From 95a968cd324d152ed4f4ae514321824b66b55d54 Mon Sep 17 00:00:00 2001
From: Ivan Timokhin <dev@ivan.timokhin.name>
Date: Sun, 8 Mar 2020 12:30:43 +0300
Subject: [PATCH 1/5] junicode: 0.7.8 -> 1.002

---
 pkgs/data/fonts/junicode/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index 1cfe1d5d4b00..26455cd2f401 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -1,16 +1,16 @@
 { lib, fetchzip }:
 
 fetchzip {
-  name = "junicode-0.7.8";
+  name = "junicode-1.002";
 
-  url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip;
+  url = mirror://sourceforge/junicode/junicode/junicode-1.002/junicode-1.002.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/;

From df082cc0b45353b43464a943cff47ed1e346d143 Mon Sep 17 00:00:00 2001
From: Ivan Timokhin <dev@ivan.timokhin.name>
Date: Sun, 8 Mar 2020 12:36:34 +0300
Subject: [PATCH 2/5] 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
---
 pkgs/data/fonts/junicode/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index 26455cd2f401..f66515cce79a 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -15,6 +15,6 @@ fetchzip {
   meta = {
     homepage = http://junicode.sourceforge.net/;
     description = "A Unicode font for medievalists";
-    license = lib.licenses.gpl2Plus;
+    license = lib.licenses.ofl;
   };
 }

From b3b95adac9eccc122e06e19346745ddbe8741bc7 Mon Sep 17 00:00:00 2001
From: Ivan Timokhin <dev@ivan.timokhin.name>
Date: Sat, 4 Apr 2020 19:06:59 +0300
Subject: [PATCH 3/5] maintainers: add ivan-timokhin

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 00ae59df8585..40689291e449 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3169,6 +3169,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";

From 63a2dca669cd86181d03fa52f5724ae88dddf757 Mon Sep 17 00:00:00 2001
From: Ivan Timokhin <dev@ivan.timokhin.name>
Date: Sat, 4 Apr 2020 19:07:18 +0300
Subject: [PATCH 4/5] junicode: add ivan-timokhin to maintainers

---
 pkgs/data/fonts/junicode/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index f66515cce79a..950a909235f3 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -15,6 +15,7 @@ fetchzip {
   meta = {
     homepage = http://junicode.sourceforge.net/;
     description = "A Unicode font for medievalists";
+    maintainers = with lib.maintainers; [ ivan-timokhin ];
     license = lib.licenses.ofl;
   };
 }

From 9c7dc00719c9414ea3a2b04a77da250dd25694e7 Mon Sep 17 00:00:00 2001
From: Ivan Timokhin <dev@ivan.timokhin.name>
Date: Sat, 4 Apr 2020 19:16:34 +0300
Subject: [PATCH 5/5] junicode: split name into pname and version

---
 pkgs/data/fonts/junicode/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index 950a909235f3..1e1341932f56 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -1,9 +1,12 @@
 { lib, fetchzip }:
 
-fetchzip {
-  name = "junicode-1.002";
+let
+  pname = "junicode";
+  version = "1.002";
+in fetchzip {
+  name = "${pname}-${version}";
 
-  url = mirror://sourceforge/junicode/junicode/junicode-1.002/junicode-1.002.zip;
+  url = "mirror://sourceforge/junicode/junicode/junicode-${version}/junicode-${version}.zip";
 
   postFetch = ''
     mkdir -p $out/share/fonts