Merge master into staging-next

pkgs/tools/misc/broot/default.nix

@@ -4,33 +4,39 @@
 , fetchCrate
 , installShellFiles
 , makeWrapper
+, pkg-config
+, libgit2
+, oniguruma
 , libiconv
-, zlib
 , Security
+, zlib
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-Iz9pXvgPIGUnfbnvk5kYAqlrMlz3I2kLszPe8GwwHVk=";
+    sha256 = "sha256-6UveXa0rMWt5FbmhB0CsYRMGMXxL8FB/XivB4Ec93PY=";
   };
 
-  cargoHash = "sha256-eECAaTUgqasuDhLSk8p/CWSQmV8yV30UoMy3GZCRbGE=";
+  cargoHash = "sha256-c6U1ZOaXZ7RnKD7q0WTkam9gL8SL/naSeHGbB5I82lk=";
 
   nativeBuildInputs = [
-    makeWrapper
     installShellFiles
+    makeWrapper
+    pkg-config
   ];
 
-  buildInputs = lib.optionals stdenv.isDarwin [
+  buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.isDarwin [
     libiconv
     Security
     zlib
   ];
 
+  RUSTONIG_SYSTEM_LIBONIG = true;
+
   postPatch = ''
     # Fill the version stub in the man page. We can't fill the date
     # stub reproducibly.

pkgs/tools/misc/cpulimit/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cpulimit";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz";
-    sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g";
+    sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA=";
   };
 
   buildFlags = with stdenv; [ (

pkgs/tools/misc/librespeed-cli/default.nix

@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "librespeed-cli";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "librespeed";
     repo = "speedtest-cli";
     rev = "v${version}";
-    sha256 = "sha256-cbLuAOAGWmYj6xR2AjpwvRXrP3SXfHhjUp5MVLqC0WE=";
+    sha256 = "sha256-rtZZgx5QNwYd6vXSts/ICSiXv7sMZA8ihHgxTjZ/6KQ=";
   };
 
   vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ=";

pkgs/tools/misc/swaglyrics/default.nix

@@ -19,7 +19,8 @@ python3.pkgs.buildPythonApplication rec {
     substituteInPlace setup.py \
       --replace 'requests>=2.24.0' 'requests~=2.23' \
       --replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \
-      --replace 'colorama==0.4.3' 'colorama~=0.4'
+      --replace 'colorama==0.4.3' 'colorama~=0.4' \
+      --replace 'unidecode==1.1.1' 'unidecode~=1.2'
   '';
 
   preBuild = "export HOME=$NIX_BUILD_TOP";