Merge pull request #1 from i10416/update/v1.23.1

setup v1.23.1

Author: i10416

flake.lock

@@ -3,7 +3,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.flake-parts.url = "github:hercules-ci/flake-parts";
   inputs.grpc-swift-src = {
-    url = "github:grpc/grpc-swift?ref=refs/tags/1.23.0";
+    url = "github:grpc/grpc-swift?ref=refs/tags/1.23.1";
     flake = false;
   };
   outputs = inputs@{ self, nixpkgs, flake-parts, grpc-swift-src }:
@@ -14,11 +14,12 @@
         let
           pkgs = import nixpkgs { inherit system; };
           protobuf = pkgs.protobuf;
+          version = "1.23.1";
           protoc-gen-swift = import ./protoc-gen-swift/default.nix {
-            inherit pkgs system grpc-swift-src;
+            inherit pkgs system grpc-swift-src version;
           };
           protoc-gen-grpc-swift = import ./protoc-gen-grpc-swift/default.nix {
-            inherit pkgs system grpc-swift-src;
+            inherit pkgs system grpc-swift-src version;
           };
         in rec {
           packages = {

flake.nix

@@ -5,18 +5,14 @@
     "swift-argument-parser" = "11igj86hrm83813m01mxgqxalcpbj5y419pw31z4wy43ip3bj6mq";
     "swift-atomics" = "0rzq9klikwm4jv9y0wqb2wajlv6nlcyjgg5bvf35209h6l2gz38y";
     "swift-collections" = "0ymxq7flzkhjxsyv4pjmlf86bvb93rhgkm2mlvsbb0lxz6729h2k";
-    "swift-distributed-tracing" = "0p2xinw822znyh274bbpigznlvzf1wkjfjhgsvb868lkwj791r3q";
-    "swift-docc-plugin" = "1mn2xm5m41dav8c1ly8cygz2p8ykrhsi6s4b1d9yn9cysdfyacqn";
-    "swift-docc-symbolkit" = "14w37wzbx1mygfwm4iv0ypj120n1axhk627rg5a7v8j0ln511r7s";
     "swift-http-types" = "1r819avswd5zl76kkjc0d7jczcwwna5fa9d5qw6h4hhqpv03r5m5";
     "swift-log" = "1045r1nxrz86cmxygd5dms06ybgyhqfzlv01645x96m2ial92i79";
     "swift-nio" = "0j05dz9y8d7q9xc1rsw3p4xny3bsxwignammphix5hh02hxymxx3";
     "swift-nio-extras" = "0qlgh5znji1zmygfb6ym7ldm7nzqq8grmhdmsjib0rpgmz40zssl";
-    "swift-nio-http2" = "06468kyfzh2gwsbk1wkkiv1rf4nhlcszjdiibb0pf2cv5dnrm4pr";
+    "swift-nio-http2" = "0s32v8aly0l2ara4gfqh6nn2rkwcj2ng2qqv3y723s1smz87pds8";
     "swift-nio-ssl" = "0iab2kr1klbdhhpy46rfqwnf1r27qnjafpm1c4f8d051vzhlk0j8";
     "swift-nio-transport-services" = "0xi25hs1g7479yr24vx78s7di9zd85wl2h8xsf3pxi03y22rkyli";
-    "swift-protobuf" = "03cry5cqp9brrrsqsklvlzm3avc9bbidaf9v0asp0q84l40rg0sw";
-    "swift-service-context" = "1f4wlirpymi9w7an5ncalxbmpkyrld2fp4nchvyl5pz09wcdk96m";
+    "swift-protobuf" = "13mvsf4dh1am1x25zd01cdgi9l017hb21r1lw7fdm323gkpjpqb0";
     "swift-system" = "0g24vjxixzhpk4mjmq6zsh8wjkl631msg0v3hgyh7bf45nf5wzd8";
   };
 }

grpc-swift/swiftpm2nix/default.nix

@@ -53,57 +53,6 @@
         },
         "subpath": "swift-collections"
       },
-      {
-        "basedOn": null,
-        "packageRef": {
-          "identity": "swift-distributed-tracing",
-          "kind": "remoteSourceControl",
-          "location": "https://github.com/apple/swift-distributed-tracing.git",
-          "name": "swift-distributed-tracing"
-        },
-        "state": {
-          "checkoutState": {
-            "revision": "7fbb8b23b77ee548b3d0686b6faf735c1b3c7cb8",
-            "version": "1.1.0"
-          },
-          "name": "sourceControlCheckout"
-        },
-        "subpath": "swift-distributed-tracing"
-      },
-      {
-        "basedOn": null,
-        "packageRef": {
-          "identity": "swift-docc-plugin",
-          "kind": "remoteSourceControl",
-          "location": "https://github.com/apple/swift-docc-plugin",
-          "name": "SwiftDocCPlugin"
-        },
-        "state": {
-          "checkoutState": {
-            "revision": "26ac5758409154cc448d7ab82389c520fa8a8247",
-            "version": "1.3.0"
-          },
-          "name": "sourceControlCheckout"
-        },
-        "subpath": "swift-docc-plugin"
-      },
-      {
-        "basedOn": null,
-        "packageRef": {
-          "identity": "swift-docc-symbolkit",
-          "kind": "remoteSourceControl",
-          "location": "https://github.com/apple/swift-docc-symbolkit",
-          "name": "SymbolKit"
-        },
-        "state": {
-          "checkoutState": {
-            "revision": "b45d1f2ed151d057b54504d653e0da5552844e34",
-            "version": "1.0.0"
-          },
-          "name": "sourceControlCheckout"
-        },
-        "subpath": "swift-docc-symbolkit"
-      },
       {
         "basedOn": null,
         "packageRef": {
@@ -182,8 +131,8 @@
         },
         "state": {
           "checkoutState": {
-            "revision": "c6afe04165c865faaa687b42c32ed76dfcc91076",
-            "version": "1.31.0"
+            "revision": "eaa71bb6ae082eee5a07407b1ad0cbd8f48f9dca",
+            "version": "1.34.1"
           },
           "name": "sourceControlCheckout"
         },
@@ -233,30 +182,13 @@
         },
         "state": {
           "checkoutState": {
-            "revision": "9f0c76544701845ad98716f3f6a774a892152bcb",
-            "version": "1.26.0"
+            "revision": "ebc7251dd5b37f627c93698e4374084d98409633",
+            "version": "1.28.2"
           },
           "name": "sourceControlCheckout"
         },
         "subpath": "swift-protobuf"
       },
-      {
-        "basedOn": null,
-        "packageRef": {
-          "identity": "swift-service-context",
-          "kind": "remoteSourceControl",
-          "location": "https://github.com/apple/swift-service-context.git",
-          "name": "swift-service-context"
-        },
-        "state": {
-          "checkoutState": {
-            "revision": "ce0141c8f123132dbd02fd45fea448018762df1b",
-            "version": "1.0.0"
-          },
-          "name": "sourceControlCheckout"
-        },
-        "subpath": "swift-service-context"
-      },
       {
         "basedOn": null,
         "packageRef": {

grpc-swift/swiftpm2nix/workspace-state.json

@@ -1,17 +1,12 @@
 { pkgs ? import <nixpkgs> { inherit system; }, system ? builtins.currentSystem
-, grpc-swift-src ? (pkgs.fetchFromGitHub {
-  owner = "grpc";
-  repo = "grpc-swift";
-  rev = "1.23.0";
-  sha256 = "sha256-4kr28UyumKHpwiVZGT0KCVyM/6D/VKCRIDXGaB8BgJc=";
-}) }:
+, grpc-swift-src, version }:
 let
   product = "protoc-gen-grpc-swift";
   grpc-swift =
     import ../grpc-swift { inherit pkgs system grpc-swift-src product; };
 in pkgs.stdenv.mkDerivation {
   pname = product;
-  version = "1.23.0";
+  version = version;
   src = ./.;
   installPhase = ''
     mkdir -p $out/bin

protoc-gen-grpc-swift/default.nix

@@ -1,18 +1,13 @@
 { pkgs ? import <nixpkgs> { inherit system; }, system ? builtins.currentSystem
-, grpc-swift-src ? (pkgs.fetchFromGitHub {
-  owner = "grpc";
-  repo = "grpc-swift";
-  rev = "1.23.0";
-  sha256 = "sha256-4kr28UyumKHpwiVZGT0KCVyM/6D/VKCRIDXGaB8BgJc=";
-}) }:
+, grpc-swift-src, version}:
 let
   product = "protoc-gen-swift";
   grpc-swift = import ../grpc-swift {
     inherit pkgs system grpc-swift-src product;
   };
 in pkgs.stdenv.mkDerivation {
   pname = product;
-  version = "1.23.0";
+  version = version;
   src = ./.;
   installPhase = ''
     mkdir -p $out/bin