pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #229751 from fufexan/hyprland

hyprwm: update packages

authored by

Jörg Thalheim and committed by
GitHub 933c8e6f 78963777

+34 -29
unified split
+6 -6
pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
··· 4 , meson 5 , ninja 6 }: 7 - stdenv.mkDerivation rec { 8 pname = "hyprland-protocols"; 9 - version = "unstable-2023-01-13"; 10 11 src = fetchFromGitHub { 12 owner = "hyprwm"; 13 - repo = pname; 14 - rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90"; 15 - hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0="; 16 }; 17 18 nativeBuildInputs = [ ··· 27 maintainers = with lib.maintainers; [ fufexan ]; 28 platforms = lib.platforms.linux; 29 }; 30 - }
··· 4 , meson 5 , ninja 6 }: 7 + stdenv.mkDerivation (finalAttrs: { 8 pname = "hyprland-protocols"; 9 + version = "0.2"; 10 11 src = fetchFromGitHub { 12 owner = "hyprwm"; 13 + repo = finalAttrs.pname; 14 + rev = "v${finalAttrs.version}"; 15 + hash = "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc="; 16 }; 17 18 nativeBuildInputs = [ ··· 27 maintainers = with lib.maintainers; [ fufexan ]; 28 platforms = lib.platforms.linux; 29 }; 30 + })
+9 -9
pkgs/applications/window-managers/hyprwm/hyprland/default.nix
··· 36 ''; 37 in 38 assert assertXWayland; 39 - stdenv.mkDerivation rec { 40 pname = "hyprland" + lib.optionalString debug "-debug"; 41 - version = "0.24.0"; 42 43 src = fetchFromGitHub { 44 owner = "hyprwm"; 45 - repo = "hyprland"; 46 - rev = "v${version}"; 47 - hash = "sha256-zbtxX0NezuNg46PAKscmDfFfNID4rAq2qGNf1BE3Cqc="; 48 }; 49 50 patches = [ 51 # make meson use the provided dependencies instead of the git submodules 52 - "${src}/nix/meson-build.patch" 53 ]; 54 55 postPatch = '' 56 # Fix hardcoded paths to /usr installation 57 sed -i "s#/usr#$out#" src/render/OpenGL.cpp 58 substituteInPlace meson.build \ 59 - --replace "@GIT_COMMIT_HASH@" '${version}' \ 60 --replace "@GIT_DIRTY@" "" 61 ''; 62 ··· 71 outputs = [ 72 "out" 73 "man" 74 ]; 75 76 buildInputs = ··· 103 (lib.optional withSystemd "-Dsystemd=enabled") 104 ]; 105 106 - 107 passthru.providedSessions = [ "hyprland" ]; 108 109 meta = with lib; { ··· 114 mainProgram = "Hyprland"; 115 platforms = wlroots.meta.platforms; 116 }; 117 - }
··· 36 ''; 37 in 38 assert assertXWayland; 39 + stdenv.mkDerivation (finalAttrs: { 40 pname = "hyprland" + lib.optionalString debug "-debug"; 41 + version = "0.25.0"; 42 43 src = fetchFromGitHub { 44 owner = "hyprwm"; 45 + repo = finalAttrs.pname; 46 + rev = "v${finalAttrs.version}"; 47 + hash = "sha256-Npf48UUfywneFYGEc7NQ59xudwvw7EJjwweT4tHguIY="; 48 }; 49 50 patches = [ 51 # make meson use the provided dependencies instead of the git submodules 52 + "${finalAttrs.src}/nix/meson-build.patch" 53 ]; 54 55 postPatch = '' 56 # Fix hardcoded paths to /usr installation 57 sed -i "s#/usr#$out#" src/render/OpenGL.cpp 58 substituteInPlace meson.build \ 59 + --replace "@GIT_COMMIT_HASH@" '${finalAttrs.src.rev}' \ 60 --replace "@GIT_DIRTY@" "" 61 ''; 62 ··· 71 outputs = [ 72 "out" 73 "man" 74 + "dev" 75 ]; 76 77 buildInputs = ··· 104 (lib.optional withSystemd "-Dsystemd=enabled") 105 ]; 106 107 passthru.providedSessions = [ "hyprland" ]; 108 109 meta = with lib; { ··· 114 mainProgram = "Hyprland"; 115 platforms = wlroots.meta.platforms; 116 }; 117 + })
+2 -2
pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
··· 49 domain = "gitlab.freedesktop.org"; 50 owner = "wlroots"; 51 repo = "wlroots"; 52 - rev = "7abda952d0000b72d240fe1d41457b9288f0b6e5"; 53 - hash = "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg="; 54 }; 55 56 pname =
··· 49 domain = "gitlab.freedesktop.org"; 50 owner = "wlroots"; 51 repo = "wlroots"; 52 + rev = "6830bfc17fd94709e2cdd4da0af989f102a26e59"; 53 + hash = "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4="; 54 }; 55 56 pname =
+4 -4
pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
··· 13 14 stdenv.mkDerivation (finalAttrs: { 15 pname = "hyprpaper"; 16 - version = "unstable-2023-04-05"; 17 18 src = fetchFromGitHub { 19 owner = "hyprwm"; 20 - repo = "hyprpaper"; 21 - rev = "9182de9ffc8c76fbf24d16dec0ea7a9430597a06"; 22 - hash = "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o="; 23 }; 24 25 nativeBuildInputs = [
··· 13 14 stdenv.mkDerivation (finalAttrs: { 15 pname = "hyprpaper"; 16 + version = "0.1.0"; 17 18 src = fetchFromGitHub { 19 owner = "hyprwm"; 20 + repo = finalAttrs.pname; 21 + rev = "v${finalAttrs.version}"; 22 + hash = "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc="; 23 }; 24 25 nativeBuildInputs = [
+5 -5
pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
··· 21 , libXdmcp 22 , debug ? false 23 }: 24 - stdenv.mkDerivation { 25 pname = "hyprpicker" + lib.optionalString debug "-debug"; 26 - version = "unstable-2023-03-31"; 27 28 src = fetchFromGitHub { 29 owner = "hyprwm"; 30 - repo = "hyprpicker"; 31 - rev = "cc6b3234b2966acd61c8a2e5caae947774666601"; 32 hash = "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE="; 33 }; 34 ··· 92 maintainers = with maintainers; [ fufexan ]; 93 platforms = wayland.meta.platforms; 94 }; 95 - }
··· 21 , libXdmcp 22 , debug ? false 23 }: 24 + stdenv.mkDerivation (finalAttrs: { 25 pname = "hyprpicker" + lib.optionalString debug "-debug"; 26 + version = "0.1.0"; 27 28 src = fetchFromGitHub { 29 owner = "hyprwm"; 30 + repo = finalAttrs.pname; 31 + rev = "v${finalAttrs.version}"; 32 hash = "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE="; 33 }; 34 ··· 92 maintainers = with maintainers; [ fufexan ]; 93 platforms = wayland.meta.platforms; 94 }; 95 + })
+2
pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
··· 9 , hyprland-share-picker 10 , inih 11 , libdrm 12 , mesa 13 , pipewire 14 , systemd ··· 36 hyprland-protocols 37 inih 38 libdrm 39 mesa 40 pipewire 41 systemd
··· 9 , hyprland-share-picker 10 , inih 11 , libdrm 12 + , libuuid 13 , mesa 14 , pipewire 15 , systemd ··· 37 hyprland-protocols 38 inih 39 libdrm 40 + libuuid 41 mesa 42 pipewire 43 systemd
+6 -3
pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix
··· 2 , fetchFromGitHub 3 , wayland 4 }: 5 { 6 - version = "unstable-2023-04-06"; 7 8 src = fetchFromGitHub { 9 owner = "hyprwm"; 10 repo = "xdg-desktop-portal-hyprland"; 11 - rev = "803c00db1191604d50766358dbc5be2de4fcb4e7"; 12 - hash = "sha256-+AagxTHrzKgngG+guIWAIV5hX1HkkvMbDxbUq2IVwAM="; 13 }; 14 15 meta = with lib; {
··· 2 , fetchFromGitHub 3 , wayland 4 }: 5 + let 6 + version = "0.3.1"; 7 + in 8 { 9 + inherit version; 10 11 src = fetchFromGitHub { 12 owner = "hyprwm"; 13 repo = "xdg-desktop-portal-hyprland"; 14 + rev = "v${version}"; 15 + hash = "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM="; 16 }; 17 18 meta = with lib; {