diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-09 18:02:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-09 18:02:55 -0500 |
commit | 8a08d7e7cc4a54cc3947f4cf5aa8fe2ae665513a (patch) | |
tree | 0d5f77234a296a6959653748afad18a041e1d78d | |
parent | e430f8db22eab608a7ce7365ea5dcdf0b269c9f3 (diff) | |
parent | 6fc5ce2c4f765ce8edb4368557884ba1d7e2c53e (diff) | |
download | nixlib-8a08d7e7cc4a54cc3947f4cf5aa8fe2ae665513a.tar nixlib-8a08d7e7cc4a54cc3947f4cf5aa8fe2ae665513a.tar.gz nixlib-8a08d7e7cc4a54cc3947f4cf5aa8fe2ae665513a.tar.bz2 nixlib-8a08d7e7cc4a54cc3947f4cf5aa8fe2ae665513a.tar.lz nixlib-8a08d7e7cc4a54cc3947f4cf5aa8fe2ae665513a.tar.xz nixlib-8a08d7e7cc4a54cc3947f4cf5aa8fe2ae665513a.tar.zst nixlib-8a08d7e7cc4a54cc3947f4cf5aa8fe2ae665513a.zip |
Merge pull request #56031 from matthewbauer/priorities
Add some more priorities
-rw-r--r-- | nixos/modules/config/system-path.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 1 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/binutils/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/unix-tools.nix | 5 |
6 files changed, 15 insertions, 2 deletions
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 diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index fca796363844..98d43c01ba06 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -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; }; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index db33b78a4aba..3b5e8f1207a2 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -52,4 +52,9 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; }; + + meta = { + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + priority = 10; + }; } 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; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 84a2735dff8f..ce1d4dc0ba87 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -123,6 +123,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix ++ platforms.windows; + priority = 10; + maintainers = [ maintainers.eelco ]; }; 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; } '' |