Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

source-serif-pro: 1.017 -> 2.010, sync w/source-sans-pro expression #53915

Merged
merged 2 commits into from
Jan 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/data/fonts/source-code-pro/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/data/fonts/source-sans-pro/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fetchzip {
sha256 = "1n7z9xpxls74xxjsa61df1ln86y063m07w1f4sbxpjaa0frim4pp";

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;
Expand Down
14 changes: 8 additions & 6 deletions pkgs/data/fonts/source-serif-pro/default.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand Down