From 5040a41b2fdd8ff624f7632aa5f573600ad4fbce Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Wed, 3 Dec 2025 10:48:29 +0100 Subject: [PATCH] charis-sil: 6.200 -> 7.000, modernize and rename to charis --- pkgs/by-name/ch/charis-sil/package.nix | 37 ------------------- pkgs/by-name/ch/charis/package.nix | 51 ++++++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + 3 files changed, 52 insertions(+), 37 deletions(-) delete mode 100644 pkgs/by-name/ch/charis-sil/package.nix create mode 100644 pkgs/by-name/ch/charis/package.nix diff --git a/pkgs/by-name/ch/charis-sil/package.nix b/pkgs/by-name/ch/charis-sil/package.nix deleted file mode 100644 index 71e143a87ffc..000000000000 --- a/pkgs/by-name/ch/charis-sil/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchzip, -}: - -stdenvNoCC.mkDerivation rec { - pname = "charis-sil"; - version = "6.200"; - - src = fetchzip { - url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; - hash = "sha256-q451lec/l13Uanmr8K/C55Cr3avRvqQUkPK/ZZ1kgHo="; - }; - - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} - - runHook postInstall - ''; - - meta = { - homepage = "https://software.sil.org/charis"; - description = "Family of highly readable fonts for broad multilingual use"; - longDescription = '' - This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents. - - The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. - ''; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.f--t ]; - }; -} diff --git a/pkgs/by-name/ch/charis/package.nix b/pkgs/by-name/ch/charis/package.nix new file mode 100644 index 000000000000..53342c22b0ed --- /dev/null +++ b/pkgs/by-name/ch/charis/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "charis"; + version = "7.000"; + + src = fetchzip { + url = "https://software.sil.org/downloads/r/charis/Charis-${finalAttrs.version}.zip"; + hash = "sha256-cVz0U2PAIl8FqT/HhvDNoWg3SCwKQ1e7rdk+dkP1Cc8="; + }; + + installPhase = '' + runHook preInstall + + install -D --mode 444 --target-directory $out/share/fonts/truetype *.ttf + install -D --mode 444 --target-directory $out/share/doc/charis-${finalAttrs.version} \ + OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt + + runHook postInstall + ''; + + meta = { + homepage = "https://software.sil.org/charis"; + description = "Family of highly readable fonts for broad multilingual use"; + longDescription = '' + This Charis font is essentially the same design as the SIL Charis font + first released by SIL in 1997. Charis is similar to Bitstream Charter, + one of the first fonts designed specifically for laser printers. It is + highly readable and holds up well in less-than-ideal reproduction + environments. It also has a full set of styles – regular, italic, bold, + bold italic. Charis is a serif, proportionally-spaced font optimized for + readability in long printed documents. + + The goal for this product was to provide a single Unicode-based font + family that would contain a comprehensive inventory of glyphs needed for + almost any Roman- or Cyrillic-based writing system, whether used for + phonetic or orthographic needs. In addition, there is provision for other + characters and symbols useful to linguists. This font makes use of + state-of-the-art font technologies to support complex typographic issues, + such as the need to position arbitrary combinations of base glyphs and + diacritics optimally. + ''; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.f--t ]; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3c90c8ed4031..c15b13fc63ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -395,6 +395,7 @@ mapAliases { cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12 certmgr-selfsigned = throw "'certmgr-selfsigned' has been renamed to/replaced by 'certmgr'"; # Converted to throw 2025-10-27 challenger = throw "'challenger' has been renamed to/replaced by 'taler-challenger'"; # Converted to throw 2025-10-27 + charis-sil = throw "'charis-sil' has renamed to/replaced by 'charis'"; # Added 2025-12-01 charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18 chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 check-esxi-hardware = throw "'check-esxi-hardware' has been renamed to/replaced by 'nagiosPlugins.check_esxi_hardware'"; # Converted to throw 2025-10-27