From f82224b57d9c1ec737e8c1b36c582793326df910 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Tue, 25 Nov 2025 22:04:59 +0000 Subject: [PATCH 1/3] bazel_ot: use bazel 8 to provide completion --- pkgs/bazel_ot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/bazel_ot/default.nix b/pkgs/bazel_ot/default.nix index e57b0519..f8f6a062 100644 --- a/pkgs/bazel_ot/default.nix +++ b/pkgs/bazel_ot/default.nix @@ -4,7 +4,7 @@ { runCommand, bazelisk, - bazel_7, + bazel_8, ... }: # OpenTitan requires a specific version of Bazel. @@ -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 '' From 9850ab514a8a01595150de7650c3e632a11d95b7 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Tue, 25 Nov 2025 21:12:42 +0000 Subject: [PATCH 2/3] ci: allow a label to trigger multiarch CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94c26968..a4068ee7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 From d67d9573313198032ef1038b52cefb3dfc9285b5 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Tue, 25 Nov 2025 13:54:41 +0000 Subject: [PATCH 3/3] nixpkgs: 25.05 -> 25.11 --- flake.lock | 8 ++++---- flake.nix | 2 +- pkgs/sv-bugpoint.nix | 4 ++-- pkgs/sv-lang.nix | 2 +- private/flake.lock | 14 +++++++------- private/flake.nix | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index c2e89d99..92ae66b0 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 558904aa..03f4aeeb 100644 --- a/flake.nix +++ b/flake.nix @@ -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. diff --git a/pkgs/sv-bugpoint.nix b/pkgs/sv-bugpoint.nix index 20a9d3ef..004a9960 100644 --- a/pkgs/sv-bugpoint.nix +++ b/pkgs/sv-bugpoint.nix @@ -7,7 +7,7 @@ cmake, ninja, sv-lang, - fmt_11, + fmt, python3, }: stdenv.mkDerivation { @@ -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" ]; diff --git a/pkgs/sv-lang.nix b/pkgs/sv-lang.nix index 8e2411a0..9a28c060 100644 --- a/pkgs/sv-lang.nix +++ b/pkgs/sv-lang.nix @@ -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. diff --git a/private/flake.lock b/private/flake.lock index b30057ce..2bc04170 100644 --- a/private/flake.lock +++ b/private/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1763659333, - "narHash": "sha256-J82tKGAOQ/mv8edogn86u7moTBjuncWj1ILe5mRzLAo=", + "lastModified": 1764075570, + "narHash": "sha256-Cn+r1LoyavaqAHmEpyyM6a5A61vhitnWbAsDnPU3diw=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "6d893fa1cdb7a4523bcab3d41e77ed06affb75c6", + "rev": "1a9a9a890a55abec3f31db5a4aa47eb5c44ed171", "type": "github" }, "original": { diff --git a/private/flake.nix b/private/flake.nix index 420301d2..616ef874 100644 --- a/private/flake.nix +++ b/private/flake.nix @@ -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";