Skip to content

Commit ecb8f8a

Browse files
doronbehardoronbehar
authored
gentium: 6.200 -> 7.000 (#414001)
2 parents af9ffbb + 8579431 commit ecb8f8a

File tree

8 files changed

+132
-20
lines changed

8 files changed

+132
-20
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
1717

1818
- `base16-builder` node package has been removed due to lack of upstream maintenance.
19+
- `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.
1920

2021
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
2122

‎maintainers/maintainer-list.nix‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2652,6 +2652,11 @@
26522652
githubId = 9315;
26532653
name = "Zhong Jianxin";
26542654
};
2655+
b-fein = {
2656+
github = "b-fein";
2657+
githubId = 64250573;
2658+
name = "Benedikt Fein";
2659+
};
26552660
b-m-f = {
26562661
email = "[email protected]";
26572662
github = "b-m-f";

‎nixos/tests/fontconfig-default-fonts.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
gentium
1919
];
2020
fonts.fontconfig.defaultFonts = {
21-
serif = [ "Gentium Plus" ];
21+
serif = [ "Gentium" ];
2222
sansSerif = [ "Cantarell" ];
2323
monospace = [ "Source Code Pro" ];
2424
emoji = [ "Twitter Color Emoji" ];
2525
};
2626
};
2727

2828
testScript = ''
29-
machine.succeed("fc-match serif | grep '\"Gentium Plus\"'")
29+
machine.succeed("fc-match serif | grep '\"Gentium\"'")
3030
machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'")
3131
machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'")
3232
machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'")

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
lib,
3+
stdenvNoCC,
4+
fetchzip,
5+
}:
6+
7+
stdenvNoCC.mkDerivation (finalAttrs: {
8+
pname = "gentium-book";
9+
version = "7.000";
10+
11+
src = fetchzip {
12+
url = "http://software.sil.org/downloads/r/gentium/GentiumBook-${finalAttrs.version}.zip";
13+
hash = "sha256-A/QZX8OYrifaxChC08SNOaspdnSr8PxOtYgFAwUc5WY=";
14+
};
15+
16+
installPhase = ''
17+
runHook preInstall
18+
19+
install -Dm644 *.ttf -t $out/share/fonts/truetype
20+
install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
21+
cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
22+
23+
runHook postInstall
24+
'';
25+
26+
meta = {
27+
homepage = "https://software.sil.org/gentium/";
28+
description = "High-quality typeface family for Latin, Cyrillic, and Greek";
29+
longDescription = ''
30+
Gentium is a typeface family designed to enable the diverse ethnic groups
31+
around the world who use the Latin, Cyrillic and Greek scripts to produce
32+
readable, high-quality publications. It supports a wide range of Latin and
33+
Cyrillic-based alphabets.
34+
35+
The design is intended to be highly readable, reasonably compact, and
36+
visually attractive. The additional ‘extended’ Latin letters are designed
37+
to naturally harmonize with the traditional 26 ones. Diacritics are
38+
treated with careful thought and attention to their use. Gentium also
39+
supports both polytonic and monotonic Greek.
40+
41+
This package contains the regular and italic styles for the Gentium Book
42+
font family, along with documentation.
43+
'';
44+
downloadPage = "https://software.sil.org/gentium/download/";
45+
maintainers = with lib.maintainers; [
46+
b-fein
47+
raskin
48+
rycee
49+
];
50+
license = lib.licenses.ofl;
51+
platforms = lib.platforms.all;
52+
};
53+
})

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
lib,
3+
stdenvNoCC,
4+
fetchzip,
5+
}:
6+
7+
stdenvNoCC.mkDerivation (finalAttrs: {
8+
pname = "gentium-plus";
9+
version = "6.200";
10+
11+
src = fetchzip {
12+
url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${finalAttrs.version}.zip";
13+
hash = "sha256-gpVOtmF4Kp3y1Rm00c4o3WQEskO7mY1Z5SVaYHI0hzg=";
14+
};
15+
16+
installPhase = ''
17+
runHook preInstall
18+
19+
install -Dm644 *.ttf -t $out/share/fonts/truetype
20+
install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
21+
cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
22+
23+
runHook postInstall
24+
'';
25+
26+
meta = {
27+
homepage = "https://software.sil.org/gentium/";
28+
description = "High-quality typeface family for Latin, Cyrillic, and Greek";
29+
longDescription = ''
30+
Gentium is a typeface family designed to enable the diverse ethnic groups
31+
around the world who use the Latin, Cyrillic and Greek scripts to produce
32+
readable, high-quality publications. It supports a wide range of Latin and
33+
Cyrillic-based alphabets.
34+
35+
The design is intended to be highly readable, reasonably compact, and
36+
visually attractive. The additional ‘extended’ Latin letters are designed
37+
to naturally harmonize with the traditional 26 ones. Diacritics are
38+
treated with careful thought and attention to their use. Gentium Plus also
39+
supports both polytonic and monotonic Greek.
40+
41+
This package contains the regular and italic styles for the Gentium Plus
42+
font family, along with documentation.
43+
'';
44+
downloadPage = "https://software.sil.org/gentium/download/";
45+
maintainers = with lib.maintainers; [
46+
raskin
47+
rycee
48+
];
49+
license = lib.licenses.ofl;
50+
platforms = lib.platforms.all;
51+
};
52+
})

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
fetchzip,
55
}:
66

7-
stdenvNoCC.mkDerivation rec {
7+
stdenvNoCC.mkDerivation (finalAttrs: {
88
pname = "gentium";
9-
version = "6.200";
9+
version = "7.000";
1010

1111
src = fetchzip {
12-
url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip";
13-
hash = "sha256-gpVOtmF4Kp3y1Rm00c4o3WQEskO7mY1Z5SVaYHI0hzg=";
12+
url = "http://software.sil.org/downloads/r/gentium/Gentium-${finalAttrs.version}.zip";
13+
hash = "sha256-RBBecFdi/yyFfBk1CcQebOuAdKNUczpwOP52zVtbc2o=";
1414
};
1515

1616
installPhase = ''
1717
runHook preInstall
1818
1919
install -Dm644 *.ttf -t $out/share/fonts/truetype
20-
install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${pname}-${version}
21-
cp -r documentation $out/share/doc/${pname}-${version}
20+
install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
21+
cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
2222
2323
runHook postInstall
2424
'';
2525

26-
meta = with lib; {
26+
meta = {
2727
homepage = "https://software.sil.org/gentium/";
2828
description = "High-quality typeface family for Latin, Cyrillic, and Greek";
2929
longDescription = ''
@@ -35,18 +35,19 @@ stdenvNoCC.mkDerivation rec {
3535
The design is intended to be highly readable, reasonably compact, and
3636
visually attractive. The additional ‘extended’ Latin letters are designed
3737
to naturally harmonize with the traditional 26 ones. Diacritics are
38-
treated with careful thought and attention to their use. Gentium Plus also
38+
treated with careful thought and attention to their use. Gentium also
3939
supports both polytonic and monotonic Greek.
4040
41-
This package contains the regular and italic styles for the Gentium Plus
42-
font family, along with documentation.
41+
This package contains the regular and italic styles for the Gentium font
42+
family, along with documentation.
4343
'';
4444
downloadPage = "https://software.sil.org/gentium/download/";
45-
maintainers = with maintainers; [
45+
maintainers = with lib.maintainers; [
46+
b-fein
4647
raskin
4748
rycee
4849
];
49-
license = licenses.ofl;
50-
platforms = platforms.all;
50+
license = lib.licenses.ofl;
51+
platforms = lib.platforms.all;
5152
};
52-
}
53+
})

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
lib,
33
buildNimPackage,
44
fetchFromSourcehut,
5-
gentium,
5+
gentium-plus,
66
makeDesktopItem,
77
}:
88

@@ -19,7 +19,7 @@ buildNimPackage (finalAttrs: {
1919

2020
lockFile = ./lock.json;
2121

22-
HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf";
22+
HOTTEXT_FONT_PATH = "${gentium-plus}/share/fonts/truetype/GentiumPlus-Regular.ttf";
2323

2424
desktopItem = makeDesktopItem {
2525
categories = [ "Utility" ];

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
libiconv,
2121
# FONTCONFIG_FILE
2222
makeFontsConf,
23-
gentium,
23+
gentium-plus,
2424

2525
# passthru.tests
2626
runCommand,
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
100100

101101
FONTCONFIG_FILE = makeFontsConf {
102102
fontDirectories = [
103-
gentium
103+
gentium-plus
104104
];
105105
};
106106
strictDeps = true;

0 commit comments

Comments
 (0)