diff options
author | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
commit | 333f145d7604f07e3b2164b459b46e075fea81f4 (patch) | |
tree | cb9bb91bafeafe64c97fa1054223c0d69cf18848 /pkgs/data | |
parent | d253b3d875d2bae84afbc141754b286e18e2fb7d (diff) | |
parent | 7e3c95a0b813394b1a41b73e078d3ffd9e951979 (diff) |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/fira-code/default.nix | 31 | ||||
-rw-r--r-- | pkgs/data/fonts/fira-mono/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/fonts/fira/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/fonts/symbola/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/fonts/unifont/default.nix | 10 |
5 files changed, 47 insertions, 16 deletions
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix new file mode 100644 index 0000000000000..9855738d6d6d8 --- /dev/null +++ b/pkgs/data/fonts/fira-code/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "fira-code-${version}"; + version = "0.5"; + + src = fetchurl { + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode-Regular.otf"; + sha256 = "1y2jz1v7m0q73rz9vblxgaqkgh9wpp4fp7dq21hdyfhxkk3ss6xk"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -v $src $out/share/fonts/opentype/FiraCode-Regular.otf + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tonsky/FiraCode; + description = "Monospace font with programming ligatures"; + longDescription = '' + Fira Code is a monospace font extending the Fira Mono font with + a set of ligatures for common programming multi-character + combinations. + ''; + license = licenses.ofl; + maintainers = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index a01f2a6242491..976fb68d79f61 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-mono-3.203"; + name = "fira-mono-3.204"; src = fetchurl { - url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3203.zip; - sha256 = "0qaplpmsqys42a49x8d15ca2gqw1v6a6k2d56ja1j38dmr2qmpv4"; + url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3204.zip; + sha256 = "0pnsw7b1i5vkwq0kny4lxzly4h8rlwkj610rykhax6zayfbnz62a"; }; buildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraMonoFonts3203"; + sourceRoot = "FiraMonoFonts3204"; installPhase = '' mkdir -p $out/share/fonts/opentype diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 6646fcb86b183..b8db1132b7c57 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-4.103"; + name = "fira-4.104"; src = fetchurl { - url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4103.zip; - sha256 = "1nw5icg3134qq2qfspvj2kclsv3965szby2lfcr65imf7lj4k52z"; + url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4104.zip; + sha256 = "1i8l0x2wdx4pw7j52lgy8qcx0wqj0azwjiq0wa9kg26x78bdfk2d"; }; buildInputs = [unzip]; phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraFonts4103"; + sourceRoot = "FiraFonts4104"; installPhase = '' mkdir -p $out/share/fonts/opentype diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index 390bf9f523a49..5b2113dc57e8e 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "symbola-7.21"; + name = "symbola-8.00"; src = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.zip"; - sha256 = "0sqmvq8c8wn4xq0p25gd2jfyjqi8jhiycqah19wzq1gqkaaw94nq"; + sha256 = "07bczpl3vqdpg2gakfddhzzgpb6v2wpasv7rwqxkyg9yd9lmbr0s"; }; docs_pdf = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; - sha256 = "0jjjydb6c0glfb6krvdyi9kh5bsx9gz5w66j378bdqgkrvspl0d2"; + sha256 = "1zmq1ijl0k5hrc6vpa2xp9n1x2zrrd7ng3jwc9yf0qsi3pmkpk0p"; }; buildInputs = [ unzip ]; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 6b2a4ffe96085..e6fe5afa9b161 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "7.0.06"; + version = "8.0.01"; ttf = fetchurl { - url = "http://unifoundry.com/pub/${name}/font-builds/${name}.ttf"; - sha256 = "0qmk06rwhxs43n1xbwj14fanbih60zqli002qhy0609da24r3957"; + url = "http://fossies.org/linux/unifont/font/precompiled/${name}.ttf"; + sha256 = "0g4g2n024072cdrs2wjp7xmkr3i9dm52a5g9hiafxjgj5a45c8kl"; }; pcf = fetchurl { - url = "http://unifoundry.com/pub/${name}/font-builds/${name}.pcf.gz"; - sha256 = "1wplig57wpc79mlqamhknn39cibg5z8dvbyibp1490ljcjs1dxdc"; + url = "http://fossies.org/linux/unifont/font/precompiled/${name}.pcf.gz"; + sha256 = "0mpdy2k7z9s60x8i6sbv64p9wrihfwgrw81x5yj13rl6x7zzghr8"; }; buildInputs = [ mkfontscale mkfontdir ]; |