diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2012-12-03 04:41:19 +0100 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2012-12-03 04:41:19 +0100 |
| commit | d4d76a84433331ae5ac60adcb0e4280e9d0d8097 (patch) | |
| tree | 986685124090d9e704f1c48430432f9ecf86cec3 | |
| parent | 5436356733147985a1c5cfff809a13ba217dea98 (diff) | |
| download | nixlib-d4d76a84433331ae5ac60adcb0e4280e9d0d8097.tar nixlib-d4d76a84433331ae5ac60adcb0e4280e9d0d8097.tar.gz nixlib-d4d76a84433331ae5ac60adcb0e4280e9d0d8097.tar.bz2 nixlib-d4d76a84433331ae5ac60adcb0e4280e9d0d8097.tar.lz nixlib-d4d76a84433331ae5ac60adcb0e4280e9d0d8097.tar.xz nixlib-d4d76a84433331ae5ac60adcb0e4280e9d0d8097.tar.zst nixlib-d4d76a84433331ae5ac60adcb0e4280e9d0d8097.zip | |
make diff to master look nicer
| -rw-r--r-- | pkgs/development/python-modules/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index e9c51c3b87f2..aa24bc78a65a 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -34,6 +34,7 @@ python setup.py test runHook postCheck '' + , postInstall ? "" , ... } @ attrs: @@ -48,7 +49,7 @@ python.stdenv.mkDerivation (attrs // { buildInputStrings = map toString buildInputs; - pythonPath = [ setuptools ] ++ pythonPath; + pythonPath = [ setuptools] ++ pythonPath; preConfigure = '' PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb5b624fd2f8..c049de9d6f5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -284,16 +284,16 @@ let pythonPackages = python.modules // rec { # bugz = buildPythonPackage (rec { # name = "bugz-0.9.3"; - + # # src = fetchgit { # url = "https://github.com/williamh/pybugz.git"; # rev = "refs/tags/0.9.3"; # }; - + # # propagatedBuildInputs = [ argparse python.modules.ssl ]; - + # # doCheck = false; - + # # meta = { # homepage = http://www.liquidx.net/pybugz/; # description = "Command line interface for Bugzilla"; @@ -2709,15 +2709,15 @@ let pythonPackages = python.modules // rec { # XXX: ValueError: ZIP does not support timestamps before 1980 # svneverever = buildPythonPackage rec { # name = "svneverever-778489a8"; - + # # src = pkgs.fetchgit { # url = git://git.goodpoint.de/svneverever.git; # rev = "778489a8c6f07825fb18c9da3892a781c3d659ac"; # sha256 = "41c9da1dab2be7b60bff87e618befdf5da37c0a56287385cb0cbd3f91e452bb6"; # }; - + # # propagatedBuildInputs = [ pysvn argparse ]; - + # # doCheck = false; # }; |