From 4354b37fc4d83002027af80cce037e2ee89f552c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Fri, 8 Mar 2024 08:48:53 +0100 Subject: [PATCH 1/2] Add more logs to the evalNixpkgs test Make it possible to understand a mimimum what's going on in case of a failure --- flake.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 42aaace67..80a55d40d 100644 --- a/flake.nix +++ b/flake.nix @@ -299,8 +299,11 @@ '' type -p nix-env # Note: we're filtering out nixos-install-tools because https://github.com/NixOS/nixpkgs/pull/153594#issuecomment-1020530593. - time nix-env --store dummy:// -f ${nixpkgs-regression} -qaP --drv-path | sort | grep -v nixos-install-tools > packages - [[ $(sha1sum < packages | cut -c1-40) = ff451c521e61e4fe72bdbe2d0ca5d1809affa733 ]] + ( + set -x + time nix-env --store dummy:// -f ${nixpkgs-regression} -qaP --drv-path | sort | grep -v nixos-install-tools > packages + [[ $(sha1sum < packages | cut -c1-40) = ff451c521e61e4fe72bdbe2d0ca5d1809affa733 ]] + ) mkdir $out ''; From 201369dceb49da19af42e29b1dc11586da4a26e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Fri, 8 Mar 2024 08:50:27 +0100 Subject: [PATCH 2/2] tests.evalNixpkgs: Update the golden hash `nix-env -qaP`'s output has changed a bit because of https://github.com/NixOS/nix/issues/10132. Although that's a bit annoying, it isn't nearly as problematic as the evaluation changes that this test is supposed to catch. So it's find to just update the hash for the time being and fix the issue later (properly fixing the issue will very likely change the hash any way). --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 80a55d40d..e9d8395ec 100644 --- a/flake.nix +++ b/flake.nix @@ -302,7 +302,7 @@ ( set -x time nix-env --store dummy:// -f ${nixpkgs-regression} -qaP --drv-path | sort | grep -v nixos-install-tools > packages - [[ $(sha1sum < packages | cut -c1-40) = ff451c521e61e4fe72bdbe2d0ca5d1809affa733 ]] + [[ $(sha1sum < packages | cut -c1-40) = e01b031fc9785a572a38be6bc473957e3b6faad7 ]] ) mkdir $out '';