alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "buildSetupcfg: Include unzip for zip sources."

Browse source 
Misunderstood the error I was seeing.

This reverts commit 0d3eb70133.
This commit is contained in:
Shea Levy 2018-04-14 20:12:22 -04:00
parent 0d3eb70133
commit 603a369b89
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/build-setupcfg/default.nix
View file

@ -6,7 +6,7 @@
# * application: Whether this package is a python library or an # * application: Whether this package is a python library or an
# application which happens to be written in python. # application which happens to be written in python.
# * doCheck: Whether to run the test suites. # * doCheck: Whether to run the test suites.
{ pkgs, pythonPackages }: pythonPackages:
{ src, info, meta ? {}, application ? false, doCheck ? true }: let { src, info, meta ? {}, application ? false, doCheck ? true }: let
build = if application build = if application
then pythonPackages.buildPythonApplication then pythonPackages.buildPythonApplication
@ -16,9 +16,7 @@ in build {
inherit src meta doCheck; inherit src meta doCheck;
nativeBuildInputs = [ nativeBuildInputs = map (p: pythonPackages.${p}) (
pkgs.unzip
] ++ map (p: pythonPackages.${p}) (
(info.setup_requires or []) ++ (info.setup_requires or []) ++
(if doCheck then (info.tests_require or []) else [])); (if doCheck then (info.tests_require or []) else []));

3
pkgs/top-level/python-packages.nix
View file

@ -67,8 +67,7 @@ let
})); }));
# See build-setupcfg/default.nix for documentation. # See build-setupcfg/default.nix for documentation.
buildSetupcfg = import ../build-support/build-setupcfg buildSetupcfg = import ../build-support/build-setupcfg self;
{ inherit pkgs; pythonPackages = self; };
graphiteVersion = "1.0.2"; graphiteVersion = "1.0.2";