hyprland: 0.45.2 -> 0.46.1; hyprland-plugins.*: version bumps and update script tweaks (#365776)

2025-04-16 18:58:28 +00:00 · 2024-12-17 11:27:41 -06:00 · 2024-12-17 11:27:41 -06:00 · a33ea1ad5c
commit a33ea1ad5c
parent 9720d2715d 81ef793133
11 changed files with 40 additions and 32 deletions
--- 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}";
--- 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";
--- 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";
--- 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 = [
--- 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 {
--- 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";
--- 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";
--- 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";
--- 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
    ];
  };
--- 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"
 }
--- 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