Revert "move checkPhase after fixupPhase for python packages"
This reverts commit 413c44da228754018a2920cb556303e803a9d488. svn path=/nixpkgs/branches/stdenv-updates/; revision=32643
This commit is contained in:
parent
013c915777
commit
178b5b9c5b
|
@ -1,9 +0,0 @@
|
||||||
source $stdenv/setup
|
|
||||||
|
|
||||||
# move checkPhase from after buildPhase to after fixupPhase
|
|
||||||
phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
|
|
||||||
configurePhase $preBuildPhases buildPhase \
|
|
||||||
$preInstallPhases installPhase fixupPhase checkPhase \
|
|
||||||
$preDistPhases distPhase $postPhases";
|
|
||||||
|
|
||||||
genericBuild
|
|
|
@ -54,7 +54,6 @@
|
||||||
|
|
||||||
, doCheck ? true
|
, doCheck ? true
|
||||||
|
|
||||||
# run after fixupPhase
|
|
||||||
, checkPhase ?
|
, checkPhase ?
|
||||||
''
|
''
|
||||||
runHook preCheck
|
runHook preCheck
|
||||||
|
@ -70,9 +69,6 @@
|
||||||
python.stdenv.mkDerivation (attrs // {
|
python.stdenv.mkDerivation (attrs // {
|
||||||
inherit doCheck buildPhase checkPhase;
|
inherit doCheck buildPhase checkPhase;
|
||||||
|
|
||||||
# moves checkPhase from after buildPhase to after fixupPhase
|
|
||||||
builder = ./builder.sh;
|
|
||||||
|
|
||||||
name = namePrefix + name;
|
name = namePrefix + name;
|
||||||
|
|
||||||
buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath;
|
buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath;
|
||||||
|
|
Loading…
Reference in a new issue