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/go-ethereum.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/go-ethereum.nix')
-rw-r--r-- | pkgs/applications/blockchains/go-ethereum.nix | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index f69489c7ffe..28a7b22a24f 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -1,21 +1,35 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: -buildGoModule rec { +let + # A list of binaries to put into separate outputs + bins = [ + "geth" + "clef" + ]; + +in buildGoModule rec { pname = "go-ethereum"; - version = "1.9.19"; + version = "1.10.6"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "08wf7qklk31dky2z0l2j9vbyr8721gkvy4dsc60afwrwihwd8lrp"; + sha256 = "sha256-4lapkoxSKdXlD6rmUxnlSKrfH+DeV6/wV05CqJjuzjA="; }; runVend = true; - vendorSha256 = "1744df059bjksvih4653nnvb4kb1xvzdhypd0nnz36m1wrihqssv"; + vendorSha256 = "sha256-5qi01y0SIEI0WRYu2I2RN94QFS8rrlioFvnRqqp6wtk="; doCheck = false; + outputs = [ "out" ] ++ bins; + + # Move binaries to separate outputs and symlink them back to $out + postInstall = lib.concatStringsSep "\n" ( + builtins.map (bin: "mkdir -p \$${bin}/bin && mv $out/bin/${bin} \$${bin}/bin/ && ln -s \$${bin}/bin/${bin} $out/bin/") bins + ); + subPackages = [ "cmd/abidump" "cmd/abigen" @@ -31,17 +45,16 @@ buildGoModule rec { "cmd/puppeth" "cmd/rlpdump" "cmd/utils" - "cmd/wnode" ]; # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = - stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; - license = with licenses; [ lgpl3 gpl3 ]; - maintainers = with maintainers; [ adisbladis lionello xrelkd ]; + license = with licenses; [ lgpl3Plus gpl3Plus ]; + maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ]; }; } |