Author: chaoflow
Date: Mon Feb 27 17:34:02 2012
New Revision: 32625
URL: https://nixos.org/websvn/nix/?rev=32625&sc=1
Log:
move checkPhase after fixupPhase for python packages
authored by: chaoflow, goibhniu
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/builder.sh
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/builder.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/builder.sh
Mon Feb 27 17:34:02 2012 (r32625)
@@ -0,0 +1,9 @@
+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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
Mon Feb 27 17:33:55 2012 (r32624)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
Mon Feb 27 17:34:02 2012 (r32625)
@@ -54,6 +54,7 @@
, doCheck ? true
+# run after fixupPhase
, checkPhase ?
''
runHook preCheck
@@ -69,6 +70,9 @@
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;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
