php85: init at 8.5.1

pkgs/by-name/bl/blackfire/package.nix

@@ -7,6 +7,7 @@
   curl,
   jq,
   common-updater-scripts,
+  php,
 }:
 
 stdenv.mkDerivation rec {
@@ -115,5 +116,6 @@ stdenv.mkDerivation rec {
       "x86_64-darwin"
       "aarch64-darwin"
     ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/interpreters/php/8.5.nix

@@ -0,0 +1,58 @@
+{ callPackage, ... }@_args:
+
+let
+  base = callPackage ./generic.nix (
+    _args
+    // {
+      version = "8.5.1";
+      hash = "sha256-VfQoxCbnJBdS6pr/8WC7ZMMqkyHL1tF9HBRbjfiCNzc=";
+    }
+  );
+in
+base.withExtensions (
+  { all, ... }:
+  with all;
+  [
+    bcmath
+    calendar
+    curl
+    ctype
+    dom
+    exif
+    fileinfo
+    filter
+    ftp
+    gd
+    gettext
+    gmp
+    iconv
+    intl
+    ldap
+    mbstring
+    mysqli
+    mysqlnd
+    opcache
+    openssl
+    pcntl
+    pdo
+    pdo_mysql
+    pdo_odbc
+    pdo_pgsql
+    pdo_sqlite
+    pgsql
+    posix
+    readline
+    session
+    simplexml
+    sockets
+    soap
+    sodium
+    sysvsem
+    sqlite3
+    tokenizer
+    xmlreader
+    xmlwriter
+    zip
+    zlib
+  ]
+)

pkgs/development/interpreters/php/generic.nix

@@ -133,7 +133,8 @@ let
                   type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension";
                 in
                 lib.nameValuePair extName {
-                  text = "${type}=${ext}/lib/php/extensions/${extName}.so";
+                  text = lib.optionalString (ext.includeInPHPIniFile or true
+                  ) "${type}=${ext}/lib/php/extensions/${extName}.so";
                   deps = map getExtName phpDeps;
                 }
               ) (enabledExtensions ++ (getDepsRecursively enabledExtensions))

pkgs/development/php-packages/amqp/default.nix

@@ -3,6 +3,7 @@
   lib,
   rabbitmq-c,
   fetchFromGitHub,
+  php,
 }:
 
 let
@@ -29,5 +30,6 @@ buildPecl {
     license = lib.licenses.php301;
     homepage = "https://github.com/php-amqp/php-amqp";
     teams = [ lib.teams.php ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/apcu/default.nix

@@ -3,6 +3,7 @@
   lib,
   pcre2,
   fetchFromGitHub,
+  php,
 }:
 
 let
@@ -15,8 +16,8 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "krakjoe";
     repo = "apcu";
-    rev = "v${version}";
-    sha256 = "sha256-kf1d+WLpwhzQVn9pnkXtPPTXI5XaAuIAReI6rDGypB8=";
+    tag = "v${version}";
+    hash = "sha256-kf1d+WLpwhzQVn9pnkXtPPTXI5XaAuIAReI6rDGypB8=";
   };
 
   buildInputs = [ pcre2 ];
@@ -33,5 +34,6 @@ buildPecl {
     homepage = "https://pecl.php.net/package/APCu";
     license = lib.licenses.php301;
     teams = [ lib.teams.php ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/ast/default.nix

@@ -2,6 +2,7 @@
   buildPecl,
   lib,
   fetchFromGitHub,
+  php,
 }:
 
 let
@@ -24,5 +25,6 @@ buildPecl {
     license = lib.licenses.bsd3;
     homepage = "https://pecl.php.net/package/ast";
     teams = [ lib.teams.php ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/gnupg/default.nix

@@ -52,7 +52,7 @@ buildPecl {
 
   meta = {
     changelog = "https://github.com/php-gnupg/php-gnupg/releases/tag/gnupg-${version}";
-    broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1.
+    broken = lib.versionOlder php.version "8.1" || lib.versionAtLeast php.version "8.5";
     description = "PHP wrapper for GpgME library that provides access to GnuPG";
     license = lib.licenses.bsd3;
     homepage = "https://pecl.php.net/package/gnupg";

pkgs/development/php-packages/imap/default.nix

@@ -9,6 +9,7 @@
   pcre2,
   pkg-config,
   uwimap,
+  php,
 }:
 
 let
@@ -56,5 +57,6 @@ buildPecl {
     homepage = "https://pecl.php.net/package/imap";
     license = lib.licenses.php301;
     teams = [ lib.teams.php ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/ioncube-loader/default.nix

@@ -54,5 +54,6 @@ stdenv.mkDerivation {
       "aarch64-linux"
       "aarch64-darwin"
     ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/openswoole/default.nix

@@ -35,6 +35,6 @@ buildPecl {
       You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process.
     '';
     teams = [ lib.teams.php ];
-    broken = lib.versionOlder php.version "8.2";
+    broken = lib.versionOlder php.version "8.2" || lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/pdo_oci/default.nix

@@ -25,5 +25,6 @@ buildPecl {
     license = lib.licenses.php301;
     homepage = "https://pecl.php.net/package/pdo_oci";
     teams = [ lib.teams.php ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/pdo_sqlsrv/default.nix

@@ -22,5 +22,6 @@ buildPecl {
     license = lib.licenses.mit;
     homepage = "https://github.com/Microsoft/msphpsql";
     teams = [ lib.teams.php ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/phan/default.nix

@@ -29,5 +29,6 @@
       mainProgram = "phan";
       maintainers = with lib.maintainers; [ apeschar ];
       teams = [ lib.teams.php ];
+      broken = lib.versionAtLeast php.version "8.5";
     };
   })

pkgs/development/php-packages/spx/default.nix

@@ -3,6 +3,7 @@
   lib,
   fetchFromGitHub,
   zlib,
+  php,
 }:
 
 let
@@ -15,7 +16,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "NoiseByNorthwest";
     repo = "php-spx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P53g/o4i+QETWdErZaGA3AREvnr8kL9h0B1BMQlKdFA=";
   };
 
@@ -30,5 +31,6 @@ buildPecl {
     homepage = "https://github.com/NoiseByNorthwest/php-spx";
     license = lib.licenses.php301;
     maintainers = with lib.maintainers; [ piotrkwiecinski ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/development/php-packages/swoole/default.nix

@@ -33,5 +33,6 @@ buildPecl {
     homepage = "https://www.swoole.com";
     license = lib.licenses.asl20;
     teams = [ lib.teams.php ];
+    broken = lib.versionAtLeast php.version "8.5";
   };
 }

pkgs/top-level/all-packages.nix

@@ -5573,6 +5573,16 @@ with pkgs;
   phpExtensions = recurseIntoAttrs php.extensions;
   phpPackages = recurseIntoAttrs php.packages;
 
+  # Import PHP85 interpreter, extensions and packages
+  php85 = callPackage ../development/interpreters/php/8.5.nix {
+    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
+    pcre2 = pcre2.override {
+      withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630
+    };
+  };
+  php85Extensions = recurseIntoAttrs php85.extensions;
+  php85Packages = recurseIntoAttrs php85.packages;
+
   # Import PHP84 interpreter, extensions and packages
   php84 = callPackage ../development/interpreters/php/8.4.nix {
     stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;