Unify golang version in nix flake

tateexon · Sep 25, 2024 · 31ab5f2 · 31ab5f2
1 parent 9efc774
commit 31ab5f2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/.envrc b/.envrc
@@ -1 +1,4 @@
+watch_file \
+  nix/ci-runtests.nix \
+  nix/devshell.nix
 use flake .
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 tidy:
 	go mod tidy
+
 lint:
 	golangci-lint run
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -14,15 +14,18 @@
           overlays = [ ];
         };
 
+        # set go version here that will be used in all shells
+        go = pkgs.go_1_23;
+
         scriptDir = toString ./.;  # Converts the flake's root directory to a string
 
         # Importing the shell environments from separate files
         fullEnv = pkgs.callPackage ./nix/devshell.nix {
-          inherit pkgs scriptDir;
+          inherit pkgs scriptDir go;
         };
 
         ciEnv = pkgs.callPackage ./nix/ci-runtests.nix {
-          inherit pkgs scriptDir;
+          inherit pkgs scriptDir go;
         };
       in rec {
         devShell = fullEnv;

diff --git a/nix/ci-runtests.nix b/nix/ci-runtests.nix
@@ -1,8 +1,5 @@
-{ pkgs, scriptDir }:
+{ pkgs, scriptDir, go }:
 with pkgs;
-let
-  go = pkgs.go_1_22;
-in
 mkShell {
   nativeBuildInputs = [
     bash

diff --git a/nix/devshell.nix b/nix/devshell.nix
@@ -1,8 +1,5 @@
-{ pkgs, scriptDir }:
+{ pkgs, scriptDir, go }:
 with pkgs;
-let
-  go = pkgs.go_1_23;
-in
 mkShell {
   nativeBuildInputs = [
     # basics