summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-01-07 01:34:30 +0100
committerRobert Hensing <robert@roberthensing.nl>2022-01-10 12:36:57 +0100
commit3168017b90440220c69d4ba8f39f469024b4cafe (patch)
tree97596eb616f4b2a89da0fcc460a3ea47d1cb9599
parentd3f956aba324a18bfafde59138929b320a9b4a2b (diff)
downloadnixpkgs-3168017b90440220c69d4ba8f39f469024b4cafe.tar
nixpkgs-3168017b90440220c69d4ba8f39f469024b4cafe.tar.gz
nixpkgs-3168017b90440220c69d4ba8f39f469024b4cafe.tar.bz2
nixpkgs-3168017b90440220c69d4ba8f39f469024b4cafe.tar.lz
nixpkgs-3168017b90440220c69d4ba8f39f469024b4cafe.tar.xz
nixpkgs-3168017b90440220c69d4ba8f39f469024b4cafe.tar.zst
nixpkgs-3168017b90440220c69d4ba8f39f469024b4cafe.zip
nixos/lib: Clarify that nixos.evalModules impl is NOT experimental
-rw-r--r--nixos/lib/eval-config-minimal.nix7
-rw-r--r--nixos/lib/eval-config.nix6
2 files changed, 11 insertions, 2 deletions
diff --git a/nixos/lib/eval-config-minimal.nix b/nixos/lib/eval-config-minimal.nix
index ed26e623b2f..d45b9ffd426 100644
--- a/nixos/lib/eval-config-minimal.nix
+++ b/nixos/lib/eval-config-minimal.nix
@@ -31,7 +31,12 @@ let
     prefix ? [],
     modules ? [],
     specialArgs ? {},
-  }: lib.evalModules {
+  }:
+  # NOTE: Regular NixOS currently does use this function! Don't break it!
+  #       Ideally we don't diverge, unless we learn that we should.
+  #       In other words, only the public interface of nixos.evalModules
+  #       is experimental.
+  lib.evalModules {
     inherit prefix modules;
     specialArgs = {
       modulesPath = builtins.toString ../modules;
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 8ea82b30f16..850322b8251 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -33,7 +33,11 @@ let pkgs_ = pkgs;
 in
 
 let
-  evalModulesMinimal = (import ./eval-config-minimal.nix { inherit lib; bypassEvalModulesWarning = true; }).evalModules;
+  evalModulesMinimal = (import ./default.nix {
+    inherit lib;
+    # Implicit use of feature is noted in implementation.
+    featureFlags.minimalModules = { };
+  }).evalModules;
 
   pkgsModule = rec {
     _file = ./eval-config.nix;