Merge branch 'master' into staging

A couple thousand rebuilds from master.
This commit is contained in:
Vladimír Čunát
2017-11-11 09:23:16 +01:00
180 changed files with 2538 additions and 2243 deletions

View File

@@ -0,0 +1,37 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "libertinus-${version}";
version = "6.4";
src = fetchFromGitHub {
rev = "v${version}";
owner = "khaledhosny";
repo = "libertinus";
sha256 = "0acnq4vpplp2s7kdnhncz61diji3wmhca04g27yqpk03ahb40x9g";
};
installPhase = ''
mkdir -p $out/share/fonts/opentype/
mkdir -p $out/share/doc/${name}/
cp *.otf $out/share/fonts/opentype/
cp *.txt $out/share/doc/${name}/
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0yn526kwb4xjyf6gvf0wflqi45z5dlzicycz2q003a6if5fgqcz3";
meta = with stdenv.lib; {
description = "A fork of the Linux Libertine and Linux Biolinum fonts";
longDescription = ''
Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts
that started as an OpenType math companion of the Libertine font family,
but grown as a full fork to address some of the bugs in the fonts.
'';
homepage = https://github.com/khaledhosny/libertinus;
license = licenses.ofl;
maintainers = with maintainers; [ siddharthist ];
platforms = platforms.all;
};
}

View File

@@ -13,7 +13,7 @@ fetchzip {
sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2";
meta = with stdenv.lib; {
homepage = http://sourceforge.net/adobe/sourcesans;
homepage = https://sourceforge.net/adobe/sourcesans;
description = "A set of OpenType fonts designed by Adobe for UIs";
license = licenses.ofl;
platforms = platforms.all;

View File

@@ -15,7 +15,7 @@ in fetchzip {
sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1";
meta = with stdenv.lib; {
homepage = http://sourceforge.net/adobe/sourceserifpro;
homepage = https://sourceforge.net/adobe/sourceserifpro;
description = "A set of OpenType fonts to complement Source Sans Pro";
license = licenses.ofl;
platforms = platforms.all;