`c653e89d0859`

5 files changed

deletedmodules/meta.nixdiff before after both

--- a/modules/meta.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib.modules) mkRemovedOptionModule;
-in
-{
-  imports = [
-    (mkRemovedOptionModule [ "fleetModules" ] "replaced with imports.")
-  ];
-}

modifiedmodules/module-list.nixdiff before after both

--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -2,7 +2,6 @@
   ./assertions.nix
   ./fleetLib.nix
   ./hosts.nix
-  ./meta.nix
   ./nixos.nix
   ./nixpkgs.nix
   ./secrets.nix

modifiedmodules/nixos.nixdiff before after both

--- a/modules/nixos.nix
+++ b/modules/nixos.nix
@@ -11,7 +11,6 @@
   inherit (lib.attrsets) mapAttrs;
   inherit (lib.options) mkOption;
   inherit (lib.types) deferredModule unspecified;
-  inherit (lib.modules) mkRemovedOptionModule;
   inherit (lib.strings) escapeNixIdentifier;
   inherit (fleetLib.options) mkHostsOption;
 
@@ -55,9 +54,6 @@
         };
       };
       config = {
-        # imports = [
-        #   (mkRemovedOptionModule ["nixosModules"] "replaced with hosts.*.nixos.imports.")
-        # ];
         nixos = let 
           inherit (hostArgs.config) system;
         in {
@@ -94,8 +90,5 @@
       };
     });
   };
-  imports = [
-    (mkRemovedOptionModule [ "nixosModules" ] "replaced with nixos.imports.")
-  ];
   config.nixos.imports = import ./nixos/module-list.nix;
 }

modifiedmodules/nixos/meta.nixdiff before after both

1{ lib, ... }:2let3  inherit (lib.modules) mkRemovedOptionModule;4in5{6  imports = [7    (mkRemovedOptionModule [ "tags" ]8      "tags are now defined at the host level, not the nixos system level for fast filtering without evaluating unnecessary hosts."9    )10    (mkRemovedOptionModule [11      "network"12    ] "network is now defined at the host level, not the nixos system level")13  ];1415  # Version of environment (fleet scripts such as rollback) already installed on the host16  config = {17    environment.etc.FLEET_HOST.text = "1";1819    # Flake/nix command support is assumed by fleet, lets add it here to avoid potential problems.20    nix.settings.experimental-features = [21      "nix-command"22      "flakes"23    ];24  };25}

1{2  # Version of environment (fleet scripts such as rollback) already installed on the host3  config = {4    environment.etc.FLEET_HOST.text = "1";56    # Flake/nix command support is assumed by fleet, lets add it here to avoid potential problems.7    nix.settings.experimental-features = [8      "nix-command"9      "flakes"10    ];11  };12}

modifiedmodules/nixpkgs.nixdiff before after both

--- a/modules/nixpkgs.nix
+++ b/modules/nixpkgs.nix
@@ -7,7 +7,6 @@
 let
   inherit (lib.options) mkOption literalExpression;
   inherit (lib.types) path;
-  inherit (lib.modules) mkRemovedOptionModule;
   inherit (fleetLib.options) mkHostsOption;
   inherit (fleetLib.types) listOfOverlay;
 
@@ -43,18 +42,9 @@
         default = config.nixpkgs.buildUsing;
         defaultText = literalExpression "config.nixpkgs.buildUsing";
       };
-      # imports = [
-      # 	(mkRemovedOptionModule ["nixpkgs" "overlays"] "this option needs to be specified at nixosModules level")
-      # ];
       config.nixos = {
         inherit _file;
         nixpkgs.overlays = config.nixpkgs.overlays;
-        imports = [
-          (mkRemovedOptionModule [
-            "nixpkgs"
-            "buildUsing"
-          ] "this option should be specified at the host level, not the nixosModules level")
-        ];
       };
     };
   };