Redis 2.6.9

This commit is contained in:
Shea Levy 2013-01-21 18:27:34 -05:00
parent 82f3f01526
commit 5cbd865ce6
2 changed files with 6 additions and 20 deletions

View File

@ -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

View File

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