Compare commits

...

5 commits

Author SHA1 Message Date
Matthew Bauer c1217c6a4e Add note 2022-08-29 13:39:54 -05:00
Matthew Bauer b1d2eff40a Discard context on fetchurl derivation
so that fetchurl outputs a real path instead of a source, and our
hashes match correctly between flake and non-flake.

also it looks like fetchTarball can support local files
2022-08-29 12:00:24 -05:00
Matthew Bauer 0b194c44aa Add hash to builtins.path calls 2022-08-26 15:06:04 -05:00
Matthew Bauer 6e1fbe397a Support local files too
Add support for local files in addition to http / https.
2022-08-26 15:03:10 -05:00
Matthew Bauer 5932243fcc Support fetching plain files
Add supports for new type = "file" locks added in
5b8c1deb18.

Unfortunately, the hash provided by the lock file is a recursive hash,
while fetchurl wants a flat hash. So we have to use a custom fetchurl
function using the builtin:fetchurl builder. Hopefully okay just to
add compat for this very useful lock type.
2022-08-26 14:42:35 -05:00

View file

@ -13,6 +13,42 @@ let
lockFile = builtins.fromJSON (builtins.readFile lockFilePath);
# Using custom fetchurl function here so that we can specify outputHashMode.
# The hash we get from the lock file is using recursive ingestion even though
# its not unpacked. So builtins.fetchurl and import <nix/fetchurl.nix> are
# insufficient.
# Note that this will be a derivation and not a path as fetchTarball is,
# causing the hash of this input to be different on flake and non-flake evaluation.
fetchurl = { url, sha256 }:
derivation {
builder = "builtin:fetchurl";
name = "source";
inherit url;
outputHash = sha256;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
executable = false;
unpack = false;
system = "builtin";
# No need to double the amount of network traffic
preferLocalBuild = true;
impureEnvVars = [
# We borrow these environment variables from the caller to allow
# easy proxy configuration. This is impure, but a fixed-output
# derivation like fetchurl is allowed to do so since its result is
# by definition pure.
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
];
# To make "nix-prefetch-url" work.
urls = [ url ];
};
fetchTree =
info:
if info.type == "github" then
@ -44,7 +80,10 @@ let
} else {
})
else if info.type == "path" then
{ outPath = builtins.path { path = info.path; };
{ outPath = builtins.path
({ path = info.path; }
// (if info ? narHash then { sha256 = info.narHash; } else {})
);
narHash = info.narHash;
}
else if info.type == "tarball" then
@ -53,6 +92,7 @@ let
({ inherit (info) url; }
// (if info ? narHash then { sha256 = info.narHash; } else {})
);
narHash = info.narHash;
}
else if info.type == "gitlab" then
{ inherit (info) rev narHash lastModified;
@ -63,8 +103,23 @@ let
);
shortRev = builtins.substring 0 7 info.rev;
}
else if info.type == "file" then
{ outPath =
if builtins.substring 0 7 info.url == "http://" || builtins.substring 0 8 info.url == "https://" then
fetchurl
({ inherit (info) url; }
// (if info ? narHash then { sha256 = info.narHash; } else {})
)
else if builtins.substring 0 7 info.url == "file://" then
builtins.path
({ path = builtins.substring 7 (-1) info.url; }
// (if info ? narHash then { sha256 = info.narHash; } else {})
)
else throw "can't support url scheme of flake input with url '${info.url}'";
narHash = info.narHash;
}
else
# FIXME: add Mercurial, tarball inputs.
# FIXME: add Mercurial input
throw "flake input has unsupported input type '${info.type}'";
callFlake4 = flakeSrc: locks: