aboutsummaryrefslogtreecommitdiff
path: root/modules/misc/nixpkgs.nix
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2018-07-04 19:54:27 +0200
committerRobert Helgesson <robert@rycee.net>2018-07-04 19:56:13 +0200
commit86fcfc74da38edd53ef2c8117388bafb254efd19 (patch)
tree3d5fd557ccc52bb4c84addd25140125e4d558279 /modules/misc/nixpkgs.nix
parenteecebbf18632facd6d6fac51b2d54496cac68d92 (diff)
nixpkgs: replace use of `traceValIfNot`
The `traceValIfNot` function is deprecated in Nixpkgs master. Instead use `traceSeqN`. Fixes #301
Diffstat (limited to 'modules/misc/nixpkgs.nix')
-rw-r--r--modules/misc/nixpkgs.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 23c79b0f442..f51588f9d3e 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -34,7 +34,11 @@ let
configType = mkOptionType {
name = "nixpkgs-config";
description = "nixpkgs config";
- check = traceValIfNot isConfig;
+ check = x:
+ let traceXIfNot = c:
+ if c x then true
+ else lib.traceSeqN 1 x false;
+ in traceXIfNot isConfig;
merge = args: fold (def: mergeConfig def.value) {};
};