treewide: declare end-of-life for deprecated options

Fixes: 6858d08 ("treewide: add soft deprecation dates (danth#506)") Link: danth#514
trueNAHO · Aug 21, 2024 · b85271e · b85271e
1 parent 03222f9
commit b85271e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 42 deletions.
diff --git a/modules/nixvim/nixvim.nix b/modules/nixvim/nixvim.nix
@@ -14,20 +14,32 @@
   };
 
   imports = let
-    mkRenamedOptionModule = let
+    mkRenamedOptionModuleWith = let
       scope = [ "stylix" "targets" "nixvim" ];
     in
-      from: to: lib.mkRenamedOptionModule (scope ++ from) (scope ++ to);
+      {
+        from,
+        to,
+      }:
+        lib.mkRenamedOptionModuleWith {
+          from = scope ++ from;
+          sinceRelease = 2411;
+          to  = scope ++ to;
+        };
   in [
-    # Added: 2024-08-06
-    (mkRenamedOptionModule
-      [ "transparent_bg" "main" ]
-      [ "transparentBackground" "main" ])
+    (
+      mkRenamedOptionModuleWith {
+        from = [ "transparent_bg" "main" ];
+        to = [ "transparentBackground" "main" ];
+      }
+    )
 
-    # Added: 2024-08-06
-    (mkRenamedOptionModule
-      [ "transparent_bg" "sign_column" ]
-      [ "transparentBackground" "signColumn" ])
+    (
+      mkRenamedOptionModuleWith {
+        from = [ "transparent_bg" "sign_column" ];
+        to = [ "transparentBackground" "signColumn" ];
+      }
+    )
   ];
 
   config = lib.mkIf (config.stylix.enable && config.stylix.targets.nixvim.enable && (config.programs ? nixvim)) (

diff --git a/stylix/palette.nix b/stylix/palette.nix
@@ -29,54 +29,23 @@ in {
       optionName:
         lib.mkRemovedOptionModule
         (scope ++ optionName)
-        "Using stylix.palette to override scheme is not supported anymore";
+        "Using stylix.palette to override scheme is not supported since 23.05";
   in [
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base00" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base01" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base02" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base03" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base04" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base05" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base06" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base07" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base08" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base09" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base0A" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base0B" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base0C" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base0D" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base0E" ])
-
-    # Added: 2023-02-02
     (mkRemovedOptionModule [ "base0F" ])
   ];