diff options
author | Rok Garbas <rok@garbas.si> | 2020-12-07 15:13:36 +0100 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2020-12-07 15:13:36 +0100 |
commit | 24db5b125f06f7f01f4afb024d41132ad1709801 (patch) | |
tree | 513ef449fc06963566c3f5cd8aefdc0ef6609d21 /src/libstore/globals.hh | |
parent | 44da19f73cfa87bb09c14fe64fce97904db0970c (diff) | |
parent | 8a06edbf7e984bae426068189ff9a631bc26af72 (diff) |
Merge remote-tracking branch 'origin/master' into cli-guideline
Diffstat (limited to 'src/libstore/globals.hh')
-rw-r--r-- | src/libstore/globals.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index eabd83e3f..6b4775683 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -583,7 +583,7 @@ public: Setting<Strings> substituters{ this, - nixStore == "/nix/store" ? Strings{"https://cache.nixos.org/"} : Strings(), + Strings{"https://cache.nixos.org/"}, "substituters", R"( A list of URLs of substituters, separated by whitespace. The default @@ -867,7 +867,7 @@ public: Example `~/.config/nix/nix.conf`: ``` - access-tokens = "github.com=23ac...b289 gitlab.mycompany.com=PAT:A123Bp_Cd..EfG gitlab.com=OAuth2:1jklw3jk" + access-tokens = github.com=23ac...b289 gitlab.mycompany.com=PAT:A123Bp_Cd..EfG gitlab.com=OAuth2:1jklw3jk ``` Example `~/code/flake.nix`: |