From e9207374e17ae12c793aebf7bc02dac83ac5a19a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:52:57 -0400 Subject: [PATCH] pythonPackages.subunit: refactor move to python-modules --- .../python-modules/subunit/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/subunit/default.nix diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix new file mode 100644 index 00000000000..ac21ea41555 --- /dev/null +++ b/pkgs/development/python-modules/subunit/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, pkgs +, testtools +, testscenarios +}: + +buildPythonPackage rec { + name = pkgs.subunit.name; + src = pkgs.subunit.src; + + propagatedBuildInputs = [ testtools testscenarios ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.check pkgs.cppunit ]; + + patchPhase = '' + sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py + ''; + + meta = pkgs.subunit.meta; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6fc2a23b1d..2e4bee579b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3918,20 +3918,7 @@ in { subdownloader = callPackage ../development/python-modules/subdownloader { }; - subunit = buildPythonPackage rec { - name = pkgs.subunit.name; - src = pkgs.subunit.src; - - propagatedBuildInputs = with self; [ testtools testscenarios ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pkgs.check pkgs.cppunit ]; - - patchPhase = '' - sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py - ''; - - meta = pkgs.subunit.meta; - }; + subunit = callPackage ../development/python-modules/subunit { }; sure = buildPythonPackage rec { name = "sure-${version}";