forked from M-Labs/nix-scripts
artiq-full: concatenate paths as paths not strings
fixes running with restrict-eval=true on Hydra
This commit is contained in:
parent
d149c66d05
commit
4666f1aa6a
|
@ -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"] [""]) (
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
Loading…
Reference in New Issue