From 80c7463a92d1fb2411868a5c8dfb324f75341c5c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 9 Jun 2019 18:52:03 +0200 Subject: [PATCH] php: drop 7.1 PHP 7.1 is currently on life support, as in only recieving security related patches. This will only continue until: 2019-12-01 This date are in the middle of the 19.09 lifecycle. So it would be nice to not have it in the 19.09 stable release. Dropping it now would also result in less maintanance in updating them. The death dates can be seen on following links: - https://endoflife.date/php - https://php.net/supported-versions.php - https://en.wikipedia.org/wiki/PHP#Release_history --- nixos/doc/manual/release-notes/rl-1909.xml | 5 ++ pkgs/development/interpreters/php/default.nix | 8 --- .../php/php71-darwin-isfinite.patch | 60 ------------------- pkgs/servers/http/unit/default.nix | 3 - pkgs/top-level/all-packages.nix | 24 -------- 5 files changed, 5 insertions(+), 95 deletions(-) delete mode 100644 pkgs/development/interpreters/php/php71-darwin-isfinite.patch diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 46964eb1cd15..b84d3136b079 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -28,6 +28,11 @@ PHP now defaults to PHP 7.3, updated from 7.2. + + + PHP 7.1 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 19.09 release. + + diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index a4a0b41210a4..089a1ac4afd8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -253,14 +253,6 @@ let }; in { - php71 = generic { - version = "7.1.30"; - sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36"; - - # https://bugs.php.net/bug.php?id=76826 - extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch; - }; - php72 = generic { version = "7.2.19"; sha256 = "16d0j0d4563bcrxlw5yysldscxpgyp917hmc4m4ys1zyfprv3l7b"; diff --git a/pkgs/development/interpreters/php/php71-darwin-isfinite.patch b/pkgs/development/interpreters/php/php71-darwin-isfinite.patch deleted file mode 100644 index ebfcd94f8d4b..000000000000 --- a/pkgs/development/interpreters/php/php71-darwin-isfinite.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ru a/Zend/configure.in b/Zend/configure.in ---- a/Zend/configure.in 2018-11-07 15:35:26.000000000 +0000 -+++ b/Zend/configure.in 2018-11-27 00:28:48.000000000 +0000 -@@ -70,7 +70,7 @@ - #endif - - #ifndef zend_isnan --#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L) -+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L) - #define zend_isnan(a) isnan(a) - #elif defined(HAVE_FPCLASS) - #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) -@@ -79,7 +79,7 @@ - #endif - #endif - --#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L) -+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L) - #define zend_isinf(a) isinf(a) - #elif defined(INFINITY) - /* Might not work, but is required by ISO C99 */ -@@ -90,7 +90,7 @@ - #define zend_isinf(a) 0 - #endif - --#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L) -+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L) - #define zend_finite(a) isfinite(a) - #elif defined(HAVE_FINITE) - #define zend_finite(a) finite(a) -diff -ru a/configure.in b/configure.in ---- a/configure.in 2018-11-07 15:35:26.000000000 +0000 -+++ b/configure.in 2018-11-27 00:28:48.000000000 +0000 -@@ -75,7 +75,7 @@ - #endif - - #ifndef zend_isnan --#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L) -+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L) - #define zend_isnan(a) isnan(a) - #elif defined(HAVE_FPCLASS) - #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) -@@ -84,7 +84,7 @@ - #endif - #endif - --#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L) -+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L) - #define zend_isinf(a) isinf(a) - #elif defined(INFINITY) - /* Might not work, but is required by ISO C99 */ -@@ -95,7 +95,7 @@ - #define zend_isinf(a) 0 - #endif - --#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L) -+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L) - #define zend_finite(a) isfinite(a) - #elif defined(HAVE_FINITE) - #define zend_finite(a) finite(a) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 3f0567695fb8..39b9b31f7f0a 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, which , withPython ? true, python -, withPHP71 ? false, php71 , withPHP72 ? true, php72 , withPHP73 ? false, php73 , withPerl ? true, perl @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optional withPython python - ++ optional withPHP71 php71 ++ optional withPHP72 php72 ++ optional withPHP73 php73 ++ optional withPerl perl @@ -51,7 +49,6 @@ stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython "./configure python --module=python --config=${python}/bin/python-config --lib-path=${python}/lib"} - ${optionalString withPHP71 "./configure php --module=php71 --config=${php71.dev}/bin/php-config --lib-path=${php71}/lib"} ${optionalString withPHP72 "./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib"} ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"} ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b4ede9c53bf..951d4cad4d81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8438,10 +8438,6 @@ in php = php73; phpPackages = php73Packages; - php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php71; - }); - php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php72; }); @@ -8452,10 +8448,6 @@ in phpPackages-unit = php72Packages-unit; - php71Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php71-unit; - }); - php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { php = php72-unit; }); @@ -8467,17 +8459,11 @@ in inherit (callPackages ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }) - php71 php72 php73; php-embed = php73-embed; - php71-embed = php71.override { - config.php.embed = true; - config.php.apxs2 = false; - }; - php72-embed = php72.override { config.php.embed = true; config.php.apxs2 = false; @@ -8490,15 +8476,6 @@ in php-unit = php73-unit; - php71-unit = php71.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; - }; - php72-unit = php72.override { config.php.embed = true; config.php.apxs2 = false; @@ -14411,7 +14388,6 @@ in neard = callPackage ../servers/neard { }; unit = callPackage ../servers/http/unit { - php71 = php71-unit; php72 = php72-unit; php73 = php73-unit; };