Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 56cad36f7541
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a33ee551ce2a
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 23, 2018

  1. noto-fonts-emoji: 2018-04-24-pistol-update -> 2018-08-10-unicode11 

    https://github.com/googlei18n/noto-emoji/releases/tag/v2018-08-10-unicode11
    @dtzWill
    dtzWill committed Nov 23, 2018
    Copy the full SHA
    84bd0c6 View commit details

Commits on Nov 24, 2018

  1. noto-fonts-emoji: fix licenses

    @c0bw3b
    c0bw3b authored Nov 24, 2018
    Copy the full SHA
    51435b4 View commit details

  2. Merge pull request #50969 from dtzWill/update/noto-fonts-emoji-unicode11 

    noto-fonts-emoji: 2018-04-24-pistol-update -> 2018-08-10-unicode11
    @c0bw3b
    c0bw3b authored Nov 24, 2018
    Copy the full SHA
    a33ee55 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/data/fonts/noto-fonts/default.nix
6 changes: 3 additions & 3 deletions pkgs/data/fonts/noto-fonts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};