From 4363f35e51058701c92b22399fc7a098eecf6d7e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 14 Feb 2019 17:26:52 +0800
Subject: [PATCH] Revert "another attempt at working around persistent channel
 src issue"

This reverts commit 04c902df7678fc59931c1b7874d638e94db1dbf5.
---
 artiq/channel.nix | 6 ------
 main.nix          | 5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 artiq/channel.nix

diff --git a/artiq/channel.nix b/artiq/channel.nix
deleted file mode 100644
index 9eb460c..0000000
--- a/artiq/channel.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs ? import <nixpkgs> {}, constituents}:
-pkgs.releaseTools.channel {
-  name = "main";
-  src = ./.;
-  inherit constituents;
-}
diff --git a/main.nix b/main.nix
index 9dd1969..4c5c307 100644
--- a/main.nix
+++ b/main.nix
@@ -38,8 +38,9 @@ let
   } // boardJobs // artiqPkgs;
 in
   jobs // {
-    channel = import "${generatedNix}/channel.nix" {
-      inherit pkgs;
+    channel = pkgs.releaseTools.channel {
+      name = "main";
+      src = "${generatedNix}";
       constituents = builtins.attrValues jobs;
     };
   }