public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2017-02-03 11:47:38 +01:00
parent 787c1add0b 5b759293e0
commit adab4cd58b
143 changed files with 3275 additions and 1859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/interpreters/python/build-python-package-flit.nix
View File

@@ -1,6 +1,7 @@
# This function provides specific bits for building a flit-based Python package.
{ flit
{ python
, flit
}:
{ ... } @ attrs:
@@ -13,7 +14,9 @@ attrs // {
runHook postBuild
'';
# Flit packages do not come with tests.
installCheckPhase = attrs.checkPhase or ":";
doCheck = attrs.doCheck or false;
}
# Flit packages, like setuptools packages, might have tests.
installCheckPhase = attrs.checkPhase or ''
${python.interpreter} -m unittest discover
'';
doCheck = attrs.doCheck or true;
}

4
pkgs/development/interpreters/python/build-python-package.nix
View File

@@ -12,7 +12,7 @@
let
setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; };
flit-specific = import ./build-python-package-flit.nix { inherit flit; };
flit-specific = import ./build-python-package-flit.nix { inherit python flit; };
wheel-specific = import ./build-python-package-wheel.nix { };
common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
in
@@ -34,4 +34,4 @@ let
else if format == "other" then {}
else throw "Unsupported format ${format}";
in mkPythonDerivation ( attrs // formatspecific )
in mkPythonDerivation ( attrs // formatspecific )