From cc4b9ef40f2f891f56968af1163588b649c043e5 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Tue, 23 Oct 2018 03:14:55 -0700 Subject: [PATCH] gocode: 2018-07-27 -> 2018-10-22 (#48832) github.com/nsf/gocode has also been deprecated in favor of github.com/mdempsky/gocode --- pkgs/development/tools/gocode/default.nix | 13 ++++++++----- pkgs/development/tools/gocode/deps.nix | 11 +++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/tools/gocode/deps.nix diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 64921ec6e10e..bb44074dfc75 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,9 +1,9 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gocode-${version}"; - version = "20180727-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "00e7f5ac290aeb20a3d8d31e737ae560a191a1d5"; + name = "gocode-unstable-${version}"; + version = "2018-10-22"; + rev = "e893215113e5f7594faa3a8eb176c2700c921276"; goPackagePath = "github.com/mdempsky/gocode"; @@ -13,12 +13,15 @@ buildGoPackage rec { allowGoReference = true; src = fetchFromGitHub { + inherit rev; + owner = "mdempsky"; repo = "gocode"; - inherit rev; - sha256 = "0vrwjq4r90za47hm88yx5h2mvkv7y4yaj2xbx3skg62wq2drsq31"; + sha256 = "1zsll7yghv64890k7skl0g2lg9rsaiisgrfnb8kshsxrcxi1kc2l"; }; + goDeps = ./deps.nix; + preBuild = '' # getting an error building the testdata because they contain invalid files # on purpose as part of the testing. diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix new file mode 100644 index 000000000000..4eefdd9c6d04 --- /dev/null +++ b/pkgs/development/tools/gocode/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6fe81c087942f588f40c3f67b41ce284f2f70eee"; + sha256 = "04yl7rk2lf94bxz74ja5snh7ava9gcnf2yx6y002pfkk538r6w5d"; + }; + } +]