Remove most of <nix/config.nix>

This is no longer needed.
NixOS · Nov 26, 2019 · 6a9c815 · 6a9c815 · LnL7 · Jan 4, 2020
1 parent 045708d
commit 6a9c815
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git 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
@@ -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 → tests/config.nix.in b/tests/config.nix → 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
@@ -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)