From 0e8924bdd4c55c9ff83c3bf6ffb62efd3b6aefa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 22 Jun 2024 15:00:41 +0200 Subject: [PATCH 1/7] protoc-gen-{tonic,prost{,-serde,-crate}}: migrate to pkgs/by-name --- .../pr/protoc-gen-prost-crate/package.nix} | 0 .../pr/protoc-gen-prost-serde/package.nix} | 0 .../pr/protoc-gen-prost/package.nix} | 0 .../pr/protoc-gen-tonic/package.nix} | 0 pkgs/top-level/all-packages.nix | 8 -------- 5 files changed, 8 deletions(-) rename pkgs/{development/tools/protoc-gen-prost-crate/default.nix => by-name/pr/protoc-gen-prost-crate/package.nix} (100%) rename pkgs/{development/tools/protoc-gen-prost-serde/default.nix => by-name/pr/protoc-gen-prost-serde/package.nix} (100%) rename pkgs/{development/tools/protoc-gen-prost/default.nix => by-name/pr/protoc-gen-prost/package.nix} (100%) rename pkgs/{development/tools/protoc-gen-tonic/default.nix => by-name/pr/protoc-gen-tonic/package.nix} (100%) diff --git a/pkgs/development/tools/protoc-gen-prost-crate/default.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-prost-crate/default.nix rename to pkgs/by-name/pr/protoc-gen-prost-crate/package.nix diff --git a/pkgs/development/tools/protoc-gen-prost-serde/default.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-prost-serde/default.nix rename to pkgs/by-name/pr/protoc-gen-prost-serde/package.nix diff --git a/pkgs/development/tools/protoc-gen-prost/default.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-prost/default.nix rename to pkgs/by-name/pr/protoc-gen-prost/package.nix diff --git a/pkgs/development/tools/protoc-gen-tonic/default.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-tonic/default.nix rename to pkgs/by-name/pr/protoc-gen-tonic/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e0db78d9023..8e87bc83b635 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -740,14 +740,6 @@ with pkgs; protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; - protoc-gen-prost = callPackage ../development/tools/protoc-gen-prost { }; - - protoc-gen-prost-crate = callPackage ../development/tools/protoc-gen-prost-crate { }; - - protoc-gen-prost-serde = callPackage ../development/tools/protoc-gen-prost-serde { }; - - protoc-gen-tonic = callPackage ../development/tools/protoc-gen-tonic { }; - protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; From 518778a5e3a08f0ef614f546b41a392e1da6a926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 22 Jun 2024 14:57:16 +0200 Subject: [PATCH 2/7] protoc-gen-{tonic,prost{,-serde,-crate}}: reformat --- pkgs/by-name/pr/protoc-gen-prost-crate/package.nix | 13 ++++++++----- pkgs/by-name/pr/protoc-gen-prost-serde/package.nix | 13 ++++++++----- pkgs/by-name/pr/protoc-gen-prost/package.nix | 13 ++++++++----- pkgs/by-name/pr/protoc-gen-tonic/package.nix | 13 ++++++++----- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix index ed278646ee47..91a5fd90811f 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix @@ -1,7 +1,7 @@ -{ fetchCrate -, lib -, rustPlatform -, protobuf +{ + fetchCrate, + lib, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neoeinstein/protoc-gen-prost"; changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ felschr sitaaax ]; + maintainers = with maintainers; [ + felschr + sitaaax + ]; }; } diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix index e1595e0a2b86..d12d5261da30 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix @@ -1,7 +1,7 @@ -{ fetchCrate -, lib -, rustPlatform -, protobuf +{ + fetchCrate, + lib, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neoeinstein/protoc-gen-prost"; changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ felschr sitaaax ]; + maintainers = with maintainers; [ + felschr + sitaaax + ]; }; } diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix index 6012af0acf3c..e67979587d68 100644 --- a/pkgs/by-name/pr/protoc-gen-prost/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix @@ -1,7 +1,7 @@ -{ fetchCrate -, lib -, rustPlatform -, protobuf +{ + fetchCrate, + lib, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neoeinstein/protoc-gen-prost"; changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ felschr sitaaax ]; + maintainers = with maintainers; [ + felschr + sitaaax + ]; }; } diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix index 6855285341e5..5349d4e5015c 100644 --- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix +++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix @@ -1,7 +1,7 @@ -{ fetchCrate -, lib -, rustPlatform -, protobuf +{ + fetchCrate, + lib, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neoeinstein/protoc-gen-prost"; changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ felschr sitaaax ]; + maintainers = with maintainers; [ + felschr + sitaaax + ]; }; } From efee88f382bf0543af5ae4d6a0ac1fb2a6a9fc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 22 Jun 2024 14:57:55 +0200 Subject: [PATCH 3/7] protoc-gen-{tonic,prost{,-serde,-crate}}: add update scripts --- pkgs/by-name/pr/protoc-gen-prost-crate/package.nix | 3 +++ pkgs/by-name/pr/protoc-gen-prost-serde/package.nix | 3 +++ pkgs/by-name/pr/protoc-gen-prost/package.nix | 3 +++ pkgs/by-name/pr/protoc-gen-tonic/package.nix | 3 +++ 4 files changed, 12 insertions(+) diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix index 91a5fd90811f..05d442d0b9ea 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix @@ -2,6 +2,7 @@ fetchCrate, lib, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-dcKJRX/iHIWEmBD2nTMyQozxld8b7dhxxB85quPUysg="; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Protoc plugin that generates Cargo crates and include files for `protoc-gen-prost`"; mainProgram = "protoc-gen-prost-crate"; diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix index d12d5261da30..09f7d8e478ac 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix @@ -2,6 +2,7 @@ fetchCrate, lib, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-l27+Rs4TYIJXZVLj7Tjw8M5+7ivWEY0TXbLtbuzwxLw="; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Protoc plugin that generates serde serialization implementations for `protoc-gen-prost`"; mainProgram = "protoc-gen-prost-serde"; diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix index e67979587d68..575b848f1d4f 100644 --- a/pkgs/by-name/pr/protoc-gen-prost/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix @@ -2,6 +2,7 @@ fetchCrate, lib, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ghXcyxG9zqUOFKGvUza29OgC3XiEtesqsAsfI/lFT08="; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Protocol Buffers compiler plugin powered by Prost"; mainProgram = "protoc-gen-prost"; diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix index 5349d4e5015c..246a82bb27d9 100644 --- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix +++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix @@ -2,6 +2,7 @@ fetchCrate, lib, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-FrkvL/uJitMkSyOytVSmlwr26yMVM12S2n+EaSw11CE="; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Protoc plugin that generates Tonic gRPC server and client code using the Prost code generation engine"; mainProgram = "protoc-gen-tonic"; From fb4c3b791d208d05c30acb56394de8a85105f8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 22 Jun 2024 15:02:59 +0200 Subject: [PATCH 4/7] protoc-gen-prost: 0.2.3 -> 0.3.1 --- pkgs/by-name/pr/protoc-gen-prost/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix index 575b848f1d4f..7c92095fbeee 100644 --- a/pkgs/by-name/pr/protoc-gen-prost/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost"; - version = "0.2.3"; + version = "0.3.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-QTt5mSUe41r2fxrgWj1l6fHC/utMVIgMi2ySsdGyl/Y="; + hash = "sha256-ma9sdt3/uq06BMELwsNadMkiEfstQhA4DAQEPdizZJM="; }; - cargoSha256 = "sha256-ghXcyxG9zqUOFKGvUza29OgC3XiEtesqsAsfI/lFT08="; + cargoHash = "sha256-pJDrwX5uDIrycxtmbds8l4wadZE0RdgmNpMwVkUGJDs="; passthru.updateScript = nix-update-script { }; From c86d8aa179da46ee362a832e8c9933bbafcc4dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 22 Jun 2024 15:04:13 +0200 Subject: [PATCH 5/7] protoc-gen-prost-serde: 0.2.3 -> 0.3.0 --- pkgs/by-name/pr/protoc-gen-prost-serde/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix index 09f7d8e478ac..3486fbea0e1e 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost-serde"; - version = "0.2.3"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-V2Z6m9y/bBwrr1mgKXKZjVg+LqTe+GalN/AeaICyE64="; + hash = "sha256-O2Mpft31ZQncqETWzwD73I1nX1Wt5XVHcTJUk5qhRLY="; }; - cargoSha256 = "sha256-l27+Rs4TYIJXZVLj7Tjw8M5+7ivWEY0TXbLtbuzwxLw="; + cargoHash = "sha256-aUWmNS3jF1I0NLApBn3GMMv6ID9mM/j7r7sPFCsFIuw="; passthru.updateScript = nix-update-script { }; From f7de4e293f714a961186a18946d3c80a076023cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 22 Jun 2024 15:04:02 +0200 Subject: [PATCH 6/7] protoc-gen-prost-crate: 0.3.1 -> 0.4.0 --- pkgs/by-name/pr/protoc-gen-prost-crate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix index 05d442d0b9ea..97c62110931c 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost-crate"; - version = "0.3.1"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MtGeU2PnVYPXb3nly2UaryjmjMz1lxcvYDjFiwf58FA="; + hash = "sha256-+TSZ2QstAF8DXsHunV/nQyqF++0bFud1ZWJQEI3JEwc="; }; - cargoSha256 = "sha256-dcKJRX/iHIWEmBD2nTMyQozxld8b7dhxxB85quPUysg="; + cargoHash = "sha256-KbErgnXG11ngzLVSktuyUAupYs1ZD64z3plKVtzLx1A="; passthru.updateScript = nix-update-script { }; From 69f70080a5c96fe0073314263acc059c613ba159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 22 Jun 2024 15:18:05 +0200 Subject: [PATCH 7/7] protoc-gen-tonic: 0.3.0 -> 0.4.0 --- pkgs/by-name/pr/protoc-gen-tonic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix index 246a82bb27d9..55c1828618e9 100644 --- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix +++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-tonic"; - version = "0.3.0"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-jgU1XvUxIrZ72dLNPqDGHCONMlHsjW4k4vkO626iqxs="; + hash = "sha256-3qz1ea9lEsZjhWNA0lcwqsPkNmjj2ZBljqNRr5/2lKM="; }; - cargoSha256 = "sha256-FrkvL/uJitMkSyOytVSmlwr26yMVM12S2n+EaSw11CE="; + cargoHash = "sha256-nUsRoDaP+omZdOTnaxvHbJT1uNGtyfgXyEFZbp/CeYA="; passthru.updateScript = nix-update-script { };