Skip to content

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

Open
dependabot[bot] wants to merge 2 commits into
masterfrom
dependabot/nix/nix-upstream-1de5009439
Open

feat(nix): bump nixpkgs from nixos-25.05 to nixos-26.05 in the nix-upstream group#88
dependabot[bot] wants to merge 2 commits into
masterfrom
dependabot/nix/nix-upstream-1de5009439

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github May 29, 2026

Copy link
Copy Markdown
Contributor

Bumps the nix-upstream group with 1 update: nixpkgs.

Updates nixpkgs from nixos-25.05 to nixos-26.05

Commits
  • ec942ba [Backport release-26.05] openldap: skip a problematic test on i686 already (#...
  • 1e8aeb2 [Backport release-26.05] python3Packages.diffusers: 0.36.0 -> 0.38.0 (#524942)
  • 21aa1b5 openldap: skip a problematic test on i686 already
  • 0e829cf [Backport release-26.05] npins: 0.4.0 -> 0.4.1; add coca to maintainers (#525...
  • 9451988 [Backport release-26.05] liferea: 1.16.9 -> 1.16.10 (#525172)
  • 90eb6c5 npins: add coca to maintainers
  • 02088a3 npins: 0.4.0 -> 0.4.1
  • 7b108a0 liferea: 1.16.9 -> 1.16.10
  • aa3f0aa [Backport release-26.05] sandhole: 0.9.4 -> 0.9.5 (#524913)
  • c7775ed [Backport release-26.05] coqPackages.equations: 1.3.1 -> 1.3.2 (#525160)
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

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](NixOS/nixpkgs@ac62194...ec942ba)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot Bot added dependencies Pull requests that update a dependency file nix Pull requests that update nix code labels May 29, 2026
@ngc7331

ngc7331 commented May 30, 2026

Copy link
Copy Markdown
Member

Do not merge: similar to #84 (comment)

With nixos-26.05:

  • gcc: 15.2.0
  • clang: 21.1.8
  • openjdk: 21.0.12
  • python3: 3.13.13

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: NixOS/nixpkgs@8f56e3c
Link: NixOS/nixpkgs@ee33386

Signed-off-by: ngc7331 <ngc7331@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file do not merge nix Pull requests that update nix code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant