From 47c0835add11c354d6590017a9930158485f03c3 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 21:55:45 -0600 Subject: [PATCH 1/8] hyprlang: 0.5.2 -> 0.6.0 --- pkgs/by-name/hy/hyprlang/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 946d553240a9..0cbd1babd340 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -1,23 +1,30 @@ { lib, - stdenv, + gcc14Stdenv, fetchFromGitHub, cmake, + pkg-config, + hyprutils, }: -stdenv.mkDerivation (finalAttrs: { +gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlang"; rev = "v${finalAttrs.version}"; - hash = "sha256-Jq9hHYFL5nMHArWgJIcrDHGnzs/MjDi95cyB7cUZIJ4="; + hash = "sha256-oj8V4kvzor5AOStzj4/B4W1ZIObAPxT9K4NfXx7dyKE="; }; nativeBuildInputs = [ cmake + pkg-config + ]; + + buildInputs = [ + hyprutils ]; outputs = [ From c9d5661658e67e997ebcb3019c1ffec5e82dd544 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 22:10:23 -0600 Subject: [PATCH 2/8] hyprgraphics: init at 0.1.1 --- pkgs/by-name/hy/hyprgraphics/package.nix | 58 ++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 pkgs/by-name/hy/hyprgraphics/package.nix diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix new file mode 100644 index 000000000000..8079a2b65048 --- /dev/null +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -0,0 +1,58 @@ +{ + lib, + gcc14Stdenv, + fetchFromGitHub, + cmake, + pkg-config, + cairo, + file, + hyprutils, + libjpeg, + libjxl, + libwebp, + pixman, +}: + +gcc14Stdenv.mkDerivation (finalAttrs: { + pname = "hyprgraphics"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprgraphics"; + rev = "v${finalAttrs.version}"; + hash = "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cairo + file + hyprutils + libjpeg + libjxl + libwebp + pixman + ]; + + outputs = [ + "out" + "dev" + ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/hyprwm/hyprlang"; + description = "Official implementation library for the hypr config language"; + license = lib.licenses.lgpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + khaneliman + ]; + }; +}) From f76e06cbdc633a7691c9d98a131fb96c4f203313 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 21:52:34 -0600 Subject: [PATCH 3/8] hyprpaper: 0.7.1 -> 0.7.2 --- pkgs/by-name/hy/hyprpaper/package.nix | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index a1633a6d3ed6..55e8189568b5 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -1,8 +1,7 @@ { lib, - stdenv, + gcc14Stdenv, fetchFromGitHub, - fetchpatch, cmake, cairo, expat, @@ -12,6 +11,7 @@ libdatrie, libGL, libjpeg, + libjxl, libselinux, libsepol, libthai, @@ -27,27 +27,20 @@ wayland-scanner, hyprwayland-scanner, hyprutils, + hyprgraphics, }: -stdenv.mkDerivation (finalAttrs: { +gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprpaper"; rev = "v${finalAttrs.version}"; - hash = "sha256-HIK7XJWQCM0BAnwW5uC7P0e7DAkVTy5jlxQ0NwoSy4M="; + hash = "sha256-bXWLq/0Ji13CM4uX4tnBgWpvRysh4H3N1OC1t6d1Sfc="; }; - patches = [ - # CMakeLists: look for wayland.xml protocol in wayland-scanner pkgdata - (fetchpatch { - url = "https://github.com/hyprwm/hyprpaper/commit/6c6e54faa84d2de94d2321eda43a8a669ebf3312.patch"; - hash = "sha256-Ns7HlUPVgBDIocZRGR6kIW58Mt92kJPQRMSKTvp6Vik="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -64,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { libdatrie libGL libjpeg + libjxl libselinux libsepol libthai @@ -76,11 +70,12 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols hyprutils + hyprgraphics ]; prePatch = '' substituteInPlace src/main.cpp \ - --replace GIT_COMMIT_HASH '"${finalAttrs.src.rev}"' + --replace-fail GIT_COMMIT_HASH '"${finalAttrs.src.rev}"' ''; meta = with lib; { @@ -93,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { wozeparrot ]; inherit (wayland.meta) platforms; - broken = stdenv.hostPlatform.isDarwin; + broken = gcc14Stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; }; }) From a237e2cf3278c96b8857af3a7673d92b4dfa4610 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 22:30:13 -0600 Subject: [PATCH 4/8] hyprlock: use gcc14Stdenv --- pkgs/by-name/hy/hyprlock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 7a744ea14456..c2bf1ba33ef6 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc14Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -24,7 +24,7 @@ nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; version = "0.5.0"; From d7a4feeef06bf3a9a26c39604f6d03e3abb3d990 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 22:31:09 -0600 Subject: [PATCH 5/8] hypridle: use gcc14Stdenv --- pkgs/by-name/hy/hypridle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 6265bd2dc005..aa9e74b0ce55 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc14Stdenv, fetchFromGitHub, pkg-config, cmake, @@ -14,7 +14,7 @@ nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; version = "0.1.5"; From 05912ba9254367c3d6fa834fedebef7984b8f182 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 22:31:44 -0600 Subject: [PATCH 6/8] hyprcursor: use gcc14Stdenv and patch --- pkgs/by-name/hy/hyprcursor/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index 9ef6b761f704..69c4a3c41cb8 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc14Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -11,8 +11,9 @@ xcur2png, tomlplusplus, nix-update-script, + fetchpatch, }: -stdenv.mkDerivation (finalAttrs: { +gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprcursor"; version = "0.1.10"; @@ -43,6 +44,14 @@ stdenv.mkDerivation (finalAttrs: { "lib" ]; + patches = [ + # NOTE: remove after next release + (fetchpatch { + name = "001-add-fstream-include"; + url = "https://github.com/hyprwm/hyprcursor/commit/c18572a92eb39e4921b4f4c2bca8521b6f701b58.patch"; + hash = "sha256-iHRRd/18xEAgvJgmZeSzMp53s+zdIpuaP/sayRfcft4="; + }) + ]; passthru.updateScript = nix-update-script { }; meta = { From 53b38747982bc7dfc919cfca3c339a541a996be2 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 22:47:54 -0600 Subject: [PATCH 7/8] xdg-desktop-portal: 1.3.6 -> 1.3.8 --- .../hyprwm/xdg-desktop-portal-hyprland/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index e46b2e677acd..4b1ce22677dd 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -18,7 +18,7 @@ qtbase, qttools, qtwayland, - sdbus-cpp, + sdbus-cpp_2, slurp, systemd, wayland, @@ -27,13 +27,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.6"; + version = "1.3.8"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0="; + hash = "sha256-V+CvM2UBJ6KjXD+B7T6vy8EYwLvLX88tZb8KP73MPSo="; }; depsBuildBuild = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { qtbase qttools qtwayland - sdbus-cpp + sdbus-cpp_2 systemd wayland wayland-protocols From ea3c70b39af0fcdbb2354418829674e555a125f7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 22:48:02 -0600 Subject: [PATCH 8/8] xdg-desktop-portal: use gcc14Stdenv --- .../hyprwm/xdg-desktop-portal-hyprland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 4b1ce22677dd..3dcbf74dbddb 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc14Stdenv, fetchFromGitHub, cmake, makeWrapper, @@ -25,7 +25,7 @@ wayland-protocols, wayland-scanner, }: -stdenv.mkDerivation (finalAttrs: { +gcc14Stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; version = "1.3.8";