diff --git a/flake.lock b/flake.lock index 903c78680..83c948bcd 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1645937171, - "narHash": "sha256-n9f9GZBNMe8UMhcgmmaXNObkH01jjgp7INMrUgBgcy4=", + "lastModified": 1654126564, + "narHash": "sha256-sgDXDKGmUG4h7OPDOHyQggFQ08ZqVzUIPi8351yhugY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22dc22f8cedc58fcb11afe1acb08e9999e78be9c", + "rev": "f1c9c23aad972787f00f175651e4cb0d7c7fd5ea", "type": "github" }, "original": { diff --git a/internal/server/proto/ruby_vagrant/ruby-server_grpc.pb.go b/internal/server/proto/ruby_vagrant/ruby-server_grpc.pb.go index 6bf16396e..60770a17d 100644 --- a/internal/server/proto/ruby_vagrant/ruby-server_grpc.pb.go +++ b/internal/server/proto/ruby_vagrant/ruby-server_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.19.4 +// source: proto/ruby_vagrant/ruby-server.proto package ruby_vagrant diff --git a/internal/server/proto/vagrant_server/server.pb.go b/internal/server/proto/vagrant_server/server.pb.go index 9bb2ca118..7aa74cd2a 100644 --- a/internal/server/proto/vagrant_server/server.pb.go +++ b/internal/server/proto/vagrant_server/server.pb.go @@ -9615,7 +9615,8 @@ func (*GetJobStreamResponse_Terminal_Event_Raw_) isGetJobStreamResponse_Terminal func (*GetJobStreamResponse_Terminal_Event_Table_) isGetJobStreamResponse_Terminal_Event_Event() {} -func (*GetJobStreamResponse_Terminal_Event_StepGroup_) isGetJobStreamResponse_Terminal_Event_Event() {} +func (*GetJobStreamResponse_Terminal_Event_StepGroup_) isGetJobStreamResponse_Terminal_Event_Event() { +} func (*GetJobStreamResponse_Terminal_Event_Step_) isGetJobStreamResponse_Terminal_Event_Event() {} diff --git a/internal/server/proto/vagrant_server/server_grpc.pb.go b/internal/server/proto/vagrant_server/server_grpc.pb.go index e64ae8cc3..5a9c7ed50 100644 --- a/internal/server/proto/vagrant_server/server_grpc.pb.go +++ b/internal/server/proto/vagrant_server/server_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.19.4 +// source: proto/vagrant_server/server.proto package vagrant_server diff --git a/nix/go-mockery.nix b/nix/go-mockery.nix index 65f433eb0..92d711abd 100644 --- a/nix/go-mockery.nix +++ b/nix/go-mockery.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.9.4"; + version = "2.12.3"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-y3pbhEqBeOU9DgzowYRH5UcOMOJpWIVgbbA5GlHqH+s="; + sha256 = "sha256-3SF8vNYG0PrZhP3zcn9mV85ByQtGDumUcxglf35/eD0"; }; buildFlagsArray = '' @@ -16,8 +16,8 @@ buildGoModule rec { -s -w -X github.com/vektra/mockery/v2/pkg/config.SemVer=${version} ''; - modSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; - vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; + modSha256 = "sha256-/ha6DCJ+vSOmfFJ+rjN6rfQ3GHZF19OQnmHjYRtSY2g="; + vendorSha256 = "sha256-/ha6DCJ+vSOmfFJ+rjN6rfQ3GHZF19OQnmHjYRtSY2g="; subPackages = ["."]; } diff --git a/nix/overlay.nix b/nix/overlay.nix index a7f844e5d..82196a61a 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -1,6 +1,6 @@ final: prev: rec { # This is the pinned protoc version we have for this project. - protobufPin = prev.protobuf3_15; + protobufPin = prev.protobuf3_19; ruby = final.ruby_2_7;