* Sync with the trunk.

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

14 files changed, 133 insertions, 16 deletions

diff --git a/pkgs/development/compilers/ghc/ghc-get-packages.sh b/pkgs/development/compilers/ghc/ghc-get-packages.sh
new file mode 100755
index 000000000000..4593ead17d31
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-get-packages.sh
@@ -0,0 +1,21 @@
+#! /bin/sh
+# Usage:
+#  $1: version of GHC
+#  $2: invocation path of GHC
+#  $3: prefix
+version="$1"
+if test -z "$3"; then
+  prefix="-package-conf "
+else
+  prefix="$3"
+fi
+PATH="$2:$PATH"
+IFS=":"
+PKGS=""
+for p in $PATH; do
+  PkgDir="$p/../lib/ghc-pkgs/ghc-$version"
+  for i in $PkgDir/*.installedconf; do
+    test -f $i && PKGS="$PKGS $prefix$i"
+  done
+done
+echo $PKGS
diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index 932cf6343018..5cacfdf8f894 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -1,14 +1,27 @@
-{stdenv, ghc}:
+{stdenv, ghc, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "ghc-wrapper-${ghc.version}";
+  name = "ghc-${ghc.version}-wrapper";
 
+  buildInputs = [makeWrapper];
   propagatedBuildInputs = [ghc];
 
   unpackPhase = "true";
-  installPhase = "true";
+  installPhase = ''
+    ensureDir $out/bin
+    cp $GHCGetPackages $out/bin/ghc-get-packages.sh
+    chmod 755 $out/bin/ghc-get-packages.sh
+    for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version} runghc runhaskell; do
+      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\")"
+    done
+    for prg in ghc-pkg ghc-pkg-${ghc.version}; do
+      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" --package-conf=)"
+    done
+    ensureDir $out/nix-support
+    ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
+  ''; 
   
-  setupHook = ./setup-hook.sh;
+  GHCGetPackages = ./ghc-get-packages.sh;
 
   inherit ghc;
   ghcVersion = ghc.version;
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index 698429c0a881..06dd8cb2fb97 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -4,8 +4,7 @@ stdenv.mkDerivation {
   name = "acl-2.2.47";
 
   src = fetchurl {
-    # The SGI site throws away old versions, so don't use it.
-    url = mirror://gentoo/distfiles/acl_2.2.47-1.tar.gz;
+    url = http://nixos.org/tarballs/acl_2.2.47-1.tar.gz;
     sha256 = "1j39g62fki0iyji9s62slgwdfskpkqy7rmjlqcnmsvsnxbxhc294";
   };
 
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index 7882b7fdfe53..aab578596909 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -2,8 +2,8 @@
 stdenv.mkDerivation {
   name = "freeimage-3.11.0";
   src = fetchurl {
-    url = mirror://sourceforge/freeimage/FreeImage3110.zip;
-    sha256 = "84021b8c0b86e5801479474ad9a99c18d121508ee16d363e02ddcbf24195340c";
+    url = mirror://sourceforge/freeimage/FreeImage3120.zip;
+    sha256 = "1hvcmv8hnv3h24zcl324g3l0ww8aa8fkcfav2lrgs1kwzp5zqcd4";
   };
   buildInputs = [ unzip ];
   patchPhase = ''
diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
new file mode 100644
index 000000000000..461f98a9033c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "MonadRandom";
+  version = "0.1.3";
+  sha256 = "be4dd46a93b59a5e94b58e6986934ca91feace9962a1741b6107a3dd06879fea";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Random-number generation monad";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix
new file mode 100644
index 000000000000..4555cf322b84
--- /dev/null
+++ b/pkgs/development/libraries/haskell/SDL-image/default.nix
@@ -0,0 +1,12 @@
+{cabal, SDL, SDL_image}:
+
+cabal.mkDerivation (self : {
+  pname = "SDL-image";
+  version = "0.5.2";
+  sha256 = "82765f5ed11ef2ad3eb47f59105fe5aecd8de2515d698ef9ea989dc4cec18016";
+  propagatedBuildInputs = [SDL SDL_image];
+  meta = {
+    description = "Binding to libSDL_image";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
new file mode 100644
index 000000000000..e1bd81d834b3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
@@ -0,0 +1,12 @@
+{cabal, SDL, SDL_mixer}:
+
+cabal.mkDerivation (self : {
+  pname = "SDL-mixer";
+  version = "0.5.5";
+  sha256 = "0e1b07a0cbe22eafff7b36f53e4ea840abad50131a867cb70d47beaf902fd185";
+  propagatedBuildInputs = [SDL SDL_mixer];
+  meta = {
+    description = "Binding to libSDL_mixer";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
new file mode 100644
index 000000000000..89c3a9bad8a6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
@@ -0,0 +1,12 @@
+{cabal, SDL, SDL_ttf}:
+
+cabal.mkDerivation (self : {
+  pname = "SDL-ttf";
+  version = "0.5.5";
+  sha256 = "577109d01fca61c103520e7bf33e45af118bcb6d15fcd6da7a8b72c43c69cbb6";
+  propagatedBuildInputs = [SDL SDL_ttf];
+  meta = {
+    description = "Binding to libSDL_ttf";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
new file mode 100644
index 000000000000..0ffca624cd4b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -0,0 +1,12 @@
+{cabal, SDL}:
+
+cabal.mkDerivation (self : {
+  pname = "SDL";
+  version = "0.5.5";
+  sha256 = "cc56c723e03befd99be0a293347690ba7d2cb7fdafcbbc287f067a8cf70af172";
+  propagatedBuildInputs = [SDL];
+  meta = {
+    description = "Binding to libSDL";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index cac8990d271f..c4ea86a4ac72 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -37,7 +37,7 @@ attrs :
             propagatedBuildInputs = [];
 
             # library directories that have to be added to the Cabal files
-            extraLibDirs = map (x : x + "/lib") self.propagatedBuildInputs;
+            extraLibDirs = attrs.lib.lists.concatMap (x : [ (x + "/lib64") (x + "/lib") ]) self.propagatedBuildInputs;
 
             # compiles Setup and configures
             configurePhase = ''
@@ -68,9 +68,17 @@ attrs :
 
               ./Setup copy
 
+              ensureDir $out/bin # necessary to get it added to PATH
+
               local confDir=$out/lib/ghc-pkgs/ghc-${attrs.ghc.ghc.version}
+              local installedPkgConf=$confDir/${self.fname}.installedconf
+              local pkgConf=$confDir/${self.fname}.conf
               ensureDir $confDir
-              ./Setup register --gen-pkg-config=$confDir/${self.fname}.conf
+              ./Setup register --gen-pkg-config=$pkgConf
+              if test -f $pkgConf; then
+                echo '[]' > $installedPkgConf
+                GHC_PACKAGE_PATH=$installedPkgConf ghc-pkg --global register $pkgConf --force
+              fi
 
               ensureDir $out/nix-support
               ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
new file mode 100644
index 000000000000..ba4b1edcc95f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "dataenc";
+  version = "0.11.1";
+  sha256 = "1212dbed8a1b8f80140d6450a7635a4365bc5733a00e2b96d00bcc526396c6bc";
+  meta = {
+    description = "Data encoding library";
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index 002b6ff7e618..0f25200516bb 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -1,12 +1,12 @@
-{cabal, HaXml, HTTP}:
+{cabal, HaXml, HTTP, dataenc, time}:
 
 cabal.mkDerivation (self : {
   pname = "haxr";
-  version = "3000.0.1";
-  sha256 = "1sppfd8qyqggfh5m8phxdn40x17g97q6j3a8d5wspy7kcmg2qaci";
+  version = "3000.1.1.2";
+  sha256 = "c24741a92e27d851a3376158230a52782c1e2b494405ebdde1d256819598c8e8";
   meta = {
     description = "a Haskell library for writing XML-RPC client and server applications";
   };
-  propagatedBuildInputs = [HaXml HTTP];
+  propagatedBuildInputs = [HaXml HTTP dataenc time];
 })
 
diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix
index fe60a4c51f0d..409d7db27ab4 100644
--- a/pkgs/development/libraries/haskell/readline/default.nix
+++ b/pkgs/development/libraries/haskell/readline/default.nix
@@ -5,6 +5,11 @@ cabal.mkDerivation (self : {
   version = "1.0.1.0";
   sha256 = "07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d";
   propagatedBuildInputs = [ readline ];
+  # experimentally link with ncursesw because ghci can't interpret ld scripts,
+  # and ncurses sometimes seems to be a script pointing to ncursesw
+  postConfigure = ''
+    sed -i -e "/^extra-libraries/ s/ncurses/ncursesw/" readline.buildinfo
+  '';
   meta = {
     description = "An interface to the GNU readline library";
   };
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix
index 652c423fd7ef..4d6e2beb7a13 100644
--- a/pkgs/development/libraries/vxl/default.nix
+++ b/pkgs/development/libraries/vxl/default.nix
@@ -3,8 +3,8 @@ stdenv.mkDerivation {
   name = "vxl-1.11.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/vxl/vxl-1.11.0.zip;
-    sha256 = "84f38d0c3656b5e4470e16ddce715bafcaa478ff066e6cec6f54524b5d72fa68";
+    url = mirror://sourceforge/vxl/vxl-1.12.0.zip;
+    sha256 = "11nwa37g42l81xv18s2q2jflc4vr2ncsm7wn7yv269wfwxcjhnlc";
   };
 
   buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ];