nix: fetch rustManifest explicitly by default

This commit is contained in:
Astro 2019-03-19 22:24:02 +01:00
parent bd42bc9129
commit a5cf3c28da
3 changed files with 7 additions and 10 deletions

View File

@ -1,9 +1,11 @@
{ # Use master branch of the overlay by default
mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
pkgs ? import <nixpkgs> { overlays = [ mozillaOverlay ]; },
rustManifest ? builtins.fetchurl "https://static.rust-lang.org/dist/channel-rust-nightly.toml"
}:
let
pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
in
with pkgs;
let
rustPlatform = recurseIntoAttrs (callPackage (import ./nix/rustPlatform.nix) {

View File

@ -1,5 +1,5 @@
{ recurseIntoAttrs, stdenv, lib,
makeRustPlatform, rustChannelOfTargets,
makeRustPlatform,
fetchurl, patchelf,
rustManifest ? ./channel-rust-nightly.toml
}:
@ -17,11 +17,9 @@ let
inherit stdenv fetchurl patchelf;
};
rust =
if restrictedManifest
then
rustChannel.rust.override { inherit targets; }
else
rustChannelOfTargets "nightly" null targets;
rustChannel.rust.override {
inherit targets;
};
in
makeRustPlatform {
rustc = rust;

View File

@ -4,11 +4,8 @@
}:
{
channel = pkgs.releaseTools.channel {
name = "adc2tcp";
adc2tcp = pkgs.lib.hydraJob (import ./default.nix {
inherit rustManifest;
mozillaOverlay = import <mozillaOverlay>;
rustRestrictedManifest = true;
});
}