Commit graph

15650 commits

Author SHA1 Message Date
Peter Simons
7cc98529c7 haskell-derive: update to version 2.5.15 2014-04-23 11:17:08 +02:00
Peter Simons
b16fcdcddf haskell-dataenc: update to version 0.14.0.6 2014-04-23 11:17:08 +02:00
Peter Simons
1983e40f10 haskell-cookie: update to version 0.4.1.1 2014-04-23 11:17:08 +02:00
Peter Simons
7f72b38f3c haskell-connection: update to version 0.2.1 2014-04-23 11:17:08 +02:00
Peter Simons
fef13a99f9 haskell-conduit: update to version 1.1.0.2 2014-04-23 11:17:08 +02:00
Peter Simons
7acbb2938a haskell-conduit-extra: update to version 1.1.0.1 2014-04-23 11:17:08 +02:00
Peter Simons
2a3cb33350 haskell-conduit-combinators: update to version 0.2.4.1 2014-04-23 11:17:08 +02:00
Peter Simons
00bc025d05 haskell-chell-quickcheck: update to version 0.2.3 2014-04-23 11:17:08 +02:00
Peter Simons
6fa686c078 haskell-atomic-primops: update to version 0.6.0.5 2014-04-23 11:17:08 +02:00
Peter Simons
0ab1f4305b haskell-alsa-pcm: update to version 0.6.0.2 2014-04-23 11:17:08 +02:00
Peter Simons
e138265a5b haskell-alsa-mixer: update to version 0.2.0.2 2014-04-23 11:17:08 +02:00
Peter Simons
d8e36fac62 haskell-aeson: update to version 0.7.0.3 2014-04-23 11:17:08 +02:00
Peter Simons
9eaa3ef5a2 haskell-RepLib: update to version 0.5.3.2 2014-04-23 11:17:07 +02:00
Peter Simons
aeafc12d89 haskell-gtk2hs-buildtools: update to version 0.12.5.2 2014-04-23 11:17:07 +02:00
Peter Simons
4d765a4565 haskell-cabal-meta: re-generate with cabal2nix 2014-04-23 11:17:07 +02:00
Karn Kallio
4587bbbca2 pakcs: update hash for latest version. 2014-04-23 10:54:58 +02:00
Ricardo M. Correia
b2250ad851 icedtea7: Update from 2.4.6 -> 2.4.7
Fixes a bunch of CVEs.

Removed 2.4.6 build patch, as it's no longer necessary.
2014-04-23 01:39:07 +02:00
Shea Levy
1c84988594 Merge branch 'gdk-pixbuf' of git://github.com/lethalman/nixpkgs 2014-04-22 16:01:19 -04:00
Luca Bruno
4a3508ad1a gdk-pixbuf: check for writable $out/.., closes #2115 2014-04-22 21:10:16 +02:00
Eelco Dolstra
83b43cfe51 dbus: Merge tools and daemon
This resolves a cyclic dependency: the daemon depends on tools (for
dbus-send) while tools depends on the daemon.  Keeping them separate
doesn't seem very useful in any case.
2014-04-22 17:38:53 +02:00
aszlig
52769d5c17
perl-dbix-class: Fix tests with newer SQLite.
Our version of SQLite causes the tests to fail, so I'm hereby adding a
patch from dbsrgits/dbix-class@ed5550d36 with the hunk for the Changes
file dropped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 16:27:28 +02:00
Eelco Dolstra
6fe24bda2d nss: Update to 3.16 2014-04-22 14:55:51 +02:00
Eelco Dolstra
393c9f2e02 nspr: Update to 4.10.4 2014-04-22 14:55:00 +02:00
Eelco Dolstra
6fec10dda3 libmicrohttpd: Disable tests
http://hydra.nixos.org/build/10584971
2014-04-22 10:05:51 +02:00
aszlig
28229d8ef1
SDL: Add alsaLib to propagatedNativeBuildInputs.
This is needed because the pkgconfig file contains linker flags for
alsa-lib. And we had it propagated before already.

Should fix build of quite a lot of SDL dependencies, such as SDL_image:

https://hydra.nixos.org/build/10558332

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 05:54:39 +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