summary refs log tree commit diff
path: root/lib/debug.nix
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2018-04-02 17:25:03 +0200
committerProfpatsch <mail@profpatsch.de>2018-04-27 18:59:39 +0200
commita455637d28fb209a4677f55d887aa91ca05ed44e (patch)
tree2b39eff29bb19f196a9ed36a7d73508e343f8dba /lib/debug.nix
parenta5f6cdfd7ef36c0ee3c8bda8b487d1292838862f (diff)
downloadnixpkgs-a455637d28fb209a4677f55d887aa91ca05ed44e.tar
nixpkgs-a455637d28fb209a4677f55d887aa91ca05ed44e.tar.gz
nixpkgs-a455637d28fb209a4677f55d887aa91ca05ed44e.tar.bz2
nixpkgs-a455637d28fb209a4677f55d887aa91ca05ed44e.tar.lz
nixpkgs-a455637d28fb209a4677f55d887aa91ca05ed44e.tar.xz
nixpkgs-a455637d28fb209a4677f55d887aa91ca05ed44e.tar.zst
nixpkgs-a455637d28fb209a4677f55d887aa91ca05ed44e.zip
lib/debug: remove the deprecated strict function
The grace period was long enough.
Diffstat (limited to 'lib/debug.nix')
-rw-r--r--lib/debug.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/debug.nix b/lib/debug.nix
index d5e9473ff77..7eaa1bd9c8b 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -102,10 +102,6 @@ rec {
   # usage: { testX = allTrue [ true ]; }
   testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
 
-  strict = v:
-    trace "Warning: strict is deprecated and will be removed in the next release"
-      (builtins.seq v v);
-
   # example: (traceCallXml "myfun" id 3) will output something like
   # calling myfun arg 1: 3 result: 3
   # this forces deep evaluation of all arguments and the result!
@@ -119,10 +115,10 @@ rec {
       in (str: expr:
           if isFunction expr then
             (arg:
-              traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (strict arg)}" (expr arg)
+              traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg)
             )
           else
-            let r = strict expr;
+            let r = builtins.seq expr expr;
             in trace "${str}\n result:\n${builtins.toXML r}" r
       );
 }