JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,746 Commits 2 Branches 0 Tags 13 GiB
4178dbc42c
Commit Graph

497 Commits

Author SHA1 Message Date
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" 
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
 2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream 
This is a partial merge of staging for builds which are working
 2015-11-13 15:53:10 -08:00
Pascal Wittmann
f5d1642a22 Merge pull request #10659 from jb55/wkhtmltopdf-bump 
wkhtmltopdf: 0.12.1 -> 0.12.2.4
 2015-11-09 13:32:32 +01:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Sergey Sofeychuk
998934bf89 imgur-screenshot: init at 1.5.4 2015-11-06 23:48:32 +03:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Jude Taylor
4318329714 link graphviz with libc++ instead of nothing on darwin 2015-10-28 16:09:51 -07:00
John Wiegley
ef8c8a3b7c Merge pull request #10568 from datakurre/datakurre-graphviz 
darwin: graphviz: remove -lstdc++ on darwin
 2015-10-28 15:46:47 -07:00
Vladimír Čunát
f9e9c7242a djvulibre: split dev and bin outputs 2015-10-28 19:36:40 +01:00
Vladimír Čunát
74d4fc7959 graphviz: simplify and add a missing X library 2015-10-28 10:15:52 +01:00
William Casarin
feb1e8f046 wkhtmltopdf: add myself as maintainer 2015-10-27 17:20:26 -07:00
William Casarin
9838265ab3 wkhtmltopdf: 0.12.1 -> 0.12.2.4 2015-10-27 17:15:40 -07:00
Pascal Wittmann
2c190bedd2 logstalgia: 1.0.6 -> 1.0.7 2015-10-26 14:45:13 +01:00
Cillian de Róiste
1ee8280543 dcraw: update from 9.22 to 9.26.0 2015-10-25 19:06:58 +01:00
Tuomas Tynkkynen
ebb060c351 sng: init at 1.0.6 2015-10-25 16:17:44 +02:00
Asko Soukka
d8cb19b22e darwin: graphviz: remove -lstdc++ on darwin 2015-10-24 03:40:37 +03:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Brian McKenna
d0de36ba7a leela: init at 12.fe7a35a 2015-10-16 21:59:49 +11:00
Vladimír Čunát
9da12a6713 SDL: split the dev output and fix referrers 2015-10-13 20:18:56 +02:00
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
 2015-10-06 15:24:20 +02:00
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs 
Fixed all 'fontconfig}' references as well, hopefully, ugh!
 2015-10-05 12:23:56 +02:00
Vladimír Čunát
f361938b21 Merge staging into closure-size 
This makes gcc5 the default builder, etc.
 2015-10-03 15:23:13 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice
8c45057764 enblend-enfuse: 4.1.3 -> 4.1.4 2015-10-02 05:34:33 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup 
Frequently using multiple *almost* identical attributes is bad.
 2015-09-23 10:42:34 +02:00
Matthias Beyer
8bb71e992c maim: 3.3.41 -> 3.4.46 2015-09-22 01:57:58 +02:00
William A. Kennington III
fc2b0e9d10 argyllcms: gcc5 compat 2015-09-16 21:58:53 -07:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream 
This is a partial merge of staging where we have up to date binaries for
all packages.
 2015-09-15 12:16:49 -07:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
 2015-09-15 12:08:24 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove 
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
 2015-09-15 11:59:33 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Samuel Rivas
7cc66a1c95 Update to 1.8.2 and make curl look like mozilla 
This commit is supposed to be squashed, keeping it just for traceability during
the pull request.
 2015-09-13 22:08:40 +02:00
Samuel Rivas
6ef885defb argyllcms 1.4.0 -> 1.8.1 2015-09-07 11:41:39 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style 
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
 2015-09-06 10:26:30 +02:00
Luca Bruno
4f320818e2 dmtx-utils: depend on imagemagick (ZHF) 2015-07-28 17:57:11 +02:00
Nikolay Amiantov
3a2275dd84 imgurbash: add package 2015-07-28 12:33:29 +03:00
goibhniu
a076e4bee6 Merge pull request #8864 from rycee/package/gmic 
gmic: init at 1.6.5.0
 2015-07-16 22:50:16 +02:00
Robert Helgesson
6a1519c631 gmic: init at 1.6.5.0 2015-07-16 22:02:21 +02:00
Bjørn Forsman
9ad01e41de eplot: init at 2.07 
Create plots quickly with gnuplot.

http://liris.cnrs.fr/christian.wolf/software/eplot/
 2015-07-15 23:37:33 +02:00
Bjørn Forsman
2926f3aa2c fgallery: init at 1.7 
fgallery is a static photo gallery generator.

http://www.thregr.org/~wavexx/software/fgallery/
 2015-07-15 16:02:37 +02:00
Tuomas Tynkkynen
167cf5c0da asymptote: Fix source URL 
The particular mirror (softlayer-ams.dfl.sourceforge.net) seems to be
down (no DNS entry).
 2015-07-05 14:31:46 +03:00
Mateusz Kowalczyk
fc26e89159 Merge pull request #8394 from mbakke/maim 
Add maim and slop
 2015-06-19 15:22:20 +01:00
Marius Bakke
3d68e0b0e2 new package: maim 2015-06-18 22:13:06 +01:00
Michael Raskin
de7c3eef17 Update Asymptote 2015-06-14 11:22:32 +03:00
Pascal Wittmann
62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +02:00
Kovacsics Robert (NixOS-SSD2)
f4dce11c19 Major update to vips and nip2 to 8.0.2, changes: 
- Much better conversion to greyscale
- More efficient use of file descriptors
- Rewritten TIFF pyramid creator
- Removed old stuff

See http://libvips.blogspot.co.uk/2015/05/whats-new-in-80.html
and https://github.com/jcupitt/libvips/blob/master/ChangeLog
 2015-06-08 10:56:00 +01:00
Nixpkgs Monitor
2a74e84992 pngcrush: update from 1.7.83 to 1.7.85 2015-06-07 15:43:53 +02:00
Thomas Tuegel
255c0903a1 gnuplot: requires Qt 4 2015-05-25 21:04:01 -05:00
Tobias Geerinckx-Rice
5d5044b2ec Use mirror:// URIs for ftp.debian.org 
Provide a more robust experience for users with horrible network
hardware (me).
 2015-05-22 10:39:27 +02:00
Pascal Wittmann
65f1e8e048 ploticus: update from 2.41 to 2.42 2015-05-19 22:06:32 +02:00
William A. Kennington III
c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references 
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
 2015-05-05 11:52:08 +02:00
Raymond Gauthier
6119355c9c Simplify standalone diagrams-builder expression. 2015-04-29 21:46:39 -04:00
Raymond Gauthier
76a8089d96 Added standalone diagram-builder haskell package. 
Simple wrapper over `haskellng`'s `diagram-builder`
package that allows for simpler install.
 2015-04-27 23:02:37 -04:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Spencer Whitt
3e2b774384 cimg, qt4, pdf2svg: enable on Darwin 2015-04-19 19:39:35 -04:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Domen Kožar
7cc31b6b49 fix eval 2015-04-02 22:30:28 +02:00
William A. Kennington III
7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
Michel Kuhlmann
c96bc1e507 r-modules: fixing rggobi by adding initial expression for ggobi 2015-03-26 12:20:07 +01:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Peter Simons
6694ef42a9 Merge branch 'master' into staging. 
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
 2015-03-10 12:09:43 +01:00
Moritz Ulrich
4560b11551 pngcrush: update from 1.7.82 to 1.7.83 2015-03-07 12:08:18 +01:00
James Cook
91fa9b27d5 graphviz: Patch to fix CVE-2014-9157 (close #6640) 2015-03-03 11:38:02 +01:00
William A. Kennington III
47f9a276c3 graphviz: Add a no x dependency version 2015-02-18 18:15:51 -08:00
Luca Bruno
ca2d7774e0 povray: fix build and add platforms 2015-02-15 18:33:47 +01:00
Pascal Wittmann
92f3ec3ba5 pngnq: update from 1.0 to 1.1 2015-02-13 11:02:27 +01:00
Michael Raskin
f6f3813b65 Packaging Asymptote from scratch to get rid of builderDefsPackage 2015-02-10 00:28:00 +03:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Mateusz Kowalczyk
c49ddebb76 gifsicle: update from 1.86 to 1.87 2015-01-23 19:41:27 +00:00
Lluís Batlle i Rossell
84e9a2e636 Adding a pgf command line tool. 
(cherry picked from commit 442148e20a031714b03a41eb44f343f6ad088fc6)
 2015-01-23 16:09:33 +01:00
Kovacsics Robert (rmk35)
aa2b38afb3 Added vips image processing system and GUI (close #5766) 
VIPS is a free image processing system for large images, nip2 is its GUI
 2015-01-21 19:19:56 +01:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Moritz Ulrich
33fb7e6975 pngcrush: Update to 1.7.82. 2015-01-19 15:47:16 +01:00
lethalman
3d65a59e9f Merge pull request #5703 from eduarrrd/gnuplot-5 
gnuplot: bump to 5.0.0, allow choosing qt version
 2015-01-19 14:50:14 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Eduard Bachmakov
5915d9c417 gnuplot: bump to 5.0.0, allow choosing qt version 
default to qt5
 2015-01-10 19:51:54 -05:00
Bjørn Forsman
e90d316f19 graphviz: patch vimdot to lookup 'vim' in $PATH 
Without this it tries to run /usr/bin/vim. Patch is already accepted
upstream.
 2015-01-09 07:11:48 +01:00
William A. Kennington III
dd7efcbf36 java: More default cleanups 2015-01-07 14:55:41 -08:00
Robert Helgesson
5b9b923abd Add package 'unpaper'. 2015-01-03 21:36:43 +01:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Pascal Wittmann
00444ab724 logstalgia: fix build with new glm version 2014-12-04 14:31:28 +01:00
Moritz Ulrich
77049af46f pngcheck: New package. 2014-12-01 17:05:20 +01:00
Michael Raskin
0fc32b90d8 Add qrcode minimalistic QR-code decode/encode tool (for pure codes only) 2014-11-28 00:12:26 +03:00
Michael Raskin
9ef9544189 Adding quirc QR code decoder 2014-11-28 00:12:26 +03:00
Edward Tjörnhammar
4c1d65130f Merge pull request #5066 from vbgl/kst 
Adds Kst
 2014-11-24 15:23:27 +01:00
Michael Raskin
b67bf6e038 Behave in a sane way in ZXing wrapper when user gives --help argument 2014-11-23 16:27:28 +03:00
Michael Raskin
e511865580 Add a binary distribution of ZXing 1D/2D code library 2014-11-23 02:35:15 +03:00
Vincent Laporte
d1d22919aa Adds Kst-2.0.8 
Kst is a real-time large-dataset viewing and plotting tool that has
built-in data analysis functionality.

Homepage: https://kst-plot.kde.org/
 2014-11-21 11:54:59 +00:00
Domen Kožar
8236ca5d70 properly package pyopenssl 2014-11-19 19:41:44 +01:00
Michael Raskin
ef9a3161d7 Fix obsolete gs option usage by asymptote 2014-11-16 13:28:16 +03: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
William A. Kennington III
94f80e66d3 boost: Remove legacy users 2014-11-02 17:22:27 -08:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Mateusz Kowalczyk
881a645c38 gifsicle: update from 1.84 to 1.86 2014-10-27 00:53:19 +00:00
Michael Raskin
3bd29ef68f Add dmtx-utils after update broke dmtx command-line use 2014-10-23 08:55:44 +04:00
Pascal Wittmann
1eea99016e logstalgia: update from 1.0.5 to 1.0.6 2014-10-16 09:06:20 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Aristid Breitkreuz
a7c77e2c20 optipng: update from 0.7.4 to 0.7.5 2014-10-07 22:42:14 +02:00
Michael Raskin
9d73fbd4b9 Set branch for old graphviz versions 2014-10-07 16:23:28 +04:00
Pascal Wittmann
981e93bd34 logstalgia: update from 1.0.3 to 1.0.5 and adopt it 2014-10-02 18:38:30 +02:00
Mateusz Kowalczyk
00a6dd884d dmtx: update from 0.7.2 to 0.7.4 
cc @7c6f434c
 2014-09-30 11:21:17 +01:00
Mateusz Kowalczyk
13af1ea08f gnuplot_qt: update from 4.6.5 to 4.6.6, potentially fixes CVE-2012-5624, CVE-2012-6093, CVE-2013-0254, CVE-2014-0190 
cc @lovek323
 2014-09-30 11:10:30 +01:00
Mateusz Kowalczyk
4ebeeead31 gifsicle: update from 1.78 to 1.84 2014-09-30 10:40:37 +01:00
Eelco Dolstra
08732891e1 netpbm: Update to 10.66.00 
Also, borrow a tarball from Gentoo so we don't have to use
fetchsvn. And don't depend on libX11 by default.
 2014-09-25 00:07:23 +02:00
William A. Kennington III
2de4144bf7 More boost fixes 2014-09-22 19:57:15 -07:00
Ian-Woo Kim
83604fa032 pdf2svg: PDF converter utility to SVG format 2014-09-15 12:54:39 +02:00
Rob Vermaas
c6b29f8117 qrencode: update from 3.4.3 to 3.4.4 2014-09-11 13:32:57 +02:00
Moritz Ulrich
484dc89a21 pngcrush: update from 1.7.76 to 1.7.77 2014-09-04 16:06:41 +02:00
Michael Raskin
50cf685019 Merge pull request #3841 from monocell/wkhtml-update 
updated wkhtmltopdf and use patched qt
 2014-09-04 01:43:02 +04:00
Michael Raskin
a27e27c1f9 Fix barcode src 2014-09-01 09:07:54 +04:00
Michael Raskin
08131bd5d5 Update guitone 2014-09-01 00:38:07 +04:00
Michael Raskin
60d4216d01 Update Graphviz 2014-09-01 00:38:07 +04:00
Michael Raskin
92ad86bb5e Allow search for updates for GNU Barcode 2014-08-31 19:32:21 +04:00
Emil Rangden
f6954aa8d5 updated wkhtmltopdf and use patched qt 
With stock version of qt4 wkthmltopdf lacks a lot of features, including:
  * Running without an X11 server
  * Printing more then one HTML document into a PDF file
  * Adding a document outline to the PDF file
  * Adding headers and footers to the PDF file
  * Generating a table of contents
  * Adding links in the generated PDF file
  * Printing using the screen media-type
  * Disabling the smart shrink feature of webkit
 2014-08-29 00:04:39 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Sander van der Burg
34d8190e30 pngout: Create new package 2014-08-14 15:59:50 +02:00
Vladimír Čunát
df76cbaa21 hugin, enblend-enfuse: enbaleParallelBuilding, default boost 
Also unset meta.broken.
 2014-08-12 21:17:53 +02:00
Vladimír Čunát
54c18db1ca Merge master into this PR 2014-08-12 21:16:47 +02:00
Vladimír Čunát
56f409a446 glmark2: style fixups 2014-08-12 20:58:36 +02:00
Vladimír Čunát
a3d33de16a Merge #3248: add glmark2-2014.03 2014-08-12 20:53:11 +02:00
Eelco Dolstra
9f08904c8d gnuplot: Use default compiler on Darwin 2014-08-09 19:53:09 +02:00
Eelco Dolstra
6c5186cf9b gnuplot: Reduce dependency bloat a bit 2014-08-09 19:30:48 +02:00
Luca Bruno
64f2ab4fb7 barcode: unsupported on darwin 2014-08-09 14:30:13 +02:00
Luca Bruno
b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Moritz Ulrich
166fbcaf28 pngcrush: update from 1.7.73 to 1.7.76 2014-08-04 15:56:11 +02:00
Peter Simons
ea448e90c3 povray: update to version 3.7 
Committed on behalf of Thomas Strobel <ts468@cam.ac.uk>.
 2014-08-04 13:03:36 +02:00
Cillian de Róiste
928f293e6e dcraw: fix build, now requires lcms2 2014-08-03 15:02:20 +02:00
Cillian de Róiste
a9df9c702d dcraw: update from 9.20 to 9.22 2014-08-03 15:02:20 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Thomas Tuegel
ac01b79c73 gnuplot: add optional Qt terminal 2014-07-23 18:01:31 -05:00
Thomas Tuegel
760cad296d gnuplot: version bump 4.6.3 -> 4.6.5 2014-07-23 18:01:17 -05:00
Wout Mertens
cfe7441729 Add maintainer and platforms 2014-07-12 15:44:48 +02:00
Christoph Hrdinka
a608a6f52a enblend-enfuse: update to version 4.1.3 2014-07-12 13:17:53 +02:00
Wout Mertens
ce81993a6b glmark2: Add glmark2 2014.03 2014-07-12 10:04:28 +02:00
Jos van den Oever
a6f11f262e Update povray. 
Current master version has 404 on tar.gz.
 2014-06-26 11:31:59 +02:00
Bjørn Forsman
6ec01b7513 zbar: tweak description and add longDescription 
"Bar code reader" is what they call it on the homepage
(http://zbar.sourceforge.net/).
 2014-06-23 16:02:45 +02:00
Vladimír Čunát
1bcc2aa216 fix licenCe typos 2014-06-12 09:12:14 +02:00
Michael Raskin
5c5cef35cb Updating Asymptote to 2.32 2014-05-28 01:33:29 +04:00
Rob Vermaas
3ec2851264 dcraw: update from 9.19 to 9.20 2014-05-22 12:58:08 +02:00
Moritz Ulrich
cd1294cac2 pngcrush: update from 1.7.71 to 1.7.73. 2014-05-19 15:36:12 +02:00
Eelco Dolstra
535de5e45a Add nifskope 2014-05-07 00:08:40 +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
Mathijs Kwik
19060fde7b qrencode: upgrade to 3.4.3 2014-04-17 17:48:43 +02:00
Jaka Hudoklin
776203453f gifsicle: add optional static builds, make gifview optional 2014-04-01 01:59:19 +02:00