chore: simplify buildGo expressions r/1580

This removes redundant `map (p: p.gopkg)` expressions.

Change-Id: If25d603c27d63ae011f396caf5d26cdfdb8c28d5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1625
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI

13 files changed, 15 insertions, 15 deletions

diff --git a/fun/amsterdump/default.nix b/fun/amsterdump/default.nix
index 0d98c9a7ab..d64b3a98dc 100644
--- a/fun/amsterdump/default.nix
+++ b/fun/amsterdump/default.nix
@@ -6,7 +6,7 @@ depot.nix.buildGo.program {
     ./main.go
   ];
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     # gopkgs."golang.org".x.oauth2.google
     gopkgs."googlemaps.github.io".maps
   ];
diff --git a/nix/buildGo/proto.nix b/nix/buildGo/proto.nix
index 2ece948ebd..57e9a5ec98 100644
--- a/nix/buildGo/proto.nix
+++ b/nix/buildGo/proto.nix
@@ -25,7 +25,7 @@ in rec {
       rev = "ffdde105785063a81acd95bdf89ea53f6e0aac2d";
     };
 
-    deps = map (p: p.gopkg) [
+    deps = [
       xtext.secure.bidirule
       xtext.unicode.bidi
       xtext.unicode.norm
@@ -55,7 +55,7 @@ in rec {
       rev = "83cc0476cb11ea0da33dacd4c6354ab192de6fe6";
     };
 
-    deps = with goProto; map (p: p.gopkg) [
+    deps = with goProto; [
       proto
       ptypes.any
     ];
@@ -63,7 +63,7 @@ in rec {
 
   goGrpc = external {
     path = "google.golang.org/grpc";
-    deps = map (p: p.gopkg) ([
+    deps = ([
       xnet.trace
       xnet.http2
       xsys.unix
diff --git a/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix b/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix
index 4e8073f93a..19bbcf0d82 100644
--- a/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix
+++ b/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix
@@ -7,7 +7,7 @@ depot.buildGo.external {
     rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.net.context.ctxhttp
     gopkgs."cloud.google.com".go.compute.metadata
   ];
diff --git a/third_party/gopkgs/github.com/jbenet/go-context/default.nix b/third_party/gopkgs/github.com/jbenet/go-context/default.nix
index 4092f8ecff..8b3fdc891c 100644
--- a/third_party/gopkgs/github.com/jbenet/go-context/default.nix
+++ b/third_party/gopkgs/github.com/jbenet/go-context/default.nix
@@ -10,7 +10,7 @@ depot.buildGo.external {
     sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.net.context
   ];
 }
diff --git a/third_party/gopkgs/github.com/src-d/gcfg/default.nix b/third_party/gopkgs/github.com/src-d/gcfg/default.nix
index 2906063428..ed51f45471 100644
--- a/third_party/gopkgs/github.com/src-d/gcfg/default.nix
+++ b/third_party/gopkgs/github.com/src-d/gcfg/default.nix
@@ -10,7 +10,7 @@ depot.buildGo.external {
     sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."gopkg.in".warnings
   ];
 }
diff --git a/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix b/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
index b52165efe3..834e1f6074 100644
--- a/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
+++ b/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
@@ -10,7 +10,7 @@ depot.buildGo.external {
     sha256 = "1chjlnv5d6svpymxgsr62d992m2xi6jb5lybjc5zn1h3hv1m01av";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.crypto.ssh.agent
   ];
 }
diff --git a/third_party/gopkgs/go.opencensus.io/default.nix b/third_party/gopkgs/go.opencensus.io/default.nix
index af9690880f..b8962df255 100644
--- a/third_party/gopkgs/go.opencensus.io/default.nix
+++ b/third_party/gopkgs/go.opencensus.io/default.nix
@@ -7,7 +7,7 @@ depot.buildGo.external {
     rev = "643eada29081047b355cfaa1ceb9bc307a10423c";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."github.com".hashicorp.golang-lru.simplelru
     gopkgs."github.com".golang.groupcache.lru
   ];
diff --git a/third_party/gopkgs/golang.org/x/oauth2/default.nix b/third_party/gopkgs/golang.org/x/oauth2/default.nix
index 230e629672..a0e4dac3ef 100644
--- a/third_party/gopkgs/golang.org/x/oauth2/default.nix
+++ b/third_party/gopkgs/golang.org/x/oauth2/default.nix
@@ -7,7 +7,7 @@ depot.buildGo.external {
     rev = "858c2ad4c8b6c5d10852cb89079f6ca1c7309787";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.net.context.ctxhttp
     gopkgs."cloud.google.com".go.compute.metadata
   ];
diff --git a/third_party/gopkgs/google.golang.org/api/default.nix b/third_party/gopkgs/google.golang.org/api/default.nix
index 333b9df157..9c94c5890b 100644
--- a/third_party/gopkgs/google.golang.org/api/default.nix
+++ b/third_party/gopkgs/google.golang.org/api/default.nix
@@ -7,7 +7,7 @@ depot.buildGo.external {
     rev = "8b4e46d953bd748a9ff098644a42389b3d8dab41";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."github.com".googleapis.gax-go.v2
     gopkgs."golang.org".x.oauth2.google
     gopkgs."golang.org".x.oauth2
diff --git a/third_party/gopkgs/google.golang.org/grpc/default.nix b/third_party/gopkgs/google.golang.org/grpc/default.nix
index 8b533c9077..021f3767fa 100644
--- a/third_party/gopkgs/google.golang.org/grpc/default.nix
+++ b/third_party/gopkgs/google.golang.org/grpc/default.nix
@@ -7,7 +7,7 @@ depot.buildGo.external {
     rev = "085c980048876e2735d4aba8f0d5bca4d7acaaa5";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.net.trace
     gopkgs."golang.org".x.net.http2
     gopkgs."golang.org".x.net.http2.hpack
diff --git a/third_party/gopkgs/googlemaps.github.io/maps.nix b/third_party/gopkgs/googlemaps.github.io/maps.nix
index 20db836aa7..b84977b334 100644
--- a/third_party/gopkgs/googlemaps.github.io/maps.nix
+++ b/third_party/gopkgs/googlemaps.github.io/maps.nix
@@ -10,7 +10,7 @@ depot.nix.buildGo.external {
     sha256 = "1zpl85yd3m417060isdlhxzakqkf4f59jgpz3kcjp2i0mkrskkjs";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."github.com".google.uuid
     gopkgs."golang.org".x.time.rate
   ];
diff --git a/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix b/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
index 0ed4e343e1..a2737422bf 100644
--- a/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
+++ b/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
@@ -10,7 +10,7 @@ depot.buildGo.external {
     sha256 = "1j0pl6ggzmd2lrqj71vmsnl6cqm43145h7yg6sy3j5n7hhd592qv";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.sys.unix
   ];
 }
diff --git a/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix b/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
index a39b7e82b7..5728ad0a42 100644
--- a/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
+++ b/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
@@ -12,7 +12,7 @@ depot.buildGo.external {
     sha256 = "08jl4ljrzzil7c3qcl2y1859nhpgw9ixxy1g40ff7kmq989yhs6v";
   };
 
-  deps = with depot.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; [
     gopkgs."github.com".emirpasic.gods.trees.binaryheap
     gopkgs."github.com".jbenet.go-context.io
     gopkgs."github.com".kevinburke.ssh_config