Unverified Commit 8980c1f7 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

various: fix parse errors for nix 2.3 

Path interpolation syntax is not supported in the minimum nix version.
parent a553ef29

nixos/tests/scion/freestanding-deployment/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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==";

pkgs/test/make-binary-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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