Skip to content

phoc: 0.8.0 -> 0.9.0, patch for wlroots 0.14#143785

Closed
Synthetica9 wants to merge 1 commit intoNixOS:masterfrom
Synthetica9:phoc-0.9.0
Closed

phoc: 0.8.0 -> 0.9.0, patch for wlroots 0.14#143785
Synthetica9 wants to merge 1 commit intoNixOS:masterfrom
Synthetica9:phoc-0.9.0

Conversation

@Synthetica9
Copy link
Member

@Synthetica9 Synthetica9 commented Oct 30, 2021

Motivation for this change

Not sure if this does what it should do, both the new and old version only show me a cursor on a black screen. Testing would be very much appreciated.

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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 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
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 30, 2021
zhaofengli
zhaofengli suggested changes Oct 30, 2021
View reviewed changes
Copy link
Member

@zhaofengli zhaofengli left a comment

Choose a reason for hiding this comment

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

Will test this in a bit, but you also need to remove the wlroots override in pkgs/top-level/all-packages.nix. With this merged we can also finally remove development/libraries/wlroots/0.12.nix as well.

pkgs/applications/misc/phoc/default.nix
Comment on lines +37 to +41
# There might be a nicer way to include only the first 7 commits in this
# range, but this works.
csplit --elide-empty-files ${upstream_wlroots_0_15_patch} '/^-- $/' '{*}'
rm xx07
cat xx* > first_7.patch
Copy link
Member

@zhaofengli zhaofengli Oct 30, 2021

Choose a reason for hiding this comment

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

It may make more sense to include those patches one by one instead of doing this. We can have a helper function like this to make it cleaner.

For the patch that updates the submodule pin, we can probably move the edited patch in-tree since it's tiny anyways.

pkgs/applications/misc/phoc/default.nix
Comment on lines -23 to -28
# Temporary fix. Upstream report: https://source.puri.sm/Librem5/phosh/-/issues/422
(fetchpatch {
name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/78fde4aaf1a74eb13a3f083cb6dfb29f578c3265/community/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
sha256 = "1zjn7mwdj21z0jsc2mz90cnrzk97yqkiq58qqgpjav4h4dgpfb38";
})
Copy link
Member

@zhaofengli zhaofengli Oct 30, 2021

Choose a reason for hiding this comment

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

This patch is still needed, along with another revert (haven't tested). See the commit history of the forked version they are pinning onto.

@zhaofengli zhaofengli mentioned this pull request Oct 30, 2021
Merged
12 tasks
@archseer
Copy link
Member

archseer commented Nov 1, 2021

Can I get removed as the package maintainer? I'm not using phoc or phosh.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 22, 2021

Can I get removed as the package maintainer? I'm not using phoc or phosh.

Please send a PR.

@SuperSandro2000 SuperSandro2000 added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 22, 2021
@primeos primeos mentioned this pull request Dec 19, 2021
Closed
10 tasks
@zhaofengli zhaofengli mentioned this pull request Dec 21, 2021
Merged
13 tasks
@zhaofengli
Copy link
Member

zhaofengli commented Dec 21, 2021

Phoc released 0.11.0 with wlroots 0.14 support (#151519, which also drops wlroots_0_12) so this PR is no longer necessary. However, I really appreciate the efforts and initiative ❤️

@Synthetica9
Copy link
Member Author

Synthetica9 commented Dec 21, 2021

Thank you for the new PR, closing this.

zhaofengli added a commit to zhaofengli/nixpkgs that referenced this pull request Jan 9, 2022
@zhaofengli
phoc: 0.9.0 -> 0.11.0
8459575 
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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@archseer archseer Awaiting requested review from archseer

@primeos primeos Awaiting requested review from primeos

1 more reviewer

@zhaofengli zhaofengli zhaofengli requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Synthetica9 @archseer @SuperSandro2000 @zhaofengli