From 84bd0c6859392fab2de5509c209626352476a5b0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Nov 2018 15:42:59 -0600 Subject: noto-fonts-emoji: 2018-04-24-pistol-update -> 2018-08-10-unicode11 https://github.com/googlei18n/noto-emoji/releases/tag/v2018-08-10-unicode11 --- pkgs/data/fonts/noto-fonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 5d633ccb7ce9..f60e9c87ab35 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -86,14 +86,14 @@ rec { maintainers = with maintainers; [ mathnerd314 ]; }; }; - noto-fonts-emoji = let version = "2018-04-24-pistol-update"; in stdenv.mkDerivation { + noto-fonts-emoji = let version = "2018-08-10-unicode11"; in stdenv.mkDerivation { name = "noto-fonts-emoji-${version}"; src = fetchFromGitHub { owner = "googlei18n"; repo = "noto-emoji"; rev = "v${version}"; - sha256 = "1f9k182j0619xvwk60gw2hng3lcd483sva2fabjdhznk8yf9f7jg"; + sha256 = "1y54zsvwf5pqhcd9cl2zz5l52qyswn6kycvrq03zm5kqqsngbw3p"; }; buildInputs = [ cairo ]; -- cgit 1.4.1 From 51435b4ac589ed440a849dde816a80969c661ede Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 24 Nov 2018 18:23:53 +0100 Subject: noto-fonts-emoji: fix licenses --- pkgs/data/fonts/noto-fonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index f60e9c87ab35..ae8d358164f4 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -116,7 +116,7 @@ rec { inherit version; description = "Color and Black-and-White emoji fonts"; homepage = https://github.com/googlei18n/noto-emoji; - license = licenses.asl20; + license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ mathnerd314 ]; }; -- cgit 1.4.1