Skip to content
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.

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

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

Merged
merged 2 commits into from
May 29, 2022

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.

This reverts commit 3312352.
Fixes NixOS#170856: issues of some users.
@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

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.

@jakobkukla
Copy link
Contributor

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

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.

@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
Copy link
Contributor

Successfully created backport PR #175320 for staging-22.05.

@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Nouveau segfault when launching X11 Display Manager
6 participants