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

Fix backward compatibility with Nix < 1.6

Browse Source 
"with" used to be less lazy, so don't rely on that.  Also don't use
the "<" operator.
This commit is contained in:
Eelco Dolstra
2013-10-30 19:12:25 +01:00
parent f3cdf9b477
commit a61b800da5
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/modules.nix
+7 -3
View File
@@ -1,5 +1,9 @@
with import ./.. {};
with lib;
with import ./lists.nix;
with import ./trivial.nix;
with import ./attrsets.nix;
with import ./options.nix;
with import ./debug.nix;
with import ./types.nix;
rec {
@@ -244,7 +248,7 @@ rec {
let
defaultPrio = 100;
getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
min = x: y: if x < y then x else y;
min = x: y: if builtins.lessThan x y then x else y;
highestPrio = fold (def: prio: min (getPrio def) prio) 9999 defs;
strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;