1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Commit graph

11269 commits

Author SHA1 Message Date
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
John Wiegley 84dae6fe28 gsasl: fix build on Darwin (close #2260, fixes #2259)
@vcunat rewrote with "more standard" optional functions.
2014-04-14 21:38:23 +02:00
Vladimír Čunát 8340454544 mesa: have all output on /run/opengl-driver{,-32}
Fixes #2242 in a different way (cleaner, I hope).
2014-04-14 21:38:23 +02:00
Luca Bruno dd23d9a5a7 libnotify: enable gobject introspection 2014-04-14 09:58:04 +02:00
Luca Bruno 64ce2101a4 telepathy-glib: update to 0.24.0
Adding a gnome online account was not possible due to
https://bugs.freedesktop.org/show_bug.cgi?id=68892
2014-04-14 09:58:04 +02:00
Bjørn Forsman a555ee2412 xmlrpc-c: bump 1.25.26 -> .27
Release 1.25.27 (released March 15, 2014):

  Fix bug: When serializing a very large floating point number, sender
  of an XML-RPC message adds some junk after the decimal point. With
  assertion checking enabled, it just crashes. Broken in 1.15 (June 2008).
2014-04-13 19:16:02 +02:00
Benno Fünfstück 57a9eaab67 haskell: jailbreak pipes-network 2014-04-13 18:40:59 +02:00
宋文武 e9a8c8417f wildmidi: update to 0.3.6 2014-04-13 18:30:24 +02:00
Oliver Charles 7f4afcda7e Merge pull request #2235 from bennofs/haskell-monad-extras
haskell: add monad-extras
2014-04-13 12:11:27 +01:00
Bjørn Forsman d1f875c6af lttng project: update from 2.3.0 to 2.4.1
(And update liburcu to 0.8.4 according to release notes for lttng 2.4.x.)

In addition to new features and bug fixes, version 2.4.x is needed to build
against Linux 3.12 (our new stable kernel).
2014-04-13 10:47:16 +02:00
Benno Fünfstück 7fed418b24 haskell: add monad-extras 2014-04-13 10:19:30 +02:00
Vladimír Čunát 1ae918b0d2 gtk3: bugfix update 3.12.0 -> .1 2014-04-12 20:25:15 +02:00
John Wiegley 0ef3c47778 Add recipes for a few Haskell libraries 2014-04-12 10:22:37 -05:00
Oliver Charles 1b7a8e6f5b Merge pull request #2217 from bennofs/haskell-uri
Add uri haskell package
2014-04-12 16:09:46 +01:00
Oliver Charles 3f1af5f709 haskellPackages.bert: Update to 1.2.2.2 2014-04-12 16:06:35 +01:00
Oliver Charles 99d8ef0673 haskellPackages.snapCORS: New expression 2014-04-12 16:04:40 +01:00
Benno Fünfstück 796ea8ee11 haskell: add uri package 2014-04-12 16:59:29 +02:00
Austin Seipp cf24cf1184 capstone: attempt to fix Linux build, remove Darwin build
The Darwin build seems fixable but I can't test right now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 21:41:14 -05:00
Austin Seipp 036a7708a2 libseccomp: attempt to fix Hydra build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 21:37:19 -05:00
Peter Simons 50b1a8ea0b haskell-diagrams-postscript: update to version 1.0.2.4 2014-04-11 22:33:12 +02:00
Peter Simons d2e61750df haskell-diagrams-lib: update to version 1.1.0.6 2014-04-11 22:33:11 +02:00
Peter Simons ce15e84af3 haskell-diagrams-contrib: update to version 1.1.1.4 2014-04-11 22:33:11 +02:00
Peter Simons 716cffc1bb haskell-language-c-inline: re-generate with cabal2nix 2014-04-11 22:33:11 +02:00
Peter Simons 86177f06e9 haskell-haskell-src: add version 1.0.1.6 2014-04-11 22:33:11 +02:00
Peter Simons f5dd4d383b haskell-HTTP: update to version 4000.2.12 2014-04-11 22:33:11 +02:00
Peter Simons fd376138b2 haskell-yesod-core: update to version 1.2.12 2014-04-11 22:33:11 +02:00
Peter Simons e77f2cd689 haskell-texmath: update to version 0.6.6.1 2014-04-11 22:33:11 +02:00
Peter Simons 43a77ee1ab haskell-monoid-extras: update to version 0.3.3.2 2014-04-11 22:33:11 +02:00
Peter Simons 2379850cad haskell-monad-logger: update to version 0.3.6 2014-04-11 22:33:11 +02:00
Peter Simons ecbb36caf1 haskell-hxt: update to version 9.3.1.4 2014-04-11 22:33:11 +02:00
Peter Simons 35e8034716 haskell-hxt-unicode: update to version 9.0.2.2 2014-04-11 22:33:11 +02:00
Peter Simons 7cc83c8c74 haskell-dual-tree: update to version 0.2.0.2 2014-04-11 22:33:11 +02:00
Peter Simons c203d9c5fa haskell-cereal-conduit: update to version 0.7.2.1 2014-04-11 22:33:11 +02:00
Peter Simons a0264d3db8 haskell-active: update to version 0.1.0.12 2014-04-11 22:33:11 +02:00
Peter Simons e1bdc5c164 haskell-statistics: add version 0.11.0.0 2014-04-11 22:33:11 +02:00
Peter Simons ea95516bf8 haskell-parsers: add version 0.11 2014-04-11 22:33:11 +02:00
John Wiegley 8026caec43 Add c2hsc to haskell-packages.nix 2014-04-11 10:34:56 -05:00
Peter Simons 9818422bc0 Merge pull request #2203 from fmap/language-c-inline
New derivation: language-c-inline (haskell)
2014-04-11 11:45:45 +02:00
Vladimír Čunát 8c12816d59 pango on darwin: amend the wrong fix
I didn't realize pango doesn't depend on flex directly,
only through introspection which caused build problems by itself, too.
2014-04-11 09:57:26 +02:00
Peter Simons b62ac3995c haskell-hastache: remove obsolete version 0.5.1 2014-04-11 09:53:16 +02:00
Peter Simons cf000e0d0f haskell-yesod-persistent: update to version 1.2.2.3 2014-04-11 09:53:15 +02:00
Peter Simons 8c3a7ea68c haskell-yesod-form: update to version 1.3.8.2 2014-04-11 09:53:15 +02:00
Peter Simons a72ef2976c haskell-yesod-auth: update to version 1.3.0.4 2014-04-11 09:53:15 +02:00
Peter Simons 967027576b haskell-thyme: update to version 0.3.3.0 2014-04-11 09:53:15 +02:00
Peter Simons 9b2b87379c haskell-tf-random: update to version 0.5 2014-04-11 09:53:15 +02:00
Peter Simons 37b804f7df haskell-semigroups: update to version 0.13.0.1 2014-04-11 09:53:15 +02:00
Peter Simons 977aa979bf haskell-quickcheck-instances: update to version 0.3.8 2014-04-11 09:53:15 +02:00
Peter Simons 237bf0f8b7 haskell-language-c: update to version 0.4.4 2014-04-11 09:53:15 +02:00
Peter Simons 47a7805337 haskell-hxt-xpath: update to version 9.1.2.1 2014-04-11 09:53:15 +02:00
Peter Simons 8fb3c001ee haskell-hmatrix: update to version 0.15.2.1 2014-04-11 09:53:15 +02:00
Peter Simons 5b0bd8e16e haskell-fay: update to version 0.19.2 2014-04-11 09:53:15 +02:00
Peter Simons e39071103e haskell-diagrams-core: update to version 1.1.0.2 2014-04-11 09:53:14 +02:00
Peter Simons 73b6fdefa8 haskell-criterion: update to version 0.8.0.2 2014-04-11 09:53:14 +02:00
Peter Simons 820757f402 haskell-classy-prelude: update to version 0.9.0 2014-04-11 09:53:14 +02:00
Peter Simons 3dd79d7e62 haskell-classy-prelude-conduit: update to version 0.9.0 2014-04-11 09:53:14 +02:00
Peter Simons 6cbf27406d haskell-binary-conduit: update to version 1.2.1.1 2014-04-11 09:53:14 +02:00
Peter Simons b0d1df0f8f haskell-aws: update to version 0.9 2014-04-11 09:53:14 +02:00
Peter Simons 6c0ce0abf7 haskell-active: update to version 0.1.0.11 2014-04-11 09:53:14 +02:00
Peter Simons d65daf11b0 haskell-HTF: update to version 0.11.3.4 2014-04-11 09:53:14 +02:00