From 9dddd735b209f4f615cce1829e092f6b0bd800ad Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 2 Feb 2025 15:58:49 +0000 Subject: [PATCH 1/2] noto-fonts: 2025.01.01 -> 2025.02.01 --- pkgs/by-name/no/noto-fonts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 18201b28c584..8ff3dd10788b 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation rec { pname = "noto-fonts${suffix}"; - version = "2025.01.01"; + version = "2025.02.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-25517Bkx/kcMETJvGJvcHSJ3e/N7U8LWqp62dADm9G4="; + hash = "sha256-IXQmHBG7yvngifLTVLwkL+10lfqofgERtNmgZSvgrt8="; }; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; From 98e1c5d85d988e27a26f8068054c0b457f2bb979 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 2 Feb 2025 17:06:47 +0100 Subject: [PATCH 2/2] noto-fonts: install megamerge font --- pkgs/by-name/no/noto-fonts/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 8ff3dd10788b..9c21fd58744d 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -29,6 +29,11 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-IXQmHBG7yvngifLTVLwkL+10lfqofgERtNmgZSvgrt8="; }; + outputs = [ + "out" + "megamerge" # Experimental fonts created by mergeing regular notofonts + ]; + _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; installPhase = @@ -39,6 +44,8 @@ stdenvNoCC.mkDerivation rec { # # We have a mix of otf and ttf fonts local out_font=$out/share/fonts/noto + + install -m444 -Dt $megamerge/share/fonts/truetype/ megamerge/*.ttf '' + ( if _variants == [ ] then