From 5e3aec5963fb27d316f63a49598d85666cf5bd81 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:14:44 -0400 Subject: [PATCH] pythonPackages.mwlib-rl: refactor move to python-modules Downgraded to 0.14.6 -> 0.14.5 (so we can use Pypi) --- .../python-modules/mwlib-rl/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/mwlib-rl/default.nix diff --git a/pkgs/development/python-modules/mwlib-rl/default.nix b/pkgs/development/python-modules/mwlib-rl/default.nix new file mode 100644 index 000000000000..21820d95c7fa --- /dev/null +++ b/pkgs/development/python-modules/mwlib-rl/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, mwlib +, mwlib-ext +, pygments +}: + +buildPythonPackage rec { + version = "0.14.5"; + pname = "mwlib.rl"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "dddf9603ea0ca5aa87890217709eb5a5b16baeca547db3daad43c3ace73b6bc1"; + }; + + buildInputs = [ mwlib mwlib-ext pygments ]; + + meta = with stdenv.lib; { + description = "Generate pdfs from mediawiki markup"; + homepage = "http://pediapress.com/code/"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6295aa27b32b..b10b1161a5f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1980,28 +1980,7 @@ in { mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; - mwlib-rl = buildPythonPackage rec { - version = "0.14.6"; - name = "mwlib.rl-${version}"; - - src = pkgs.fetchurl { - url = "http://pypi.pediapress.com/packages/mirror/${name}.zip"; - sha256 = "7f596fd60eb24d8d3da3ab4880f095294028880eafb653810a7bdaabdb031238"; - }; - - buildInputs = with self; - [ - mwlib - mwlib-ext - pygments - ]; - - meta = { - description = "Generate pdfs from mediawiki markup"; - homepage = "http://pediapress.com/code/"; - license = licenses.bsd3; - }; - }; + mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; natsort = callPackage ../development/python-modules/natsort { };