Skip to content

nixpkgs: 25.05 -> 25.11 #151

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
wants to merge 3 commits into
base: main
Choose a base branch
from
+19 −19
Open

nixpkgs: 25.05 -> 25.11 #151

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
f82224b
bazel_ot: use bazel 8 to provide completion
nbdd0121 Nov 25, 2025
9850ab5
ci: allow a label to trigger multiarch CI
nbdd0121 Nov 25, 2025
d67d957
nixpkgs: 25.05 -> 25.11
nbdd0121 Nov 25, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
echo '| Package | System | Status |' >> $GITHUB_STEP_SUMMARY
echo '|---------|--------|--------|' >> $GITHUB_STEP_SUMMARY

if ${{ github.event_name == 'pull_request' }}; then
if ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI:Multiarch') }}; then
# We only support MacOS with best-effort basis. They take much longer to build so shouldn't block PR.
SYSTEMS=(x86_64-linux)
else
Expand Down
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.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
description = "lowRISC CIC's Nix Packages and Environments";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
flake-utils.url = "github:numtide/flake-utils";

# We also have some additional dependencies in private/flake.nix.
Expand Down
4 changes: 2 additions & 2 deletions pkgs/bazel_ot/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
runCommand,
bazelisk,
bazel_7,
bazel_8,
...
}:
# OpenTitan requires a specific version of Bazel.
Expand All @@ -19,5 +19,5 @@ runCommand "bazel" {} ''
cp -r ${bazelisk} $out
chmod -R +w $out
ln -s $out/bin/bazelisk $out/bin/bazel
cp -r ${bazel_7}/share $out/share
cp -r ${bazel_8}/share $out/share
''
4 changes: 2 additions & 2 deletions pkgs/sv-bugpoint.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
cmake,
ninja,
sv-lang,
fmt_11,
fmt,
python3,
}:
stdenv.mkDerivation {
Expand All @@ -23,7 +23,7 @@ stdenv.mkDerivation {

cmakeFlags = [
"-DFETCHCONTENT_SOURCE_DIR_SLANG=${sv-lang.src}"
"-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_11.src}"
"-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt.src}"
"-DSLANG_USE_MIMALLOC=OFF"
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/sv-lang.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pkgs.sv-lang.overrideAttrs (prev: rec {
propagatedBuildInputs =
(prev.propagatedBuildInputs or [])
++ [
pkgs.fmt_11
pkgs.fmt
];

# Time out specific to sv-lang 7, see https://github.com/nixos/nixpkgs/issues/451986.
Expand Down
14 changes: 7 additions & 7 deletions private/flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion private/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: MIT
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";

# Need to obtain GCC 12 which is no longer supported.
nixpkgs-2505.url = "github:NixOS/nixpkgs/nixos-25.05";
Expand Down