Merge staging-next into staging

pkgs/development/interpreters/guile/default.nix

@@ -12,11 +12,11 @@
 
 (rec {
   name = "guile-${version}";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url = "mirror://gnu/guile/${name}.tar.xz";
-    sha256 = "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk";
+    sha256 = "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd";
   };
 
   outputs = [ "out" "dev" "info" ];
@@ -93,7 +93,7 @@
 
   meta = {
     description = "Embeddable Scheme implementation";
-    homepage    = https://www.gnu.org/software/guile/;
+    homepage    = "https://www.gnu.org/software/guile/";
     license     = stdenv.lib.licenses.lgpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
     platforms   = stdenv.lib.platforms.all;

pkgs/development/interpreters/php/default.nix

@@ -6,7 +6,8 @@
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
 , gd, freetype, libXpm, libjpeg, libpng, libwebp
-, libzip, valgrind, oniguruma
+, libzip, valgrind, oniguruma, symlinkJoin, writeText
+, makeWrapper, callPackage
 }:
 
 with lib;
@@ -255,7 +256,7 @@ let
         description = "An HTML-embedded scripting language";
         homepage = https://www.php.net/;
         license = licenses.php301;
-        maintainers = with maintainers; [ globin etu ];
+        maintainers = with maintainers; [ globin etu ma27 ];
         platforms = platforms.all;
         outputsToInstall = [ "out" "dev" ];
       };
@@ -268,24 +269,48 @@ let
 
     };
 
+    generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: {
+      passthru.buildEnv = { exts ? (_: []), extraConfig ? "" }: let
+        extraInit = writeText "custom-php.ini" ''
+          ${extraConfig}
+          ${concatMapStringsSep "\n" (ext: let
+            extName = lib.removePrefix "php-" (builtins.parseDrvName ext.name).name;
+            type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension";
+          in ''
+            ${type}=${ext}/lib/php/extensions/${extName}.so
+          '') (exts (callPackage ../../../top-level/php-packages.nix { inherit php; }))}
+        '';
+      in symlinkJoin {
+        name = "php-custom-${version}";
+        nativeBuildInputs = [ makeWrapper ];
+        paths = [ php ];
+        postBuild = ''
+          wrapProgram $out/bin/php \
+            --add-flags "-c ${extraInit}"
+          wrapProgram $out/bin/php-fpm \
+            --add-flags "-c ${extraInit}"
+        '';
+      };
+    });
+
 in {
-  php72 = generic {
-    version = "7.2.27";
-    sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v";
+  php72 = generic' {
+    version = "7.2.28";
+    sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
   };
 
-  php73 = generic {
-    version = "7.3.14";
-    sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr";
+  php73 = generic' {
+    version = "7.3.15";
+    sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
   };
 
-  php74 = generic {
+  php74 = generic' {
     version = "7.4.3";
     sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ=";
   };