diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2019-01-18 23:12:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 23:12:53 +0100 |
| commit | bf4c5c56d8630239f649669228c2ab4463e14d64 (patch) | |
| tree | 6e01275232bd4182e8740137f7b8903c9d740473 | |
| parent | d34f44db4508cdcce96382cb80bd11fbe9c7d614 (diff) | |
| parent | 49d98377390309468ea14bf72f1a3122a219fab6 (diff) | |
| download | nixlib-bf4c5c56d8630239f649669228c2ab4463e14d64.tar nixlib-bf4c5c56d8630239f649669228c2ab4463e14d64.tar.gz nixlib-bf4c5c56d8630239f649669228c2ab4463e14d64.tar.bz2 nixlib-bf4c5c56d8630239f649669228c2ab4463e14d64.tar.lz nixlib-bf4c5c56d8630239f649669228c2ab4463e14d64.tar.xz nixlib-bf4c5c56d8630239f649669228c2ab4463e14d64.tar.zst nixlib-bf4c5c56d8630239f649669228c2ab4463e14d64.zip | |
Merge pull request #53945 from dotlambda/recommonmark-0.5.0
python.pkgs.recommonmark: 0.4.0 -> 0.5.0
| -rw-r--r-- | pkgs/development/python-modules/recommonmark/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
2 files changed, 16 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 2078a04be063..f6965fd6cd93 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -1,26 +1,30 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest -, sphinx -, CommonMark_54 +, CommonMark , docutils +, sphinx }: buildPythonPackage rec { pname = "recommonmark"; - version = "0.4.0"; + version = "0.5.0"; - src = fetchPypi { - inherit pname version; - sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; + # PyPI tarball is missing some test files: https://github.com/rtfd/recommonmark/pull/128 + src = fetchFromGitHub { + owner = "rtfd"; + repo = pname; + rev = version; + sha256 = "04bjqx2hczmg7rnj2rpsjk7h24diwk83s6fhgrxk00k40w2bpz5j"; }; - checkInputs = [ pytest sphinx ]; - propagatedBuildInputs = [ CommonMark_54 docutils ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ CommonMark docutils sphinx ]; - # No tests in archive - doCheck = false; + checkPhase = '' + py.test + ''; meta = { description = "A docutils-compatibility bridge to CommonMark"; @@ -28,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 657e1cb43308..428b827f0fc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1274,14 +1274,6 @@ in { CommonMark = callPackage ../development/python-modules/commonmark { }; - CommonMark_54 = self.CommonMark.overridePythonAttrs (oldAttrs: rec { - version = "0.5.4"; - src = oldAttrs.src.override { - inherit version; - sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5"; - }; - }); - coilmq = callPackage ../development/python-modules/coilmq { }; colander = callPackage ../development/python-modules/colander { }; |