From 5cbd865ce6f4a9d5209e066173ddce4d049a2e0a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 21 Jan 2013 18:27:34 -0500
Subject: Redis 2.6.9

---
 pkgs/servers/nosql/redis/darwin.patch | 12 ------------
 pkgs/servers/nosql/redis/default.nix  | 14 ++++++--------
 2 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/servers/nosql/redis/darwin.patch

(limited to 'pkgs/servers/nosql')

diff --git a/pkgs/servers/nosql/redis/darwin.patch b/pkgs/servers/nosql/redis/darwin.patch
deleted file mode 100644
index 002f09b36f34..000000000000
--- a/pkgs/servers/nosql/redis/darwin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru redis-2.4.7/deps/hiredis/Makefile redis-2.4.7.patched/deps/hiredis/Makefile
---- redis-2.4.7/deps/hiredis/Makefile	2012-02-02 14:29:24.000000000 +0000
-+++ redis-2.4.7.patched/deps/hiredis/Makefile	2012-12-07 17:14:43.000000000 +0000
-@@ -20,7 +20,7 @@
-   CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
-   CCLINK?=-lm -pthread
-   LDFLAGS?=-L. -Wl,-rpath,.
--  OBJARCH?=-arch i386 -arch x86_64
-+  #OBJARCH?=-arch i386 -arch x86_64
-   DYLIBNAME?=libhiredis.dylib
-   DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
-   STLIBNAME?=libhiredis.a
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index aa25b49e5811..abdaf204be4a 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, which, tcl }:
 
 stdenv.mkDerivation rec {
-  pname = "redis";
-  version = "2.4.7";
-  name = "${pname}-${version}";
+  name = "redis-2.6.9";
 
   src = fetchurl {
-    url = "http://redis.googlecode.com/files/redis-2.4.7.tar.gz";
-    sha256 = "f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1";
+    url = "http://redis.googlecode.com/files/${name}.tar.gz";
+    sha256 = "12bl3inq7xr2lqlqbxjxa3v9s5v7xn2pxlbm72ivxbiq43zpx5jd";
   };
 
   makeFlags = "PREFIX=$(out)";
 
-  # commented out until the patch is found
-  # patches = if stdenv.isDarwin then [ ./darwin.patch ] else [];
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://redis.io;
     description = "An open source, advanced key-value store";
-- 
cgit 1.4.1


From 79dac66415dc1d1992f3c072de5c711d0edcc969 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 21 Jan 2013 18:30:11 -0500
Subject: Whoops, tcl and which aren't needed

---
 pkgs/servers/nosql/redis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/servers/nosql')

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index abdaf204be4a..1992164b3d1c 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, tcl }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "redis-2.6.9";
-- 
cgit 1.4.1