Commit graph

15626 commits

Author SHA1 Message Date
Luca Bruno 4a3508ad1a gdk-pixbuf: check for writable $out/.., closes #2115 2014-04-22 21:10:16 +02:00
Sander van der Burg 281126d7ee Merge pull request #2346 from cpages/android
Add android ndk support
2014-04-21 23:27:10 +02:00
Vladimír Čunát f3ec500d48 libarchive: move patch into nixpkgs
Unfortunately, github periodically changes output even for raw diffs
(not just raw patches). I'm including the patch in nixpkgs.

I was unable to do it without hash change. Even if I added binary equal file.
2014-04-21 17:57:20 +02:00
Shea Levy 3b93b7bfe6 nodejs: Fix configuration 2014-04-21 09:05:34 -04: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
aszlig cdd1c9caa5
Merge branch 'chromium-refactor', closes #1798.
This implements some longstanding work of getting the Chromium
derivation more modular. Unfortunately, I didn't manage to decrease the
compile time, which was one of the primary goal for doing the refactor.
A main reason this didn't work out well was the fact that most bundled
libraries are so heavily patched that it's not possible within a limited
time frame to decouple it from the main derivation.

However, it should now be easier to build other derivations that build
upon Chromium, like libcef. Also, it finally adds support for the
non-free PepperAPI Flash and PDF plugins and support for fetching the
corresponding versions through the updater.
2014-04-21 09:50:50 +02:00
Rickard Nilsson 6b634673f9 Add remarkjs 0.6.4, a markdown-driven slideshow tool
Also, add required node packages (and update generated node pkgs).
2014-04-21 01:27:23 +02:00
Eelco Dolstra 4e8c2f0ff9 Merge branch 'systemd-update' 2014-04-20 19:31:01 +02:00
Vladimír Čunát cb83796abb elfutils: update 0.155 -> 0.158 2014-04-20 18:24:11 +02:00
Vladimír Čunát b4df087f14 elfutils: fix CVE-2014-0172
Patch taken from upstream mailing-list.
2014-04-20 18:24:11 +02:00
Shea Levy 88e531d8dc Fix gcc bug 58800.
See #2330 for details, except I needed to remove the Changelog change from the patch
2014-04-20 09:46:21 -04:00
Shea Levy 2364bd807d Revert "Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs"
The patch doesn't apply

This reverts commit 094eea8f6a, reversing
changes made to 552d66cd9e.
2014-04-20 09:36:15 -04:00
Shea Levy 094eea8f6a Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs
Description from ambrop72:

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58800

I have not been able to test this due to nix wanting to rebuild lots of
things before building gcc.
Patch was created with: svn diff -r 203872:203873
http://gcc.gnu.org/svn/gcc/branches

This should fix a crash in OpenSCAD: openscad/openscad#514
2014-04-20 09:32:50 -04:00
ambrop7@gmail.com 7eeb94e8dc Add patch for GCC bug 58800. 2014-04-20 12:40:32 +02:00
Matt Whiteley 552d66cd9e Add swig-3.x 2014-04-20 11:30:31 +01:00
Carles Pagès 8267fa4694 androidndk: add v9d
I also updated the buildApp expression so it can build ndk based apps, when
setting useNDK to true.
2014-04-20 11:29:10 +02:00
Vladimír Čunát 4160e65931 mediastreamer: fix build by updating
Probably broken by major ffmpeg update.
2014-04-19 22:06:22 +02:00
Rok Garbas 805ec7e54a Merge pull request #2320 from iyzsong/unmaintain
drop my maintainship of orc and vala
2014-04-19 19:55:24 +01:00
宋文武 6da2470034 drop my maintainship of orc and vala 2014-04-19 23:21:51 +08:00
Marco d6aee89fd7 Fix build of MLton on Linux i686 2014-04-19 14:30:39 +01:00
Marco Maggesi 3737ec7c74 Enable compilation of MLton on darwin 2014-04-19 14:30:39 +01:00
Vladimír Čunát c8f633564e orc: bugfix update (mainly memory leaks), doCheck 2014-04-19 13:59:18 +02:00
Domen Kožar 060a3da168 Merge pull request #2290 from ttuegel/ffmpeg
ffmpeg 2.1.4 -> 2.2.1
2014-04-19 13:09:55 +02:00
John Wiegley 599c2775dd Add expression for xml-lens 2014-04-19 11:21:15 +01:00
Jaka Hudoklin d0c0132fb0 node_webkit: fix hash for i686-linux 2014-04-19 10:45:03 +01:00
Domen Kožar 85992ec738 Merge pull request #1507 from offlinehacker/pkgs/node_webkit/add
Add node-webkit, app runtime based on Chromium and node.js
2014-04-19 05:35:20 +02:00
aszlig a87208de58
libopus: Allow to enable custom modes.
The reason I'm not making this the default is because it seems to add
complexity and degrades performance of the library. For details have a
look at this lengthy discussion at:

https://bugs.debian.org/686777

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig 4c8ec5e12e
v8: Bring back old version 3.14.
The current version of v8 breaks builds of nodejs, mongodb and
rethinkdb. So let's bring back the old package with annoying _3_14
version suffix so hopefully the corresponding maintainers will get rid
of that dependency :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig 5e95ae5e88
libwebp: Enable (de)mux and decoder.
This is required to build Chromium. Making it a non-optional dependency
as it shouldn't really hurt other packages using it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:40 +02:00
aszlig 33acfbe917
minizip: New package based on zlib derivation.
This is needed by Chromium and is part of the zlib source tree in
contrib/, so let's propagate the version of zlib and use the same source
tree.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:40 +02:00
aszlig 7f47785d67
libwebp: Build with support for GIF and TIFF.
Not sure whether those are really needed for Chromium, but I suppose it
doesn't hurt to have support for conversion.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:39 +02:00
aszlig a01f279d2e
libwebp: Update to new upstream version 0.4.0.
Now the version should be recent enough to be built against Chromium,
see: https://code.google.com/p/webp/issues/detail?id=122#c6

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:38 +02:00
aszlig 8ddc86d6e4
v8: Refactor package and update to version 3.25.9.
This now uses fetchurl instead of fetchsvn and now invokes gyp directly
instead of copying over the gyp command to the source tree.

Also, we're now using stdenv.is64bit to properly determine the host
architecture.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:38 +02:00
Sander van der Burg e9a1b1e18c Add allowUnfree parameter to allow Java builds to work 2014-04-18 20:05:39 +02:00
Michael Raskin 3c8311aae6 Merge pull request #2306 from jwiegley/logging
Update logging expression to 1.4.0
2014-04-18 10:46:59 -07:00
Michael Raskin f45bcfb5e9 Merge pull request #2298 from jwiegley/hfsevents
Add hfsevents expression, and make fsnotify use it on darwin
2014-04-18 10:42:16 -07:00
Michael Raskin d31cf5329e Merge pull request #2075 from iyzsong/webkit
get rid of old webkit packages
2014-04-18 10:10:29 -07:00
Cillian de Róiste e70602e12b #492 python-virtualenv: make modules of the python wrapper available
Note: simply calling `virtualenv .` will not produce a ./bin/python
which can import e.g. sqlite3, using `virtualenv --python=python2.7`
will, if python2.7 is python27Full (the wrapped python). I'm not sure
if this is a bug or a feature.
2014-04-18 18:08:49 +02:00
John Wiegley 1be71ec4a2 Update logging expression to 1.4.0 2014-04-17 21:48:05 -05:00
Rok Garbas 47d783ce9d sqlite: update to 3.8.4.3 2014-04-17 13:51:36 +01:00
Peter Simons b6429a6aa4 Merge pull request #2291 from ttuegel/alsa-mixer
haskell-alsa-mixer 0.2.0.1 -> 0.2.0.2
2014-04-17 11:34:07 +02:00
John Wiegley 0556bc0fcb Add hfsevents expression, and make fsnotify use it on darwin 2014-04-16 16:43:32 -05:00
Peter Simons 2fcc5da447 Merge pull request #2255 from jwiegley/timeparsers
The timeparsers library requires convertible == 1.0.*
2014-04-16 20:59:54 +02:00
John Wiegley df56712700 The timeparsers library requires convertible == 1.0.* 2014-04-16 13:09:31 -05:00
John Wiegley 78d452c93c Change aspell configure to use $out/lib/aspell 2014-04-16 12:59:27 -05:00
Domen Kožar 3a9f28ee08 Merge pull request #2185 from lethalman/gnome3
tracker, licenses.cc-by-30, gnome-user-docs, upgrade sushi, gnome-keyring service, gnome-user-share, gnome-tweak-tool, gnome-shell-extensions, xdg-user-dirs
2014-04-16 18:08:00 +02:00
Oliver Charles 3b3f7d2595 haskellPackages.digestiveFunctorsAeson: Update to 1.1.7 2014-04-16 16:39:12 +01:00
Thomas Tuegel 0b84d35175 Assume maintainership of alsa-mixer 2014-04-16 07:58:12 -05:00
Thomas Tuegel d809a27859 haskell-alsa-mixer 0.2.0.1 -> 0.2.0.2 2014-04-16 07:51:38 -05:00
Thomas Tuegel 922e4f3858 ffmpeg 2.1.4 -> 2.2.1 2014-04-16 07:49:51 -05:00