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: e430f8db22ea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8a08d7e7cc4a
Choose a head ref
  • 8 commits
  • 6 files changed
  • 1 contributor

Commits on Feb 19, 2019

  1. darwin.binutils: add myself as maintainer

    @matthewbauer
    matthewbauer committed Feb 19, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 916062A1C4748647
    Learn about vigilant mode
    Copy the full SHA
    c563965 View commit details

  2. darwin.binutils: set low priority

    @matthewbauer
    matthewbauer committed Feb 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a4fbfe4 View commit details

  3. unix-tools: set low priority

    @matthewbauer
    matthewbauer committed Feb 19, 2019
    Copy the full SHA
    228f2ea View commit details

  4. bintools-wrapper: set low priority

    @matthewbauer
    matthewbauer committed Feb 19, 2019
    Copy the full SHA
    9f6f223 View commit details

  5. gnutar: set low priority

    @matthewbauer
    matthewbauer committed Feb 19, 2019
    Copy the full SHA
    83254ec View commit details

  6. coreutils: set low priority

    @matthewbauer
    matthewbauer committed Feb 19, 2019
    Copy the full SHA
    fce294c View commit details

  7. nixos/system-path.nix: add 3 to every priority 

    We can’t use lowPrio here because it erases the differences in
priority of the packages by setting it to a constant value. see this
comment for info:

#55886 (comment)
    @matthewbauer
    matthewbauer committed Feb 19, 2019
    Copy the full SHA
    6fc5ce2 View commit details

Commits on Mar 9, 2019

  1. Merge pull request #56031 from matthewbauer/priorities 

    Add some more priorities
    @matthewbauer
    matthewbauer authored Mar 9, 2019
    Copy the full SHA
    8a08d7e View commit details
2 changes: 1 addition & 1 deletion nixos/modules/config/system-path.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ with lib;

let

requiredPackages = map lib.lowPrio
requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
[ config.nix.package
pkgs.acl
pkgs.attr
1 change: 1 addition & 0 deletions pkgs/build-support/bintools-wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -328,6 +328,7 @@ stdenv.mkDerivation {
{ description =
stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
+ " (wrapper script)";
priority = 10;
} // optionalAttrs useMacosReexportHack {
platforms = stdenv.lib.platforms.darwin;
};
5 changes: 5 additions & 0 deletions pkgs/os-specific/darwin/binutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,4 +52,9 @@ stdenv.mkDerivation {
passthru = {
inherit targetPrefix;
};

meta = {
maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
priority = 10;
};
}
2 changes: 2 additions & 0 deletions pkgs/tools/archivers/gnutar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -62,5 +62,7 @@ stdenv.mkDerivation rec {

maintainers = [ ];
platforms = stdenv.lib.platforms.all;

priority = 10;
};
}
2 changes: 2 additions & 0 deletions pkgs/tools/misc/coreutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -123,6 +123,8 @@ stdenv.mkDerivation rec {

platforms = platforms.unix ++ platforms.windows;

priority = 10;

maintainers = [ maintainers.eelco ];
};

5 changes: 4 additions & 1 deletion pkgs/top-level/unix-tools.nix
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,10 @@ let
bin = "${getBin provider}/bin/${cmd}";
manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz";
in runCommand "${cmd}-${version}" {
meta.platforms = map (n: { kernel.name = n; }) (attrNames providers);
meta = {
priority = 10;
platforms = map (n: { kernel.name = n; }) (attrNames providers);
};
passthru = { inherit provider; };
preferLocalBuild = true;
} ''