Unverified Commit ae1374a3 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

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

junicode: 1.003 -> 2.200
parents 57de8658 49c7d93c

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -339,6 +339,8 @@ 


- `mkDerivation` now rejects MD5 hashes.



- 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.



## Other Notable Changes {#sec-release-23.11-notable-changes}



- 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.

pkgs/data/fonts/junicode/default.nix

+13 −11
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchFromGitHub }:

{ lib, stdenvNoCC, fetchzip }:



stdenvNoCC.mkDerivation {

stdenvNoCC.mkDerivation rec {

  pname = "junicode";

  version = "1.003";

  version = "2.200";



  src = fetchFromGitHub {

    owner = "psb1558";

    repo = "Junicode-font";

    rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb";

    hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4=";

  src = fetchzip {

    url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip";

    hash = "sha256-2K+zPq6Bjg+hZQhQrWWm1bxHVfwwRdsV7EseRGBnpUw=";

  };



  outputs = [ "out" "doc" ];



  installPhase = ''

    runHook preInstall



    local out_ttf=$out/share/fonts/junicode-ttf

    mkdir -p $out_ttf

    cp legacy/*.ttf $out_ttf

    install -Dm 444 -t $out/share/fonts/truetype TTF/*.ttf VAR/*.ttf

    install -Dm 444 -t $out/share/fonts/opentype OTF/*.otf

    install -Dm 444 -t $out/share/fonts/woff2 WOFF2/*.woff2



    install -Dm 444 -t $doc/share/doc/${pname}-${version} docs/*.pdf



    runHook postInstall

  '';

pkgs/tools/typesetting/satysfi/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -65,10 +65,12 @@ in 
      cp -r lib-satysfi/dist/ $out/share/satysfi/

      cp -r \

        ${ipaexfont}/share/fonts/opentype/* \

        ${junicode}/share/fonts/junicode-ttf/* \

        ${lmodern}/share/fonts/opentype/public/lm/* \

        ${lmmath}/share/fonts/opentype/latinmodern-math.otf \

        $out/share/satysfi/dist/fonts

        ${junicode}/share/fonts/truetype/Junicode-{Bold,BoldItalic,Italic}.ttf \

        $out/share/satysfi/dist/fonts/

      cp ${junicode}/share/fonts/truetype/Junicode-Regular.ttf \

        $out/share/satysfi/dist/fonts/Junicode.ttf

    '';



    meta = with lib; {