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

This commit is contained in:
Martin Weinelt
2021-05-12 18:28:03 +02:00
32 changed files with 216 additions and 99 deletions
+5 -1
View File
@@ -3,6 +3,7 @@
, fetchFromGitHub
, fetchpatch
, rustPlatform
, libiconv
, Security
}:
@@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
cargoPatches = [
# Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1
@@ -30,6 +31,9 @@ rustPlatform.buildRustPackage rec {
})
];
# Tries to send large UDP packets that Darwin rejects.
doCheck = !stdenv.isDarwin;
meta = with lib; {
description = "UDP-based load generator";
homepage = "https://github.com/rozgo/anevicon";
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
version = "9.1.2";
version = "9.1.3";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7v8vz0n35ATWdmMcM2U7z1sONbmsaWQahHsramivm88=";
sha256 = "rVR2KfrK7M74kZUm5q23Lbj7hTLCN+p12RBaf3JAEXM=";
};
vendorSha256 = "sha256-IAyiD4v2UEGlWj8oZ0E3YhqyThJTjwjWjOzQKuj6Q9s=";
vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4=";
doCheck = false;
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "network-manager-applet";
version = "1.20.0";
version = "1.22.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla";
sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4=";
};
mesonFlags = [