diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 22 |
3 files changed, 16 insertions, 22 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4429742fbe6..cd4ad8b1a7a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -528,6 +528,11 @@ mapAliases ({ pgp-tools = signing-party; # added 2017-03-26 pg_tmp = ephemeralpg; # added 2018-01-16 + # Obsolete PHP version aliases + php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # added 2021-06-03 + php73Packages = php73; # added 2021-06-03 + php73Extensions = php73; # added 2021-06-03 + php-embed = throw '' php*-embed has been dropped, you can build something similar with the following snippet: @@ -541,8 +546,8 @@ mapAliases ({ similar with the following snippet: (php74.override { embedSupport = true; apxs2Support = false; }).packages ''; # added 2020-04-01 - php74Packages-embed = phpPackages-embed; php73Packages-embed = phpPackages-embed; + php74Packages-embed = phpPackages-embed; php-unit = throw '' php*-unit has been dropped, you can build something similar with @@ -571,8 +576,8 @@ mapAliases ({ fpmSupport = false; }).packages ''; # added 2020-04-01 - php74Packages-unit = phpPackages-unit; php73Packages-unit = phpPackages-unit; + php74Packages-unit = phpPackages-unit; pidgin-with-plugins = pidgin; # added 2016-06 pidginlatex = pidgin-latex; # added 2018-01-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70bfe841573..8a4661c18e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12306,13 +12306,6 @@ in php74Extensions = recurseIntoAttrs php74.extensions; php74Packages = recurseIntoAttrs php74.packages; - # Import PHP73 interpreter, extensions and packages - php73 = callPackage ../development/interpreters/php/7.3.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; - php73Extensions = recurseIntoAttrs php73.extensions; - php73Packages = recurseIntoAttrs php73.packages; - picoc = callPackage ../development/interpreters/picoc {}; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f7527d4df2a..e44efb0b952 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkg-config, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium -, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl +, html-tidy, libzip, zlib, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit , readline, rsync, fetchpatch, valgrind @@ -19,8 +19,6 @@ lib.makeScope pkgs.newScope (self: with self; { pname = "php-${pname}"; }); - pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; - php = phpPackage; # This is a set of interactive tools based on PHP. @@ -297,8 +295,8 @@ lib.makeScope pkgs.newScope (self: with self; { doCheck = false; } { name = "exif"; doCheck = false; } { name = "ffi"; buildInputs = [ libffi ]; enable = lib.versionAtLeast php.version "7.4"; } - { name = "fileinfo"; buildInputs = [ pcre' ]; } - { name = "filter"; buildInputs = [ pcre' ]; } + { name = "fileinfo"; buildInputs = [ pcre2 ]; } + { name = "filter"; buildInputs = [ pcre2 ]; } { name = "ftp"; buildInputs = [ openssl ]; } { name = "gd"; buildInputs = [ zlib gd ]; @@ -350,11 +348,10 @@ lib.makeScope pkgs.newScope (self: with self; { ]; doCheck = false; } { name = "imap"; - buildInputs = [ uwimap openssl pam pcre' ]; + buildInputs = [ uwimap openssl pam pcre2 ]; configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; # uwimap doesn't build on darwin. enable = (!stdenv.isDarwin); } - # interbase (7.3, 7.2) { name = "intl"; buildInputs = [ icu64 ]; patches = lib.optionals (lib.versionOlder php.version "7.4") [ @@ -377,7 +374,7 @@ lib.makeScope pkgs.newScope (self: with self; { ]; doCheck = false; } { name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ - pcre' + pcre2 ]; doCheck = false; } { name = "mysqli"; internalDeps = [ php.extensions.mysqlnd ]; @@ -425,7 +422,7 @@ lib.makeScope pkgs.newScope (self: with self; { # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre' ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [ + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; patches = lib.optionals (lib.versionOlder php.version "7.4") [ @@ -480,7 +477,7 @@ lib.makeScope pkgs.newScope (self: with self; { configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ]; doCheck = false; } { name = "pgsql"; - buildInputs = [ pcre' ]; + buildInputs = [ pcre2 ]; configureFlags = [ "--with-pgsql=${postgresql}" ]; doCheck = false; } { name = "posix"; doCheck = false; } @@ -493,11 +490,10 @@ lib.makeScope pkgs.newScope (self: with self; { ''; doCheck = false; } - # recode (7.3, 7.2) { name = "session"; doCheck = !(lib.versionAtLeast php.version "8.0"); } { name = "shmop"; } { name = "simplexml"; - buildInputs = [ libxml2 pcre' ]; + buildInputs = [ libxml2 pcre2 ]; configureFlags = [ "--enable-simplexml" ] # Required to build on darwin. ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } @@ -558,7 +554,7 @@ lib.makeScope pkgs.newScope (self: with self; { configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } { name = "zend_test"; } { name = "zip"; - buildInputs = [ libzip pcre' ]; + buildInputs = [ libzip pcre2 ]; configureFlags = [ "--with-zip" ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ] ++ lib.optionals (lib.versionOlder php.version "7.3") [ "--with-libzip" ]; |