From 5e77fe111dccbaaf86290bedacba12c52f5f4fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 23 Jan 2023 12:42:20 +0000 Subject: [PATCH 1/2] polkadot: 0.9.36 -> 0.9.37 --- pkgs/applications/blockchains/polkadot/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 1f5636dd41c3..024e3142530a 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,17 @@ , stdenv , writeShellScriptBin , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.36"; + version = "0.9.37"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-HzQFlnn+SPasI0g0DYDCRoFCMVyxlUmEQAobvzRnAW4="; + hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,9 +33,9 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-P31GW/1HiaZLF6e8Fq1YnH1ZLhiOhURm8st9a4KRlJU="; + cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97c76b591fe6..34d97af89a34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34301,7 +34301,7 @@ with pkgs; openethereum = callPackage ../applications/blockchains/openethereum { }; polkadot = callPackage ../applications/blockchains/polkadot { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; particl-core = callPackage ../applications/blockchains/particl-core { }; From 2fd344883da568dffe1d4c9e21f7bb25b239508a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 24 Jan 2023 10:10:14 +0000 Subject: [PATCH 2/2] polkadot: use system rocksdb --- pkgs/applications/blockchains/polkadot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 024e3142530a..883514b7da5b 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -3,6 +3,7 @@ , lib , llvmPackages , protobuf +, rocksdb , rustPlatform , stdenv , writeShellScriptBin @@ -45,6 +46,7 @@ rustPlatform.buildRustPackage rec { ''; PROTOC = "${protobuf}/bin/protoc"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; # NOTE: We don't build the WASM runtimes since this would require a more # complicated rust environment setup and this is only needed for developer