diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-13 19:16:43 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-13 19:16:43 +0100 |
| commit | 01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0 (patch) | |
| tree | fa3b5948ed7c99764e1cd234beba97cc0b2d141b /pkgs/data | |
| parent | 1df29ee4562a573f0528dcfb8866bd309865ba47 (diff) | |
| parent | 5e367ecef917dadbe3e977b281a33c1fc9cf6e59 (diff) | |
| download | nixlib-01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0.tar nixlib-01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0.tar.gz nixlib-01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0.tar.bz2 nixlib-01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0.tar.lz nixlib-01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0.tar.xz nixlib-01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0.tar.zst nixlib-01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0.zip | |
Merge branch 'master' into staging-next
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict. It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/twitter-color-emoji/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index e74e51a95dcb..6cceee558a94 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -14,14 +14,14 @@ }: let - version = "13.0.1"; + version = "13.0.2"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter"; repo = "twemoji"; rev = "v${version}"; - sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9"; + sha256 = "069pyq09jfzwp3xla8vmhbyyam32x2iyp0s29xcxlkj22p99bg6d"; }; pythonEnv = |