Skip to content

xorg-server: 21.1.20 -> 21.1.21#471756

Merged
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
LeSuisse:xorg-server-21.1.21
Jan 3, 2026
Merged

xorg-server: 21.1.20 -> 21.1.21#471756
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
LeSuisse:xorg-server-21.1.21

Conversation

@LeSuisse
Copy link
Member

@LeSuisse LeSuisse commented Dec 17, 2025 •
edited
Loading

Fixes some regressions
https://lists.x.org/archives/xorg-announce/2025-November/003643.html

Fixes #471620

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@LeSuisse LeSuisse added the 9.needs: port to stable A PR needs a backport to the stable release. label Dec 17, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Dec 17, 2025
@LeSuisse LeSuisse marked this pull request as ready for review December 17, 2025 19:12
@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Dec 17, 2025
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. and removed 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Dec 19, 2025
@rphillips
Copy link

rphillips commented Dec 22, 2025

@NixOS/nixpkgs-merge-bot merge

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 22, 2025

@rphillips wants to merge this PR.

Requirements to merge this PR with @NixOS/nixpkgs-merge-bot merge:

  • ✅ PR targets a development branch.
  • ✅ PR touches only files of packages in pkgs/by-name/.
  • ✅ PR is at least one of:
    • ⬜ Approved by a committer.
    • ⬜ Backported via label.
    • ✅ Opened by a committer.
    • ⬜ Opened by r-ryantm.
  • ❌ rphillips is a member of @NixOS/nixpkgs-maintainers.
  • ❌ rphillips is a maintainer of all touched packages.

❌ Pull Request could not be merged (#305350)

@rphillips
Copy link

rphillips commented Dec 22, 2025

Bummer... Although, this PR should fix nvidia breakage.

@UlyssesZh UlyssesZh added the backport staging-25.11 Backport PR automatically label Jan 2, 2026
@yuannan
Copy link
Member

yuannan commented Jan 2, 2026

@NixOS/nixpkgs-merge-bot merge

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 2, 2026

@yuannan wants to merge this PR.

Requirements to merge this PR with @NixOS/nixpkgs-merge-bot merge:

  • ✅ PR targets a development branch.
  • ✅ PR touches only files of packages in pkgs/by-name/.
  • ✅ PR is at least one of:
    • ⬜ Approved by a committer.
    • ⬜ Backported via label.
    • ✅ Opened by a committer.
    • ⬜ Opened by r-ryantm.
  • ✅ yuannan is a member of @NixOS/nixpkgs-maintainers.
  • ❌ yuannan is a maintainer of all touched packages.

❌ Pull Request could not be merged (#305350)

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jan 2, 2026
@SuperSandro2000 SuperSandro2000 added this pull request to the merge queue Jan 3, 2026
Merged via the queue into NixOS:staging with commit 5d66e18 Jan 3, 2026
38 of 40 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 3, 2026

Backport failed for staging-25.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-25.11
git worktree add -d .worktree/backport-471756-to-staging-25.11 origin/staging-25.11
cd .worktree/backport-471756-to-staging-25.11
git switch --create backport-471756-to-staging-25.11
git cherry-pick -x dd36729232ce83245d0003e45655d926ba4b4b6a

@LeSuisse LeSuisse deleted the xorg-server-21.1.21 branch January 4, 2026 15:26
@LeSuisse LeSuisse mentioned this pull request Jan 4, 2026
Merged
13 tasks
github-merge-queue bot pushed a commit that referenced this pull request Jan 17, 2026
@LeSuisse
xorg.xorgserver: 21.1.20 -> 21.1.21
305af14 
Fixes some regressions
https://lists.x.org/archives/xorg-announce/2025-November/003643.html

Not-cherry-picked-because: package was refactored and renamed on unstable.

PR on unstable: #471756
Mic92 pushed a commit to TUM-DSE/nixpkgs that referenced this pull request Feb 10, 2026
@LeSuisse @Mic92
xorg.xorgserver: 21.1.20 -> 21.1.21
4265748 
Fixes some regressions
https://lists.x.org/archives/xorg-announce/2025-November/003643.html

Not-cherry-picked-because: package was refactored and renamed on unstable.

PR on unstable: NixOS#471756
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@yuannan yuannan yuannan approved these changes

@UlyssesZh UlyssesZh UlyssesZh approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons. backport staging-25.11 Backport PR automatically

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@LeSuisse @rphillips @yuannan @UlyssesZh @SuperSandro2000