svn merge ^/nixpkgs/trunk

Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520

5 files changed, 58 insertions, 5 deletions

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 42d577c55fa8..037fa14491c2 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
   patches =
     [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541.
       ./readlink.patch
+
+      # Allow cross-builds for GNU/Hurd.
+      ./libnss-wins-pthread.patch
     ];
 
   buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
@@ -39,7 +42,7 @@ stdenv.mkDerivation rec {
     # XXX: Awful hack to allow cross-compilation.
     '' sed -i source3/configure \
            -e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g'
-    '';
+    ''; # "
 
   preConfigure =
     '' cd source3
diff --git a/pkgs/servers/samba/libnss-wins-pthread.patch b/pkgs/servers/samba/libnss-wins-pthread.patch
new file mode 100644
index 000000000000..63e1485c20dc
--- /dev/null
+++ b/pkgs/servers/samba/libnss-wins-pthread.patch
@@ -0,0 +1,15 @@
+`libnss_wins' uses pthreads but is built without `-pthread'.  This is
+not a problem when building natively on GNU/Linux, but causes troubles
+when cross-building for GNU/Hurd (undefined references to libpthread
+functions.)
+
+--- samba-3.6.1/source3/Makefile.in	2012-02-22 15:25:15.000000000 +0100
++++ samba-3.6.1/source3/Makefile.in	2012-02-22 15:25:47.000000000 +0100
+@@ -2760,6 +2760,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP
+ 	@echo "Linking $@"
+ 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
+ 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
++		$(PTHREAD_LDFLAGS) \
+ 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
+ 
+ bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
index b308e4e0d1e0..ba0d57b3654b 100644
--- a/pkgs/servers/sql/postgresql/8.3.x.nix
+++ b/pkgs/servers/sql/postgresql/8.3.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.3.16"; in
+let version = "8.3.17"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0i17da3jz44y2xikp99qs0dac9j84hghr8rg5n7hr86ippi90180";
+    sha256 = "0xq8yg8qwd4qvjk6764argaxl6fribyf1xnxmdsk4xfcmgmfw5gv";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index c3a34b3d43bd..20b9bca5144c 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.9"; in
+let version = "8.4.10"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "12n3x2q444hfhy9nbl14yfhd58im86jmlb9b0ihqzbmq1j6wnn0x";
+    sha256 = "1yvwn2qpn2dpgfi496r1zl8b8xy52lb2pprg076pvc37sklq77vl";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
new file mode 100644
index 000000000000..161c3dc2ccf0
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, zlib, readline }:
+
+let version = "9.1.2"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
+  
+  src = fetchurl {
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "0c6vwlfxppjvrikqfq6s87sxmxxvsx1qq03bwgk589sv9x8zym4d";
+  };
+
+  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";
+  };
+}