From e8a612c06630048e407a28a45a665ea1504106aa Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 17 Sep 2020 19:55:20 +0200 Subject: [PATCH 1/2] =?UTF-8?q?pythonPackages.nototools:=200.2.12=20?= =?UTF-8?q?=E2=86=92=200.2.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/noto-fonts/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 6ea26f7c79d..f5bd6335dfb 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.12"; + version = "0.2.13"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5"; + sha256 = "0ggp65xgkf9y7jamncm65lkm84wapsa47abf133pcb702875v8jz"; }; postPatch = '' From ebd935523129ec3b6c02b40d21bb45519d625a27 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 17 Sep 2020 16:01:27 +0200 Subject: [PATCH 2/2] =?UTF-8?q?noto-fonts-emoji:=20unstable-2020-08-20=20?= =?UTF-8?q?=E2=86=92=202020-09-16-unicode13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/noto-fonts/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 40a6c887439..79f8cb8b336 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -111,18 +111,18 @@ in }; noto-fonts-emoji = let - version = "unstable-2020-08-20"; + version = "2020-09-16-unicode13_1"; emojiPythonEnv = python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { pname = "noto-fonts-emoji"; - inherit version; + version = builtins.replaceStrings [ "_" ] [ "." ] version; src = fetchFromGitHub { owner = "googlefonts"; repo = "noto-emoji"; - rev = "1bc491419fa2925d018f27bfe702792031be0e68"; - sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy"; + rev = "v${version}"; + sha256 = "0659336dp0l2nkac153jpcb9yvp0p3dx1crcyxjd14i8cqkfi2hh"; }; nativeBuildInputs = [