Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d449e60555f0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1af2f1163305
Choose a head ref
  • 6 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 8, 2020

  1. junicode: 0.7.8 -> 1.002

    @ivan-timokhin
    ivan-timokhin committed Mar 8, 2020
    Copy the full SHA
    95a968c View commit details

  2. junicode: change license to OFL 

    Both the project page ([1], third paragraph) and the
documentation ([2], second-to-last paragraph on the last page)
indicate that the font is available under SIL OFL.

[1]: http://junicode.sourceforge.net/
[2]: http://junicode.sourceforge.net/Junicode.pdf
    @ivan-timokhin
    ivan-timokhin committed Mar 8, 2020
    Copy the full SHA
    df082cc View commit details

Commits on Apr 4, 2020

  1. maintainers: add ivan-timokhin

    @ivan-timokhin
    ivan-timokhin committed Apr 4, 2020
    Copy the full SHA
    b3b95ad View commit details

  2. junicode: add ivan-timokhin to maintainers

    @ivan-timokhin
    ivan-timokhin committed Apr 4, 2020
    Copy the full SHA
    63a2dca View commit details

  3. junicode: split name into pname and version

    @ivan-timokhin
    ivan-timokhin committed Apr 4, 2020
    Copy the full SHA
    9c7dc00 View commit details

Commits on Apr 6, 2020

  1. Merge pull request #82044 from ivan-timokhin/junicode-1.002 

    junicode: update to 1.002 and correct license
    @timokau
    timokau authored Apr 6, 2020
    Copy the full SHA
    1af2f11 View commit details
Showing with 15 additions and 5 deletions.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +9 −5 pkgs/data/fonts/junicode/default.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
14 changes: 9 additions & 5 deletions pkgs/data/fonts/junicode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}