Merge pull request #60195 from marsam/init-xkcd-font

xkcd-font: init at 2017-08-24
This commit is contained in:
Renaud 2019-04-25 21:50:04 +02:00 committed by GitHub
commit 1746dc22e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 0 deletions

View file

@ -145,6 +145,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};
cc-by-nc-30 = spdx {
spdxId = "CC-BY-NC-3.0";
fullName = "Creative Commons Attribution Non Commercial 3.0 Unported";
free = false;
};
cc-by-nc-40 = spdx {
spdxId = "CC-BY-NC-4.0";
fullName = "Creative Commons Attribution Non Commercial 4.0 International";

View file

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "xkcd-font";
version = "unstable-2017-08-24";
src = fetchFromGitHub {
owner = "ipython";
repo = pname;
rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
sha256 = "01wpfc1yp93b37r472mx2b459il5gywnv5sl7pp9afpycb3i4f6l";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
'';
meta = with stdenv.lib; {
description = "The xkcd font";
homepage = https://github.com/ipython/xkcd-font;
license = licenses.cc-by-nc-30;
platforms = platforms.all;
maintainers = [ maintainers.marsam ];
};
}

View file

@ -16413,6 +16413,8 @@ in
xits-math = callPackage ../data/fonts/xits-math { };
xkcd-font = callPackage ../data/fonts/xkcd-font { };
xkeyboard_config = xorg.xkeyboardconfig;
xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;