From 1f0e93aa19ca2fbd95f64057e28ae25173306717 Mon Sep 17 00:00:00 2001 From: dramforever Date: Mon, 21 Apr 2025 15:48:22 +0800 Subject: [PATCH 1/3] kdePackages.krohnkite: Add dramforever to maintainers --- pkgs/kde/third-party/krohnkite/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix index 75c3b01995a8..2107958a53bb 100644 --- a/pkgs/kde/third-party/krohnkite/default.nix +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -50,7 +50,10 @@ buildNpmPackage rec { description = "Dynamic Tiling Extension for KWin 6"; homepage = "https://github.com/anametologin/krohnkite"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ben9986 ]; + maintainers = with lib.maintainers; [ + ben9986 + dramforever + ]; platforms = lib.platforms.all; }; } From 3cd35a8bd6be898abc2ce35ff897a5fe22e77559 Mon Sep 17 00:00:00 2001 From: dramforever Date: Mon, 21 Apr 2025 15:34:34 +0800 Subject: [PATCH 2/3] kdePackages.krohnkite: Use nix-update-script --- pkgs/kde/third-party/krohnkite/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix index 2107958a53bb..5777b5360af6 100644 --- a/pkgs/kde/third-party/krohnkite/default.nix +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -1,5 +1,6 @@ { lib, + nix-update-script, buildNpmPackage, fetchFromGitHub, nodejs_22, @@ -7,14 +8,14 @@ kpackage, zip, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "krohnkite"; version = "0.9.8.5"; src = fetchFromGitHub { owner = "anametologin"; repo = "krohnkite"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DcNU0nx6KHztfMPFs5PZtZIeu4hDxNYIJa5E1fwMa0Q="; }; @@ -46,9 +47,12 @@ buildNpmPackage rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Dynamic Tiling Extension for KWin 6"; homepage = "https://github.com/anametologin/krohnkite"; + changelog = "https://github.com/anametologin/krohnkite/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ben9986 @@ -56,4 +60,4 @@ buildNpmPackage rec { ]; platforms = lib.platforms.all; }; -} +}) From bde63e100a082870aca354991fd50899d261c931 Mon Sep 17 00:00:00 2001 From: dramforever Date: Mon, 21 Apr 2025 15:47:21 +0800 Subject: [PATCH 3/3] kdePackages.krohnkite: 0.9.8.5 -> 0.9.9.0 --- pkgs/kde/third-party/krohnkite/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix index 5777b5360af6..346c8f43c6b4 100644 --- a/pkgs/kde/third-party/krohnkite/default.nix +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -10,13 +10,13 @@ }: buildNpmPackage (finalAttrs: { pname = "krohnkite"; - version = "0.9.8.5"; + version = "0.9.9.0"; src = fetchFromGitHub { owner = "anametologin"; repo = "krohnkite"; tag = finalAttrs.version; - hash = "sha256-DcNU0nx6KHztfMPFs5PZtZIeu4hDxNYIJa5E1fwMa0Q="; + hash = "sha256-23GNKxP/ItGJgElS8gK2lMMkjZ/3LITr40LXo9/o6Iw="; }; npmDepsHash = "sha256-Q/D6s0wOPSEziE1dBXgTakjhXCGvzhvLVS7zXcZlPCI="; @@ -41,7 +41,12 @@ buildNpmPackage (finalAttrs: { runHook preInstall substituteInPlace Makefile --replace-fail '7z a -tzip' 'zip -r' - make KWINPKG_FILE=krohnkite.kwinscript krohnkite.kwinscript + # Override PROJECT_VER and PROJECT_REV because we don't have .git + make \ + KWINPKG_FILE=krohnkite.kwinscript \ + PROJECT_REV=${finalAttrs.version} \ + PROJECT_VER=${finalAttrs.version} \ + krohnkite.kwinscript kpackagetool6 --type=KWin/Script --install=krohnkite.kwinscript --packageroot=$out/share/kwin/scripts runHook postInstall