From 04c902df7678fc59931c1b7874d638e94db1dbf5 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 14 Feb 2019 17:20:58 +0800 Subject: [PATCH] another attempt at working around persistent channel src issue --- artiq/channel.nix | 6 ++++++ main.nix | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 artiq/channel.nix diff --git a/artiq/channel.nix b/artiq/channel.nix new file mode 100644 index 0000000..9eb460c --- /dev/null +++ b/artiq/channel.nix @@ -0,0 +1,6 @@ +{ pkgs ? import {}, constituents}: +pkgs.releaseTools.channel { + name = "main"; + src = ./.; + inherit constituents; +} diff --git a/main.nix b/main.nix index 4c5c307..9dd1969 100644 --- 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; }; }