Unverified Commit 65d53fb1 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #214230 from alyssais/tarball-show-trace 

tarball: add --show-trace to nix-env command
parents 8fe83a02 32d066dc

nixos/lib/make-channel.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/make-tarball.nix

+1 −1
Original line number Diff line number Diff line
@@ -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