Merge pull request #132449 from Stunkymonkey/develoment-phases

pkgs/development/java-modules/postgresql_jdbc/default.nix

@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
     inherit version;
   };
 
-  phases = [ "installPhase" ];
-
   installPhase = ''
     runHook preInstall
     install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar

pkgs/development/libraries/apache-activemq/default.nix

@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
     url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
   };
 
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out
     mv * $out/

pkgs/development/libraries/aspell/dictionaries.nix

@@ -153,7 +153,7 @@ let
         }
       '';
 
-      phases = [ "preBuild" "buildPhase" "installPhase" ];
+      dontUnpack = true;
     } // args);
 
 in rec {
@@ -905,7 +905,11 @@ in rec {
 
     langInputs = [ en ];
 
-    buildPhase = "cat $src | aspell-affix en-computers --dont-validate-words --lang=en";
+    buildPhase = ''
+      runHook preBuild
+      cat $src | aspell-affix en-computers --dont-validate-words --lang=en
+      runHook postBuild
+    '';
     installPhase = "aspell-install en-computers";
 
     meta = {
@@ -930,8 +934,10 @@ in rec {
     langInputs = [ en ];
 
     buildPhase = ''
+      runHook preBuild
       cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en
       cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en
+      runHook postBuild
     '';
     installPhase = "aspell-install en_US-science en_GB-science";
 

pkgs/development/libraries/hunspell/dictionaries.nix

@@ -45,7 +45,6 @@ let
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
       };
-      phases = "unpackPhase patchPhase buildPhase installPhase";
       nativeBuildInputs = [ unzip ];
       buildInputs = [ bash coreutils which zip ];
       patchPhase = ''
@@ -89,7 +88,6 @@ let
         platforms = platforms.all;
       };
       nativeBuildInputs = [ unzip ];
-      phases = "unpackPhase installPhase";
       sourceRoot = ".";
       unpackCmd = ''
       unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile
@@ -129,7 +127,6 @@ let
         platforms = platforms.all;
       };
       nativeBuildInputs = [ unzip ];
-      phases = "unpackPhase installPhase";
       sourceRoot = ".";
       unpackCmd = ''
         unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
@@ -158,7 +155,6 @@ let
         platforms = platforms.all;
       };
       nativeBuildInputs = [ unzip ];
-      phases = "unpackPhase installPhase";
       sourceRoot = ".";
       unpackCmd = ''
         unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile}
@@ -185,7 +181,6 @@ let
         platforms = platforms.all;
       };
       nativeBuildInputs = [ unzip ];
-      phases = "unpackPhase patchPhase installPhase";
       sourceRoot = ".";
       prePatch = ''
         # Fix dic file empty lines (FS#22275)
@@ -204,7 +199,6 @@ let
 
       inherit srcs;
 
-      phases = ["unpackPhase" "installPhase"];
       sourceRoot = ".";
       # Copy files stripping until first dash (path and hash)
       unpackCmd = "cp $curSrc \${curSrc##*-}";
@@ -242,7 +236,8 @@ let
 
       buildInputs = [ ispell perl hunspell ];
 
-      phases = ["unpackPhase" "installPhase"];
+      dontBuild = true;
+
       installPhase = ''
         patchShebangs bin
         make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic

pkgs/development/libraries/miniball/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/include

pkgs/development/misc/avr8-burn-omat/default.nix

@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ unzip ];
 
-  phases = "unpackPhase installPhase";
-
   # move to nix-support to not create that many symlinks..
   # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog)
   installPhase = ''

pkgs/development/ocaml-modules/ounit/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   buildInputs = [ findlib ];
   propagatedBuildInputs = [ ounit2 ];
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  dontBuild = true;
 
   createFindlibDestdir = true;
 

pkgs/development/ocaml-modules/z3/default.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   pname = "ocaml${ocaml.version}-z3";
   inherit (z3-with-ocaml) version;
 
-  phases = [ "installPhase" "fixupPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     runHook preInstall