From 192752acd9c76f0efd158599ca2b343a762197bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 08:16:52 +0000 Subject: [PATCH 1/2] deps: update nix lock file --- flake.lock | 12 ++++++------ internal/meshapi/meshapi.pb.go | 4 ++-- internal/meshapi/meshapi_grpc.pb.go | 2 +- internal/userapi/userapi.pb.go | 4 ++-- internal/userapi/userapi_grpc.pb.go | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index ea381d0a03..0fd68d6efc 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1737103437, - "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", + "lastModified": 1738070913, + "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", + "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", "type": "github" }, "original": { diff --git a/internal/meshapi/meshapi.pb.go b/internal/meshapi/meshapi.pb.go index 970fbe96af..01938d048c 100644 --- a/internal/meshapi/meshapi.pb.go +++ b/internal/meshapi/meshapi.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.1 +// protoc-gen-go v1.36.3 +// protoc v5.29.2 // source: meshapi.proto package meshapi diff --git a/internal/meshapi/meshapi_grpc.pb.go b/internal/meshapi/meshapi_grpc.pb.go index 7129759a21..16f5c62339 100644 --- a/internal/meshapi/meshapi_grpc.pb.go +++ b/internal/meshapi/meshapi_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.1 +// - protoc v5.29.2 // source: meshapi.proto package meshapi diff --git a/internal/userapi/userapi.pb.go b/internal/userapi/userapi.pb.go index e81400d0d4..75ea6f4cc4 100644 --- a/internal/userapi/userapi.pb.go +++ b/internal/userapi/userapi.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.1 +// protoc-gen-go v1.36.3 +// protoc v5.29.2 // source: internal/userapi/userapi.proto package userapi diff --git a/internal/userapi/userapi_grpc.pb.go b/internal/userapi/userapi_grpc.pb.go index 8021d5ae86..22f560ff00 100644 --- a/internal/userapi/userapi_grpc.pb.go +++ b/internal/userapi/userapi_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.1 +// - protoc v5.29.2 // source: internal/userapi/userapi.proto package userapi From 4641c3cee32dedb3d2436b0ed8b2a7162fbdbfba Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 30 Jan 2025 11:04:25 +0100 Subject: [PATCH 2/2] overlays: pin vale to v3.9.3 Signed-off-by: Paul Meyer --- overlays/nixpkgs.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix index 49c7f4323f..b4688450fb 100644 --- a/overlays/nixpkgs.nix +++ b/overlays/nixpkgs.nix @@ -46,4 +46,24 @@ final: prev: done ''; }); + + # A change in vale popped up several hundred new findings, likely the bug + # described in https://github.com/errata-ai/vale/issues/955. + # Wait for the v3.9.5 release. + vale = prev.vale.overrideAttrs ( + finalAttrs: _prevAttrs: { + version = "3.9.3"; + src = final.fetchFromGitHub { + owner = "errata-ai"; + repo = "vale"; + rev = "v${finalAttrs.version}"; + hash = "sha256-2IvVF/x8n1zvVXHAJLAFuDrw0Oi/RuQDa851SBlyRIk="; + }; + vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk="; + ldflags = [ + "-s" + "-X main.version=${finalAttrs.version}" + ]; + } + ); }