From 6a9c815734de3549a5116796830bd4ebfd006025 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 27 Mar 2019 23:49:14 +0100
Subject: [PATCH] Remove most of <nix/config.nix>
This is no longer needed.
---
.gitignore | 1 +
corepkgs/config.nix.in | 8 --------
tests/{config.nix => config.nix.in} | 6 ++----
tests/local.mk | 2 +-
4 files changed, 4 insertions(+), 13 deletions(-)
rename tests/{config.nix => config.nix.in} (86%)
diff --git a/.gitignore b/.gitignore
index f58e1f90f..f64031e12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@ perl/Makefile.config
/tests/restricted-innocent
/tests/shell
/tests/shell.drv
+/tests/config.nix
# /tests/lang/
/tests/lang/*.out
diff --git a/corepkgs/config.nix.in b/corepkgs/config.nix.in
index 4ea182d8f..cb9945944 100644
--- a/corepkgs/config.nix.in
+++ b/corepkgs/config.nix.in
@@ -4,14 +4,6 @@ let
let val = builtins.getEnv var; in
if val != "" then val else def;
in rec {
- shell = "@bash@";
- coreutils = "@coreutils@";
- bzip2 = "@bzip2@";
- gzip = "@gzip@";
- xz = "@xz@";
- tar = "@tar@";
- tarFlags = "@tarFlags@";
- tr = "@tr@";
nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@";
nixPrefix = "@prefix@";
nixLibexecDir = fromEnv "NIX_LIBEXEC_DIR" "@libexecdir@";
diff --git a/tests/config.nix b/tests/config.nix.in
similarity index 86%
rename from tests/config.nix
rename to 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)
--
GitLab