Mirrors/disko
2
0
Fork 0
mirror of https://github.com/nix-community/disko synced 2024-11-10 06:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename makeDiskImage -> makeDiskImages

Browse source
This commit is contained in:
lassulus 2023-09-14 17:06:31 +02:00 committed by mergify[bot]
parent 56e6cad143
commit 9f29cedac7
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/default.nix
View file

@ -11,10 +11,10 @@ let
diskoLib = { diskoLib = {
# like make-disk-image.nix from nixpkgs, but with disko config # 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 # 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; }; testLib = import ./tests.nix { inherit lib makeTest eval-config; };
# like lib.types.oneOf but instead of a list takes an attrset # like lib.types.oneOf but instead of a list takes an attrset

2
lib/types/disk.nix
View file

@ -19,7 +19,7 @@
imageSize = lib.mkOption { imageSize = lib.mkOption {
type = lib.types.strMatching "[0-9]+[KMGTP]?"; type = lib.types.strMatching "[0-9]+[KMGTP]?";
description = '' 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 is used as an argument to truncate -s
''; '';
default = "2G"; default = "2G";

4
module.nix
View file

@ -71,10 +71,10 @@ in
disko = builtins.trace "the .disko output is deprecated, please use .diskoScript instead" (cfg.devices._scripts pkgs).diskoScript; 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; 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; nixosConfig = args;
}; };
diskoImageScript = diskoLib.makeDiskImageScript { diskoImagesScript = diskoLib.makeDiskImagesScript {
nixosConfig = args; nixosConfig = args;
}; };

2
tests/make-disk-image-impure.nix
View file

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

2
tests/make-disk-image.nix
View file

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