diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2023-06-16 18:03:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-16 18:03:50 +0200 |
| commit | e503eadafc5fb79dabcca161aa3bf41a4fb777a5 (patch) | |
| tree | 8b0464d9e29a7e5245c8e921c6623f5cedfa31a2 /src/libexpr | |
| parent | 713836112c1e0f83af38a2273d5f32d52f4a4808 (diff) | |
| parent | b1ed9b4b0cc037a8b14dcc37fd32f6a5a16e7ba3 (diff) | |
Merge pull request #8477 from edolstra/tarball-flake-redirects
Tarball flake improvements
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/parser.y | 2 | ||||
| -rw-r--r-- | src/libexpr/primops/fetchTree.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 4d981712a..3b545fd84 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -793,7 +793,7 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl if (EvalSettings::isPseudoUrl(elem.second)) { try { auto storePath = fetchers::downloadTarball( - store, EvalSettings::resolvePseudoUrl(elem.second), "source", false).first.storePath; + store, EvalSettings::resolvePseudoUrl(elem.second), "source", false).tree.storePath; res = { true, store->toRealPath(storePath) }; } catch (FileTransferError & e) { logWarning({ diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc index be8159cc8..1d23ef53b 100644 --- a/src/libexpr/primops/fetchTree.cc +++ b/src/libexpr/primops/fetchTree.cc @@ -266,7 +266,7 @@ static void fetch(EvalState & state, const PosIdx pos, Value * * args, Value & v // https://github.com/NixOS/nix/issues/4313 auto storePath = unpack - ? fetchers::downloadTarball(state.store, *url, name, (bool) expectedHash).first.storePath + ? fetchers::downloadTarball(state.store, *url, name, (bool) expectedHash).tree.storePath : fetchers::downloadFile(state.store, *url, name, (bool) expectedHash).storePath; if (expectedHash) { |