[Backport release-24.05] hyprland: 0.40.0-unstable-2024-05-05 -> 0.41.1; hyprwayland-scanner: 0.3.4 -> 0.3.10; hyprlandPlugins.hy3: 0.40.0 -> 0.41.0; hyprutils: init at 0.1.2; hyprlandPlugins: init upstream hyprland-plugins at 0.41.1, hy3: 0.41.0 -> 0.41.1

[fufexan]

Description of changes

Manual backport for #319131, #321069, #309255, #321575.
Also backported hyprcursor-1.9, otherwise Hyprland wouldn't build.

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:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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.11 Release Notes (or backporting 23.11 and 24.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.

---

Add a 👍 reaction to pull requests you find important.

[JohnRTitor]

Passes my eyeball test, but CI seems to report an error, not a hard fail though.

[wineee]

CI fail caused by #317959 ， it not backport to release-24.05， cause
meta mismatch

meta = {
          homepage = "https://github.com/hyprwm/hyprwayland-scanner";
    -     description = "Hyprland version of wayland-scanner in and for C++";
    +-    description = "A Hyprland version of wayland-scanner in and for C++";
     -    license = licenses.bsd3;
     -    maintainers = with maintainers; [ fufexan ];
    ++    description = "Hyprland version of wayland-scanner in and for C++";
     +    changelog = "[https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}](https://github.com/hyprwm/hyprwayland-scanner/releases/tag/$%7BfinalAttrs.version%7D)";
     +    license = lib.licenses.bsd3;
     +    maintainers = with lib.maintainers; [ fufexan ];

[fufexan]

So we can't change meta for backports?

[JohnRTitor]

Could you do a partial backport of the conflicting commit? (of only the Hyprland package)

Else further backports to 24.05 will fail as well.

[fufexan]

Ok, I don't know what CI wants me to do. Is there a commit I'm missing?

[donovanglover]

Should be able to fix by removing the meta.description change in 8e4fa0d#diff-be17458e33be77de31b34f9517f70d41b45b6675673dd0174607d8aacc424c48L167

[Schweber]

@JohnRTitor hyprutils have been updated to 0.1.3 a few hours ago

[JohnRTitor]

@JohnRTitor hyprutils have been updated to 0.1.3 a few hours ago

Sure #321069

[donovanglover]

LGTM

[wineee]

hy3-0.41.0 failed to build, https://logs.ofborg.org/?key=nixos/nixpkgs.320347&attempt_id=86365f30-bb52-481c-a60e-612ff1d2c80e

[ 14%] Building CXX object CMakeFiles/hy3.dir/src/dispatchers.cpp.o
[ 28%] Building CXX object CMakeFiles/hy3.dir/src/main.cpp.o
[ 42%] Building CXX object CMakeFiles/hy3.dir/src/Hy3Layout.cpp.o
[ 71%] Building CXX object CMakeFiles/hy3.dir/src/SelectionHook.cpp.o
[ 71%] Building CXX object CMakeFiles/hy3.dir/src/Hy3Node.cpp.o
[ 85%] Building CXX object CMakeFiles/hy3.dir/src/TabGroup.cpp.o
/build/source/src/TabGroup.cpp:14:10: fatal error: src/helpers/memory/SharedPtr.hpp: No such file or directory
   14 | #include "src/helpers/memory/SharedPtr.hpp"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

[donovanglover]

Good catch. Upstream issue: outfoxxed/hy3#120

[JohnRTitor]

Please include the #321069 backport

And this is blocked until there is a 41.1 release of hy3

[JohnRTitor]

I feel like #309255 should be included as well since v0.40 changed the socket address.

[JohnRTitor]

I have removed the blockers please cherry-pick #321575.

Changes addressed

[JohnRTitor]

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

26 packages built:

• grimblast
• hdrop
• hyprcursor
• hyprcursor.dev
• hyprcursor.lib
• hyprland
• hyprland.dev
• hyprland.man
• hyprlandPlugins.borders-plus-plus
• hyprlandPlugins.csgo-vulkan-fix
• hyprlandPlugins.hy3
• hyprlandPlugins.hyprbars
• hyprlandPlugins.hyprexpo
• hyprlandPlugins.hyprtrails
• hyprlandPlugins.hyprwinwrap
• hyprpaper
• hyprshade
• hyprshade.dist
• hyprshot
• hyprutils
• hyprutils.dev
• hyprwayland-scanner
• nwg-panel
• nwg-panel.dist
• waybar
• xdg-desktop-portal-hyprland