Commit Graph

19199 Commits

Author SHA1 Message Date
Dan Peebles 42f46936bb libarchive: add propagatedBuildInputs for attr and acl to appease pkgconfig dependencies 2016-04-29 03:29:30 +00:00
Dan Peebles 7dd3a92c19 libsolv: init at 0.6.20 2016-04-29 02:33:14 +00:00
Rhys 934a460fd2 v8: Build 3.16.14 on ARM 2016-04-29 12:16:26 +10:00
Vincent Laporte 0452b58f0f gobject-introspection: fix on darwin 2016-04-28 18:36:09 +02:00
Eelco Dolstra 8cc9e6da8a sqlite: 3.11.1 -> 3.12.2 2016-04-28 13:45:44 +02:00
Alexander V. Nikolaev a817d5b543 libmemcached: move cyrus_sasl to propagatedBuildInputs
Reason: struct/sasl.h from libmemcached include stuff from there
/nix/store/d3f91zvai71dyhs83ybzsnjfhxnv7mmh-libmemcached-1.0.18/include/libmemcached-1.0/struct/sasl.h:39:23:
fatal error: sasl/sasl.h: No such file or directory
2016-04-28 14:21:19 +03:00
Arseniy Seroka 52b64cedec Merge pull request #15016 from jagajaga/eid
open-eid
2016-04-28 13:56:09 +03:00
Rob Vermaas 66a224c99d Fix nlopt build.
(cherry picked from commit 6c8fbed541188b04998ffc92ef960b6970f1f04e)
2016-04-28 09:16:01 +00:00
Sander van der Burg d76982e181 Merge pull request #14973 from holidaycheck/update-libuv
libuv: 1.7.5 -> 1.9.0
2016-04-28 08:56:31 +00:00
Tuomas Tynkkynen b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen 4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Tobias Geerinckx-Rice 3329b75a14
bobcat: 4.01.04 -> 4.02.00 2016-04-27 18:20:24 +02:00
Edward Tjörnhammar 2b384d401d
tsocks: switch back to regular stdenv libc, remove saveme compilation 2016-04-27 18:02:06 +02:00
knedlsepp 6c0404730f catch: 1.2.1 -> 1.5.0 2016-04-27 13:37:15 +00:00
Tobias Pflug 7dcf75bdd4 libuv: 1.7.5 -> 1.9.0 2016-04-27 11:06:47 +02:00
Arseniy Seroka 9765e5835f
libdigidocpp: init at 3.12.0.1317 2016-04-27 11:38:09 +03:00
Arseniy Seroka 5b7ed1f00c
xsd: init at 4.0.0 2016-04-27 11:38:09 +03:00
Arseniy Seroka 12944261c2
xml-security-c: init at 1.7.3 2016-04-27 11:38:09 +03:00
Arseniy Seroka 6f90f44734
libdigidoc: init at 3.10.1.1212 2016-04-27 11:38:08 +03:00
Arseniy Seroka f223e114da
xalanc: init at 1.11 2016-04-27 11:38:05 +03:00
Tuomas Tynkkynen 584d884bd7 gstreamer: Fix multiple outputs split
- Explicitly moving the files breaks them, because the wrappers
  reference the files by absolute path.  Also this automatically
  moves the manpages to $dev as well.
- Need to explicitly set --exec-prefix since the pkgconfig file has
  `toolsdir=${exec_prefix}/bin`, breaking totem:

http://hydra.nixos.org/build/34980617/nixlog/1/raw

````
checking for BACKEND_TEST... yes
checking GStreamer 1.0 inspection tool... no
configure: error:
		Cannot find required GStreamer-1.0 tool 'gst-inspect-1.0'.
		It should be part of gstreamer-1_0-utils. Please install it.

builder for ‘/nix/store/npq2ihlsdniv4j3wbyparq9byjxqdi15-totem-3.18.1.drv’ failed with exit code 1
````

While at it, enable parallel build.
2016-04-27 05:01:03 +03:00
Tuomas Tynkkynen 15f68398ef libzip: Add platforms 2016-04-27 04:10:54 +03:00
Tuomas Tynkkynen 25b55e7409 gegl: Add platforms 2016-04-27 04:10:42 +03:00
Tuomas Tynkkynen 519dd711fe libzip: Move directory containing zipconf.h to $dev
http://hydra.nixos.org/build/34979863/nixlog/1/raw
2016-04-27 03:54:36 +03:00
Tuomas Tynkkynen 2c32607650 libzip: 0.11.2 -> 1.1.2 2016-04-27 03:54:31 +03:00
Nikolay Amiantov 1a3f7d553d unixODBCDrivers: update and refactor, mark mysql packages as broken 2016-04-26 21:18:01 +03:00
Nikolay Amiantov 45aaea24fa unixODBC: 2.3.2 -> 2.3.4 2016-04-26 21:17:23 +03:00
Thomas Tuegel fad200eb7c exiv2: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel 6651b53bdd libinput: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel 2a16c9d52b libzip: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel b06f9aa015 openjpeg: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel 668f93c719 xcb-util-cursor: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel f11c043fa2 glibmm: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel 160bf21b3a librsvg: multiple outputs 2016-04-25 19:04:24 -05:00
Thomas Tuegel 6a64edfa0e gstreamer-1.0: multiple outputs 2016-04-25 19:04:24 -05:00
Franz Pletz a8f1a96540 libeatmydata: 82 -> 105 2016-04-25 18:15:52 +02:00
Tuomas Tynkkynen 26f90102b8 openssl: fix indentation 2016-04-25 18:19:40 +03:00
Vladimír Čunát c7377b0e4a zlib, bash: mass-rebuild cleanup 2016-04-25 17:12:49 +02:00
Nikolay Amiantov a5cf243134 Merge branch 'staging' of ssh://github.com/NixOS/nixpkgs into staging 2016-04-25 18:03:35 +03:00
Nikolay Amiantov 09f02b918e Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:10 +03:00
Karn Kallio b6e63fba6d phonon : fix configuration paths 2016-04-25 08:23:45 -05:00
artuuge 0472cc82ea beignet: init at 1.1.2 2016-04-25 14:51:30 +02:00
Nikolay Amiantov 31d76ae1b1 Merge pull request #14871 from abbradar/choice-cdrtools-cdrkit
CD/DVD writing improvements
2016-04-25 13:42:03 +04:00
Thomas Tuegel 9eb107dc52 Revert "dbus: 1.8.20 -> 1.10.8"
This reverts commit d088e0621e.

The D-Bus update breaks logind and polkit.

(cherry picked from commit 2e06e5eb36)

Hydra had rebuilt this on staging, fixing many test problems.
There were also phonon changes in these rebuilds, but the amount of
binaries affected by them is relatively low and I'm not yet fully
convinced of their stability.
2016-04-24 20:08:39 +02:00
Franz Pletz 5c4e00b6b7 gst_all_1: 1.6.1 -> 1.8.0 (#14628) 2016-04-24 19:40:20 +02:00
Nikolay Amiantov a9a94df4e6 SDL: use mesa_noglu instead of mesa 2016-04-24 16:21:28 +03:00
Nikolay Amiantov 1f8ee98a7f Merge pull request #14939 from rardiol/cegui
cegui: init at 0.8.4
2016-04-24 17:18:03 +04:00
Moritz Ulrich dc0d32cab7 libu2f-host: Install udev-rules.
This allows users to automatically set up necessary udev-rules by adding
`pkgs.libu2f-host` to `services.udev.packages`.
2016-04-24 14:36:50 +02:00
Ricardo Ardissone 3f14b00106 cegui: init at 0.8.4 2016-04-23 16:39:15 -03:00
Joachim Fasting da7eaef5b0 Merge pull request #14913 from makkus/seafile
seafile-*: 4.4.2 -> 5.0.7
2016-04-23 19:08:15 +02:00
Thomas Tuegel cbaca6aa71 phonon: fix src urls 2016-04-23 09:54:51 -05:00
Wout Mertens 017469c1ef Merge pull request #14036 from acowley/darwin-ffmpeg
Darwin ffmpeg
2016-04-23 15:24:21 +02:00
Thomas Tuegel 2e06e5eb36 Revert "dbus: 1.8.20 -> 1.10.8"
This reverts commit d088e0621e.

The D-Bus update breaks logind and polkit.
2016-04-23 07:31:02 -05:00
Vladimír Čunát 1bfc3a8965 boost: support libiconv, also on non-glibc platforms 2016-04-23 10:52:07 +02:00
Vladimír Čunát 2b0d725854 boost: finish fixes for mingw
- Dynamic linking won't work, it seems.
- When using a native python, the extension isn't built,
  so let's not depend on it.
- Replace flags missing on this branch, such as `isCrossWin`.
2016-04-23 10:52:07 +02:00
aszlig fb74d901d7 boost: Add patch for mingw to use gas instead.
The upstream sources only compile with masm, so we need to add a patch
that translates the masm sources to GNU assembler. Unfortunately, this
means, that "generic.nix" is no longer very much generic, but the
versions we currently include work fine with the patch.

Unfortunately, the boost build still doesn't finish, but we're getting
there soon enough.

The patch is from https://svn.boost.org/trac/boost/ticket/7262 and
following the discussion it seems that the upstream authors are
unwilling to add a gas version for the Windows platform. So in the long
term we might need to find a better solution to that, like for example
using Wine to run MASM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:07 +02:00
aszlig 5f0f48c08b boost: Reduce noise during cross compile.
I guess the "set -x" was only left there for debugging, so I'm removing
it because it let's the scrollback buffer explode ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
aszlig 2d760a28b3 boost: Supply some configure flags for mingw.
Otherwise, Boost.Build is trying to compile against pthread and
desperately searches for icu/iconv.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
aszlig ad033f7665 boost: Fix generation of crossB2Args.
`concatMapStringsSep` actually needs a function to work on the list
items, but it was probably a leftover from the refactor in af8654d.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-23 10:52:06 +02:00
Vladimír Čunát 960244c0af poppler: improve on mingw
The minimal version should be fine now.
2016-04-23 10:52:05 +02:00
Vladimír Čunát 076a09ee37 poppler: disable some dependencies for minimal config
lcms, openjpeg and curl don't seem to be so necessary.
2016-04-23 10:52:05 +02:00
Vladimír Čunát 7d4ebb526c libjpeg(-turbo): fix on mingw
By porting a patch from msys2.
2016-04-23 10:52:04 +02:00
Vladimír Čunát bd3d377e5e freetype: fix on mingw 2016-04-23 10:52:04 +02:00
Vladimír Čunát 321ecde8a1 zlib: on mingw, add another DLL link
Also clean up the expression a little.
It fixes at least libpng's DLL.
2016-04-23 10:52:03 +02:00
Vladimír Čunát 80509ab287 libpng: fix on mingw by disabling doCheck 2016-04-23 10:52:03 +02:00
Vladimír Čunát 49bec81730 libxslt: fix on mingw by upstream patch
It's only static, as libxml2 is only static ATM.
2016-04-23 10:52:03 +02:00
Vladimír Čunát 94eba25103 libxml2: fix on mingw, without DLLs ATM
After closure-size merge we need to disable python support,
as python upstream doesn't support cross-building linux -> mingw.
2016-04-23 10:52:02 +02:00
Vladimír Čunát afaf1c2f77 gettext: remove crossAttrs
They seem not needed anymore.
2016-04-23 10:52:00 +02:00
Nikolay Amiantov 60ddddeb5b libisofs: init at 1.4.2 2016-04-23 03:57:14 +03:00
Nikolay Amiantov 274a699348 libburn: init at 1.4.2.pl01 2016-04-23 03:57:00 +03:00
Markus Binsteiner 83274eccf0 seafile-*: 4.4.2 -> 5.0.7
Also updated dependencies:
ccnet: 1.4.2 -> 5.0.7
libsearpc: 1.2.2 -> 3.0.7
2016-04-23 12:52:42 +12:00
Nikolay Amiantov f3435096e2 speechd: 0.7.1 -> 0.8.3
Make it actually useful -- support sound output and several voice modules
2016-04-23 02:27:36 +03:00
Pascal Wittmann 8d7e44745d libfilezilla: 0.4.0.1 -> 0.5.0 2016-04-22 21:05:38 +02:00
Vladimír Čunát e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Thomas Tuegel b4ff81ffd6 phonon-backend-vlc: init at 0.9.0 2016-04-22 08:11:10 -05:00
Thomas Tuegel 8b585cc9f5 phonon: 4.8.3 -> 4.9.0
- Removed phonon-backend-vlc.
- Moved qt5.phonon to kde5.phonon.
2016-04-22 07:56:02 -05:00
Moritz Ulrich ba08f0014d libraw: 0.17.0 -> 0.17.1 2016-04-21 23:03:46 +02:00
Eelco Dolstra 11e252e5a0 aws-sdk-cpp: 0.9.6 -> 0.10.6 2016-04-21 17:17:18 +02:00
Nikolay Amiantov d713fd1f9f libdvdcss: 1.3.0 -> 1.4.0 2016-04-21 17:23:56 +03:00
Nikolay Amiantov c6c85c0a58 gst_all_1.gst-plugins-bad: add mplex plugin 2016-04-21 17:23:56 +03:00
Vladimír Čunát a047ba25f4 libiconv: fix on mingw 2016-04-21 13:25:33 +02:00
Karn Kallio c4ab7e2cd4 libxml2 : Have exec_prefix match the location of bin/xml2-config. 2016-04-21 13:00:21 +02:00
Vladimír Čunát 685c34555c Merge #14856: gnutls: 3.4.6 -> 3.4.11 2016-04-21 12:27:55 +02:00
Thomas Tuegel 9ea3e371df qt5: handle dev output even without qmake 2016-04-21 04:57:01 -05:00
vbgl f53e097b01 Merge pull request #14826 from vbgl/cairo-xlib-on-darwin
cairo: build cairo-xlib even on Darwin
2016-04-21 10:48:47 +02:00
Michiel Leenaars 4ea23ca277 gnutls: 3.4.6 -> 3.4.11 2016-04-20 22:44:39 +02:00
Peter Simons 9bc2daa927 pcre: drop unused withCharSize function argument 2016-04-20 22:30:39 +02:00
Joachim Fasting cb6280af01 Merge pull request #14844 from colemickens/update-libinput
libinput: v1.2.2 -> v1.2.3
2016-04-20 21:41:32 +02:00
Nikolay Amiantov d3877b7cb0 Merge pull request #14611 from abbradar/ogre-no-nvidia
ogre: don't build with nvigia-cg and samples by default, add flags
2016-04-20 21:06:56 +04:00
Nikolay Amiantov 039ff272ee qt55: remove configureScript from qt5Submodule 2016-04-20 19:02:13 +03:00
Nikolay Amiantov 79008f6095 signon: move to qmakeHook
This reverts commit 96bed5b7aa.
2016-04-20 18:55:53 +03:00
Nikolay Amiantov 1b032e5221 qwt: move to qmake4Hook 2016-04-20 18:55:53 +03:00
Nikolay Amiantov d441238b52 qt5.qwt: move to qmakeHook
This reverts commit 8779e0f274.
2016-04-20 18:55:53 +03:00
Nikolay Amiantov 82af8640e3 quazip: move to qmakeHook
This reverts commit d663b3df24.
2016-04-20 18:55:52 +03:00
Nikolay Amiantov 1875538730 qtscriptgenerator: spaces 2016-04-20 18:55:52 +03:00
Nikolay Amiantov 5b17e82559 qt55.qtmultimedia: use qmakeFlags 2016-04-20 18:55:52 +03:00
Nikolay Amiantov 4a4567b731 qt54.qtmultimedia: use qmakeFlags 2016-04-20 18:55:52 +03:00
Nikolay Amiantov b69940ee76 qscintilla: move to qmake4Hook 2016-04-20 18:55:52 +03:00
Nikolay Amiantov e307c3dac2 qoauth: move to qmake4Hook 2016-04-20 18:55:51 +03:00
Nikolay Amiantov 005dab1a7a qmltermwidget: move to qmakeHook
This reverts commit 2d6ea2cc30.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov 49558b04d2 liqglviewer: move to qmake4Hook 2016-04-20 18:55:51 +03:00
Nikolay Amiantov 9a2bd51a30 libkeyfinder: move to qmakeHook
This reverts commit f43d8b2336.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov ac1a531933 libcommuni: move to qmakeHook
This reverts commit ee1af147f3.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov 4b5bf1916a herqq: move to qmake4Hook 2016-04-20 18:55:51 +03:00
Nikolay Amiantov 068c7b68a2 accounts-qt: move to qmakeHook
This reverts commit 25382a37e3.
2016-04-20 18:55:50 +03:00
Nikolay Amiantov 31d6dd6be0 CGAL: fix build 2016-04-20 18:55:50 +03:00
Nikolay Amiantov b857459bdb qt5.qmakeHook: init, move from qtbase's setup hook 2016-04-20 18:55:37 +03:00
Nikolay Amiantov 065a7515a7 qmake4Hook: init 2016-04-20 18:48:01 +03:00
Thomas Tuegel 3ecbb214b6 phonon: fix evaluation error 2016-04-20 10:15:10 -05:00
Thomas Tuegel 01b171c877 phonon: fix build after cmake setup hook changes 2016-04-20 10:01:06 -05:00
Thomas Tuegel 491f7f017c cmake: set LIBDIR and INCLUDEDIR for multiple outputs 2016-04-20 10:01:06 -05:00
Thomas Tuegel d088e0621e dbus: 1.8.20 -> 1.10.8 2016-04-20 10:01:06 -05:00
Thomas Tuegel 924c0d34e7 qt55.polkit-qt: set CMAKE_INSTALL_INCLUDEDIR 2016-04-20 10:01:06 -05:00
Thomas Tuegel afef9d4b0a polkit-qt-1: separate Qt 4 and Qt 5 versions 2016-04-20 10:01:06 -05:00
Thomas Tuegel 40ebe0bad3 qt55.polkit-qt: use multiple outputs 2016-04-20 10:01:06 -05:00
Thomas Tuegel 84a83feb4d qt55.qtbase: do not link $out/lib into $dev/ 2016-04-20 10:01:06 -05:00
Thomas Tuegel d5c100dc21 makeQtWrapper: defer environment settings to prePhases 2016-04-20 10:01:06 -05:00
Thomas Tuegel 8727485e08 qt55.qtbase: canonicalize paths in addToSearchPathOnce 2016-04-20 10:01:06 -05:00
Thomas Tuegel 51fe07711f qt55.qtbase: disable plugin path debugging 2016-04-20 10:01:06 -05:00
Thomas Tuegel 35f9c58206 qt55.qtquick1: get import paths from NIX_PROFILES 2016-04-20 10:01:06 -05:00
Thomas Tuegel e0a87ce931 qt55.qtdeclarative: get import paths from NIX_PROFILES 2016-04-20 10:01:06 -05:00
Thomas Tuegel e6c91d586c qt55.qtbase: debug NIX_PROFILES paths 2016-04-20 10:01:06 -05:00
Vladimír Čunát 57474b7d4a Merge branch 'master' into staging
Compare to Hydra nixpkgs job 1260021.
2016-04-20 16:49:52 +02:00
Vladimír Čunát 802f830b2a gtk3: maintenance update 3.20.0 -> 3.20.3 2016-04-20 16:46:01 +02:00
Damien Cassou 914e193dba gegl: 0.3.0-20140619 -> 0.3.6 2016-04-20 16:46:00 +02:00
Damien Cassou d30a9fd186 telepathy-glib: 0.24.0 -> 0.24.1 2016-04-20 16:46:00 +02:00
Damien Cassou 325cfb2192 gtk3: 3.18.5 -> 3.20.0 2016-04-20 16:46:00 +02:00
Damien Cassou 386597c132 gdk-pixbuf: 2.32.3 -> 2.34.0 2016-04-20 16:45:59 +02:00
Damien Cassou 3e3a24e2c6 json-glib: 1.0.2 -> 1.2.0 2016-04-20 16:45:59 +02:00
Damien Cassou 39af1c76e1 gobject-introspection: 1.46.0 -> 1.48.0 2016-04-20 16:45:58 +02:00
Damien Cassou 9c8148dbab glib: 2.46.1 -> 2.48.0 2016-04-20 16:45:58 +02:00
Damien Cassou 7629cd6b34 libsigcxx: 2.6.2 -> 2.8.0 2016-04-20 16:45:58 +02:00
Vladimír Čunát c9fe0d779c libjpeg(-turbo): drop unneeded autoreconf, fix cross 2016-04-20 16:45:58 +02:00
Vladimír Čunát aa711c58bf mesa: maintenance update 11.1.2 -> 11.1.3
There's also 11.2.1, but I don't have time to test ATM,
and such a change might be risky without any testing.
2016-04-20 16:39:49 +02:00
vbgl df681cda9a Merge pull request #14705 from acowley/qt4-darwin
qt4.8: darwin compatibility
2016-04-20 11:25:55 +02:00
Cole Mickens b301b00b89 libinput: v1.2.2 -> v1.2.3 2016-04-19 22:45:20 -07:00
Alexander Ried e898c4f1d5 libvirt: add comment about updating 2016-04-20 00:03:37 +02:00
Anthony Cowley eccfe71bae qt4.8: darwin compatibility
Supplies the necessary system frameworks.
2016-04-19 17:09:29 -04:00
Tuomas Tynkkynen d9d96ff40d Merge pull request #14825 from knedlsepp/add_nanoflann
nanoflann: init at 1.1.9
2016-04-19 22:12:47 +03:00
Josef Kemetmueller b8525851af nanoflann: init at 1.1.9 2016-04-19 18:45:46 +02:00
Vincent Laporte f3536f8ca0 cairo: build cairo-xlib even on Darwin 2016-04-19 18:06:53 +02:00
Alexey Shmalko 0ebe901035
avro-c++: Init at 1.7.5 2016-04-19 16:57:02 +03:00
Eelco Dolstra b4bf432709 nghttp2: 1.8.0 -> 1.9.2, unify with libnghttp2, and use multiple outputs
Note: I ignored the C++ libraries, but it appears we're not currently
using them. Once we do, we'll probably want to put them in a separate
output as well (to prevent non-C++ users from depending on Boost).
2016-04-18 21:13:18 +02:00
joachifm c7f9b6c440 Merge pull request #13968 from bzizou/libibverbs
libibverbs: added mlx4 and mthca userspace driver plugins
2016-04-18 15:30:00 +02:00
Lluís Batlle i Rossell ecedf80a52 Fixing ogre-paged build.
I update to a tree maintained by rigsofrods people.
2016-04-18 12:30:48 +02:00
Tuomas Tynkkynen 00f5f08e05 Merge pull request #14780 from womfoo/update-facter
Update facter: 3.1.3 -> 3.1.5 and add new library dependency leatherman 0.4.2
2016-04-18 05:42:56 +03:00
Kranium Gikos Mendoza 6d2fb3c730 leatherman: init at 0.4.2 2016-04-18 01:31:41 +08:00
Tobias Geerinckx-Rice 0352d4fb72
libpsl: list 2016-04-05 -> 2016-04-16 2016-04-17 18:48:14 +02:00
Pascal Wittmann 04e3fe2280 swt: repair shared objects and refactor 2016-04-17 16:34:14 +02:00
Nikolay Amiantov c225bc8576 bullet: 2.80 -> 2.83 2016-04-17 05:24:40 +03:00
Tuomas Tynkkynen 908aac3ca7 Merge remote-tracking branch 'upstream/master' into staging 2016-04-16 21:06:42 +03:00
Domen Kožar b4d3a7f62b nghttp2: more stable url (hopefully) 2016-04-16 09:51:58 +01:00
Eric Sagnes 3e2318ec3e gtk2: make gtk2 look for immodule cache in $NIX_PROFILE 2016-04-16 17:51:32 +09:00
Eric Sagnes 77c4139262 gtk3: make gtk3 look for immodule cache in $NIX_PROFILE 2016-04-16 17:51:32 +09:00
Vladimír Čunát 5ac500ae68 Merge #14754: libgcrypt: 1.6.5 -> 1.7.0
http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00005.html
> This is a new stable version of Libgcrypt with full API
> and ABI compatibiliy to the 1.6 series.
2016-04-16 08:44:37 +02:00
Aneesh Agrawal f84a2fe412 libgcrypt: 1.6.5 -> 1.7.0 2016-04-15 22:43:04 -04:00
Anthony Cowley 184a3957e6 ffmpeg-full: avfoundation indev support on darwin
Adds support for camera input devices on OS X.

This required fixing links in output libraries and executables to pull
in the system's CoreFoundation.framework rather than the open source CF
one.
2016-04-15 18:21:33 -04:00
Franz Pletz a12be841d6 Merge pull request #14708 from aneeshusa/use-multiple-outputs-for-libressl-2.3
libressl: enable multiple outputs
2016-04-15 21:49:12 +02:00
Tuomas Tynkkynen 8a66effde2 Merge remote-tracking branch 'upstream/master' into staging 2016-04-15 22:46:41 +03:00
Tuomas Tynkkynen b4f97aeae8 uid_wrapper: Remove glibc from build inputs hack
Not needed anymore after #14668
2016-04-15 22:45:08 +03:00
Tuomas Tynkkynen 6fac16c6f3 socket_wrapper: Remove glibc from build inputs hack
Not needed anymore after #14668
2016-04-15 22:44:22 +03:00
Tuomas Tynkkynen be02add261 nss_wrapper: Remove glibc from linker flags hack
Not needed anymore after #14668
2016-04-15 22:43:14 +03:00
Tuomas Tynkkynen a01cdca9d1 nss_wrapper: Remove glibc from build inputs hack
Not needed anymore after #14668
2016-04-15 22:38:59 +03:00
Aneesh Agrawal 9fb0bf1335 libressl 2.2: enable multiple outputs 2016-04-15 10:43:04 -04:00
joachifm ff44872c77 Merge pull request #14713 from ericsagnes/fix/libpinyin
libpinyin: move to libraries
2016-04-15 05:50:06 +02:00
aszlig 96bed5b7aa
signon: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of signon override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of signon and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig f43d8b2336
libkeyfinder: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of libkeyfinder
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of libkeyfinder and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig 25382a37e3
accounts-qt: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of accounts-qt
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of accounts-qt and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig ee1af147f3
libcommuni: Fix finding qmake
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path.

As the configurePhase is replaced by a qmake path directly from qtbase,
it won't work because the setup-hook from qtbase needs to do some setup
in order for qmake to find its own data files.

So instead of hardcoding that path, we just go for setting the
configureFlags attribute and replacing which with "type -P" so that the
configure script can figure out the right path to qmake on its own.

This fixes the build of libcommuni and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig 2d6ea2cc30
qmltermwidget: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qmltermwidget
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of qmltermwidget and it now successfully compiles
on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Eric Sagnes c6ec758fe3 libpinyin: move to libraries 2016-04-15 10:22:35 +09:00
aszlig 8779e0f274
qt5.qwt: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qwt override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of qwt and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:29:56 +02:00
aszlig d663b3df24
qt5.quazip: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of quazip override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of quazip and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:27:21 +02:00
Aneesh Agrawal 60f97245a2 libressl 2.3: enable multiple outputs 2016-04-14 17:45:43 -04:00
Tobias Geerinckx-Rice 358900674b
webgitgtk 2.12: fix evaluation
Remove reference to unknown maintainer @iyzsong.
2016-04-14 19:57:14 +02:00
Michael Raskin 73fba62fb1 Merge pull request #13545 from bendlas/init-webkitgtk-212
webkitgtk: init at 2.12
2016-04-14 16:37:56 +00:00
Nikolay Amiantov cd4b76c821 protobuf: split to multiple outputs 2016-04-14 17:30:40 +03:00
Tuomas Tynkkynen 66de416b7a treewide: Mass replace 'hunspell}/bin' to refer to the correct outputs 2016-04-14 08:32:20 +03:00
Tuomas Tynkkynen f34655e28c openssl-chacha: Split into multiple outputs
Mainly done because of this in all-packages.nix:
````
  cipherscan = callPackage ../tools/security/cipherscan {
    openssl = if stdenv.system == "x86_64-linux"
      then openssl-chacha
      else openssl;
  };
````
... and inside cipherscan we want to refer to `openssl.bin`
2016-04-14 08:32:20 +03:00
Nikolay Amiantov 92f2c5f71e Revert "glfw3: apparently fix the build"
This reverts commit be90eb047c.
2016-04-14 01:03:48 +03:00
Herwig Hochleitner 6bb9ca5057 webkitgtk: init at 2.12.0
this has the b3 jit activated
2016-04-13 20:44:59 +02:00
Michael Raskin be90eb047c glfw3: apparently fix the build 2016-04-13 18:52:37 +02:00
Michael Raskin a9b9c8c23b libgphoto2: 2.5.9 -> 2.5.10 2016-04-13 14:47:04 +02:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Tuomas Tynkkynen 9bc67ca5c9 Merge pull request #14620 from nico202/ispike
iSpike: init at 2.1
2016-04-13 07:21:16 +03:00
Nikolay Amiantov 53ae67fddd openscenegraph: add withApps flag 2016-04-13 04:35:33 +03:00
Tuomas Tynkkynen a9ce4b0884 libdvdcss: Don't build on Darwin
http://hydra.nixos.org/build/34377524/nixlog/1/raw

While at it, add a license.
2016-04-13 04:17:34 +03:00
Franz Pletz 9fd4e1e8dd libuchardet: 0.0.1 -> 0.0.5 2016-04-12 15:51:32 +02:00
Franz Pletz 8b073d96d7 vaapiIntel: 1.6.1 -> 1.6.2 2016-04-12 15:51:32 +02:00
Franz Pletz 365f5942a4 xvidcore: 1.3.3 -> 1.3.4 2016-04-12 15:51:31 +02:00
Franz Pletz 862875f9cd libvirt: 1.3.2 -> 1.3.3 2016-04-12 15:49:54 +02:00
= 9ec9da1a24 iSpike: init at 2.1.1 2016-04-12 14:36:20 +02:00
Franz Pletz 310f05ed9d libgsf: 1.14.34 -> 1.14.36 2016-04-12 04:28:50 +02:00
Nikolay Amiantov 36a8c35461 ogrepaged: mark as broken 2016-04-12 03:12:49 +03:00
Nikolay Amiantov 6a5387e68c mygui: disable ogre by default 2016-04-12 03:09:11 +03:00
Nikolay Amiantov c74e2b51e8 mygui: disable some components, support OpenGL renderer 2016-04-12 03:08:16 +03:00
Nikolay Amiantov c322c042cf Merge commit 'refs/pull/14593/head' of git://github.com/NixOS/nixpkgs 2016-04-12 03:07:40 +03:00
Tobias Geerinckx-Rice ad794fed9c
{lib,pcman}fm: 1.2.3 -> 1.2.4 2016-04-11 23:39:47 +02:00
Tobias Geerinckx-Rice 06dceaa5b2
geoclue2: 2.4.2 -> 2.4.3 2016-04-11 23:39:47 +02:00
joachifm 2e2a87e57a Merge pull request #14376 from acowley/qhull
qhull: darwin compatibility
2016-04-11 23:17:20 +02:00