diff options
author | Chris Ostrouchov <chris.ostrouchov@gmail.com> | 2018-10-15 17:45:33 -0400 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 07:46:56 +0200 |
commit | 6f01ed332bda74b937714806b26b669ccf154c68 (patch) | |
tree | fe25054859bbfb42c8702297ad2252be290c0826 | |
parent | d70a0fc07937b28843c8e552dafb63b68dda0a3c (diff) | |
download | nixlib-6f01ed332bda74b937714806b26b669ccf154c68.tar nixlib-6f01ed332bda74b937714806b26b669ccf154c68.tar.gz nixlib-6f01ed332bda74b937714806b26b669ccf154c68.tar.bz2 nixlib-6f01ed332bda74b937714806b26b669ccf154c68.tar.lz nixlib-6f01ed332bda74b937714806b26b669ccf154c68.tar.xz nixlib-6f01ed332bda74b937714806b26b669ccf154c68.tar.zst nixlib-6f01ed332bda74b937714806b26b669ccf154c68.zip |
pythonPackages.markdown-macros: refactor move to python-modules
-rw-r--r-- | pkgs/development/python-modules/markdown-macros/default.nix | 40 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 33 |
2 files changed, 40 insertions, 33 deletions
diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix new file mode 100644 index 000000000000..98dce9130464 --- /dev/null +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, fetchpatch +, markdown +}: + +buildPythonPackage rec { + pname = "markdown-macros"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lzvrb7nci22yp21ab2qqc9p0fhkazqj29vw0wln2r4ckb2nbawv"; + }; + + patches = [ + # Fixes a bug with markdown>2.4 + (fetchpatch { + url = "https://github.com/wnielson/markdown-macros/pull/1.patch"; + sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0"; + }) + ]; + + prePatch = '' + substituteInPlace setup.py --replace "distribute" "setuptools" + ''; + + propagatedBuildInputs = [ markdown ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "An extension for python-markdown that makes writing trac-like macros easy"; + homepage = https://github.com/wnielson/markdown-macros; + license = licenses.mit; + maintainers = [ maintainers.abigailbuccaneer ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95314d94d356..0c4845974faa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5813,39 +5813,6 @@ in { markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; - markdown-macros = buildPythonPackage rec { - name = "markdown-macros-${version}"; - version = "0.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/markdown-macros/${name}.tar.gz"; - sha256 = "1lzvrb7nci22yp21ab2qqc9p0fhkazqj29vw0wln2r4ckb2nbawv"; - }; - - patches = [ - # Fixes a bug with markdown>2.4 - (pkgs.fetchpatch { - url = "https://github.com/wnielson/markdown-macros/pull/1.patch"; - sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0"; - }) - ]; - - prePatch = '' - substituteInPlace setup.py --replace "distribute" "setuptools" - ''; - - propagatedBuildInputs = with self; [ markdown ]; - - doCheck = false; - - meta = { - description = "An extension for python-markdown that makes writing trac-like macros easy"; - homepage = https://github.com/wnielson/markdown-macros; - license = licenses.mit; - maintainers = [ maintainers.abigailbuccaneer ]; - }; - }; - mathics = if (versionOlder self.django.version "1.8") || (versionAtLeast self.django.version "1.9") then throw "mathics only supports django-1.8.x" |