From 72d85acba4ed3647e00aca829ae16ea10b83a9a4 Mon Sep 17 00:00:00 2001 From: Olmo Kramer Date: Fri, 31 May 2024 13:21:16 -0700 Subject: [PATCH] nix flake update: add test for multiple inputs from nix#10073 Upstream-PR: https://github.com/NixOS/nix/pull/10073 Change-Id: I53fcb43b387e55439e062e208877afeb88493bb4 --- tests/functional/flakes/flakes.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh index dfa088960..3ef518b23 100644 --- a/tests/functional/flakes/flakes.sh +++ b/tests/functional/flakes/flakes.sh @@ -485,6 +485,16 @@ nix flake lock $flake3Dir nix flake update flake2/flake1 --flake "$flake3Dir" [[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]] +# Test updating multiple inputs. +nix flake lock "$flake3Dir" --override-input flake1 flake1/master/$hash1 +nix flake lock "$flake3Dir" --override-input flake2/flake1 flake1/master/$hash1 +[[ $(jq -r .nodes.flake1.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]] +[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]] + +nix flake update flake1 flake2/flake1 --flake "$flake3Dir" +[[ $(jq -r .nodes.flake1.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]] +[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]] + # Test 'nix flake metadata --json'. nix flake metadata $flake3Dir --json | jq .