Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-03-01 19:30:56 +01:00
138 changed files with 6595 additions and 4660 deletions
@@ -0,0 +1,22 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "cargo-criterion";
version = "1.0.0";
src = fetchFromGitHub {
owner = "bheisler";
repo = pname;
rev = version;
sha256 = "0czagclrn4yhlvlh06wsyiybz69r7mmk3182fywzn9vd0xlclxpi";
};
cargoSha256 = "sha256-XZuZ81hB/GQDopJyfSkxQiehSwJz7VWoJR6/m3WLil8=";
meta = with lib; {
description = "Cargo extension for running Criterion.rs benchmarks";
homepage = "https://github.com/bheisler/cargo-criterion";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ humancalico ];
};
}
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
version = "0.8.7";
version = "0.8.8";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = pname;
rev = version;
sha256 = "sha256-LXc4PFJ1FbdF3yotqqOkhhe+MKGZ4sqJgxAvDml9GeA=";
sha256 = "sha256-8wmH9DeI+tm3c/6n7bwMe5SslGNCUg4d5BE0+wQ7KTU=";
};
cargoSha256 = "sha256-4FFyRhmMpzKmKrvU2bmGHWUnLAbTDU1bPv7RfhQfYeY=";
cargoSha256 = "sha256-f0Wisel7NQOyfbhhs0GwyTBiUfydPMSVAysrov/RxxI=";
doCheck = false;
@@ -0,0 +1,25 @@
{ fetchFromGitHub, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "cargo-play";
version = "0.5.0";
src = fetchFromGitHub {
owner = "fanzeyi";
repo = pname;
rev = "v${version}";
sha256 = "01r00akfmvpzp924yqqybd9s0pwiwxy8vklsg4m9ypzljc3nlv02";
};
cargoSha256 = "0fvsdyivq5991ka6avh12aqdkjx0myk61kmzlr19p2vlfpg70q07";
# some tests require internet access
doCheck = false;
meta = with lib; {
description = "Run your rust code without setting up cargo";
homepage = "https://github.com/fanzeyi/cargo-play";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "crate2nix";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub
{
owner = "kolloch";
repo = pname;
rev = version;
sha256 = "sha256-pqg1BsEq3kGmUzt1zpQvXgdnRcIsiuIyvtUBi3VxtZ4=";
sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
} + "/crate2nix";
cargoSha256 = "sha256-dAMWrGNMleQ3lDbG46Hr4qvCyxR+QcPOUZw9r2/CxV4=";
cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik=";
nativeBuildInputs = [ makeWrapper ];
@@ -2,10 +2,10 @@
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
rev = "2021-02-22";
rev = "2021-03-01";
version = "unstable-${rev}";
sha256 = "sha256-QiVSwpTTOqR2WEm0nXyLLavlF2DnY9GY93HtpgHt2uI=";
cargoSha256 = "sha256-934ApOv/PJzkLc/LChckb/ZXKrh4kU556Bo/Zck+q8g=";
sha256 = "10x4fk1nxk548cfxrbfvz0kpa2r955d0bcnxxn8k8zmrdqxs3sph";
cargoSha256 = "02s6qnq61vifx59hnbaalqmfvp8anfik62y6rzy3rwm1l9r85qrz";
};
rust-analyzer = callPackage ./wrapper.nix {} {