Update redis to 3.0.2 (now that 3 is stable, squash it into default)

include fix for http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/

2 files changed, 3 insertions, 25 deletions

diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix
deleted file mode 100644
index 0e7a7d0f2507..000000000000
--- a/pkgs/servers/nosql/redis/3.0.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  version = "3.0.1";
-  name = "redis-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/antirez/redis/archive/${version}.tar.gz";
-    sha256 = "1m34s60qvj1xyqw7x7ar0graw52wypx47dhvfb0br67vfb62l8sl";
-  };
-
-  makeFlags = "PREFIX=$(out)";
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://redis.io;
-    description = "An open source, advanced key-value store";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.berdario ];
-  };
-}
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 833a17246fc9..6da7ec11e7c6 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "redis-2.8.19";
+  version = "3.0.2";
+  name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145";
+    sha256 = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f";
   };
 
   makeFlags = "PREFIX=$(out)";