From d5ab4c9f3147991f6034abb60ff56ef7305ed3cb Mon Sep 17 00:00:00 2001 From: Emi Simpson Date: Fri, 23 Feb 2024 16:47:34 -0500 Subject: [PATCH] Update JustSeeds package --- packages/justseeds.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/justseeds.nix b/packages/justseeds.nix index ed52291..9bef60a 100644 --- a/packages/justseeds.nix +++ b/packages/justseeds.nix @@ -1,6 +1,6 @@ {pkgs, stdenv, lib, ...}: stdenv.mkDerivation { pname = "justseeds-fontpack"; - version = "13.000"; + version = "14.000"; # Fontpack 1 pack01 = pkgs.fetchzip { @@ -39,8 +39,8 @@ # Fontpack 6 pack06 = pkgs.fetchzip { - url = "https://justseeds.org/wp-content/uploads/JS-Font-pack-6.zip"; - sha256 = "JgJ6czKxNHq/aZ80MqLAazLWW/pe7qZrPgc2+h6itGI="; + url = "https://justseeds.org/wp-content/uploads/JS-Font-pack-6_2.zip"; + sha256 = "f6tcmnyd5Ey5j28RCohUG7f01CabA8RpwSxPXYDY5jg="; stripRoot = false; }; @@ -81,8 +81,8 @@ # Fontpack 12 pack12 = pkgs.fetchzip { - url = "https://justseeds.org/wp-content/uploads/JSOTP-12.zip"; - sha256 = "anwRr+yaQWp/nxdXu89UMHSoexGvAuE2gApsfq3UibU="; + url = "https://justseeds.org/wp-content/uploads/JSOTP-12_1223.zip"; + sha256 = "9LO4zt1TGhiPptzeXY/0wZewraZ574U73WZSuTzpJRs="; stripRoot = false; }; @@ -93,6 +93,13 @@ stripRoot = false; }; + # Fontpack 14 + pack14 = pkgs.fetchzip { + url = "https://justseeds.org/wp-content/uploads/JSOTP-14.zip"; + sha256 = "JaoefaCCE3I8CrUHuTn0Ggn8HTp2mgjsn9WLFGG/ycU="; + stripRoot = false; + }; + dontUnpack = true; installPhase = '' install -D -m 444 $pack01/JS_fontpak1/*.otf -t $out/share/fonts/otf @@ -100,7 +107,7 @@ install -D -m 444 $pack03/'JSOTP FP3_2'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack04/fontpak4/*.otf -t $out/share/fonts/otf install -D -m 444 $pack05/'JS Font Pak 5'/*.otf -t $out/share/fonts/otf - install -D -m 444 $pack06/'JS Font pack 6'/*.otf -t $out/share/fonts/otf + install -D -m 444 $pack06/'JS Font pack 6 zip'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack07/'JS Font Pack 7'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack08/'Justseeds Font Pack 8'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack09/'Justseeds Font Pack 9'/*.otf -t $out/share/fonts/otf @@ -108,6 +115,7 @@ install -D -m 444 $pack11/'JSOTP 11'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack12/'JSOTP 12'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack13/'JOSTP 13'/*.otf -t $out/share/fonts/otf + install -D -m 444 $pack14/'JSOTP 14'/*.otf -t $out/share/fonts/otf ''; meta = {