Merge pull request #151970 from sikmir/md2gemini

This commit is contained in:
Sandro 2022-02-02 10:56:18 +01:00 committed by GitHub
commit 43e3b6af08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions

View File

@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "md2gemini";
version = "1.8.1";
version = "1.9.0";
propagatedBuildInputs = [ mistune_2_0 cjkwrap wcwidth ];
checkInputs = [ pytestCheckHook ];
@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0mfa0f0m762168fbsxjr1cx9yhj82dr8z1d28jl6hj9bkqnvvwiy";
sha256 = "sha256-d1zuK+NqoPS36ihh8qx9gOET94tApY+SGStsc/bITnU=";
};
meta = with lib; {

View File

@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchPypi, nose, version, sha256 }:
{ lib, buildPythonPackage, fetchPypi, nose, version, sha256, format ? "setuptools" }:
buildPythonPackage rec {
inherit version;
inherit version format;
pname = "mistune";
src = fetchPypi {

View File

@ -4,8 +4,9 @@ self: rec {
sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e";
};
mistune_2_0 = self.callPackage ./common.nix {
version = "2.0.0rc1";
sha256 = "1nd7iav1ixh9hlj4hxn6lmpava88d86ys8rqm30wgvr7gjlxnas5";
version = "2.0.2";
sha256 = "sha256-b8iMPLSduosWaHtBcl5mHPhXhMEuiXSim50zbdWWw6E=";
format = "pyproject";
};
mistune = mistune_0_8;
}

View File

@ -43,6 +43,9 @@ buildPythonPackage rec {
postPatch = ''
# isort is a development dependency
sed -i '/isort/d' setup.py
# Fix mistune imports for mistune >= 2.0.0
# https://gitlab.com/mailman/hyperkitty/-/merge_requests/379
sed -i 's/mistune.scanner/mistune.util/' hyperkitty/lib/renderer.py
'';
propagatedBuildInputs = [