Merge master into staging-next

pkgs/by-name/ch/chhoto-url/package.nix

@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.5.0";
+  version = "6.5.1";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-/aOy2kurZRHbNlanQVobLpu/R9k/2iuNDqzD0TXLx8M=";
+    hash = "sha256-gDD/1NKqPH84nr+EjTFfMGZkZfskQujn+uRGrnGs/fg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-IxWA/mID3P6e16IoBb8qiFxOXQRdeAhlCcSEOIPz7UU=";
+  cargoHash = "sha256-jSdUKkZBgpMN05FmZUXHqBszuDAByf6bzIaaRNfymGY=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

pkgs/by-name/hg/hgrep/package.nix

@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "0.3.8";
+  version = "0.3.9";
 in
 rustPlatform.buildRustPackage {
   pname = "hgrep";
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "rhysd";
     repo = "hgrep";
     tag = "v${version}";
-    hash = "sha256-GcV6tZLhAtBE0/husOqZ3Gib9nXXg7kcxrNp9IK0eTo=";
+    hash = "sha256-xBLpEs0PvYb7sIca9yb3vhi2Bsr1BFqB0jlD+bZT2EI=";
   };
 
-  cargoHash = "sha256-NxfWY9OoMNASlWE48njuAdTI11JAV+rzjD0OU2cHLsc=";
+  cargoHash = "sha256-TP+PClv7FX3kRBwJ0RAKbKoTKpi7hTZgw/Z/ktFKbwQ=";
 
   nativeInstallCheckInputs = [
     versionCheckHook