another attempt at working around persistent channel src issue

2019-02-14 17:20:58 +08:00 · 2019-02-14 17:20:58 +08:00 · 04c902df76
commit 04c902df76
parent 30cfea4ae6
2 changed files with 8 additions and 3 deletions
--- a/artiq/channel.nix
+++ b/artiq/channel.nix
@ -0,0 +1,6 @@
+{ pkgs ? import <nixpkgs> {}, constituents}:
+pkgs.releaseTools.channel {
+  name = "main";
+  src = ./.;
+  inherit constituents;
+}
--- a/main.nix
+++ b/main.nix
@ -38,9 +38,8 @@ let
  } // boardJobs // artiqPkgs;
 in
  jobs // {
-    channel = pkgs.releaseTools.channel {
-      name = "main";
-      src = "${generatedNix}";
+    channel = import "${generatedNix}/channel.nix" {
+      inherit pkgs;
      constituents = builtins.attrValues jobs;
    };
  }