diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 91f57ad526d92..7aee0a3a17a41 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -2,14 +2,12 @@ lib, callPackage, pkg-config, - stdenv, - hyprland, }: let mkHyprlandPlugin = hyprland: args@{ pluginName, ... }: - stdenv.mkDerivation ( + hyprland.stdenv.mkDerivation ( args // { pname = "${pluginName}"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix index f5caf1b875780..dc78919bf92ab 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -3,18 +3,18 @@ mkHyprlandPlugin, fetchFromGitHub, hyprland, - unstableGitUpdater, + nix-update-script, }: mkHyprlandPlugin hyprland { pluginName = "hypr-dynamic-cursors"; - version = "0-unstable-2024-11-19"; + version = "0-unstable-2024-12-14"; src = fetchFromGitHub { owner = "VirtCode"; repo = "hypr-dynamic-cursors"; - rev = "81f4b964f997a3174596ef22c7a1dee8a5f616c7"; - hash = "sha256-3SDwq2i2QW9nu7HBCPuDtLmrwLt2kajzImBsawKRZ+s="; + rev = "f0cef070c531e3a3a1f713b7062bded357b4c468"; + hash = "sha256-XFQqJWxo6xUqLpAKqc0bHg1pZ21eFQ1HueDTxw7N6r8="; }; dontUseCmakeConfigure = true; @@ -28,7 +28,7 @@ mkHyprlandPlugin hyprland { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "Plugin to make your Hyprland cursor more realistic"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix index 63a219f3173fb..a3f80eb836078 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix @@ -3,6 +3,7 @@ mkHyprlandPlugin, hyprland, fetchFromGitHub, + nix-update-script, }: mkHyprlandPlugin hyprland { @@ -25,6 +26,7 @@ mkHyprlandPlugin hyprland { runHook postInstall ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { homepage = "https://github.com/pyt0xic/hyprfocus"; description = "Focus animation plugin for Hyprland inspired by Flashfocus"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix index cc088d87f2cb0..5d17306cb33e6 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix @@ -13,13 +13,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprgrass"; - version = "0.8.2-unstable-2024-10-30"; + version = "0.8.2-unstable-2024-12-13"; src = fetchFromGitHub { owner = "horriblename"; repo = "hyprgrass"; - rev = "f97b6ac2b7de3bae194b776c388467db2604929f"; - hash = "sha256-Jg5Q/v8tcNjopTMbra82y5n9QQdCnrbEFNgT1kA7pQE="; + rev = "dc19ccb209147312a4f60d76193b995c2634e756"; + hash = "sha256-3ALmrImk37KT+UHt1EMi6PAHyj8WhL9Xw/Ar/ys4rtk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 55d2be93403f2..db8fdf62b3d13 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.45.0"; + version = "0.46.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; rev = "refs/tags/v${version}"; - hash = "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk="; + hash = "sha256-Q9bXV9d6xqxr8V1UKmmmHdCgky3I4n2hk1TDxZ/pBto="; }; in mkHyprlandPlugin hyprland { diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix index d5029e20ed8bf..e46864b96d86f 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix @@ -4,18 +4,18 @@ hyprland, cmake, fetchFromGitHub, - unstableGitUpdater, + nix-update-script, }: mkHyprlandPlugin hyprland { pluginName = "hyprscroller"; - version = "0-unstable-2024-11-29"; + version = "0-unstable-2024-12-17"; src = fetchFromGitHub { owner = "dawsers"; repo = "hyprscroller"; - rev = "50a87a8a7dc56494a5b71e95182ef4b907d71448"; - hash = "sha256-4Gzj0HWovu0hzzw+2zEXne7vDmP6yIK2GmtURB1EZxQ="; + rev = "9dc46c3c98e875a8f3b2a118ef3859a3c714c887"; + hash = "sha256-CifZc4Ev+CG4qHHOH6e6NLBLQNbFVn4gZEFNCX8e0QQ="; }; nativeBuildInputs = [ cmake ]; @@ -29,7 +29,7 @@ mkHyprlandPlugin hyprland { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { homepage = "https://github.com/dawsers/hyprscroller"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix index 79d88bc4e45f8..ca470d454430e 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix @@ -3,18 +3,18 @@ fetchFromGitHub, hyprland, mkHyprlandPlugin, - unstableGitUpdater, + nix-update-script, }: mkHyprlandPlugin hyprland { pluginName = "hyprspace"; - version = "0-unstable-2024-11-02"; + version = "0-unstable-2024-12-08"; src = fetchFromGitHub { owner = "KZDKM"; repo = "hyprspace"; - rev = "260f386075c7f6818033b05466a368d8821cde2d"; - hash = "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ="; + rev = "e2d561c933cd085d68bf0b39c4f78870ad0abbc2"; + hash = "sha256-YiLUDw14NaavML8y9rxXxO7q+j3b/ghQhBmIy0+/Zmk="; }; dontUseCmakeConfigure = true; @@ -28,7 +28,7 @@ mkHyprlandPlugin hyprland { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { homepage = "https://github.com/KZDKM/Hyprspace"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index f2ef35f0ed863..ee03570e13d7d 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -5,16 +5,17 @@ hyprland, ninja, mkHyprlandPlugin, + nix-update-script, }: mkHyprlandPlugin hyprland rec { pluginName = "hyprsplit"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; rev = "refs/tags/v${version}"; - hash = "sha256-otDIivy4sMZBN2t9eHVI5PaFacg2Je4U9gBPPcH/Vpo="; + hash = "sha256-R/aLxJTLUi3bYQu38vVosTDPrFHAYwz4n34JbO1PPm0="; }; nativeBuildInputs = [ @@ -22,6 +23,8 @@ mkHyprlandPlugin hyprland rec { ninja ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/shezdy/hyprsplit"; description = "Hyprland plugin for awesome / dwm like workspaces"; diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index 8079a2b65048f..43eb8f4b7e7dc 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -52,6 +52,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ + fufexan khaneliman ]; }; diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index c12aedc68e49a..51be5efa24257 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.45.2-b", - "commit_hash": "12f9a0d0b93f691d4d9923716557154d74777b0a", - "commit_message": "[gha] Nix: update inputs", - "date": "2024-11-19", - "tag": "v0.45.2" + "branch": "v0.46.1-b", + "commit_hash": "254fc2bc6000075f660b4b8ed818a6af544d1d64", + "commit_message": "version: bump to 0.46.1", + "date": "2024-12-17", + "tag": "v0.46.1" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index d144b31b1031d..594b91370cac3 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -14,6 +14,7 @@ epoll-shim, git, hyprcursor, + hyprgraphics, hyprlang, hyprutils, hyprwayland-scanner, @@ -28,6 +29,7 @@ pciutils, pkgconf, python3, + re2, systemd, tomlplusplus, wayland, @@ -82,14 +84,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.45.2"; + version = "0.46.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-1pNsLGNStCFjXiBc2zMUxKzKk45CePTf+GwKlzTmrCY="; + hash = "sha256-0SVRQJeKsdwaTO7pMM0MwTXyVwKNQ4m1f2mvcPnZttM="; }; postPatch = '' @@ -138,6 +140,7 @@ customStdenv.mkDerivation (finalAttrs: { cairo git hyprcursor.dev + hyprgraphics hyprlang hyprutils libGL @@ -148,6 +151,7 @@ customStdenv.mkDerivation (finalAttrs: { mesa pango pciutils + re2 tomlplusplus wayland wayland-protocols