From 86fcfc74da38edd53ef2c8117388bafb254efd19 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 4 Jul 2018 19:54:27 +0200 Subject: [PATCH] nixpkgs: replace use of `traceValIfNot` The `traceValIfNot` function is deprecated in Nixpkgs master. Instead use `traceSeqN`. Fixes #301 --- modules/misc/nixpkgs.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix index 23c79b0f4..f51588f9d 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) {}; };