From a6fe4e3f2529fbc867d2edd7064d1bb6fd27c3ec Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Mon, 11 Dec 2023 13:49:10 +0100
Subject: [PATCH] [wip] nix: update flake and use mkosi with sorted cpio

---
 flake.lock            | 12 ++++++------
 flake.nix             |  9 +++++++++
 image/base/mkosi.conf |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 64d89f5532..297ea4ad29 100644
--- a/flake.lock
+++ b/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": {
diff --git a/flake.nix b/flake.nix
index 681ea120e8..f4807508f5 100644
--- 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
index 8d00493269..4ee2f73fcf 100644
--- 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]