nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-11-04 05:44:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #559 from Ma27/fix-manual-build

Browse Source 
Fix manual build
This commit is contained in:
lassulus 2024-03-06 06:45:52 +07:00 committed by GitHub
commit ad5e8bd14d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flake.nix
View File

@ -57,7 +57,10 @@
in in
# FIXME: aarch64-linux seems to hang on boot # FIXME: aarch64-linux seems to hang on boot
nixpkgs.lib.optionalAttrs pkgs.hostPlatform.isx86_64 (nixosTests // { inherit disko-install; }) // nixpkgs.lib.optionalAttrs pkgs.hostPlatform.isx86_64 (nixosTests // { inherit disko-install; }) //
pkgs.lib.optionalAttrs (!pkgs.buildPlatform.isRiscV64 && !pkgs.hostPlatform.isx86_32) { inherit shellcheck; }); pkgs.lib.optionalAttrs (!pkgs.buildPlatform.isRiscV64 && !pkgs.hostPlatform.isx86_32) {
inherit shellcheck;
inherit (self.packages.${system}) disko-doc;
});
nixosConfigurations.testmachine = nixpkgs.lib.nixosSystem { nixosConfigurations.testmachine = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";

3
lib/types/lvm_vg.nix
View File

@ -22,6 +22,9 @@
priority = lib.mkOption { priority = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = if (lib.hasInfix "100%" lv.config.size) then 9001 else 1000; default = if (lib.hasInfix "100%" lv.config.size) then 9001 else 1000;
defaultText = lib.literalExpression ''
if (lib.hasInfix "100%" lv.config.size) then 9001 else 1000
'';
description = "Priority of the logical volume, smaller values are created first"; description = "Priority of the logical volume, smaller values are created first";
}; };
size = lib.mkOption { size = lib.mkOption {