From c90b4c59176a1dc0c03f6e44214489694974c98d Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Thu, 18 Jun 2026 13:23:54 +0000
Subject: [PATCH] Nix: update to nixpkgs 26.05

---
 nix/merged-packages.nix |  4 +++-
 nix/nixpkgs-26.05.nix   |  9 +++++++++
 nix/reth.nix            | 14 +-------------
 nix/solc.nix            |  8 ++++----
 nix/user-packages.nix   | 12 ++++++------
 5 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 nix/nixpkgs-26.05.nix

diff --git a/nix/merged-packages.nix b/nix/merged-packages.nix
index 8911afeb..be61670c 100644
--- a/nix/merged-packages.nix
+++ b/nix/merged-packages.nix
@@ -1,7 +1,8 @@
 { add_pkgs_path }:
 
 let
-    dfl_nixpkgs = import ./nixpkgs-25.11.nix {};
+    dfl_nixpkgs = import ./nixpkgs-26.05.nix {};
+    old_nixpkgs = import ./nixpkgs-25.11.nix {};
     dfl_python = pkgs.python313;
     null_pkgs = {
         system-packages = {};
@@ -11,6 +12,7 @@ let
         ~/.mmgen/user-packages.nix else ./user-packages.nix;
     usr_pkgs = import usr_pkgs_path {
         pkgs = dfl_nixpkgs;
+        old_pkgs = old_nixpkgs;
         python = dfl_python;
         bdir = ./.; };
     pkgs = if usr_pkgs?pkgs then usr_pkgs.pkgs else dfl_nixpkgs;
diff --git a/nix/nixpkgs-26.05.nix b/nix/nixpkgs-26.05.nix
new file mode 100644
index 00000000..7e968eaa
--- /dev/null
+++ b/nix/nixpkgs-26.05.nix
@@ -0,0 +1,9 @@
+import (
+    fetchGit {
+        url = "https://github.com/NixOS/nixpkgs.git";
+        # url = /path/to/repo/nixpkgs-26.05.git;
+        ref = "release-26.05";
+        rev = "aa42bf7ceec62347e0962a461071ba81d39bdf37";
+        shallow = true;
+    }
+)
diff --git a/nix/reth.nix b/nix/reth.nix
index 2b74c95a..56a52d4a 100644
--- a/nix/reth.nix
+++ b/nix/reth.nix
@@ -1,20 +1,8 @@
 {
     lib,
+    pkgs,
 }:
 
-let
-    # cargo and rustc packages from 25.11 are out of date,
-    # so fetch them from a more recent commit:
-    pinnedPkgs = fetchGit {
-        url = "https://github.com/NixOS/nixpkgs.git";
-        # url = /path/to/repo/nixpkgs-116266.git;
-        rev = "116266f52682e7b975426c66204b3dada19be502";
-        shallow = true;
-    };
-    pkgs = import pinnedPkgs {};
-
-in
-
 pkgs.rustPlatform.buildRustPackage rec {
     pname = "reth";
     version = "2.2.0";
diff --git a/nix/solc.nix b/nix/solc.nix
index e82564a9..905f0a9c 100644
--- a/nix/solc.nix
+++ b/nix/solc.nix
@@ -1,6 +1,6 @@
-{ pkgs, fetchzip, fetchurl }:
+{ old_pkgs, fetchzip, fetchurl }:
 
-pkgs.stdenv.mkDerivation rec {
+old_pkgs.stdenv.mkDerivation rec {
     pname = "solc";
     version = "0.8.26";
     src = fetchzip {
@@ -19,8 +19,8 @@ pkgs.stdenv.mkDerivation rec {
         url = "https://github.com/nlohmann/json/releases/download/v3.11.3/json.hpp";
         sha256 = "sha256-m+pMgGbvShwgayvlo2MC+JJvf9xgh69dILQX0M8QPqY=";
     };
-    nativeBuildInputs = [ pkgs.cmake ];
-    buildInputs = [ pkgs.boost ];
+    nativeBuildInputs = [ old_pkgs.cmake ];
+    buildInputs = [ old_pkgs.boost ];
     cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" ];
     patchPhase = ''
         mkdir -p deps/downloads
diff --git a/nix/user-packages.nix b/nix/user-packages.nix
index cf61e739..78b7997e 100644
--- a/nix/user-packages.nix
+++ b/nix/user-packages.nix
@@ -3,12 +3,12 @@
 # In addition to setting new attributes, this file may be used to override the defaults
 # in nix/packages.nix of the mmgen-wallet repository
 
-{ pkgs, python, bdir }:
+{ pkgs, old_pkgs, python, bdir }:
 
 rec {
     ### Set nixpkgs globally for the MMGen environment.
     ### If you set it, make sure to uncomment the python variable assignment below.
-    # pkgs = import (bdir + /nixpkgs-25.11.nix) {};
+    # pkgs = import (bdir + /nixpkgs-26.05.nix) {};
 
     ### Set python version globally for the MMGen environment.
     ### Must be set if pkgs is set.
@@ -18,17 +18,17 @@ rec {
         # monero-cli   = monero-cli;                                      # Monero daemon
         # go-ethereum  = go-ethereum;                                     # Geth
         # reth         = callPackage (bdir + /reth.nix) {};               # Rust Ethereum daemon
-        # solc         = callPackage (bdir + /solc.nix) {};               # Solidity compiler
+        # solc         = callPackage (bdir + /solc.nix) { old_pkgs=old_pkgs; }; # Solidity compiler
         # litecoin     = callPackage (bdir + /litecoin.nix) {};           # Litecoin daemon
         # bitcoin-cash = callPackage (bdir + /bitcoin-cash-node.nix) {};  # Bitcoin Cash Node daemon
         # zcash-mini   = callPackage (bdir + /zcash-mini.nix) {};         # ZEC (test suite)
 
         ### For development with --pure (add/remove packages for your setup):
-        # neovim       = neovim;
-        # neovim-qt    = neovim-qt;
+        # neovim       = old_pkgs.neovim;
+        # neovim-qt    = old_pkgs.neovim-qt;
         # rxvt-unicode = rxvt-unicode;
         # which        = which;
-        # ctags        = ctags;
+        # ctags        = universal-ctags;
         # xclip        = xclip;
         # ruff         = ruff;
         # perl         = perl;