forked from M-Labs/thermostat
nix: fetch rustManifest explicitly by default
This commit is contained in:
parent
bd42bc9129
commit
a5cf3c28da
|
@ -1,9 +1,11 @@
|
||||||
{ # Use master branch of the overlay by default
|
{ # Use master branch of the overlay by default
|
||||||
mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
|
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"
|
rustManifest ? builtins.fetchurl "https://static.rust-lang.org/dist/channel-rust-nightly.toml"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
|
||||||
|
in
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
rustPlatform = recurseIntoAttrs (callPackage (import ./nix/rustPlatform.nix) {
|
rustPlatform = recurseIntoAttrs (callPackage (import ./nix/rustPlatform.nix) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ recurseIntoAttrs, stdenv, lib,
|
{ recurseIntoAttrs, stdenv, lib,
|
||||||
makeRustPlatform, rustChannelOfTargets,
|
makeRustPlatform,
|
||||||
fetchurl, patchelf,
|
fetchurl, patchelf,
|
||||||
rustManifest ? ./channel-rust-nightly.toml
|
rustManifest ? ./channel-rust-nightly.toml
|
||||||
}:
|
}:
|
||||||
|
@ -17,11 +17,9 @@ let
|
||||||
inherit stdenv fetchurl patchelf;
|
inherit stdenv fetchurl patchelf;
|
||||||
};
|
};
|
||||||
rust =
|
rust =
|
||||||
if restrictedManifest
|
rustChannel.rust.override {
|
||||||
then
|
inherit targets;
|
||||||
rustChannel.rust.override { inherit targets; }
|
};
|
||||||
else
|
|
||||||
rustChannelOfTargets "nightly" null targets;
|
|
||||||
in
|
in
|
||||||
makeRustPlatform {
|
makeRustPlatform {
|
||||||
rustc = rust;
|
rustc = rust;
|
||||||
|
|
|
@ -4,11 +4,8 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
channel = pkgs.releaseTools.channel {
|
|
||||||
name = "adc2tcp";
|
|
||||||
adc2tcp = pkgs.lib.hydraJob (import ./default.nix {
|
adc2tcp = pkgs.lib.hydraJob (import ./default.nix {
|
||||||
inherit rustManifest;
|
inherit rustManifest;
|
||||||
mozillaOverlay = import <mozillaOverlay>;
|
mozillaOverlay = import <mozillaOverlay>;
|
||||||
rustRestrictedManifest = true;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue