From 87f1d1beb9393085e47e45c46e29673192b991b6 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 16 Mar 2024 20:01:22 +0100 Subject: [PATCH] kuro: bump electron version and do clean up --- pkgs/applications/misc/kuro/default.nix | 21 +++++++++++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/kuro/default.nix b/pkgs/applications/misc/kuro/default.nix index 50a773b5c5182..55a2e04c93269 100644 --- a/pkgs/applications/misc/kuro/default.nix +++ b/pkgs/applications/misc/kuro/default.nix @@ -5,18 +5,21 @@ , makeDesktopItem , copyDesktopItems , mkYarnPackage -, electron +, electron_29 }: +let + electron = electron_29; +in mkYarnPackage rec { pname = "kuro"; version = "9.0.0"; src = fetchFromGitHub { owner = "davidsmorais"; - repo = pname; + repo = "kuro"; rev = "v${version}"; - sha256 = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU="; + hash = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU="; }; packageJSON = ./package.json; @@ -26,7 +29,7 @@ mkYarnPackage rec { hash = "sha256-GTiNv7u1QK/wjQgpka7REuoLn2wjZG59kYJQaZZPycI="; }; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ makeWrapper @@ -68,21 +71,23 @@ mkYarnPackage rec { desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; + name = "kuro"; + exec = "kuro"; + icon = "kuro"; desktopName = "Kuro"; genericName = "Microsoft To-Do Client"; comment = meta.description; categories = [ "Office" ]; - startupWMClass = pname; + startupWMClass = "kuro"; }) ]; meta = with lib; { + changelog = "https://github.com/davidsmorais/kuro/releases/tag/${src.rev}"; description = "An unofficial, featureful, open source, community-driven, free Microsoft To-Do app"; homepage = "https://github.com/davidsmorais/kuro"; license = licenses.mit; + mainProgram = "kuro"; maintainers = with maintainers; [ ChaosAttractor ]; inherit (electron.meta) platforms; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acd7f66f5b615..62029d568d39b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32822,9 +32822,7 @@ with pkgs; kupfer = callPackage ../applications/misc/kupfer { }; - kuro = callPackage ../applications/misc/kuro { - electron = electron_22; - }; + kuro = callPackage ../applications/misc/kuro { }; timoni = callPackage ../applications/networking/cluster/timoni { };