Commit graph

303 commits

Author SHA1 Message Date
Rob Vermaas e110d2eafe Merge pull request #2741 from bergey/nafees
Nafees font family (5 fonts)
2014-05-28 08:37:29 +02:00
Thomas Tuegel dfd96f77a7 add lohit-fonts-20140220 2014-05-25 14:17:23 -05:00
Daniel Bergey 2bfd36fa14 Nafees font family (5 fonts) 2014-05-25 01:30:57 +00:00
Ricky Elrod b56e41aebe Add eb-garamond font (close #2553)
@vcunat added license, changed attribute name according to the [rules],
and trivial refactoring.
[rules]: http://nixos.org/nixpkgs/manual/#idm140333184443184 ("package naming")
2014-05-13 12:07:50 +02:00
cillianderoiste 366e220c25 Merge pull request #2551 from CodeBlock/source-code-pro
Add Source Code Pro font
2014-05-07 09:48:49 +02:00
Ricky Elrod df9427c535 Source Code Pro font 2014-05-06 19:49:15 -04:00
Ricky Elrod 139c6fb180 Add OFL as an actual license 2014-05-06 04:04:43 -04:00
Ricky Elrod df0014488a First attempt at data/fonts/poly 2014-05-06 03:48:04 -04:00
Mihaly Barasz 1f2228cdc1 tzdata: use symlinks instead of hardlinks
Hard links are not handled by nar, so installing from binary cache
unnecessarily duplicates data. Also, it's more common to use symlinks for the
tzdata package in other distributions.
2014-04-29 16:25:10 +02:00
Eelco Dolstra dc224baba1 tzdata: Update to 2014b 2014-04-29 16:13:15 +02:00
Mihaly Barasz c2c90bf2bb tzdata: fix 'posix' symlink 2014-04-29 16:08:19 +02:00
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Eelco Dolstra cce948e165 man-pages: Update to 3.64 2014-04-16 18:43:38 +02:00
Peter Simons 715a61ad7a docbook5_xsl: update from 1.75.2 to 1.78.1 2014-04-09 12:41:10 +02:00
Evgeny Egorochkin 901a2fc581 manpages: update from 3.62 to 3.63 2014-04-03 07:59:39 +03:00
Vladimír Čunát d4da7e5e4f man-pages-posix: update 2003a -> 2013-a 2014-03-16 17:39:50 +01:00
Shea Levy dddb4f45e9 Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs
Bump wqy-zenhei font to the latest version and add wqy-microhei
2014-03-15 13:22:31 -04:00
Evgeny Egorochkin 1b2902f8eb manpages: update from 3.61 to 3.62 2014-03-13 08:53:09 +02:00
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
aszlig 46e90f76c6
tzdata: Provide lib as an additional output.
We're already using tzcode inside tzdata, so let's make it available as
an output here. The reason we need it is in order to compile OpenCFLite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:44 +01:00
Domen Kožar 676f10f037 Merge pull request #1855 from kirelagin/master
Add Symbola font
2014-03-07 13:15:17 +01:00
Evgeny Egorochkin e38341fee2 manpages: update from 3.60 to 3.61 2014-03-01 05:13:49 +02:00
Kirill Elagin 72783a8c5b Add Symbola font 2014-02-28 21:55:07 +04:00
Vladimír Čunát ae5d8f6768 Merge master into x-updates 2014-02-20 20:55:31 +01:00
Ricardo M. Correia 2539acf351 manpages: Update from 3.54 -> 3.60. 2014-02-18 20:23:59 +00:00
Vladimír Čunát 96f07fa74e Merge master into x-updates 2014-02-16 11:45:02 +01:00
PkmX eb295a62f2 Fix licenses and add platforms metadata for wqy-*. 2014-02-13 04:05:29 +08:00
PkmX 0ce54a4768 wqy-microhei: squash installPhase into one line. 2014-02-12 11:32:09 +08:00
PkmX 5181713002 Add myself to maintainers and metadata to wqy-*. 2014-02-12 11:32:00 +08:00
Vladimír Čunát 161d029d7d preferLocalBuild: set to true for wrappers and fetchers 2014-02-10 21:04:17 +01:00
Vladimír Čunát dfdf164f87 Merge master into x-updates
Conflicts (trivial):
	pkgs/games/spring/default.nix
2014-02-10 19:15:58 +01:00
PkmX ce28f1bb72 Minor fix to wqy-microhei.ttc path. 2014-02-09 06:11:59 +08:00
PkmX 023f30f07d Add wqy-microhei font 2014-02-09 05:23:23 +08:00
PkmX c7b781ca12 Bump wqy-zenhei to 0.9.45. 2014-02-09 05:23:23 +08:00
Pascal Wittmann 0fa30be7a8 andagii: fix fetch by providing a different user-agent
Close #1706.
2014-02-08 11:16:22 +01:00
Vladimír Čunát 6e2d3b9847 Merge master into x-updates 2014-02-02 10:05:25 +01:00
Vladimír Čunát 546bd7738d xorg xkeyboard-config: update, unify with the other expression 2014-01-30 13:46:02 +01:00
Petr Rockai 4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Jaka Hudoklin 9a68fd380f pkgs/docbook-xsl: update to 1.78.1 (close #1069) 2014-01-26 11:20:11 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Vladimír Čunát 9bcacfb142 hicolor_icon_theme: minor update 0.12 -> 0.13 2013-12-28 15:08:47 +01:00
Eelco Dolstra 3f799e7233 cacert: Update to 20131205 2013-12-20 18:29:06 +01:00
Nixpkgs Monitor 947f0a2282 lmodern: update from 2.004.1 to 2.004.4 2013-12-18 18:18:37 +02:00
Nixpkgs Monitor 8298e450a7 shared_mime_info: update from 1.1 to 1.2 2013-12-04 06:53:44 +02:00
Nixpkgs Monitor 8a875f54a4 cantarell_fonts: update from 0.0.7 to 0.0.15 2013-12-04 06:27:36 +02:00
Michael Raskin e17df71e2b Merge pull request #1289 from iyzsong/terminus-font
terminus-font: update to 4.38
2013-11-28 02:52:12 -08:00
Song Wenwu 0d18b8169e terminus-font: update to 4.38 2013-11-28 10:37:45 +08:00
Vladimír Čunát aaaeaf6f3a dejavu_fonts: minor update 2.33 -> .34 2013-11-27 21:34:14 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra f007850b6e man-pages: Update to 3.54 2013-10-23 10:36:21 +02:00