Merge pull request #334414 from andresilva/polkadot-fix-rust-1.80 (53ef6dac) · Commits · nix / nixpkgs

pkgs/applications/blockchains/polkadot/Cargo.lock

+26 −8

Original line number	Diff line number	Diff line
		@@ -4660,9 +4660,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"
		@@ -9244,6 +9247,12 @@ dependencies = [
		"num-traits",
		]

		[[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.4.2"
		@@ -14996,6 +15005,12 @@ dependencies = [
		"rand",
		]

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

		[[package]]
		name = "pprof"
		version = "0.12.1"
		@@ -21682,14 +21697,16 @@ dependencies = [

		[[package]]
		name = "time"
		version = "0.3.27"
		version = "0.3.36"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
		checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
		dependencies = [
		"deranged",
		"itoa",
		"libc",
		"num-conv",
		"num_threads",
		"powerfmt",
		"serde",
		"time-core",
		"time-macros",
		@@ -21697,16 +21714,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.13"
		version = "0.2.18"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9"
		checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
		dependencies = [
		"num-conv",
		"time-core",
		]

pkgs/applications/blockchains/polkadot/default.nix

+10 −0

Original line number	Diff line number	Diff line
		{ fetchFromGitHub
		, fetchpatch
		, lib
		, openssl
		, pkg-config
		@@ -51,6 +52,15 @@ rustPlatform.buildRustPackage rec {
		};
		};

		cargoPatches = [
		# NOTE: bump `time` dependency to be able to build with rust 1.80
		# should be removed on the next release
		(fetchpatch {
		url = "https://github.com/paritytech/polkadot-sdk/pull/5149.patch";
		hash = "sha256-FNG9XLeMRJOT6k7mcs6GemtQ3oUrH/hOYG0JNQP0akU=";
		})
		];

		buildType = "production";

		cargoBuildFlags = [ "-p" "polkadot" ];