diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-29 15:54:33 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-29 15:54:33 -0700 |
| commit | 271972de0a7f0027f33d2bf3098070f1a73bbc55 (patch) | |
| tree | c37c532df1e46c3ad5e5a51f713cb35fdd374373 /pkgs/development/compilers | |
| parent | 48a791d27062c71ced0921920d95fdd991b35107 (diff) | |
| parent | ea4850ca6438d62012d2f3caec1c52c1653192b0 (diff) | |
| download | nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.gz nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.bz2 nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.lz nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.xz nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.zst nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/rustc/head.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 4e431d334cb0..5d294d5c43de 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -133,7 +133,7 @@ let result = stdenv.mkDerivation rec { if test -n "${jce}"; then unzip ${jce} - cp -v UnlimitedJCEPolicy/*.jar $jrePath/lib/security + cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security fi rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 045a47e88de6..016d09b3cf1a 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,10 +2,10 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2015-09-21"; + shortVersion = "2015-09-23"; isRelease = false; - srcRev = "547fd5c11e6902e2f9748e7b46893211b36da421"; - srcSha = "10wklbxz6f4ga9q2rxghih18xdw6xm01bay6c13y72c4bwlnkm2w"; + srcRev = "b2f379cdc23aec5c5d0d62acfcc5a4a18ebf0e30"; + srcSha = "1z710f5vv9pbis1q96dc6kqvi0j7xgg95r5f5c3czbvndrxjwm03"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. |