From 470ad5f3ad6eda1a0c279af1573746ac373e20e7 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Thu, 1 Jan 2026 13:27:13 -0800 Subject: [PATCH 1/3] paratype-pt-mono: move src to google fonts, ofl license --- pkgs/by-name/pa/paratype-pt-mono/package.nix | 32 +++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/pa/paratype-pt-mono/package.nix b/pkgs/by-name/pa/paratype-pt-mono/package.nix index 1a95bbf38519..a0573a129183 100644 --- a/pkgs/by-name/pa/paratype-pt-mono/package.nix +++ b/pkgs/by-name/pa/paratype-pt-mono/package.nix @@ -1,41 +1,37 @@ { lib, stdenvNoCC, - fetchzip, + fetchFromGitHub, }: stdenvNoCC.mkDerivation { pname = "paratype-pt-mono"; - version = "2.005"; + version = "1.001"; - src = fetchzip { - urls = [ - "https://company.paratype.com/system/attachments/631/original/ptmono.zip" - "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" - ]; - stripRoot = false; - hash = "sha256-mfDAu/KGelC6wZpUCrUrLVZKo+XiKNBqcpMI8tH2tMw="; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf"; + hash = "sha256-wzm6KzO/arar7VMvm0l0L6gi3CnglmZKSGe7c0i530Q="; + rootDir = "ofl/ptmono"; }; installPhase = '' runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 *.txt -t $out/share/doc/paratype runHook postInstall ''; meta = { - homepage = "http://www.paratype.ru/public/"; + homepage = "https://www.paratype.ru/catalog/font/pt/pt-mono"; description = "Open Paratype font"; - - license = lib.licenses.paratype; - # no commercial distribution of the font on its own - # must rename on modification - # http://www.paratype.ru/public/pt_openlicense.asp - + license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ + raskin + pancaek + ]; }; } From ab0f6e4182c973c4ef31300adaeb9292435dcec6 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Thu, 1 Jan 2026 13:27:13 -0800 Subject: [PATCH 2/3] paratype-pt-sans: move src to google fonts, ofl license --- pkgs/by-name/pa/paratype-pt-sans/package.nix | 32 +++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/pa/paratype-pt-sans/package.nix b/pkgs/by-name/pa/paratype-pt-sans/package.nix index f57cca833bbd..000ac93e602b 100644 --- a/pkgs/by-name/pa/paratype-pt-sans/package.nix +++ b/pkgs/by-name/pa/paratype-pt-sans/package.nix @@ -1,41 +1,37 @@ { lib, stdenvNoCC, - fetchzip, + fetchFromGitHub, }: stdenvNoCC.mkDerivation { pname = "paratype-pt-sans"; - version = "2.005"; + version = "2.003"; - src = fetchzip { - urls = [ - "https://company.paratype.com/system/attachments/629/original/ptsans.zip" - "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" - ]; - stripRoot = false; - hash = "sha256-34TqYXtWzkAstaGQBhJy+/hVk5tg6ZvHZ/kvUroWVLs="; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf"; + hash = "sha256-44G9Pdi4GxeC9hzvCKuE7AmHyjVrjzalr3XZOgl3l6o="; + rootDir = "ofl/ptsans"; }; installPhase = '' runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 *.txt -t $out/share/doc/paratype runHook postInstall ''; meta = { - homepage = "http://www.paratype.ru/public/"; + homepage = "https://www.paratype.ru/catalog/font/pt/pt-sans"; description = "Open Paratype font"; - - license = lib.licenses.paratype; - # no commercial distribution of the font on its own - # must rename on modification - # http://www.paratype.ru/public/pt_openlicense.asp - + license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ + raskin + pancaek + ]; }; } From 5a3116cfb49401c9a5a5415790a753bb7dd5c045 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Thu, 1 Jan 2026 13:27:13 -0800 Subject: [PATCH 3/3] paratype-pt-serif: move src to google fonts, ofl license --- pkgs/by-name/pa/paratype-pt-serif/package.nix | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/pa/paratype-pt-serif/package.nix b/pkgs/by-name/pa/paratype-pt-serif/package.nix index b23b3804db3e..f84c4f0df42b 100644 --- a/pkgs/by-name/pa/paratype-pt-serif/package.nix +++ b/pkgs/by-name/pa/paratype-pt-serif/package.nix @@ -1,41 +1,37 @@ { lib, stdenvNoCC, - fetchzip, + fetchFromGitHub, }: stdenvNoCC.mkDerivation { pname = "paratype-pt-serif"; - version = "2.005"; + version = "1.000"; - src = fetchzip { - urls = [ - "https://company.paratype.com/system/attachments/634/original/ptserif.zip" - "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" - ]; - stripRoot = false; - hash = "sha256-4L3t5NEHmj975fn8eBAkRUO1OL0xseNp9g7k7tt/O2c="; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf"; + hash = "sha256-HpA4r5VqAVtPFY9ltRUeZERNfyFRkAvwununoDF+5mk="; + rootDir = "ofl/ptserif"; }; installPhase = '' runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 *.txt -t $out/share/doc/paratype runHook postInstall ''; meta = { - homepage = "http://www.paratype.ru/public/"; + homepage = "https://www.paratype.ru/catalog/font/pt/pt-serif"; description = "Open Paratype font"; - - license = lib.licenses.paratype; - # no commercial distribution of the font on its own - # must rename on modification - # http://www.paratype.ru/public/pt_openlicense.asp - + license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ + raskin + pancaek + ]; }; }