summary refs log tree commit diff
path: root/lib/modules.nix
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2023-04-10 17:26:25 +0200
committerRobert Hensing <robert@roberthensing.nl>2023-05-06 18:29:04 +0200
commit84b1b017026bb1d0a37a8d3ef553f073225b4e8d (patch)
tree06dfde57ccd9f656389667f53caffb4c3b1115ac /lib/modules.nix
parent1f4a58ef038184eaf4757e96ec1f09b08a01c8ab (diff)
downloadnixpkgs-84b1b017026bb1d0a37a8d3ef553f073225b4e8d.tar
nixpkgs-84b1b017026bb1d0a37a8d3ef553f073225b4e8d.tar.gz
nixpkgs-84b1b017026bb1d0a37a8d3ef553f073225b4e8d.tar.bz2
nixpkgs-84b1b017026bb1d0a37a8d3ef553f073225b4e8d.tar.lz
nixpkgs-84b1b017026bb1d0a37a8d3ef553f073225b4e8d.tar.xz
nixpkgs-84b1b017026bb1d0a37a8d3ef553f073225b4e8d.tar.zst
nixpkgs-84b1b017026bb1d0a37a8d3ef553f073225b4e8d.zip
lib/modules: Only interpret class declaration in non-shorthand mode
This is to avoid stealing keys from submodules. `class` might be
common enough that reinterpreting existing `class` attributes in
configurations as a declaration leads to fairly widespread problems.
Diffstat (limited to 'lib/modules.nix')
-rw-r--r--lib/modules.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/modules.nix b/lib/modules.nix
index 9377c2e1e9d..4533252c60e 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -511,7 +511,7 @@ let
         imports = m.require or [] ++ m.imports or [];
         options = {};
         config = addFreeformType (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"]);
-        class = m.class or null;
+        class = null;
       };
 
   applyModuleArgsIfFunction = key: f: args@{ config, options, lib, ... }: