diff options
| author | Domen Kožar <domen@enlambda.com> | 2017-05-02 09:38:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 09:38:32 +0200 |
| commit | e057e5927e2de5c256def7e7462499c5f9d87b17 (patch) | |
| tree | 54897c74e8a89f6fefd04aa93ce0e1d02aebbc40 | |
| parent | 767aad2aaa4e2730b74cca9dbe513aa933f7667b (diff) | |
| parent | d3acf9891cd22cab0d3821494d002890b617a04e (diff) | |
| download | nixlib-e057e5927e2de5c256def7e7462499c5f9d87b17.tar nixlib-e057e5927e2de5c256def7e7462499c5f9d87b17.tar.gz nixlib-e057e5927e2de5c256def7e7462499c5f9d87b17.tar.bz2 nixlib-e057e5927e2de5c256def7e7462499c5f9d87b17.tar.lz nixlib-e057e5927e2de5c256def7e7462499c5f9d87b17.tar.xz nixlib-e057e5927e2de5c256def7e7462499c5f9d87b17.tar.zst nixlib-e057e5927e2de5c256def7e7462499c5f9d87b17.zip | |
Merge pull request #25427 from aneeshusa/fix-meta-priority-types
Fix meta priority types
| -rw-r--r-- | lib/meta.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/ncbi-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/meta.nix b/lib/meta.nix index 44e3cc011f18..ae652e579c39 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -45,7 +45,7 @@ rec { /* 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 = drv: addMetaAttrs { priority = 10; } drv; /* Apply lowPrio to an attrset with derivations @@ -56,7 +56,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 = drv: addMetaAttrs { priority = -10; } drv; /* Apply hiPrio to an attrset with derivations diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index e9d99aeb254c..821a80230e50 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { 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/; license = "GPL"; - priority = "5"; # zlib.so gives a conflict with zlib + priority = 5; # zlib.so gives a conflict with zlib broken = true; }; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fcb50bd9ff50..a063a1ed2dc9 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -238,7 +238,7 @@ let checkMetaAttr = k: v: 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)}]"; checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; |