nix: update flake and use mkosi with sorted cpio

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1701237617,
-        "narHash": "sha256-Ryd8xpNDY9MJnBFDYhB37XSFIxCPVVVXAbInNPa95vs=",
+        "lastModified": 1702206697,
+        "narHash": "sha256-vE9oEx3Y8TO5MnWwFlmopjHd1JoEBno+EhsfUCq5iR8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "85306ef2470ba705c97ce72741d56e42d0264015",
+        "rev": "29d6c96900b9b576c2fb89491452f283aa979819",
         "type": "github"
       },
       "original": {

flake.nix

@@ -22,6 +22,13 @@
       callPackage = pkgsUnstable.callPackage;
 
       mkosiDev = (pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec {
+        # TODO(malt3): remove patch once merged and released upstream (systemd/mkosi#2163)
+        src = pkgsUnstable.fetchFromGitHub {
+          owner = "systemd";
+          repo = "mkosi";
+          rev = "5629e6b88ef4bfc8d372682350bfcdf0963f75d3";
+          hash = "sha256-4VwAaZYj8CoWJbOa8+C/TriPUijowQ0OCzxxgDFh1tE=";
+        };
         propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsUnstable;  [
           # package management
           dnf5
@@ -34,6 +41,9 @@
           cryptsetup # dm-verity
           util-linux # flock
           kmod # depmod
+          cpio # cpio
+          zstd # zstd
+          xz # xz
         ]);
       }));
 

image/base/mkosi.conf

@@ -4,6 +4,7 @@ Release=38
 
 [Output]
 Format=tar
+CompressOutput=false
 Seed=b04a9a33-4559-4af4-8b38-9249cf933229
 
 [Content]