lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Respect the narHash attribute in more input types

Browse source 
call-flake.nix now passes node.info.narHash to fetchTree. This ensures
that dirty Git trees work even in pure mode.
This commit is contained in:
Eelco Dolstra 2020-04-02 19:04:33 +02:00
parent 78ad5b3d91
commit a6ff66b658
6 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/flake/call-flake.nix
View file

@ -8,7 +8,10 @@ let
builtins.mapAttrs builtins.mapAttrs
(key: node: (key: node:
let let
sourceInfo = if key == lockFile.root then rootSrc else fetchTree (removeAttrs node.locked ["dir"]); sourceInfo =
if key == lockFile.root
then rootSrc
else fetchTree ({ inherit (node.info) narHash; } // removeAttrs node.locked ["dir"]);
subdir = if key == lockFile.root then rootSubdir else node.locked.dir or ""; subdir = if key == lockFile.root then rootSubdir else node.locked.dir or "";
flake = import (sourceInfo + (if subdir != "" then "/" else "") + subdir + "/flake.nix"); flake = import (sourceInfo + (if subdir != "" then "/" else "") + subdir + "/flake.nix");
inputs = builtins.mapAttrs (inputName: key: allNodes.${key}) (node.inputs or {}); inputs = builtins.mapAttrs (inputName: key: allNodes.${key}) (node.inputs or {});

4
src/libfetchers/fetchers.cc
View file

@ -29,8 +29,10 @@ std::unique_ptr<Input> inputFromURL(const std::string & url)
std::unique_ptr<Input> inputFromAttrs(const Attrs & attrs) std::unique_ptr<Input> inputFromAttrs(const Attrs & attrs)
{ {
auto attrs2(attrs);
attrs2.erase("narHash");
for (auto & inputScheme : *inputSchemes) { for (auto & inputScheme : *inputSchemes) {
auto res = inputScheme->inputFromAttrs(attrs); auto res = inputScheme->inputFromAttrs(attrs2);
if (res) { if (res) {
if (auto narHash = maybeGetStrAttr(attrs, "narHash")) if (auto narHash = maybeGetStrAttr(attrs, "narHash"))
// FIXME: require SRI hash. // FIXME: require SRI hash.

2
src/libfetchers/git.cc
View file

@ -39,7 +39,7 @@ struct GitInput : Input
bool isImmutable() const override bool isImmutable() const override
{ {
return (bool) rev; return (bool) rev || narHash;
} }
std::optional<std::string> getRef() const override { return ref; } std::optional<std::string> getRef() const override { return ref; }

2
src/libfetchers/github.cc
View file

@ -33,7 +33,7 @@ struct GitHubInput : Input
bool isImmutable() const override bool isImmutable() const override
{ {
return (bool) rev; return (bool) rev || narHash;
} }
std::optional<std::string> getRef() const override { return ref; } std::optional<std::string> getRef() const override { return ref; }

2
src/libfetchers/mercurial.cc
View file

@ -33,7 +33,7 @@ struct MercurialInput : Input
bool isImmutable() const override bool isImmutable() const override
{ {
return (bool) rev; return (bool) rev || narHash;
} }
std::optional<std::string> getRef() const override { return ref; } std::optional<std::string> getRef() const override { return ref; }

6
src/libfetchers/tarball.cc
View file

@ -205,9 +205,7 @@ struct TarballInput : Input
{ {
Attrs attrs; Attrs attrs;
attrs.emplace("url", url.to_string()); attrs.emplace("url", url.to_string());
if (narHash) if (hash)
attrs.emplace("narHash", narHash->to_string(SRI));
else if (hash)
attrs.emplace("hash", hash->to_string(SRI)); attrs.emplace("hash", hash->to_string(SRI));
return attrs; return attrs;
} }
@ -260,7 +258,7 @@ struct TarballInputScheme : InputScheme
if (maybeGetStrAttr(attrs, "type") != "tarball") return {}; if (maybeGetStrAttr(attrs, "type") != "tarball") return {};
for (auto & [name, value] : attrs) for (auto & [name, value] : attrs)
if (name != "type" && name != "url" && name != "hash" && name != "narHash") if (name != "type" && name != "url" && name != "hash")
throw Error("unsupported tarball input attribute '%s'", name); throw Error("unsupported tarball input attribute '%s'", name);
auto input = std::make_unique<TarballInput>(parseURL(getStrAttr(attrs, "url"))); auto input = std::make_unique<TarballInput>(parseURL(getStrAttr(attrs, "url")));