diff options
| author | Profpatsch <mail@profpatsch.de> | 2018-04-02 20:45:12 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2018-04-27 18:59:39 +0200 |
| commit | b90104ea0edc6763505458e4143e034f1d92bc2a (patch) | |
| tree | 85dea16e21a8b8e2fe1525ec966cb20f2318fef5 | |
| parent | 562286aa560aea85448adbc0e50e636e8d3cf8d0 (diff) | |
| download | nixlib-b90104ea0edc6763505458e4143e034f1d92bc2a.tar nixlib-b90104ea0edc6763505458e4143e034f1d92bc2a.tar.gz nixlib-b90104ea0edc6763505458e4143e034f1d92bc2a.tar.bz2 nixlib-b90104ea0edc6763505458e4143e034f1d92bc2a.tar.lz nixlib-b90104ea0edc6763505458e4143e034f1d92bc2a.tar.xz nixlib-b90104ea0edc6763505458e4143e034f1d92bc2a.tar.zst nixlib-b90104ea0edc6763505458e4143e034f1d92bc2a.zip | |
lib/debug: fix use-sites of deprecated debug functions
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index b8a55a24394e..8fbe218b232a 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -33,7 +33,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) {}; }; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index e11419846aeb..514c1daed629 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -224,7 +224,7 @@ let else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" - else throw "turning ${lib.showVal x} into a VimL thing not implemented yet"; + else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; in assert builtins.hasAttr "vim-addon-manager" knownPlugins; '' |