diff --git a/.github/workflows/nix-ci.yaml b/.github/workflows/nix-ci.yaml index 06a6cad41c8a4..ba08c719ee3dc 100644 --- a/.github/workflows/nix-ci.yaml +++ b/.github/workflows/nix-ci.yaml @@ -4,13 +4,14 @@ 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 @@ -18,7 +19,7 @@ jobs: 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 @@ -26,7 +27,7 @@ jobs: 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 index 06c301936e4db..2e819fa13ad72 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699781429, - "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { diff --git a/go.mod b/go.mod index bfccc98c18c0d..da86bb21b0c18 100644 --- 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 index f19d4c9fac760..0931fc08fccfa 100644 --- 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 index 977161460eb8d..deab8e6b1307d 100644 --- 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