diff options
author | Elis Hirwing <elis@hirwing.se> | 2021-06-03 15:06:06 +0200 |
---|---|---|
committer | Elis Hirwing <elis@hirwing.se> | 2021-06-04 09:26:54 +0200 |
commit | 68eb5305ac93adb1cce777c0ae73fd29eccb6973 (patch) | |
tree | b5094ede67986e0d787ac0da47f2a0a31125fd69 /pkgs/development/php-packages | |
parent | 42e9a2ccfab2a96d28c3c164a6cf41fb6f769de5 (diff) | |
download | nixpkgs-68eb5305ac93adb1cce777c0ae73fd29eccb6973.tar nixpkgs-68eb5305ac93adb1cce777c0ae73fd29eccb6973.tar.gz nixpkgs-68eb5305ac93adb1cce777c0ae73fd29eccb6973.tar.bz2 nixpkgs-68eb5305ac93adb1cce777c0ae73fd29eccb6973.tar.lz nixpkgs-68eb5305ac93adb1cce777c0ae73fd29eccb6973.tar.xz nixpkgs-68eb5305ac93adb1cce777c0ae73fd29eccb6973.tar.zst nixpkgs-68eb5305ac93adb1cce777c0ae73fd29eccb6973.zip |
php: Drop PHP 7.3 support
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.
Diffstat (limited to 'pkgs/development/php-packages')
11 files changed, 31 insertions, 50 deletions
diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 3301d949c22..5aa8b2b4f9b 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pcre' }: +{ buildPecl, lib, pcre2 }: buildPecl { pname = "apcu"; @@ -6,7 +6,7 @@ buildPecl { version = "5.1.20"; sha256 = "sha256-uZ1A+v7Ab00TL87lPnUm3b/B0EHqbgThc4nfrSj5w5A="; - buildInputs = [ pcre' ]; + buildInputs = [ pcre2 ]; doCheck = true; checkTarget = "test"; checkFlagsArray = [ "REPORT_EXIT_STATUS=1" "NO_INTERACTION=1" ]; diff --git a/pkgs/development/php-packages/apcu_bc/default.nix b/pkgs/development/php-packages/apcu_bc/default.nix index a9c34a8d778..448c25bee64 100644 --- a/pkgs/development/php-packages/apcu_bc/default.nix +++ b/pkgs/development/php-packages/apcu_bc/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pcre', php }: +{ buildPecl, lib, pcre2, php }: buildPecl { pname = "apcu_bc"; @@ -8,7 +8,7 @@ buildPecl { peclDeps = [ php.extensions.apcu ]; - buildInputs = [ pcre' ]; + buildInputs = [ pcre2 ]; postInstall = '' mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index ebff9b00f02..744ba2302f7 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre' }: +{ buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre2 }: buildPecl { pname = "imagick"; @@ -21,7 +21,7 @@ buildPecl { configureFlags = [ "--with-imagick=${imagemagick.dev}" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre' ]; + buildInputs = [ pcre2 ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 95e51892f04..d0e5e545f6b 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPecl, lib, pcre', pkg-config, cyrus_sasl, icu64 +{ stdenv, buildPecl, lib, pcre2, pkg-config, cyrus_sasl, icu64 , openssl, snappy, zlib, darwin }: buildPecl { @@ -14,7 +14,7 @@ buildPecl { openssl snappy zlib - pcre' + pcre2 ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 1422e1b176d..0583f776e56 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pcre' }: +{ buildPecl, lib, pcre2 }: buildPecl { pname = "pcov"; @@ -6,7 +6,7 @@ buildPecl { version = "1.0.8"; sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ="; - buildInputs = [ pcre' ]; + buildInputs = [ pcre2 ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index 0880c2a46e2..4c1b42183ba 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -1,24 +1,15 @@ { buildPecl, lib, fetchFromGitHub, php }: -let - pname = "pinba"; - - isPhp73 = lib.versionAtLeast php.version "7.3"; - version = if isPhp73 then "1.1.2-dev" else "1.1.1"; +buildPecl { + pname = "pinba"; + version = "1.1.2-dev"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "tony2001"; repo = "pinba_extension"; - } // (if (isPhp73) then { rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; - } else { - rev = "RELEASE_1_1_1"; - sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; - })); -in -buildPecl { - inherit pname version src; + }; meta = with lib; { description = "PHP extension for Pinba"; diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index e2ef068120d..2112e84cfff 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pcre', fetchpatch }: +{ buildPecl, lib, pcre2, fetchpatch }: buildPecl { pname = "protobuf"; @@ -6,7 +6,7 @@ buildPecl { version = "3.14.0"; sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd"; - buildInputs = [ pcre' ]; + buildInputs = [ pcre2 ]; patches = [ # TODO: remove with next update diff --git a/pkgs/development/php-packages/pthreads/default.nix b/pkgs/development/php-packages/pthreads/default.nix index 31b32e82967..c1aac8c8424 100644 --- a/pkgs/development/php-packages/pthreads/default.nix +++ b/pkgs/development/php-packages/pthreads/default.nix @@ -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; } diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index 0e78d3bbc97..c8dea9463d6 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, rdkafka, pcre' }: +{ buildPecl, lib, rdkafka, pcre2 }: buildPecl { pname = "rdkafka"; @@ -6,7 +6,7 @@ buildPecl { version = "5.0.0"; sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs="; - buildInputs = [ rdkafka pcre' ]; + buildInputs = [ rdkafka pcre2 ]; postPhpize = '' substituteInPlace configure \ diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix index 222a243606f..4318a49a8aa 100644 --- a/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -2,7 +2,7 @@ , lib , php , fetchFromGitHub -, pcre' +, pcre2 , fetchpatch }: @@ -17,7 +17,7 @@ buildPecl rec { }; buildInputs = [ - pcre' + pcre2 ]; internalDeps = with php.extensions; [ diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index b3d43acd1b3..ef228c2ddc3 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPecl, php, valgrind, pcre' }: +{ lib, buildPecl, php, valgrind, pcre2 }: buildPecl { pname = "swoole"; @@ -6,7 +6,7 @@ buildPecl { version = "4.6.4"; sha256 = "0hgndnn27q7fbsb0nw6bfdg0kyy5di9vrmf7g53jc6lsnf73ha31"; - buildInputs = [ valgrind pcre' ]; + buildInputs = [ valgrind pcre2 ]; internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; doCheck = true; |