about summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2018-11-24 18:49:48 +0100
committerGitHub <noreply@github.com>2018-11-24 18:49:48 +0100
commita33ee551ce2a9e5ec2b788f1e82008693d116693 (patch)
treee94aafcd47774b56669d8b06dbee51a19b8b9ce9 /pkgs/data
parent56cad36f7541dfb906b1ecc8858c73da4fbd1010 (diff)
parent51435b4ac589ed440a849dde816a80969c661ede (diff)
downloadnixlib-a33ee551ce2a9e5ec2b788f1e82008693d116693.tar
nixlib-a33ee551ce2a9e5ec2b788f1e82008693d116693.tar.gz
nixlib-a33ee551ce2a9e5ec2b788f1e82008693d116693.tar.bz2
nixlib-a33ee551ce2a9e5ec2b788f1e82008693d116693.tar.lz
nixlib-a33ee551ce2a9e5ec2b788f1e82008693d116693.tar.xz
nixlib-a33ee551ce2a9e5ec2b788f1e82008693d116693.tar.zst
nixlib-a33ee551ce2a9e5ec2b788f1e82008693d116693.zip
Merge pull request #50969 from dtzWill/update/noto-fonts-emoji-unicode11
noto-fonts-emoji: 2018-04-24-pistol-update -> 2018-08-10-unicode11
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/noto-fonts/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 5d633ccb7ce9..ae8d358164f4 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 ];
@@ -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 ];
     };