sync with trunk

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

pkgs/development/interpreters/python/pythonhome-wrapper.nix

@@ -0,0 +1,21 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "pythonhome-wrapper";
+
+  unpackPhase = "true";
+  installPhase = ''
+    ensureDir $out/bin
+    echo '
+#!/bin/sh
+
+BINDIR=`dirname $0`
+PYTHONHOME=`dirname $BINDIR`
+PYTHONHOME=`(cd $PYTHONHOME && pwd)`
+export PYTHONHOME
+
+$BINDIR/python "$@"
+    ' > $out/bin/py
+    chmod +x $out/bin/py
+  '';
+}

pkgs/development/libraries/haskell/NumInstances/default.nix

@@ -8,5 +8,9 @@ cabal.mkDerivation (self: {
     description = "Instances of numeric classes for functions and tuples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/derp/default.nix

@@ -0,0 +1,16 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "derp";
+  version = "0.1.5";
+  sha256 = "0mpc4hav5iqrcjns5sz8q0v2c0d7nb2hbzn58cmbl7cma2kp36li";
+  meta = {
+    description = "Derivative Parsing";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/tools/haskell/uuagc/cabal.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc-cabal";
-  version = "1.0.0.6";
-  sha256 = "1ij84n2pjhqyz10vsa9qxk4k227wg1c96rq5sylvcwdkzciww81d";
+  version = "1.0.0.7";
+  sha256 = "1ciypx0rrisjbwx8fc9bzkkv975646951ibqpvbxipxzvv5npy9y";
   buildDepends = [ mtl uulib ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";

pkgs/os-specific/linux/kernel/linux-3.1.nix

@@ -200,13 +200,13 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.1-rc6";
+    version = "3.1-rc7";
 
-    modDirVersion = "3.1.0-rc6";
+    modDirVersion = "3.1.0-rc7";
   
     src = fetchurl {
       url = "https://github.com/torvalds/linux/tarball/v${version}";
-      sha256 = "047a5qkcghn0q9b611vpdwbl87qb0k0q9x0bdpywlpy644l5dfwy";
+      sha256 = "05zlg522svyym6cab7lrqpihzrk8j356dyahyc321nd8yw0qfv2x";
       name = "v${version}.tar.gz";
     };
 

pkgs/shells/bash/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison, bashCompletion ? null}:
+{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }:
 
 assert interactive -> readline != null;
 
@@ -52,10 +52,7 @@ stdenv.mkDerivation rec {
     # Add an `sh' -> `bash' symlink.
     ln -s bash "$out/bin/sh"
 
-  '' + (if interactive && bashCompletion != null then ''
-    ensureDir "$out/etc"
-    echo >"$out/etc/bash_completion" '. "${bashCompletion}/etc/bash_completion"'
-  '' else ''
+  '' + (if interactive then "" else ''
     # Install the completion examples.
     ensureDir "$out/etc"
     cp -v "examples/complete/bash_completion" "$out/etc"

pkgs/top-level/all-packages.nix

@@ -2594,6 +2594,8 @@ let
     extraLibs = lib.attrValues python.modules;
   };
 
+  pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { };
+
   pyrex = pyrex095;
 
   pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { };

pkgs/top-level/haskell-packages.nix

@@ -517,6 +517,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   derive = callPackage ../development/libraries/haskell/derive {};
 
+  derp = callPackage ../development/libraries/haskell/derp {};
+
   Diff = callPackage ../development/libraries/haskell/Diff {};
 
   digest = callPackage ../development/libraries/haskell/digest {