From c6de7f54e1e4ca1eb4df5a284dc2958a95ad9de6 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sun, 3 Aug 2025 16:01:16 -0400
Subject: [PATCH 1/3] =?UTF-8?q?m1n1:=201.4.21=20=E2=86=92=201.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/m1/m1n1/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
index 229f6522cbbd..aa96c0576b30 100644
--- a/pkgs/by-name/m1/m1n1/package.nix
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "m1n1";
-  version = "1.4.21";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "AsahiLinux";
     repo = "m1n1";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0ZnDexY/Sf2TJFfUv/YelCctFJVENffWqBU0r0azD0M=";
+    hash = "sha256-J1PZVaEdI6gx/qzsoVW1ehRQ/ZDKzdC1NgIGgBqxQ+0=";
   };
 
   nativeBuildInputs = [

From 81adf0a3f314fe17b46b521f6fb9f3e0354044ff Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Tue, 5 Aug 2025 19:35:48 -0400
Subject: [PATCH 2/3] m1n1: enable tests

---
 pkgs/by-name/m1/m1n1/package.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
index aa96c0576b30..6fa864b85772 100644
--- a/pkgs/by-name/m1/m1n1/package.nix
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   imagemagick,
   source-code-pro,
+  python3Packages,
   nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -47,6 +48,25 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  nativeCheckInputs = with python3Packages; [
+    pytest
+  ];
+
+  checkInputs = with python3Packages; [
+    construct
+    pyserial
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    pytest
+
+    runHook postCheck
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
   };

From fd8c443ccd183bc6d9c2b7d8166d001ee8fac303 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Tue, 5 Aug 2025 20:28:02 -0400
Subject: [PATCH 3/3] m1n1: add branding

---
 pkgs/by-name/m1/m1n1/package.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
index 6fa864b85772..d2516357e0f2 100644
--- a/pkgs/by-name/m1/m1n1/package.nix
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -6,6 +6,8 @@
   source-code-pro,
   python3Packages,
   nix-update-script,
+  nixos-icons,
+  withBranding ? true,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "m1n1";
@@ -18,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-J1PZVaEdI6gx/qzsoVW1ehRQ/ZDKzdC1NgIGgBqxQ+0=";
   };
 
+  postPatch = lib.optionalString withBranding ''
+    ln -s ${nixos-icons}/share/icons/hicolor/128x128/apps/nix-snowflake.png data/custom_128.png
+    ln -s ${nixos-icons}/share/icons/hicolor/256x256/apps/nix-snowflake.png data/custom_256.png
+  '';
+
   nativeBuildInputs = [
     imagemagick
   ];
@@ -33,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [
     "ARCH=${stdenv.cc.targetPrefix}"
     "RELEASE=1"
+    (lib.optionalString withBranding "LOGO=custom")
   ];
 
   enableParallelBuilding = true;
@@ -73,6 +81,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Bootloader to bridge the Apple (XNU) boot to Linux boot";
+    longDescription = ''
+      m1n1 is the bootloader developed by the Asahi Linux project to
+      bridge the Apple (XNU) boot ecosystem to the Linux boot ecosystem.
+
+      What it does:
+
+      - Initializes hardware
+      - Puts up a pretty Nix logo
+      - Loads embedded (appended) payloads, which can be:
+         - Device Trees (FDTs), with automatic selection based on the platform
+         - Initramfs images (compressed CPIO archives)
+         - Kernel images in Linux ARM64 boot format (optionally compressed)
+         - Configuration statements
+    '';
     homepage = "https://github.com/AsahiLinux/m1n1";
     changelog = "https://github.com/AsahiLinux/m1n1/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [