restore compatibility with 24.05

addresses #40 (comment)
numtide · Oct 10, 2024 · 5bba455 · 5bba455
1 parent ec6ef7d
commit 5bba455
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/modules/nixos/24.05-compat.nix b/modules/nixos/24.05-compat.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  ...
+}:
+{
+  # Backward-compat for 24.05, can be removed after we drop 24.05 support
+  imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "enable" ] [ "hardware" "opengl" "enable" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "extraPackages" ] [ "hardware" "opengl" "extraPackages" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "extraPackages32" ] [ "hardware" "opengl" "extraPackages32" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "enable32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "package" ] [ "hardware" "opengl" "package" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "package32" ] [ "hardware" "opengl" "package32" ])
+  ];
+}
diff --git a/modules/nixos/facter.nix b/modules/nixos/facter.nix
@@ -13,6 +13,7 @@
     ./networking
     ./system.nix
     ./virtualisation.nix
+    ./24.05-compat.nix
   ];
 
   options.facter = with lib; {