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.

Sign up for GitHub

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

Jump to bottom

{wlroots_0_17, tinywl, dwl, waybox, wio}: update #269359

Merged
merged 8 commits into from
Dec 22, 2023
Merged

{wlroots_0_17, tinywl, dwl, waybox, wio}: update #269359

merged 8 commits into from
Dec 22, 2023

Conversation

wineee
Copy link
Member

@wineee wineee commented Nov 23, 2023 •
edited
Loading

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

Priorities

Add a 👍 reaction to pull requests you find important.

@wineee wineee marked this pull request as ready for review November 23, 2023 03:13
@wineee wineee marked this pull request as draft November 23, 2023 03:22
@wineee
Copy link
Member Author

wineee commented Nov 23, 2023

Result of nixpkgs-review pr 269359 run on x86_64-linux 1

1 package failed to build:
  • tinywl
8 packages built:
  • grimblast
  • hyprland
  • hyprland.dev
  • hyprland.man
  • waybar
  • wlroots
  • wlroots.examples
  • xdg-desktop-portal-hyprland

@wineee wineee marked this pull request as ready for review November 23, 2023 04:09
@wineee
Copy link
Member Author

wineee commented Nov 23, 2023

Hyprland uses a specific version of wlroots. Is there anything that needs to be adjusted after wlroots 0.17 is released?
@fufexan

@wineee
Copy link
Member Author

wineee commented Nov 23, 2023

@ofborg test tinywl

@wineee wineee requested a review from NickCao November 23, 2023 06:51
@fufexan
Copy link
Contributor

fufexan commented Nov 23, 2023

Hyprland uses a specific version of wlroots. Is there anything that needs to be adjusted after wlroots 0.17 is released?

Currently, the way we add libdisplayinfo and libliftoff to buildInputs is done through overrideAttrs, but that will no longer be needed, so we will only need to pass the new versions to override, which simplifies things. We can also remove hwdata from there.

fufexan
fufexan approved these changes Nov 23, 2023
View reviewed changes
Copy link
Contributor

@fufexan fufexan left a comment

Choose a reason for hiding this comment

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

Built it fine, LGTM.

@wineee wineee mentioned this pull request Nov 24, 2023
Merged
13 tasks
@wineee wineee changed the title wlroots_0_17: init at 0.17.0 {wlroots_0_17,dwl}: update Nov 27, 2023
@wineee wineee changed the title {wlroots_0_17,dwl}: update {wlroots_0_17, dwl, waybox}: update Nov 27, 2023
@wineee
Copy link
Member Author

wineee commented Dec 15, 2023 •
edited
Loading

Rebase to resolve conflict with #272333
wlroots-hyprland is 0.18.0-dev now
https://gitlab.freedesktop.org/wlroots/wlroots/-/blob/5d639394f3e83b01596dcd166a44a9a1a2583350/meson.build#L4

@wineee
Copy link
Member Author

wineee commented Dec 15, 2023

@ofborg build hyprland

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3104

@fufexan
Copy link
Contributor

fufexan commented Dec 15, 2023

Rebase to resolve conflict with #272333 wlroots-hyprland is 0.18.0-dev now https://gitlab.freedesktop.org/wlroots/wlroots/-/blob/5d639394f3e83b01596dcd166a44a9a1a2583350/meson.build#L4

Ah didn't check that. I'll update the version on the next Hyprland release.

pbsds
pbsds approved these changes Dec 18, 2023
View reviewed changes
Copy link
Contributor

@pbsds pbsds left a comment

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 269359 run on x86_64-linux 1

15 packages built:
  • dwl
  • dwl.man
  • grimblast
  • hdrop
  • hyprland
  • hyprland.dev
  • hyprland.man
  • hyprshot
  • tinywl
  • waybar
  • waybox
  • wio
  • wlroots (wlroots_0_17)
  • wlroots.examples (wlroots_0_17.examples)
  • xdg-desktop-portal-hyprland

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1332

@Scrumplex
Copy link
Member

Result of nixpkgs-review pr 269359 run on x86_64-linux 1

15 packages built:
  • dwl
  • dwl.man
  • grimblast
  • hdrop
  • hyprland
  • hyprland.dev
  • hyprland.man
  • hyprshot
  • tinywl
  • waybar
  • waybox
  • wio
  • wlroots (wlroots_0_17)
  • wlroots.examples (wlroots_0_17.examples)
  • xdg-desktop-portal-hyprland

@NickCao NickCao merged commit d344598 into NixOS:master Dec 22, 2023
27 checks passed
@wineee wineee deleted the wlroots_17 branch December 22, 2023 19:34
@andresilva andresilva mentioned this pull request Dec 27, 2023
Merged
@wineee wineee mentioned this pull request Mar 28, 2024
Open
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@fufexan fufexan fufexan approved these changes

@pbsds pbsds pbsds approved these changes

@AndersonTorres AndersonTorres AndersonTorres approved these changes

@wegank wegank wegank approved these changes

@Scrumplex Scrumplex Scrumplex approved these changes

@primeos primeos Awaiting requested review from primeos

@NickCao NickCao Awaiting requested review from NickCao

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@alyssais alyssais Awaiting requested review from alyssais

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer 12.approvals: 3+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet