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

sway: 1.8.1 -> 1.9.0 #287805

Merged
merged 1 commit into from
Feb 29, 2024
Merged

sway: 1.8.1 -> 1.9.0 #287805

merged 1 commit into from
Feb 29, 2024

Conversation

raboof
Copy link
Member

@raboof raboof commented Feb 10, 2024

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@oxalica
Copy link
Contributor

oxalica commented Feb 24, 2024

🎉 It's released now. https://github.com/swaywm/sway/releases/tag/1.9

pkgs/by-name/sw/sway-unwrapped/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sw/sway-unwrapped/package.nix Outdated Show resolved Hide resolved
@raboof raboof force-pushed the sway-update-to-1.9 branch from 904d719 to 25d5555 Compare February 25, 2024 11:50
@raboof raboof marked this pull request as ready for review February 25, 2024 11:51
@norpol
Copy link
Contributor

norpol commented Feb 25, 2024

Thanks for bumping, just built it and verified with this that I'm running the new release

swaymsg -t get_version
sway version 1.9

for my configuration everything appears to be working as expected, screen lock works, xdg-desktop-portal-wlr/screen sharing works as well.

@trofi
Copy link
Contributor

trofi commented Feb 25, 2024

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

2 packages failed to build:
  • swayfx
  • swayfx-unwrapped
8 packages built:
  • nwg-panel
  • nwg-panel.dist
  • sway
  • sway-contrib.grimshot
  • sway-contrib.grimshot.man
  • sway-unwrapped
  • waybar
  • wlprop

Copy link
Contributor

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

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

The change looks mostly good, but I believe we should also accordingly update the module to use wmenu instead of dmenu

@trofi regarding the build failure, it's because swayfx is a fork based off the older sway, and hence only support wlr 0.16.x. Swayfx upstream needs to bump.

@wineee
Copy link
Member

wineee commented Feb 26, 2024

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

2 packages failed to build:

  • swayfx
  • swayfx-unwrapped

8 packages built:

swayfx still need wlroots_0_16, it shouldn't inherit sway's buildInput if it cannot be guaranteed to be released synchronously with sway

(sway-unwrapped.override {

@eclairevoyant
Copy link
Contributor

Created raboof#2 to address the swayfx issues

@thiagokokada
Copy link
Contributor

Any concerns about merging this PR and fixing swayfx in a subsequent PR?

@oxalica
Copy link
Contributor

oxalica commented Feb 29, 2024

I'm running with sway on this PR for some days and it works fine. The only concern to me is that we are accepting parameter wlroots_0_17, which causes downstream overriding to be confusingly .override { wlroots_0_17 = pkgs.wl_roots_0_16; /* or whatever */ }. But I don't think it's fixable for by-name packages currently. Merging as-is is fine to me.

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

I agree with the point raboof#2 that swayfx should be decoupled from sway eventually. Ff that PR is merged into this PR's branch, I'd say we can merge this for now and deal with swayfx later.

@raboof raboof force-pushed the sway-update-to-1.9 branch from 77ff229 to 7d0757d Compare February 29, 2024 07:57
@raboof
Copy link
Member Author

raboof commented Feb 29, 2024

But I don't think it's fixable for by-name packages currently.

I think I found a way - applied - if that seems to work let's merge like that, unless maintainers @primeos or @Synthetica9 have any input

@clushie
Copy link

clushie commented Feb 29, 2024

[...] the module to use wmenu instead of dmenu

The file nixos/modules/programs/wayland/sway.nix:

swaylock swayidle foot dmenu

needs to be changed to wmenu otherwise this PR will break the default configuration. See the diff:

diff /nix/store/v1dwgcx2mp0phzh1inymxgapizbi7psc-sway-1.9/etc/sway/config /nix/store/jik0q6a6v7q5l6k04r6f0h7zjig5a7vf-sway-1.8.1/etc/sway/config
21c21
< set $menu dmenu_path | wmenu | xargs swaymsg exec --
---
> set $menu dmenu_path | dmenu | xargs swaymsg exec --
208c208
<     status_command while date +'%Y-%m-%d %X'; do sleep 1; done
---
>     status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done

On that front please also merge #284343 which was released shortly before sway 1.9

@raboof raboof force-pushed the sway-update-to-1.9 branch from 7d0757d to 5cbad8a Compare February 29, 2024 10:31
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Feb 29, 2024
@raboof
Copy link
Member Author

raboof commented Feb 29, 2024

needs to be changed to wmenu

updated, thanks!

please also merge #284343

it looks like that was already merged last month? did you mean to refer to another PR?

@clushie
Copy link

clushie commented Feb 29, 2024

@raboof Sorry I just double checked the commit and it should basically be wmenu and dmenu now 🙈, dmenu is still used to generate a list of executables in $PATH

readlink -f `which dmenu_path`
/nix/store/hb7qbfbfdz5xw12fd9b37vyhkrcl6yd0-dmenu-5.2/bin/dmenu_path

Ah omg didn't realize this had the merged icon sorry

Co-authored-by: Phileas Lebada <norpol@users.noreply.github.com>
Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
@raboof raboof force-pushed the sway-update-to-1.9 branch from 5cbad8a to 36e51d7 Compare February 29, 2024 10:37
@raboof
Copy link
Member Author

raboof commented Feb 29, 2024

Updated

@raboof raboof merged commit 728d2d1 into NixOS:master Feb 29, 2024
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants