From 9d75205879f46a25c0a9d6ca97bf9be02c1af1de Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 2 Feb 2023 18:11:10 +0000 Subject: [PATCH 1/2] tarball: add --show-trace to nix-env command Otherwise, when this fails on Hydra, we have no way of seeing what went wrong, e.g. [1]. [1]: https://hydra.nixos.org/log/2210x8gsd8jgdx73qa7hmhmmridyy7yp-nixpkgs-tarball-23.05pre450719.c11c55dd08a.drv Suggested-by: K900 --- pkgs/top-level/make-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index dbe96bd096f8..ea975a9b6fcc 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -64,7 +64,7 @@ pkgs.releaseTools.sourceTarball { echo "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --meta --json --show-trace --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages From 32d066dce3e443459148fcd003927f00362d8f26 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 3 Feb 2023 23:02:47 +0000 Subject: [PATCH 2/2] channel: add --show-trace to nix-env command Otherwise, when this fails on Hydra, we have no way of seeing what went wrong. --- nixos/lib/make-channel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index 9b920b989fcf..0a511468fb2d 100644 --- a/nixos/lib/make-channel.nix +++ b/nixos/lib/make-channel.nix @@ -23,7 +23,7 @@ pkgs.releaseTools.makeSourceTarball { cp -prd . ../$releaseName chmod -R u+w ../$releaseName ln -s . ../$releaseName/nixpkgs # hack to make ‘’ work - NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null + NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --show-trace --xml \* > /dev/null cd .. chmod -R u+w $releaseName tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName