From 796b4926bbdea841eaab82239fe7f7e93daf75dd Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Wed, 15 Nov 2023 18:38:27 +0100
Subject: [PATCH 1/4] mkosi: 18 -> 19

---
 nixos/doc/manual/release-notes/rl-2405.section.md | 3 ++-
 pkgs/tools/virtualization/mkosi/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index e2f99c20cfc8..8279d68ad6bb 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -20,7 +20,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- Create the first release note entry in this section!
+- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the
+  [release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.
 
 ## Other Notable Changes {#sec-release-24.05-notable-changes}
 
diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix
index 3b1a4988f47d..704e0ff86c90 100644
--- a/pkgs/tools/virtualization/mkosi/default.nix
+++ b/pkgs/tools/virtualization/mkosi/default.nix
@@ -60,14 +60,14 @@ let
 in
 buildPythonApplication rec {
   pname = "mkosi";
-  version = "18";
+  version = "19";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "mkosi";
     rev = "v${version}";
-    hash = "sha256-bnd2P6lq1XqKed3m4hDYrR9IcdrPaJxNBL2Z6jCruV4=";
+    hash = "sha256-KjJM+KZCgUnsaEN2ZorhH0AR5nmiV2h3i7Vb3KdGFtI=";
   };
 
   # Fix ctypes finding library

From 28a41e21cbdf2077f5b2058eef72bc6392e3c50c Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Wed, 15 Nov 2023 19:58:15 +0100
Subject: [PATCH 2/4] mkosi: cleanup wrapping

---
 pkgs/tools/virtualization/mkosi/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix
index 704e0ff86c90..6b23aeeb9e02 100644
--- a/pkgs/tools/virtualization/mkosi/default.nix
+++ b/pkgs/tools/virtualization/mkosi/default.nix
@@ -89,10 +89,6 @@ buildPythonApplication rec {
     wheel
   ];
 
-  makeWrapperArgs = [
-    "--set MKOSI_INTERPRETER ${python3pefile}/bin/python3"
-  ];
-
   propagatedBuildInputs = [
     systemdForMkosi
     bubblewrap
@@ -100,15 +96,15 @@ buildPythonApplication rec {
     qemu
   ];
 
-  postInstall = ''
-    wrapProgram $out/bin/mkosi \
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
   checkInputs = [
     pytestCheckHook
   ];
 
+  makeWrapperArgs = [
+    "--set MKOSI_INTERPRETER ${python3pefile}/bin/python3"
+    "--prefix PYTHONPATH : \"$PYTHONPATH\""
+  ];
+
   meta = with lib; {
     description = "Build legacy-free OS images";
     homepage = "https://github.com/systemd/mkosi";

From 3f5b64f3c751a02e920c5b296811b0dffbcf2d9a Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 16 Nov 2023 10:19:45 +0100
Subject: [PATCH 3/4] mkosi: add man page

---
 pkgs/tools/virtualization/mkosi/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix
index 6b23aeeb9e02..9e56a1b425af 100644
--- a/pkgs/tools/virtualization/mkosi/default.nix
+++ b/pkgs/tools/virtualization/mkosi/default.nix
@@ -5,6 +5,7 @@
 , python3
 , bubblewrap
 , systemd
+, pandoc
 
   # Python packages
 , setuptools
@@ -63,6 +64,8 @@ buildPythonApplication rec {
   version = "19";
   format = "pyproject";
 
+  outputs = [ "out" "man" ];
+
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "mkosi";
@@ -84,6 +87,7 @@ buildPythonApplication rec {
   '';
 
   nativeBuildInputs = [
+    pandoc
     setuptools
     setuptools-scm
     wheel
@@ -96,10 +100,19 @@ buildPythonApplication rec {
     qemu
   ];
 
+  postBuild = ''
+    ./tools/make-man-page.sh
+  '';
+
   checkInputs = [
     pytestCheckHook
   ];
 
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    mv mkosi/resources/mkosi.1 $out/share/man/man1/
+  '';
+
   makeWrapperArgs = [
     "--set MKOSI_INTERPRETER ${python3pefile}/bin/python3"
     "--prefix PYTHONPATH : \"$PYTHONPATH\""

From fdb0b82f5c5501814edbb59acdfef478a9a66ab7 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 16 Nov 2023 10:24:43 +0100
Subject: [PATCH 4/4] mkosi: add importsCheck

---
 pkgs/tools/virtualization/mkosi/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix
index 9e56a1b425af..38ffb1cd4838 100644
--- a/pkgs/tools/virtualization/mkosi/default.nix
+++ b/pkgs/tools/virtualization/mkosi/default.nix
@@ -108,6 +108,10 @@ buildPythonApplication rec {
     pytestCheckHook
   ];
 
+  pythonImportsCheck = [
+    "mkosi"
+  ];
+
   postInstall = ''
     mkdir -p $out/share/man/man1
     mv mkosi/resources/mkosi.1 $out/share/man/man1/