nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 06:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove most of <nix/config.nix>

Browse Source 
This is no longer needed.
This commit is contained in:
Eelco Dolstra 2019-03-27 23:49:14 +01:00
parent 045708db43
commit 6a9c815734
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -86,6 +86,7 @@ perl/Makefile.config
/tests/restricted-innocent /tests/restricted-innocent
/tests/shell /tests/shell
/tests/shell.drv /tests/shell.drv
/tests/config.nix
# /tests/lang/ # /tests/lang/
/tests/lang/*.out /tests/lang/*.out

8
corepkgs/config.nix.in
View File

@ -4,14 +4,6 @@ let
let val = builtins.getEnv var; in let val = builtins.getEnv var; in
if val != "" then val else def; if val != "" then val else def;
in rec { in rec {
shell = "@bash@";
coreutils = "@coreutils@";
bzip2 = "@bzip2@";
gzip = "@gzip@";
xz = "@xz@";
tar = "@tar@";
tarFlags = "@tarFlags@";
tr = "@tr@";
nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@"; nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@";
nixPrefix = "@prefix@"; nixPrefix = "@prefix@";
nixLibexecDir = fromEnv "NIX_LIBEXEC_DIR" "@libexecdir@"; nixLibexecDir = fromEnv "NIX_LIBEXEC_DIR" "@libexecdir@";

6
tests/config.nix → tests/config.nix.in
View File

@ -1,9 +1,7 @@
with import <nix/config.nix>;
rec { rec {
inherit shell; shell = "@bash@";
path = coreutils; path = "@coreutils@";
system = builtins.currentSystem; system = builtins.currentSystem;

2
tests/local.mk
View File

@ -39,4 +39,4 @@ tests-environment = NIX_REMOTE= $(bash) -e
clean-files += $(d)/common.sh 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)