PHP 7.3 won't be supported by upstream for the entire life cycle of the 21.11 release. Also drop the pcre' alias since it isn't needed anymore since we don't need different pcre versions anymore.launchpad/nixpkgs/master
parent
42e9a2ccfa
commit
68eb5305ac
@ -1,20 +0,0 @@ |
||||
{ callPackage, lib, stdenv, nixosTests, ... }@_args: |
||||
|
||||
let |
||||
generic = (import ./generic.nix) _args; |
||||
|
||||
base = callPackage generic (_args // { |
||||
version = "7.3.28"; |
||||
sha256 = "0r4r8famg3a8x6ch24y1370nsphkxg4k9zq5x8v88f4l8mj6wqwg"; |
||||
|
||||
# https://bugs.php.net/bug.php?id=76826 |
||||
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; |
||||
}); |
||||
|
||||
in base.withExtensions ({ all, ... }: with all; ([ |
||||
bcmath calendar curl ctype dom exif fileinfo filter ftp gd |
||||
gettext gmp hash iconv intl json ldap mbstring mysqli mysqlnd |
||||
opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite |
||||
pgsql posix readline session simplexml sockets soap sodium sqlite3 |
||||
tokenizer xmlreader xmlwriter zip zlib |
||||
] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) |
@ -1,60 +0,0 @@ |
||||
diff -ru a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2018-12-04 19:12:20.000000000 +0300
|
||||
+++ b/configure.ac 2018-12-10 12:30:37.798917520 +0300
|
||||
@@ -68,7 +68,7 @@
|
||||
#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 @@
|
||||
#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 @@
|
||||
#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/Zend/configure.ac b/Zend/configure.ac
|
||||
--- a/Zend/configure.ac 2018-12-04 19:12:30.000000000 +0300
|
||||
+++ b/Zend/configure.ac 2018-12-10 12:28:50.350929699 +0300
|
||||
@@ -59,7 +59,7 @@
|
||||
#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))
|
||||
@@ -68,7 +68,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 */
|
||||
@@ -79,7 +79,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)
|
@ -1,28 +1,18 @@ |
||||
{ buildPecl, lib, fetchFromGitHub, php, pcre' }: |
||||
let |
||||
pname = "pthreads"; |
||||
|
||||
isPhp73 = lib.versionAtLeast php.version "7.3"; |
||||
isPhp74 = lib.versionAtLeast php.version "7.4"; |
||||
{ buildPecl, lib, fetchFromGitHub, php, pcre2 }: |
||||
|
||||
version = if isPhp73 then "3.2.0-dev" else "3.2.0"; |
||||
buildPecl { |
||||
pname = "pthreads"; |
||||
version = "3.2.0-dev"; |
||||
|
||||
src = fetchFromGitHub ({ |
||||
src = fetchFromGitHub { |
||||
owner = "krakjoe"; |
||||
repo = "pthreads"; |
||||
} // (if (isPhp73) then { |
||||
rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; |
||||
sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; |
||||
} else { |
||||
rev = "v3.2.0"; |
||||
sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; |
||||
})); |
||||
in |
||||
buildPecl { |
||||
inherit pname version src; |
||||
}; |
||||
|
||||
buildInputs = [ pcre'.dev ]; |
||||
buildInputs = [ pcre2.dev ]; |
||||
|
||||
meta.broken = isPhp74; |
||||
meta.broken = lib.versionAtLeast php.version "7.4"; |
||||
meta.maintainers = lib.teams.php.members; |
||||
} |
||||
|
Loading…
Reference in new issue