Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9b440931ca94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f04462149e4
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 1, 2020

  1. openethereum: linux -> unix, remove systemd from buildInputs

    @yihuang
    yihuang committed Oct 1, 2020
    Copy the full SHA
    ce07fef View commit details

Commits on Nov 11, 2020

  1. openethereum: v3.0.1 -> v3.1.0

    Sebastian Bolanos committed Nov 11, 2020
    Copy the full SHA
    63fc8c7 View commit details

  2. Merge remote-tracking branch 'yihuang/openethereum-unix' into openeth… 

    …ereum-updates
    Sebastian Bolanos committed Nov 11, 2020
    Copy the full SHA
    33de047 View commit details

  3. Merge pull request #103475 from sebohe/openethereum-updates 

    openethereum v3.0.1 -> v3.1.0 + macOS build capabilities
    @mmahut
    mmahut authored Nov 11, 2020
    Copy the full SHA
    7f04462 View commit details
Showing with 9 additions and 27 deletions.
  1. +9 −7 pkgs/applications/blockchains/openethereum/default.nix
  2. +0 −20 pkgs/applications/blockchains/openethereum/lock.patch
16 changes: 9 additions & 7 deletions pkgs/applications/blockchains/openethereum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,23 +5,23 @@
, llvmPackages
, openssl
, pkg-config
, stdenv
, systemd
, darwin
}:

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 = [
@@ -31,7 +31,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 +45,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;
};
}
20 changes: 0 additions & 20 deletions pkgs/applications/blockchains/openethereum/lock.patch
View file

This file was deleted.