From a5cf3c28da22c5fd329c8f583523adf14586ea00 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 19 Mar 2019 22:24:02 +0100
Subject: [PATCH] nix: fetch rustManifest explicitly by default

---
 default.nix          |  4 +++-
 nix/rustPlatform.nix | 10 ++++------
 release.nix          |  3 ---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/default.nix b/default.nix
index 1bbdc53..b97df27 100644
--- a/default.nix
+++ b/default.nix
@@ -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) {
diff --git a/nix/rustPlatform.nix b/nix/rustPlatform.nix
index 4a9c8a2..3ca2279 100644
--- a/nix/rustPlatform.nix
+++ b/nix/rustPlatform.nix
@@ -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;
diff --git a/release.nix b/release.nix
index 7f31c3d..e21d65e 100644
--- a/release.nix
+++ b/release.nix
@@ -4,11 +4,8 @@
 }:
 
 {
-channel = pkgs.releaseTools.channel {
-  name = "adc2tcp";
   adc2tcp = pkgs.lib.hydraJob (import ./default.nix {
     inherit rustManifest;
     mozillaOverlay = import <mozillaOverlay>;
-    rustRestrictedManifest = true;
   });
 }