Merge remote-tracking branch 'nixpkgs/staging-next' into staging

This will bring in the fix for the yarGen eval failure.
This commit is contained in:
Alyssa Ross
2021-04-23 13:35:52 +00:00
48 changed files with 777 additions and 176 deletions
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
version = "8.6.12";
version = "9.1.0";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Oad0JpeeCpIHfH9e1pTKtrnvZ+eFx3dR5GP6g6piFS0=";
sha256 = "sha256-teH4Y6PrUSE7Rxw0WV7Ka+CB44nwYXy9q09wOAhC8Bc=";
};
vendorSha256 = "sha256-LYMZFaCNlJg+9Hoh2VbY6tMHv6oT7r+JHBcQYpOceRQ=";
vendorSha256 = "sha256-HPUvL22BrVH9/j41VFaystZWs0LO6KNIf2cNYqKxWnY=";
doCheck = false;
+4 -4
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "lychee";
version = "0.5.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "lycheeverse";
repo = pname;
rev = "v${version}";
sha256 = "03dsp0384mwr51dkqfl25xba0m17sppabiz7slhxcig89b0ksykm";
rev = version;
sha256 = "0kpwpbv0dqb0p4bxjlcjas6x1n91rdsvy2psrc1nyr1sh6gb1q5j";
};
cargoSha256 = "08y2wpm2qgm2jsy257b2p2anxy4q3bj2kfdr5cnb6wnaz9g4ypq2";
cargoSha256 = "1b915zkg41n3azk4hhg6fgc83n7iq8p7drvdyil2m2a4qdjvp9r3";
nativeBuildInputs = [ pkg-config ];