NixOS/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 17:46:29 +09:00
Code Activity

various: fix parse errors for nix 2.3

Browse source 
Path interpolation syntax is not supported in the minimum nix version.
This commit is contained in:
Wolfgang Walther 2025-05-10 22:23:24 +02:00
parent a553ef2950
commit 8980c1f7fc
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/scion/freestanding-deployment/default.nix
View file

@ -23,7 +23,7 @@ import ../../make-test-python.nix (
networkConfig.Address = "192.168.1.${toString hostId}/24"; networkConfig.Address = "192.168.1.${toString hostId}/24";
}; };
environment.etc = { environment.etc = {
"scion/topology.json".source = ./topology${toString hostId}.json; "scion/topology.json".source = ./topology + "${toString hostId}.json";
"scion/crypto/as".source = trust-root-configuration-keys + "/AS${toString hostId}"; "scion/crypto/as".source = trust-root-configuration-keys + "/AS${toString hostId}";
"scion/certs/ISD42-B1-S1.trc".source = trust-root-configuration-keys + "/ISD42-B1-S1.trc"; "scion/certs/ISD42-B1-S1.trc".source = trust-root-configuration-keys + "/ISD42-B1-S1.trc";
"scion/keys/master0.key".text = "U${toString hostId}v4k23ZXjGDwDofg/Eevw=="; "scion/keys/master0.key".text = "U${toString hostId}v4k23ZXjGDwDofg/Eevw==";

2
pkgs/test/make-binary-wrapper/default.nix
View file

@ -20,7 +20,7 @@ let
runCommand "make-binary-wrapper-test-${testname}" env '' runCommand "make-binary-wrapper-test-${testname}" env ''
mkdir -p tmp/foo # for the chdir test mkdir -p tmp/foo # for the chdir test
source=${./${testname}} source=${./. + "/${testname}"}
params=$(<"$source/${testname}.cmdline") params=$(<"$source/${testname}.cmdline")
eval "makeCWrapper /send/me/flags $params" > wrapper.c eval "makeCWrapper /send/me/flags $params" > wrapper.c