Merge pull request #776 from Enzime/populate

module: always populate system.build attributes
nix-community · Sep 19, 2024 · a31fe5e · a31fe5e
2 parents d32d150 + c5853dc
commit a31fe5e
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 70 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -388,55 +388,59 @@ let
             description = ''
               The scripts generated by disko
             '';
-            default = { pkgs, checked ? false }: {
-              destroyScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-destroy" ''
-                export PATH=${lib.makeBinPath (with pkgs; [
-                  util-linux
-                  e2fsprogs
-                  mdadm
-                  zfs
-                  lvm2
-                  bash
-                  jq
-                  gnused
-                  gawk
-                  coreutils-full
-                ])}:$PATH
-                ${cfg.config._destroy}
-              '';
-
-              formatScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-format" ''
-                export PATH=${lib.makeBinPath (cfg.config._packages pkgs)}:$PATH
-                ${cfg.config._create}
-              '';
-
-              mountScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-mount" ''
-                export PATH=${lib.makeBinPath (cfg.config._packages pkgs)}:$PATH
-                ${cfg.config._mount}
-              '';
-
-              diskoScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
-                export PATH=${lib.makeBinPath ((cfg.config._packages pkgs) ++ [ pkgs.bash ])}:$PATH
-                ${cfg.config._disko}
-              '';
-
-              # These are useful to skip copying executables uploading a script to an in-memory installer
-              destroyScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-destroy" ''
-                ${cfg.config._destroy}
-              '';
-
-              formatScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-format" ''
-                ${cfg.config._create}
-              '';
-
-              mountScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-mount" ''
-                ${cfg.config._mount}
-              '';
-
-              diskoScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko" ''
-                ${cfg.config._disko}
-              '';
-            };
+            default = { pkgs, checked ? false }:
+              let
+                throwIfNoDisksDetected = _: v: if devices.disk == { } then throw "No disks defined, did you forget to import your disko config?" else v;
+              in
+              mapAttrs throwIfNoDisksDetected {
+                destroyScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-destroy" ''
+                  export PATH=${lib.makeBinPath (with pkgs; [
+                    util-linux
+                    e2fsprogs
+                    mdadm
+                    zfs
+                    lvm2
+                    bash
+                    jq
+                    gnused
+                    gawk
+                    coreutils-full
+                  ])}:$PATH
+                  ${cfg.config._destroy}
+                '';
+
+                formatScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-format" ''
+                  export PATH=${lib.makeBinPath (cfg.config._packages pkgs)}:$PATH
+                  ${cfg.config._create}
+                '';
+
+                mountScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-mount" ''
+                  export PATH=${lib.makeBinPath (cfg.config._packages pkgs)}:$PATH
+                  ${cfg.config._mount}
+                '';
+
+                diskoScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
+                  export PATH=${lib.makeBinPath ((cfg.config._packages pkgs) ++ [ pkgs.bash ])}:$PATH
+                  ${cfg.config._disko}
+                '';
+
+                # These are useful to skip copying executables uploading a script to an in-memory installer
+                destroyScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-destroy" ''
+                  ${cfg.config._destroy}
+                '';
+
+                formatScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-format" ''
+                  ${cfg.config._create}
+                '';
+
+                mountScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-mount" ''
+                  ${cfg.config._mount}
+                '';
+
+                diskoScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko" ''
+                  ${cfg.config._disko}
+                '';
+              };
           };
           _destroy = lib.mkOption {
             internal = true;

diff --git a/module.nix b/module.nix
@@ -192,10 +192,19 @@ in
     visible = "shallow";
   };
 
-  config = lib.mkMerge [
-    (lib.mkIf (cfg.devices.disk != { }) {
-      system.build = (cfg.devices._scripts { inherit pkgs; checked = cfg.checkScripts; }) // {
+  config = {
+    _module.args.diskoLib = import ./lib {
+      inherit lib;
+      rootMountPoint = config.disko.rootMountPoint;
+      makeTest = import (pkgs.path + "/nixos/tests/make-test-python.nix");
+      eval-config = import (pkgs.path + "/nixos/lib/eval-config.nix");
+    };
 
+    system.build = (cfg.devices._scripts { inherit pkgs; checked = cfg.checkScripts; }) // (
+      let
+        throwIfNoDisksDetected = _: v: if cfg.devices.disk == { } then throw "No disks defined, did you forget to import your disko config?" else v;
+      in
+      lib.mapAttrs throwIfNoDisksDetected {
         # we keep these old outputs for compatibility
         disko = builtins.trace "the .disko output is deprecated, please use .diskoScript instead" (cfg.devices._scripts { inherit pkgs; }).diskoScript;
         diskoNoDeps = builtins.trace "the .diskoNoDeps output is deprecated, please use .diskoScriptNoDeps instead" (cfg.devices._scripts { inherit pkgs; }).diskoScriptNoDeps;
@@ -211,22 +220,13 @@ in
         };
 
         vmWithDisko = lib.mkDefault config.virtualisation.vmVariantWithDisko.system.build.vmWithDisko;
-      };
-
-
-      # we need to specify the keys here, so we don't get an infinite recursion error
-      # Remember to add config keys here if they are added to types
-      fileSystems = lib.mkIf cfg.enableConfig cfg.devices._config.fileSystems or { };
-      boot = lib.mkIf cfg.enableConfig cfg.devices._config.boot or { };
-      swapDevices = lib.mkIf cfg.enableConfig cfg.devices._config.swapDevices or [ ];
-    })
-    {
-      _module.args.diskoLib = import ./lib {
-        inherit lib;
-        rootMountPoint = config.disko.rootMountPoint;
-        makeTest = import (pkgs.path + "/nixos/tests/make-test-python.nix");
-        eval-config = import (pkgs.path + "/nixos/lib/eval-config.nix");
-      };
-    }
-  ];
+      }
+    );
+
+    # we need to specify the keys here, so we don't get an infinite recursion error
+    # Remember to add config keys here if they are added to types
+    fileSystems = lib.mkIf cfg.enableConfig cfg.devices._config.fileSystems or { };
+    boot = lib.mkIf cfg.enableConfig cfg.devices._config.boot or { };
+    swapDevices = lib.mkIf cfg.enableConfig cfg.devices._config.swapDevices or [ ];
+  };
 }