From 761c33f3474a2cb8174a74a4ff1b41d94d9e85df Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:28:06 -0400 Subject: [PATCH] pythonPackages.pip2nix: 0.3.0 -> 0.7.0 fix broken --- .../python-modules/pip2nix/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------- 2 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/pip2nix/default.nix diff --git a/pkgs/development/python-modules/pip2nix/default.nix b/pkgs/development/python-modules/pip2nix/default.nix new file mode 100644 index 000000000000..0e648f1ca184 --- /dev/null +++ b/pkgs/development/python-modules/pip2nix/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, click +, configobj +, contexter +, jinja2 +, pytest +}: + +buildPythonPackage rec { + pname = "pip2nix"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec9a71e09ac7f43cc7b6c9d386384eb7b5c331bf6ea0e72ca559d87979397a95"; + }; + + propagatedBuildInputs = [ click configobj contexter jinja2 pytest ]; + + postPatch = '' + sed -i "s/'pip>=8,<10'/'pip'/" setup.py + sed -i "s/pip<10,>=8/pip/" ${pname}.egg-info/requires.txt + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate Nix expressions for Python packages"; + homepage = https://github.com/johbo/pip2nix; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2af1b7c1f3e4..03793fb646fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3792,19 +3792,7 @@ in { pid = callPackage ../development/python-modules/pid { }; - pip2nix = buildPythonPackage rec { - name = "pip2nix-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pip2nix/${name}.tar.gz"; - sha256 = "1s76i8r4khq8y5r6g4218jg2c6qldmw5xhzymxad51ii8hafpwq6"; - }; - - propagatedBuildInputs = with self; [ click configobj contexter jinja2 pytest ]; - - meta.broken = true; - }; + pip2nix = callPackage ../development/python-modules/pip2nix { }; pychef = buildPythonPackage rec { name = "PyChef-${version}";