From 8ad6dd1b85e8b3c9d15f5189e4522542209ed1b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 May 2026 16:54:22 +0000
Subject: [PATCH 1/3] feat(nix): bump nixpkgs in the nix-upstream group

Bumps the nix-upstream group with 1 update: [nixpkgs](https://github.com/nixos/nixpkgs).


Updates `nixpkgs` from nixos-25.05 to nixos-26.05
- [Commits](https://github.com/nixos/nixpkgs/compare/ac62194c3917d5f474c1a844b6fd6da2db95077d...ec942ba042dad5ef097e2ef3a3effc034241f011)

---
updated-dependencies:
- dependency-name: nixpkgs
  dependency-version: ec942ba042dad5ef097e2ef3a3effc034241f011
  dependency-type: direct:production
  dependency-group: nix-upstream
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 flake.lock | 8 ++++----
 flake.nix  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2e01d446e..2b5bc7d65 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,16 +22,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767313136,
-        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
+        "lastModified": 1779971959,
+        "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
+        "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 4756f201f..f93e587c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Nix devshells for XiangShan";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     gsim = {
       url = "github:OpenXiangShan/gsim";
       inputs.nixpkgs.follows = "nixpkgs";

From 2bd122e551a67941e509ec8ab36987083a606168 Mon Sep 17 00:00:00 2001
From: ngc7331 <ngc7331@outlook.com>
Date: Tue, 16 Jun 2026 18:34:11 +0800
Subject: [PATCH 2/3] fix(nix): follow upstream change

upstream had bumped verilator to 5.044+ and dropped patch for 5.040, so we can remove "drop patches"

and upstream had moved VERILATOR_SRC_VERSION into env, so we need to drop its override to prevent conflict

Link: https://github.com/NixOS/nixpkgs/commit/8f56e3ccb2a071232fedc111ffbafcbcfadafe41
Link: https://github.com/NixOS/nixpkgs/commit/ee33386333ae859b3798d09ca7388ff61bbdbc7f

Signed-off-by: ngc7331 <ngc7331@outlook.com>
---
 flake.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index f93e587c6..eb6adc0a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,16 +49,12 @@
         # compile verilator with clang instead of gcc
         ((verilator.override { stdenv = clangStdenv; }).overrideAttrs (finalAttrs: previousAttrs: {
           version = "5.048";
-          VERILATOR_SRC_VERSION = "v${finalAttrs.version}";
           src = fetchFromGitHub {
             owner = "verilator";
             repo = "verilator";
             rev = "v${finalAttrs.version}";
             hash = "sha256-xvqqgbW7L07+NBYzGN2KLhwir58ByShxo4VVPI3pgZk=";
           };
-          # drop patch https://github.com/NixOS/nixpkgs/commit/06be23d66287c004cb8ef933a9ff6589276ab104
-          # since it's already included in 5.044
-          patches = [];
           # use jemalloc by default
           buildInputs = previousAttrs.buildInputs ++ [
             jemalloc

From e3994e301fe855e771f1b4c9343e149cbb61f3b5 Mon Sep 17 00:00:00 2001
From: ngc7331 <ngc7331@outlook.com>
Date: Thu, 16 Jul 2026 21:31:09 +0800
Subject: [PATCH 3/3] fix(nix): disable judy for gtkwave

Signed-off-by: ngc7331 <ngc7331@outlook.com>
---
 flake.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index eb6adc0a4..4e18d4616 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,7 +64,12 @@
         gsim.packages.${system}.default
 
         # === debug ===
-        gtkwave
+        (gtkwave.overrideAttrs (finalAttrs: previousAttrs: {
+          # disable judy, it will cause a "abort: buffer overflow detected" error while opening xiangshan .fst waveforms
+          configureFlags = builtins.filter (
+            flag: flag != "--enable-judy"
+          ) previousAttrs.configureFlags;
+        }))
 
         # === lib ===
         readline