JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Always use integers for meta.priority

Browse Source 
Meta attributes types are now enforce as of commit
90b9719f4f,
so ensure meta.priority is always set to an integer.

This fixes evaluation of `linuxPackages_latest.virtualbox`
(the impetus for this commit)
and other packages that use lowPrio or hiPrio.
This commit is contained in:
Aneesh Agrawal 2017-05-02 01:43:22 -04:00
parent f87e4c9f53
commit bd9246b009
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/meta.nix
View File

@ -45,7 +45,7 @@ rec {
/* Decrease the nix-env priority of the package, i.e., other /* Decrease the nix-env priority of the package, i.e., other
versions/variants of the package will be preferred. versions/variants of the package will be preferred.
*/ */
lowPrio = drv: addMetaAttrs { priority = "10"; } drv; lowPrio = drv: addMetaAttrs { priority = 10; } drv;
/* Apply lowPrio to an attrset with derivations /* Apply lowPrio to an attrset with derivations
@ -56,7 +56,7 @@ rec {
/* Increase the nix-env priority of the package, i.e., this /* Increase the nix-env priority of the package, i.e., this
version/variant of the package will be preferred. version/variant of the package will be preferred.
*/ */
hiPrio = drv: addMetaAttrs { priority = "-10"; } drv; hiPrio = drv: addMetaAttrs { priority = -10; } drv;
/* Apply hiPrio to an attrset with derivations /* Apply hiPrio to an attrset with derivations

2
pkgs/applications/science/biology/ncbi-tools/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support''; longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support'';
homepage = http://www.ncbi.nlm.nih.gov/IEB/ToolBox/; homepage = http://www.ncbi.nlm.nih.gov/IEB/ToolBox/;
license = "GPL"; license = "GPL";
priority = "5"; # zlib.so gives a conflict with zlib priority = 5; # zlib.so gives a conflict with zlib
broken = true; broken = true;
}; };
} }