3p/nixpkgs: gopls: don't build integration tests or documentation generator

This commit is contained in:
Luke Granger-Brown 2020-10-25 11:22:09 +00:00
parent 72904c318c
commit 9599a84a1c
3 changed files with 46 additions and 7 deletions

View file

@ -15,7 +15,9 @@ core.workflow(
]),
authoring = authoring.pass_thru("Default email <noreply+nixpkgs@lukegb.com>"),
transformations = [
patch.apply(patches = []),
patch.apply(patches = [
"patches/0001-gopls-don-t-build-integration-tests-or-documentation.patch",
]),
core.move("", "third_party/nixpkgs"),
],
)

View file

@ -0,0 +1,36 @@
From bc7e7161154b32eaf1c269ff05337874207edc61 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 25 Oct 2020 11:08:01 +0000
Subject: [PATCH] gopls: don't build integration tests or documentation
generator
Not only are these not used, but they also have super generic names,
which is confusing when they appear on the path, and possibly leads
to conflicts with other binaries.
---
pkgs/development/tools/gopls/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix
index a77f9fa8ddd..e04789eb41e 100644
--- a/pkgs/development/tools/gopls/default.nix
+++ b/pkgs/development/tools/gopls/default.nix
@@ -13,10 +13,13 @@ buildGoModule rec {
modRoot = "gopls";
vendorSha256 = "1jaav6c5vybgks5hc164is0i7h097c5l75s7w3wi5a3zyzkbiyny";
+ # Only build gopls, and not the integration tests or documentation generator.
+ subPackages = [ "." ];
+
meta = with stdenv.lib; {
description = "Official language server for the Go language";
homepage = "https://github.com/golang/tools/tree/master/gopls";
license = licenses.bsd3;
maintainers = with maintainers; [ mic92 ];
};
-}
\ No newline at end of file
+}
--
2.28.0

View file

@ -1,24 +1,25 @@
{ stdenv, buildGoModule, fetchgit }:
{ stdenv, go, buildGoModule, fetchgit }:
buildGoModule rec {
pname = "gopls";
version = "0.5.1";
version = "0.4.1";
src = fetchgit {
rev = "gopls/v${version}";
url = "https://go.googlesource.com/tools";
sha256 = "1vnidc8kaisdyprylsibddpdksm84c6qr528768yvi93crdmddls";
sha256 = "18migk7arxm8ysfzidl7mdr069fxym9bfi6zisj7dliczw0qnkzv";
};
modRoot = "gopls";
vendorSha256 = "048qs6ygav8al3sz9vwf6fqaahkr8wr3dj1yd2jhr7c5h30n4rs2";
vendorSha256 = "1jaav6c5vybgks5hc164is0i7h097c5l75s7w3wi5a3zyzkbiyny";
doCheck = false;
# Only build gopls, and not the integration tests or documentation generator.
subPackages = [ "." ];
meta = with stdenv.lib; {
description = "Official language server for the Go language";
homepage = "https://github.com/golang/tools/tree/master/gopls";
license = licenses.bsd3;
maintainers = with maintainers; [ mic92 zimbatm ];
maintainers = with maintainers; [ mic92 ];
};
}