Merge remote-tracking branch 'origin/master' into staging

pkgs/misc/maven/default.nix

@@ -3,13 +3,13 @@
 assert jdk != null;
 
 stdenv.mkDerivation {
-  name = "apache-maven-3.0.4";
+  name = "apache-maven-3.1.1";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz;
-    sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk";
+    url = mirror://apache/maven/binaries/apache-maven-3.1.1-bin.tar.gz;
+    sha256 = "06ymc5y8bp5crcz74z2m9pf58aid5q11v2klnjmxb4ar8mkd8zh7";
   };
 
   buildInputs = [ makeWrapper ];

pkgs/misc/my-env/loadenv.sh

@@ -6,6 +6,7 @@ source @myenvpath@
 
 PATH="$PATH:$OLDPATH"
 export PS1="\n@name@:[\u@\h:\w]\$ "
+export NIX_MYENV_NAME="@name@"
 export buildInputs
 export NIX_STRIP_DEBUG=0
 export TZ="$OLDTZ"