diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-03 11:47:38 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-03 11:47:38 +0100 |
| commit | adab4cd58b06896be6436f93a76432811deb897e (patch) | |
| tree | d4dec437b37d500a136f35ead5290ba15c338ee3 /pkgs/development/interpreters | |
| parent | 787c1add0ba40ba8094b0ed4001de10c7d05c033 (diff) | |
| parent | 5b759293e09a062373d4b2843c5bad89d5a47165 (diff) | |
| download | nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.gz nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.bz2 nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.lz nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.xz nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.zst nixlib-adab4cd58b06896be6436f93a76432811deb897e.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/build-python-package-flit.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/build-python-package.nix | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix index 8628c3df769e..1beff0ebd834 100644 --- a/pkgs/development/interpreters/python/build-python-package-flit.nix +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -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; -} \ No newline at end of file + # Flit packages, like setuptools packages, might have tests. + installCheckPhase = attrs.checkPhase or '' + ${python.interpreter} -m unittest discover + ''; + doCheck = attrs.doCheck or true; +} diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index e15405e2981d..b26bf1539cd5 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -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 ) \ No newline at end of file +in mkPythonDerivation ( attrs // formatspecific ) |