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

[WIP] Flakes #45

Closed
astro wants to merge 12 commits from astro/nix-scripts:flakes into master
pull from: astro/nix-scripts:flakes
merge into: M-Labs:master
Conversation 1 Commits 12 Files Changed 11 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7432778e2 - Show all commits

3
flake.nix
View File

@ -71,7 +71,7 @@
artiq-board-generated = artiq-board-generated =
(import ./artiq-board-generated { (import ./artiq-board-generated {
inherit pkgs; inherit pkgs;
sinaraSystemsSrc = null; #sources.sinara-systems.outPath; sinaraSystemsSrc = null;
sinaraSystemsRev = sources.sinara-systems.rev; sinaraSystemsRev = sources.sinara-systems.rev;
sinaraSystemsHash = builtins.replaceStrings ["sha256-"] [""] sinaraSystemsHash = builtins.replaceStrings ["sha256-"] [""]
sources.sinara-systems.narHash; sources.sinara-systems.narHash;
@ -82,6 +82,7 @@
import ./artiq-full.nix { import ./artiq-full.nix {
inherit pkgs a6p artiq-board-generated; inherit pkgs a6p artiq-board-generated;
artiq-fast = artiq-fast-src; artiq-fast = artiq-fast-src;
sinaraSystemsSrc = sources.sinara-systems.outPath;
}; };
in { in {
inherit artiq-fast artiq-full; inherit artiq-fast artiq-full;