sway: 1.5 -> 1.6; wlroots: 1.12 -> 1.13

[Synthetica9]

Motivation for this change

Tracking PR for Sway 1.6, first RC just landed: https://github.com/swaywm/sway/releases/tag/1.6-rc1

EDIT 2021-03-24: Next RC landed https://github.com/swaywm/sway/releases/tag/1.6-rc2

EDIT: 2021-04-07: Final version of wlroots 0.13 landed. https://github.com/swaywm/wlroots/releases/tag/0.13.0

Things done

• Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
• Built on platform(s)
  • NixOS
  • macOS
  • other Linux distributions
• Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
• Tested compilation of all pkgs 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/)
• Determined the impact on package closure size (by running nix path-info -S before and after)
• Ensured that relevant documentation is up to date
• Fits CONTRIBUTING.md.

[Synthetica9]

Seems to build and run fine here. A few new dependencies were added, I just naively added them.

[primeos]

Can you also run nixpkgs-review and investigate broken builds (e.g. by backporting patches, switching to a newer release, looking at issue trackers, etc.)?
Other than that it looks good.

[jbeich]

For wayfire/hikari/etc fixes try extracting from freebsd/freebsd-ports@70148c1

[Synthetica9]

Sway 1.6 also seems to fix an issue I was having with firefox, which is a nice plus

[Synthetica9]

@SuperSandro2000 What's the recommended way to fetch multiple commits from a PR that hasn't been merged yet? (cage-kiosk/cage#174)

[Synthetica9]

@berbiche see 732cd86

[primeos]

@SuperSandro2000 What's the recommended way to fetch multiple commits from a PR that hasn't been merged yet? (cage-kiosk/cage#174)

I think that's unfortunately a bit of a problem without a good solution (PRs are mutable so we cannot use them directly and even fetching the commits before they're merged is far from ideal as they could disappear / become GCed, e.g. if the PR branch will be rebased).

For past wlroots updates I've kindly pinged the maintainers to e.g. merge such PRs. If that doesn't work it's probably best to keep wlroots 1.12 in Nixpkgs for some time (we're already doing this with some other packages).

[Synthetica9]

Okay, I see you pinged the maintainers. Since this is not yet ready to be merged anyways I'll keep it as is for now, I'll use the merge commit when that appears on master.

[SuperSandro2000]

GCed commits is usually not a problem with github and is far less likely than a changed pr.

[berbiche]

@berbiche see 732cd86

Cagebreak's source code history is available on the "development" branch, the master branch is just a "dump" like you said.

I'll investigate and send a patch when I have time.

[Synthetica9]

@alyssais I tried to override wlroots for wayfire and wcm, but I couldn't get it through the plugin system, any pointers?

[alyssais]

I pushed a small cleanup to the Wayfire override. This is all going to be squashed a bit before being merged, right?

[Synthetica9]

This is all going to be squashed a bit before being merged, right?

Yeah, I'll do a rebase to group relevant commits together at least, maybe a full squash if requested.

[mweinelt]

https://github.com/swaywm/sway/releases/tag/1.6
Final release notes.

[Synthetica9]

swaywm/sway@1.6 (release)

Way ahead of you 😉

[Synthetica9]

@primeos I think two things remain:

• What do we do with Unbreak build with wlroots 0.13.0 cage-kiosk/cage#174 ? Pin wlroots to 0.12 for cage?
• Rebase again, should I squash all RCs together or keep them for the "story"?

[primeos]

@Synthetica9 yes, I'd pin cage to wlroots 0.12 (we can always look at that later, outside of this PR) and squash the RCs together. Regarding squashing I'd do the following (IIRC that's how I handled it in the past but that is open for discussion if you don't like it):

1. Commit: Introduces wlroots_0_12 and pins the packages that still require it to that version
2. Commit: Updates wlroots and introduces the required changes to fix builds of other packages (except if we update their version)
3. Commit: Updates sway

[Synthetica9]

I think this PR is ready to be merged :)

[primeos]

Overall it LGTM now, thanks a lot! We mainly need to re-add recurseIntoAttrs for Wayfire (s. below).

nixpkgs-review result:

1 package added:
wlroots_0_12 (init at 0.12.0)

11 packages updated:
dwl fuzzel sway-contrib.grimshot (1.5.1 → 1.6) labwc (2021-02-06 → 2021-03-15) qt-video-wlr sway (1.5.1 → 1.6) sway-contrib.inactive-windows-transparency (1.5.1 → 1.6) sway-unwrapped (1.5.1 → 1.6) waybar wbg-unstable wlroots (0.12.0 → 0.13.0)

3 packages removed:
wayfire (†0.7.0) wcm (†0.7.0) wf-shell (†0.7.0)

12 packages built:
dwl fuzzel labwc qt-video-wlr sway sway-contrib.grimshot sway-contrib.inactive-windows-transparency sway-unwrapped waybar wbg wlroots wlroots_0_12

[primeos]

Thanks a lot, very well done!
I've briefly tested sway, dwl, and labwc on my old desktop PC. nixpkgs-review result:

1 package added:
wayfireApplications-unwrapped.wlroots (init at 0.12.0)

11 packages updated:
dwl fuzzel sway-contrib.grimshot (1.5.1 → 1.6) labwc (2021-02-06 → 2021-03-15) qt-video-wlr sway (1.5.1 → 1.6) sway-contrib.inactive-windows-transparency (1.5.1 → 1.6) sway-unwrapped (1.5.1 → 1.6) waybar wbg-unstable wlroots (0.12.0 → 0.13.0)

12 packages built:
dwl fuzzel labwc qt-video-wlr sway sway-contrib.grimshot sway-contrib.inactive-windows-transparency sway-unwrapped waybar wayfireApplications-unwrapped.wlroots wbg wlroots

Should be resolved now (GH doesn't handle that automatically)