From 8995a90df4bd1533e6360564809778758a054fc4 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 14 Mar 2025 12:36:14 +0000 Subject: [PATCH] go-mockery: 2.52.1 -> 2.53.2 Diff: https://github.com/vektra/mockery/compare/v2.52.1...v2.53.2 --- pkgs/by-name/go/go-mockery/package.nix | 92 ++++++++++++++++---------- 1 file changed, 56 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index c5bd0378d456..0ac9e42eb5a4 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -1,69 +1,89 @@ -{ lib, buildGoModule, fetchFromGitHub, go-mockery, runCommand, go }: +{ + lib, + buildGoModule, # sync with go below, update to latest release + fetchFromGitHub, + + # passthru test + go-mockery, + runCommand, + go, +}: buildGoModule rec { pname = "go-mockery"; - version = "2.52.1"; + version = "2.53.2"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-algCErKmB43r/t7wo8BJSM0MHRxvxVWZ2u0n1xuLLdw="; + sha256 = "sha256-8J9sx9rPBZXZQKmuDSAuuktONyNM2U32W8CM9jts4Hw="; }; - preCheck = '' - substituteInPlace ./pkg/generator_test.go --replace-fail 0.0.0-dev ${version} - substituteInPlace ./pkg/logging/logging_test.go --replace-fail v0.0 v${lib.versions.majorMinor version} - ''; - ldflags = [ - "-s" "-w" - "-X" "github.com/vektra/mockery/v2/pkg/logging.SemVer=v${version}" + "-s" + "-w" + "-X" + "github.com/vektra/mockery/v${lib.versions.major version}/pkg/logging.SemVer=v${version}" ]; env.CGO_ENABLED = false; proxyVendor = true; - vendorHash = "sha256-nL6dDGifhtmDHfz1ae+wnmVPPQDLrRgI7v8c5cQzo8Q="; + vendorHash = "sha256-4dZnffxyxTex5wvdWP4rRslW+I8/XC1RhhrljgI630I="; subPackages = [ "." ]; + preCheck = '' + # check all paths + unset subPackages + + substituteInPlace ./pkg/generator_test.go --replace-fail 0.0.0-dev ${version} + substituteInPlace ./pkg/logging/logging_test.go --replace-fail v0.0 v${lib.versions.majorMinor version} + ''; + passthru.tests = { - generateMock = runCommand "${pname}-test" { - nativeBuildInputs = [ go-mockery ]; - buildInputs = [ go ]; - } '' - if [[ $(mockery --version) != *"${version}"* ]]; then - echo "Error: program version does not match package version" - exit 1 - fi + generateMock = + runCommand "${pname}-test" + { + nativeBuildInputs = [ go-mockery ]; + buildInputs = [ go ]; + } + '' + if [[ $(${meta.mainProgram} --version) != *"${version}"* ]]; then + echo "Error: program version does not match package version" + exit 1 + fi - export HOME=$TMPDIR + export HOME=$TMPDIR - cat < foo.go - package main + cat < foo.go + package main - type Foo interface { - Bark() string - } - EOF + type Foo interface { + Bark() string + } + EOF - mockery --name Foo --dir . + ${meta.mainProgram} --name Foo --dir . - if [[ ! -f "mocks/Foo.go" ]]; then - echo "Error: mocks/Foo.go was not generated by ${pname}" - exit 1 - fi + if [[ ! -f "mocks/Foo.go" ]]; then + echo "Error: mocks/Foo.go was not generated by ${pname}" + exit 1 + fi - touch $out - ''; + touch $out + ''; }; - meta = with lib; { + meta = { homepage = "https://github.com/vektra/mockery"; description = "Mock code autogenerator for Golang"; - maintainers = with maintainers; [ fbrs ]; + maintainers = with lib.maintainers; [ + fbrs + jk + ]; mainProgram = "mockery"; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; }