[wip] nix: update flake and use mkosi with sorted cpio

edgelesssys · Dec 11, 2023 · a6fe4e3 · a6fe4e3
1 parent 27804ef
commit a6fe4e3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -22,6 +22,12 @@
       callPackage = pkgsUnstable.callPackage;
 
       mkosiDev = (pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec {
+        src = pkgsUnstable.fetchFromGitHub {
+          owner = "systemd";
+          repo = "mkosi";
+          rev = "54dc08693f315d5e33a52f6bbadc67eec5405d13";
+          hash = "sha256-ysmO5YYtYcm//zQomkLhpXzaYVjrr0olVft3BkfPptA=";
+        };
         propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsUnstable;  [
           # package management
           dnf5
@@ -34,6 +40,9 @@
           cryptsetup # dm-verity
           util-linux # flock
           kmod # depmod
+          cpio # cpio
+          zstd # zstd
+          xz # xz
         ]);
       }));
 

diff --git a/image/base/mkosi.conf b/image/base/mkosi.conf
@@ -4,6 +4,7 @@ Release=38
 
 [Output]
 Format=tar
+CompressOutput=false
 Seed=b04a9a33-4559-4af4-8b38-9249cf933229
 
 [Content]