From 8980c1f7fc23102fb723a41bc70cc3233ef5f62b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 May 2025 22:23:24 +0200 Subject: [PATCH] various: fix parse errors for nix 2.3 Path interpolation syntax is not supported in the minimum nix version. --- nixos/tests/scion/freestanding-deployment/default.nix | 2 +- pkgs/test/make-binary-wrapper/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/scion/freestanding-deployment/default.nix b/nixos/tests/scion/freestanding-deployment/default.nix index ca6c7cffc30e..7dbd10c225a5 100644 --- a/nixos/tests/scion/freestanding-deployment/default.nix +++ b/nixos/tests/scion/freestanding-deployment/default.nix @@ -23,7 +23,7 @@ import ../../make-test-python.nix ( networkConfig.Address = "192.168.1.${toString hostId}/24"; }; 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/certs/ISD42-B1-S1.trc".source = trust-root-configuration-keys + "/ISD42-B1-S1.trc"; "scion/keys/master0.key".text = "U${toString hostId}v4k23ZXjGDwDofg/Eevw=="; diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index 6f086de299a0..715b28f912e4 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -20,7 +20,7 @@ let runCommand "make-binary-wrapper-test-${testname}" env '' mkdir -p tmp/foo # for the chdir test - source=${./${testname}} + source=${./. + "/${testname}"} params=$(<"$source/${testname}.cmdline") eval "makeCWrapper /send/me/flags $params" > wrapper.c