colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rust: remove beta and nightly releases

Browse Source 
nixpkgs is for stable software. If you want beta and nightly, use the
nixpkgs-mozilla overlay.
This commit is contained in:
zimbatm 2017-10-04 17:40:01 +01:00
parent 97d02a78f0
commit 1d6eaac764
6 changed files with 6 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/development/compilers/rust/beta.nix
View File

@ -1,40 +0,0 @@
{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
, targets ? []
, targetToolchains ? []
, targetPatches ? []
}:
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
in
rec {
rustc = callPackage ./rustc.nix {
inherit llvm targets targetPatches targetToolchains rustPlatform;
version = "beta-2017-05-27";
configureFlags = [ "--release-channel=beta" ];
src = fetchurl {
url = "https://static.rust-lang.org/dist/2017-05-27/rustc-beta-src.tar.gz";
sha256 = "9f3f92efef7fb2b4bf38e57e4ff1f416dc221880b90841c4bdaee350801c0b57";
};
patches = [
./patches/darwin-disable-fragile-tcp-tests.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
doCheck = false;
broken = true;
};
cargo = callPackage ./cargo.nix rec {
version = "0.18.0";
srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666";
srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
};
}

37
pkgs/development/compilers/rust/nightly.nix
View File

@ -1,37 +0,0 @@
{ stdenv, callPackage, rustPlatform, llvm, fetchurl
, targets ? []
, targetToolchains ? []
, targetPatches ? []
}:
rec {
rustc = callPackage ./rustc.nix {
inherit llvm targets targetPatches targetToolchains rustPlatform;
version = "nightly-2017-05-30";
configureFlags = [ "--release-channel=nightly" ];
src = fetchurl {
url = "https://static.rust-lang.org/dist/2017-05-30/rustc-nightly-src.tar.gz";
sha256 = "90ce76db56a93f1b4532f2e62bbf12c243c4d156662b0d80c25319211ee7d0e0";
};
patches = [
./patches/darwin-disable-fragile-tcp-tests.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
doCheck = false;
broken = true;
};
cargo = callPackage ./cargo.nix rec {
version = "0.18.0";
srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666";
srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
};
}

23
pkgs/development/compilers/rust/nightlyBin.nix
View File

@ -1,23 +0,0 @@
{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }:
let
platform = if stdenv.system == "x86_64-linux"
then "x86_64-unknown-linux-gnu"
else throw "missing bootstrap url for platform ${stdenv.system}";
bootstrapHash =
if stdenv.system == "x86_64-linux"
then "0svlm4bxsdhdn4jsv46f278kid23a9w978q2137qrba4xnyb06kf"
else throw "missing bootstrap hash for platform ${stdenv.system}";
src = fetchurl {
url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz";
sha256 = bootstrapHash;
};
version = "2017-06-26";
in import ./binaryBuild.nix
{ inherit stdenv fetchurl makeWrapper cacert zlib buildRustPackage curl;
inherit version src platform;
versionType = "nightly";
}

25
pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch
View File

@ -1,25 +0,0 @@
From 5702d7cdb2bed7ac3af3c01087b181da35f6e108 Mon Sep 17 00:00:00 2001
From: joachim schiele <js@lastlog.de>
Date: Thu, 24 Nov 2016 22:25:48 +0100
Subject: [PATCH 2/2] asdf
---
src/tools/tidy/src/main.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
index cabaee5..685df94 100644
--- a/src/tools/tidy/src/main.rs
+++ b/src/tools/tidy/src/main.rs
@@ -48,7 +48,7 @@ fn main() {
errors::check(&path, &mut bad);
cargo::check(&path, &mut bad);
features::check(&path, &mut bad);
- cargo_lock::check(&path, &mut bad);
+ //cargo_lock::check(&path, &mut bad);
pal::check(&path, &mut bad);
if bad {
--
2.10.0

25
pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch
View File

@ -1,25 +0,0 @@
From ac204f8be95cdb2350a1dd893641e38528aaf01d Mon Sep 17 00:00:00 2001
From: joachim schiele <js@lastlog.de>
Date: Fri, 25 Nov 2016 02:17:02 +0100
Subject: [PATCH] asdf
---
src/tools/tidy/src/main.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
index cb11fe2..c9b7d2a 100644
--- a/src/tools/tidy/src/main.rs
+++ b/src/tools/tidy/src/main.rs
@@ -45,7 +45,7 @@ fn main() {
bins::check(&path, &mut bad);
style::check(&path, &mut bad);
errors::check(&path, &mut bad);
- cargo::check(&path, &mut bad);
+ //cargo::check(&path, &mut bad);
features::check(&path, &mut bad);
pal::check(&path, &mut bad);
--
2.10.0

32
pkgs/top-level/all-packages.nix
View File

@ -6175,34 +6175,12 @@ with pkgs;
inherit (darwin) apple_sdk;
};
# For beta and nightly releases use the nixpkgs-mozilla overlay
rust = callPackage ../development/compilers/rust { };
inherit (rust) cargo rustc;
rustRegistry = callPackage ./rust-packages.nix { };
rust = rustStable;
rustStable = callPackage ../development/compilers/rust {
inherit (llvmPackages_4) llvm;
};
rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {}));
rustNightly = rustBeta;
# rust support in nixpkgs isn't yet well maintained enough for us to
# pretend to support nightlies in a meaningful way.
# rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
# rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
# }));
rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {
buildRustPackage = callPackage ../build-support/rust {
rust = rustNightlyBin;
};
});
cargo = rust.cargo;
rustc = rust.rustc;
cargo-edit = callPackage ../tools/package-management/cargo-edit { };
rustPlatform = recurseIntoAttrs (makeRustPlatform rust);
makeRustPlatform = rust: lib.fix (self:
@ -6224,6 +6202,8 @@ with pkgs;
});
cargo-edit = callPackage ../tools/package-management/cargo-edit { };
rainicorn = callPackage ../development/tools/rust/rainicorn { };
rustfmt = callPackage ../development/tools/rust/rustfmt { };
rustracer = callPackage ../development/tools/rust/racer { };