M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

Revert "another attempt at working around persistent channel src issue" 

This reverts commit 04c902df76.
This commit is contained in:
Sebastien Bourdeauducq 2019-02-14 17:26:52 +08:00
parent 04c902df76
commit 4363f35e51
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/channel.nix
View File

@ -1,6 +0,0 @@
{ pkgs ? import <nixpkgs> {}, constituents}:
pkgs.releaseTools.channel {
name = "main";
src = ./.;
inherit constituents;
}

5
main.nix
View File

@ -38,8 +38,9 @@ let
} // boardJobs // artiqPkgs; } // boardJobs // artiqPkgs;
in in
jobs // { jobs // {
channel = import "${generatedNix}/channel.nix" { channel = pkgs.releaseTools.channel {
inherit pkgs; name = "main";
src = "${generatedNix}";
constituents = builtins.attrValues jobs; constituents = builtins.attrValues jobs;
}; };
} }