diff options
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 26 |
2 files changed, 42 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 67ba470ac01..25c9dfe320f 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,9 +1,9 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix { lib, stdenv, fetchurl, flex, bison, autoconf , mysql, libxml2, readline, zlib, curl, postgresql, gettext -, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype +, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds -, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 +, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip }: with lib; @@ -42,7 +42,7 @@ let , intlSupport ? config.php.intl or true , exifSupport ? config.php.exif or true , xslSupport ? config.php.xsl or false - , mcryptSupport ? config.php.mcrypt or true + , mcryptSupport ? (config.php.mcrypt or true) && (versionOlder version "7.2") , bz2Support ? config.php.bz2 or false , zipSupport ? config.php.zip or true , ftpSupport ? config.php.ftp or true @@ -54,6 +54,7 @@ let , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2") , tidySupport ? (config.php.tidy or false) , argon2Support ? (config.php.argon2 or true) && (versionAtLeast version "7.2") + , libzipSupport ? (config.php.libzip or true) && (versionAtLeast version "7.3") }: let @@ -68,7 +69,9 @@ let enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig autoconf ]; - buildInputs = [ flex bison pcre ] + buildInputs = [ flex bison ] + ++ optional (versionOlder version "7.3") pcre + ++ optional (versionAtLeast version "7.3") pcre2 ++ optional withSystemd systemd ++ optionals imapSupport [ uwimap openssl pam ] ++ optionals curlSupport [ curl openssl ] @@ -96,15 +99,16 @@ let ++ optional (mssqlSupport && !stdenv.isDarwin) freetds ++ optional sodiumSupport libsodium ++ optional tidySupport html-tidy - ++ optional argon2Support libargon2; + ++ optional argon2Support libargon2 + ++ optional libzipSupport libzip; CXXFLAGS = optional stdenv.cc.isClang "-std=c++11"; - configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" - "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}" ] + ++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}" + ++ optional (versionAtLeast version "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}" ++ optional stdenv.isDarwin "--with-iconv=${libiconv}" ++ optional withSystemd "--with-fpm-systemd" ++ optionals imapSupport [ @@ -163,8 +167,8 @@ let ++ optional calendarSupport "--enable-calendar" ++ optional sodiumSupport "--with-sodium=${libsodium.dev}" ++ optional tidySupport "--with-tidy=${html-tidy}" - ++ optional argon2Support "--with-password-argon2=${libargon2}"; - + ++ optional argon2Support "--with-password-argon2=${libargon2}" + ++ optional libzipSupport "--with-libzip=${libzip.dev}"; hardeningDisable = [ "bindnow" ]; @@ -242,4 +246,9 @@ in { # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; + + php73 = generic { + version = "7.3.0"; + sha256 = "0rvwx37dsmxivgrf4wfc1y778iln498c6a40biy9k6lnr6p7s9ks"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6d4f349002..d3444f4b506 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7835,18 +7835,28 @@ in php = php72; }); + php73Packages = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php73; + }); + phpPackages-unit = php72Packages-unit; php71Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { php = php71-unit; }); - php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { + + php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { php = php72-unit; }); + php73Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php73-unit; + }); + inherit (callPackages ../development/interpreters/php { }) php71 - php72; + php72 + php73; php-embed = php72-embed; @@ -7860,6 +7870,11 @@ in config.php.apxs2 = false; }; + php73-embed = php73.override { + config.php.embed = true; + config.php.apxs2 = false; + }; + php-unit = php72-unit; php71-unit = php71.override { @@ -7876,6 +7891,13 @@ in config.php.fpm = false; }; + php73-unit = php73.override { + config.php.embed = true; + config.php.apxs2 = false; + config.php.systemd = false; + config.php.fpm = false; + }; + picoc = callPackage ../development/interpreters/picoc {}; picolisp = callPackage ../development/interpreters/picolisp {}; |