Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-15 18:30:28 +00:00
committed by GitHub
43 changed files with 928 additions and 316 deletions

View File

@@ -1,6 +1,7 @@
{ lib, stdenv
, fetchFromGitHub
, rustPlatform
, libiconv
, Security
}:
@@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-L1MKoVacVKcpEG2IfS+eENxFZNiSaTDTxfFbFlvzYl8=";
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
meta = with lib; {
description = "A utility that makes sweeping changes to large, shared code bases";