From 3a74268b6e8b9c77ed1ec0f08f864d0b7cae4009 Mon Sep 17 00:00:00 2001 From: sterni Date: Sat, 18 Mar 2023 22:34:19 +0100 Subject: chore(3p/sources): Bump channels & overlays * //users/wpcarro/emacs: use top level (ELPA) version of eglot, as it was removed from MELPA: https://github.com/melpa/melpa/commit/dc2ead17a8e5d5df59fc3729c8f0435cfcbf55ef * //3p/nixpkgs:tdlib: 1.8.11 -> 1.8.12 * //tvix/store: regenerate protos after buf update Change-Id: I782a8d91fda5ed461788055a3721104e8c032207 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8327 Autosubmit: sterni Reviewed-by: flokli Tested-by: BuildkiteCI Reviewed-by: wpcarro Reviewed-by: tazjin Reviewed-by: sterni --- third_party/overlays/tvl.nix | 6 +++--- third_party/sources/sources.json | 24 ++++++++++++------------ tvix/store/protos/castore.pb.go | 2 +- tvix/store/protos/pathinfo.pb.go | 2 +- tvix/store/protos/rpc_blobstore.pb.go | 2 +- tvix/store/protos/rpc_blobstore_grpc.pb.go | 19 ++++++++++++++----- tvix/store/protos/rpc_directory.pb.go | 2 +- tvix/store/protos/rpc_directory_grpc.pb.go | 14 +++++++++++--- tvix/store/protos/rpc_pathinfo.pb.go | 2 +- tvix/store/protos/rpc_pathinfo_grpc.pb.go | 23 ++++++++++++++++------- users/wpcarro/emacs/default.nix | 7 +++++-- 11 files changed, 66 insertions(+), 37 deletions(-) diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index a71ef8a24e..79c4518877 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -47,12 +47,12 @@ depot.nix.readTree.drvTargets { # Too match telega in emacs-overlay or wherever tdlib = super.tdlib.overrideAttrs (_: { - version = "1.8.11"; + version = "1.8.12"; src = self.fetchFromGitHub { owner = "tdlib"; repo = "td"; - rev = "1543c41f3411bd6aa74713c8aba4e93fa8d952c7"; - sha256 = "0qw3a2wh5hfad0m4ixywh5p2mvyprkw982jb7n4sqxdvwc0xfcgq"; + rev = "70bee089d492437ce931aa78446d89af3da182fc"; + sha256 = "1m1mnvrk9nr3d3sq191i5y1bdgnp1hnq0c6iqybzmyswr501prz3"; }; }); diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 1ac7839d66..be337c4da3 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a640fde298d0b55085267eb7bbbac0c529aec66e", - "sha256": "0j7ww62h8f64mmnpzv99qfb9skfp96k20vnis7n49flb0qg9ahsg", + "rev": "4413eb27ed79fbd5ef50ea372c8fc28d6de2981b", + "sha256": "003j8881xkqf9plvgy7h6zg8zs9m7gw4kl4lhxx15v9j7nf4nvgh", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/a640fde298d0b55085267eb7bbbac0c529aec66e.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/4413eb27ed79fbd5ef50ea372c8fc28d6de2981b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", - "sha256": "0s6vyyfmhcyqrgln304c1490spb2hqhh5bzfi0y2hnk5i5sph07q", + "rev": "ac718d02867a84b42522a0ece52d841188208f2c", + "sha256": "1lbf24nlx01gckq2cij9fxc6jv0lrviwliaghrwspfgyb2ph4cn5", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/3c5319ad3aa51551182ac82ea17ab1c6b0f0df89.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/ac718d02867a84b42522a0ece52d841188208f2c.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "423b16bef17c9e8e9ea515e502c0c5d0f8e51f4a", - "sha256": "1zh965j6x2qq98g2azy7lfdkxh5d1c6dq40vsjs1zn6jyf22c98g", + "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565", + "sha256": "0v1qydk4pw3vzvnizq41gqrf3yfkkc49dvsq4304zq5fdjvsjwyk", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/423b16bef17c9e8e9ea515e502c0c5d0f8e51f4a.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/7313c06ac334d6262ddfe30a38b3abc3da6bd565.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { @@ -113,10 +113,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "292b3a8437125f015adbd32efd6bcdbbd95303f3", - "sha256": "12d0ylspdp6gcqihin5zds9xc6lq6mzrsj0ng5gwbk736k4r9s4y", + "rev": "0888b44843e3c86db9fd56334c7f5261ea00dc19", + "sha256": "0gwpch0aafnbhqvzzrfqlvqr661qzs6w2f1ni27ih9gvxy0img75", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/292b3a8437125f015adbd32efd6bcdbbd95303f3.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/0888b44843e3c86db9fd56334c7f5261ea00dc19.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/tvix/store/protos/castore.pb.go b/tvix/store/protos/castore.pb.go index 06e2d2e5a9..fab95d2e2c 100644 --- a/tvix/store/protos/castore.pb.go +++ b/tvix/store/protos/castore.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: tvix/store/protos/castore.proto diff --git a/tvix/store/protos/pathinfo.pb.go b/tvix/store/protos/pathinfo.pb.go index 987a79c35d..91d4209477 100644 --- a/tvix/store/protos/pathinfo.pb.go +++ b/tvix/store/protos/pathinfo.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: tvix/store/protos/pathinfo.proto diff --git a/tvix/store/protos/rpc_blobstore.pb.go b/tvix/store/protos/rpc_blobstore.pb.go index 853a040130..8507167576 100644 --- a/tvix/store/protos/rpc_blobstore.pb.go +++ b/tvix/store/protos/rpc_blobstore.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: tvix/store/protos/rpc_blobstore.proto diff --git a/tvix/store/protos/rpc_blobstore_grpc.pb.go b/tvix/store/protos/rpc_blobstore_grpc.pb.go index 25b3c0006a..5199fe1511 100644 --- a/tvix/store/protos/rpc_blobstore_grpc.pb.go +++ b/tvix/store/protos/rpc_blobstore_grpc.pb.go @@ -1,6 +1,9 @@ +// SPDX-License-Identifier: MIT +// Copyright © 2022 The Tvix Authors + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 +// - protoc-gen-go-grpc v1.3.0 // - protoc (unknown) // source: tvix/store/protos/rpc_blobstore.proto @@ -18,6 +21,12 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + BlobService_Stat_FullMethodName = "/tvix.store.v1.BlobService/Stat" + BlobService_Read_FullMethodName = "/tvix.store.v1.BlobService/Read" + BlobService_Put_FullMethodName = "/tvix.store.v1.BlobService/Put" +) + // BlobServiceClient is the client API for BlobService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -62,7 +71,7 @@ func NewBlobServiceClient(cc grpc.ClientConnInterface) BlobServiceClient { func (c *blobServiceClient) Stat(ctx context.Context, in *StatBlobRequest, opts ...grpc.CallOption) (*BlobMeta, error) { out := new(BlobMeta) - err := c.cc.Invoke(ctx, "/tvix.store.v1.BlobService/Stat", in, out, opts...) + err := c.cc.Invoke(ctx, BlobService_Stat_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -70,7 +79,7 @@ func (c *blobServiceClient) Stat(ctx context.Context, in *StatBlobRequest, opts } func (c *blobServiceClient) Read(ctx context.Context, in *ReadBlobRequest, opts ...grpc.CallOption) (BlobService_ReadClient, error) { - stream, err := c.cc.NewStream(ctx, &BlobService_ServiceDesc.Streams[0], "/tvix.store.v1.BlobService/Read", opts...) + stream, err := c.cc.NewStream(ctx, &BlobService_ServiceDesc.Streams[0], BlobService_Read_FullMethodName, opts...) if err != nil { return nil, err } @@ -102,7 +111,7 @@ func (x *blobServiceReadClient) Recv() (*BlobChunk, error) { } func (c *blobServiceClient) Put(ctx context.Context, opts ...grpc.CallOption) (BlobService_PutClient, error) { - stream, err := c.cc.NewStream(ctx, &BlobService_ServiceDesc.Streams[1], "/tvix.store.v1.BlobService/Put", opts...) + stream, err := c.cc.NewStream(ctx, &BlobService_ServiceDesc.Streams[1], BlobService_Put_FullMethodName, opts...) if err != nil { return nil, err } @@ -206,7 +215,7 @@ func _BlobService_Stat_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tvix.store.v1.BlobService/Stat", + FullMethod: BlobService_Stat_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BlobServiceServer).Stat(ctx, req.(*StatBlobRequest)) diff --git a/tvix/store/protos/rpc_directory.pb.go b/tvix/store/protos/rpc_directory.pb.go index 03e93fd56b..5a1cdccca0 100644 --- a/tvix/store/protos/rpc_directory.pb.go +++ b/tvix/store/protos/rpc_directory.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: tvix/store/protos/rpc_directory.proto diff --git a/tvix/store/protos/rpc_directory_grpc.pb.go b/tvix/store/protos/rpc_directory_grpc.pb.go index 88007c5a91..a578dbd89d 100644 --- a/tvix/store/protos/rpc_directory_grpc.pb.go +++ b/tvix/store/protos/rpc_directory_grpc.pb.go @@ -1,6 +1,9 @@ +// SPDX-License-Identifier: MIT +// Copyright © 2022 The Tvix Authors + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 +// - protoc-gen-go-grpc v1.3.0 // - protoc (unknown) // source: tvix/store/protos/rpc_directory.proto @@ -18,6 +21,11 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + DirectoryService_Get_FullMethodName = "/tvix.store.v1.DirectoryService/Get" + DirectoryService_Put_FullMethodName = "/tvix.store.v1.DirectoryService/Put" +) + // DirectoryServiceClient is the client API for DirectoryService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -49,7 +57,7 @@ func NewDirectoryServiceClient(cc grpc.ClientConnInterface) DirectoryServiceClie } func (c *directoryServiceClient) Get(ctx context.Context, in *GetDirectoryRequest, opts ...grpc.CallOption) (DirectoryService_GetClient, error) { - stream, err := c.cc.NewStream(ctx, &DirectoryService_ServiceDesc.Streams[0], "/tvix.store.v1.DirectoryService/Get", opts...) + stream, err := c.cc.NewStream(ctx, &DirectoryService_ServiceDesc.Streams[0], DirectoryService_Get_FullMethodName, opts...) if err != nil { return nil, err } @@ -81,7 +89,7 @@ func (x *directoryServiceGetClient) Recv() (*Directory, error) { } func (c *directoryServiceClient) Put(ctx context.Context, opts ...grpc.CallOption) (DirectoryService_PutClient, error) { - stream, err := c.cc.NewStream(ctx, &DirectoryService_ServiceDesc.Streams[1], "/tvix.store.v1.DirectoryService/Put", opts...) + stream, err := c.cc.NewStream(ctx, &DirectoryService_ServiceDesc.Streams[1], DirectoryService_Put_FullMethodName, opts...) if err != nil { return nil, err } diff --git a/tvix/store/protos/rpc_pathinfo.pb.go b/tvix/store/protos/rpc_pathinfo.pb.go index 0b05f2a70c..27f04ed8f6 100644 --- a/tvix/store/protos/rpc_pathinfo.pb.go +++ b/tvix/store/protos/rpc_pathinfo.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.29.1 // protoc (unknown) // source: tvix/store/protos/rpc_pathinfo.proto diff --git a/tvix/store/protos/rpc_pathinfo_grpc.pb.go b/tvix/store/protos/rpc_pathinfo_grpc.pb.go index a69820e358..5a858a3324 100644 --- a/tvix/store/protos/rpc_pathinfo_grpc.pb.go +++ b/tvix/store/protos/rpc_pathinfo_grpc.pb.go @@ -1,6 +1,9 @@ +// SPDX-License-Identifier: MIT +// Copyright © 2022 The Tvix Authors + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 +// - protoc-gen-go-grpc v1.3.0 // - protoc (unknown) // source: tvix/store/protos/rpc_pathinfo.proto @@ -18,6 +21,12 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + PathInfoService_Get_FullMethodName = "/tvix.store.v1.PathInfoService/Get" + PathInfoService_Put_FullMethodName = "/tvix.store.v1.PathInfoService/Put" + PathInfoService_CalculateNAR_FullMethodName = "/tvix.store.v1.PathInfoService/CalculateNAR" +) + // PathInfoServiceClient is the client API for PathInfoService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -67,7 +76,7 @@ func NewPathInfoServiceClient(cc grpc.ClientConnInterface) PathInfoServiceClient func (c *pathInfoServiceClient) Get(ctx context.Context, in *GetPathInfoRequest, opts ...grpc.CallOption) (*PathInfo, error) { out := new(PathInfo) - err := c.cc.Invoke(ctx, "/tvix.store.v1.PathInfoService/Get", in, out, opts...) + err := c.cc.Invoke(ctx, PathInfoService_Get_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -76,7 +85,7 @@ func (c *pathInfoServiceClient) Get(ctx context.Context, in *GetPathInfoRequest, func (c *pathInfoServiceClient) Put(ctx context.Context, in *PathInfo, opts ...grpc.CallOption) (*PathInfo, error) { out := new(PathInfo) - err := c.cc.Invoke(ctx, "/tvix.store.v1.PathInfoService/Put", in, out, opts...) + err := c.cc.Invoke(ctx, PathInfoService_Put_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -85,7 +94,7 @@ func (c *pathInfoServiceClient) Put(ctx context.Context, in *PathInfo, opts ...g func (c *pathInfoServiceClient) CalculateNAR(ctx context.Context, in *Node, opts ...grpc.CallOption) (*CalculateNARResponse, error) { out := new(CalculateNARResponse) - err := c.cc.Invoke(ctx, "/tvix.store.v1.PathInfoService/CalculateNAR", in, out, opts...) + err := c.cc.Invoke(ctx, PathInfoService_CalculateNAR_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -168,7 +177,7 @@ func _PathInfoService_Get_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tvix.store.v1.PathInfoService/Get", + FullMethod: PathInfoService_Get_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PathInfoServiceServer).Get(ctx, req.(*GetPathInfoRequest)) @@ -186,7 +195,7 @@ func _PathInfoService_Put_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tvix.store.v1.PathInfoService/Put", + FullMethod: PathInfoService_Put_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PathInfoServiceServer).Put(ctx, req.(*PathInfo)) @@ -204,7 +213,7 @@ func _PathInfoService_CalculateNAR_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tvix.store.v1.PathInfoService/CalculateNAR", + FullMethod: PathInfoService_CalculateNAR_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PathInfoServiceServer).CalculateNAR(ctx, req.(*Node)) diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index 5f232818da..78c66c693d 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -87,7 +87,6 @@ let direnv dockerfile-mode doom-themes - eglot elisp-slime-nav elixir-mode elm-mode @@ -145,7 +144,11 @@ let which-key yaml-mode yasnippet - ])); + ]) ++ + + [ + epkgs.eglot # from elpa devel + ]); loadPath = concatStringsSep ":" [ ./.emacs.d/wpc -- cgit 1.4.1