3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

602 commits

Author SHA1 Message Date
Andreas Baldeau c7bb01cfa2 Added Font Awesome TTF font. 2015-05-03 14:55:04 +02:00
William A. Kennington III 00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Tobias Geerinckx-Rice 5204bdfba6 geolite-legacy: support XZ-compressed databases 2015-04-30 13:11:30 +02:00
Thomas Tuegel 713844317e source-serif-pro: new source 2015-04-29 17:45:13 -05:00
Thomas Tuegel dbde0d3edc source-sans-pro: new source 2015-04-29 17:45:00 -05:00
Thomas Tuegel f1b1e556c4 source-code-pro: new source 2015-04-29 17:44:48 -05:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
lethalman 62c60b4387 Merge pull request #7474 from AndersonTorres/comicneue
ComicNeue: 1.1 -> 2.2
2015-04-27 12:26:39 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Edward Tjörnhammar 29c3f65ffe Merge pull request #7494 from malyn/powerline-fonts
Add Powerline fonts
2015-04-24 17:00:00 +02:00
Michael Alyn Miller 76dcf48b13 Add Powerline fonts 2015-04-24 07:33:59 -07:00
Joachim Fasting 8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Tobias Geerinckx-Rice 13749c5e92 geolite-legacy 2015-04-16 -> 2015-04-21 2015-04-21 01:48:28 +02:00
AndersonTorres cdc7c6b916 ComicNeue: 1.1 -> 2.2 2015-04-20 12:48:53 -03:00
Tobias Geerinckx-Rice 2ae207718c man-pages 3.82 -> 3.83 2015-04-20 15:00:39 +02:00
Tobias Geerinckx-Rice ccee24ebf7 man-pages 3.78 -> 3.82 2015-04-17 00:46:21 +02:00
Tobias Geerinckx-Rice 4679104133 tzdata 2015a -> 2015c 2015-04-17 00:46:20 +02:00
Tobias Geerinckx-Rice 13f6f9046d geolite-legacy: 2015-03-26 -> 2015-04-16
Clean up: use a helper function to fetch database files.
2015-04-16 05:44:23 +02:00
Robert Helgesson 361e787857 Remove mention of monospace from 'fira'.
This package does not actually include the monospace version of the
font. To get the monospace version please see the 'fira-mono' package.
2015-04-10 23:40:47 +02:00
Robert Helgesson 328a2cec73 Add package for 'fira-mono'. 2015-04-10 23:40:22 +02:00
Robert Helgesson 1631afe59f Update 'fira' from 4.004 to 4.1. 2015-04-10 21:01:30 +02:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Vladimír Čunát 859e2c53d6 Merge #6793: add packages for some fonts
Also handle font-family aliases.
(I'm sorry about the bad commit above.)
2015-04-09 20:11:42 +02:00
Vladimír Čunát 3f0c0c3029 Merge #6793: add packages for some fonts
Also handle font-family aliases.
2015-04-09 20:06:53 +02:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Tobias Geerinckx-Rice 1a77b59a85 Add geolite-legacy 2015-03-26
The geoip package only installs a GeoIP _library_ which is useless
without a GeoIP _database_.

The only package to currently install such a database is ntopng, which
manually downloads Maxmind's GeoLite Legacy files to a private location.

Provide these as a separate package so other packages can use them as
well.
2015-03-31 16:36:15 +02:00
Karn Kallio 3fe7f80ef2 symbola: advance to version 7.21, correcting hash error 2015-03-31 11:09:06 +02:00
Christian Theune 6daa2462c6 Enable syncthing for Mac OS X.
Also requires enabling iana-etc. I'm shooting for "unix" platforms which
seems reasonable. Not sure why this was restricted to linux originally --
the history doesn't tell.
2015-03-30 22:07:02 +02:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
Domen Kožar 636b25af67 fira: 4.002 -> 4.004 2015-03-26 11:55:39 +01:00
Henry Till 6e5f25316a add mplus-outline-fonts 2015-03-25 14:31:52 -04:00
Thomas Tuegel 5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Michael Raskin fb03c7d7f4 Update tempora-lgc source link as the original site seems to be permanently down 2015-03-21 19:11:09 +03:00
Robert Helgesson cebc43403a Add packages for a number of fonts.
The added fonts are

 - Caladea,
 - Carlito,
 - Comfortaa,
 - Comic Relief,
 - Crimson,
 - Fantasque Sans Mono,
 - Lobster Two,
 - Pecita,
 - Quattrocento, and
 - Quattrocento Sans.
2015-03-21 00:33:14 +01:00
Robert Helgesson 2fcb411819 Add no-op fontconfig files for Microsoft fonts.
With these fontconfig files it becomes possible for other packages to
configure font aliases for the Microsoft fonts. If both, for example,
vista-fonts and some package providing an alias for Cambria are
installed then the user may control whether or not the alias is active
by manipulating the package priorities.
2015-03-21 00:33:14 +01:00
Eelco Dolstra 2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Vladimír Čunát 51a8a43dfc Merge #6472: add ddccontrol 2015-03-16 21:52:59 +01:00
Vladimír Čunát f41f7a0bb9 ddccontrol*: cleanup
- remove doubled file for ddccontrol-db
- adding stdenv to buildInputs is pointless
- fix doubled http://
- whitespace, etc.
2015-03-16 21:47:06 +01:00
Robert Helgesson 2491e32cc5 Update 'fira' to version 4.002. 2015-03-10 19:33:33 +01:00
William A. Kennington III fdd2b23c3e hicolor-icon-theme: 0.13 -> 0.14 2015-03-09 18:34:00 -07:00
Luca Bruno aae9e49cbc Add setup-hook to hicolor_icon_theme 2015-03-09 15:55:24 +01:00
Fedor Pakhomov eb8105ad01 Separated DDCcontrol-DB declaration from DDCcontrol declaration 2015-03-07 01:10:46 +03:00
宋文武 17479728ec numix-icon-theme, numix-icon-theme-circle: Use commit date as version.
Use git commit date as version number.
Install to $out/share/icons instead of $out/usr/share/icons.
2015-03-05 15:47:25 +08:00
Remy Goldschmidt 8a732aecb8 Fixed licenses, fixed platform, renamed packages 2015-03-05 00:23:18 -06:00
Remy Goldschmidt 7648cb2456 Added Numix GTK theme, removed unnecessary ls -lah in Numix/Numix-Circle icon themes 2015-03-04 18:00:25 -06:00
Remy Goldschmidt 3876279b10 Added Numix/Numix-Circle icon theme 2015-03-03 20:15:30 -06:00
Thomas Tuegel 07d0dd3be0 Merge branch 'kde5' 2015-02-25 15:09:44 -06:00
Thomas Tuegel ad06db5ddc media-player-info: patch extra shebangs to fix chroot build 2015-02-25 12:07:37 -06:00
Eelco Dolstra 586b9d9525 tzdata: Update to 2015a 2015-02-25 15:24:53 +01:00
Thomas Tuegel 95b13b1155 add media-player-info 2015-02-21 11:39:19 -06:00
Karn Kallio f02ccf6acd symbola: update to 7.19 ; fixes wrong hash. 2015-02-08 20:26:59 +01:00
Sven Keidel 92d4ec2ce8 zeal: new package 2015-01-28 00:02:50 +01:00
Tobias Geerinckx-Rice b7b6c93efd Update (kernel) manpages 3.75 -> 3.78 2015-01-26 19:57:22 +01:00
Robert Helgesson a9b2e757e2 unifont: update from 5.1-20080907 to 7.0.06 (close #5748)
Also expand meta set and add myself as maintainer.
2015-01-20 16:38:49 +01:00
Robert Helgesson 44c3424414 Add package for the 'open-dyslexic' font. 2015-01-17 00:49:54 +01:00
vtaku0 b87da0fa91 source-han-sans: update, and refactor expressions
Close #5778.
@vcunat nitpicks: truetype -> opentype, remove empty buildInputs.
2015-01-15 14:09:00 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Daniel Bergey 79c8cc4bf4 include version number in name
league provides no version number, so use date
2014-12-20 14:45:26 +00:00
Daniel Bergey 4c064b5478 add LaTeX Project Public License v1.3c for Gyre
use lib.maintainers
2014-12-19 20:07:53 +00:00
Daniel Bergey a2db5ebf20 add TeX Gyre fonts 2014-12-19 19:31:58 +00:00
Daniel Bergey 123f553a22 add League of Moveable Type fonts
Conflicts:
	pkgs/top-level/all-packages.nix
2014-12-19 19:31:56 +00:00
Pavan Rikhi ab012ecdb5 dina-font: fix the installPhase 2014-12-09 17:11:29 -05:00
Domen Kožar de99c9c955 Merge branch 'staging' 2014-12-08 16:28:45 +01:00
Pavan Rikhi 211c9ba7f5 Add the Dina font 2014-12-07 18:11:49 -05:00
Vladimír Čunát b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Eelco Dolstra 880616c353 docbook-xsl-ns: Cleanup 2014-11-25 16:23:49 +01:00
Eelco Dolstra 9adc6fe276 docbook5: Install a catalog.xml 2014-11-25 16:23:48 +01:00
Eelco Dolstra 52b743add4 tzdata: Update to 2014j 2014-11-25 00:42:22 +01:00
Longrin Wischnewski dbe2f139cf Symbola: bump from 7.17 to 7.18 2014-11-18 15:20:26 +01:00
Longrin Wischnewski 9512e0cd0b Symbola: update hash for PDF file 2014-11-18 15:12:58 +01:00
Aristid Breitkreuz d157865b65 stdman: improvements to package description 2014-11-17 22:13:44 +01:00
James ‘Twey’ Kay bb999776f3 New package: stdman 2014-11-17 22:13:44 +01:00
Mateusz Kowalczyk 0c43a02e36 Attach a bunch of meta.branch info for the monitor
This should stop explicitly-versioned expressions from showing up in the
monitor as in need of update.
2014-11-17 18:04:59 +00:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
David Rusu 1628cee892 hasklig: new font
Closes #4847

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-11-07 01:14:48 +00:00
Michael Raskin ee7e65f033 As Atlas dependency is considered a bad thing, update Liberation fonts while using binary distributin by default 2014-11-06 20:42:46 +03:00
Eelco Dolstra 782a12e450 Revert "Update Liberation fonts"
This reverts commit e85f67f215. It makes
NixOS depend on Atlas, gfortran, numpy, etc. In particular nothing
importation should ever gepend on Atlas, because it's prone to random
build failures:

  http://hydra.nixos.org/build/16766850
2014-11-06 10:03:42 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Michael Raskin bc5f55cc91 Adopt a few packages 2014-11-05 11:56:19 +03:00
Vincent Laporte c7457dd1b0 junicode: update from 0.6.15 to 0.7.8 2014-11-04 00:04:29 +00:00
Vincent Laporte c8b3f48865 freefont_ttf: update from 20100919 to 20120503 2014-11-03 23:59:57 +00:00
Michael Raskin f891bc78d1 Add a binary-distribution-based Liberation fonts package 2014-11-04 00:54:15 +03:00
Michael Raskin e85f67f215 Update Liberation fonts 2014-11-04 00:37:43 +03:00
Mateusz Kowalczyk b102f09c00 Merge pull request #4674 from balajisivaraman/meslo-lg
Add Meslo LG & Meslo LG DZ fonts
2014-10-29 16:34:25 +00:00
Balaji Sivaraman a76ee499a3 Add Meslo LG & Meslo LG DZ fonts.
Clean up description as per Nix standards.
2014-10-28 22:56:48 +05:30
Domen Kožar 6f9a111186 tzdata: set platforms to build on hydra 2014-10-27 18:41:42 +01:00
Nixpkgs Monitor 46f498bf91 manpages: update from 3.74 to 3.75 2014-10-27 07:16:33 +02:00
Vladimír Čunát e76772d1fd tzdata: update 2014-10-25 21:37:24 +02:00
Aristid Breitkreuz 8303601d2c poppler_data: update from 0.4.6 to 0.4.7 2014-10-07 23:22:09 +02:00
Aristid Breitkreuz fcad7e7053 manpages: update from 3.73 to 3.74 2014-10-07 21:50:40 +02:00
aszlig 4d92a0675b
linux-man-pages: Update to version 3.73.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-02 10:25:12 +02:00
Pascal Wittmann 0a7f196426 cantarell_fonts: fixed derivation 2014-09-30 12:29:11 +02:00
Mateusz Kowalczyk c9630bb6a9 cantarell_fonts: update from 0.0.15 to 0.0.16
Hijacking maintainership as original maintainer is no longer active.

cc @urkud
2014-09-30 11:16:54 +01:00
Mateusz Kowalczyk 5409201b64 Revert "Revert "tzdata: bump to 2014g.""
This reverts commit 0b4c22edaa.

This should now work according to #4243
2014-09-24 20:50:34 +01:00
Mateusz Kowalczyk 5d264cc00d manpages: update from 3.71 to 3.72 2014-09-22 01:32:48 +01:00
Domen Kožar 0b4c22edaa Revert "tzdata: bump to 2014g."
This reverts commit 4dce30e510.

Breaks all go packages.
2014-09-19 20:40:54 +02:00
Eelco Dolstra ee082af1e0 Merge pull request #4151 from lostdj/ltp/master/tzdata2014g
tzdata: bump to 2014g
2014-09-18 18:37:37 +02:00
lostdj 4dce30e510 tzdata: bump to 2014g. 2014-09-18 20:21:26 +04:00
cillianderoiste 3bb60dbefe Merge pull request #4060 from rycee/stix-font
Add package for the STIX OTF fonts.
2014-09-13 15:56:56 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Robert Helgesson e68d97aa43 Add package for the STIX fonts. 2014-09-13 12:07:13 +02:00
Michael Raskin e50b3daded Add a working URL for arkpandora font 2014-09-11 15:54:10 +04:00
Nixpkgs Monitor 73bd403a57 shared_mime_info: update from 1.2 to 1.3 2014-09-06 19:02:27 +02:00
Michael Raskin d45c1db2db Merge pull request #3942 from joshcartwright/proggyfonts
Add proggyfonts collection
2014-09-03 22:04:00 +04:00
Josh Cartwright a224d1f9ba Add proggyfonts collection
The Proggy Fonts are a font collection intended for fixed-width uses
like programming languages.

Signed-off-by: Josh Cartwright <joshc@eso.teric.us>
2014-09-03 09:03:15 -05:00
Nomen Nescio ef5b30428f baekmuk-ttf: new package
baekmuk-ttf: new package
2014-09-03 15:12:03 +04:00
Michael Raskin df3061295e Specify correct version for Symbola 2014-09-03 11:31:52 +04:00
Pascal Wittmann 4cf191a425 miscfiles: update from 1.4.2 to 1.5 and adopt it 2014-09-01 23:59:07 +02:00
Michael Raskin 5599a2959e Update CM-Unicode font; note its migration to SF.net 2014-08-31 20:11:55 +04:00
Aristid Breitkreuz 76009da9d2 Merge pull request #3872 from robberer/pkgs/symbola
Symbola: fix download url's, adjust installPhase and meta
2014-08-30 14:45:05 +02:00
Longrin Wischnewski d8727a927a Symbola: fix download url's, adjust installPhase and meta 2014-08-30 10:00:12 +02:00
Rüdiger Sonderfeld 57c8f29232 Add comic-neue font. 2014-08-28 13:05:45 +02:00
Александр Цамутали 669e1a56d6 data/fonts/terminus-font: Update to 4.39. 2014-08-24 20:06:43 +04:00
Rüdiger Sonderfeld f61fb466eb man-pages: Update to 3.71. 2014-08-24 10:15:08 +02:00
Rüdiger Sonderfeld 6525bdf213 Add Fira font.
Fira is the font for FirefoxOS.

- https://github.com/mozilla/Fira
- http://www.carrois.com/fira-3-1/
2014-08-23 15:30:41 +02:00
Eelco Dolstra c37057240f man-pages: Update to 3.70 2014-08-19 11:46:08 +02:00
Pascal Wittmann 0cb0ad27be Merge pull request #3211 from ttuegel/adobe-fonts
Adobe Source fonts
2014-08-08 21:52:59 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Eelco Dolstra 6b67028383 cacert: Update to 20140715
This is generated with a more recent version of mk-ca-bundle.pl. The
previous version mistakenly dropped some certificates, like "Verisign
Class 3 Public Primary Certification Authority".
2014-08-05 10:43:25 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
taku0 74110a7a42 source-han-sans: fixed package name 2014-07-30 16:27:20 +02:00
taku0 4ed2acc148 add source-han-sans-japanese, source-han-sans-korean, source-han-sans-simplified-chinese, source-han-sans-traditional-chinese: An open source Pan-CJK typeface 2014-07-30 16:27:20 +02:00
Eelco Dolstra b9c457ba12 cacert: Update to 20140704 2014-07-30 10:14:40 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
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
Thomas Tuegel a8168daabb Rename SourceCodePro to source-code-pro 2014-07-08 15:59:48 -05:00
Thomas Tuegel e2da5d38f3 Add source-serif-pro-1.014 2014-07-08 15:59:41 -05:00
Thomas Tuegel 88f60ee57d Add source-sans-pro-1.050 2014-07-08 15:59:34 -05: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
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
Michael Raskin be5b32e798 Apparently fix texinfo5 with fresh TeXLive 2013-10-20 19:15:11 +04:00