Commit graph

11227 commits

Author SHA1 Message Date
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
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
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
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
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
Eelco Dolstra
4e8c2f0ff9 Merge branch 'systemd-update' 2014-04-20 19:31:01 +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
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
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
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
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
Eelco Dolstra
ee9c068b0c systemd: Update to 212
Note that systemd no longer depends on dbus, so we're rid of the
cyclic dependency problem between systemd and dbus.

This commit incorporates from wkennington's systemd branch
(203dcff45002a63f6be75c65f1017021318cc839,
1f842558a95947261ece66f707bfa24faf5a9d88).
2014-04-16 00:59:26 +02:00
Peter Simons
cd64124f46 Merge pull request #2238 from bennofs/haskell-jailbreak-pipes-network
haskell: jailbreak pipes-network
2014-04-15 16:11:10 +02:00
Benno Fünfstück
0ae505179b haskell-pipes-network: add maintainers attribute again 2014-04-15 15:13:12 +02:00
Peter Simons
abdd87da3c haskell-text-icu: don't run test suite on Darwin
https://github.com/bos/text-icu/issues/6
https://github.com/NixOS/nixpkgs/pull/2254
2014-04-15 11:04:23 +02:00
Lukas Toth
f5fa89f198 haskellPackages.Unixutils: New expression 2014-04-15 10:43:38 +02:00
Lukas Toth
66e750190f haskellPackages.bzlib: New expression 2014-04-15 10:43:38 +02:00
Lukas Toth
cf63d8953c haskellPackages.Extra: New expression 2014-04-15 10:43:38 +02:00
Lukas Toth
1ae0fec71b haskellPackages.ipprint: New expression 2014-04-15 10:43:38 +02:00