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

Fix manual build
nix-community · Mar 5, 2024 · ad5e8bd · ad5e8bd
2 parents cf185d6 + 007625b
commit ad5e8bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/flake.nix b/flake.nix
@@ -57,7 +57,10 @@
         in
         # FIXME: aarch64-linux seems to hang on boot
         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 {
         system = "x86_64-linux";

diff --git a/lib/types/lvm_vg.nix b/lib/types/lvm_vg.nix
@@ -22,6 +22,9 @@
           priority = lib.mkOption {
             type = lib.types.int;
             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";
           };
           size = lib.mkOption {