git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #132449 from Stunkymonkey/develoment-phases
commit532010edf648d0309154d70ab0bf9b2c2a4ab3ab authorSandro <sandro.jaeckel@gmail.com> dateSun 8 Aug 2021, 01:37 (5 years ago) parentf56a9802262635
8 files changed+13−18
compare with master
unifiedsplit
pkgs/development/java-modules/postgresql_jdbc/default.nix−2 pkgs/development/libraries/apache-activemq/default.nix−2 pkgs/development/libraries/aspell/dictionaries.nix+8−2 pkgs/development/libraries/hunspell/dictionaries.nix+2−7 pkgs/development/libraries/miniball/default.nix+1−1 pkgs/development/misc/avr8-burn-omat/default.nix−2 pkgs/development/ocaml-modules/ounit/default.nix+1−1 pkgs/development/ocaml-modules/z3/default.nix+1−1
pkgs/development/java-modules/postgresql_jdbc/default.nix−2
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
1111 inherit version;
1212 };
1313
14− phases = [ "installPhase" ];
15−
1614 installPhase = ''
1715 runHook preInstall
1816 install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar
pkgs/development/libraries/apache-activemq/default.nix−2
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
99 url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
1010 };
1111
12− phases = [ "unpackPhase" "installPhase" ];
13−
1412 installPhase = ''
1513 mkdir -p $out
1614 mv * $out/
pkgs/development/libraries/aspell/dictionaries.nix+8−2
@@ -153,7 +153,7 @@ let
153153 }
154154 '';
155155
156− phases = [ "preBuild" "buildPhase" "installPhase" ];
156+ dontUnpack = true;
157157 } // args);
158158
159159in rec {
@@ -905,7 +905,11 @@ in rec {
905905
906906 langInputs = [ en ];
907907
908− buildPhase = "cat $src | aspell-affix en-computers --dont-validate-words --lang=en";
908+ buildPhase = ''
909+ runHook preBuild
910+ cat $src | aspell-affix en-computers --dont-validate-words --lang=en
911+ runHook postBuild
912+ '';
909913 installPhase = "aspell-install en-computers";
910914
911915 meta = {
@@ -930,8 +934,10 @@ in rec {
930934 langInputs = [ en ];
931935
932936 buildPhase = ''
937+ runHook preBuild
933938 cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en
934939 cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en
940+ runHook postBuild
935941 '';
936942 installPhase = "aspell-install en_US-science en_GB-science";
937943
pkgs/development/libraries/hunspell/dictionaries.nix+2−7
@@ -45,7 +45,6 @@ let
4545 maintainers = with maintainers; [ renzo ];
4646 platforms = platforms.all;
4747 };
48− phases = "unpackPhase patchPhase buildPhase installPhase";
4948 nativeBuildInputs = [ unzip ];
5049 buildInputs = [ bash coreutils which zip ];
5150 patchPhase = ''
@@ -89,7 +88,6 @@ let
8988 platforms = platforms.all;
9089 };
9190 nativeBuildInputs = [ unzip ];
92− phases = "unpackPhase installPhase";
9391 sourceRoot = ".";
9492 unpackCmd = ''
9593 unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile
@@ -129,7 +127,6 @@ let
129127 platforms = platforms.all;
130128 };
131129 nativeBuildInputs = [ unzip ];
132− phases = "unpackPhase installPhase";
133130 sourceRoot = ".";
134131 unpackCmd = ''
135132 unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
@@ -158,7 +155,6 @@ let
158155 platforms = platforms.all;
159156 };
160157 nativeBuildInputs = [ unzip ];
161− phases = "unpackPhase installPhase";
162158 sourceRoot = ".";
163159 unpackCmd = ''
164160 unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile}
@@ -185,7 +181,6 @@ let
185181 platforms = platforms.all;
186182 };
187183 nativeBuildInputs = [ unzip ];
188− phases = "unpackPhase patchPhase installPhase";
189184 sourceRoot = ".";
190185 prePatch = ''
191186 # Fix dic file empty lines (FS#22275)
@@ -204,7 +199,6 @@ let
204199
205200 inherit srcs;
206201
207− phases = ["unpackPhase" "installPhase"];
208202 sourceRoot = ".";
209203 # Copy files stripping until first dash (path and hash)
210204 unpackCmd = "cp $curSrc \${curSrc##*-}";
@@ -242,7 +236,8 @@ let
242236
243237 buildInputs = [ ispell perl hunspell ];
244238
245− phases = ["unpackPhase" "installPhase"];
239+ dontBuild = true;
240+
246241 installPhase = ''
247242 patchShebangs bin
248243 make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic
pkgs/development/libraries/miniball/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2";
1010 };
1111
12− phases = [ "installPhase" ];
12+ dontUnpack = true;
1313
1414 installPhase = ''
1515 mkdir -p $out/include
pkgs/development/misc/avr8-burn-omat/default.nix−2
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
1111
1212 nativeBuildInputs = [ unzip ];
1313
14− phases = "unpackPhase installPhase";
15−
1614 # move to nix-support to not create that many symlinks..
1715 # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog)
1816 installPhase = ''
pkgs/development/ocaml-modules/ounit/default.nix+1−1
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77 buildInputs = [ findlib ];
88 propagatedBuildInputs = [ ounit2 ];
99
10− phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
10+ dontBuild = true;
1111
1212 createFindlibDestdir = true;
1313
pkgs/development/ocaml-modules/z3/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 pname = "ocaml${ocaml.version}-z3";
1111 inherit (z3-with-ocaml) version;
1212
13− phases = [ "installPhase" "fixupPhase" ];
13+ dontUnpack = true;
1414
1515 installPhase = ''
1616 runHook preInstall