From 16b59bd2912ec2fe33c8b266b8ff828d57a35363 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 6 Oct 2024 06:59:21 +0000 Subject: [PATCH] buf: 1.42.0 -> 1.44.0 --- .../buf/default.nix => by-name/bu/buf/package.nix} | 10 +++++++--- .../tools => by-name/bu}/buf/skip_broken_tests.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) rename pkgs/{development/tools/buf/default.nix => by-name/bu/buf/package.nix} (84%) rename pkgs/{development/tools => by-name/bu}/buf/skip_broken_tests.patch (100%) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/by-name/bu/buf/package.nix similarity index 84% rename from pkgs/development/tools/buf/default.nix rename to pkgs/by-name/bu/buf/package.nix index 95fa7c96c2bf..5f8bfc30ebb8 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.42.0"; + version = "1.44.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-T4cEl2aT6F/IamCd1FxomYxqGpbcbXzPtEu0AJUyJJU="; + hash = "sha256-I0Y9gsNqCFLR2Bkt55HyER6wznTNoZW5345zUmuOFXQ="; }; - vendorHash = "sha256-apF3FpVlwonm76d0Ue7TMPDIRW0BNkZXWMLgh1+mmvo="; + vendorHash = "sha256-4ykve9X//ckYPDkq76i0ojOiyzjrPJ/J2z7mA5giWKE="; patches = [ # Skip a test that requires networking to be available to work. @@ -40,6 +40,10 @@ buildGoModule rec { ]; preCheck = '' + # For WebAssembly runtime tests + GOOS=wasip1 GOARCH=wasm go build -o $GOPATH/bin/buf-plugin-suffix.wasm \ + ./private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix + # The tests need access to some of the built utilities export PATH="$PATH:$GOPATH/bin" ''; diff --git a/pkgs/development/tools/buf/skip_broken_tests.patch b/pkgs/by-name/bu/buf/skip_broken_tests.patch similarity index 100% rename from pkgs/development/tools/buf/skip_broken_tests.patch rename to pkgs/by-name/bu/buf/skip_broken_tests.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ecb984fb667..0ca59a20ba25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -351,8 +351,6 @@ with pkgs; brev-cli = callPackage ../development/misc/brev-cli { }; - buf = callPackage ../development/tools/buf { }; - cbfmt = callPackage ../development/tools/cbfmt { }; circumflex = callPackage ../applications/networking/circumflex { };