Merge pull request #250525 from ivan-timokhin/junicode-2.00

junicode: 1.003 -> 2.200

authored by Mario Rodas and committed by GitHub ae1374a3 57de8658

+19 -13
+2
nixos/doc/manual/release-notes/rl-2311.section.md
··· 339 339 340 340 - `mkDerivation` now rejects MD5 hashes. 341 341 342 + - The `junicode` font package has been updated to [major version 2](https://github.com/psb1558/Junicode-font/releases/tag/v2.001), which is now a font family. In particular, plain `Junicode.ttf` no longer exists. In addition, TrueType font files are now placed in `font/truetype` instead of `font/junicode-ttf`; this change does not affect use via `fonts.packages` NixOS option. 343 + 342 344 ## Other Notable Changes {#sec-release-23.11-notable-changes} 343 345 344 346 - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
+13 -11
pkgs/data/fonts/junicode/default.nix
··· 1 - { lib, stdenvNoCC, fetchFromGitHub }: 1 + { lib, stdenvNoCC, fetchzip }: 2 2 3 - stdenvNoCC.mkDerivation { 3 + stdenvNoCC.mkDerivation rec { 4 4 pname = "junicode"; 5 - version = "1.003"; 5 + version = "2.200"; 6 6 7 - src = fetchFromGitHub { 8 - owner = "psb1558"; 9 - repo = "Junicode-font"; 10 - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; 11 - hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; 7 + src = fetchzip { 8 + url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; 9 + hash = "sha256-2K+zPq6Bjg+hZQhQrWWm1bxHVfwwRdsV7EseRGBnpUw="; 12 10 }; 13 11 12 + outputs = [ "out" "doc" ]; 13 + 14 14 installPhase = '' 15 15 runHook preInstall 16 16 17 - local out_ttf=$out/share/fonts/junicode-ttf 18 - mkdir -p $out_ttf 19 - cp legacy/*.ttf $out_ttf 17 + install -Dm 444 -t $out/share/fonts/truetype TTF/*.ttf VAR/*.ttf 18 + install -Dm 444 -t $out/share/fonts/opentype OTF/*.otf 19 + install -Dm 444 -t $out/share/fonts/woff2 WOFF2/*.woff2 20 + 21 + install -Dm 444 -t $doc/share/doc/${pname}-${version} docs/*.pdf 20 22 21 23 runHook postInstall 22 24 '';
+4 -2
pkgs/tools/typesetting/satysfi/default.nix
··· 65 65 cp -r lib-satysfi/dist/ $out/share/satysfi/ 66 66 cp -r \ 67 67 ${ipaexfont}/share/fonts/opentype/* \ 68 - ${junicode}/share/fonts/junicode-ttf/* \ 69 68 ${lmodern}/share/fonts/opentype/public/lm/* \ 70 69 ${lmmath}/share/fonts/opentype/latinmodern-math.otf \ 71 - $out/share/satysfi/dist/fonts 70 + ${junicode}/share/fonts/truetype/Junicode-{Bold,BoldItalic,Italic}.ttf \ 71 + $out/share/satysfi/dist/fonts/ 72 + cp ${junicode}/share/fonts/truetype/Junicode-Regular.ttf \ 73 + $out/share/satysfi/dist/fonts/Junicode.ttf 72 74 ''; 73 75 74 76 meta = with lib; {