diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-03-27 23:49:14 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-11-26 22:07:28 +0100 |
| commit | 6a9c815734de3549a5116796830bd4ebfd006025 (patch) | |
| tree | 46f55d0201fc49c1a7528864681cad041f067e4f | |
| parent | 045708db4343174f30f3647776971c852f72a9e8 (diff) | |
Remove most of <nix/config.nix>
This is no longer needed.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | corepkgs/config.nix.in | 8 | ||||
| -rw-r--r-- | tests/config.nix.in (renamed from tests/config.nix) | 6 | ||||
| -rw-r--r-- | tests/local.mk | 2 |
4 files changed, 4 insertions, 13 deletions
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 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) |