Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 899024b79ef5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 13f19ce5d43e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 24, 2020

  1. referencesByPopularity: Fix cross compilation 

    (cherry picked from commit c3e7966)
    @adisbladis
    adisbladis committed Nov 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    adisbladis
    GPG key ID: 110BFAD44C6249B7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    97f498b View commit details

  2. referencesByPopularity: Don't use buildPackages at call-site 

    It's cleaner to reference buildPackages directly in
build-support/docker directly.

(cherry picked from commit 6847a5c)
    @adisbladis
    adisbladis committed Nov 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    adisbladis
    GPG key ID: 110BFAD44C6249B7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    13f19ce View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/build-support/docker/default.nix
3 changes: 1 addition & 2 deletions pkgs/build-support/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
moreutils,
nix,
pigz,
referencesByPopularity,
rsync,
runCommand,
runtimeShell,
@@ -772,7 +771,7 @@ rec {
then tag
else
lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
paths = referencesByPopularity overallClosure;
paths = buildPackages.referencesByPopularity overallClosure;
nativeBuildInputs = [ jq ];
} ''
${if (tag == null) then ''