diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-04 00:21:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 00:21:27 +0000 |
| commit | ed251f3eb422e9013b8cce924c5f91c6cb3929de (patch) | |
| tree | f191f459a16ed6fe3eb018cf56bb10041a887aa2 /pkgs/data | |
| parent | b4b7aea730faab2f41833dabd01307629c55ccc4 (diff) | |
| parent | da60d463c537d2a3220236f9aa328ca57888b9a4 (diff) | |
| download | nixpkgs-ed251f3eb422e9013b8cce924c5f91c6cb3929de.tar nixpkgs-ed251f3eb422e9013b8cce924c5f91c6cb3929de.tar.gz nixpkgs-ed251f3eb422e9013b8cce924c5f91c6cb3929de.tar.bz2 nixpkgs-ed251f3eb422e9013b8cce924c5f91c6cb3929de.tar.lz nixpkgs-ed251f3eb422e9013b8cce924c5f91c6cb3929de.tar.xz nixpkgs-ed251f3eb422e9013b8cce924c5f91c6cb3929de.tar.zst nixpkgs-ed251f3eb422e9013b8cce924c5f91c6cb3929de.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/tools.nix | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 45366a8e505..019ed1f371c 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -128,7 +128,7 @@ in }; noto-fonts-emoji = let - version = "2.034"; + version = "2.038"; emojiPythonEnv = buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); in stdenvNoCC.mkDerivation { @@ -139,7 +139,7 @@ in owner = "googlefonts"; repo = "noto-emoji"; rev = "v${version}"; - sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; + sha256 = "1rgmcc6nqq805iqr8kvxxlk5cf50q714xaxk3ld6rjrd69kb8ix9"; }; depsBuildBuild = [ @@ -171,8 +171,10 @@ in enableParallelBuilding = true; installPhase = '' + runHook preInstall mkdir -p $out/share/fonts/noto - cp NotoColorEmoji.ttf fonts/NotoEmoji-Regular.ttf $out/share/fonts/noto + cp NotoColorEmoji.ttf $out/share/fonts/noto + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index e829e98bee0..82b56b9efff 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.16"; + version = "0.2.17"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "14rrdamkmhrykff8ln07fq9cm8zwj3k113lzwjcy0lgz23g51jyl"; + sha256 = "0jxydivqzggirc31jv7b4mrsjkg646zmra5m4h0pk4amgy65rvyp"; }; postPatch = '' |