From 29c7fae0cab64a16d3248abbcae189ca96a20ac1 Mon Sep 17 00:00:00 2001
From: Matthew Brisebois <matthew@webheroes.ca>
Date: Tue, 20 Aug 2024 15:17:33 -0600
Subject: [PATCH] Revert flake.nix

---
 flake.lock | 39 ++++++++++++++++++++++++++++++++++++---
 flake.nix  | 53 ++++++++++++++++++++++++++---------------------------
 2 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2fb54df..9a771ac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,29 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "id": "flake-utils",
+        "type": "indirect"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720781449,
-        "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
+        "lastModified": 1722640603,
+        "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
+        "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
         "type": "github"
       },
       "original": {
@@ -18,8 +35,24 @@
     },
     "root": {
       "inputs": {
+        "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 be3e188..6afbcd9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,37 +5,36 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   };
 
-  outputs = { self, nixpkgs }:
-    let
-      system = "x86_64-linux";
-      pkgs = import ./pkgs.nix {
-        pkgs = nixpkgs.legacyPackages.${system};
-        inherit system;
-      };
-    in
-    {
-      devShells.${system} = {
-        default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            holochain_0-4
-            lair-keystore_0-4-5
-            hc_0-4
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import ./pkgs.nix {
+          pkgs = nixpkgs.legacyPackages.${system};
+          inherit system;
+        };
+      in
+      {
+        devShell = pkgs.mkShell {
+            buildInputs = with pkgs; [
+              holochain_0-4
+              lair-keystore_0-4-5
+              hc_0-4
 
-            rustup
-            cargo
-            rustc
+              rustup
+              cargo
+              rustc
 
-            nodejs_22
-          ];
+              nodejs_22
+            ];
 
-          shellHook = ''
-            export PS1="\[\e[1;32m\](flake-env)\[\e[0m\] \[\e[1;34m\]\u@\h:\w\[\e[0m\]$ "
+            shellHook = ''
+              export PS1="\[\e[1;32m\](flake-env)\[\e[0m\] \[\e[1;34m\]\u@\h:\w\[\e[0m\]$ "
               export CARGO_HOME=$(pwd)/.cargo
               export RUSTUP_HOME=$(pwd)/.rustup
-            rustup default stable
-            rustup target add wasm32-unknown-unknown
-          '';
+              rustup default stable
+              rustup target add wasm32-unknown-unknown
+            '';
         };
-      };
-    };
+      }
+    );
 }