diff options
118 files changed, 16 insertions, 449 deletions
diff --git a/doc/default.nix b/doc/default.nix index fa2e4a88738d..4c04128052bc 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,8 +1,6 @@ let pkgs = import ./.. { }; lib = pkgs.lib; - sources = lib.sourceFilesBySuffices ./. [".xml"]; - sources-langs = ./languages-frameworks; in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; diff --git a/lib/generators.nix b/lib/generators.nix index aa6759087031..f5faf7007860 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -19,8 +19,6 @@ let libStr = lib.strings; libAttr = lib.attrsets; - flipMapAttrs = flip libAttr.mapAttrs; - inherit (lib) isFunction; in diff --git a/lib/lists.nix b/lib/lists.nix index 231c2317c0c4..288882924fff 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -64,7 +64,6 @@ rec { */ foldl = op: nul: list: let - len = length list; foldl' = n: if n == -1 then nul diff --git a/lib/modules.nix b/lib/modules.nix index 20207b31d35b..a443d5ec5d16 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -670,7 +670,6 @@ rec { { config, options, ... }: let fromOpt = getAttrFromPath from options; - toOpt = getAttrFromPath to options; toOf = attrByPath to (abort "Renaming error: option `${showOption to}' does not exist."); in diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index eab20d0f14dc..3f2d742e7884 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -380,10 +380,6 @@ runTests { resRem7 = res6.replace (a: removeAttrs a ["a"]); - resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; }; - x2 = x.merge { a = 20; }; # now we have 27 - in (x2.replace) { a = 10; }; # and override the value by 10 - # fixed tests (delayed args): (when using them add some comments, please) resFixed1 = let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; }); diff --git a/lib/types.nix b/lib/types.nix index cf6f2aa46e40..98eff2ac6ffb 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -309,7 +309,6 @@ rec { } else def; - listOnly = listOf elemType; attrOnly = attrsOf elemType; in mkOptionType rec { name = "loaOf"; diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix index c7654ca78c3a..7549dc6c0651 100644 --- a/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -2,9 +2,7 @@ with lib; -let fcBool = x: if x then "<bool>true</bool>" else "<bool>false</bool>"; - - cfg = config.fonts.fontconfig.ultimate; +let cfg = config.fonts.fontconfig.ultimate; latestVersion = pkgs.fontconfig.configVersion; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 42b00b2025d8..05029628672b 100644 --- a/ |