Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
  pkgs/tools/package-management/cargo-release/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-18 11:03:38 -07:00
21 changed files with 264 additions and 238 deletions
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
version = "0.13.10";
version = "0.13.11";
src = fetchFromGitHub {
owner = "sunng87";
repo = "cargo-release";
rev = "v${version}";
sha256 = "sha256-WWU+aNMNOOstHiGRE5nj2biWCL3uwyqJKgt0xCAfS0s=";
sha256 = "sha256-v0XKLwxUIxBt9hIUzprz+VsxCRifH1/SbNcI0sH2ENM=";
};
cargoSha256 = "sha256-W+/owW9Hl1cSBlfSN8Gea575tkjmZlwa5X6TCYyaLsM=";
cargoSha256 = "sha256-zbET6UsV29hAL83rw3XRgrcM5FABFNI3w3Kbd61FS7E=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]