From f72531b3e9572d9df5783b161d1f7c55159a90fc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:18:50 +0100 Subject: [PATCH] treewide: move fonts to pkgs/by-name --- .../an/ankacoder-condensed/package.nix} | 0 .../an/ankacoder/package.nix} | 0 pkgs/by-name/ar/arphic-ukai/package.nix | 42 ++++++++++ pkgs/by-name/ar/arphic-uming/package.nix | 42 ++++++++++ .../fi/fira-code-symbols/package.nix} | 0 .../fi/fira-code/package.nix} | 0 .../ha/hackgen-font/package.nix} | 0 .../ha/hackgen-nf-font/package.nix} | 0 .../in/inconsolata-lgc/package.nix} | 0 .../in/inconsolata/package.nix} | 0 .../in/input-fonts/package.nix} | 0 .../jo/joypixels/package.nix} | 0 .../na/navilu-font/package.nix} | 4 +- .../pa/paratype-pt-mono/package.nix} | 0 .../pa/paratype-pt-sans/package.nix} | 0 .../pa/paratype-pt-serif/package.nix} | 0 .../pr/profont/package.nix} | 4 +- pkgs/by-name/ta/tai-ahom/package.nix | 33 ++++++++ pkgs/data/fonts/arphic/default.nix | 82 ------------------- pkgs/data/fonts/tai-languages/default.nix | 38 --------- pkgs/top-level/all-packages.nix | 31 ------- 21 files changed, 121 insertions(+), 155 deletions(-) rename pkgs/{data/fonts/ankacoder/condensed.nix => by-name/an/ankacoder-condensed/package.nix} (100%) rename pkgs/{data/fonts/ankacoder/default.nix => by-name/an/ankacoder/package.nix} (100%) create mode 100644 pkgs/by-name/ar/arphic-ukai/package.nix create mode 100644 pkgs/by-name/ar/arphic-uming/package.nix rename pkgs/{data/fonts/fira-code/symbols.nix => by-name/fi/fira-code-symbols/package.nix} (100%) rename pkgs/{data/fonts/fira-code/default.nix => by-name/fi/fira-code/package.nix} (100%) rename pkgs/{data/fonts/hackgen/default.nix => by-name/ha/hackgen-font/package.nix} (100%) rename pkgs/{data/fonts/hackgen/nerdfont.nix => by-name/ha/hackgen-nf-font/package.nix} (100%) rename pkgs/{data/fonts/inconsolata/lgc.nix => by-name/in/inconsolata-lgc/package.nix} (100%) rename pkgs/{data/fonts/inconsolata/default.nix => by-name/in/inconsolata/package.nix} (100%) rename pkgs/{data/fonts/input-fonts/default.nix => by-name/in/input-fonts/package.nix} (100%) rename pkgs/{data/fonts/joypixels/default.nix => by-name/jo/joypixels/package.nix} (100%) rename pkgs/{data/fonts/navilu/default.nix => by-name/na/navilu-font/package.nix} (93%) rename pkgs/{data/fonts/paratype-pt/mono.nix => by-name/pa/paratype-pt-mono/package.nix} (100%) rename pkgs/{data/fonts/paratype-pt/sans.nix => by-name/pa/paratype-pt-sans/package.nix} (100%) rename pkgs/{data/fonts/paratype-pt/serif.nix => by-name/pa/paratype-pt-serif/package.nix} (100%) rename pkgs/{data/fonts/profont/default.nix => by-name/pr/profont/package.nix} (96%) create mode 100644 pkgs/by-name/ta/tai-ahom/package.nix delete mode 100644 pkgs/data/fonts/arphic/default.nix delete mode 100644 pkgs/data/fonts/tai-languages/default.nix diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/by-name/an/ankacoder-condensed/package.nix similarity index 100% rename from pkgs/data/fonts/ankacoder/condensed.nix rename to pkgs/by-name/an/ankacoder-condensed/package.nix diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/by-name/an/ankacoder/package.nix similarity index 100% rename from pkgs/data/fonts/ankacoder/default.nix rename to pkgs/by-name/an/ankacoder/package.nix diff --git a/pkgs/by-name/ar/arphic-ukai/package.nix b/pkgs/by-name/ar/arphic-ukai/package.nix new file mode 100644 index 000000000000..6df92965f5ef --- /dev/null +++ b/pkgs/by-name/ar/arphic-ukai/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenvNoCC, + fetchurl, + mkfontdir, + mkfontscale, +}: + +stdenvNoCC.mkDerivation rec { + pname = "arphic-ukai"; + version = "0.2.20080216.2"; + + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall + + install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc + cd $out/share/fonts + mkfontdir + mkfontscale + + runHook postInstall + ''; + + meta = with lib; { + description = "CJK Unicode font Kai style"; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; + + license = licenses.arphicpl; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ar/arphic-uming/package.nix b/pkgs/by-name/ar/arphic-uming/package.nix new file mode 100644 index 000000000000..3d23d2e3c1ce --- /dev/null +++ b/pkgs/by-name/ar/arphic-uming/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenvNoCC, + fetchurl, + mkfontdir, + mkfontscale, +}: + +stdenvNoCC.mkDerivation rec { + pname = "arphic-uming"; + version = "0.2.20080216.2"; + + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall + + install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc + cd $out/share/fonts + mkfontdir + mkfontscale + + runHook postInstall + ''; + + meta = with lib; { + description = "CJK Unicode font Ming style"; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; + + license = licenses.arphicpl; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/by-name/fi/fira-code-symbols/package.nix similarity index 100% rename from pkgs/data/fonts/fira-code/symbols.nix rename to pkgs/by-name/fi/fira-code-symbols/package.nix diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/by-name/fi/fira-code/package.nix similarity index 100% rename from pkgs/data/fonts/fira-code/default.nix rename to pkgs/by-name/fi/fira-code/package.nix diff --git a/pkgs/data/fonts/hackgen/default.nix b/pkgs/by-name/ha/hackgen-font/package.nix similarity index 100% rename from pkgs/data/fonts/hackgen/default.nix rename to pkgs/by-name/ha/hackgen-font/package.nix diff --git a/pkgs/data/fonts/hackgen/nerdfont.nix b/pkgs/by-name/ha/hackgen-nf-font/package.nix similarity index 100% rename from pkgs/data/fonts/hackgen/nerdfont.nix rename to pkgs/by-name/ha/hackgen-nf-font/package.nix diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/by-name/in/inconsolata-lgc/package.nix similarity index 100% rename from pkgs/data/fonts/inconsolata/lgc.nix rename to pkgs/by-name/in/inconsolata-lgc/package.nix diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/by-name/in/inconsolata/package.nix similarity index 100% rename from pkgs/data/fonts/inconsolata/default.nix rename to pkgs/by-name/in/inconsolata/package.nix diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/by-name/in/input-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/input-fonts/default.nix rename to pkgs/by-name/in/input-fonts/package.nix diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/by-name/jo/joypixels/package.nix similarity index 100% rename from pkgs/data/fonts/joypixels/default.nix rename to pkgs/by-name/jo/joypixels/package.nix diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/by-name/na/navilu-font/package.nix similarity index 93% rename from pkgs/data/fonts/navilu/default.nix rename to pkgs/by-name/na/navilu-font/package.nix index e796bebd3bf1..4d9ba79067e9 100644 --- a/pkgs/data/fonts/navilu/default.nix +++ b/pkgs/by-name/na/navilu-font/package.nix @@ -1,11 +1,11 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, fontforge, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "navilu-font"; version = "1.2"; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/by-name/pa/paratype-pt-mono/package.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/mono.nix rename to pkgs/by-name/pa/paratype-pt-mono/package.nix diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/by-name/pa/paratype-pt-sans/package.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/sans.nix rename to pkgs/by-name/pa/paratype-pt-sans/package.nix diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/by-name/pa/paratype-pt-serif/package.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/serif.nix rename to pkgs/by-name/pa/paratype-pt-serif/package.nix diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/by-name/pr/profont/package.nix similarity index 96% rename from pkgs/data/fonts/profont/default.nix rename to pkgs/by-name/pr/profont/package.nix index ed264c41f247..146baa6231d4 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/by-name/pr/profont/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb"; stripRoot = false; } - + /profont-x11; + + "/profont-x11"; srcOtb = fetchzip { @@ -25,7 +25,7 @@ stdenv.mkDerivation { sha256 = "18rfhfqrsj3510by0w1a7ak5as6r2cxh8xv02xc1y30mfa6g24x6"; stripRoot = false; } - + /profont-otb; + + "/profont-otb"; dontBuild = true; diff --git a/pkgs/by-name/ta/tai-ahom/package.nix b/pkgs/by-name/ta/tai-ahom/package.nix new file mode 100644 index 000000000000..b588cadc1292 --- /dev/null +++ b/pkgs/by-name/ta/tai-ahom/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +stdenvNoCC.mkDerivation { + pname = "tai-ahom"; + version = "unstable-2015-07-06"; + + src = fetchurl { + url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf"; + hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/enabling-languages/tai-languages"; + description = "Unicode-compliant Tai Ahom font"; + maintainers = with maintainers; [ mathnerd314 ]; + license = licenses.ofl; # See font metadata + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix deleted file mode 100644 index e658dcb713ff..000000000000 --- a/pkgs/data/fonts/arphic/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - mkfontdir, - mkfontscale, -}: - -let - version = "0.2.20080216.2"; -in -{ - arphic-ukai = stdenvNoCC.mkDerivation rec { - pname = "arphic-ukai"; - inherit version; - - src = fetchurl { - url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; - hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I="; - }; - - nativeBuildInputs = [ - mkfontscale - mkfontdir - ]; - - installPhase = '' - runHook preInstall - - install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc - cd $out/share/fonts - mkfontdir - mkfontscale - - runHook postInstall - ''; - - meta = with lib; { - description = "CJK Unicode font Kai style"; - homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; - - license = licenses.arphicpl; - maintainers = [ maintainers.changlinli ]; - platforms = platforms.all; - }; - }; - - arphic-uming = stdenvNoCC.mkDerivation rec { - pname = "arphic-uming"; - inherit version; - - src = fetchurl { - url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; - hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds="; - }; - - nativeBuildInputs = [ - mkfontscale - mkfontdir - ]; - - installPhase = '' - runHook preInstall - - install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc - cd $out/share/fonts - mkfontdir - mkfontscale - - runHook postInstall - ''; - - meta = with lib; { - description = "CJK Unicode font Ming style"; - homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; - - license = licenses.arphicpl; - maintainers = [ maintainers.changlinli ]; - platforms = platforms.all; - }; - }; -} diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix deleted file mode 100644 index 97acb4920610..000000000000 --- a/pkgs/data/fonts/tai-languages/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, -}: - -{ - tai-ahom = stdenvNoCC.mkDerivation rec { - pname = "tai-ahom"; - version = "unstable-2015-07-06"; - - src = fetchurl { - url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf"; - hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/enabling-languages/tai-languages"; - description = "Unicode-compliant Tai Ahom font"; - maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.ofl; # See font metadata - platforms = platforms.all; - }; - }; - - # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f4ab07d90a..8cae33627c19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1645,9 +1645,6 @@ with pkgs; arpack-mpi = arpack.override { useMpi = true; }; - inherit (callPackages ../data/fonts/arphic {}) - arphic-ukai arphic-uming; - asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { }; atomicparsley = callPackage ../tools/video/atomicparsley { @@ -4380,8 +4377,6 @@ with pkgs; mytetra = libsForQt5.callPackage ../applications/office/mytetra { }; - navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; }; - nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { }); netcdf-mpi = netcdf.override { @@ -12711,9 +12706,6 @@ with pkgs; andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { }; - ankacoder = callPackage ../data/fonts/ankacoder { }; - ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { }; - ant-theme = callPackage ../data/themes/ant-theme/ant.nix { }; ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { }; @@ -12772,9 +12764,6 @@ with pkgs; inherit (nodePackages) svgo; }; - fira-code = callPackage ../data/fonts/fira-code { }; - fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -12816,22 +12805,10 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - hackgen-font = callPackage ../data/fonts/hackgen { }; - - hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { }; - - inconsolata = callPackage ../data/fonts/inconsolata { }; - - inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix { }; - - input-fonts = callPackage ../data/fonts/input-fonts { }; - iosevka = callPackage ../data/fonts/iosevka { }; iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { }; iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {}); - joypixels = callPackage ../data/fonts/joypixels { }; - kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { @@ -12917,10 +12894,6 @@ with pkgs; papis = with python3Packages; toPythonApplication papis; - paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix { }; - paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix { }; - paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix { }; - plata-theme = callPackage ../data/themes/plata { inherit (mate) marco; }; @@ -12931,8 +12904,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - profont = callPackage ../data/fonts/profont { }; - qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { }; ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix { @@ -12973,8 +12944,6 @@ with pkgs; source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf; source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf; - inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; - tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; };