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

artiq-full: concatenate paths as paths not strings 

fixes running with restrict-eval=true on Hydra
This commit is contained in:
Astro 2021-02-02 13:20:00 +01:00
parent d149c66d05
commit 4666f1aa6a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq-full.nix
View File

@ -13,7 +13,7 @@ let
); );
isStandalone = jsonFile: isStandalone = jsonFile:
(builtins.fromJSON ( (builtins.fromJSON (
builtins.readFile "${sinaraSystemsSrc}/${jsonFile}" builtins.readFile (<sinaraSystemsSrc> + "/${jsonFile}")
)).base == "standalone"; )).base == "standalone";
in in
map (builtins.replaceStrings [".json"] [""]) ( map (builtins.replaceStrings [".json"] [""]) (

2
artiq-full/artiq-board.nix
View File

@ -16,7 +16,7 @@ let
cargoDeps = fetchcargo rec { cargoDeps = fetchcargo rec {
name = "artiq-firmware-cargo-deps"; name = "artiq-firmware-cargo-deps";
src = "${artiqSrc}/artiq/firmware"; src = "${artiqSrc}/artiq/firmware";
sha256 = (import "${artiqSrc}/artiq/firmware/cargosha256.nix"); sha256 = import (artiqSrc + "/artiq/firmware/cargosha256.nix");
}; };
cargoVendored = pkgs.stdenv.mkDerivation { cargoVendored = pkgs.stdenv.mkDerivation {