From 08051c14e490c1988af0ce812d0927ce1305c9b4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Aug 2022 18:50:38 +1000 Subject: [PATCH] gomplate: 3.10.0 -> 3.11.2 https://github.com/hairyhenderson/gomplate/releases/tag/v3.11.0 https://github.com/hairyhenderson/gomplate/releases/tag/v3.11.1 https://github.com/hairyhenderson/gomplate/releases/tag/v3.11.2 --- pkgs/development/tools/gomplate/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 087c4fcf3c33..2df0e8ed9416 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gomplate"; - version = "3.10.0"; + version = "3.11.2"; owner = "hairyhenderson"; rev = "v${version}"; src = fetchFromGitHub { inherit owner rev; repo = pname; - sha256 = "0dbi9saxbwcvypxc0s656ln9zq2vysx8dhrcz488nmy6rcpqiiah"; + sha256 = "sha256-NIepoz1JToaX2EJCL/kqkpBJigJVy2Tkz0jGn4ukfvI="; }; - vendorSha256 = "0rvki8ghlbbaqgnjfsbs1jswj08jfzmnz9ilynv2c6kfkx9zs108"; + vendorSha256 = "sha256-fXbwNX+GoujciZVxxe7Tl21MxWhyAD4cW/p8PCAAElw="; postPatch = '' # some tests require network access @@ -24,6 +24,11 @@ buildGoModule rec { internal/tests/integration/datasources_vault*_test.go ''; + # TestInputDir_RespectsUlimit + preCheck = '' + ulimit -n 1024 + ''; + ldflags = [ "-s" "-w" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd8aa5008df5..56bff6bb6d91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23715,10 +23715,7 @@ with pkgs; gomp = callPackage ../applications/version-management/gomp { }; - gomplate = callPackage ../development/tools/gomplate { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + gomplate = callPackage ../development/tools/gomplate { }; gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value