1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 06:21:14 +02:00

Merge remote-tracking branch 'origin/master' into flakes

This commit is contained in:
Eelco Dolstra 2019-06-25 14:27:57 +02:00
commit 2cc248c4fd
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
8 changed files with 50 additions and 38 deletions

View file

@ -767,8 +767,7 @@ StoreType getStoreType(const std::string & uri = settings.storeUri.get(),
const std::string & stateDir = settings.nixStateDir);
/* Return the default substituter stores, defined by the
substituters option and various legacy options like
binary-caches. */
substituters option and various legacy options. */
std::list<ref<Store>> getDefaultSubstituters();