max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9805 from yshui/prefetch-unpack

Browse source 
Add --unpack to nix store prefetch-file
This commit is contained in:
Théophane Hufschmitt 2024-01-22 10:51:50 +01:00 committed by GitHub
commit f51409cf98
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nix/prefetch.cc
View file

@ -262,6 +262,7 @@ struct CmdStorePrefetchFile : StoreCommand, MixJSON
{ {
std::string url; std::string url;
bool executable = false; bool executable = false;
bool unpack = false;
std::optional<std::string> name; std::optional<std::string> name;
HashAlgorithm hashAlgo = HashAlgorithm::SHA256; HashAlgorithm hashAlgo = HashAlgorithm::SHA256;
std::optional<Hash> expectedHash; std::optional<Hash> expectedHash;
@ -294,6 +295,14 @@ struct CmdStorePrefetchFile : StoreCommand, MixJSON
.handler = {&executable, true}, .handler = {&executable, true},
}); });
addFlag({
.longName = "unpack",
.description =
"Unpack the archive (which must be a tarball or zip file) and add "
"the result to the Nix store.",
.handler = {&unpack, true},
});
expectArg("url", &url); expectArg("url", &url);
} }
@ -310,7 +319,7 @@ struct CmdStorePrefetchFile : StoreCommand, MixJSON
} }
void run(ref<Store> store) override void run(ref<Store> store) override
{ {
auto [storePath, hash] = prefetchFile(store, url, name, hashAlgo, expectedHash, false, executable); auto [storePath, hash] = prefetchFile(store, url, name, hashAlgo, expectedHash, unpack, executable);
if (json) { if (json) {
auto res = nlohmann::json::object(); auto res = nlohmann::json::object();