mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 08:16:15 +02:00
f742438465
The original idea was to implement a git-fetcher in Nix's core that supports content hashes[1]. In #3549[2] it has been suggested to actually use `fetchTree` for this since it's a fairly generic wrapper over the new fetcher-API[3] and already supports content-hashes. This patch implements a new git-fetcher based on `fetchTree` by incorporating the following changes: * Removed the original `fetchGit`-implementation and replaced it with an alias on the `fetchTree` implementation. * Ensured that the `git`-fetcher from `libfetchers` always computes a content-hash and returns an "empty" revision on dirty trees (the latter one is needed to retain backwards-compatibility). * The hash-mismatch error in the fetcher-API exits with code 102 as it usually happens whenever a hash-mismatch is detected by Nix. * Removed the `flakes`-feature-flag: I didn't see a reason why this API is so tightly coupled to the flakes-API and at least `fetchGit` should remain usable without any feature-flags. * It's only possible to specify a `narHash` for a `git`-tree if either a `ref` or a `rev` is given[4]. * It's now possible to specify an URL without a protocol. If it's missing, `file://` is automatically added as it was the case in the original `fetchGit`-implementation. [1] https://github.com/NixOS/nix/pull/3216 [2] https://github.com/NixOS/nix/pull/3549#issuecomment-625194383 [3] https://github.com/NixOS/nix/pull/3459 [4] https://github.com/NixOS/nix/pull/3216#issuecomment-553956703
52 lines
2.1 KiB
Bash
52 lines
2.1 KiB
Bash
source common.sh
|
|
|
|
clearStore
|
|
|
|
rm -rf $TEST_HOME
|
|
|
|
tarroot=$TEST_ROOT/tarball
|
|
rm -rf $tarroot
|
|
mkdir -p $tarroot
|
|
cp dependencies.nix $tarroot/default.nix
|
|
cp config.nix dependencies.builder*.sh $tarroot/
|
|
|
|
hash=$(nix hash-path $tarroot)
|
|
|
|
test_tarball() {
|
|
local ext="$1"
|
|
local compressor="$2"
|
|
|
|
tarball=$TEST_ROOT/tarball.tar$ext
|
|
(cd $TEST_ROOT && tar c tarball) | $compressor > $tarball
|
|
|
|
nix-env -f file://$tarball -qa --out-path | grep -q dependencies
|
|
|
|
nix-build -o $TEST_ROOT/result file://$tarball
|
|
|
|
nix-build -o $TEST_ROOT/result '<foo>' -I foo=file://$tarball
|
|
|
|
nix-build -o $TEST_ROOT/result -E "import (fetchTarball file://$tarball)"
|
|
|
|
nix-build -o $TEST_ROOT/result -E "import (fetchTree file://$tarball)"
|
|
nix-build -o $TEST_ROOT/result -E "import (fetchTree { type = \"tarball\"; url = file://$tarball; })"
|
|
nix-build -o $TEST_ROOT/result -E "import (fetchTree { type = \"tarball\"; url = file://$tarball; narHash = \"$hash\"; })"
|
|
nix-build -o $TEST_ROOT/result -E "import (fetchTree { type = \"tarball\"; url = file://$tarball; narHash = \"sha256-xdKv2pq/IiwLSnBBJXW8hNowI4MrdZfW+SYqDQs7Tzc=\"; })" 2>&1 | grep 'NAR hash mismatch in input'
|
|
|
|
nix-instantiate --strict --eval -E "!((import (fetchTree { type = \"tarball\"; url = file://$tarball; narHash = \"$hash\"; })) ? submodules)" >&2
|
|
nix-instantiate --strict --eval -E "!((import (fetchTree { type = \"tarball\"; url = file://$tarball; narHash = \"$hash\"; })) ? submodules)" 2>&1 | grep 'true'
|
|
|
|
nix-instantiate --eval -E '1 + 2' -I fnord=file://no-such-tarball.tar$ext
|
|
nix-instantiate --eval -E 'with <fnord/xyzzy>; 1 + 2' -I fnord=file://no-such-tarball$ext
|
|
(! nix-instantiate --eval -E '<fnord/xyzzy> 1' -I fnord=file://no-such-tarball$ext)
|
|
|
|
nix-instantiate --eval -E '<fnord/config.nix>' -I fnord=file://no-such-tarball$ext -I fnord=.
|
|
}
|
|
|
|
test_tarball '' cat
|
|
test_tarball .xz xz
|
|
test_tarball .gz gzip
|
|
|
|
rm -rf $TEST_ROOT/tmp
|
|
mkdir -p $TEST_ROOT/tmp
|
|
(! TMPDIR=$TEST_ROOT/tmp XDG_RUNTIME_DIR=$TEST_ROOT/tmp nix-env -f file://$(pwd)/bad.tar.xz -qa --out-path)
|
|
(! [ -e $TEST_ROOT/tmp/bad ])
|