rename makeDiskImage -> makeDiskImages

lib/default.nix

@@ -11,10 +11,10 @@ let
   diskoLib = {
 
     # like make-disk-image.nix from nixpkgs, but with disko config
-    makeDiskImage = args: (import ./make-disk-image.nix ({ inherit diskoLib; } // args)).pure;
+    makeDiskImages = args: (import ./make-disk-image.nix ({ inherit diskoLib; } // args)).pure;
 
     # a version of makeDiskImage which runs outside of the store
-    makeDiskImageScript = args: (import ./make-disk-image.nix ({ inherit diskoLib; } // args)).impure;
+    makeDiskImagesScript = args: (import ./make-disk-image.nix ({ inherit diskoLib; } // args)).impure;
 
     testLib = import ./tests.nix { inherit lib makeTest eval-config; };
     # like lib.types.oneOf but instead of a list takes an attrset

lib/types/disk.nix

@@ -19,7 +19,7 @@
     imageSize = lib.mkOption {
       type = lib.types.strMatching "[0-9]+[KMGTP]?";
       description = ''
-        size of the image if the makeDiskImage function from diksoLib is used.
+        size of the image if the makeDiskImages function from diksoLib is used.
         is used as an argument to truncate -s
       '';
       default = "2G";

module.nix

@@ -71,10 +71,10 @@ in
       disko = builtins.trace "the .disko output is deprecated, please use .diskoScript instead" (cfg.devices._scripts pkgs).diskoScript;
       diskoNoDeps = builtins.trace "the .diskoNoDeps output is deprecated, please use .diskoScriptNoDeps instead" (cfg.devices._scripts pkgs).diskoScriptNoDeps;
 
-      diskoImages = diskoLib.makeDiskImage {
+      diskoImages = diskoLib.makeDiskImages {
         nixosConfig = args;
       };
-      diskoImageScript = diskoLib.makeDiskImageScript {
+      diskoImagesScript = diskoLib.makeDiskImagesScript {
         nixosConfig = args;
       };
 

tests/make-disk-image-impure.nix

@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { }
 , diskoLib ? pkgs.callPackage ../lib { }
 }:
-diskoLib.makeDiskImageScript {
+diskoLib.makeDiskImagesScript {
   nixosConfig = pkgs.nixos [
     ../module.nix
     ../example/simple-efi.nix

tests/make-disk-image.nix

@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { }
 , diskoLib ? pkgs.callPackage ../lib { }
 }:
-diskoLib.makeDiskImage {
+diskoLib.makeDiskImages {
   nixosConfig = pkgs.nixos [
     ../module.nix
     ../example/simple-efi.nix