about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-11-03 00:13:27 +0000
committerGitHub <noreply@github.com>2017-11-03 00:13:27 +0000
commitddec346c63f5a121acc2e2a77c0a41dc554473b5 (patch)
tree94945300736efe08953e21622875a2073755a170 /pkgs
parent9caf89c9034cdc66779f7f583088e444a22e4057 (diff)
parent994cff67e34e909e5f5e2009aa13f1c21e6b2e5f (diff)
downloadnixlib-ddec346c63f5a121acc2e2a77c0a41dc554473b5.tar
nixlib-ddec346c63f5a121acc2e2a77c0a41dc554473b5.tar.gz
nixlib-ddec346c63f5a121acc2e2a77c0a41dc554473b5.tar.bz2
nixlib-ddec346c63f5a121acc2e2a77c0a41dc554473b5.tar.lz
nixlib-ddec346c63f5a121acc2e2a77c0a41dc554473b5.tar.xz
nixlib-ddec346c63f5a121acc2e2a77c0a41dc554473b5.tar.zst
nixlib-ddec346c63f5a121acc2e2a77c0a41dc554473b5.zip
Merge pull request #31158 from jbboehr/fix/php-redis-3.1.4-m
phpPackages.redis: rev 4a37e4 -> 3.1.4
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/php-packages.nix14
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 960de37332f6..f5b4d34b34e2 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -269,22 +269,16 @@ let
     buildInputs = [ pkgs.geoip ];
   };
 
-  redis = if isPhp7 then redisPhp7 else redis22;
+  redis = if isPhp7 then redis31 else redis22;
 
   redis22 = assert !isPhp7; buildPecl {
     name = "redis-2.2.7";
     sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm";
   };
 
-  # Not released yet
-  redisPhp7 = assert isPhp7; buildPecl rec {
-    name = "redis-php7";
-
-    src = fetchgit {
-      url = "https://github.com/phpredis/phpredis";
-      rev = "4a37e47d0256581ce2f7a3b15b5bb932add09f36";
-      sha256 = "1qm2ifa0zf95l1g967iiabmja17srpwz73lfci7z13ffdw1ayhfd";
-    };
+  redis31 = assert isPhp7; buildPecl {
+    name = "redis-3.1.4";
+    sha256 = "0rgjdrqfif8pfn3ipk1v4gyjkkdcdrdk479qbpda89w25vaxzsxd";
   };
 
   v8 = assert isPhp7; buildPecl rec {