Merge master into staging-next

1 files changed, 5 insertions, 16 deletions

diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 1e16eb78cef1..cf0261e01c43 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit, fetchpatch }:
+{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
 
 buildGoPackage rec {
   pname = "go-ethereum";
-  version = "1.8.27";
+  version = "1.9.0";
 
   goPackagePath = "github.com/ethereum/go-ethereum";
 
@@ -13,28 +13,17 @@ buildGoPackage rec {
   # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
   hardeningDisable = [ "fortify" ];
 
-  # Apply ethereum/go-ethereum#19183 to fix the aarch64 build failure.
-  #
-  # TODO Remove this patch when upstream (https://github.com/ethereum/go-ethereum)
-  # fix this problem in the future release.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/ethereum/go-ethereum/commit/39bd2609.patch";
-      sha256 = "1a362hzvcjk505hicv25kziy3c6s5an4j7rk4jibcxwgvygb3mz5";
-    })
- ];
-
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1640y7lqy7bvjjgx6wp0cnbw632ls5fj4ixclr819lfz4p5dfhx1";
+    sha256 = "03gkrvps1syvyjna7769n4j3mlpxcgdj461gzds2l90k02ajvh7x";
   };
 
   meta = with stdenv.lib; {
-    homepage = https://ethereum.github.io/go-ethereum/;
+    homepage = "https://geth.ethereum.org/";
     description = "Official golang implementation of the Ethereum protocol";
     license = with licenses; [ lgpl3 gpl3 ];
-    maintainers = with maintainers; [ adisbladis asymmetric lionello ];
+    maintainers = with maintainers; [ adisbladis asymmetric lionello xrelkd ];
   };
 }