ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Revert "added unzip to buildPythonPackage's buildInputs - used quite often"

Browse Source 
This reverts commit f067ecb4911f154fe2c64434abdc5a8b79625f5a.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32644
This commit is contained in:
Florian Friesdorf 2012-02-28 00:06:52 +00:00
parent 178b5b9c5b
commit e545a9944a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/generic/default.nix
View File

@ -3,7 +3,7 @@
(http://pypi.python.org/pypi/setuptools/), which represents a large
number of Python packages nowadays. */
{ python, setuptools, wrapPython, lib, site, offlineDistutils, unzip }:
{ python, setuptools, wrapPython, lib, site, offlineDistutils }:
{ name, namePrefix ? "python-"
@ -71,7 +71,7 @@ python.stdenv.mkDerivation (attrs // {
name = namePrefix + name;
buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath;
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
preConfigure = ''
# do not allow distutils to make downloads, whatever install command is used

12
pkgs/top-level/python-packages.nix
View File

@ -8,7 +8,7 @@ let pythonPackages = python.modules // rec {
buildPythonPackage = import ../development/python-modules/generic {
inherit (pkgs) lib unzip;
inherit (pkgs) lib;
inherit python wrapPython setuptools site offlineDistutils;
};
@ -84,7 +84,7 @@ let pythonPackages = python.modules // rec {
sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b";
};
buildInputs = [ pkgs.sqlite ];
buildInputs = [ pkgs.unzip pkgs.sqlite ];
doCheck = false;
@ -103,6 +103,8 @@ let pythonPackages = python.modules // rec {
sha256 = "ee6da1aaad8b08a74a33eb82264b1a2bf12a7d5aefc7e9d7d40a8f8fa9912e62";
};
buildInputs = [ pkgs.unzip ];
# How do we run the tests?
doCheck = false;
@ -286,6 +288,8 @@ let pythonPackages = python.modules // rec {
sha256 = "1i5n97l20kn2w9v6x8ybcdnl323vy8lcc5qlxz5l89di36a2skgw";
};
buildInputs = [ pkgs.unzip ];
# The tests fail - I don't know why
doCheck = false;
@ -1637,7 +1641,7 @@ let pythonPackages = python.modules // rec {
sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040";
};
buildInputs = [ pkgs.pyrex ];
buildInputs = [ pkgs.unzip pkgs.pyrex ];
propagatedBuildInputs = [ pkgs.libyaml ];
meta = {
@ -2113,6 +2117,8 @@ let pythonPackages = python.modules // rec {
md5 = "8e46dd755f6998d471bfbcb4def897ff";
};
buildInputs = [ pkgs.unzip ];
# The test requires "webtest", which is a cyclic dependency. (WTF?)
doCheck = false;