From a010daa8e34fc28e9c7c7b39b234ecc1b5073f62 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Tue, 20 Jan 2015 11:19:28 +0000 Subject: [PATCH 1/4] Add redis-3.0.0-rc2 --- pkgs/servers/nosql/redis/3.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/nosql/redis/3.nix diff --git a/pkgs/servers/nosql/redis/3.nix b/pkgs/servers/nosql/redis/3.nix new file mode 100644 index 00000000000..ccd5ccdb37f --- /dev/null +++ b/pkgs/servers/nosql/redis/3.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "3.0.0-rc2"; + name = "redis-${version}"; + + src = fetchurl { + url = "https://github.com/antirez/redis/archive/${version}.tar.gz"; + sha256 = "3713194850e1b75fa01f17249a69e67636c1ad3f148fd15950d08d7a87bcf463"; + }; + + 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bcb526f3ae..e0c792ddbe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7984,6 +7984,7 @@ let radius = callPackage ../servers/radius { }; redis = callPackage ../servers/nosql/redis { }; + redis3 = callPackage ../servers/nosql/redis/3.nix { }; redstore = callPackage ../servers/http/redstore { }; From 687e83156cd4de46078a189b92472c7ddad33d6b Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Sat, 24 Jan 2015 10:40:04 +0000 Subject: [PATCH 2/4] Rename redis3 --- pkgs/servers/nosql/redis/{3.nix => 3.0.nix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/servers/nosql/redis/{3.nix => 3.0.nix} (100%) diff --git a/pkgs/servers/nosql/redis/3.nix b/pkgs/servers/nosql/redis/3.0.nix similarity index 100% rename from pkgs/servers/nosql/redis/3.nix rename to pkgs/servers/nosql/redis/3.0.nix From 81d1422d0d13210ee7bf7c3e1ab6eb705ff8120a Mon Sep 17 00:00:00 2001 From: berdario Date: Wed, 11 Feb 2015 14:22:49 +0000 Subject: [PATCH 3/4] Forgot to update the all-packages.nix --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0c792ddbe7..92a1f9172cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7984,7 +7984,7 @@ let radius = callPackage ../servers/radius { }; redis = callPackage ../servers/nosql/redis { }; - redis3 = callPackage ../servers/nosql/redis/3.nix { }; + redis3 = callPackage ../servers/nosql/redis/3.0.nix { }; redstore = callPackage ../servers/http/redstore { }; From ef15f769feeb1d184bf5aae8f3026907394afb7d Mon Sep 17 00:00:00 2001 From: berdario Date: Wed, 11 Feb 2015 14:24:27 +0000 Subject: [PATCH 4/4] redis3.0.0-rc3 --- pkgs/servers/nosql/redis/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix index ccd5ccdb37f..049639ad684 100644 --- a/pkgs/servers/nosql/redis/3.0.nix +++ b/pkgs/servers/nosql/redis/3.0.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.0.0-rc2"; + version = "3.0.0-rc3"; name = "redis-${version}"; src = fetchurl { url = "https://github.com/antirez/redis/archive/${version}.tar.gz"; - sha256 = "3713194850e1b75fa01f17249a69e67636c1ad3f148fd15950d08d7a87bcf463"; + sha256 = "1695fa532eafc14c95f45add5d8a71d07e0e87b5c8f06c29dfa06313322d27b7"; }; makeFlags = "PREFIX=$(out)";