Merge pull request #165885 from danderson/danderson/gotools-generics

gotools: 2021-01-13 -> 0.1.10

authored by Jörg Thalheim and committed by GitHub 5fbddc8d c5fac1f6

+15 -7
+12 -6
pkgs/development/tools/gotools/default.nix
··· 1 { lib, buildGoModule, fetchgit }: 2 3 buildGoModule rec { 4 - pname = "gotools-unstable"; 5 - version = "2021-01-13"; 6 - rev = "8b4aab62c064010e8e875d2e5a8e63a96fefc87d"; 7 8 src = fetchgit { 9 - inherit rev; 10 url = "https://go.googlesource.com/tools"; 11 - sha256 = "1cmnm9fl2a6hiplj8s6x0l3czcw4xh3j3lvzbgccnp1l8kz8q2vm"; 12 }; 13 14 # The gopls folder contains a Go submodule which causes a build failure. ··· 25 rm -rf gopls 26 ''; 27 28 - vendorSha256 = "18qpjmmjpk322fvf81cafkpl3spv7hpdpymhympmld9isgzggfyz"; 29 30 doCheck = false; 31 ··· 53 # Do not copy this without a good reason for enabling 54 # In this case tools is heavily coupled with go itself and embeds paths. 55 allowGoReference = true; 56 }
··· 1 { lib, buildGoModule, fetchgit }: 2 3 buildGoModule rec { 4 + pname = "gotools"; 5 + version = "0.1.10"; 6 7 src = fetchgit { 8 + rev = "v${version}"; 9 url = "https://go.googlesource.com/tools"; 10 + sha256 = "sha256-r71+//VhayW18uvMl/ls/8KYNbZ7uDZw3SWoqPL3Xqk="; 11 }; 12 13 # The gopls folder contains a Go submodule which causes a build failure. ··· 24 rm -rf gopls 25 ''; 26 27 + vendorSha256 = "sha256-UJIXG8WKzazNTXoqEFlT/umC40F6z2Q5I8RfxnMbsPM="; 28 29 doCheck = false; 30 ··· 52 # Do not copy this without a good reason for enabling 53 # In this case tools is heavily coupled with go itself and embeds paths. 54 allowGoReference = true; 55 + 56 + meta = with lib; { 57 + description = "Additional tools for Go development"; 58 + homepage = "http://go.googlesource.com/tools"; 59 + license = licenses.bsd3; 60 + maintainers = with maintainers; [ danderson ]; 61 + }; 62 }
+3 -1
pkgs/top-level/all-packages.nix
··· 23085 23086 gotest = callPackage ../development/tools/gotest { }; 23087 23088 - gotools = callPackage ../development/tools/gotools { }; 23089 23090 gotop = callPackage ../tools/system/gotop { }; 23091
··· 23085 23086 gotest = callPackage ../development/tools/gotest { }; 23087 23088 + gotools = callPackage ../development/tools/gotools { 23089 + buildGoModule = buildGo118Module; 23090 + }; 23091 23092 gotop = callPackage ../tools/system/gotop { }; 23093