From fdc094f69e8345a95df26af093adea2e18f5fb63 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 21 Nov 2019 22:19:01 +0100 Subject: php74: init at 7.4.0RC6 --- pkgs/development/interpreters/php/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 4778f08560df6..373cbae262a7f 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -4,7 +4,7 @@ , openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 -, libzip, valgrind +, libzip, valgrind, oniguruma }: with lib; @@ -78,6 +78,7 @@ let buildInputs = [ ] ++ optional (versionOlder version "7.3") pcre ++ optional (versionAtLeast version "7.3") pcre2 + ++ optional (versionAtLeast version "7.4") oniguruma ++ optional withSystemd systemd ++ optionals imapSupport [ uwimap openssl pam ] ++ optionals curlSupport [ curl openssl ] @@ -268,4 +269,16 @@ in { # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; + + php74 = let + version = "7.4.0RC6"; + sha256 = "1q20ax5mphypq7dwxd509lzca6m0rcxkzmcbkc6kg4bw6gvnjkyv"; + in (generic { + inherit version sha256; + }).overrideAttrs(oa: { + src = fetchurl { + url = "https://downloads.php.net/~derick/php-${version}.tar.bz2"; + inherit sha256; + }; + }); } -- cgit 1.4.1 From 80b12a60dff90bc43626cd6632437031f8ea476e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 27 Nov 2019 11:12:08 +0100 Subject: php74: 7.4.0RC6 -> 7.4.0 Changelog: https://www.php.net/ChangeLog-7.php#7.4.0 --- pkgs/development/interpreters/php/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 373cbae262a7f..97d5c0aabe8db 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -270,15 +270,8 @@ in { extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; - php74 = let - version = "7.4.0RC6"; - sha256 = "1q20ax5mphypq7dwxd509lzca6m0rcxkzmcbkc6kg4bw6gvnjkyv"; - in (generic { - inherit version sha256; - }).overrideAttrs(oa: { - src = fetchurl { - url = "https://downloads.php.net/~derick/php-${version}.tar.bz2"; - inherit sha256; - }; - }); + php74 = generic { + version = "7.4.0"; + sha256 = "1h01bahvcm9kgm5jqhm2j9k9d4q4rpfkkpqk00c47rirdblnn85z"; + }; } -- cgit 1.4.1 From a4cf20c68f81e331bd663fa4cb3d381145de501f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 1 Dec 2019 09:50:51 +0100 Subject: php74: Go through configuration options --- pkgs/development/interpreters/php/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 97d5c0aabe8db..a58025c42ac85 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -115,7 +115,8 @@ let "--with-config-file-scan-dir=/etc/php.d" ] ++ 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 (versions.majorMinor version == "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}" + ++ optional (versionAtLeast version "7.4") "--with-external-pcre=${pcre2.dev} PCRE_LIBDIR=${pcre2}" ++ optional stdenv.isDarwin "--with-iconv=${libiconv}" ++ optional withSystemd "--with-fpm-systemd" ++ optionals imapSupport [ @@ -134,10 +135,11 @@ let ++ optional mhashSupport "--with-mhash" ++ optional curlSupport "--with-curl=${curl.dev}" ++ optional zlibSupport "--with-zlib=${zlib.dev}" - ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}" + ++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}" ++ optional (!libxml2Support) [ "--disable-dom" "--disable-libxml" + (if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml") "--disable-simplexml" "--disable-xml" "--disable-xmlreader" @@ -157,7 +159,12 @@ let ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock" ++ optional bcmathSupport "--enable-bcmath" # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. - ++ optionals gdSupport [ + ++ optionals (gdSupport && versionAtLeast version "7.4") [ + "--enable-gd" + "--with-jpeg=${libjpeg.dev}" + "--with-freetype=${freetype.dev}" + "--enable-gd-jis-conv" + ] ++ optionals (gdSupport && versionOlder version "7.4") [ "--with-gd" "--with-freetype-dir=${freetype.dev}" "--with-png-dir=${libpng.dev}" @@ -174,7 +181,7 @@ let ++ optional xslSupport "--with-xsl=${libxslt.dev}" ++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}" ++ optional bz2Support "--with-bz2=${bzip2.dev}" - ++ optional zipSupport "--enable-zip" + ++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip" ++ optional ftpSupport "--enable-ftp" ++ optional fpmSupport "--enable-fpm" ++ optional ztsSupport "--enable-maintainer-zts" @@ -182,7 +189,7 @@ let ++ optional sodiumSupport "--with-sodium=${libsodium.dev}" ++ optional tidySupport "--with-tidy=${html-tidy}" ++ optional argon2Support "--with-password-argon2=${libargon2}" - ++ optional libzipSupport "--with-libzip=${libzip.dev}" + ++ optional (libzipSupport && (versionOlder version "7.4")) "--with-libzip=${libzip.dev}" ++ optional phpdbgSupport "--enable-phpdbg" ++ optional (!phpdbgSupport) "--disable-phpdbg" ++ optional (!cgiSupport) "--disable-cgi" -- cgit 1.4.1