diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/applications/blockchains/openethereum/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/applications/blockchains/openethereum/default.nix')
-rw-r--r-- | pkgs/applications/blockchains/openethereum/default.nix | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 7d5acc62050..be2373941b3 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -5,44 +5,46 @@ , llvmPackages , openssl , pkg-config +, stdenv , systemd +, darwin }: rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.0.1"; + version = "3.2.6"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "08dkcrga1x18csh6pw6f54x5xwijppyjhg46cf4p452xc1l3a6ir"; + sha256 = "0lxps3cyg8dzb9qr1kg91s9jc3mnm6hxybwcbhva38pcq4yc40xc"; }; - cargoSha256 = "1xliragihwjfc5qmfm0ng519bw8a28m1w1yqcl9mpk8zywiybaah"; + cargoSha256 = "08yrpls3szmw6vy2c4d6b1k907ga0809ylvyx0zb6f8mp8z7ahl2"; - cargoPatches = [ ./lock.patch ]; + nativeBuildInputs = [ cmake pkg-config ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - nativeBuildInputs = [ - cmake - llvmPackages.clang - llvmPackages.libclang - pkg-config - ]; - - buildInputs = [ openssl systemd ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isLinux [ systemd ] + ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; cargoBuildFlags = [ "--features final" ]; - # test result: FAILED. 88 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out - doCheck = false; + # Fix tests by preventing them from writing to /homeless-shelter. + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Exclude some tests that don't work in the sandbox + # - Nat test requires network access + checkFlags = "--skip configuration::tests::should_resolve_external_nat_hosts"; meta = with lib; { description = "Fast, light, robust Ethereum implementation"; homepage = "http://parity.io/ethereum"; license = licenses.gpl3; maintainers = with maintainers; [ akru xrelkd ]; - platforms = platforms.linux; + platforms = lib.platforms.unix; }; } |