summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2019-04-17 13:10:19 -0500
committerGitHub <noreply@github.com>2019-04-17 13:10:19 -0500
commit60e7e8ae3d73abfbf8029197d2f8bf17527af68c (patch)
tree03009e61234505f26fccb5264ed095b42d795143
parent2e60e06d69d9090fe14353aadb420e98b3805ac4 (diff)
parent16a1601bb449a490bb287db0638789dfad7ea5db (diff)
downloadnixpkgs-60e7e8ae3d73abfbf8029197d2f8bf17527af68c.tar
nixpkgs-60e7e8ae3d73abfbf8029197d2f8bf17527af68c.tar.gz
nixpkgs-60e7e8ae3d73abfbf8029197d2f8bf17527af68c.tar.bz2
nixpkgs-60e7e8ae3d73abfbf8029197d2f8bf17527af68c.tar.lz
nixpkgs-60e7e8ae3d73abfbf8029197d2f8bf17527af68c.tar.xz
nixpkgs-60e7e8ae3d73abfbf8029197d2f8bf17527af68c.tar.zst
nixpkgs-60e7e8ae3d73abfbf8029197d2f8bf17527af68c.zip
Merge pull request #58140 from dtzWill/update/go-langserver-2.0.0
go-langserver: 2018-03-05 -> 2.0.0, unpin old go version
-rw-r--r--pkgs/development/tools/go-langserver/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix
index 84efaf2a4b6..ec0e565eabd 100644
--- a/pkgs/development/tools/go-langserver/default.nix
+++ b/pkgs/development/tools/go-langserver/default.nix
@@ -1,18 +1,17 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "go-langserver-${version}";
-  version = "unstable-2018-03-05";
-  rev = "5d7a5dd74738978d635f709669241f164c120ebd";
+  pname = "go-langserver";
+  version = "2.0.0";
 
   goPackagePath = "github.com/sourcegraph/go-langserver";
   subPackages = [ "." ];
 
   src = fetchFromGitHub {
-    inherit rev;
+    rev = "v${version}";
     owner = "sourcegraph";
     repo = "go-langserver";
-    sha256 = "0aih0akk3wk3332znkhr2bzxcc3parijq7n089mdahnf20k69xyz";
+    sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9db7bedce3..994cc348045 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15389,9 +15389,7 @@ in
 
   gomodifytags = callPackage ../development/tools/gomodifytags { };
 
-  go-langserver = callPackage ../development/tools/go-langserver {
-    buildGoPackage = buildGo110Package;
-  };
+  go-langserver = callPackage ../development/tools/go-langserver { };
 
   gotests = callPackage ../development/tools/gotests { };