pyrox.dev
Merge pull request #25427 from aneeshusa/fix-meta-priority-types
Fix meta priority types
authored by Domen Kožar and committed by GitHub e057e592 767aad2a
+2
-2
lib/meta.nix
+2
-2
lib/meta.nix
···
45
45
/* Decrease the nix-env priority of the package, i.e., other
46
46
versions/variants of the package will be preferred.
47
47
*/
48
-
lowPrio = drv: addMetaAttrs { priority = "10"; } drv;
48
+
lowPrio = drv: addMetaAttrs { priority = 10; } drv;
49
49
50
50
51
51
/* Apply lowPrio to an attrset with derivations
···
56
56
/* Increase the nix-env priority of the package, i.e., this
57
57
version/variant of the package will be preferred.
58
58
*/
59
-
hiPrio = drv: addMetaAttrs { priority = "-10"; } drv;
59
+
hiPrio = drv: addMetaAttrs { priority = -10; } drv;
60
60
61
61
62
62
/* Apply hiPrio to an attrset with derivations
+1
-1
pkgs/applications/science/biology/ncbi-tools/default.nix
+1
-1
pkgs/applications/science/biology/ncbi-tools/default.nix
···
23
23
longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support'';
24
24
homepage = http://www.ncbi.nlm.nih.gov/IEB/ToolBox/;
25
25
license = "GPL";
26
-
priority = "5"; # zlib.so gives a conflict with zlib
26
+
priority = 5; # zlib.so gives a conflict with zlib
27
27
broken = true;
28
28
};
29
29
}
+1
-1
pkgs/stdenv/generic/default.nix
+1
-1
pkgs/stdenv/generic/default.nix
···
238
238
239
239
checkMetaAttr = k: v:
240
240
if metaTypes?${k} then
241
-
if metaTypes.${k}.check v then null else "key '${k}' has a value of an invalid type; expected ${metaTypes.${k}.description}"
241
+
if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}"
242
242
else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
243
243
checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
244
244