diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-02-27 07:33:39 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-27 07:33:39 -0500 |
commit | 7b56996d61afbbcbee9341cc89573c687e6e5077 (patch) | |
tree | 394655ce20098f07f4fa148443cd1e7e404b39af | |
parent | afa6c6a7c1c974c39460cc7f4cc3d77f4f9ef709 (diff) | |
parent | 991276361b775991e62f754738c8a28e9ccadf4c (diff) | |
download | nixlib-7b56996d61afbbcbee9341cc89573c687e6e5077.tar nixlib-7b56996d61afbbcbee9341cc89573c687e6e5077.tar.gz nixlib-7b56996d61afbbcbee9341cc89573c687e6e5077.tar.bz2 nixlib-7b56996d61afbbcbee9341cc89573c687e6e5077.tar.lz nixlib-7b56996d61afbbcbee9341cc89573c687e6e5077.tar.xz nixlib-7b56996d61afbbcbee9341cc89573c687e6e5077.tar.zst nixlib-7b56996d61afbbcbee9341cc89573c687e6e5077.zip |
Merge pull request #80160 from bhipple/u/parity
parity: 2.5.11 -> 2.7.2
-rw-r--r-- | pkgs/applications/blockchains/parity/beta.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/blockchains/parity/default.nix | 52 | ||||
-rw-r--r-- | pkgs/applications/blockchains/parity/parity.nix | 47 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 47 insertions, 60 deletions
diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix deleted file mode 100644 index ffa509d2320e..000000000000 --- a/pkgs/applications/blockchains/parity/beta.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - version = "2.6.6"; - sha256 = "1gx5qg9c588d5m564bnbly86663yrzb2hmlgv9zplwba7p0lpphl"; - cargoSha256 = "1xqmnirx2r91q5gy1skxl0f79xvaqzimq3l0cj4xvfms7mpdfbg1"; -in - import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix index 1b5870b429b1..e390b78b86df 100644 --- a/pkgs/applications/blockchains/parity/default.nix +++ b/pkgs/applications/blockchains/parity/default.nix @@ -1,6 +1,46 @@ -let - version = "2.5.11"; - sha256 = "1x2p559g2f30520v3kn46n737l5s1kwrn962dv73s6mb6n1lhs55"; - cargoSha256 = "16nf6y0hyffwdhxn1w4ms4zycs5lkzir8sj6c2lgsabig057hb6z"; -in - import ./parity.nix { inherit version sha256 cargoSha256; } +{ lib +, fetchFromGitHub +, rustPlatform +, cmake +, llvmPackages +, openssl +, pkg-config +, systemd +}: + +rustPlatform.buildRustPackage rec { + pname = "parity"; + version = "2.7.2"; + + src = fetchFromGitHub { + owner = "paritytech"; + repo = "parity-ethereum"; + rev = "v${version}"; + sha256 = "09cvqk0h9c26famh3f1nc3g74cd0zk6klys977yr1f13bgqmzx0x"; + }; + + cargoSha256 = "1fdymy8hvn137i5y4flyhlxwjxkd2cd6gq81i1429gk7j3h085ig"; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + nativeBuildInputs = [ + cmake + llvmPackages.clang + llvmPackages.libclang + pkg-config + ]; + + buildInputs = [ openssl systemd ]; + + cargoBuildFlags = [ "--features final" ]; + + # test result: FAILED. 88 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out + doCheck = false; + + meta = with lib; { + description = "Fast, light, robust Ethereum implementation"; + homepage = "http://parity.io"; + license = licenses.gpl3; + maintainers = with maintainers; [ akru xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix deleted file mode 100644 index 6937d6efb099..000000000000 --- a/pkgs/applications/blockchains/parity/parity.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ version -, sha256 -, cargoSha256 -}: - -{ lib -, fetchFromGitHub -, rustPlatform - -, cmake -, openssl -, pkgconfig -, systemd -}: - -rustPlatform.buildRustPackage { - pname = "parity"; - inherit version; - inherit cargoSha256; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - - src = fetchFromGitHub { - owner = "paritytech"; - repo = "parity-ethereum"; - rev = "v${version}"; - inherit sha256; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ openssl systemd ]; - - cargoBuildFlags = [ "--features final" ]; - - # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out - doCheck = false; - - meta = with lib; { - description = "Fast, light, robust Ethereum implementation"; - homepage = "http://parity.io"; - license = licenses.gpl3; - maintainers = with maintainers; [ akru xrelkd ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d681fd0fe039..d23c03a73d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22854,7 +22854,7 @@ in zcash = callPackage ../applications/blockchains/zcash { }; parity = callPackage ../applications/blockchains/parity { }; - parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; + parity-ui = callPackage ../applications/blockchains/parity-ui { }; polkadot = callPackage ../applications/blockchains/polkadot { }; |