feat: add PHP 8.4 packages

Author: gaelreyrol

flake.lock

@@ -18,6 +18,10 @@
       url = "github:php/php-src/PHP-8.3";
       flake = false;
     };
+    php-src-84 = {
+      url = "github:php/php-src/PHP-8.4";
+      flake = false;
+    };
   };
 
   outputs =

flake.nix

@@ -82,7 +82,7 @@ let
 
             dom = prevPO.extensions.dom.overrideAttrs (attrs: {
               NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE or "" + cflags;
-              patches = (patches.dom or [ ]) ++ attrs.patches;
+              patches = (patches.dom or [ ]) ++ (attrs.patches or []);
             });
 
             opcache = prevPO.extensions.opcache.overrideAttrs (attrs: {
@@ -144,12 +144,12 @@ let
 
             tokenizer = prevPO.extensions.tokenizer.overrideAttrs (attrs: {
               NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE or "" + cflags;
-              patches = [ ] ++ lib.optionals (lib.versionAtLeast prevPO.php.version "8.1") attrs.patches;
+              patches = [ ] ++ lib.optionals (lib.versionAtLeast prevPO.php.version "8.1") (attrs.patches or []);
             });
 
             sqlite3 = prevPO.extensions.sqlite3.overrideAttrs (attrs: {
               NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE or "" + cflags;
-              patches = (patches.sqlite3 or [ ]) ++ attrs.patches;
+              patches = (patches.sqlite3 or [ ]) ++ (attrs.patches or []);
             });
           };
         };

src/makePhpPackage.nix

@@ -52,6 +52,11 @@ let
       hash = "sha256-AcIM3hxaVpZlGHXtIvUHhJZ5+6dA+MQhYWt9Q9f3l9o=";
       extensions = extensions.php81-to-php8300;
     }
+    {
+      version = "8.4.2";
+      hash = "sha256-70/pkhuIXOOwR3kqtgJg6vZX4igSvlEdGdDkXt+YR4M=";
+      extensions = extensions.php-from-8400;
+    }
   ];
 in
 lib.mapAttrs (k: v: ((makePhpPackage v).withExtensions (v.extensions))) (makePackageSet versions)

src/overlays/active.nix

@@ -30,8 +30,13 @@ let
       src = inputs.php-src-83;
       extensions = extensions.php81-to-php8300;
     };
+    php-8-4-snapshot = {
+      version = "8.4.999-${inputs.php-src-84.shortRev}";
+      src = inputs.php-src-84;
+      extensions = extensions.php-from-8400;
+    };
     php-master-snapshot = {
-      version = "8.4.999-${inputs.php-src-master.shortRev}";
+      version = "8.5.999-${inputs.php-src-master.shortRev}";
       src = inputs.php-src-master;
       extensions = extensions.php-from-8400;
     };