diff options
author | Domen Kožar <domen@dev.si> | 2015-11-19 09:56:46 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-11-21 21:44:12 +0100 |
commit | 127a20f8da1b6ff50fcc273edee1570bf5eff428 (patch) | |
tree | a2671410b93779419b0fd9d7b325a4e7f04a22b1 /pkgs/development/python-modules/generic | |
parent | 6ba529277a7f3d07a8182d94205197fbb256b144 (diff) |
buildPythonPackage: sadly, checkPhase is too often installPhase in python
Diffstat (limited to 'pkgs/development/python-modules/generic')
-rw-r--r-- | pkgs/development/python-modules/generic/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index acdcc7233cdb4..d820e0f30ac36 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,7 +53,6 @@ let setuppy = ./run_setup.py; in python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { - inherit doCheck; name = namePrefix + name; @@ -82,12 +81,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { runHook postBuild ''; - checkPhase = attrs.checkPhase or '' - runHook preCheck - ${python.interpreter} nix_run_setup.py test - runHook postCheck - ''; - installPhase = attrs.installPhase or '' runHook preInstall @@ -101,12 +94,20 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { runHook postInstall ''; + doInstallCheck = doCheck; + doCheck = false; + installCheckPhase = attrs.checkPhase or '' + runHook preCheck + ${python.interpreter} nix_run_setup.py test + runHook postCheck + ''; + postFixup = attrs.postFixup or '' wrapPythonPrograms # check if we have two packagegs with the same name in closure and fail # this shouldn't happen, something went wrong with dependencies specs - ${python.interpreter} ${./do_conflict.py} + ${python.interpreter} ${./catch_conflicts.py} ''; shellHook = attrs.shellHook or '' |