From 178b5b9c5b9650e2f8244d524b45f4eff783ae2c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:49 +0000 Subject: [PATCH] Revert "move checkPhase after fixupPhase for python packages" This reverts commit 413c44da228754018a2920cb556303e803a9d488. svn path=/nixpkgs/branches/stdenv-updates/; revision=32643 --- pkgs/development/python-modules/generic/builder.sh | 9 --------- pkgs/development/python-modules/generic/default.nix | 4 ---- 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/python-modules/generic/builder.sh diff --git a/pkgs/development/python-modules/generic/builder.sh b/pkgs/development/python-modules/generic/builder.sh deleted file mode 100644 index 6cad5e99aa3..00000000000 --- a/pkgs/development/python-modules/generic/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8197e5e7431..c208c0bcff2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -54,7 +54,6 @@ , doCheck ? true -# run after fixupPhase , checkPhase ? '' runHook preCheck @@ -70,9 +69,6 @@ python.stdenv.mkDerivation (attrs // { inherit doCheck buildPhase checkPhase; - # moves checkPhase from after buildPhase to after fixupPhase - builder = ./builder.sh; - name = namePrefix + name; buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath;