From f796fc139274b2d674a9b72c3fafeb68f4f55927 Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Fri, 12 Jan 2024 10:10:27 +0100
Subject: [PATCH] [wip] upgrade mkosi to v20

---
 bazel/mkosi/mkosi_wrapper.sh.in | 5 +++--
 flake.nix                       | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bazel/mkosi/mkosi_wrapper.sh.in b/bazel/mkosi/mkosi_wrapper.sh.in
index c8e541a0b..b5c67e731 100644
--- a/bazel/mkosi/mkosi_wrapper.sh.in
+++ b/bazel/mkosi/mkosi_wrapper.sh.in
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -xeuo pipefail
 shopt -s inherit_errexit
 
 export PATH=/run/wrappers/bin:/run/current-system/sw/bin:/bin:/usr/bin:/usr/local/bin
@@ -22,6 +22,7 @@ enabled=1
 gpgcheck=0
 EOF
   args+=("--package-manager-tree=${reposdir}:/etc/yum.repos.d")
+  args+=("--local-mirror=${LOCAL_MIRROR}")
 fi
 
-exec @@MKOSI@@ "${args[@]}" build
+exec @@MKOSI@@ --debug "${args[@]}" build
diff --git a/flake.nix b/flake.nix
index f593777f3..492ef6657 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,8 +26,8 @@
         src = pkgsUnstable.fetchFromGitHub {
           owner = "systemd";
           repo = "mkosi";
-          rev = "abf22cdc6ccb13f2cd84679ede77231455ec6813";
-          hash = "sha256-njtYWSXSLMcn6AtGfAeL/ncZQ6g+Vgpe7EaKLkzAOl4=";
+          rev = "0a4e1276af191e64c57cd3c1ab50271ab3b706c8";
+          hash = "sha256-vcXa+oc+5hpWPQvzloNPTM8ra7ShUTLtBiQjqoAB09Y=";
         };
         propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsUnstable;  [
           # package management
@@ -35,6 +35,10 @@
           rpm
 
           # filesystem tools
+          bash # sh and bash for sandboxed scripts
+          coreutils # cp, rm, mkdir, chmod, chown, chgrp, ln, readlink, stat, ...
+          btrfs-progs # btrfs subvolumes
+          gnutar # tar
           squashfsTools # mksquashfs
           dosfstools # mkfs.vfat
           mtools # mcopy