summary refs log tree commit diff
diff options
context:
space:
mode:
authorGiorgio Gallo <giorgio.gallo@bitnic.it>2023-05-04 10:16:19 +0200
committerGiorgio Gallo <giorgio.gallo@bitnic.it>2023-05-04 10:16:19 +0200
commitcae55ac31d4d904d5281c8c382e4eb68f36bb6d0 (patch)
tree1906aefca6ac3a80f4075ccbba377316107eadee
parent3428bdf3c93a7608615dddd44dec50c3df89b4be (diff)
downloadnixpkgs-cae55ac31d4d904d5281c8c382e4eb68f36bb6d0.tar
nixpkgs-cae55ac31d4d904d5281c8c382e4eb68f36bb6d0.tar.gz
nixpkgs-cae55ac31d4d904d5281c8c382e4eb68f36bb6d0.tar.bz2
nixpkgs-cae55ac31d4d904d5281c8c382e4eb68f36bb6d0.tar.lz
nixpkgs-cae55ac31d4d904d5281c8c382e4eb68f36bb6d0.tar.xz
nixpkgs-cae55ac31d4d904d5281c8c382e4eb68f36bb6d0.tar.zst
nixpkgs-cae55ac31d4d904d5281c8c382e4eb68f36bb6d0.zip
gomplate: use go 1.20
-rw-r--r--pkgs/development/tools/gomplate/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix
index e28836ffed2..e6a99d1eeae 100644
--- a/pkgs/development/tools/gomplate/default.nix
+++ b/pkgs/development/tools/gomplate/default.nix
@@ -7,10 +7,6 @@ buildGoModule rec {
   pname = "gomplate";
   version = "3.11.5";
 
-  # gomplate is currently built w/ go 1.19 (see pkgs/top-level/all-packages.nix), but
-  # it seems the reported "go 1.20 build failure" does no longer occurr.
-  # TODO remove indication to use go 1.19 in pkgs/top-level/all-packages.nix when next upgrading gomplate
-
   src = fetchFromGitHub {
     owner = "hairyhenderson";
     repo = pname;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 750c8a15a53..54e10a9b9fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26540,9 +26540,7 @@ with pkgs;
 
   gomp = callPackage ../applications/version-management/gomp { };
 
-  gomplate = callPackage ../development/tools/gomplate {
-    buildGoModule = buildGo119Module; # go 1.20 build failure
-  };
+  gomplate = callPackage ../development/tools/gomplate { };
 
   gpm = callPackage ../servers/gpm {
     withNcurses = false; # Keep curses disabled for lack of value