Unverified Commit 671bc100 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

go-mockery: 2.52.1 -> 2.53.2, terragrunt: 0.75.10 -> 0.76.1 (#389836)

parents 2537db10 c0ecec31

pkgs/by-name/go/go-mockery/package.nix

+62 −42
Original line number Diff line number Diff line 
{ 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" {

    generateMock =

      runCommand "${pname}-test"

        {

          nativeBuildInputs = [ go-mockery ];

          buildInputs = [ go ];

    } ''

      if [[ $(mockery --version) != *"${version}"* ]]; then

        }

        ''

          if [[ $(${meta.mainProgram} --version) != *"${version}"* ]]; then

            echo "Error: program version does not match package version"

            exit 1

          fi
@@ -48,7 +65,7 @@ buildGoModule rec { 
          }

          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}"
@@ -59,11 +76,14 @@ buildGoModule rec { 
        '';

  };



  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;

  };

}

pkgs/by-name/te/terragrunt/package.nix

+9 −16
Original line number Diff line number Diff line 
{

  lib,

  # Breaks with go 1.24 (see https://github.com/gruntwork-io/terragrunt/issues/4031)

  # > 2025/03/17 13:30:44 internal error: package "bufio" without types was imported from "github.com/gruntwork-io/terragrunt/tf/getproviders"

  # > tf/getproviders/lock.go:1: running "mockery": exit status 1

  # > make: *** [Makefile:54: generate-mocks] Error 1

  buildGo123Module,

  buildGoModule,

  fetchFromGitHub,

  versionCheckHook,

  go-mockery,

}:



buildGo123Module rec {

buildGoModule rec {

  pname = "terragrunt";

  version = "0.75.10";

  version = "0.76.1";



  src = fetchFromGitHub {

    owner = "gruntwork-io";

    repo = pname;

    tag = "v${version}";

    hash = "sha256-lnp1prffufVOG+XV7UAo9Rh3ALE//b87ioPgimgZ5S0=";

    hash = "sha256-VYoqKowP7LivXTifl0Qv3OnVyaIhhuA28jrvkaLSPFA=";

  };



  nativeBuildInputs = [ go-mockery ];

  nativeBuildInputs = [

    versionCheckHook

    go-mockery

  ];



  preBuild = ''

    make generate-mocks
@@ -39,13 +39,6 @@ buildGo123Module rec { 


  doInstallCheck = true;



  installCheckPhase = ''

    runHook preInstallCheck

    $out/bin/terragrunt --help

    $out/bin/terragrunt --version | grep "v${version}"

    runHook postInstallCheck

  '';



  meta = with lib; {

    homepage = "https://terragrunt.gruntwork.io";

    changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}";