summary refs log tree commit diff
diff options
context:
space:
mode:
authorAneesh Agrawal <aneeshusa@gmail.com>2017-05-02 01:43:22 -0400
committerAneesh Agrawal <aneeshusa@gmail.com>2017-05-02 01:43:22 -0400
commitbd9246b00904af79c00d9d64e780fb7dd589c624 (patch)
tree93736fa1d3f612011324e3bf419b11b171f74b7c
parentf87e4c9f53925603a73a8ec1070dbcd743bedfd2 (diff)
downloadnixpkgs-bd9246b00904af79c00d9d64e780fb7dd589c624.tar
nixpkgs-bd9246b00904af79c00d9d64e780fb7dd589c624.tar.gz
nixpkgs-bd9246b00904af79c00d9d64e780fb7dd589c624.tar.bz2
nixpkgs-bd9246b00904af79c00d9d64e780fb7dd589c624.tar.lz
nixpkgs-bd9246b00904af79c00d9d64e780fb7dd589c624.tar.xz
nixpkgs-bd9246b00904af79c00d9d64e780fb7dd589c624.tar.zst
nixpkgs-bd9246b00904af79c00d9d64e780fb7dd589c624.zip
treewide: Always use integers for meta.priority
Meta attributes types are now enforce as of commit
90b9719f4fc95e54400a66bffcc8044c568cfa4b,
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.
-rw-r--r--lib/meta.nix4
-rw-r--r--pkgs/applications/science/biology/ncbi-tools/default.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/meta.nix b/lib/meta.nix
index 44e3cc011f1..ae652e579c3 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 e9d99aeb254..821a80230e5 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;
   };
 }