From cfac1e9ce702432a9e96a9aabde20e65fc40c6a3 Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Tue, 17 Oct 2023 11:47:23 +0300
Subject: [PATCH] feat: temporarily add go from staging to flake

---
 flake.lock | 23 ++++++++++++++++++++---
 flake.nix  | 12 ++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index a0e7489..0197eee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696757521,
-        "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=",
+        "lastModified": 1697379843,
+        "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2646b294a146df2781b1ca49092450e8a32814e1",
+        "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
         "type": "github"
       },
       "original": {
@@ -37,9 +37,26 @@
         "type": "github"
       }
     },
+    "nixpkgs-staging-next": {
+      "locked": {
+        "lastModified": 1697522482,
+        "narHash": "sha256-PIggwFrGfBihQLyGsewFv8sbx/Z7LPy8MVkImYea9U0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c61915bc9615d3995d4f4dae505ae68a359eab7b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "staging-next",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
+        "nixpkgs-staging-next": "nixpkgs-staging-next",
         "templ": "templ"
       }
     },
diff --git a/flake.nix b/flake.nix
index c166223..af5107e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,13 +1,14 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs-staging-next.url = "github:nixos/nixpkgs/staging-next";
     templ = {
       url = "github:a-h/templ?ref=tags/v0.2.364";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, templ }:
+  outputs = inputs@{ self, nixpkgs, nixpkgs-staging-next, templ }:
   let
     allSystems = [
       "x86_64-linux"
@@ -15,15 +16,18 @@
 
     forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
       pkgs = import nixpkgs { inherit system; };
+      pkgs-staging-next = import nixpkgs-staging-next { inherit system; };
       templ-pkg = inputs.templ.packages.${system}.default;
     });
   in
   {
-    devShells = forAllSystems ({ pkgs, templ-pkg }: {
+    devShells = forAllSystems ({ pkgs, pkgs-staging-next, templ-pkg }: {
       default = pkgs.mkShell {
         buildInputs = [
-          pkgs.go
-          pkgs.gopls
+          #pkgs.go
+          #pkgs.gopls
+          pkgs-staging-next.go
+          pkgs-staging-next.gopls
 
           # sqlite web inspector for developing
           pkgs.sqlite-web
-- 
2.44.1