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: 3fe733238351
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 79743fef7ba3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 23, 2020

  1. twitter-color-emoji: 12.1.2 -> 12.1.5 

    Twemoji version bump, plus a Fedora patch update to fix emoji size:
https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/c/282c789d3742d223968a7ddcae6e65374f6dcae1?branch=master
    @emilazy
    emilazy committed Apr 23, 2020
    Copy the full SHA
    63b70bb View commit details

Commits on Apr 24, 2020

  1. Merge pull request #85889 from emilazy/twitter-color-emoji-12.1.5 

    twitter-color-emoji: 12.1.2 -> 12.1.5
    @jtojnar
    jtojnar authored Apr 24, 2020
    Copy the full SHA
    79743fe View commit details
Showing with 9 additions and 7 deletions.
  1. +9 −7 pkgs/data/fonts/twitter-color-emoji/default.nix
16 changes: 9 additions & 7 deletions pkgs/data/fonts/twitter-color-emoji/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/tree/454acad50ba584d9602ccd4238fc5e585abc15c9
# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts
# The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig)

{ stdenv
@@ -15,14 +15,14 @@
}:

let
version = "12.1.2";
version = "12.1.5";

twemojiSrc = fetchFromGitHub {
name = "twemoji";
owner = "twitter";
repo = "twemoji";
rev = "v${version}";
sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn";
hash = "sha256-qb3bLiUgtA8QQ13u928kvM+3qwmQpyjUk0EPKja1kSk=";
};

in
@@ -54,10 +54,10 @@ stdenv.mkDerivation rec {
];

patches = [
# ImageMagick -> GrahphicsMagick
# ImageMagick -> GraphicsMagick
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-use-gm.patch";
sha256 = "0yfmfzaaiq5163c06172g4r734aysiqyv1s28siv642vqzsqh4i2";
url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch";
sha256 = "sha256-kyJwT1SKS1vnXxvPTiIMK6TRHMp1ZOSlb6rodL4Jbxs=";
})
];

@@ -114,7 +114,9 @@ stdenv.mkDerivation rec {
# In twemoji source
## Artwork is Creative Commons Attribution 4.0 International
## Non-artwork is MIT
# In Fedora twitter-twemoji-fonts source
## spec files are MIT: https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files
license = with licenses; [ asl20 ofl cc-by-40 mit ];
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ jtojnar emily ];
};
}