From 567646ba878a198d65327db018c8c6c8a1fd1300 Mon Sep 17 00:00:00 2001
From: Surma <surma@surma.dev>
Date: Thu, 15 Oct 2026 23:39:52 +0100
Subject: [PATCH] Flake

---
 flake.lock | 34 ++++++++++++++++++++++++++++++++++
 flake.nix  | 49 +++++++++++++++++++++----------------------------
 2 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2866b85..105b374 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1791914995,
+        "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1791637130,
@@ -18,6 +36,7 @@
     },
     "root": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay"
       }
@@ -41,6 +60,21 @@
         "repo": "rust-overlay",
         "type": "github"
       }
+    },
+    "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 27303c6..11f11a1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,28 +3,25 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
     rust-overlay.url = "github:oxalica/rust-overlay";
     rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { nixpkgs, rust-overlay, ... }:
-    let
-      systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-      forAll = f: nixpkgs.lib.genAttrs systems (system: f (import nixpkgs {
-        inherit system;
-        overlays = [ rust-overlay.overlays.default ];
-      }));
-      # The toolchain that builds the host and, at runtime, the actors.
-      rustFor = pkgs: pkgs.rust-bin.stable.latest.default.override {
-        targets = [ "wasm32-wasip2" ];
-        extensions = [ "rust-src" ];
-      };
-      sausageFor = pkgs:
-        let
-          rust = rustFor pkgs;
-          rustPlatform = pkgs.makeRustPlatform { cargo = rust; rustc = rust; };
-        in
-        rustPlatform.buildRustPackage {
+  outputs = { nixpkgs, flake-utils, rust-overlay, ... }:
+    flake-utils.lib.eachSystem flake-utils.lib.allSystems (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ rust-overlay.overlays.default ];
+        };
+        # The toolchain that builds the host and, at runtime, the actors.
+        rust = pkgs.rust-bin.stable.latest.default.override {
+          targets = [ "wasm32-wasip2" ];
+          extensions = [ "rust-src" ];
+        };
+        rustPlatform = pkgs.makeRustPlatform { cargo = rust; rustc = rust; };
+        sausage = rustPlatform.buildRustPackage {
           pname = "sausage";
           version = "0.1.0";
           src = ./.;
@@ -38,21 +35,17 @@
           '';
           meta.mainProgram = "sausage";
         };
-    in
-    {
-      packages = forAll (pkgs: { default = sausageFor pkgs; });
+      in
+      {
+        packages.default = sausage;
 
-      apps = forAll (pkgs: {
-        default = { type = "app"; program = "${sausageFor pkgs}/bin/sausage"; };
-      });
+        apps.default = { type = "app"; program = "${sausage}/bin/sausage"; };
 
-      devShells = forAll (pkgs: {
-        default = pkgs.mkShell {
-          packages = [ (rustFor pkgs) pkgs.wasmtime pkgs.wasm-tools ];
+        devShells.default = pkgs.mkShell {
+          packages = [ rust pkgs.wasmtime pkgs.wasm-tools ];
           shellHook = ''
             export CARGO_HOME="$PWD/.cargo-home"
           '';
         };
       });
-    };
 }