Unverified Commit 817b0376 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #257560 from aaronjheng/skeema 

skeema: 1.10.1 -> 1.11.0
parents f0013664 2a816c9a

pkgs/tools/system/skeema/default.nix

+4 −10
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub, coreutils, runtimeShell, testers, skeema }:

{ lib, buildGoModule, fetchFromGitHub, coreutils, testers, skeema }:



buildGoModule rec {

  pname = "skeema";

  version = "1.10.1";

  version = "1.11.0";



  src = fetchFromGitHub {

    owner = "skeema";

    repo = "skeema";

    rev = "v${version}";

    hash = "sha256-t0UACavJaDorAgxm2gA6FEsMfQ8UQEY/CZbFIFHwfIQ=";

    hash = "sha256-BXjcn9oakTvaWPYIsAsjYRwQ1aKhZ4PAV2AkxSVOF/I=";

  };



  vendorHash = null;
@@ -25,6 +25,7 @@ buildGoModule rec { 
        "TestParseDirSymlinks"



        # Flaky tests

        "TestCommandTimeout"

        "TestShellOutTimeout"

      ];

    in
@@ -41,13 +42,6 @@ buildGoModule rec { 


      substituteInPlace internal/applier/ddlstatement_test.go \

        --replace /bin/echo "${coreutils}/bin/echo"



      substituteInPlace internal/util/shellout_unix_test.go \

        --replace /bin/echo "${coreutils}/bin/echo" \

        --replace /usr/bin/printf "${coreutils}/bin/printf"



      substituteInPlace internal/util/shellout_unix.go \

        --replace /bin/sh "${runtimeShell}"

    '';



  passthru.tests.version = testers.testVersion {