Merge pull request #334838 from Mrmaxmeier/deepfilternet-rust-1-80 (d7f68639) · Commits · nix / nixpkgs

pkgs/by-name/de/deepfilternet/Cargo.lock

+26 −8

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

		[[package]]
		name = "deranged"
		version = "0.3.8"
		version = "0.3.11"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
		checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
		dependencies = [
		"powerfmt",
		]

		[[package]]
		name = "derivative"
		@@ -2805,6 +2808,12 @@ dependencies = [
		"serde",
		]

		[[package]]
		name = "num-conv"
		version = "0.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"

		[[package]]
		name = "num-derive"
		version = "0.3.3"
		@@ -3266,6 +3275,12 @@ dependencies = [
		"windows-sys 0.48.0",
		]

		[[package]]
		name = "powerfmt"
		version = "0.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"

		[[package]]
		name = "ppv-lite86"
		version = "0.2.17"
		@@ -4134,12 +4149,14 @@ dependencies = [

		[[package]]
		name = "time"
		version = "0.3.28"
		version = "0.3.36"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
		checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
		dependencies = [
		"deranged",
		"itoa",
		"num-conv",
		"powerfmt",
		"serde",
		"time-core",
		"time-macros",
		@@ -4147,16 +4164,17 @@ dependencies = [

		[[package]]
		name = "time-core"
		version = "0.1.1"
		version = "0.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
		checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

		[[package]]
		name = "time-macros"
		version = "0.2.14"
		version = "0.2.18"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
		checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
		dependencies = [
		"num-conv",
		"time-core",
		]

pkgs/by-name/de/deepfilternet/cargo-lock-bump-time.patch

0 → 100644

+84 −0

Original line number	Diff line number	Diff line
		diff --git a/Cargo.lock b/Cargo.lock
		index 48eb89c..ae318a6 100644
		--- a/Cargo.lock
		+++ b/Cargo.lock
		@@ -1073,9 +1073,12 @@ dependencies = [

		[[package]]
		name = "deranged"
		-version = "0.3.8"
		+version = "0.3.11"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
		+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
		+dependencies = [
		+ "powerfmt",
		+]

		[[package]]
		name = "derivative"
		@@ -2805,6 +2808,12 @@ dependencies = [
		"serde",
		]

		+[[package]]
		+name = "num-conv"
		+version = "0.1.0"
		+source = "registry+https://github.com/rust-lang/crates.io-index"
		+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
		+
		[[package]]
		name = "num-derive"
		version = "0.3.3"
		@@ -3266,6 +3275,12 @@ dependencies = [
		"windows-sys 0.48.0",
		]

		+[[package]]
		+name = "powerfmt"
		+version = "0.2.0"
		+source = "registry+https://github.com/rust-lang/crates.io-index"
		+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
		+
		[[package]]
		name = "ppv-lite86"
		version = "0.2.17"
		@@ -4134,12 +4149,14 @@ dependencies = [

		[[package]]
		name = "time"
		-version = "0.3.28"
		+version = "0.3.36"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
		+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
		dependencies = [
		"deranged",
		"itoa",
		+ "num-conv",
		+ "powerfmt",
		"serde",
		"time-core",
		"time-macros",
		@@ -4147,16 +4164,17 @@ dependencies = [

		[[package]]
		name = "time-core"
		-version = "0.1.1"
		+version = "0.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
		+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

		[[package]]
		name = "time-macros"
		-version = "0.2.14"
		+version = "0.2.18"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
		+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
		dependencies = [
		+ "num-conv",
		"time-core",
		]

pkgs/by-name/de/deepfilternet/package.nix

+5 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,11 @@ rustPlatform.buildRustPackage rec {
		hash = "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY=";
		};

		cargoPatches = [
		# Fix compilation with Rust 1.80 (https://github.com/NixOS/nixpkgs/issues/332957)
		./cargo-lock-bump-time.patch
		];

		cargoLock = {
		lockFile = ./Cargo.lock;
		outputHashes = {

Admin message