From 6ef670fee37e81ce92de59ef9ecc910300e99d23 Mon Sep 17 00:00:00 2001 From: Mathieu Post Date: Fri, 30 Sep 2022 15:48:56 +0200 Subject: [PATCH] go-mockery: 2.9.2 -> 2.14.1 fixes errors with go 1.18 --- pkgs/development/tools/go-mockery/default.nix | 17 ++++++++++++++--- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index b1673ecfe1e3..a1b406ff8666 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,16 +2,27 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.9.2"; + version = "2.14.1"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-+r9he3rlANGusv0vIZPSninaouMftRsfJWnm3VngcXU="; + sha256 = "sha256-FgDjuiBFzOaT8GlJYI7xNfxC9uhyZtBAIBFXZgW0BDU="; }; - vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; + preCheck = '' + substituteInPlace ./pkg/generator_test.go --replace 0.0.0-dev ${version} + ''; + + ldflags = [ + "-s" "-w" + "-X" "github.com/vektra/mockery/v2/pkg/config.SemVer=v${version}" + ]; + + CGO_ENABLED = false; + + vendorSha256 = "sha256-+40n7OoP8TLyjj4ehBHOD6/SqzJMCHsISE0FrXUL3Q8="; meta = with lib; { homepage = "https://github.com/vektra/mockery"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d08b09c37e3d..d276fbe9cfa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25403,8 +25403,7 @@ with pkgs; go-migrate = callPackage ../development/tools/go-migrate { }; go-mockery = callPackage ../development/tools/go-mockery { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; + buildGoModule = buildGo118Module; # tests fail with 1.19 }; gomacro = callPackage ../development/tools/gomacro { };