diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
| commit | 95b828de42adaa2f825e5588d1cccb0d6398b20a (patch) | |
| tree | abfa4798c91b9932173212e7fbc6e5f7bd85f5d6 /pkgs/misc | |
| parent | 421ce6439c2e685065fe9c256b751225de51e0b3 (diff) | |
| parent | 1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff) | |
| download | nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.gz nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.bz2 nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.lz nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.xz nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.zst nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/maven/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/my-env/loadenv.sh | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix index 8367e6ea72a..b7cb84fbb3c 100644 --- a/pkgs/misc/maven/default.nix +++ b/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 ]; diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 6752d1c03b5..a162f8b853a 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/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" |