bump golang to 1.23.x, python to 3, and remove asdf .tool-versions (#9)

tateexon · Sep 25, 2024 · c5d3c99 · c5d3c99
1 parent 1e1e342
commit c5d3c99
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 29 deletions.
diff --git a/.tool-versions b/.tool-versions
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,22 +12,20 @@
         pkgs = import nixpkgs {
           inherit system;
           overlays = [ ];
-          config = {
-            permittedInsecurePackages = [
-              "python-2.7.18.8"
-            ];
-          };
         };
 
+        # 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_22;
-in
 mkShell {
   nativeBuildInputs = [
     # basics
@@ -25,7 +22,7 @@ mkShell {
     # linting tools
     typos
     pre-commit
-    python
+    python3
     shfmt
     shellcheck
   ];