diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
| commit | 0a47a28f1df3bdf7b2cf074af84a432aa48cbba7 (patch) | |
| tree | 6c953c0d58cf6d178795383fefe9babddaa7da4e /pkgs/servers/nosql | |
| parent | 3e2e62ca31311dd7e5237aa97a815458a44a3a3e (diff) | |
| parent | 296cd6600943d5a349cda55a36137331f8c3eec8 (diff) | |
| download | nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.gz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.bz2 nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.lz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.xz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.zst nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/redis/darwin.patch | 12 | ||||
| -rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 12 |
2 files changed, 5 insertions, 19 deletions
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..1992164b3d1c 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl }: 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"; |