diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 23:28:16 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 23:28:16 +0100 |
| commit | b58780c43de1f6463d753c4dbf2506641cf1c678 (patch) | |
| tree | 858337275f05e2bd2fdfcac5f6574e200b00fb44 /pkgs/servers | |
| parent | 88b11196c130b6bda5fd2e57729e876527c63377 (diff) | |
| parent | fde74242bf41d199ad68db90c5ce4d35f6c2c51b (diff) | |
| download | nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.gz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.bz2 nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.lz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.xz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.zst nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.zip | |
Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial solution.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nosql/redis/darwin.patch | 12 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.2.x.nix | 35 |
2 files changed, 47 insertions, 0 deletions
diff --git a/pkgs/servers/nosql/redis/darwin.patch b/pkgs/servers/nosql/redis/darwin.patch new file mode 100644 index 00000000000..002f09b36f3 --- /dev/null +++ b/pkgs/servers/nosql/redis/darwin.patch @@ -0,0 +1,12 @@ +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/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix new file mode 100644 index 00000000000..6341fa952f5 --- /dev/null +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, zlib, readline }: + +let version = "9.2.2"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + src = fetchurl { + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "1wzphj8vdqpzaihqmrkm9p4wlfvgr9psg5hnrmzwp5l8m5aai9z1"; + }; + + buildInputs = [ zlib readline ]; + + enableParallelBuilding = true; + + LC_ALL = "C"; + + postInstall = + '' + mkdir -p $out/share/man + cp -rvd doc/src/sgml/man1 $out/share/man + ''; + + passthru = { + inherit readline; + psqlSchema = "9.1"; + }; + + meta = { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = "bsd"; + }; +} |