diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 89b9f146495..3187f793127 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,11 +1,10 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchgit }: -buildGoPackage rec { +buildGoModule rec { pname = "lint"; - version = "20181026-${lib.strings.substring 0 7 rev}"; - rev = "c67002cb31c3a748b7688c27f20d8358b4193582"; + version = "20201208-${lib.strings.substring 0 7 rev}"; + rev = "83fdc39ff7b56453e3793356bcff3070b9b96445"; - goPackagePath = "golang.org/x/lint"; excludedPackages = "testdata"; # we must allow references to the original `go` package, as golint uses @@ -15,15 +14,15 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/lint"; - sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + sha256 = "sha256-g4Z9PREOxGoN7n/XhutawsITBznJlbz6StXeDYvOQ1c="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-dPadFoymYu2Uw2AXZfbaBfxsN8IWMuK1TrcknHco3Bo="; meta = with lib; { homepage = "https://golang.org"; description = "Linter for Go source code"; license = licenses.bsd3; - maintainers = with maintainers; [ jhillyerd ]; + maintainers = with maintainers; [ jhillyerd tomberek ]; }; } diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix deleted file mode 100644 index e2640098933..00000000000 --- a/pkgs/development/tools/golint/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "91f80e683c10fea00e7f965a1a7cac482ce52541"; - sha256 = "16a2vppy5hnp663f28yak6592l8p968ihsc91pigamxx3vk1qh5d"; - }; - } -]