From dbc73e5cded38bc249bca773c0ae85d607039e1c Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 5 Dec 2025 14:11:35 -0800 Subject: [PATCH] numix-icon-theme: move to by-name/ --- .../nu/numix-icon-theme/package.nix} | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 10 insertions(+), 14 deletions(-) rename pkgs/{data/icons/numix-icon-theme/default.nix => by-name/nu/numix-icon-theme/package.nix} (74%) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/by-name/nu/numix-icon-theme/package.nix similarity index 74% rename from pkgs/data/icons/numix-icon-theme/default.nix rename to pkgs/by-name/nu/numix-icon-theme/package.nix index 907e51a6e5cf..8438f544d88d 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/by-name/nu/numix-icon-theme/package.nix @@ -4,21 +4,21 @@ fetchFromGitHub, gtk3, adwaita-icon-theme, - breeze-icons, gnome-icon-theme, hicolor-icon-theme, gitUpdater, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "numix-icon-theme"; version = "25.10.26"; src = fetchFromGitHub { owner = "numixproject"; repo = "numix-icon-theme"; - rev = version; - sha256 = "sha256-YKR4dncq2uuX8CMJj/Zr/0pdl7gLC8VZGvb/HI1+Uwc="; + tag = finalAttrs.version; + hash = "sha256-YKR4dncq2uuX8CMJj/Zr/0pdl7gLC8VZGvb/HI1+Uwc="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - breeze-icons + libsForQt5.breeze-icons gnome-icon-theme hicolor-icon-theme ]; @@ -51,12 +51,12 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Numix icon theme"; homepage = "https://numixproject.github.io"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; # darwin cannot deal with file names differing only in case - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + 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 0aec23c18a1f..5b757354a103 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10433,10 +10433,6 @@ with pkgs; stdenv = gccStdenv; }; - numix-icon-theme = callPackage ../data/icons/numix-icon-theme { - inherit (plasma5Packages) breeze-icons; - }; - openmoji-color = callPackage ../data/fonts/openmoji { fontFormats = [ "glyf_colr_0" ]; }; openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = [ "glyf" ]; };