git.iko.soy/typeable/nixpkgs
on master help sign in
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

commit80c7463a92d1fb2411868a5c8dfb324f75341c5c authorElis Hirwing <elis@hirwing.se> dateSun 9 Jun 2019, 18:52 (7 years ago) parentc40e872
5 files changed+5−95
nixos/doc/manual/release-notes/rl-1909.xml+5 pkgs/development/interpreters/php/default.nix−8 pkgs/development/interpreters/php/php71-darwin-isfinite.patch−60 pkgs/servers/http/unit/default.nix−3 pkgs/top-level/all-packages.nix−24
nixos/doc/manual/release-notes/rl-1909.xml+5
@@ -28,6 +28,11 @@
2828 PHP now defaults to PHP 7.3, updated from 7.2.
2929 </para>
3030 </listitem>
31+ <listitem>
32+ <para>
33+ PHP 7.1 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 19.09 release.
34+ </para>
35+ </listitem>
3136 </itemizedlist>
3237 </section>
3338
pkgs/development/interpreters/php/default.nix−8
@@ -253,14 +253,6 @@ let
253253 };
254254
255255in {
256− php71 = generic {
257− version = "7.1.30";
258− sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36";
259−
260− # https://bugs.php.net/bug.php?id=76826
261− extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
262− };
263−
264256 php72 = generic {
265257 version = "7.2.19";
266258 sha256 = "16d0j0d4563bcrxlw5yysldscxpgyp917hmc4m4ys1zyfprv3l7b";
pkgs/development/interpreters/php/php71-darwin-isfinite.patchdeleted−60
@@ -1,60 +0,0 @@
1−diff -ru a/Zend/configure.in b/Zend/configure.in
2−--- a/Zend/configure.in 2018-11-07 15:35:26.000000000 +0000
3−+++ b/Zend/configure.in 2018-11-27 00:28:48.000000000 +0000
4−@@ -70,7 +70,7 @@
5− #endif
6−
7− #ifndef zend_isnan
8−-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
9−+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
10− #define zend_isnan(a) isnan(a)
11− #elif defined(HAVE_FPCLASS)
12− #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
13−@@ -79,7 +79,7 @@
14− #endif
15− #endif
16−
17−-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
18−+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
19− #define zend_isinf(a) isinf(a)
20− #elif defined(INFINITY)
21− /* Might not work, but is required by ISO C99 */
22−@@ -90,7 +90,7 @@
23− #define zend_isinf(a) 0
24− #endif
25−
26−-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
27−+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
28− #define zend_finite(a) isfinite(a)
29− #elif defined(HAVE_FINITE)
30− #define zend_finite(a) finite(a)
31−diff -ru a/configure.in b/configure.in
32−--- a/configure.in 2018-11-07 15:35:26.000000000 +0000
33−+++ b/configure.in 2018-11-27 00:28:48.000000000 +0000
34−@@ -75,7 +75,7 @@
35− #endif
36−
37− #ifndef zend_isnan
38−-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
39−+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
40− #define zend_isnan(a) isnan(a)
41− #elif defined(HAVE_FPCLASS)
42− #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
43−@@ -84,7 +84,7 @@
44− #endif
45− #endif
46−
47−-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
48−+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
49− #define zend_isinf(a) isinf(a)
50− #elif defined(INFINITY)
51− /* Might not work, but is required by ISO C99 */
52−@@ -95,7 +95,7 @@
53− #define zend_isinf(a) 0
54− #endif
55−
56−-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
57−+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
58− #define zend_finite(a) isfinite(a)
59− #elif defined(HAVE_FINITE)
60− #define zend_finite(a) finite(a)
pkgs/servers/http/unit/default.nix−3
@@ -1,6 +1,5 @@
11{ stdenv, fetchFromGitHub, which
22, withPython ? true, python
3−, withPHP71 ? false, php71
43, withPHP72 ? true, php72
54, withPHP73 ? false, php73
65, withPerl ? true, perl
@@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
3029
3130 buildInputs = [ ]
3231 ++ optional withPython python
33− ++ optional withPHP71 php71
3432 ++ optional withPHP72 php72
3533 ++ optional withPHP73 php73
3634 ++ optional withPerl perl
@@ -51,7 +49,6 @@ stdenv.mkDerivation rec {
5149
5250 postConfigure = ''
5351 ${optionalString withPython "./configure python --module=python --config=${python}/bin/python-config --lib-path=${python}/lib"}
54− ${optionalString withPHP71 "./configure php --module=php71 --config=${php71.dev}/bin/php-config --lib-path=${php71}/lib"}
5552 ${optionalString withPHP72 "./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib"}
5653 ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"}
5754 ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"}
pkgs/top-level/all-packages.nix−24
@@ -8438,10 +8438,6 @@ in
84388438 php = php73;
84398439 phpPackages = php73Packages;
84408440
8441− php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
8442− php = php71;
8443− });
8444−
84458441 php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
84468442 php = php72;
84478443 });
@@ -8452,10 +8448,6 @@ in
84528448
84538449 phpPackages-unit = php72Packages-unit;
84548450
8455− php71Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
8456− php = php71-unit;
8457− });
8458−
84598451 php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
84608452 php = php72-unit;
84618453 });
@@ -8467,17 +8459,11 @@ in
84678459 inherit (callPackages ../development/interpreters/php {
84688460 stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
84698461 })
8470− php71
84718462 php72
84728463 php73;
84738464
84748465 php-embed = php73-embed;
84758466
8476− php71-embed = php71.override {
8477− config.php.embed = true;
8478− config.php.apxs2 = false;
8479− };
8480−
84818467 php72-embed = php72.override {
84828468 config.php.embed = true;
84838469 config.php.apxs2 = false;
@@ -8490,15 +8476,6 @@ in
84908476
84918477 php-unit = php73-unit;
84928478
8493− php71-unit = php71.override {
8494− config.php.embed = true;
8495− config.php.apxs2 = false;
8496− config.php.systemd = false;
8497− config.php.phpdbg = false;
8498− config.php.cgi = false;
8499− config.php.fpm = false;
8500− };
8501−
85028479 php72-unit = php72.override {
85038480 config.php.embed = true;
85048481 config.php.apxs2 = false;
@@ -14411,7 +14388,6 @@ in
1441114388 neard = callPackage ../servers/neard { };
1441214389
1441314390 unit = callPackage ../servers/http/unit {
14414− php71 = php71-unit;
1441514391 php72 = php72-unit;
1441614392 php73 = php73-unit;
1441714393 };