From f882afff2c68092ac29f1b953fb24bf88a8e3cb0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 28 Jul 2025 12:50:20 +0000 Subject: [PATCH] kora-icon-theme: migrate to by-name kora-icon-theme: refactor package definitions kora-icon-theme: switch to kdePackages --- .../ko/kora-icon-theme/package.nix} | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) rename pkgs/{data/icons/kora-icon-theme/default.nix => by-name/ko/kora-icon-theme/package.nix} (76%) diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/by-name/ko/kora-icon-theme/package.nix similarity index 76% rename from pkgs/data/icons/kora-icon-theme/default.nix rename to pkgs/by-name/ko/kora-icon-theme/package.nix index bb32bda29cf4..5996ec27e1e1 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/by-name/ko/kora-icon-theme/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, gtk3, adwaita-icon-theme, - breeze-icons, + kdePackages, hicolor-icon-theme, gitUpdater, }: @@ -16,8 +16,8 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "bikass"; repo = "kora"; - rev = "v${version}"; - sha256 = "sha256-Oralfx5MzCzkx+c+zwtFp8q83oKrNINd/PmVeugNKGo="; + tag = "v${version}"; + hash = "sha256-Oralfx5MzCzkx+c+zwtFp8q83oKrNINd/PmVeugNKGo="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; @@ -50,11 +50,11 @@ stdenvNoCC.mkDerivation rec { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "SVG icon theme in four variants"; homepage = "https://github.com/bikass/kora"; - license = with licenses; [ gpl3Only ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15b7b79653f4..e162e6bb35ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11483,10 +11483,6 @@ with pkgs; kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; - kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (libsForQt5.kdeFrameworks) breeze-icons; - }; - la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme { inherit (plasma5Packages) breeze-icons; inherit (pantheon) elementary-icon-theme;