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

phoc: 0.9.0 -> 0.11.0, wlroots_0_12: drop #151519

Merged
merged 2 commits into from
Jan 10, 2022
Merged

Conversation

zhaofengli
Copy link
Member

Motivation for this change

We can finally drop wlroots_0_12! On the other hand, we now need to keep wlroots_0_14 when 0.15 gets merged in #151234 😛 Tested with #151404 on a PinePhone Pro.

Closes #118838, and supersedes #143785.

Also removing archseer from the maintainer list per request: #143785 (comment)

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.

@ofborg ofborg bot added 8.has: clean-up 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 21, 2021
@zhaofengli
Copy link
Member Author

Marking this as draft until #151234 lands in master. We will then add the wlroots_0_14 override for phoc.

@zhaofengli zhaofengli marked this pull request as draft January 4, 2022 22:39
We can finally drop wlroots_0_12! On the other hand, we now need to keep
wlroots_0_14 when 0.15 gets merged :P

Removing archseer from maintainers per request: NixOS#143785 (comment)
phoc was the last package that depended on this.
@zhaofengli zhaofengli marked this pull request as ready for review January 9, 2022 18:41
@primeos
Copy link
Member

primeos commented Jan 9, 2022

@zhaofengli thanks a lot for this PR and your patience! :) Did you already test this with Phosh (just to be sure)? I just tried to give it a quick go but realized that it's a bit more involved than I thought (plus I never used it before so I could only perform limited testing).

Edit: Personal note: I was surprised that I didn't get any notification for https://source.puri.sm/Librem5/phoc/-/merge_requests/241 which I was subscribed to. Turns out the project was archived and moved to https://gitlab.gnome.org/World/Phosh/phoc.

So: https://source.puri.sm/Librem5/phoc/-/merge_requests/241 became https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241 which was replaced by https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/280 which was superseded by https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/300 which finally got merged.

Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Diff LGTM and from my very limited testing of Phoc and Phosh (without a proper Phosh setup) it seems fine.

@zhaofengli
Copy link
Member Author

@primeos

Did you already test this with Phosh (just to be sure)?

Yes, to be sure I just re-tested on my PinePhone Pro and it worked without a problem.

Edit: Personal note: I was surprised that I didn't get any notification for https://source.puri.sm/Librem5/phoc/-/merge_requests/241 which I was subscribed to. Turns out the project was archived and moved to https://gitlab.gnome.org/World/Phosh/phoc.

So: https://source.puri.sm/Librem5/phoc/-/merge_requests/241 became https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241 which was replaced by https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/280 which was superseded by https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/300 which finally got merged.

Wow, thanks for keeping an eye out for this! I hope their migration to wlroots 0.15.0 won't be as bumpy.

@primeos
Copy link
Member

primeos commented Jan 10, 2022

Awesome, thanks a lot @zhaofengli! And very cool that you use it on your PinePhone Pro :) (And of course that you already have a PinePhone Pro :D)

@primeos primeos merged commit f0c39f6 into NixOS:master Jan 10, 2022
@zhaofengli zhaofengli deleted the phoc-0.11.0 branch January 10, 2022 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove wlroots_0_12 (tracking issue)
2 participants