From c5639650b83c556b3f017523475184aa6c42a2cf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 20:56:09 -0500 Subject: [PATCH 1/7] darwin.binutils: add myself as maintainer --- pkgs/os-specific/darwin/binutils/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index db33b78a4aba..5ba4371c3bba 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -52,4 +52,8 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; }; + + meta = { + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; } From a4fbfe4217bfbe3b8ed1ddad606e9e559ae3d2e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:09:14 -0500 Subject: [PATCH 2/7] darwin.binutils: set low priority --- pkgs/os-specific/darwin/binutils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 5ba4371c3bba..3b5e8f1207a2 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation { meta = { maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + priority = 10; }; } From 228f2ea6a75ffe3e383b5087d777428d72b99b6c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:09:47 -0500 Subject: [PATCH 3/7] unix-tools: set low priority --- pkgs/top-level/unix-tools.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 7d4986068332..00edb7c09072 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -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; } '' From 9f6f223c1821681f992a461ca97492189a2a5fd7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:10:12 -0500 Subject: [PATCH 4/7] bintools-wrapper: set low priority --- pkgs/build-support/bintools-wrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 4122af898de9..03ba54525bf7 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -326,6 +326,7 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; + priority = 10; } // optionalAttrs useMacosReexportHack { platforms = stdenv.lib.platforms.darwin; }; From 83254ec1af301c1a1178942b106c2e89ecfde8a2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:11:16 -0500 Subject: [PATCH 5/7] gnutar: set low priority --- pkgs/tools/archivers/gnutar/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index a6f5052ad08a..8ec34ce6730b 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -62,5 +62,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.all; + + priority = 10; }; } From fce294caab31427f901a8723cee68dc91577f493 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:11:33 -0500 Subject: [PATCH 6/7] coreutils: set low priority --- pkgs/tools/misc/coreutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 3a3486503081..fabb58a33d6b 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -122,6 +122,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix ++ platforms.windows; + priority = 10; + maintainers = [ maintainers.eelco ]; }; From 6fc5ce2c4f765ce8edb4368557884ba1d7e2c53e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:16:30 -0500 Subject: [PATCH 7/7] nixos/system-path.nix: add 3 to every priority MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: https://github.com/NixOS/nixpkgs/issues/55886#issuecomment-464766877 --- nixos/modules/config/system-path.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 7a65e44e828d..fae2fc740082 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -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