Skip to content

Commit

Permalink
rust: remove beta and nightly releases
Browse files Browse the repository at this point in the history
nixpkgs is for stable software. If you want beta and nightly, use the
nixpkgs-mozilla overlay.
  • Loading branch information
zimbatm committed Oct 22, 2017
1 parent 97d02a7 commit 1d6eaac
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 176 deletions.
40 changes: 0 additions & 40 deletions pkgs/development/compilers/rust/beta.nix

This file was deleted.

37 changes: 0 additions & 37 deletions pkgs/development/compilers/rust/nightly.nix

This file was deleted.

23 changes: 0 additions & 23 deletions pkgs/development/compilers/rust/nightlyBin.nix

This file was deleted.

This file was deleted.

This file was deleted.

32 changes: 6 additions & 26 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -6175,33 +6175,11 @@ with pkgs;
inherit (darwin) apple_sdk;
};

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;
# For beta and nightly releases use the nixpkgs-mozilla overlay
rust = callPackage ../development/compilers/rust { };
inherit (rust) cargo rustc;

# 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 { };
rustRegistry = callPackage ./rust-packages.nix { };

rustPlatform = recurseIntoAttrs (makeRustPlatform rust);

Expand All @@ -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 { };
Expand Down

0 comments on commit 1d6eaac

Please sign in to comment.