Merge staging-next into staging

2 files changed, 13 insertions, 1 deletions

diff --git a/pkgs/build-support/kernel/make-initrd-ng-tool.nix b/pkgs/build-support/kernel/make-initrd-ng-tool.nix
index 5e08c091c0549..7ffa0bf6813a5 100644
--- a/pkgs/build-support/kernel/make-initrd-ng-tool.nix
+++ b/pkgs/build-support/kernel/make-initrd-ng-tool.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Tool for copying binaries and their dependencies";
     mainProgram = "make-initrd-ng";
-    maintainers = with lib.maintainers; [ das_j elvishjerricco k900 lheckemann ];
+    maintainers = with lib.maintainers; [ das_j elvishjerricco k900 ];
     license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 92c71dfc059ce..d8f1bfaf4447b 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -218,6 +218,10 @@ in
     buildInputs = [ openssl ];
   };
 
+  opentelemetry-proto = attrs: {
+    nativeBuildInputs = [ protobuf ];
+  };
+
   pam-sys = attr: {
     buildInputs = [ linux-pam ];
   };
@@ -236,6 +240,10 @@ in
     nativeBuildInputs = [ protobuf ];
   };
 
+  prost-wkt-types = attr: {
+    nativeBuildInputs = [ protobuf ];
+  };
+
   rdkafka-sys = attr: {
     nativeBuildInputs = [ pkg-config ];
     buildInputs = [ rdkafka ];
@@ -299,6 +307,10 @@ in
     buildInputs = [ libsodium ];
   };
 
+  tonic-reflection = attrs: {
+    nativeBuildInputs = [ protobuf ];
+  };
+
   xcb = attrs: {
     buildInputs = [ python3 ];
   };