Merge pull request #8176 from berdario/redis-3.0.2

Update redis to 3.0.2 (now that 3 is stable, squash it into default)
This commit is contained in:
James Cook 2015-07-12 10:24:48 -07:00
commit 87f916590b
3 changed files with 3 additions and 26 deletions

View file

@ -1,23 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "3.0.2";
name = "redis-${version}";
src = fetchurl {
url = "https://github.com/antirez/redis/archive/${version}.tar.gz";
sha256 = "00gazq98ccz64l4l5vzpynyk5wg15iwmwwvznaarkwm99b9rsz4g";
};
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 ];
};
}

View file

@ -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)";

View file

@ -9132,7 +9132,6 @@ let
radius = callPackage ../servers/radius { };
redis = callPackage ../servers/nosql/redis { };
redis3 = callPackage ../servers/nosql/redis/3.0.nix { };
redstore = callPackage ../servers/http/redstore { };