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: bd4c7fdff4e7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6847a5c12dd5
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 24, 2020

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

    It's cleaner to reference buildPackages directly in
build-support/docker directly.
    @adisbladis
    adisbladis committed Nov 24, 2020
    Copy the full SHA
    6847a5c View commit details
Showing with 2 additions and 3 deletions.
  1. +1 −2 pkgs/build-support/docker/default.nix
  2. +1 −1 pkgs/top-level/all-packages.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 ''
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -511,7 +511,7 @@ in

nukeReferences = callPackage ../build-support/nuke-references { };

referencesByPopularity = buildPackages.callPackage ../build-support/references-by-popularity { };
referencesByPopularity = callPackage ../build-support/references-by-popularity { };

removeReferencesTo = callPackage ../build-support/remove-references-to { };