diff options
author | Will Dietz <github@wdtz.org> | 2019-01-28 21:50:03 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-28 21:50:03 -0600 |
commit | 7f6f22fa31163421749c286880534e69c07cfd8d (patch) | |
tree | bba4199b068f2ff889d5859b0d0d673b45cd9737 /pkgs/data | |
parent | d8fc8726a3aed54a7d3d77c78fcd753fef76c3e2 (diff) | |
parent | 49c8b0a9dec240373e09c6ecc57226f01adf4316 (diff) |
Merge pull request #53915 from dtzWill/update/source-serif-pro-2.010
source-serif-pro: 1.017 -> 2.010, sync w/source-sans-pro expression
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/source-code-pro/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/source-sans-pro/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/source-serif-pro/default.nix | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index 95c5688218792..6c3b903530652 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -18,7 +18,7 @@ in fetchzip { description = "A set of monospaced OpenType fonts designed for coding environments"; maintainers = with stdenv.lib.maintainers; [ relrod ]; platforms = with stdenv.lib.platforms; all; - homepage = https://blog.typekit.com/2012/09/24/source-code-pro/; + homepage = https://adobe-fonts.github.io/source-code-pro/; license = stdenv.lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index c2dfac96a3074..84360dec5d423 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -15,7 +15,7 @@ fetchzip { sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3"; meta = with stdenv.lib; { - homepage = https://sourceforge.net/adobe/sourcesans; + homepage = https://adobe-fonts.github.io/source-sans-pro/; description = "A set of OpenType fonts designed by Adobe for UIs"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index d58ccc3381335..cdfe1e3f18724 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchzip }: let - version = "1.017"; + version = "2.010"; in fetchzip { name = "source-serif-pro-${version}"; - url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.zip"; + url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R-ro%2F1.010R-it/source-serif-pro-${version}R-ro-1.010R-it.zip"; postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + mkdir -p $out/share/fonts/{opentype,truetype,variable} + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable ''; - sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1"; + sha256 = "1a3lmqk7hyxpfkb30s9z73lhs823dmq6xr5llp9w23g6bh332x2h"; meta = with stdenv.lib; { - homepage = https://sourceforge.net/adobe/sourceserifpro; + homepage = https://adobe-fonts.github.io/source-serif-pro/; description = "A set of OpenType fonts to complement Source Sans Pro"; license = licenses.ofl; platforms = platforms.all; |