diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-10 23:35:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 23:35:20 +0200 |
| commit | 5428974aa3c76ba7f294db27376c45897071e6c3 (patch) | |
| tree | 3437620ac334c01841764cdd1b1764aff422f267 /pkgs/development | |
| parent | 7b1b874e61a9e96ba48e6e8a1ae5de2cb2445119 (diff) | |
| parent | 6be7d1c176b80d8fb4e7e0b4c699cbd300d8ef61 (diff) | |
| download | nixpkgs-5428974aa3c76ba7f294db27376c45897071e6c3.tar nixpkgs-5428974aa3c76ba7f294db27376c45897071e6c3.tar.gz nixpkgs-5428974aa3c76ba7f294db27376c45897071e6c3.tar.bz2 nixpkgs-5428974aa3c76ba7f294db27376c45897071e6c3.tar.lz nixpkgs-5428974aa3c76ba7f294db27376c45897071e6c3.tar.xz nixpkgs-5428974aa3c76ba7f294db27376c45897071e6c3.tar.zst nixpkgs-5428974aa3c76ba7f294db27376c45897071e6c3.zip | |
Merge pull request #95101 from etu/php72-drop-support
php: Drop PHP 7.2 support
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/php72-darwin-isfinite.patch | 62 |
2 files changed, 1 insertions, 72 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 6e11b02611f..53d435ebb82 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -267,14 +267,6 @@ let }; }; - php72base = callPackage generic (_args // { - version = "7.2.32"; - sha256 = "19wqbpvsd6c6iaad00h0m0xnx4r8fj56pwfhki2cw5xdfi10lp3i"; - - # https://bugs.php.net/bug.php?id=76826 - extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; - }); - php73base = callPackage generic (_args // { version = "7.3.20"; sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6"; @@ -301,8 +293,7 @@ let php74 = php74base.withExtensions defaultPhpExtensions; php73 = php73base.withExtensions defaultPhpExtensionsWithHash; - php72 = php72base.withExtensions defaultPhpExtensionsWithHash; in { - inherit php72 php73 php74; + inherit php73 php74; } diff --git a/pkgs/development/interpreters/php/php72-darwin-isfinite.patch b/pkgs/development/interpreters/php/php72-darwin-isfinite.patch deleted file mode 100644 index ea2e3e28f2c..00000000000 --- a/pkgs/development/interpreters/php/php72-darwin-isfinite.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/Zend/configure.ac b/Zend/configure.ac -index b95c1360b8..fe16c86007 100644 ---- a/Zend/configure.ac -+++ b/Zend/configure.ac -@@ -60,7 +60,7 @@ int zend_sprintf(char *buffer, const char *format, ...); - #include <math.h> - - #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)) -@@ -69,7 +69,7 @@ int zend_sprintf(char *buffer, const char *format, ...); - #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 */ -@@ -80,7 +80,7 @@ int zend_sprintf(char *buffer, const char *format, ...); - #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/configure.ac b/configure.ac -index d3f3cacd07..ddbf712ba2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -68,7 +68,7 @@ int zend_sprintf(char *buffer, const char *format, ...); - #include <math.h> - - #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)) -@@ -77,7 +77,7 @@ int zend_sprintf(char *buffer, const char *format, ...); - #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 */ -@@ -88,7 +88,7 @@ int zend_sprintf(char *buffer, const char *format, ...); - #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) |