fix: nix build, downgrade toolchain to go1.23.1 (#14442)

grafana · Oct 10, 2024 · 26dfd62 · 26dfd62
1 parent b8f17ab
commit 26dfd62
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/nix-ci.yaml b/.github/workflows/nix-ci.yaml
@@ -4,29 +4,30 @@ on:
   pull_request:
     paths:
       - "flake.nix"
+      - "go.mod"
       - "nix/**"
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix run --print-build-logs .#lint
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix run --print-build-logs .#test
   packages:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix build --print-build-logs .#promtail

diff --git a/flake.lock b/flake.lock
diff --git a/go.mod b/go.mod
@@ -1,8 +1,8 @@
 module github.com/grafana/loki/v3
 
-go 1.22
+go 1.23
 
-toolchain go1.23.2
+toolchain go1.23.1
 
 require (
 	cloud.google.com/go/bigtable v1.29.0

diff --git a/nix/packages/faillint.nix b/nix/packages/faillint.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "faillint";
-  version = "1.11.0";
+  version = "v1.14.0";
 
   src = fetchFromGitHub {
     owner = "fatih";
     repo = "faillint";
-    rev = "v${version}";
-    sha256 = "ZSTeNp8r+Ab315N1eVDbZmEkpQUxmmVovvtqBBskuI4=";
+    rev = "${version}";
+    sha256 = "NV+wbu547mtTa6dTGv7poBwWXOmu5YjqbauzolCg5qs=";
   };
 
-  vendorHash = "sha256-5OR6Ylkx8AnDdtweY1B9OEcIIGWsY8IwTHbR/LGnqFI=";
+  vendorHash = "sha256-vWt4HneDA7YwXYnn8TbfWCKzSv7RcgXxn/HAh6a+htQ=";
   doCheck = false;
 }
diff --git a/nix/packages/loki.nix b/nix/packages/loki.nix
@@ -5,7 +5,7 @@ let
     pname = "lambda-promtail";
 
     src = ./../../tools/lambda-promtail;
-    vendorHash = "sha256-CKob173T0VHD5c8F26aU7p1l+QzqddNM4qQedMbLJa0=";
+    vendorHash = "sha256-zEN42vbw4mWtU8KOUi9ZSQiFoRJnH7C04aaZ2wCtA/o=";
 
     doCheck = false;
 
@@ -27,8 +27,9 @@ pkgs.stdenv.mkDerivation {
     bash
     gcc
     git
-    go
+    go_1_23
     golangci-lint
+    gotools
     nettools
     yamllint