From 216fa5f709c7b49e2fc33646ea8541272ff65ed8 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 21 May 2022 18:03:00 +0100 Subject: [PATCH] depotwide: cleanup after tvl bump --- third_party/default.nix | 15 ++--- third_party/tvl/copy.bara.sky | 4 ++ third_party/tvl/nix/buildGo/default.nix | 39 +++++++++--- third_party/tvl/nix/buildGo/proto.nix | 81 ++----------------------- 4 files changed, 46 insertions(+), 93 deletions(-) diff --git a/third_party/default.nix b/third_party/default.nix index 40461c57fa..b1885a0e0d 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -35,6 +35,8 @@ let rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9"; sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c"; }; + + tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; }; in rec { inherit nixpkgsConfig nixpkgs; @@ -60,14 +62,13 @@ rec { }; }; readTree = import ./tvl/nix/readTree {}; - gopkgs = readTree ch ./gopkgs; - - bat_syntaxes = import ./tvl/third_party/bat_syntaxes { pkgs = ch.depot.pkgs; }; - cheddar = import ./tvl/tools/cheddar { - pkgs = ch.depot.pkgs // { - inherit naersk bat_syntaxes; - }; + gopkgs = readTree { + args = ch; + path = ./gopkgs; }; + + bat_syntaxes = tvlDepot.third_party.bat_syntaxes; + cheddar = tvlDepot.tools.cheddar; naersk = nixpkgs.callPackage naerskSrc {}; crate2nix = import "${crate2nixSrc}" { pkgs = ch.depot.pkgs; }; diff --git a/third_party/tvl/copy.bara.sky b/third_party/tvl/copy.bara.sky index bd3e98b778..be172f47a0 100644 --- a/third_party/tvl/copy.bara.sky +++ b/third_party/tvl/copy.bara.sky @@ -9,6 +9,10 @@ core.workflow( fetch = "default", push = "default", ), + origin_files = glob(["**"], exclude = [ + "nix/utils/tests/**", # nix/utils/tests/missing makes everything barf + "users/**", + ]), destination_files = glob(["third_party/tvl/**"], exclude = [ "third_party/tvl/copy.bara.sky", "third_party/tvl/patches/**", diff --git a/third_party/tvl/nix/buildGo/default.nix b/third_party/tvl/nix/buildGo/default.nix index 92951b3cb2..f8928f25fb 100644 --- a/third_party/tvl/nix/buildGo/default.nix +++ b/third_party/tvl/nix/buildGo/default.nix @@ -5,6 +5,7 @@ # rules_go. { pkgs ? import { } +, gopkgs , ... }: @@ -110,23 +111,43 @@ let # Import support libraries needed for protobuf & gRPC support protoLibs = import ./proto.nix { - inherit external; + inherit gopkgs; }; # Build a Go library out of the specified protobuf definition. - proto = { name, proto, path ? name, goPackage ? name, extraDeps ? [ ] }: (makeOverridable package) { + proto = { name, proto ? null, protos ? [ proto ], path ? name, goPackage ? name, withGrpc ? false, extraSrcs ? [], extraDeps ? [] }: + let + protosDir = runCommand "protos" {} '' + mkdir $out + ${lib.concatMapStrings (p: "cp ${p} $out/${baseNameOf p}\n") protos} + ''; + mname = prefix: lib.concatMapStrings (p: "${prefix}M${baseNameOf p}=${path} ") protos; + in (makeOverridable package) { inherit name path; deps = [ protoLibs.goProto.proto.gopkg ] ++ extraDeps; - srcs = lib.singleton (runCommand "goproto-${name}.pb.go" { } '' - cp ${proto} ${baseNameOf proto} - ${protobuf}/bin/protoc --plugin=${protoLibs.goProto.protoc-gen-go.gopkg}/bin/protoc-gen-go \ - --go_out=plugins=grpc,import_path=${baseNameOf path}:. ${baseNameOf proto} - mv ./${goPackage}/*.pb.go $out - ''); + srcs = lib.concatMap (proto: lib.singleton (runCommand "goproto-${name}-${baseNameOf proto}.pb.go" {} '' + ${protobuf}/bin/protoc \ + -I ${protosDir} \ + --plugin=${protoLibs.goProto.cmd.protoc-gen-go.gopkg}/bin/protoc-gen-go \ + --go_out=. \ + --go_opt=paths=source_relative \ + ${mname "--go_opt="} \ + ${protosDir}/${baseNameOf proto} + mv ./*.pb.go $out + '') ++ lib.optional withGrpc (runCommand "gogrpcproto-${name}-${baseNameOf proto}.pb.go" {} '' + ${protobuf}/bin/protoc \ + -I ${protosDir} \ + --plugin=${protoLibs.goGrpc.cmd.protoc-gen-go-grpc.gopkg}/bin/protoc-gen-go-grpc \ + --go-grpc_out=. \ + --go-grpc_opt=paths=source_relative \ + ${mname "--go-grpc_opt="} \ + ${protosDir}/${baseNameOf proto} + mv ./*.pb.go $out 2>/dev/null || echo "package ${goPackage}" >> $out + '')) protos ++ extraSrcs; }; # Build a Go library out of the specified gRPC definition. - grpc = args: proto (args // { extraDeps = [ protoLibs.goGrpc.gopkg ]; }); + grpc = { extraDeps ? [], ... }@args: proto (args // { withGrpc = true; extraDeps = extraDeps ++ [ protoLibs.goGrpc.gopkg ]; }); in { diff --git a/third_party/tvl/nix/buildGo/proto.nix b/third_party/tvl/nix/buildGo/proto.nix index 6c37f758ce..92036faa81 100644 --- a/third_party/tvl/nix/buildGo/proto.nix +++ b/third_party/tvl/nix/buildGo/proto.nix @@ -4,84 +4,11 @@ # This file provides derivations for the dependencies of a gRPC # service in Go. -{ external }: +{ gopkgs }: let inherit (builtins) fetchGit map; -in -rec { - goProto = external { - path = "github.com/golang/protobuf"; - src = fetchGit { - url = "https://github.com/golang/protobuf"; - rev = "ed6926b37a637426117ccab59282c3839528a700"; - }; - }; - - xnet = external { - path = "golang.org/x/net"; - - src = fetchGit { - url = "https://go.googlesource.com/net"; - rev = "ffdde105785063a81acd95bdf89ea53f6e0aac2d"; - }; - - deps = [ - xtext.secure.bidirule - xtext.unicode.bidi - xtext.unicode.norm - ]; - }; - - xsys = external { - path = "golang.org/x/sys"; - src = fetchGit { - url = "https://go.googlesource.com/sys"; - rev = "bd437916bb0eb726b873ee8e9b2dcf212d32e2fd"; - }; - }; - - xtext = external { - path = "golang.org/x/text"; - src = fetchGit { - url = "https://go.googlesource.com/text"; - rev = "cbf43d21aaebfdfeb81d91a5f444d13a3046e686"; - }; - }; - - genproto = external { - path = "google.golang.org/genproto"; - src = fetchGit { - url = "https://github.com/google/go-genproto"; - # necessary because https://github.com/NixOS/nix/issues/1923 - ref = "main"; - rev = "83cc0476cb11ea0da33dacd4c6354ab192de6fe6"; - }; - - deps = with goProto; [ - proto - ptypes.any - ]; - }; - - goGrpc = external { - path = "google.golang.org/grpc"; - deps = ([ - xnet.trace - xnet.http2 - xsys.unix - xnet.http2.hpack - genproto.googleapis.rpc.status - ] ++ (with goProto; [ - proto - ptypes - ptypes.duration - ptypes.timestamp - ])); - - src = fetchGit { - url = "https://github.com/grpc/grpc-go"; - rev = "d8e3da36ac481ef00e510ca119f6b68177713689"; - }; - }; +in rec { + goProto = gopkgs."google.golang.org".protobuf; + goGrpc = gopkgs."google.golang.org".grpc; }