checkpoint

Signed-off-by: lucasew <[email protected]>
NixOS · Jan 8, 2025 · b0192d8 · b0192d8
1 parent 79571c4
commit b0192d8
Show file tree

Hide file tree

Showing 232 changed files with 1,356 additions and 3,654 deletions.
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
@@ -10,19 +10,7 @@
 }:
 
 let
-  inherit (pkgs) buildPackages runCommand docbook_xsl_ns;
-
-  inherit (pkgs.lib)
-    hasPrefix
-    removePrefix
-    flip
-    foldr
-    types
-    lib.mkOption
-    escapeShellArg
-    concatMapStringsSep
-    sourceFilesBySuffices
-    ;
+  inherit (pkgs) buildPackages runCommand docbook_xsl_ns lib;
 
   common = import ./common.nix;
 
@@ -35,7 +23,7 @@ let
   # E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
   # you'd need to include `extraSources = [ pkgs.customModules ]`
   prefixesToStrip = map (p: "${toString p}/") ([ prefix ] ++ extraSources);
-  stripAnyPrefixes = flip (foldr removePrefix) prefixesToStrip;
+  stripAnyPrefixes = lib.flip (lib.foldr lib.removePrefix) prefixesToStrip;
 
   optionsDoc = buildPackages.nixosOptionsDoc {
     inherit options revision baseOptionsJSON warningsAreErrors;
@@ -61,9 +49,9 @@ let
         declarations =
           map
             (decl:
-              if hasPrefix (toString ../../..) (toString decl)
+              if lib.hasPrefix (toString ../../..) (toString decl)
               then
-                let subpath = removePrefix "/" (removePrefix (toString ../../..) (toString decl));
+                let subpath = lib.removePrefix "/" (lib.removePrefix (toString ../../..) (toString decl));
                 in { url = "https://github.com/NixOS/nixpkgs/blob/master/${subpath}"; name = subpath; }
               else decl)
             opt.declarations;
@@ -86,7 +74,7 @@ let
     substituteInPlace ./configuration/configuration.md \
       --replace-fail \
           '@MODULE_CHAPTERS@' \
-          ${lib.escapeShellArg (concatMapStringsSep "\n" (p: "${p.value}") config.meta.doc)}
+          ${lib.escapeShellArg (lib.concatMapStringsSep "\n" (p: "${p.value}") config.meta.doc)}
     substituteInPlace ./nixos-options.md \
       --replace-fail \
         '@NIXOS_OPTIONS_JSON@' \
@@ -105,7 +93,7 @@ in rec {
   # Generate the NixOS manual.
   manualHTML = runCommand "nixos-manual-html"
     { nativeBuildInputs = [ buildPackages.nixos-render-docs ];
-      inputs = sourceFilesBySuffices ./. [ ".md" ];
+      inputs = lib.sourceFilesBySuffices ./. [ ".md" ];
       meta.description = "The NixOS manual in HTML format";
       allowedReferences = ["out"];
     }

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
@@ -56,8 +56,6 @@ evalConfigArgs@
 }:
 
 let
-  inherit (lib) lib.optional;
-
   evalModulesMinimal = (import ./default.nix {
     inherit lib;
     # Implicit use of feature is noted in implementation.
@@ -68,15 +66,15 @@ let
     _file = ./eval-config.nix;
     key = _file;
     config = lib.mkMerge (
-      (optional (system != null) {
+      (lib.optional (system != null) {
         # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override
         # this.  Since the latter defaults to the former, the former should
         # default to the argument. That way this new default could propagate all
         # they way through, but has the last priority behind everything else.
         nixpkgs.system = lib.mkDefault system;
       })
       ++
-      (optional (pkgs != null) {
+      (lib.optional (pkgs != null) {
         # This should be default priority, so it conflicts with any user-defined pkgs.
         nixpkgs.pkgs = pkgs;
       })