Skip to content

feat(nix): bump nixpkgs from nixos-25.05 to nixos-26.05 in the nix-upstream group #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat(nix): bump nixpkgs from nixos-25.05 to nixos-26.05 in the nix-upstream group #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fc3cbf
feat(nix): bump nixpkgs in the nix-upstream group
dependabot[bot] May 29, 2026
2f697b2
fix(nix): follow upstream change
ngc7331 Jun 16, 2026
8a7d585
fix(nix): disable judy for gtkwave
ngc7331 Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -48,16 +48,12 @@
}))
(verilator.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
Expand All @@ -67,7 +63,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
Expand Down