summary refs log tree commit diff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2023-08-16 09:31:12 -0400
committerfigsoda <figsoda@pm.me>2023-08-16 09:31:12 -0400
commit14767f46f348917d39184e15c5a742df5a5029cf (patch)
treef23e26029bb0464bc5ae744734a934f4f7a2cf2b
parentfea0315e49eda00dfed040ee4a4ab51994c791a7 (diff)
downloadnixpkgs-14767f46f348917d39184e15c5a742df5a5029cf.tar
nixpkgs-14767f46f348917d39184e15c5a742df5a5029cf.tar.gz
nixpkgs-14767f46f348917d39184e15c5a742df5a5029cf.tar.bz2
nixpkgs-14767f46f348917d39184e15c5a742df5a5029cf.tar.lz
nixpkgs-14767f46f348917d39184e15c5a742df5a5029cf.tar.xz
nixpkgs-14767f46f348917d39184e15c5a742df5a5029cf.tar.zst
nixpkgs-14767f46f348917d39184e15c5a742df5a5029cf.zip
difftastic: 0.49.0 -> 0.50.0
Diff: https://github.com/wilfred/difftastic/compare/0.49.0...0.50.0

Changelog: https://github.com/Wilfred/difftastic/blob/0.50.0/CHANGELOG.md
-rw-r--r--pkgs/tools/text/difftastic/Cargo.lock30
-rw-r--r--pkgs/tools/text/difftastic/default.nix4
2 files changed, 25 insertions, 9 deletions
diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/tools/text/difftastic/Cargo.lock
index 25e3c8e41fe..1d0974afe89 100644
--- a/pkgs/tools/text/difftastic/Cargo.lock
+++ b/pkgs/tools/text/difftastic/Cargo.lock
@@ -142,9 +142,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.4"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -234,7 +234,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "difftastic"
-version = "0.49.0"
+version = "0.50.0"
 dependencies = [
  "assert_cmd",
  "bumpalo",
@@ -244,6 +244,7 @@ dependencies = [
  "crossterm",
  "glob",
  "hashbrown 0.12.3",
+ "humansize",
  "itertools",
  "lazy_static",
  "libc",
@@ -363,6 +364,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "humansize"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
+dependencies = [
+ "libm",
+]
+
+[[package]]
 name = "humantime"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -403,6 +413,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
+name = "libm"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+
+[[package]]
 name = "libmimalloc-sys"
 version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -651,9 +667,9 @@ checksum = "59ffec9df464013295b499298811e6a3de31bf8128092135826517db12dee601"
 
 [[package]]
 name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
 dependencies = [
  "either",
  "rayon-core",
@@ -661,9 +677,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix
index 3842fb6b147..520afe5a302 100644
--- a/pkgs/tools/text/difftastic/default.nix
+++ b/pkgs/tools/text/difftastic/default.nix
@@ -16,13 +16,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "difftastic";
-  version = "0.49.0";
+  version = "0.50.0";
 
   src = fetchFromGitHub {
     owner = "wilfred";
     repo = pname;
     rev = version;
-    hash = "sha256-jFBvMRkuAaQAi/28BBf/9cm6FcNMOYS5M69YoSXsX4Q=";
+    hash = "sha256-CC06Bryn5VNEsW4Wwbo+ubifizCWgpWUE1FsAozZcdg=";
   };
 
   cargoLock = {