Merge pull request #200518 from avdv/buf-fix-cyclic-import-test

buf: Add patch to make TestCyclicImport deterministic
This commit is contained in:
Arnout Engelen 2022-11-10 14:40:32 +01:00 committed by GitHub
commit 5f588eb4a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,7 @@
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
, protobuf
, git
, testers
@ -29,6 +30,16 @@ buildGoModule rec {
# Remove reliance of tests on file protocol which is disabled in git by default now
# Rebased upstream change https://github.com/bufbuild/buf/commit/bcaa77f8bbb8f6c198154c7c8d53596da4506dab
./buf-tests-dont-use-file-transport.patch
# Make TestCyclicImport tests deterministic (see https://github.com/bufbuild/buf/pull/1551)
(fetchpatch {
url = "https://github.com/bufbuild/buf/commit/75b5ef4c84f5953002dff95a1c66cb82b0e3b06f.patch";
sha256 = "sha256-pKF3VXkzttsTTT2r/Z37ug9nnu8gRdkfmv/aTOhAJpw=";
})
# Make TestDuplicateSyntheticOneofs check deterministic (see https://github.com/bufbuild/buf/pull/1579)
(fetchpatch {
url = "https://github.com/bufbuild/buf/commit/9e72aa314e6f02b36793caa5f6068394cbdcb98c.patch";
sha256 = "sha256-6NEF3sP1EQ6cQxkH2xRyHxAD0OrXBlQQa05rLK998wo=";
})
];
nativeBuildInputs = [ installShellFiles ];