From 32594baba75ab4086f98f06a607405fefa34dd8e Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sun, 20 Oct 2024 23:50:17 +0200
Subject: [PATCH 1/3] flake: use new devshell format

---
 flake.nix | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index db6957e..90a6aa5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,19 +37,24 @@
                 src = pkgs.lib.cleanSource ./.;
               };
           });
-      devShell = forAllSystems ({ system, pkgs, fpkgs }:
-        let
-          ffpkgs = fpkgs.complete;
-        in
-        pkgs.mkShell {
-          buildInputs = [
-            ffpkgs.cargo
-            ffpkgs.clippy
-            ffpkgs.rust-src
-            ffpkgs.rustc
-            ffpkgs.rustfmt
-          ];
-        });
+      devShells = forAllSystems
+        ({ system, pkgs, fpkgs }:
+          let
+            ffpkgs = fpkgs.complete;
+          in
+          {
+            default = pkgs.mkShell
+              {
+                buildInputs = [
+                  ffpkgs.cargo
+                  ffpkgs.clippy
+                  ffpkgs.rust-src
+                  ffpkgs.rustc
+                  ffpkgs.rustfmt
+                  pkgs.wgo
+                ];
+              };
+          });
     };
 }
 

From 07a2ae193a541423cc05a70b3f1c62e350c22552 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sun, 20 Oct 2024 23:56:21 +0200
Subject: [PATCH 2/3] flake: remove unused parameters

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

diff --git a/flake.nix b/flake.nix
index 90a6aa5..9a122e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
     };
   };
 
-  outputs = { self, fenix, nixpkgs, ... }:
+  outputs = { fenix, nixpkgs, ... }:
     let
       allSystems = [
         "x86_64-linux" # 64-bit Intel/AMD Linux
@@ -23,7 +23,7 @@
     in
     {
       packages = forAllSystems
-        ({ system, pkgs, fpkgs }:
+        ({ pkgs, fpkgs, ... }:
           let
             toolchain = fpkgs.minimal.toolchain;
           in
@@ -38,7 +38,7 @@
               };
           });
       devShells = forAllSystems
-        ({ system, pkgs, fpkgs }:
+        ({ pkgs, fpkgs, ... }:
           let
             ffpkgs = fpkgs.complete;
           in

From 0cc19082f69c6170a15a8dc48918a797c3036bcf Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sun, 20 Oct 2024 23:56:40 +0200
Subject: [PATCH 3/3] flake: use nixpkgs master

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 9a122e3..53c6de4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/master";
     fenix = {
       url = "github:nix-community/fenix";
       inputs.nixpkgs.follows = "nixpkgs";