diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-19 09:23:29 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-19 09:23:29 +0100 |
commit | bd538d6bb0a9dd72de7e8717bae705245060c2c4 (patch) | |
tree | 1058a21ab3ae9da463e1342bdd3e2074f912877c /lib | |
parent | 379c3899a59df74a2359b34f80604416a25bae05 (diff) | |
parent | aaff01ecbf993100a3704f843bfe27e0bc2ce0c3 (diff) | |
download | nixlib-bd538d6bb0a9dd72de7e8717bae705245060c2c4.tar nixlib-bd538d6bb0a9dd72de7e8717bae705245060c2c4.tar.gz nixlib-bd538d6bb0a9dd72de7e8717bae705245060c2c4.tar.bz2 nixlib-bd538d6bb0a9dd72de7e8717bae705245060c2c4.tar.lz nixlib-bd538d6bb0a9dd72de7e8717bae705245060c2c4.tar.xz nixlib-bd538d6bb0a9dd72de7e8717bae705245060c2c4.tar.zst nixlib-bd538d6bb0a9dd72de7e8717bae705245060c2c4.zip |
Merge master into staging-next
Diffstat (limited to 'lib')
-rw-r--r-- | lib/default.nix | 2 | ||||
-rw-r--r-- | lib/meta.nix | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/default.nix b/lib/default.nix index 48eb99a7198a..d400907ebb0c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -94,7 +94,7 @@ let callPackageWith callPackagesWith extendDerivation hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName - appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio + appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio hiPrioSet; inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices diff --git a/lib/meta.nix b/lib/meta.nix index 199030c103af..2e83c4247ddf 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -41,16 +41,18 @@ rec { let x = builtins.parseDrvName name; in "${x.name}-${suffix}-${x.version}"); - /* Apply a function to each derivation and only to derivations in an attrset + /* Apply a function to each derivation and only to derivations in an attrset. */ mapDerivationAttrset = f: set: lib.mapAttrs (name: pkg: if lib.isDerivation pkg then (f pkg) else pkg) set; + /* Set the nix-env priority of the package. + */ + setPrio = priority: addMetaAttrs { inherit priority; }; /* Decrease the nix-env priority of the package, i.e., other versions/variants of the package will be preferred. */ - lowPrio = drv: addMetaAttrs { priority = 10; } drv; - + lowPrio = setPrio 10; /* Apply lowPrio to an attrset with derivations */ @@ -60,8 +62,7 @@ rec { /* Increase the nix-env priority of the package, i.e., this version/variant of the package will be preferred. */ - hiPrio = drv: addMetaAttrs { priority = -10; } drv; - + hiPrio = setPrio (-10); /* Apply hiPrio to an attrset with derivations */ |