astro
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flake.nix: fix handling of sinara-systems

This commit is contained in:
Astro 2021-03-11 00:09:32 +01:00
parent d7432778e2
commit 3d825116e2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq-full.nix
View File

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

13
flake.nix
View File

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