Commit Graph

323 Commits

Author SHA1 Message Date
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Russell O'Connor
2faad96991 Consistently use the package name opensans-ttf everywhere. 2014-07-16 16:22:47 -04:00
Russell O'Connor
c4affbb17c Package for Open Sans fonts. 2014-07-15 13:35:22 -04:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Eelco Dolstra
0a11e40596 tzdata: Update to 2014e 2014-07-08 18:35:40 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin
8f03d888c3 Allow auto-updating of the AnonymousPro font 2014-07-01 12:20:04 +04:00
Michael Raskin
60ccbebc4e Create some meta for the AnonymousPro font 2014-07-01 11:54:08 +04:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin
d001de0100 Merge pull request #3102 from auntieNeo/ipafont
Added package for Japanese IPAFonts.
2014-06-30 10:19:48 +04:00
Michael Raskin
d41a7bd9e2 Merge pull request #2871 from auntieNeo/kochi-substitute
Added Kochi substitute Japanese font package
2014-06-30 10:14:14 +04:00
Kosyrev Serge
4bbabdc8b9 aurulent-sans: new expression 2014-06-18 04:12:10 +04:00
Jonathan Glines
339b347987 Added package for Japanese IPAFonts. 2014-06-15 10:02:41 -06:00
Jonathan Glines
fad3494f07 Changed kochi-substitute-naga10 to unfreeRedistributable. 2014-06-12 21:39:17 -06:00
Jonathan Glines
1a30cf5e09 Re-added the non-free kochi-substitute with naga10 glyphs. 2014-06-12 21:33:23 -06:00
Jonathan Glines
f5b5df830c Moved kochi-mincho and kochi-gothic back into one package. 2014-06-11 22:18:05 -06:00
Jonathan Glines
b913409e0b Removed non-free kochi-substitute and added kochi from Debian package. 2014-06-11 22:08:14 -06:00
Jonathan Glines
0672cfcc5f Added mirrors for sourceforge.jp. 2014-06-08 11:47:37 -06:00
Jonathan Glines
cf21858bdf Added package for kochi-substitute font. 2014-06-04 00:54:01 -06:00
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