Skip to content

Commit 26dfd62

Browse files
fix: nix build, downgrade toolchain to go1.23.1 (#14442)
1 parent b8f17ab commit 26dfd62

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

‎.github/workflows/nix-ci.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,30 @@ on:
44
pull_request:
55
paths:
66
- "flake.nix"
7+
- "go.mod"
78
- "nix/**"
89
jobs:
910
lint:
1011
runs-on: ubuntu-latest
1112
steps:
1213
- uses: actions/checkout@v4
13-
- uses: cachix/install-nix-action@v22
14+
- uses: cachix/install-nix-action@v30
1415
with:
1516
nix_path: nixpkgs=channel:nixos-unstable
1617
- run: nix run --print-build-logs .#lint
1718
test:
1819
runs-on: ubuntu-latest
1920
steps:
2021
- uses: actions/checkout@v4
21-
- uses: cachix/install-nix-action@v22
22+
- uses: cachix/install-nix-action@v30
2223
with:
2324
nix_path: nixpkgs=channel:nixos-unstable
2425
- run: nix run --print-build-logs .#test
2526
packages:
2627
runs-on: ubuntu-latest
2728
steps:
2829
- uses: actions/checkout@v4
29-
- uses: cachix/install-nix-action@v22
30+
- uses: cachix/install-nix-action@v30
3031
with:
3132
nix_path: nixpkgs=channel:nixos-unstable
3233
- run: nix build --print-build-logs .#promtail

‎flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/grafana/loki/v3
22

3-
go 1.22
3+
go 1.23
44

5-
toolchain go1.23.2
5+
toolchain go1.23.1
66

77
require (
88
cloud.google.com/go/bigtable v1.29.0

‎nix/packages/faillint.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
buildGoModule rec {
44
pname = "faillint";
5-
version = "1.11.0";
5+
version = "v1.14.0";
66

77
src = fetchFromGitHub {
88
owner = "fatih";
99
repo = "faillint";
10-
rev = "v${version}";
11-
sha256 = "ZSTeNp8r+Ab315N1eVDbZmEkpQUxmmVovvtqBBskuI4=";
10+
rev = "${version}";
11+
sha256 = "NV+wbu547mtTa6dTGv7poBwWXOmu5YjqbauzolCg5qs=";
1212
};
1313

14-
vendorHash = "sha256-5OR6Ylkx8AnDdtweY1B9OEcIIGWsY8IwTHbR/LGnqFI=";
14+
vendorHash = "sha256-vWt4HneDA7YwXYnn8TbfWCKzSv7RcgXxn/HAh6a+htQ=";
1515
doCheck = false;
1616
}

‎nix/packages/loki.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let
55
pname = "lambda-promtail";
66

77
src = ./../../tools/lambda-promtail;
8-
vendorHash = "sha256-CKob173T0VHD5c8F26aU7p1l+QzqddNM4qQedMbLJa0=";
8+
vendorHash = "sha256-zEN42vbw4mWtU8KOUi9ZSQiFoRJnH7C04aaZ2wCtA/o=";
99

1010
doCheck = false;
1111

@@ -27,8 +27,9 @@ pkgs.stdenv.mkDerivation {
2727
bash
2828
gcc
2929
git
30-
go
30+
go_1_23
3131
golangci-lint
32+
gotools
3233
nettools
3334
yamllint
3435

0 commit comments

Comments
 (0)