Merge pull request #126750 from d-xo/erigon-2021-06-03

authored by Sandro and committed by GitHub 2e4b2ad7 dc547ee7

+46 -32
+7
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
··· 184 184 </listitem> 185 185 <listitem> 186 186 <para> 187 + The <literal>erigon</literal> ethereum node has moved to a new 188 + database format in <literal>2021-05-04</literal>, and requires 189 + a full resync 190 + </para> 191 + </listitem> 192 + <listitem> 193 + <para> 187 194 <literal>services.geoip-updater</literal> was broken and has 188 195 been replaced by 189 196 <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>.
+2
nixos/doc/manual/release-notes/rl-2111.section.md
··· 57 57 58 58 - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 59 59 60 + - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync 61 + 60 62 - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable). 61 63 62 64 - PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release.
+34
pkgs/applications/blockchains/erigon.nix
··· 1 + { stdenv, lib, buildGoModule, fetchFromGitHub }: 2 + 3 + buildGoModule rec { 4 + pname = "erigon"; 5 + version = "2021.08.01"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "ledgerwatch"; 9 + repo = pname; 10 + rev = "v${version}"; 11 + sha256 = "sha256-fjMkCCeQa/IHB4yXlL7Qi8J9wtZm90l3xIA72LeoW8M="; 12 + }; 13 + 14 + vendorSha256 = "1vsgd19an592dblm9afasmh8cd0x2frw5pvnxkxd2fikhy2mibbs"; 15 + runVend = true; 16 + 17 + # Build errors in mdbx when format hardening is enabled: 18 + # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] 19 + hardeningDisable = [ "format" ]; 20 + 21 + subPackages = [ 22 + "cmd/erigon" 23 + "cmd/evm" 24 + "cmd/rpcdaemon" 25 + "cmd/rlpdump" 26 + ]; 27 + 28 + meta = with lib; { 29 + homepage = "https://github.com/ledgerwatch/erigon/"; 30 + description = "Ethereum node implementation focused on scalability and modularity"; 31 + license = with licenses; [ lgpl3Plus gpl3Plus ]; 32 + maintainers = with maintainers; [ d-xo ]; 33 + }; 34 + }
-30
pkgs/applications/blockchains/turbo-geth/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub }: 2 - 3 - buildGoModule rec { 4 - pname = "turbo-geth"; 5 - version = "2021.05.02"; 6 - 7 - src = fetchFromGitHub { 8 - owner = "ledgerwatch"; 9 - repo = pname; 10 - rev = "v${version}"; 11 - sha256 = "sha256-7sTRAAlKZOdwi/LRbIEDKWpBe1ol8pZfEf2KIC4s0xk="; 12 - }; 13 - 14 - vendorSha256 = "1d0ahdb2b5v8nxq3kdxw151phnyv6habb8kr8qjaq3kyhcnyk6ng"; 15 - runVend = true; 16 - 17 - subPackages = [ 18 - "cmd/tg" 19 - "cmd/evm" 20 - "cmd/rpcdaemon" 21 - "cmd/rlpdump" 22 - ]; 23 - 24 - meta = with lib; { 25 - homepage = "https://github.com/ledgerwatch/turbo-geth/"; 26 - description = "Ethereum node and geth fork focused on scalability and modularity"; 27 - license = with licenses; [ lgpl3Plus gpl3Plus ]; 28 - maintainers = with maintainers; [ d-xo ]; 29 - }; 30 - }
+1
pkgs/top-level/aliases.nix
··· 876 876 truecrypt = veracrypt; # added 2018-10-24 877 877 tshark = wireshark-cli; # added 2018-04-25 878 878 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 879 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08 879 880 uberwriter = apostrophe; # added 2020-04-23 880 881 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 881 882 ucsFonts = ucs-fonts; # added 2016-07-15
+2 -2
pkgs/top-level/all-packages.nix
··· 28874 28874 28875 28875 ergo = callPackage ../applications/blockchains/ergo { }; 28876 28876 28877 + erigon = callPackage ../applications/blockchains/erigon.nix { }; 28878 + 28877 28879 exodus = callPackage ../applications/blockchains/exodus { }; 28878 28880 28879 28881 faraday = callPackage ../applications/blockchains/faraday { }; ··· 28944 28946 sumokoin = callPackage ../applications/blockchains/sumokoin { boost = boost165; }; 28945 28947 28946 28948 tessera = callPackage ../applications/blockchains/tessera { }; 28947 - 28948 - turbo-geth = callPackage ../applications/blockchains/turbo-geth { }; 28949 28949 28950 28950 vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { 28951 28951 boost = boost165;