Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-05-12 04:53:38 +02:00
222 changed files with 17737 additions and 11667 deletions
+4 -4
View File
@@ -2,19 +2,19 @@
let
srcs = [
(fetchurl {
url = "www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf";
url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf;
sha256 = "1yfbi62j6gjmzglxz29m6x6lxqpxghcqjjh916qn8in74ba5v0gq";
})
(fetchurl {
url = "www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf";
url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf;
sha256 = "0bfbl1h9h1022km2rg1zwl9lpabhnwdsvzdp0bwmf0wbm62550cp";
})
(fetchurl {
url = "www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf";
url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf;
sha256 = "10m9j4bvr6c4zp691wxm4hvzhph2zlfsxk1nmbsb9vn1i6vfgz04";
})
(fetchurl {
url = "www.ttfotf.com/download-font/tempora-lgc-unicode.otf";
url = http://www.ttfotf.com/download-font/tempora-lgc-unicode.otf;
sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i";
})
];
+28
View File
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "xits-math-${version}";
version = "1.108";
src = fetchFromGitHub {
owner = "khaledhosny";
repo = "xits-math";
rev = "v${version}";
sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out/share/fonts/opentype
cp *.otf $out/share/fonts/opentype
'';
meta = with stdenv.lib; {
homepage = https://github.com/khaledhosny/xits-math;
description = "OpenType implementation of STIX fonts with math support";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}