From e1d1a573e58067dae9c45eba621f8032feb811fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Sep 2016 17:10:38 +0200 Subject: Python: fix mkPythonDerivation doCheck --- pkgs/development/interpreters/python/mk-python-derivation.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 47e55be4bafc9..99af42cd7add2 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -41,6 +41,8 @@ , passthru ? {} +, doCheck ? false + , ... } @ attrs: @@ -58,14 +60,14 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) - ++ lib.optionals attrs.doCheck checkInputs; + ++ lib.optionals doCheck checkInputs; # propagate python/setuptools to active setup-hook in nix-shell propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; - doInstallCheck = attrs.doCheck or false; + doInstallCheck = doCheck; postFixup = attrs.postFixup or '' wrapPythonPrograms -- cgit 1.4.1