diff --git a/pkgs/development/compilers/rustc/1.0.0-beta.nix b/pkgs/development/compilers/rustc/1.0.0-beta.nix deleted file mode 100644 index 93359fba9f7..00000000000 --- a/pkgs/development/compilers/rustc/1.0.0-beta.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, callPackage }: -callPackage ./makeRustcDerivation.nix { - shortVersion = "1.0.0-beta.2"; - isRelease = true; - srcSha = "0wcpp6fg7cc75bj5b6dcz5dhgps6xw09n75qiapmd12qxjzj17wn"; - snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; - snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; - snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; - snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa"; - snapshotDate = "2015-03-27"; - snapshotRev = "5520801"; - patches = [ - ./patches/beta.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - configureFlags = [ "--release-channel=beta" ]; -} diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix new file mode 100644 index 00000000000..639414988af --- /dev/null +++ b/pkgs/development/compilers/rustc/1.0.0.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage }: +callPackage ./makeRustcDerivation.nix { + shortVersion = "1.0.0"; + isRelease = true; + srcSha = "1fjyk5xhg9dx85d1kkjmb1jai7awvdmzcjf2fdmi2pdjyzacn163"; + snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16"; + snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f"; + snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb"; + snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f"; + snapshotDate = "2015-04-27"; + snapshotRev = "857ef6e"; + patches = [ + ./patches/beta.patch + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + configureFlags = [ "--release-channel=beta" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c15f9ce0a4..41da2c9dbaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4389,9 +4389,8 @@ let ocaml = ocaml_3_08_0; }; - rustcBeta = callPackage ../development/compilers/rustc/1.0.0-beta.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - rustc = rustcBeta; + rustc = callPackage ../development/compilers/rustc/1.0.0.nix {}; rustPlatform = rustStable;