From ce07fef9f4cadd7fcc3adfc4b25ccdad187d1336 Mon Sep 17 00:00:00 2001 From: yihuang Date: Thu, 1 Oct 2020 07:16:27 +0800 Subject: [PATCH 1/2] openethereum: linux -> unix, remove systemd from buildInputs --- pkgs/applications/blockchains/openethereum/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 7d5acc62050..8ff65ec92a9 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -5,7 +5,9 @@ , llvmPackages , openssl , pkg-config +, stdenv , systemd +, darwin }: rustPlatform.buildRustPackage rec { @@ -31,7 +33,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl systemd ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isLinux [ systemd ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; cargoBuildFlags = [ "--features final" ]; @@ -43,6 +47,6 @@ rustPlatform.buildRustPackage rec { homepage = "http://parity.io/ethereum"; license = licenses.gpl3; maintainers = with maintainers; [ akru xrelkd ]; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 63fc8c77ca4ae5c36b02572ada9409d74f571be9 Mon Sep 17 00:00:00 2001 From: Sebastian Bolanos Date: Wed, 11 Nov 2020 11:18:57 -0600 Subject: [PATCH 2/2] openethereum: v3.0.1 -> v3.1.0 --- .../blockchains/openethereum/default.nix | 8 +++----- .../blockchains/openethereum/lock.patch | 20 ------------------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 pkgs/applications/blockchains/openethereum/lock.patch diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 7d5acc62050..d5c7884c5cc 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -10,18 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "08dkcrga1x18csh6pw6f54x5xwijppyjhg46cf4p452xc1l3a6ir"; + sha256 = "cs84Zz0nhagGDu5sDFTaFZF3SPEgJU8F4vGX7KLihOM="; }; - cargoSha256 = "1xliragihwjfc5qmfm0ng519bw8a28m1w1yqcl9mpk8zywiybaah"; - - cargoPatches = [ ./lock.patch ]; + cargoSha256 = "6suNkHw1BbISb0MkYkUaD+mpUal+kn3y1SFVqzJFqJc="; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/openethereum/lock.patch b/pkgs/applications/blockchains/openethereum/lock.patch deleted file mode 100644 index 66709480bb7..00000000000 --- a/pkgs/applications/blockchains/openethereum/lock.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /nix/store/hv764a65zmfzw5scjhz5839agv10da6x-source/Cargo.lock 1969-12-31 16:00:01.000000000 -0800 -+++ ./Cargo.lock 2020-07-31 21:30:31.146750066 -0700 -@@ -3113,7 +3113,7 @@ - - [[package]] - name = "openethereum" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "ansi_term", - "atty", -@@ -3562,7 +3562,7 @@ - - [[package]] - name = "parity-version" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "parity-bytes", - "rlp",