From 47c4c68fdf2dc0711e2d5cb17405a931d4bbb141 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 15 May 2022 19:08:40 +0200 Subject: [PATCH] php: Remove fixes for abandoned PHP versions --- pkgs/development/php-packages/memcached/default.nix | 2 -- pkgs/development/php-packages/openswoole/default.nix | 1 - pkgs/development/php-packages/redis/default.nix | 2 -- pkgs/development/php-packages/snuffleupagus/default.nix | 2 -- pkgs/development/php-packages/swoole/default.nix | 1 - 5 files changed, 8 deletions(-) diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 5e56882c9d24..9724904d52b3 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -13,8 +13,6 @@ buildPecl rec { internalDeps = [ php.extensions.session - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - php.extensions.hash ]; configureFlags = [ diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index 49379dfd5413..d43ed40f8cee 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -9,7 +9,6 @@ buildPecl { sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; - internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; meta = with lib; { changelog = "https://pecl.php.net/package/openswoole/${version}"; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index 070112ba6552..e4b16dd991a7 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -10,8 +10,6 @@ buildPecl { session ] ++ lib.optionals (lib.versionOlder php.version "8.0") [ json - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - hash ]; meta = with lib; { diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix index 4318a49a8aa5..7a1c401b93aa 100644 --- a/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -22,8 +22,6 @@ buildPecl rec { internalDeps = with php.extensions; [ session - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - hash ]; patches = [ diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index 201b78e49663..fb69c18710a7 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -7,7 +7,6 @@ buildPecl { sha256 = "sha256-SnhDRC7/a7BTHn87c6YCz/R8jI6aES1ibSD6YAl6R+I="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; - internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; doCheck = true; checkTarget = "tests";