From 230182f61b001ff04f418c2e8ef9561235f6e002 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Mar 2015 16:17:31 +0100 Subject: [PATCH] pythonPackages.subunit: revert "rewrite to use buildPythonPackage" This reverts commit e42547d8e9f6cf04a6969c7b486b72da3e17cb90. The change broke samba and dependent packages. --- pkgs/top-level/python-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a79d9d296cc..8281c25e4ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10866,17 +10866,21 @@ let }); - subunit = buildPythonPackage rec { + subunit = stdenv.mkDerivation rec { name = "subunit-${version}"; - version = "1.1.0"; + version = "1.0.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/python-subunit/python-subunit-${version}.tar.gz"; - sha256 = "125zh5i1f21ficn8ix5q33jk87j2pfmzbw6jq5l8v0hhjrp619yr"; + url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m"; }; + buildInputs = (with pkgs; [ pkgconfig check cppunit perl ]) ++ [ self.wrapPython ]; + propagatedBuildInputs = with self; [ testtools testscenarios ]; + postFixup = "wrapPythonPrograms"; + meta = { description = "A streaming protocol for test results"; homepage = https://launchpad.net/subunit;