From d85777cb91052e1e309f833ce8c6f8628ba2a5f8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 13 Jan 2019 17:01:06 -0600 Subject: [PATCH 1/2] source-serif-pro: 1.017 -> 2.010, sync w/source-sans-pro expression --- pkgs/data/fonts/source-serif-pro/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index d58ccc33813..8e7688df7d3 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,18 +1,20 @@ { 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; From 49c8b0a9dec240373e09c6ecc57226f01adf4316 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 28 Jan 2019 21:32:31 -0600 Subject: [PATCH 2/2] source-{code,sans,serif}-pro: update homepage Per reviewer suggestion on #53915. --- pkgs/data/fonts/source-code-pro/default.nix | 2 +- pkgs/data/fonts/source-sans-pro/default.nix | 2 +- pkgs/data/fonts/source-serif-pro/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index 95c56882187..6c3b9035306 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 1561605b6ad..93e884259b6 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 = "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; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index 8e7688df7d3..cdfe1e3f187 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -17,7 +17,7 @@ in fetchzip { 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;