gentium: 6.200 -> 7.000 (#414001)

doc/release-notes/rl-2511.section.md

@@ -16,6 +16,7 @@
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
+- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
 
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 

maintainers/maintainer-list.nix

@@ -2652,6 +2652,11 @@
     githubId = 9315;
     name = "Zhong Jianxin";
   };
+  b-fein = {
+    github = "b-fein";
+    githubId = 64250573;
+    name = "Benedikt Fein";
+  };
   b-m-f = {
     email = "maximilian@sodawa.com";
     github = "b-m-f";

nixos/tests/fontconfig-default-fonts.nix

@@ -18,7 +18,7 @@
         gentium
       ];
       fonts.fontconfig.defaultFonts = {
-        serif = [ "Gentium Plus" ];
+        serif = [ "Gentium" ];
         sansSerif = [ "Cantarell" ];
         monospace = [ "Source Code Pro" ];
         emoji = [ "Twitter Color Emoji" ];
@@ -26,7 +26,7 @@
     };
 
   testScript = ''
-    machine.succeed("fc-match serif | grep '\"Gentium Plus\"'")
+    machine.succeed("fc-match serif | grep '\"Gentium\"'")
     machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'")
     machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'")
     machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'")

pkgs/by-name/ge/gentium-book/package.nix

@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "gentium-book";
+  version = "7.000";
+
+  src = fetchzip {
+    url = "http://software.sil.org/downloads/r/gentium/GentiumBook-${finalAttrs.version}.zip";
+    hash = "sha256-A/QZX8OYrifaxChC08SNOaspdnSr8PxOtYgFAwUc5WY=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 *.ttf -t $out/share/fonts/truetype
+    install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+    cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://software.sil.org/gentium/";
+    description = "High-quality typeface family for Latin, Cyrillic, and Greek";
+    longDescription = ''
+      Gentium is a typeface family designed to enable the diverse ethnic groups
+      around the world who use the Latin, Cyrillic and Greek scripts to produce
+      readable, high-quality publications. It supports a wide range of Latin and
+      Cyrillic-based alphabets.
+
+      The design is intended to be highly readable, reasonably compact, and
+      visually attractive. The additional ‘extended’ Latin letters are designed
+      to naturally harmonize with the traditional 26 ones. Diacritics are
+      treated with careful thought and attention to their use. Gentium also
+      supports both polytonic and monotonic Greek.
+
+      This package contains the regular and italic styles for the Gentium Book
+      font family, along with documentation.
+    '';
+    downloadPage = "https://software.sil.org/gentium/download/";
+    maintainers = with lib.maintainers; [
+      b-fein
+      raskin
+      rycee
+    ];
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/ge/gentium-plus/package.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "gentium-plus";
+  version = "6.200";
+
+  src = fetchzip {
+    url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${finalAttrs.version}.zip";
+    hash = "sha256-gpVOtmF4Kp3y1Rm00c4o3WQEskO7mY1Z5SVaYHI0hzg=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 *.ttf -t $out/share/fonts/truetype
+    install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+    cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://software.sil.org/gentium/";
+    description = "High-quality typeface family for Latin, Cyrillic, and Greek";
+    longDescription = ''
+      Gentium is a typeface family designed to enable the diverse ethnic groups
+      around the world who use the Latin, Cyrillic and Greek scripts to produce
+      readable, high-quality publications. It supports a wide range of Latin and
+      Cyrillic-based alphabets.
+
+      The design is intended to be highly readable, reasonably compact, and
+      visually attractive. The additional ‘extended’ Latin letters are designed
+      to naturally harmonize with the traditional 26 ones. Diacritics are
+      treated with careful thought and attention to their use. Gentium Plus also
+      supports both polytonic and monotonic Greek.
+
+      This package contains the regular and italic styles for the Gentium Plus
+      font family, along with documentation.
+    '';
+    downloadPage = "https://software.sil.org/gentium/download/";
+    maintainers = with lib.maintainers; [
+      raskin
+      rycee
+    ];
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/ge/gentium/package.nix

@@ -4,26 +4,26 @@
   fetchzip,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gentium";
-  version = "6.200";
+  version = "7.000";
 
   src = fetchzip {
-    url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip";
-    hash = "sha256-gpVOtmF4Kp3y1Rm00c4o3WQEskO7mY1Z5SVaYHI0hzg=";
+    url = "http://software.sil.org/downloads/r/gentium/Gentium-${finalAttrs.version}.zip";
+    hash = "sha256-RBBecFdi/yyFfBk1CcQebOuAdKNUczpwOP52zVtbc2o=";
   };
 
   installPhase = ''
     runHook preInstall
 
     install -Dm644 *.ttf -t $out/share/fonts/truetype
-    install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${pname}-${version}
-    cp -r documentation $out/share/doc/${pname}-${version}
+    install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+    cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://software.sil.org/gentium/";
     description = "High-quality typeface family for Latin, Cyrillic, and Greek";
     longDescription = ''
@@ -35,18 +35,19 @@ stdenvNoCC.mkDerivation rec {
       The design is intended to be highly readable, reasonably compact, and
       visually attractive. The additional ‘extended’ Latin letters are designed
       to naturally harmonize with the traditional 26 ones. Diacritics are
-      treated with careful thought and attention to their use. Gentium Plus also
+      treated with careful thought and attention to their use. Gentium also
       supports both polytonic and monotonic Greek.
 
-      This package contains the regular and italic styles for the Gentium Plus
-      font family, along with documentation.
+      This package contains the regular and italic styles for the Gentium font
+      family, along with documentation.
     '';
     downloadPage = "https://software.sil.org/gentium/download/";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
+      b-fein
       raskin
       rycee
     ];
-    license = licenses.ofl;
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
   };
-}
+})

pkgs/by-name/ho/hottext/package.nix

@@ -2,7 +2,7 @@
   lib,
   buildNimPackage,
   fetchFromSourcehut,
-  gentium,
+  gentium-plus,
   makeDesktopItem,
 }:
 
@@ -19,7 +19,7 @@ buildNimPackage (finalAttrs: {
 
   lockFile = ./lock.json;
 
-  HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf";
+  HOTTEXT_FONT_PATH = "${gentium-plus}/share/fonts/truetype/GentiumPlus-Regular.ttf";
 
   desktopItem = makeDesktopItem {
     categories = [ "Utility" ];

pkgs/by-name/si/sile/package.nix

@@ -20,7 +20,7 @@
   libiconv,
   # FONTCONFIG_FILE
   makeFontsConf,
-  gentium,
+  gentium-plus,
 
   # passthru.tests
   runCommand,
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   FONTCONFIG_FILE = makeFontsConf {
     fontDirectories = [
-      gentium
+      gentium-plus
     ];
   };
   strictDeps = true;