diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-27 12:01:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-27 12:01:12 +0000 |
commit | 4a5044c558d52f024f446e9985cf42620785e384 (patch) | |
tree | 18969748355d2098b2c2e311ac837524f17f501c /pkgs/data | |
parent | d8a20a1d4d81e55a0663fc485f3314aebe25d6d5 (diff) | |
parent | 2ca7c1c8a6a7d58deadf6f6202fbe6ffb06eb521 (diff) | |
download | nixpkgs-4a5044c558d52f024f446e9985cf42620785e384.tar nixpkgs-4a5044c558d52f024f446e9985cf42620785e384.tar.gz nixpkgs-4a5044c558d52f024f446e9985cf42620785e384.tar.bz2 nixpkgs-4a5044c558d52f024f446e9985cf42620785e384.tar.lz nixpkgs-4a5044c558d52f024f446e9985cf42620785e384.tar.xz nixpkgs-4a5044c558d52f024f446e9985cf42620785e384.tar.zst nixpkgs-4a5044c558d52f024f446e9985cf42620785e384.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/junicode/default.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 4e42cf1c417..88ef4e588c7 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,22 +1,24 @@ -{ 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 ''; |