git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #132449 from Stunkymonkey/develoment-phases
532010eSandro
pkgs/development/java-modules/postgresql_jdbc/default.nix−2
compare with master
unifiedsplit
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
11 inherit version;
11 inherit version;
12 };
12 };
13
13
14− phases = [ "installPhase" ];
15−
16 installPhase = ''
14 installPhase = ''
17 runHook preInstall
15 runHook preInstall
18 install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar
16 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 {
9 url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
9 url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
10 };
10 };
11
11
12− phases = [ "unpackPhase" "installPhase" ];
13−
14 installPhase = ''
12 installPhase = ''
15 mkdir -p $out
13 mkdir -p $out
16 mv * $out/
14 mv * $out/
pkgs/development/libraries/aspell/dictionaries.nix+8−2
@@ -153,7 +153,7 @@ let
153 }
153 }
154 '';
154 '';
155
155
156− phases = [ "preBuild" "buildPhase" "installPhase" ];
156+ dontUnpack = true;
157 } // args);
157 } // args);
158
158
159in rec {
159in rec {
@@ -905,7 +905,11 @@ in rec {
905
905
906 langInputs = [ en ];
906 langInputs = [ en ];
907
907
908+ buildPhase = ''
909+ runHook preBuild
908− buildPhase = "cat $src | aspell-affix en-computers --dont-validate-words --lang=en";
910+ cat $src | aspell-affix en-computers --dont-validate-words --lang=en
911+ runHook postBuild
912+ '';
909 installPhase = "aspell-install en-computers";
913 installPhase = "aspell-install en-computers";
910
914
911 meta = {
915 meta = {
@@ -930,8 +934,10 @@ in rec {
930 langInputs = [ en ];
934 langInputs = [ en ];
931
935
932 buildPhase = ''
936 buildPhase = ''
937+ runHook preBuild
933 cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en
938 cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en
934 cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en
939 cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en
940+ runHook postBuild
935 '';
941 '';
936 installPhase = "aspell-install en_US-science en_GB-science";
942 installPhase = "aspell-install en_US-science en_GB-science";
937
943
pkgs/development/libraries/hunspell/dictionaries.nix+2−7
@@ -45,7 +45,6 @@ let
45 maintainers = with maintainers; [ renzo ];
45 maintainers = with maintainers; [ renzo ];
46 platforms = platforms.all;
46 platforms = platforms.all;
47 };
47 };
48− phases = "unpackPhase patchPhase buildPhase installPhase";
49 nativeBuildInputs = [ unzip ];
48 nativeBuildInputs = [ unzip ];
50 buildInputs = [ bash coreutils which zip ];
49 buildInputs = [ bash coreutils which zip ];
51 patchPhase = ''
50 patchPhase = ''
@@ -89,7 +88,6 @@ let
89 platforms = platforms.all;
88 platforms = platforms.all;
90 };
89 };
91 nativeBuildInputs = [ unzip ];
90 nativeBuildInputs = [ unzip ];
92− phases = "unpackPhase installPhase";
93 sourceRoot = ".";
91 sourceRoot = ".";
94 unpackCmd = ''
92 unpackCmd = ''
95 unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile
93 unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile
@@ -129,7 +127,6 @@ let
129 platforms = platforms.all;
127 platforms = platforms.all;
130 };
128 };
131 nativeBuildInputs = [ unzip ];
129 nativeBuildInputs = [ unzip ];
132− phases = "unpackPhase installPhase";
133 sourceRoot = ".";
130 sourceRoot = ".";
134 unpackCmd = ''
131 unpackCmd = ''
135 unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
132 unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
@@ -158,7 +155,6 @@ let
158 platforms = platforms.all;
155 platforms = platforms.all;
159 };
156 };
160 nativeBuildInputs = [ unzip ];
157 nativeBuildInputs = [ unzip ];
161− phases = "unpackPhase installPhase";
162 sourceRoot = ".";
158 sourceRoot = ".";
163 unpackCmd = ''
159 unpackCmd = ''
164 unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile}
160 unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile}
@@ -185,7 +181,6 @@ let
185 platforms = platforms.all;
181 platforms = platforms.all;
186 };
182 };
187 nativeBuildInputs = [ unzip ];
183 nativeBuildInputs = [ unzip ];
188− phases = "unpackPhase patchPhase installPhase";
189 sourceRoot = ".";
184 sourceRoot = ".";
190 prePatch = ''
185 prePatch = ''
191 # Fix dic file empty lines (FS#22275)
186 # Fix dic file empty lines (FS#22275)
@@ -204,7 +199,6 @@ let
204
199
205 inherit srcs;
200 inherit srcs;
206
201
207− phases = ["unpackPhase" "installPhase"];
208 sourceRoot = ".";
202 sourceRoot = ".";
209 # Copy files stripping until first dash (path and hash)
203 # Copy files stripping until first dash (path and hash)
210 unpackCmd = "cp $curSrc \${curSrc##*-}";
204 unpackCmd = "cp $curSrc \${curSrc##*-}";
@@ -242,7 +236,8 @@ let
242
236
243 buildInputs = [ ispell perl hunspell ];
237 buildInputs = [ ispell perl hunspell ];
244
238
245− phases = ["unpackPhase" "installPhase"];
239+ dontBuild = true;
240+
246 installPhase = ''
241 installPhase = ''
247 patchShebangs bin
242 patchShebangs bin
248 make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic
243 make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic
pkgs/development/libraries/miniball/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
9 sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2";
9 sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2";
10 };
10 };
11
11
12− phases = [ "installPhase" ];
12+ dontUnpack = true;
13
13
14 installPhase = ''
14 installPhase = ''
15 mkdir -p $out/include
15 mkdir -p $out/include
pkgs/development/misc/avr8-burn-omat/default.nix−2
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
11
11
12 nativeBuildInputs = [ unzip ];
12 nativeBuildInputs = [ unzip ];
13
13
14− phases = "unpackPhase installPhase";
15−
16 # move to nix-support to not create that many symlinks..
14 # move to nix-support to not create that many symlinks..
17 # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog)
15 # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog)
18 installPhase = ''
16 installPhase = ''
pkgs/development/ocaml-modules/ounit/default.nix+1−1
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
7 buildInputs = [ findlib ];
7 buildInputs = [ findlib ];
8 propagatedBuildInputs = [ ounit2 ];
8 propagatedBuildInputs = [ ounit2 ];
9
9
10− phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
10+ dontBuild = true;
11
11
12 createFindlibDestdir = true;
12 createFindlibDestdir = true;
13
13
pkgs/development/ocaml-modules/z3/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
10 pname = "ocaml${ocaml.version}-z3";
10 pname = "ocaml${ocaml.version}-z3";
11 inherit (z3-with-ocaml) version;
11 inherit (z3-with-ocaml) version;
12
12
13− phases = [ "installPhase" "fixupPhase" ];
13+ dontUnpack = true;
14
14
15 installPhase = ''
15 installPhase = ''
16 runHook preInstall
16 runHook preInstall