From f1dea7ed30a62a4be9f86ea7ddf0760ceb6b6e3b Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Tue, 24 Aug 2021 10:22:39 +0200
Subject: [PATCH] erigon: 2021.08.03 -> 2021.08.04

---
 .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++
 nixos/doc/manual/release-notes/rl-2111.section.md        | 2 ++
 pkgs/applications/blockchains/erigon.nix                 | 8 ++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index a138d4c8780c..5ec936b4dbe4 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -293,6 +293,15 @@ Superuser created successfully.
           a full resync
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The <literal>erigon</literal> ethereum node has moved it’s
+          database location in <literal>2021-08-03</literal>, users
+          upgrading must manually move their chaindata (see
+          <link xlink:href="https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03">release
+          notes</link>).
+        </para>
+      </listitem>
       <listitem>
         <para>
           <literal>services.geoip-updater</literal> was broken and has
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 35d65dc43cf3..a9298ec4ec9d 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -111,6 +111,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable
 
 - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync
 
+- The `erigon` ethereum node has moved it's database location in `2021-08-03`, users upgrading must manually move their chaindata (see [release notes](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03)).
+
 - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable).
 
 - PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release.
diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix
index 36b04c8e14bc..119789fc960c 100644
--- a/pkgs/applications/blockchains/erigon.nix
+++ b/pkgs/applications/blockchains/erigon.nix
@@ -1,17 +1,17 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "erigon";
-  version = "2021.08.03";
+  version = "2021.08.04";
 
   src = fetchFromGitHub {
     owner = "ledgerwatch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qr2IzaZhBEG/nkMqxlhAk6gwWV6lUSsdG1ecPp6N91Y=";
+    sha256 = "0sw1qr7mdhhmfwdkkyzcjaqs2s3m19d01n3ipzcnqs1iml62rcqr";
   };
 
-  vendorSha256 = "sha256-CjBIbjE67zUIPI8hX2Xg6vy64BATMpnTllC91vE9n0M=";
+  vendorSha256 = "1hschm8xgq52p4s36pp34amcf2fi1kb0clxgkfxr07bsr6z0dn6b";
   runVend = true;
 
   # Build errors in mdbx when format hardening is enabled: