Skip to content

Comments

Revert "xorg.xorgserver: 1.20.13 -> 21.1.3"#174140

Merged
vcunat merged 2 commits intoNixOS:staging-nextfrom
vcunat:p/xorg-server_revert
May 29, 2022
Merged

Revert "xorg.xorgserver: 1.20.13 -> 21.1.3"#174140
vcunat merged 2 commits intoNixOS:staging-nextfrom
vcunat:p/xorg-server_revert

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented May 23, 2022

This reverts commit 3312352.
Fixes #170856: issues of some users.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@vcunat
Revert "xorg.xorgserver: 1.20.13 -> 21.1.3"
43b7c96 
This reverts commit 3312352.
Fixes NixOS#170856: issues of some users.
@vcunat vcunat requested review from hedning and jtojnar as code owners May 23, 2022 16:02
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label May 23, 2022
@vcunat
Copy link
Member Author

vcunat commented May 23, 2022

According to testing on the issue, reverting the driver bumps from PR #153994 isn't needed to fix the issues. (There are no newer releases for -ati and -nouveau.)

However, there's a newer release of xorg-server-1.20.14, but the affected people haven't tested it (yet), so I can't be confident that it didn't backport the regression. (There is some modesetting change.) You can try https://github.com/vcunat/nixpkgs/commits/p/xorg-server_bump

@vcunat
Copy link
Member Author

vcunat commented May 23, 2022 •
edited
Loading

We've been using 1.20.13 for a very long time and I don't recall people reporting problems, so I'd hope it would be OK even without doing more testing beforehand.

This was referenced May 23, 2022
Merged
Closed
@ofborg ofborg bot requested review from amaxine, bobby285271, dasj19 and davidak May 23, 2022 16:20
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels May 23, 2022
@jakobkukla
Copy link
Contributor

jakobkukla commented May 24, 2022

However, there's a newer release of xorg-server-1.20.14, but the affected people haven't tested it (yet), so I can't be confident that it didn't backport the regression. (There is some modesetting change.) You can try https://github.com/vcunat/nixpkgs/commits/p/xorg-server_bump

Can confirm reverting to xorg-server-1.20.14 is solving the issue for me.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented May 24, 2022

With the amounts of rebuilds we should target staging-next at least.

@vcunat
Copy link
Member Author

vcunat commented May 28, 2022

I assume .14 will be preferable to .13, so I added that here now, but more testing would still be nice.

@vcunat vcunat mentioned this pull request May 28, 2022
Closed
@FPtje
Copy link
Contributor

FPtje commented May 29, 2022

I just switched to this branch, and I can confirm that this still works, whereas the latest nixos-unstable still triggers the issue for me. Thanks!

@vcunat vcunat changed the base branch from master to staging-next May 29, 2022 15:49
@vcunat vcunat merged commit af1a54b into NixOS:staging-next May 29, 2022
@vcunat vcunat deleted the p/xorg-server_revert branch May 29, 2022 15:53
@vcunat
Copy link
Member Author

vcunat commented May 29, 2022

I think we have enough feedback to stage this at least for unstable.

@github-actions github-actions bot mentioned this pull request May 29, 2022
Merged
1 task
@github-actions
Copy link
Contributor

github-actions bot commented May 29, 2022

Successfully created backport PR #175320 for staging-22.05.

@jyooru jyooru mentioned this pull request Jun 3, 2022
Closed
Artturin
Artturin reviewed Nov 6, 2022
View reviewed changes
pkgs/servers/x11/xorg/tarballs.list
mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-21.1.3.tar.xz
mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz
Copy link
Member

@Artturin Artturin Nov 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you forgot to change this to .14, fix in #199912

@Artturin Artturin mentioned this pull request Dec 18, 2022
Closed
@fabianhjr fabianhjr mentioned this pull request Dec 19, 2022
Merged
13 tasks
fabianhjr added a commit to LibreCybernetics/nixpkgs that referenced this pull request Mar 1, 2023
@fabianhjr
xorg.xorgserver: 1.20.14 → 21.1.7
0c6d8cb 
Diff:
https://github.com/freedesktop/xorg-xserver/compare/xorg-server-1.20.14...xorg-server-21.1.7

This reverts the revert on NixOS#174140
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Artturin Artturin Artturin left review comments

@jtojnar jtojnar Awaiting requested review from jtojnar

@hedning hedning Awaiting requested review from hedning

@davidak davidak Awaiting requested review from davidak

@dasj19 dasj19 Awaiting requested review from dasj19

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@amaxine amaxine Awaiting requested review from amaxine

Assignees

No one assigned

Labels

6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Nouveau segfault when launching X11 Display Manager

6 participants

@vcunat @jakobkukla @SuperSandro2000 @FPtje @nakoo @Artturin