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 +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d825116e2 - Show all commits

2
artiq-full.nix
View File

@ -62,7 +62,7 @@ let
cp ${./artiq-full}/extras.nix $out cp ${./artiq-full}/extras.nix $out
cp ${./artiq-full}/*.patch $out cp ${./artiq-full}/*.patch $out
${if a6p ${if sinaraSystemsRev != null && sinaraSystemsHash != null
then '' then ''
REV=${sinaraSystemsRev} REV=${sinaraSystemsRev}
HASH=${sinaraSystemsHash} HASH=${sinaraSystemsHash}

13
flake.nix
View File

@ -24,13 +24,17 @@
}; };
}; };
outputs = sources@{ self, nixpkgs, ... }: outputs = sources@{ self, nixpkgs, sinara-systems, ... }:
let let
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
]; ];
forAllSystems = nixpkgs.lib.genAttrs systems; forAllSystems = nixpkgs.lib.genAttrs systems;
sinaraSystemsSrc = sinara-systems.outPath;
sinaraSystemsRev = sinara-systems.rev;
sinaraSystemsHash = builtins.replaceStrings ["sha256-"] [""] sinara-systems.narHash;
artiq-jobsets = system: artiqInputName: a6p: artiq-jobsets = system: artiqInputName: a6p:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@ -71,10 +75,7 @@
artiq-board-generated = artiq-board-generated =
(import ./artiq-board-generated { (import ./artiq-board-generated {
inherit pkgs; inherit pkgs;
sinaraSystemsSrc = null; inherit sinaraSystemsSrc sinaraSystemsRev sinaraSystemsHash;
sinaraSystemsRev = sources.sinara-systems.rev;
sinaraSystemsHash = builtins.replaceStrings ["sha256-"] [""]
sources.sinara-systems.narHash;
artiq-fast = artiq-fast-src; artiq-fast = artiq-fast-src;
}).generated-nix; }).generated-nix;
@ -82,7 +83,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; inherit sinaraSystemsSrc sinaraSystemsRev sinaraSystemsHash;
}; };
in { in {
inherit artiq-fast artiq-full; inherit artiq-fast artiq-full;