diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-03 00:09:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 00:09:15 +0000 |
| commit | 2dfb8125f9e5cdda24d9aa065bc0a2902c035dba (patch) | |
| tree | ddfef8c19cfe6e8106c7f184569053692af32677 /pkgs/data | |
| parent | fa2bec27def40911678695abb5af11b3726db3ff (diff) | |
| parent | bd05c3d04bbeb801f36ed7964156ef19c9338482 (diff) | |
| download | nixlib-2dfb8125f9e5cdda24d9aa065bc0a2902c035dba.tar nixlib-2dfb8125f9e5cdda24d9aa065bc0a2902c035dba.tar.gz nixlib-2dfb8125f9e5cdda24d9aa065bc0a2902c035dba.tar.bz2 nixlib-2dfb8125f9e5cdda24d9aa065bc0a2902c035dba.tar.lz nixlib-2dfb8125f9e5cdda24d9aa065bc0a2902c035dba.tar.xz nixlib-2dfb8125f9e5cdda24d9aa065bc0a2902c035dba.tar.zst nixlib-2dfb8125f9e5cdda24d9aa065bc0a2902c035dba.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/cantarell-fonts/default.nix | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 011e88dc1d2e..49b4e6354ca4 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,15 +1,36 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, python3 +, gettext +, appstream-glib +, gnome +}: stdenv.mkDerivation rec { pname = "cantarell-fonts"; - version = "0.301"; + version = "0.303.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"; + sha256 = "+UY6BlnGPlfjgf3XU88ZKSJTlcW0kTWYlCR2GDBTBBE="; }; - nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + nativeBuildInputs = [ + meson + ninja + python3 + python3.pkgs.psautohint + python3.pkgs.cffsubr + python3.pkgs.statmake + python3.pkgs.ufo2ft + python3.pkgs.setuptools + python3.pkgs.ufoLib2 + gettext + appstream-glib + ]; # ad-hoc fix for https://github.com/NixOS/nixpkgs/issues/50855 # until we fix gettext's envHook @@ -19,7 +40,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; + outputHash = "XeqHVdTQ7PTzxkjwfzS/BTR7+k/M69sfUKdRXGOTmZE="; passthru = { updateScript = gnome.updateScript { |