1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Commit graph

18974 commits

Author SHA1 Message Date
Wout Mertens 017469c1ef Merge pull request #14036 from acowley/darwin-ffmpeg
Darwin ffmpeg
2016-04-23 15:24:21 +02: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
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
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