Merge pull request #269598 from mfrw/mfrw/difftastic-0.53.0 (c27ef7f6) · Commits · nix / nixpkgs

pkgs/tools/text/difftastic/Cargo.lock

+235 −48

Original line number	Diff line number	Diff line
		@@ -15,9 +15,9 @@ dependencies = [

		[[package]]
		name = "aho-corasick"
		version = "0.7.20"
		version = "1.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
		checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
		dependencies = [
		"memchr",
		]
		@@ -28,7 +28,7 @@ version = "2.0.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d5c2ca00549910ec251e3bd15f87aeeb206c9456b9a77b43ff6c97c54042a472"
		dependencies = [
		"bstr",
		"bstr 0.2.17",
		"doc-comment",
		"predicates",
		"predicates-core",
		@@ -42,7 +42,7 @@ version = "0.2.14"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
		dependencies = [
		"hermit-abi",
		"hermit-abi 0.1.19",
		"libc",
		"winapi",
		]
		@@ -59,6 +59,12 @@ version = "1.3.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

		[[package]]
		name = "bitflags"
		version = "2.4.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"

		[[package]]
		name = "bstr"
		version = "0.2.17"
		@@ -67,7 +73,17 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
		dependencies = [
		"lazy_static",
		"memchr",
		"regex-automata",
		"regex-automata 0.1.10",
		]

		[[package]]
		name = "bstr"
		version = "1.6.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
		dependencies = [
		"memchr",
		"serde",
		]

		[[package]]
		@@ -104,7 +120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
		dependencies = [
		"atty",
		"bitflags",
		"bitflags 1.3.2",
		"clap_lex",
		"indexmap",
		"lazy_static",
		@@ -190,11 +206,11 @@ dependencies = [

		[[package]]
		name = "crossterm"
		version = "0.26.1"
		version = "0.27.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
		checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
		dependencies = [
		"bitflags",
		"bitflags 2.4.1",
		"crossterm_winapi",
		"libc",
		"mio",
		@@ -206,9 +222,9 @@ dependencies = [

		[[package]]
		name = "crossterm_winapi"
		version = "0.9.0"
		version = "0.9.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
		checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
		dependencies = [
		"winapi",
		]
		@@ -237,7 +253,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"

		[[package]]
		name = "difftastic"
		version = "0.52.0"
		version = "0.53.0"
		dependencies = [
		"assert_cmd",
		"bumpalo",
		@@ -248,12 +264,15 @@ dependencies = [
		"glob",
		"hashbrown 0.12.3",
		"humansize",
		"ignore",
		"is-terminal",
		"itertools 0.11.0",
		"lazy_static",
		"libc",
		"libmimalloc-sys",
		"line-numbers",
		"log",
		"memchr",
		"mimalloc",
		"owo-colors",
		"predicates",
		@@ -272,7 +291,6 @@ dependencies = [
		"typed-arena",
		"unicode-width",
		"version_check",
		"walkdir",
		"wu-diff",
		]

		@@ -290,17 +308,27 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"

		[[package]]
		name = "env_logger"
		version = "0.7.1"
		version = "0.10.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
		checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
		dependencies = [
		"atty",
		"humantime",
		"is-terminal",
		"log",
		"regex",
		"termcolor",
		]

		[[package]]
		name = "errno"
		version = "0.3.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
		dependencies = [
		"libc",
		"windows-sys 0.48.0",
		]

		[[package]]
		name = "fixedbitset"
		version = "0.4.1"
		@@ -339,6 +367,19 @@ version = "0.3.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"

		[[package]]
		name = "globset"
		version = "0.4.13"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
		dependencies = [
		"aho-corasick",
		"bstr 1.6.0",
		"fnv",
		"log",
		"regex",
		]

		[[package]]
		name = "hashbrown"
		version = "0.11.2"
		@@ -369,6 +410,12 @@ dependencies = [
		"libc",
		]

		[[package]]
		name = "hermit-abi"
		version = "0.3.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"

		[[package]]
		name = "humansize"
		version = "2.1.3"
		@@ -380,11 +427,26 @@ dependencies = [

		[[package]]
		name = "humantime"
		version = "1.3.0"
		version = "2.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

		[[package]]
		name = "ignore"
		version = "0.4.18"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
		checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
		dependencies = [
		"quick-error",
		"crossbeam-utils",
		"globset",
		"lazy_static",
		"log",
		"memchr",
		"regex",
		"same-file",
		"thread_local",
		"walkdir",
		"winapi-util",
		]

		[[package]]
		@@ -397,6 +459,29 @@ dependencies = [
		"hashbrown 0.11.2",
		]

		[[package]]
		name = "io-lifetimes"
		version = "1.0.11"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
		dependencies = [
		"hermit-abi 0.3.3",
		"libc",
		"windows-sys 0.48.0",
		]

		[[package]]
		name = "is-terminal"
		version = "0.4.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
		dependencies = [
		"hermit-abi 0.3.3",
		"io-lifetimes",
		"rustix",
		"windows-sys 0.48.0",
		]

		[[package]]
		name = "itertools"
		version = "0.10.3"
		@@ -429,9 +514,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

		[[package]]
		name = "libc"
		version = "0.2.139"
		version = "0.2.149"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
		checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"

		[[package]]
		name = "libm"
		@@ -450,9 +535,15 @@ dependencies = [

		[[package]]
		name = "line-numbers"
		version = "0.2.2"
		version = "0.3.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "793a75315eb63b8699158825bdea85d63eeb850e7543cb834abef3c7b5b53780"
		checksum = "7b25f5068853805faa3c19f44d0c401446e4eb3f47cc808fa331eec30f0ba35c"

		[[package]]
		name = "linux-raw-sys"
		version = "0.3.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"

		[[package]]
		name = "lock_api"
		@@ -512,7 +603,7 @@ dependencies = [
		"libc",
		"log",
		"wasi",
		"windows-sys",
		"windows-sys 0.42.0",
		]

		[[package]]
		@@ -546,7 +637,7 @@ version = "1.13.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
		dependencies = [
		"hermit-abi",
		"hermit-abi 0.1.19",
		"libc",
		]

		@@ -597,7 +688,7 @@ dependencies = [
		"libc",
		"redox_syscall",
		"smallvec",
		"windows-sys",
		"windows-sys 0.42.0",
		]

		[[package]]
		@@ -654,9 +745,9 @@ dependencies = [

		[[package]]
		name = "pretty_env_logger"
		version = "0.4.0"
		version = "0.5.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
		checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
		dependencies = [
		"env_logger",
		"log",
		@@ -671,12 +762,6 @@ dependencies = [
		"unicode-ident",
		]

		[[package]]
		name = "quick-error"
		version = "1.2.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

		[[package]]
		name = "quote"
		version = "1.0.32"
		@@ -720,17 +805,18 @@ version = "0.2.16"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
		dependencies = [
		"bitflags",
		"bitflags 1.3.2",
		]

		[[package]]
		name = "regex"
		version = "1.7.3"
		version = "1.9.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
		checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
		dependencies = [
		"aho-corasick",
		"memchr",
		"regex-automata 0.3.7",
		"regex-syntax",
		]

		@@ -740,11 +826,22 @@ version = "0.1.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"

		[[package]]
		name = "regex-automata"
		version = "0.3.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
		dependencies = [
		"aho-corasick",
		"memchr",
		"regex-syntax",
		]

		[[package]]
		name = "regex-syntax"
		version = "0.6.29"
		version = "0.7.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
		checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"

		[[package]]
		name = "rustc-hash"
		@@ -752,6 +849,20 @@ version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

		[[package]]
		name = "rustix"
		version = "0.37.27"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
		dependencies = [
		"bitflags 1.3.2",
		"errno",
		"io-lifetimes",
		"libc",
		"linux-raw-sys",
		"windows-sys 0.48.0",
		]

		[[package]]
		name = "rustversion"
		version = "1.0.12"
		@@ -812,9 +923,9 @@ dependencies = [

		[[package]]
		name = "signal-hook"
		version = "0.3.14"
		version = "0.3.17"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
		checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
		dependencies = [
		"libc",
		"signal-hook-registry",
		@@ -930,6 +1041,16 @@ dependencies = [
		"terminal_size",
		]

		[[package]]
		name = "thread_local"
		version = "1.1.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
		dependencies = [
		"cfg-if",
		"once_cell",
		]

		[[package]]
		name = "tree-sitter"
		version = "0.20.9"
		@@ -1045,13 +1166,37 @@ version = "0.42.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
		dependencies = [
		"windows_aarch64_gnullvm",
		"windows_aarch64_msvc",
		"windows_i686_gnu",
		"windows_i686_msvc",
		"windows_x86_64_gnu",
		"windows_x86_64_gnullvm",
		"windows_x86_64_msvc",
		"windows_aarch64_gnullvm 0.42.1",
		"windows_aarch64_msvc 0.42.1",
		"windows_i686_gnu 0.42.1",
		"windows_i686_msvc 0.42.1",
		"windows_x86_64_gnu 0.42.1",
		"windows_x86_64_gnullvm 0.42.1",
		"windows_x86_64_msvc 0.42.1",
		]

		[[package]]
		name = "windows-sys"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
		dependencies = [
		"windows-targets",
		]

		[[package]]
		name = "windows-targets"
		version = "0.48.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
		dependencies = [
		"windows_aarch64_gnullvm 0.48.5",
		"windows_aarch64_msvc 0.48.5",
		"windows_i686_gnu 0.48.5",
		"windows_i686_msvc 0.48.5",
		"windows_x86_64_gnu 0.48.5",
		"windows_x86_64_gnullvm 0.48.5",
		"windows_x86_64_msvc 0.48.5",
		]

		[[package]]
		@@ -1060,42 +1205,84 @@ version = "0.42.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.48.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.42.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.48.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.42.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.48.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.42.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.48.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.42.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.48.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.42.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.48.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.42.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.48.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

		[[package]]
		name = "wu-diff"
		version = "0.1.2"

pkgs/tools/text/difftastic/default.nix

+7 −2

Original line number	Diff line number	Diff line
		@@ -17,13 +17,13 @@ in

		rustPlatform.buildRustPackage rec {
		pname = "difftastic";
		version = "0.52.0";
		version = "0.53.0";

		src = fetchFromGitHub {
		owner = "wilfred";
		repo = pname;
		rev = version;
		hash = "sha256-ve5oUvclHGgw56UEIuEQ0tSdzad94MfL6qzc2hoB0dw=";
		hash = "sha256-fLn+Ibe6i6pI6yDCWkDAUMl2wOVSFXBCqidT6iNCSGM=";
		};

		cargoLock = {
		@@ -33,6 +33,11 @@ rustPlatform.buildRustPackage rec {
		};
		};

		# skip flaky tests
		checkFlags = [
		"--skip=options::tests::test_detect_display_width"
		];

		# Work around https://github.com/NixOS/nixpkgs/issues/166205.
		env = lib.optionalAttrs stdenv.cc.isClang {
		NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";

Admin message