diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix deleted file mode 100644 index ecf54354a8b7..000000000000 --- a/pkgs/development/interpreters/php/8.2.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ callPackage, ... }@_args: - -let - base = callPackage ./generic.nix ( - _args - // { - version = "8.2.30"; - hash = "sha256-EEggtsj8lZ3eSzNCE19CvavyRuhpGKFjgaF9hEfIZvo="; - } - ); -in -base.withExtensions ( - { all, ... }: - with all; - [ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - imap - 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 - ] -) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix deleted file mode 100644 index 5421559bc7f2..000000000000 --- a/pkgs/development/interpreters/php/8.3.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ callPackage, ... }@_args: - -let - base = callPackage ./generic.nix ( - _args - // { - version = "8.3.30"; - hash = "sha256-gAt7btULc8jueETuXy98xhL6p4daCqfEUp6O1YZqUDA="; - } - ); -in -base.withExtensions ( - { all, ... }: - with all; - [ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - imap - 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 - ] -) diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix deleted file mode 100644 index 3b1fcbd893c9..000000000000 --- a/pkgs/development/interpreters/php/8.4.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ callPackage, ... }@_args: - -let - base = callPackage ./generic.nix ( - _args - // { - version = "8.4.18"; - hash = "sha256-WGsy2Szrz7yklcX2rRozZAVT0KnAv9LmcVM02VnPmFg="; - } - ); -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 - ] -) diff --git a/pkgs/development/interpreters/php/8.5.nix b/pkgs/development/interpreters/php/8.5.nix deleted file mode 100644 index 6eecaf1b72cd..000000000000 --- a/pkgs/development/interpreters/php/8.5.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ callPackage, ... }@_args: - -let - base = callPackage ./generic.nix ( - _args - // { - version = "8.5.3"; - hash = "sha256-/F7KvBg862TZ/KPc04e9KbK2dEgyavmY/eADEkkWgjs="; - } - ); -in -base.withExtensions ( - { all, ... }: - with all; - [ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - intl - ldap - mbstring - mysqli - mysqlnd - 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 - ] -) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ba59bef5f802..4bc90e463d7c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,4 +1,5 @@ { + lib, callPackage, stdenv, llvmPackages, @@ -6,16 +7,81 @@ }: let - commonArgs = { - 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 - }; - }; + mkPhp = + { version, hash }: + let + base = callPackage ./generic.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 + }; + inherit version hash; + }; + in + base.withExtensions ( + { all, ... }: + with all; + [ + bcmath + calendar + curl + ctype + dom + exif + fileinfo + filter + ftp + gd + gettext + gmp + iconv + intl + ldap + mbstring + mysqli + mysqlnd + 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 + ] + ++ lib.optionals (lib.versionOlder version "8.4") [ all.imap ] + ++ lib.optionals (lib.versionOlder version "8.5") [ all.opcache ] + ); in { - php82 = callPackage ./8.2.nix commonArgs; - php83 = callPackage ./8.3.nix commonArgs; - php84 = callPackage ./8.4.nix commonArgs; - php85 = callPackage ./8.5.nix commonArgs; + php82 = mkPhp { + version = "8.2.30"; + hash = "sha256-EEggtsj8lZ3eSzNCE19CvavyRuhpGKFjgaF9hEfIZvo="; + }; + php83 = mkPhp { + version = "8.3.30"; + hash = "sha256-gAt7btULc8jueETuXy98xhL6p4daCqfEUp6O1YZqUDA="; + }; + php84 = mkPhp { + version = "8.4.18"; + hash = "sha256-WGsy2Szrz7yklcX2rRozZAVT0KnAv9LmcVM02VnPmFg="; + }; + php85 = mkPhp { + version = "8.5.3"; + hash = "sha256-/F7KvBg862TZ/KPc04e9KbK2dEgyavmY/eADEkkWgjs="; + }; } diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index d1891d56fabf..b40972d7696f 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -382,14 +382,14 @@ let jq ] } - new_version=$(curl --silent "https://www.php.net/releases/active" | jq --raw-output '."${lib.versions.major version}"."${lib.versions.majorMinor version}".version') + new_version=$(curl --silent "https://www.php.net/releases/active.php" | jq --raw-output '."${lib.versions.major version}"."${lib.versions.majorMinor version}".version') update-source-version "$UPDATE_NIX_ATTR_PATH.unwrapped" "$new_version" "--file=$1" ''; in [ script # Passed as an argument so that update.nix can ensure it does not become a store path. - (./. + "/${lib.versions.majorMinor version}.nix") + ./default.nix ]; buildEnv = mkBuildEnv { } [ ]; withExtensions = mkWithExtensions { } [ ];