From 86d449c8d16125981a5d191e67027d1999c929cc Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 10 Jan 2025 15:08:38 +0100
Subject: [PATCH 1/3] clan-cli: exit with errorcode also in debug mode

---
 pkgs/clan-cli/clan_cli/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py
index 22f53b374..63bff3721 100644
--- a/pkgs/clan-cli/clan_cli/__init__.py
+++ b/pkgs/clan-cli/clan_cli/__init__.py
@@ -438,7 +438,7 @@ def main() -> None:
             log.exception("Exited with error")
         else:
             log.error("%s", e)
-            sys.exit(1)
+        sys.exit(1)
     except KeyboardInterrupt as ex:
         log.warning("Interrupted by user", exc_info=ex)
         sys.exit(1)

From b12abb208f659b1164041e03d552cf490c13184a Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 10 Jan 2025 17:19:06 +0100
Subject: [PATCH 2/3] checks.flash: add missing grub-install deps

---
 checks/flash/flake-module.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/checks/flash/flake-module.nix b/checks/flash/flake-module.nix
index 29a3d7c26..89a652c69 100644
--- a/checks/flash/flake-module.nix
+++ b/checks/flash/flake-module.nix
@@ -10,10 +10,14 @@
     let
       dependencies = [
         pkgs.disko
+        self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.pkgs.perlPackages.ConfigIniFiles
+        self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.pkgs.perlPackages.FileSlurp
+
         self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.config.system.build.toplevel
         self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.config.system.build.diskoScript
         self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.config.system.build.diskoScript.drvPath
         self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.config.system.clan.deployment.file
+
       ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
       closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
     in

From bad34db7537c0cffbd1d02c8a2f76f0ed7abb9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 16 Jan 2025 17:02:10 +0100
Subject: [PATCH 3/3] update nixpkgs

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8aa599fc8..d9534da74 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,11 +57,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736881310,
-        "narHash": "sha256-5BlVeikKoJVrUXBdr1kSrcRQ8o20Kl+ZU2pEzpE5sUw=",
+        "lastModified": 1736943799,
+        "narHash": "sha256-BYsp8PA1j691FupfrLVOQzm4CaYaKtkh4U+KuGMnBWw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "733994ea06585b76621073160e87b0bfac7fc5ae",
+        "rev": "ae2fb9f1fb5fcf17fb59f25c2a881c170c501d6f",
         "type": "github"
       },
       "original": {