From 3ec974ac88bb798420f561867eec981484b32d60 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 31 Jan 2025 16:47:53 +0100
Subject: [PATCH 1/3] nixos/geth: add sepolia network

---
 .../services/blockchain/ethereum/geth.nix     |  3 ++-
 nixos/tests/geth.nix                          | 25 +++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix
index 0c406c595a74..807d50f8aa7e 100644
--- a/nixos/modules/services/blockchain/ethereum/geth.nix
+++ b/nixos/modules/services/blockchain/ethereum/geth.nix
@@ -129,8 +129,9 @@ let
               "goerli"
               "holesky"
               "rinkeby"
-              "yolov2"
               "ropsten"
+              "sepolia"
+              "yolov2"
             ]
           );
           default = null;
diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix
index 984b46935b86..7fa7b97ed3bb 100644
--- a/nixos/tests/geth.nix
+++ b/nixos/tests/geth.nix
@@ -15,7 +15,8 @@ import ./make-test-python.nix (
             enable = true;
           };
         };
-        services.geth."testnet" = {
+
+        services.geth."holesky" = {
           enable = true;
           port = 30304;
           network = "holesky";
@@ -28,15 +29,31 @@ import ./make-test-python.nix (
             port = 18551;
           };
         };
+
+        services.geth."sepolia" = {
+          enable = true;
+          port = 30305;
+          network = "sepolia";
+          http = {
+            enable = true;
+            port = 28545;
+          };
+          authrpc = {
+            enable = true;
+            port = 28551;
+          };
+        };
       };
 
     testScript = ''
       start_all()
 
       machine.wait_for_unit("geth-mainnet.service")
-      machine.wait_for_unit("geth-testnet.service")
+      machine.wait_for_unit("geth-holesky.service")
+      machine.wait_for_unit("geth-sepolia.service")
       machine.wait_for_open_port(8545)
       machine.wait_for_open_port(18545)
+      machine.wait_for_open_port(28545)
 
       machine.succeed(
           'geth attach --exec "eth.blockNumber" http://localhost:8545 | grep \'^0$\' '
@@ -45,6 +62,10 @@ import ./make-test-python.nix (
       machine.succeed(
           'geth attach --exec "eth.blockNumber" http://localhost:18545 | grep \'^0$\' '
       )
+
+      machine.succeed(
+          'geth attach --exec "eth.blockNumber" http://localhost:28545 | grep \'^0$\' '
+      )
     '';
   }
 )

From de9134175539a2bc14b25c6834aa4d7e692f4144 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 31 Jan 2025 16:58:50 +0100
Subject: [PATCH 2/3] nixos/geth: remove obsolete networks

These networks are not available anymore as flags, so allowing them would break the module at runtime.
---
 nixos/modules/services/blockchain/ethereum/geth.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix
index 807d50f8aa7e..570c556ef849 100644
--- a/nixos/modules/services/blockchain/ethereum/geth.nix
+++ b/nixos/modules/services/blockchain/ethereum/geth.nix
@@ -126,12 +126,8 @@ let
         network = lib.mkOption {
           type = lib.types.nullOr (
             lib.types.enum [
-              "goerli"
               "holesky"
-              "rinkeby"
-              "ropsten"
               "sepolia"
-              "yolov2"
             ]
           );
           default = null;

From cd1cf641441a2fab192f2cd3574a4924014184cf Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Tue, 4 Feb 2025 12:37:22 +0100
Subject: [PATCH 3/3] go-ethereum: fix incorrect license

Cf. upstream at https://github.com/ethereum/go-ethereum/blob/master/README.md#license
---
 pkgs/by-name/go/go-ethereum/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix
index bd9a740f73d4..abff2184e684 100644
--- a/pkgs/by-name/go/go-ethereum/package.nix
+++ b/pkgs/by-name/go/go-ethereum/package.nix
@@ -72,8 +72,8 @@ buildGoModule rec {
     homepage = "https://geth.ethereum.org/";
     description = "Official golang implementation of the Ethereum protocol";
     license = with licenses; [
-      lgpl3Plus
-      gpl3Plus
+      lgpl3Only
+      gpl3Only
     ];
     maintainers = with maintainers; [ RaghavSood ];
     mainProgram = "geth";