diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-04-25 17:15:48 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-04-26 20:15:52 +0000 |
| commit | 912cfb8aaaaeff60c25a685dc41b143952cfb4d3 (patch) | |
| tree | 74e690782877978ee6965508e777b6f303f960d5 | |
| parent | 845fa5692164d0bbe2a1857ba27d1bbb4ae0c0e7 (diff) | |
| download | nixpkgs-912cfb8aaaaeff60c25a685dc41b143952cfb4d3.tar nixpkgs-912cfb8aaaaeff60c25a685dc41b143952cfb4d3.tar.gz nixpkgs-912cfb8aaaaeff60c25a685dc41b143952cfb4d3.tar.bz2 nixpkgs-912cfb8aaaaeff60c25a685dc41b143952cfb4d3.tar.lz nixpkgs-912cfb8aaaaeff60c25a685dc41b143952cfb4d3.tar.xz nixpkgs-912cfb8aaaaeff60c25a685dc41b143952cfb4d3.tar.zst nixpkgs-912cfb8aaaaeff60c25a685dc41b143952cfb4d3.zip | |
buildPythonPackage: use `config.doCheckByDefault`
| -rw-r--r-- | pkgs/development/interpreters/python/build-python-package.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index 6a07a006c6b..b55d6d874bb 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -2,6 +2,7 @@ # and can build packages that use distutils, setuptools or flit. { lib +, config , python , wrapPython , setuptools @@ -19,7 +20,7 @@ let wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; mkPythonDerivation = import ./mk-python-derivation.nix { - inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; + inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; }; in diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 96a9cdf0c61..9835ba32d17 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -1,6 +1,7 @@ # Generic builder. { lib +, config , python , wrapPython , setuptools @@ -53,7 +54,7 @@ , passthru ? {} -, doCheck ? false +, doCheck ? config.doCheckByDefault or false , ... } @ attrs: |