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

Merge pull request #25427 from aneeshusa/fix-meta-priority-types

Browse Source 
Fix meta priority types
This commit is contained in:
Domen Kožar 2017-05-02 09:38:32 +02:00 committed by GitHub
commit e057e5927e
3 changed files with 4 additions and 4 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;
}; };
} }

2
pkgs/stdenv/generic/default.nix
View File

@ -238,7 +238,7 @@ let
checkMetaAttr = k: v: checkMetaAttr = k: v:
if metaTypes?${k} then if metaTypes?${k} then
if metaTypes.${k}.check v then null else "key '${k}' has a value of an invalid type; expected ${metaTypes.${k}.description}" 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}"
else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];