Commit graph

29621 commits

Author SHA1 Message Date
Nikolay Amiantov 071663c1da Merge commit 'refs/pull/14891/head' of git://github.com/NixOS/nixpkgs 2016-04-22 17:40:06 +03:00
Nikolay Amiantov 6185f74531 atom, electron, vscode: split dependencies to atomEnv
fixes #14890
2016-04-22 16:10:51 +02:00
Sander van der Burg 020195ea11 Merge pull request #14893 from holidaycheck/node-5.11.0
nodejs: 5.10.1 -> 5.11.0
2016-04-22 13:00:20 +00:00
Evgeny Egorochkin a63aa83875 qtcreator: fix build 2016-04-22 14:36:19 +03:00
Mathias Schreck 594416b210 nodejs: 5.10.1 -> 5.11.0 2016-04-22 12:31:09 +02:00
Nikolay Amiantov b2426adf1c Merge pull request #14870 from retrry/rust-updates
Rust Updates
2016-04-22 14:29:14 +04: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
Robbin C f1492bf44c tinc-haskell: init at 20160419 2016-04-21 23:08:42 +08: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
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
Robin Gloster 0087d16120 haskellPackages: clean up unnecessary overrides 2016-04-20 17:08:26 +00: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 f3e8653647 valkyrie: move to qmake4Hook 2016-04-20 18:55:54 +03:00
Nikolay Amiantov a9662f8c45 qtcreator: move to qmakeHook 2016-04-20 18:55:53 +03:00
Nikolay Amiantov c161258003 pyqt5: move to qmakeHook
This reverts commit f1c2572479.
2016-04-20 18:55:53 +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 ba52751157 eql: flags is a list of strings 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
Joachim Fasting 1636d18050 Merge pull request #14851 from taku0/oraclejdk-8u91
oraclejdk: 8u77 -> 8u91, 8u92
2016-04-20 17:27:16 +02: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 4d968dd416 pygobject: 3.18.2 -> 3.20.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
Vladimír Čunát 90ee003240 gcc: fix mingw build after closure-size merge
This may also (help to) fix also other less usual configurations.
2016-04-20 16:39:23 +02:00
taku0 713a069155 oraclejdk: 8u77 -> 8u91, 8u92 2016-04-20 23:35:49 +09:00
Peter Simons 4537e2be35 haskell-semigroups: fix build with pre 7.6.x versions of GHC 2016-04-20 13:46:10 +02:00
Peter Simons c2545acecd haskell-configuration-ghc-8.0.x: doctest 0.11.x is now the default 2016-04-20 13:46:10 +02:00
Peter Simons 2c1f152c60 haskell-reflection: fix build with ghc versions prior to 7.6.x 2016-04-20 13:46:10 +02:00
Peter Simons 9a45c0cd9d hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-2-gc07fcb5 using the following inputs:

  - Hackage: 3346eec54c
  - LTS Haskell: 573e5576f2
  - Stackage Nightly: 70928b4eec
2016-04-20 13:46:10 +02:00
Tadas Barzdzius 357a251bfb rustfmt: 2016-03-22 -> 0.4.0 2016-04-20 12:43:00 +03:00
Tadas Barzdzius 7d661a4ab4 cargo: 0.8.0 -> 0.9.0. Enable Darwin 2016-04-20 12:42:37 +03:00
Tadas Barzdzius 9450a6826f rustc: 1.7.0 -> 1.8.0 2016-04-20 12:39:44 +03: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
Brandon Edens 1d8e7cd4c9 kconfig-frontends: init 3.12.0.0 2016-04-19 21:17:47 -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
Michael Raskin aaa9e85ae6 ECL: wrap to ensure succesful linking in ECL's runtime 2016-04-19 17:43:47 +02:00
Joachim Fasting 1451bb8a18 Merge pull request #14811 from rasendubi/avro-cpp
avro-c++: Init at 1.7.5
2016-04-19 16:14:19 +02:00
Alexey Shmalko 0ebe901035
avro-c++: Init at 1.7.5 2016-04-19 16:57:02 +03:00
Joachim Fasting 7660819b48 Merge pull request #14755 from romildo/fix.pygobject
pygobject: fix some warnings
2016-04-19 15:48:30 +02:00
Joachim Fasting b42bff4630 Merge pull request #14625 from utdemir/master
selenium-server-standalone: 2.45.0 -> 2.53.0
2016-04-19 13:48:06 +02:00
Utku Demir cde425fcd4 Add correct libstdc++.so path to chromedriver
It was probably broken after the closure-size merge
2016-04-19 12:08:58 +03:00
Utku Demir ffac939edc selenium-server-standalone: 2.45.0 -> 2.53.0
Also remove `patchPhase`, since the relevant executable
does not exist anymore on the new archive.
2016-04-19 11:36:17 +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
Eelco Dolstra 21a2f2ba3b nix: Add a "dev" output
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
2016-04-18 21:13:18 +02:00
zimbatm 961ad19660 Merge pull request #14408 from retrry/rustc-update
rustc: 1.6.0 -> 1.7.0. Enable Darwin platform.
2016-04-18 20:09:44 +01: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
Lluís Batlle i Rossell e741a302d4 Make rigsofrods build the latest code.
I add angelscript 2.22 too, as it makes RoR happy.
2016-04-18 12:30:47 +02:00
Michael Fellinger 55bd038cc1 gem-config: fix bundler 2016-04-18 12:04:37 +02:00
Michael Fellinger 263d467131 bundlerEnv: filter gemset groups 2016-04-18 12:04:36 +02:00
Charles Strahan 99fd109a85 Merge pull request #14786 from manveru/gemset-groups
bundlerEnv: filter gemset groups
2016-04-18 02:02:57 -04: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
Michael Fellinger 090da825fe
bundlerEnv: filter gemset groups 2016-04-17 23:07:31 +02:00
Michael Fellinger caadfd53e3
capybara-webkit: qt5Full -> qt48 2016-04-17 22:35:04 +02: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
Tobias Geerinckx-Rice 038b18496c
ccache: 3.2.4 -> 3.2.5 2016-04-17 18:25:07 +02:00
Pascal Wittmann 04e3fe2280 swt: repair shared objects and refactor 2016-04-17 16:34:14 +02:00
Luca Bruno 6db84ed559 Merge pull request #14493 from kamilchm/build-go-without-vendor
buildGoPackage: we don't need to build vendored packages
2016-04-17 11:18:30 +02:00
Nikolay Amiantov c225bc8576 bullet: 2.80 -> 2.83 2016-04-17 05:24:40 +03:00
Mathieu Boespflug 6c9c59067b gradle: fix attribute name for gcc libs path.
PR #14326 fixed gradle so that its native code library could find
libstdc++.so.6, but this fix is inoperative now, because this library
is in `"${stdenv.cc.cc.lib}/lib"` now, rather than
`"${stdenv.cc.cc}/lib"`.
2016-04-17 01:09:24 +02: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
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
Michael Raskin 909a46ff77 Fix gccgo by un-splitting lib output (like gcj) 2016-04-16 08:42:20 +02:00
Charles Strahan 0be225a8dc ghcjs: update sources to latest 2016-04-16 01:55:56 -04:00
José Romildo Malaquias 9f44ad975b pygobject: fix some warnings 2016-04-16 00:23:57 -03: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
Joachim Fasting be2bb668ec
cppcheck: 1.72 -> 1.73
ChangeLog at https://sourceforge.net/p/cppcheck/news/2016/04/cppcheck-173/
2016-04-15 17:43:50 +02:00
Joachim Fasting 7b9b6d27d3
cppcheck: split man output 2016-04-15 17:41:41 +02:00
Aneesh Agrawal 9fb0bf1335 libressl 2.2: enable multiple outputs 2016-04-15 10:43:04 -04:00
Peter Simons a6978ded09 Merge pull request #14144 from jefdaj/r-bioc-data-packages
r-modules: update CRAN, add Bioconductor data packages
2016-04-15 14:46:19 +02:00
joachifm ff44872c77 Merge pull request #14713 from ericsagnes/fix/libpinyin
libpinyin: move to libraries
2016-04-15 05:50:06 +02:00
aszlig f5ec09842d
pygame: Fix build with multiple outputs
The config.py script doesn't seem to cope very well with symlinks, so
let's pass it the right derivation outputs wherever possible and fall
back to drv.out.

I've disabled the tests because they somehow now seem to cause the build
to fail even though the tests failed *before* the merge of the
closure-size branch, but the whole build didn't fail regardless.

Here is a build from before the closure-size branch merge:

http://hydra.nixos.org/build/34367296

If you have a look at the build log, you already see a bunch of failing
tests (to be exact: the same set of tests that are failing now with the
fix of the preConfigure phase).

Other than that, the build now succeeds on my machine.

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

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +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
Jeffrey David Johnson 2291885f9e mark bioc packages broken; should match hydra now 2016-04-14 14:34:11 -07:00
Tobias Geerinckx-Rice 358900674b
webgitgtk 2.12: fix evaluation
Remove reference to unknown maintainer @iyzsong.
2016-04-14 19:57:14 +02:00
Jeffrey David Johnson f88843f545 mark bioc packages broken; should match hydra now 2016-04-14 09:54:46 -07: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
Frederik Rietdijk aedf601bba Merge pull request #14687 from makefu/devpi-client-fix
devpi-client: add missing python libraries
2016-04-14 14:25:21 +02:00
joachifm 19e425fa0c Merge pull request #14447 from mucaho/vscode_unfree
vscode: switch to unfree, binary package
2016-04-14 14:16:43 +02:00
makefu 776ff2e735 devpi-client: add missing python libraries 2016-04-14 14:06:32 +02:00
zimbatm 12e919bb34 Merge pull request #14653 from manveru/bundler-env-frozen
bundler-env: Gemfile.lock is frozen
2016-04-14 10:20:04 +01:00
Peter Simons 232d843c8a haskell-src-exts: test suite fails when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons 70f396fa48 haskell-generic-deriving: build fails Haddock phase with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons 2be16386b5 haskell-lens: use latest version when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons d98a8f88d0 haskell-kan-extensions: use version 5.x when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons 3babe992f9 haskell-semigroupoids: doctest suite won't build with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons 15d7b7da10 haskell-bifunctors: use latest version 5.3 when compiling with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Anthony Cowley 3f845da22a haskell-modules: darwin configuration-common
- Reconfigure OpenGL/CL related packages to propagate the necessary
  framework dependencies.

- Disable tests on all versions of c2hs so package sets such as LTS
  releases work.

Closes https://github.com/NixOS/nixpkgs/pull/14609.
2016-04-14 09:17:55 +02:00
Peter Simons 2422ae0838 ghc: update 8.0.x pre-release from rc2 to rc3 2016-04-14 09:17:55 +02:00
Peter Simons 8a12018821 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-1-ge7059e3 using the following inputs:

  - Hackage: 4d5f229e9e
  - LTS Haskell: 924977cc28
  - Stackage Nightly: 0002f21766
2016-04-14 09:17:55 +02:00
Peter Simons c7a4de7717 configuration-hackage2nix.yaml: update list of broken builds 2016-04-14 09:17:55 +02: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 794f07d4e4 treewide: Mass replace 'binutils}/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
Tobias Geerinckx-Rice 994c9b7487
flexcpp: 2.04.00 -> 2.05.00 2016-04-14 02:37:53 +02:00
Nikolay Amiantov 6f3e72eef6 Merge pull request #14658 from abbradar/search-path-fixes
Search path fixes
2016-04-14 03:08:41 +04:00
Nikolay Amiantov 92f2c5f71e Revert "glfw3: apparently fix the build"
This reverts commit be90eb047c.
2016-04-14 01:03:48 +03:00
Nikolay Amiantov 52637e22cd cmake: add all glibc outputs to system prefix 2016-04-14 01:03:23 +03:00
Nikolay Amiantov d528c7d8f5 cmake-2_8: fix for multiple outputs 2016-04-14 01:03:23 +03:00
Arseniy Seroka 0420a532e9 Merge pull request #14649 from vbgl/coq_8.5.1
Coq 8.5pl1
2016-04-13 22:16:48 +03:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +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 cd5b677576 gcc49 (gcj): do not create separate lib output (cyclical dependency), fix ecj1 linking. Does not affect the hash of normal gcc49 2016-04-13 18:46:14 +02:00
Michael Raskin 14b8bdc01f julia: fix library path management after multiple-outputs/closure-size merge 2016-04-13 18:46:14 +02:00
Tadas Barzdzius 650d2f988d rustc: 1.6.0 -> 1.7.0. Enable Darwin platform. 2016-04-13 16:29:31 +03:00
Michael Raskin 238cb743bc scons: 2.4.1 -> 2.5.0 2016-04-13 14:47:04 +02:00
Michael Raskin a9b9c8c23b libgphoto2: 2.5.9 -> 2.5.10 2016-04-13 14:47:04 +02:00
Michael Raskin 7c0f4882f3 angelscript: 2.30.2 -> 2.31.0 2016-04-13 14:47:04 +02:00
Michael Fellinger fe87240e68 bundler-env: Gemfile.lock is frozen 2016-04-13 11:25:41 +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
Tuomas Tynkkynen ba59be833b sunxi-tools: Don't build on darwin
http://hydra.nixos.org/build/34390183/nixlog/1/raw

While at it, use fetchFromGitHub.
2016-04-13 04:06:15 +03:00
Alexey Shmalko e870ac3044 gcc-arm-embedded: 4.9 -> 5.2
Seems that GCC ARM Embedded have changed convention for file location,
and version 5.2 isn't accessible from the predicted url. That's why
nix-expression is updated to allow overloading url parts.
2016-04-13 03:07:05 +03:00
Jeffrey David Johnson 2f6581df00 r-modules: mark mzR broken 2016-04-12 14:16:43 -07:00
Shea Levy 2274d7e96e Merge branch 'chromedriver221' of git://github.com/NeQuissimus/nixpkgs 2016-04-12 16:47:49 -04:00
Vincent Laporte 618b336808 coq-ext-lib: 0.9.0-beta3 -> 0.9.3 2016-04-12 19:43:49 +02:00
Tim Steinbach 7c2deb94bf chromedriver: 2.14 -> 2.21 2016-04-12 11:07:56 -04: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
zimbatm c8484b95be Merge pull request #14600 from nckx/update/gup
Update gup and rename gfxmonk -> timbertson
2016-04-12 12:08:43 +01:00
Peter Simons 4fe298f248 Merge pull request #14603 from obadz/haste-fix
haskellPackages.haste-compiler: fix build issue in #14581
2016-04-12 10:01:27 +02:00
Franz Pletz ef37c57e4e dfu-util: 0.8 -> 0.9 2016-04-12 04:28:50 +02:00