From 022cc423956379e755cd2a7e130cffa61e86cb74 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 23 Oct 2024 13:05:30 +0300 Subject: [PATCH] chore(3p/sources): bump channels & overlays (2024-10-23) * ops/modules: remove deprecated headscale DNS setting * users/aspen: use stable julia again (upstream ticket is resolved, and 16 has been removed because it's long deprecated) * users/wpcarro: utillinux -> util-linux * 3p/overlays: temporarily restore utillinux until upstream breakage is fixed * users/tazjin: noto-cjk -> noto-cjk-sans * tvix: regenerate Go protobufs Change-Id: I9dbec812306cd4e66030d14bbea3805e8224e0d5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12679 Reviewed-by: tazjin Reviewed-by: aspen Autosubmit: tazjin Tested-by: BuildkiteCI --- ops/modules/tvl-headscale.nix | 6 +- third_party/overlays/tvl.nix | 6 + third_party/sources/sources.json | 30 ++-- tvix/build-go/build.pb.go | 136 ++++-------------- tvix/build-go/rpc_build.pb.go | 2 +- tvix/castore-go/castore.pb.go | 114 +++------------ tvix/castore-go/rpc_blobstore.pb.go | 136 ++++-------------- tvix/castore-go/rpc_directory.pb.go | 48 ++----- tvix/store-go/pathinfo.pb.go | 114 +++------------ tvix/store-go/rpc_pathinfo.pb.go | 70 ++------- tvix/store/src/bin/tvix-store.rs | 2 +- .../aspen/system/home/modules/development.nix | 4 +- users/tazjin/nixos/frog/default.nix | 2 +- users/tazjin/nixos/modules/fonts.nix | 2 +- .../boilerplate/typescript/default.nix | 2 +- .../website/sandbox/contentful/default.nix | 2 +- 16 files changed, 143 insertions(+), 533 deletions(-) diff --git a/ops/modules/tvl-headscale.nix b/ops/modules/tvl-headscale.nix index a07021c78..6e805e4ac 100644 --- a/ops/modules/tvl-headscale.nix +++ b/ops/modules/tvl-headscale.nix @@ -22,11 +22,7 @@ settings = { server_url = "https://net.tvl.fyi"; - dns_config.nameservers = [ - "8.8.8.8" - "1.1.1.1" - "77.88.8.8" - ]; + dns.magic_dns = false; # TLS is handled by nginx tls_cert_path = null; diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 7b3157854..c1aa5bbfd 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -148,4 +148,10 @@ depot.nix.readTree.drvTargets { hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; }; }) else super.fuse; + + # somebody renamed 'utillinux' upstream, but didn't rename all use-cases, + # leading to some packages being broken. + # + # temporarily restore the old name to make things work again. + utillinux = self.util-linux; } diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 681680893..c3a863526 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "d57112db877f07387ce7104b5ac346ede556d2d7", - "sha256": "1dz9fx6dk6l27sbylr55v38rnvyicpv35krv2qmhp2awgbaap5gi", + "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", + "sha256": "0jygm1vsfp10fylmxg8qfss01zfz72iwnxqaal75x5wpgmihdc7c", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/d57112db877f07387ce7104b5ac346ede556d2d7.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/5ec753a1fc4454df9285d8b3ec0809234defb975.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "nix-community", "repo": "impermanence", - "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e", - "sha256": "0m0j3y7x3cbiaksawn5bknipsqc1dxdhvl8cg5fk23iszyhpf3hl", + "rev": "e337457502571b23e449bf42153d7faa10c0a562", + "sha256": "0l242sa21jv53lkjh180dp5x9ip1blrz3gbks9m604kmk520csqb", "type": "tarball", - "url": "https://github.com/nix-community/impermanence/archive/d0b38e550039a72aff896ee65b0918e975e6d48e.tar.gz", + "url": "https://github.com/nix-community/impermanence/archive/e337457502571b23e449bf42153d7faa10c0a562.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "naersk": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", - "sha256": "0p3ry8x72cl572fs1c47h9y3s045p4aq71wpblzdi4dfqx3z2i7m", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "sha256": "1p9abqmdawhxpzykwyg9bqgyb4m3wp81yp57pf2sw5ar3a2nx2r3", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5633bcff0c6162b9e4b5f1264264611e950c8ec7.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/1997e4aa514312c1af7e2bda7fad1644e778ff26.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fc1e58ebabe0cef4442eedea07556ff0c9eafcfe", - "sha256": "127y267f60661yf0ysn34gjkmyb6nmnl32nn06jswb7i86y6j79v", + "rev": "10c5eb61aaa32caddb9ecf0362a6eb9daeb08eab", + "sha256": "1q14zplvixn86hp8p1hc9jqz7is4qypjk45sx06b8kbmrf3aii4g", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/fc1e58ebabe0cef4442eedea07556ff0c9eafcfe.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/10c5eb61aaa32caddb9ecf0362a6eb9daeb08eab.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": "acb7ce45817b13dd34cb32540ff18be4e1f3ba09", - "sha256": "06qv3whllk9f5il3xhr5l1x2ffck4i9y8fg5ym7dha4z15392llk", + "rev": "57c4a0ce3a1a3cdbf9e7eaa16b5441345de50d13", + "sha256": "0nq0x1qqkc9lzlmfsi5q373h6s4rbkhkvjbg3crz7w9x5f7bfhzq", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/acb7ce45817b13dd34cb32540ff18be4e1f3ba09.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/57c4a0ce3a1a3cdbf9e7eaa16b5441345de50d13.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/tvix/build-go/build.pb.go b/tvix/build-go/build.pb.go index ef9caf2ea..b7adc024c 100644 --- a/tvix/build-go/build.pb.go +++ b/tvix/build-go/build.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: tvix/build/protos/build.proto @@ -124,11 +124,9 @@ type BuildRequest struct { func (x *BuildRequest) Reset() { *x = BuildRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_build_protos_build_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_build_protos_build_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildRequest) String() string { @@ -139,7 +137,7 @@ func (*BuildRequest) ProtoMessage() {} func (x *BuildRequest) ProtoReflect() protoreflect.Message { mi := &file_tvix_build_protos_build_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -241,11 +239,9 @@ type Build struct { func (x *Build) Reset() { *x = Build{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_build_protos_build_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_build_protos_build_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Build) String() string { @@ -256,7 +252,7 @@ func (*Build) ProtoMessage() {} func (x *Build) ProtoReflect() protoreflect.Message { mi := &file_tvix_build_protos_build_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -304,11 +300,9 @@ type BuildRequest_EnvVar struct { func (x *BuildRequest_EnvVar) Reset() { *x = BuildRequest_EnvVar{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_build_protos_build_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_build_protos_build_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildRequest_EnvVar) String() string { @@ -319,7 +313,7 @@ func (*BuildRequest_EnvVar) ProtoMessage() {} func (x *BuildRequest_EnvVar) ProtoReflect() protoreflect.Message { mi := &file_tvix_build_protos_build_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -378,11 +372,9 @@ type BuildRequest_BuildConstraints struct { func (x *BuildRequest_BuildConstraints) Reset() { *x = BuildRequest_BuildConstraints{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_build_protos_build_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_build_protos_build_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildRequest_BuildConstraints) String() string { @@ -393,7 +385,7 @@ func (*BuildRequest_BuildConstraints) ProtoMessage() {} func (x *BuildRequest_BuildConstraints) ProtoReflect() protoreflect.Message { mi := &file_tvix_build_protos_build_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -454,11 +446,9 @@ type BuildRequest_AdditionalFile struct { func (x *BuildRequest_AdditionalFile) Reset() { *x = BuildRequest_AdditionalFile{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_build_protos_build_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_build_protos_build_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildRequest_AdditionalFile) String() string { @@ -469,7 +459,7 @@ func (*BuildRequest_AdditionalFile) ProtoMessage() {} func (x *BuildRequest_AdditionalFile) ProtoReflect() protoreflect.Message { mi := &file_tvix_build_protos_build_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -509,11 +499,9 @@ type Build_OutputNeedles struct { func (x *Build_OutputNeedles) Reset() { *x = Build_OutputNeedles{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_build_protos_build_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_build_protos_build_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Build_OutputNeedles) String() string { @@ -524,7 +512,7 @@ func (*Build_OutputNeedles) ProtoMessage() {} func (x *Build_OutputNeedles) ProtoReflect() protoreflect.Message { mi := &file_tvix_build_protos_build_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -668,80 +656,6 @@ func file_tvix_build_protos_build_proto_init() { if File_tvix_build_protos_build_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_tvix_build_protos_build_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*BuildRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_build_protos_build_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*Build); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_build_protos_build_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*BuildRequest_EnvVar); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_build_protos_build_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*BuildRequest_BuildConstraints); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_build_protos_build_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*BuildRequest_AdditionalFile); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_build_protos_build_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*Build_OutputNeedles); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/tvix/build-go/rpc_build.pb.go b/tvix/build-go/rpc_build.pb.go index b2f947362..e6cdb84f1 100644 --- a/tvix/build-go/rpc_build.pb.go +++ b/tvix/build-go/rpc_build.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: tvix/build/protos/rpc_build.proto diff --git a/tvix/castore-go/castore.pb.go b/tvix/castore-go/castore.pb.go index 1adfbe34d..9395a392b 100644 --- a/tvix/castore-go/castore.pb.go +++ b/tvix/castore-go/castore.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: tvix/castore/protos/castore.proto @@ -45,11 +45,9 @@ type Directory struct { func (x *Directory) Reset() { *x = Directory{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_castore_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_castore_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Directory) String() string { @@ -60,7 +58,7 @@ func (*Directory) ProtoMessage() {} func (x *Directory) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_castore_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -121,11 +119,9 @@ type DirectoryNode struct { func (x *DirectoryNode) Reset() { *x = DirectoryNode{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_castore_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_castore_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DirectoryNode) String() string { @@ -136,7 +132,7 @@ func (*DirectoryNode) ProtoMessage() {} func (x *DirectoryNode) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_castore_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -190,11 +186,9 @@ type FileNode struct { func (x *FileNode) Reset() { *x = FileNode{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_castore_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_castore_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FileNode) String() string { @@ -205,7 +199,7 @@ func (*FileNode) ProtoMessage() {} func (x *FileNode) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_castore_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -262,11 +256,9 @@ type SymlinkNode struct { func (x *SymlinkNode) Reset() { *x = SymlinkNode{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_castore_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_castore_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SymlinkNode) String() string { @@ -277,7 +269,7 @@ func (*SymlinkNode) ProtoMessage() {} func (x *SymlinkNode) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_castore_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -322,11 +314,9 @@ type Node struct { func (x *Node) Reset() { *x = Node{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_castore_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_castore_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Node) String() string { @@ -337,7 +327,7 @@ func (*Node) ProtoMessage() {} func (x *Node) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_castore_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -492,68 +482,6 @@ func file_tvix_castore_protos_castore_proto_init() { if File_tvix_castore_protos_castore_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_tvix_castore_protos_castore_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*Directory); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_castore_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*DirectoryNode); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_castore_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*FileNode); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_castore_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*SymlinkNode); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_castore_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*Node); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_tvix_castore_protos_castore_proto_msgTypes[4].OneofWrappers = []any{ (*Node_Directory)(nil), (*Node_File)(nil), diff --git a/tvix/castore-go/rpc_blobstore.pb.go b/tvix/castore-go/rpc_blobstore.pb.go index a6ee6748b..90b131bff 100644 --- a/tvix/castore-go/rpc_blobstore.pb.go +++ b/tvix/castore-go/rpc_blobstore.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: tvix/castore/protos/rpc_blobstore.proto @@ -38,11 +38,9 @@ type StatBlobRequest struct { func (x *StatBlobRequest) Reset() { *x = StatBlobRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StatBlobRequest) String() string { @@ -53,7 +51,7 @@ func (*StatBlobRequest) ProtoMessage() {} func (x *StatBlobRequest) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -105,11 +103,9 @@ type StatBlobResponse struct { func (x *StatBlobResponse) Reset() { *x = StatBlobResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StatBlobResponse) String() string { @@ -120,7 +116,7 @@ func (*StatBlobResponse) ProtoMessage() {} func (x *StatBlobResponse) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -160,11 +156,9 @@ type ReadBlobRequest struct { func (x *ReadBlobRequest) Reset() { *x = ReadBlobRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ReadBlobRequest) String() string { @@ -175,7 +169,7 @@ func (*ReadBlobRequest) ProtoMessage() {} func (x *ReadBlobRequest) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -209,11 +203,9 @@ type BlobChunk struct { func (x *BlobChunk) Reset() { *x = BlobChunk{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BlobChunk) String() string { @@ -224,7 +216,7 @@ func (*BlobChunk) ProtoMessage() {} func (x *BlobChunk) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -257,11 +249,9 @@ type PutBlobResponse struct { func (x *PutBlobResponse) Reset() { *x = PutBlobResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PutBlobResponse) String() string { @@ -272,7 +262,7 @@ func (*PutBlobResponse) ProtoMessage() {} func (x *PutBlobResponse) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -307,11 +297,9 @@ type StatBlobResponse_ChunkMeta struct { func (x *StatBlobResponse_ChunkMeta) Reset() { *x = StatBlobResponse_ChunkMeta{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StatBlobResponse_ChunkMeta) String() string { @@ -322,7 +310,7 @@ func (*StatBlobResponse_ChunkMeta) ProtoMessage() {} func (x *StatBlobResponse_ChunkMeta) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -443,80 +431,6 @@ func file_tvix_castore_protos_rpc_blobstore_proto_init() { if File_tvix_castore_protos_rpc_blobstore_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*StatBlobRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*StatBlobResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ReadBlobRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*BlobChunk); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*PutBlobResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_rpc_blobstore_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*StatBlobResponse_ChunkMeta); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/tvix/castore-go/rpc_directory.pb.go b/tvix/castore-go/rpc_directory.pb.go index ca8690953..27a4e9423 100644 --- a/tvix/castore-go/rpc_directory.pb.go +++ b/tvix/castore-go/rpc_directory.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: tvix/castore/protos/rpc_directory.proto @@ -41,11 +41,9 @@ type GetDirectoryRequest struct { func (x *GetDirectoryRequest) Reset() { *x = GetDirectoryRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_rpc_directory_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_rpc_directory_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetDirectoryRequest) String() string { @@ -56,7 +54,7 @@ func (*GetDirectoryRequest) ProtoMessage() {} func (x *GetDirectoryRequest) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_rpc_directory_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -115,11 +113,9 @@ type PutDirectoryResponse struct { func (x *PutDirectoryResponse) Reset() { *x = PutDirectoryResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_castore_protos_rpc_directory_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_castore_protos_rpc_directory_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PutDirectoryResponse) String() string { @@ -130,7 +126,7 @@ func (*PutDirectoryResponse) ProtoMessage() {} func (x *PutDirectoryResponse) ProtoReflect() protoreflect.Message { mi := &file_tvix_castore_protos_rpc_directory_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -222,32 +218,6 @@ func file_tvix_castore_protos_rpc_directory_proto_init() { return } file_tvix_castore_protos_castore_proto_init() - if !protoimpl.UnsafeEnabled { - file_tvix_castore_protos_rpc_directory_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*GetDirectoryRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_castore_protos_rpc_directory_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*PutDirectoryResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_tvix_castore_protos_rpc_directory_proto_msgTypes[0].OneofWrappers = []any{ (*GetDirectoryRequest_Digest)(nil), } diff --git a/tvix/store-go/pathinfo.pb.go b/tvix/store-go/pathinfo.pb.go index 2609600c2..4941d80a8 100644 --- a/tvix/store-go/pathinfo.pb.go +++ b/tvix/store-go/pathinfo.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: tvix/store/protos/pathinfo.proto @@ -118,11 +118,9 @@ type PathInfo struct { func (x *PathInfo) Reset() { *x = PathInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PathInfo) String() string { @@ -133,7 +131,7 @@ func (*PathInfo) ProtoMessage() {} func (x *PathInfo) ProtoReflect() protoreflect.Message { mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -185,11 +183,9 @@ type StorePath struct { func (x *StorePath) Reset() { *x = StorePath{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StorePath) String() string { @@ -200,7 +196,7 @@ func (*StorePath) ProtoMessage() {} func (x *StorePath) ProtoReflect() protoreflect.Message { mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -285,11 +281,9 @@ type NARInfo struct { func (x *NARInfo) Reset() { *x = NARInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NARInfo) String() string { @@ -300,7 +294,7 @@ func (*NARInfo) ProtoMessage() {} func (x *NARInfo) ProtoReflect() protoreflect.Message { mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -369,11 +363,9 @@ type NARInfo_Signature struct { func (x *NARInfo_Signature) Reset() { *x = NARInfo_Signature{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NARInfo_Signature) String() string { @@ -384,7 +376,7 @@ func (*NARInfo_Signature) ProtoMessage() {} func (x *NARInfo_Signature) ProtoReflect() protoreflect.Message { mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -426,11 +418,9 @@ type NARInfo_CA struct { func (x *NARInfo_CA) Reset() { *x = NARInfo_CA{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NARInfo_CA) String() string { @@ -441,7 +431,7 @@ func (*NARInfo_CA) ProtoMessage() {} func (x *NARInfo_CA) ProtoReflect() protoreflect.Message { mi := &file_tvix_store_protos_pathinfo_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -573,68 +563,6 @@ func file_tvix_store_protos_pathinfo_proto_init() { if File_tvix_store_protos_pathinfo_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_tvix_store_protos_pathinfo_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*PathInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_store_protos_pathinfo_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*StorePath); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_store_protos_pathinfo_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*NARInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_store_protos_pathinfo_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*NARInfo_Signature); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_store_protos_pathinfo_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*NARInfo_CA); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/tvix/store-go/rpc_pathinfo.pb.go b/tvix/store-go/rpc_pathinfo.pb.go index 3acdd32e8..357338430 100644 --- a/tvix/store-go/rpc_pathinfo.pb.go +++ b/tvix/store-go/rpc_pathinfo.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: tvix/store/protos/rpc_pathinfo.proto @@ -39,11 +39,9 @@ type GetPathInfoRequest struct { func (x *GetPathInfoRequest) Reset() { *x = GetPathInfoRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetPathInfoRequest) String() string { @@ -54,7 +52,7 @@ func (*GetPathInfoRequest) ProtoMessage() {} func (x *GetPathInfoRequest) ProtoReflect() protoreflect.Message { mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -107,11 +105,9 @@ type ListPathInfoRequest struct { func (x *ListPathInfoRequest) Reset() { *x = ListPathInfoRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListPathInfoRequest) String() string { @@ -122,7 +118,7 @@ func (*ListPathInfoRequest) ProtoMessage() {} func (x *ListPathInfoRequest) ProtoReflect() protoreflect.Message { mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -154,11 +150,9 @@ type CalculateNARResponse struct { func (x *CalculateNARResponse) Reset() { *x = CalculateNARResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CalculateNARResponse) String() string { @@ -169,7 +163,7 @@ func (*CalculateNARResponse) ProtoMessage() {} func (x *CalculateNARResponse) ProtoReflect() protoreflect.Message { mi := &file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -285,44 +279,6 @@ func file_tvix_store_protos_rpc_pathinfo_proto_init() { return } file_tvix_store_protos_pathinfo_proto_init() - if !protoimpl.UnsafeEnabled { - file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*GetPathInfoRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ListPathInfoRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*CalculateNARResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_tvix_store_protos_rpc_pathinfo_proto_msgTypes[0].OneofWrappers = []any{ (*GetPathInfoRequest_ByOutputHash)(nil), } diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index 1aed0a8e4..d21bc630e 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -346,7 +346,7 @@ async fn run_cli( }.instrument(info_span!("import path", "indicatif.pb_show" = tracing::field::Empty)) }) .buffer_unordered(50) - .try_collect() + .try_collect::<()>() .await?; } Commands::Copy { diff --git a/users/aspen/system/home/modules/development.nix b/users/aspen/system/home/modules/development.nix index ca6ef131a..0da6d9cba 100644 --- a/users/aspen/system/home/modules/development.nix +++ b/users/aspen/system/home/modules/development.nix @@ -68,9 +68,7 @@ with lib; nodePackages.prettier ] ++ optionals (stdenv.isLinux) [ - # TODO(aspen): replace with stable again once the current julia debacle - # is resolved upstream, see https://github.com/NixOS/nixpkgs/pull/121114 - julia_16-bin + julia-stable-bin valgrind linuxPackages.perf diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index ce82d749f..226886bfb 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -109,7 +109,7 @@ lib.fix (self: { corefonts dejavu_fonts jetbrains-mono - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji ]; diff --git a/users/tazjin/nixos/modules/fonts.nix b/users/tazjin/nixos/modules/fonts.nix index 36b4cbe96..01ec11842 100644 --- a/users/tazjin/nixos/modules/fonts.nix +++ b/users/tazjin/nixos/modules/fonts.nix @@ -9,7 +9,7 @@ dejavu_fonts font-awesome jetbrains-mono - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-color-emoji noto-fonts-monochrome-emoji ]; diff --git a/users/wpcarro/boilerplate/typescript/default.nix b/users/wpcarro/boilerplate/typescript/default.nix index 84949cae7..b013cf07e 100644 --- a/users/wpcarro/boilerplate/typescript/default.nix +++ b/users/wpcarro/boilerplate/typescript/default.nix @@ -6,7 +6,7 @@ pkgs.stdenv.mkDerivation { buildInputs = with pkgs; [ nodejs # Exposes lscpu for parcel.js - utillinux + util-linux ]; # parcel.js needs number of CPUs PARCEL_WORKERS = "1"; diff --git a/users/wpcarro/website/sandbox/contentful/default.nix b/users/wpcarro/website/sandbox/contentful/default.nix index ce7e534b2..8b3ed12c4 100644 --- a/users/wpcarro/website/sandbox/contentful/default.nix +++ b/users/wpcarro/website/sandbox/contentful/default.nix @@ -6,7 +6,7 @@ pkgs.stdenv.mkDerivation { buildInputs = with pkgs; [ nodejs # Exposes lscpu for parcel.js - utillinux + util-linux ]; # parcel.js needs number of CPUs PARCEL_WORKERS = "1";