Merge pull request #229508 from figsoda/gifski (0b265223) · Commits · nix / nixpkgs

pkgs/tools/graphics/gifski/Cargo.lock

+139 −94

Original line number	Diff line number	Diff line
		@@ -19,6 +19,55 @@ dependencies = [
		"version_check",
		]

		[[package]]
		name = "anstream"
		version = "0.3.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450"
		dependencies = [
		"anstyle",
		"anstyle-parse",
		"anstyle-query",
		"anstyle-wincon",
		"colorchoice",
		"is-terminal",
		"utf8parse",
		]

		[[package]]
		name = "anstyle"
		version = "1.0.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"

		[[package]]
		name = "anstyle-parse"
		version = "0.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
		dependencies = [
		"utf8parse",
		]

		[[package]]
		name = "anstyle-query"
		version = "1.0.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
		dependencies = [
		"windows-sys",
		]

		[[package]]
		name = "anstyle-wincon"
		version = "1.0.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
		dependencies = [
		"anstyle",
		"windows-sys",
		]

		[[package]]
		name = "arrayvec"
		version = "0.7.2"
		@@ -33,9 +82,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

		[[package]]
		name = "bindgen"
		version = "0.59.2"
		version = "0.64.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
		checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
		dependencies = [
		"bitflags",
		"cexpr",
		@@ -48,6 +97,7 @@ dependencies = [
		"regex",
		"rustc-hash",
		"shlex",
		"syn",
		]

		[[package]]
		@@ -85,9 +135,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

		[[package]]
		name = "clang-sys"
		version = "1.6.0"
		version = "1.6.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a"
		checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
		dependencies = [
		"glob",
		"libc",
		@@ -96,26 +146,32 @@ dependencies = [

		[[package]]
		name = "clap"
		version = "4.1.8"
		version = "4.2.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
		checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819"
		dependencies = [
		"clap_builder",
		]

		[[package]]
		name = "clap_builder"
		version = "4.2.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
		dependencies = [
		"anstream",
		"anstyle",
		"bitflags",
		"clap_lex",
		"is-terminal",
		"once_cell",
		"strsim",
		"termcolor",
		]

		[[package]]
		name = "clap_lex"
		version = "0.3.2"
		version = "0.4.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
		dependencies = [
		"os_str_bytes",
		]
		checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"

		[[package]]
		name = "color_quant"
		@@ -123,6 +179,12 @@ version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"

		[[package]]
		name = "colorchoice"
		version = "1.0.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"

		[[package]]
		name = "crc32fast"
		version = "1.3.2"
		@@ -134,9 +196,9 @@ dependencies = [

		[[package]]
		name = "crossbeam-channel"
		version = "0.5.7"
		version = "0.5.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
		checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
		dependencies = [
		"cfg-if",
		"crossbeam-utils",
		@@ -177,9 +239,9 @@ dependencies = [

		[[package]]
		name = "dunce"
		version = "1.0.3"
		version = "1.0.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
		checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"

		[[package]]
		name = "either"
		@@ -189,13 +251,13 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"

		[[package]]
		name = "errno"
		version = "0.2.8"
		version = "0.3.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
		checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
		dependencies = [
		"errno-dragonfly",
		"libc",
		"winapi",
		"windows-sys",
		]

		[[package]]
		@@ -219,9 +281,9 @@ dependencies = [

		[[package]]
		name = "ffmpeg-next"
		version = "4.4.0"
		version = "6.0.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4676cda947a87a1e8a42e154059c567e75de64860252cce52c684acd8c074fa0"
		checksum = "8af03c47ad26832ab3aabc4cdbf210af3d3b878783edd5a7ba044ba33aab7a60"
		dependencies = [
		"bitflags",
		"ffmpeg-sys-next",
		@@ -230,8 +292,8 @@ dependencies = [

		[[package]]
		name = "ffmpeg-sys-next"
		version = "4.4.0"
		source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=78458039d5fac99354f9cb078869f3be3f3af5fb#78458039d5fac99354f9cb078869f3be3f3af5fb"
		version = "6.0.1"
		source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=94d5496d88900bdc0cad66733138134d0ea3cf31#94d5496d88900bdc0cad66733138134d0ea3cf31"
		dependencies = [
		"bindgen",
		"cc",
		@@ -243,9 +305,9 @@ dependencies = [

		[[package]]
		name = "flate2"
		version = "1.0.25"
		version = "1.0.26"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
		checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
		dependencies = [
		"crc32fast",
		"miniz_oxide",
		@@ -284,7 +346,7 @@ dependencies = [

		[[package]]
		name = "gifski"
		version = "1.10.3"
		version = "1.11.0"
		dependencies = [
		"clap",
		"crossbeam-channel",
		@@ -340,12 +402,11 @@ checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"

		[[package]]
		name = "imagequant"
		version = "4.1.1"
		version = "4.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f332f82fc531b53cffa3181c14f7beb5b6c33932d68bb0c2fa4fd583553fca64"
		checksum = "fc3c62f251799ae51bbd7a94fc00a83fcb796d8dd14876280e3063e8341138dc"
		dependencies = [
		"arrayvec",
		"noisy_float",
		"num_cpus",
		"once_cell",
		"rayon",
		@@ -361,9 +422,9 @@ checksum = "b2cf49df1085dcfb171460e4592597b84abe50d900fb83efb6e41b20fefd6c2c"

		[[package]]
		name = "io-lifetimes"
		version = "1.0.7"
		version = "1.0.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380"
		checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
		dependencies = [
		"hermit-abi 0.3.1",
		"libc",
		@@ -372,9 +433,9 @@ dependencies = [

		[[package]]
		name = "is-terminal"
		version = "0.4.4"
		version = "0.4.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
		checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
		dependencies = [
		"hermit-abi 0.3.1",
		"io-lifetimes",
		@@ -396,9 +457,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

		[[package]]
		name = "libc"
		version = "0.2.140"
		version = "0.2.142"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
		checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"

		[[package]]
		name = "libloading"
		@@ -412,9 +473,9 @@ dependencies = [

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

		[[package]]
		name = "lodepng"
		@@ -461,9 +522,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

		[[package]]
		name = "miniz_oxide"
		version = "0.6.2"
		version = "0.7.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
		checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
		dependencies = [
		"adler",
		]
		@@ -474,15 +535,6 @@ version = "1.0.9"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"

		[[package]]
		name = "noisy_float"
		version = "0.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "978fe6e6ebc0bf53de533cd456ca2d9de13de13856eda1518a285d7705a213af"
		dependencies = [
		"num-traits",
		]

		[[package]]
		name = "nom"
		version = "7.1.3"
		@@ -518,12 +570,6 @@ version = "1.17.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"

		[[package]]
		name = "os_str_bytes"
		version = "6.4.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"

		[[package]]
		name = "pbr"
		version = "1.1.1"
		@@ -549,9 +595,9 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"

		[[package]]
		name = "proc-macro2"
		version = "1.0.52"
		version = "1.0.56"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
		checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
		dependencies = [
		"unicode-ident",
		]
		@@ -595,18 +641,18 @@ dependencies = [

		[[package]]
		name = "regex"
		version = "1.7.1"
		version = "1.8.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
		checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
		dependencies = [
		"regex-syntax",
		]

		[[package]]
		name = "regex-syntax"
		version = "0.6.28"
		version = "0.7.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
		checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"

		[[package]]
		name = "resize"
		@@ -635,9 +681,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

		[[package]]
		name = "rustix"
		version = "0.36.9"
		version = "0.37.18"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
		checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
		dependencies = [
		"bitflags",
		"errno",
		@@ -666,12 +712,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

		[[package]]
		name = "termcolor"
		version = "1.2.0"
		name = "syn"
		version = "1.0.109"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
		checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
		dependencies = [
		"winapi-util",
		"proc-macro2",
		"quote",
		"unicode-ident",
		]

		[[package]]
		@@ -690,6 +738,12 @@ version = "1.0.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"

		[[package]]
		name = "utf8parse"
		version = "0.2.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

		[[package]]
		name = "vcpkg"
		version = "0.2.15"
		@@ -733,15 +787,6 @@ version = "0.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

		[[package]]
		name = "winapi-util"
		version = "0.1.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
		dependencies = [
		"winapi",
		]

		[[package]]
		name = "winapi-x86_64-pc-windows-gnu"
		version = "0.4.0"
		@@ -750,18 +795,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

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

		[[package]]
		name = "windows-targets"
		version = "0.42.2"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
		checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
		dependencies = [
		"windows_aarch64_gnullvm",
		"windows_aarch64_msvc",
		@@ -774,42 +819,42 @@ dependencies = [

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.42.2"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
		checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"

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

		[[package]]
		name = "windows_i686_gnu"
		version = "0.42.2"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
		checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.42.2"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
		checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.42.2"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
		checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.42.2"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
		checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.42.2"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
		checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

pkgs/tools/graphics/gifski/default.nix

+17 −6

Original line number	Diff line number	Diff line
		{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config }:
		{ lib
		, rustPlatform
		, fetchFromGitHub
		, stdenv
		, pkg-config
		}:

		rustPlatform.buildRustPackage rec {
		pname = "gifski";
		version = "1.10.3";
		version = "1.11.0";

		src = fetchFromGitHub {
		owner = "ImageOptim";
		repo = "gifski";
		rev = version;
		sha256 = "sha256-P4t16rCKsL6FwDVXDC2XkgUGcAlWCPt1iXoBmhDZRzk=";
		sha256 = "sha256-sPsq/hntNqOdPJcoob1jrDUrLLiBEnfRoDANyFUjOuM=";
		};

		cargoLock = {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"ffmpeg-sys-next-4.4.0" = "sha256-TpO06VjSLCUe3NH7sr5YPfEF7C0EBBxQIQ2/SbVncnI=";
		"ffmpeg-sys-next-6.0.1" = "sha256-/KxW57lt9/qKqNUUZqJucsP0cKvZ1m/FdGCsZxBlxYc=";
		};
		};

		@@ -23,10 +28,16 @@ rustPlatform.buildRustPackage rec {
		# error: the crate `gifski` is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
		doCheck = !stdenv.isDarwin;

		# error: linker `/usr/bin/x86_64-linux-gnu-gcc` not found
		postPatch = ''
		rm .cargo/config.toml;
		'';

		meta = with lib; {
		description = "GIF encoder based on libimagequant (pngquant)";
		homepage = "https://gif.ski/";
		license = licenses.agpl3;
		maintainers = [ maintainers.marsam ];
		changelog = "https://github.com/ImageOptim/gifski/releases/tag/${src.rev}";
		license = licenses.agpl3Plus;
		maintainers = with maintainers; [ figsoda marsam ];
		};
		}