Merge staging-next into staging

doc/languages-frameworks/bower.section.md

@@ -118,7 +118,13 @@ pkgs.stdenv.mkDerivation {
     runHook postBuild
   '';
 
-  installPhase = "mv gulpdist $out";
+  installPhase = ''
+    runHook preInstall
+
+    mv gulpdist $out
+
+    runHook postInstall
+  '';
 }
 ```
 

doc/languages-frameworks/emscripten.section.md

@@ -192,6 +192,7 @@ pkgs.buildEmscriptenPackage {
     cp *.json $out/share
     cp *.rng $out/share
     cp README.md $doc/share/${name}
+
     runHook postInstall
   '';
 

doc/languages-frameworks/java.section.md

@@ -69,9 +69,13 @@ script to run it using a JRE. You can use `makeWrapper` for this:
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
     makeWrapper ${jre}/bin/java $out/bin/foo \
       --add-flags "-cp $out/share/java/foo.jar org.foo.Main"
+
+    runHook postInstall
   '';
 }
 ```

doc/languages-frameworks/javascript.section.md

@@ -690,7 +690,11 @@ The configure phase can sometimes fail because it makes many assumptions which m
 ```nix
 {
   configurePhase = ''
+    runHook preConfigure
+
     ln -s $node_modules node_modules
+
+    runHook postConfigure
   '';
 }
 ```
@@ -700,8 +704,12 @@ or if you need a writeable node_modules directory:
 ```nix
 {
   configurePhase = ''
+    runHook preConfigure
+
     cp -r $node_modules node_modules
     chmod +w node_modules
+
+    runHook postConfigure
   '';
 }
 ```

doc/languages-frameworks/lisp.section.md

@@ -59,7 +59,11 @@ Such a Lisp can be now used e.g. to compile your sources:
 ```nix
 {
   buildPhase = ''
+    runHook preBuild
+
     ${sbcl'}/bin/sbcl --load my-build-file.lisp
+
+    runHook postBuild
   '';
 }
 ```

doc/languages-frameworks/swift.section.md

@@ -103,7 +103,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   # The helper provides a configure snippet that will prepare all dependencies
   # in the correct place, where SwiftPM expects them.
-  configurePhase = generated.configure;
+  configurePhase = ''
+    runHook preConfigure
+
+    ${generated.configure}
+
+    runHook postConfigure
+  '';
 
   installPhase = ''
     runHook preInstall
@@ -168,11 +174,17 @@ with a writable copy:
 
 ```nix
 {
-  configurePhase = generated.configure ++ ''
+  configurePhase = ''
+    runHook preConfigure
+
+    ${generated.configure}
+
     # Replace the dependency symlink with a writable copy.
     swiftpmMakeMutable swift-crypto
     # Now apply a patch.
     patch -p1 -d .build/checkouts/swift-crypto -i ${./some-fix.patch}
+
+    runHook postConfigure
   '';
 }
 ```