diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2020-04-06 09:11:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 09:11:13 +0000 |
| commit | 1af2f1163305f1c6c5c8f66815bad825cbb12fd4 (patch) | |
| tree | 39c937d025569dc9a37be555c005df5c1393676e | |
| parent | d449e60555f07a9070d196d0ab99a024bd562e89 (diff) | |
| parent | 9c7dc00719c9414ea3a2b04a77da250dd25694e7 (diff) | |
| download | nixpkgs-1af2f1163305f1c6c5c8f66815bad825cbb12fd4.tar nixpkgs-1af2f1163305f1c6c5c8f66815bad825cbb12fd4.tar.gz nixpkgs-1af2f1163305f1c6c5c8f66815bad825cbb12fd4.tar.bz2 nixpkgs-1af2f1163305f1c6c5c8f66815bad825cbb12fd4.tar.lz nixpkgs-1af2f1163305f1c6c5c8f66815bad825cbb12fd4.tar.xz nixpkgs-1af2f1163305f1c6c5c8f66815bad825cbb12fd4.tar.zst nixpkgs-1af2f1163305f1c6c5c8f66815bad825cbb12fd4.zip | |
Merge pull request #82044 from ivan-timokhin/junicode-1.002
junicode: update to 1.002 and correct license
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/fonts/junicode/default.nix | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ac2b51881aa..3551ef849ed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3239,6 +3239,12 @@ githubId = 4458; name = "Ivan Kozik"; }; + ivan-timokhin = { + email = "nixpkgs@ivan.timokhin.name"; + name = "Ivan Timokhin"; + github = "ivan-timokhin"; + githubId = 9802104; + }; ivan-tkatchev = { email = "tkatchev@gmail.com"; name = "Ivan Tkatchev"; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 1cfe1d5d4b0..1e1341932f5 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,20 +1,24 @@ { lib, fetchzip }: -fetchzip { - name = "junicode-0.7.8"; +let + pname = "junicode"; + version = "1.002"; +in fetchzip { + name = "${pname}-${version}"; - url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; + url = "mirror://sourceforge/junicode/junicode/junicode-${version}/junicode-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/junicode-ttf ''; - sha256 = "0q4si9pnbif36154sv49kzc7ygivgflv81nzmblpz3b2p77g9956"; + sha256 = "1n170gw41lr0zr5958z5cgpg6i1aa7kj7iq9s6gdh1cqq7hhgd08"; meta = { homepage = http://junicode.sourceforge.net/; description = "A Unicode font for medievalists"; - license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ivan-timokhin ]; + license = lib.licenses.ofl; }; } |