From 36c8305a06d39ca59b2545c56d2dd7018f400b4a Mon Sep 17 00:00:00 2001
From: "m.huber" <m.huber@kithara.com>
Date: Tue, 14 Jan 2025 23:58:08 +0100
Subject: [PATCH 1/2] Add golang back to nix dev environment

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

diff --git a/flake.lock b/flake.lock
index 1890b82dcfa7b..4319737c26e93 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1736798957,
+        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e3655b627ebe5..843f842634f3c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,6 +29,7 @@
             poetry
 
             # backend
+            go_1_23
             gofumpt
             sqlite
           ];

From ea57ec10e8ea258591c6dfc5330245857a95cada Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Thu, 16 Jan 2025 11:41:35 -0500
Subject: [PATCH 2/2] use nix goroot

---
 flake.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/flake.nix b/flake.nix
index 843f842634f3c..f54eba1c3bcfc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,6 +33,10 @@
             gofumpt
             sqlite
           ];
+          shellHook = ''
+            export GO="${pkgs.go_1_23}/bin/go"
+            export GOROOT="${pkgs.go_1_23}/share/go"
+          '';
         };
       }
     );