aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-03-27 23:49:14 +0100
committerEelco Dolstra <edolstra@gmail.com>2019-11-26 22:07:28 +0100
commit6a9c815734de3549a5116796830bd4ebfd006025 (patch)
tree46f55d0201fc49c1a7528864681cad041f067e4f /tests
parent045708db4343174f30f3647776971c852f72a9e8 (diff)
Remove most of <nix/config.nix>
This is no longer needed.
Diffstat (limited to 'tests')
-rw-r--r--tests/config.nix.in (renamed from tests/config.nix)6
-rw-r--r--tests/local.mk2
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/config.nix b/tests/config.nix.in
index 6ba91065b..51aed539c 100644
--- a/tests/config.nix
+++ b/tests/config.nix.in
@@ -1,9 +1,7 @@
-with import <nix/config.nix>;
-
rec {
- inherit shell;
+ shell = "@bash@";
- path = coreutils;
+ path = "@coreutils@";
system = builtins.currentSystem;
diff --git a/tests/local.mk b/tests/local.mk
index 187f96ea2..f1d215eec 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -39,4 +39,4 @@ tests-environment = NIX_REMOTE= $(bash) -e
clean-files += $(d)/common.sh
-installcheck: $(d)/common.sh $(d)/plugins/libplugintest.$(SO_EXT)
+installcheck: $(d)/common.sh $(d)/config.nix $(d)/plugins/libplugintest.$(SO_EXT)