diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-04-07 14:29:45 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-04-07 14:29:45 +0200 |
| commit | 54955867a6de7b01f094bf3390d69db82d6c5d7c (patch) | |
| tree | 61a8d12cabb118cc92125d1fbf856328d74b4f43 /src/libstore | |
| parent | e35d83d1fc45f6c10fbd96462cee48016aa1497c (diff) | |
| parent | 55cefd41d63368d4286568e2956afd535cb44018 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/download.cc | 5 | ||||
| -rw-r--r-- | src/libstore/globals.hh | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc index 35a35cd78..af69699a8 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -1,14 +1,10 @@ #include "download.hh" #include "util.hh" #include "globals.hh" -#include "hash.hh" #include "store-api.hh" -#include "archive.hh" #include "s3.hh" #include "compression.hh" -#include "pathlocks.hh" #include "finally.hh" -#include "tarfile.hh" #ifdef ENABLE_S3 #include <aws/core/client/ClientConfiguration.h> @@ -386,6 +382,7 @@ struct CurlDownloader : public Downloader case CURLE_SSL_CACERT_BADFILE: case CURLE_TOO_MANY_REDIRECTS: case CURLE_WRITE_ERROR: + case CURLE_UNSUPPORTED_PROTOCOL: err = Misc; break; default: // Shut up warnings diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 41bbed33f..6c3c58269 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -361,14 +361,14 @@ public: void requireExperimentalFeature(const std::string & name); - Setting<std::string> flakeRegistry{this, "https://github.com/NixOS/flake-registry/raw/master/flake-registry.json", "flake-registry", - "Path or URI of the global flake registry."}; - Setting<bool> allowDirty{this, true, "allow-dirty", "Whether to allow dirty Git/Mercurial trees."}; Setting<bool> warnDirty{this, true, "warn-dirty", "Whether to warn about dirty Git/Mercurial trees."}; + + Setting<std::string> flakeRegistry{this, "https://github.com/NixOS/flake-registry/raw/master/flake-registry.json", "flake-registry", + "Path or URI of the global flake registry."}; }; |