about summary refs log tree commit diff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2022-12-06 12:06:09 -0500
committerGitHub <noreply@github.com>2022-12-06 12:06:09 -0500
commita6695650be1f1f90ac5eb2500ca228dd967e8b8f (patch)
treee4c63067a4ac729186d1747e5227d6ea263286cf
parent751d1a5a5121b0ea94a470138a7991e58fbaebae (diff)
parentbaefb0bfd8503f3e89016a9c3ca76036a1a20883 (diff)
Merge pull request #204800 from mathieupost/patch-4
go-mockery: 2.14.1 -> 2.15.0
-rw-r--r--pkgs/development/tools/go-mockery/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix
index a1b406ff8666e..3b7911c20fe3c 100644
--- a/pkgs/development/tools/go-mockery/default.nix
+++ b/pkgs/development/tools/go-mockery/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "go-mockery";
-  version = "2.14.1";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "vektra";
     repo = "mockery";
     rev = "v${version}";
-    sha256 = "sha256-FgDjuiBFzOaT8GlJYI7xNfxC9uhyZtBAIBFXZgW0BDU=";
+    sha256 = "sha256-RowVdrpUQdoxgJCrg9rzaF/7ZA09SKzjsVrzQb5wzR8=";
   };
 
   preCheck = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54de606469950..c17634e7b69c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25698,9 +25698,7 @@ with pkgs;
 
   go-migrate = callPackage ../development/tools/go-migrate { };
 
-  go-mockery = callPackage ../development/tools/go-mockery {
-    buildGoModule = buildGo118Module; # tests fail with 1.19
-  };
+  go-mockery = callPackage ../development/tools/go-mockery { };
 
   gomacro = callPackage ../development/tools/gomacro { };