From be208d8e7888985e1808d65635dca60328dc40a8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 23 Dec 2023 17:15:09 -0500 Subject: [PATCH] remote-store test: Break out IFD expression into a separate file (cherry picked from commit 9cb287657bec5a969d8bb1678d598d9fa820e60b) --- tests/ifd.nix | 10 ++++++++++ tests/remote-store.sh | 13 +------------ 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 tests/ifd.nix diff --git a/tests/ifd.nix b/tests/ifd.nix new file mode 100644 index 000000000..d0b9b54ad --- /dev/null +++ b/tests/ifd.nix @@ -0,0 +1,10 @@ +with import ./config.nix; +import ( + mkDerivation { + name = "foo"; + bla = import ./dependencies.nix {}; + buildCommand = " + echo \\\"hi\\\" > $out + "; + } +) diff --git a/tests/remote-store.sh b/tests/remote-store.sh index 50e6f24b9..7649964ef 100644 --- a/tests/remote-store.sh +++ b/tests/remote-store.sh @@ -19,18 +19,7 @@ else fi # Test import-from-derivation through the daemon. -[[ $(nix eval --impure --raw --expr ' - with import ./config.nix; - import ( - mkDerivation { - name = "foo"; - bla = import ./dependencies.nix {}; - buildCommand = " - echo \\\"hi\\\" > $out - "; - } - ) -') = hi ]] +[[ $(nix eval --impure --raw --file ./ifd.nix) = hi ]] storeCleared=1 NIX_REMOTE_=$NIX_REMOTE $SHELL ./user-envs.sh