From 127191d92e22fdbda927a8b0340122b291953ab8 Mon Sep 17 00:00:00 2001
From: Notarin Steele <424c414e4b@gmail.com>
Date: Sat, 16 Aug 2025 14:50:08 -0400
Subject: [PATCH 1/2] Fixed missing architectures

---
 flake.lock |  34 -----------------
 flake.nix  | 105 +++++++++++++++++++++++++++++------------------------
 2 files changed, 58 insertions(+), 81 deletions(-)

diff --git a/flake.lock b/flake.lock
index 369add2..76ae581 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,24 +15,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1744868846,
@@ -52,24 +34,8 @@
     "root": {
       "inputs": {
         "crane": "crane",
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index d0f7946..45f8ea9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,65 +2,76 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = {
+    self,
     nixpkgs,
     crane,
-    flake-utils,
     ...
-  }:
-    flake-utils.lib.eachDefaultSystemPassThrough (
-      system: let
-        pkgs = nixpkgs.legacyPackages.${system};
-        craneLib = crane.mkLib pkgs;
-      in rec {
-        packages.${system} = rec {
-          hayabusa = craneLib.buildPackage {
-            src = ./.;
-            nativeBuildInputs = with pkgs; [
+  }: (
+    builtins.foldl' (acc: elem: nixpkgs.lib.recursiveUpdate acc elem) {} (
+      builtins.map (
+        system: let
+          pkgs = nixpkgs.legacyPackages.${system};
+          craneLib = crane.mkLib pkgs;
+        in {
+          packages.${system} = rec {
+            hayabusa = craneLib.buildPackage {
+              src = ./.;
+              nativeBuildInputs = with pkgs; [
+                pkg-config
+                openssl
+              ];
+              meta = {
+                homepage = "https://github.com/Notarin/hayabusa/";
+                description = "Hayabusa is a swift rust fetch program.";
+                mainProgram = "hayabusa";
+              };
+            };
+            default = hayabusa;
+          };
+          devShells.${system}.default = craneLib.devShell {
+            packages = with pkgs; [
               pkg-config
               openssl
             ];
-            meta = {
-              homepage = "https://github.com/Notarin/hayabusa/";
-              description = "Hayabusa is a swift rust fetch program.";
-              mainProgram = "hayabusa";
-            };
           };
-          default = hayabusa;
-        };
-        devShells.${system}.default = craneLib.devShell {
-          packages = with pkgs; [
-            pkg-config
-            openssl
-          ];
-        };
-        nixosModules.default = {
-          pkgs,
-          lib,
-          config,
-          ...
-        }: {
-          options = {
-            services.hayabusa = {
-              enable = lib.mkEnableOption "Enable the hayabusa system info daemon";
-            };
+        }
+      )
+      [
+        "aarch64-darwin"
+        "aarch64-linux"
+        "i686-linux"
+        "x86_64-darwin"
+        "x86_64-linux"
+      ]
+    )
+    // {
+      nixosModules.default = {
+        pkgs,
+        lib,
+        config,
+        ...
+      }: {
+        options = {
+          services.hayabusa = {
+            enable = lib.mkEnableOption "Enable the hayabusa system info daemon";
           };
-          config = lib.mkIf config.services.hayabusa.enable {
-            systemd.services.hayabusa = {
-              after = ["network.target"];
-              wants = ["network-online.target"];
-              wantedBy = ["multi-user.target"];
-              serviceConfig = {
-                Restart = "always";
-                Type = "simple";
-                ExecStart = "${lib.getExe packages.${config._module.args.pkgs.stdenv.system}.default} -d";
-              };
+        };
+        config = lib.mkIf config.services.hayabusa.enable {
+          systemd.services.hayabusa = {
+            after = ["network.target"];
+            wants = ["network-online.target"];
+            wantedBy = ["multi-user.target"];
+            serviceConfig = {
+              Restart = "always";
+              Type = "simple";
+              ExecStart = "${lib.getExe self.packages.${config._module.args.pkgs.stdenv.system}.default} -d";
             };
           };
         };
-      }
-    );
+      };
+    }
+  );
 }

From d2770ba027bdf7350bd4b34d9ae6da02843416d0 Mon Sep 17 00:00:00 2001
From: Notarin Steele <424c414e4b@gmail.com>
Date: Sat, 16 Aug 2025 14:53:45 -0400
Subject: [PATCH 2/2] Incremented version to 0.3.8

---
 Cargo.lock | 6 +++---
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 82fa4bf..f210874 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -697,7 +697,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 
 [[package]]
 name = "hayabusa"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "base64",
  "clap",
@@ -1403,9 +1403,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.97"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1"
+checksum = "56b3997d62ff36d1d0e5616f1e00c4b071680eb3769d56102663c1f0886971e1"
 dependencies = [
  "unicode-ident",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index ea242c0..6277ace 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hayabusa"
-version = "0.3.7"
+version = "0.3.8"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 license-file = "LICENSE.md"