Merge pull request #335280 from mjm/push-pyosnvuxppup (dd1eee10) · Commits · nix / nixpkgs

pkgs/tools/filesystems/garage/default.nix

+8 −5

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		, nixosTests
		}:
		let
		generic = { version, sha256, cargoHash, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
		generic = { version, sha256, cargoHash, cargoPatches ? [], eol ? false, broken ? false }: rustPlatform.buildRustPackage {
		pname = "garage";
		inherit version;

		@@ -29,7 +29,7 @@ let
		rm .cargo/config.toml \|\| true
		'';

		inherit cargoHash;
		inherit cargoHash cargoPatches;

		nativeBuildInputs = [ protobuf pkg-config ];

		@@ -97,7 +97,8 @@ rec {
		garage_0_8_7 = generic {
		version = "0.8.7";
		sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc=";
		cargoHash = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo=";
		cargoHash = "sha256-1cGlJP/RRgxt3GGMN1c+7Y5lLHJyvHEnpLsR35R5FfI=";
		cargoPatches = [ ./update-time-0.8.patch ];
		broken = stdenv.isDarwin;
		};

		@@ -106,14 +107,16 @@ rec {
		garage_0_9_4 = generic {
		version = "0.9.4";
		sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk=";
		cargoHash = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA=";
		cargoHash = "sha256-1Hrip4R5dr31czOcFMGW4ZvVfVwvdd7LkwukwNpS3o4=";
		cargoPatches = [ ./update-time.patch ];
		broken = stdenv.isDarwin;
		};

		garage_1_0_0 = generic {
		version = "1.0.0";
		sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8=";
		cargoHash = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0=";
		cargoHash = "sha256-zol9P01bwlvl1Wap4EekgVpC45izNCt2uKs7x+EEA/E=";
		cargoPatches = [ ./update-time.patch ];
		broken = stdenv.isDarwin;
		};

pkgs/tools/filesystems/garage/update-time-0.8.patch

0 → 100644

+111 −0

Original line number	Diff line number	Diff line
		diff --git a/Cargo.lock b/Cargo.lock
		index 23604c99e5..58355d867e 100644
		--- a/Cargo.lock
		+++ b/Cargo.lock
		@@ -223,7 +223,7 @@
		"http",
		"hyper",
		"ring",
		- "time 0.3.28",
		+ "time 0.3.36",
		"tokio",
		"tower",
		"tracing",
		@@ -393,7 +393,7 @@
		"percent-encoding",
		"regex",
		"sha2",
		- "time 0.3.28",
		+ "time 0.3.36",
		"tracing",
		]

		@@ -533,7 +533,7 @@
		"itoa",
		"num-integer",
		"ryu",
		- "time 0.3.28",
		+ "time 0.3.36",
		]

		[[package]]
		@@ -932,9 +932,12 @@

		[[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"
		@@ -2410,6 +2413,12 @@
		]

		[[package]]
		+name = "num-conv"
		+version = "0.1.0"
		+source = "registry+https://github.com/rust-lang/crates.io-index"
		+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
		+
		+[[package]]
		name = "num-integer"
		version = "0.1.45"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		@@ -2747,6 +2756,12 @@
		]

		[[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"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		@@ -3666,11 +3681,13 @@

		[[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",
		+ "num-conv",
		+ "powerfmt",
		"serde",
		"time-core",
		"time-macros",
		@@ -3678,16 +3695,17 @@

		[[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/tools/filesystems/garage/update-time.patch

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		diff --git a/Cargo.lock b/Cargo.lock
		index 9cb4b57ee5..b23da31151 100644
		--- a/Cargo.lock
		+++ b/Cargo.lock
		@@ -4082,9 +4082,9 @@

		[[package]]
		name = "time"
		-version = "0.3.34"
		+version = "0.3.36"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
		+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
		dependencies = [
		"deranged",
		"num-conv",
		@@ -4102,9 +4102,9 @@

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

Admin message