Merge master into staging-next

2021-05-13 18:32:50 +00:00
parent 7465594428 48c25a9eaf
commit 39e3f7c2cc
46 changed files with 274 additions and 121 deletions
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -11,6 +11,13 @@ rustPlatform.buildRustPackage rec {
    sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";
  };

+  postPatch = ''
+    # Remove #[deny(warnings)] which is equivalent to -Werror in C.
+    # Prevents build failures when upgrading rustc, which may give more warnings.
+    substituteInPlace src/lib.rs \
+      --replace "#![deny(warnings)]" ""
+  '';
+
  cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67";

  buildInputs = [ llvmPackages.libclang v8 ]