tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

rustc: 1.4.0 -> 1.5.0

authored by

Robin Gloster and committed by moritz.vongoewels.de b26aa99d b45161fb

+16 -33
unified split
+3 -4
pkgs/development/compilers/rustc/default.nix
··· 1 { stdenv, callPackage }: 2 3 callPackage ./generic.nix { 4 - shortVersion = "1.4.0"; 5 isRelease = true; 6 - forceBundledLLVM = false; 7 configureFlags = [ "--release-channel=stable" ]; 8 - srcSha = "13wpi9nb3h6wwck2mxhza85fahzcwgas00w8m25086v34dha4dp1"; 9 10 /* Rust is bootstrapped from an earlier built version. We need 11 to fetch these earlier versions, which vary per platform. ··· 22 snapshotDate = "2015-08-11"; 23 snapshotRev = "1af31d4"; 24 25 - # cc-ar-opts.patch should be removable in 1.4.0+ 26 patches = [ ./patches/remove-uneeded-git.patch ] 27 ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; 28 }
··· 1 { stdenv, callPackage }: 2 3 callPackage ./generic.nix { 4 + shortVersion = "1.5.0"; 5 isRelease = true; 6 + forceBundledLLVM = true; 7 configureFlags = [ "--release-channel=stable" ]; 8 + srcSha = "1vfpwx6a2f2rn528774cz9r7r82ppycn8z8ybll6bphdw7cyar1g"; 9 10 /* Rust is bootstrapped from an earlier built version. We need 11 to fetch these earlier versions, which vary per platform. ··· 22 snapshotDate = "2015-08-11"; 23 snapshotRev = "1af31d4"; 24 25 patches = [ ./patches/remove-uneeded-git.patch ] 26 ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; 27 }
+1 -1
pkgs/development/compilers/rustc/head.nix
··· 23 snapshotRev = "1af31d4"; 24 25 patches = [ ./patches/remove-uneeded-git.patch ] 26 - ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec-head.patch; 27 } 28
··· 23 snapshotRev = "1af31d4"; 24 25 patches = [ ./patches/remove-uneeded-git.patch ] 26 + ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; 27 } 28
-24
pkgs/development/compilers/rustc/patches/grsec-head.patch
··· 1 - diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile 2 - index b22f34f..c6489bd 100644 3 - --- a/src/test/run-make/relocation-model/Makefile 4 - +++ b/src/test/run-make/relocation-model/Makefile 5 - @@ -2,9 +2,11 @@ 6 - 7 - all: others 8 - $(RUSTC) -C relocation-model=dynamic-no-pic foo.rs 9 - + paxctl -czexm $(TMPDIR)/foo 10 - $(call RUN,foo) 11 - 12 - $(RUSTC) -C relocation-model=default foo.rs 13 - + paxctl -czexm $(TMPDIR)/foo 14 - $(call RUN,foo) 15 - 16 - $(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs 17 - @@ -16,6 +18,7 @@ others: 18 - else 19 - others: 20 - $(RUSTC) -C relocation-model=static foo.rs 21 - + paxctl -czexm $(TMPDIR)/foo 22 - $(call RUN,foo) 23 - $(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs 24 - endif
···
+12 -4
pkgs/development/compilers/rustc/patches/grsec.patch
··· 1 diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile 2 - index 2fcdd32..2d9ddb0 100644 3 --- a/src/test/run-make/relocation-model/Makefile 4 +++ b/src/test/run-make/relocation-model/Makefile 5 - @@ -5,9 +5,11 @@ all: 6 $(call RUN,foo) 7 8 $(RUSTC) -C relocation-model=default foo.rs 9 + paxctl -czexm $(TMPDIR)/foo 10 $(call RUN,foo) 11 12 $(RUSTC) -C relocation-model=static foo.rs 13 + paxctl -czexm $(TMPDIR)/foo 14 $(call RUN,foo) 15 - 16 - $(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
··· 1 diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile 2 + index b22f34f..c6489bd 100644 3 --- a/src/test/run-make/relocation-model/Makefile 4 +++ b/src/test/run-make/relocation-model/Makefile 5 + @@ -2,9 +2,11 @@ 6 + 7 + all: others 8 + $(RUSTC) -C relocation-model=dynamic-no-pic foo.rs 9 + + paxctl -czexm $(TMPDIR)/foo 10 $(call RUN,foo) 11 12 $(RUSTC) -C relocation-model=default foo.rs 13 + paxctl -czexm $(TMPDIR)/foo 14 $(call RUN,foo) 15 16 + $(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs 17 + @@ -16,6 +18,7 @@ others: 18 + else 19 + others: 20 $(RUSTC) -C relocation-model=static foo.rs 21 + paxctl -czexm $(TMPDIR)/foo 22 $(call RUN,foo) 23 + $(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs 24 + endif