diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-02-03 23:27:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-03 23:27:10 +0000 |
| commit | 65d53fb147c8618011d8524995ca3bbfc145aace (patch) | |
| tree | db2620cb1eae968cc8c8bb65c0ce4715b6c3e53b | |
| parent | 8fe83a027e547e89a36e6b4e0774cb01ef478fac (diff) | |
| parent | 32d066dce3e443459148fcd003927f00362d8f26 (diff) | |
| download | nixpkgs-65d53fb147c8618011d8524995ca3bbfc145aace.tar nixpkgs-65d53fb147c8618011d8524995ca3bbfc145aace.tar.gz nixpkgs-65d53fb147c8618011d8524995ca3bbfc145aace.tar.bz2 nixpkgs-65d53fb147c8618011d8524995ca3bbfc145aace.tar.lz nixpkgs-65d53fb147c8618011d8524995ca3bbfc145aace.tar.xz nixpkgs-65d53fb147c8618011d8524995ca3bbfc145aace.tar.zst nixpkgs-65d53fb147c8618011d8524995ca3bbfc145aace.zip | |
Merge pull request #214230 from alyssais/tarball-show-trace
tarball: add --show-trace to nix-env command
| -rw-r--r-- | nixos/lib/make-channel.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index 9b920b989fc..0a511468fb2 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 ‘<nixpkgs>’ 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 diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index dbe96bd096f..ea975a9b6fc 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 |