Commit Graph

17847 Commits

Author SHA1 Message Date
William A. Kennington III
baf30718ca Merge branch 'master.upstream' into staging.upstream 2015-11-18 02:36:33 -08:00
William A. Kennington III
357e471d56 rocksdb: 4.0 -> 4.1 2015-11-17 21:12:49 -08:00
William A. Kennington III
b809f886c0 libinput: 1.0.1 -> 1.1.1 2015-11-17 21:11:53 -08:00
William A. Kennington III
6e9f0df8bd gtk: 3.18.4 -> 3.18.5 2015-11-17 21:11:53 -08:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Luca Bruno
db4e688df2 git2: fix libssh support 2015-11-17 17:55:20 +01:00
Vladimír Čunát
31aa281919 libpng12: security update 1.2.53 -> 1.2.54
Part of fix for #11030.
Also refactor meta.
2015-11-17 12:57:33 +01:00
Domen Kožar
f809e8e0ab webkitgtk: 2.10.0 -> 2.10.4 (fix build) 2015-11-17 08:19:01 +01:00
Domen Kožar
4755afc385 Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)
Merge rest of the fixes from staging
2015-11-16 11:23:06 +01:00
Peter Simons
731965eb24 Merge pull request #10967 from sjourdois/cracklib
cracklib: 2.9.4 -> 2.9.6
2015-11-16 11:09:04 +01:00
Peter Simons
2025ed52a0 Merge pull request #10987 from mcmtroffaes/feature/libssh2-mingw
libssh2: fix shared library build under mingw
2015-11-16 11:05:45 +01:00
Vladimír Čunát
cc86857601 libpng: security and maintenance 1.6.18 -> 1.6.19
Fixes #11030, CVE-2015-{7981,8126}.
2015-11-16 08:12:08 +01:00
Tobias Geerinckx-Rice
b0e253a05c libpsl: list 2015-11-12 -> 2015-11-13 2015-11-15 03:56:59 +01:00
William A. Kennington III
b762a2035c taglib: 1.9.1 -> 1.10 2015-11-14 13:28:48 -08:00
William A. Kennington III
453f7c7218 Merge branch 'master.upstream' into staging.upstream 2015-11-14 12:39:32 -08:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
cdf65ba19e gtk3: 3.18.3 -> 3.18.4 2015-11-13 15:55:33 -08:00
William A. Kennington III
8f45d18a71 Merge branch 'master.upstream' into staging.upstream 2015-11-13 15:54:10 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Arseniy Seroka
f7bd63dc77 Merge pull request #10977 from sjourdois/ffmpeg
darwin: ffmpeg-full and deps: darwin fixes
2015-11-13 17:43:54 +03:00
Tobias Geerinckx-Rice
519d18b063 libpsl: list 2015-10-11 -> 2015-11-12 2015-11-13 15:07:34 +01:00
vbgl
c14eca68a4 Merge pull request #10965 from sjourdois/cgal
cgal: 4.6.1 -> 4.7
2015-11-13 00:07:04 +01:00
Matthias C. M. Troffaes
d583c16568 libssh2: fix shared library build under mingw 2015-11-12 15:12:09 +00:00
William A. Kennington III
6de80cb21b libevdev: 1.4.4 -> 1.4.5 2015-11-11 15:47:22 -08:00
William A. Kennington III
0ba740d26b mesa: 11.0.4 -> 11.0.5 2015-11-11 15:45:15 -08:00
Stéphane Jourdois
a2bf64a381 darwin: ffmpeg-full: add some missing darwin deps 2015-11-11 23:00:11 +01:00
Stéphane Jourdois
b096a863a9 darwin: wavpack: add missing darwin deps 2015-11-11 23:00:10 +01:00
Stéphane Jourdois
eed349522f darwin: libsndfile: add missing darwin deps 2015-11-11 23:00:10 +01:00
Stéphane Jourdois
00da78070e darwin: libdc1394: add missing darwin deps 2015-11-11 23:00:10 +01:00
Demin Dmitriy
f47103e015 libgksu: fix sudo references (close #10524)
gksudo wasn't working because libgksu used wrong sudo file which doesn't have setuid bit

Committer: it isn't optimal, as it won't work on non-NixOS. I've got a
patch for it to use relative paths, but apparently something's wrong
with it and I don't want to kill much more time with it ATM.
2015-11-11 14:24:05 +01:00
Stéphane Jourdois
50783998a2 cracklib: 2.9.4 -> 2.9.6 2015-11-11 13:44:07 +01:00
Stéphane Jourdois
48cd7177b2 cgal: 4.6.1 -> 4.7
Also enable darwin support
2015-11-11 13:09:57 +01:00
Domen Kožar
505117f3fb Merge branch 'master' into staging 2015-11-11 12:53:36 +01:00
Domen Kožar
f81a32d7cb Merge pull request #10947 from sjourdois/check
darwin: check: add missing CoreServices dep
2015-11-11 12:03:14 +01:00
William A. Kennington III
cb21b77ff1 gtk3: 3.18.0 -> 3.18.3 2015-11-10 18:25:47 -08:00
Stéphane Jourdois
492562fe59 darwin: subunit: allow build on Darwin 2015-11-10 22:14:06 +01:00
Stéphane Jourdois
ea5a227993 darwin: check: add missing CoreServices dep 2015-11-10 22:13:31 +01:00
Arseniy Seroka
a8a58faedb Merge pull request #10896 from sjourdois/gnutls
darwin: gnutls: add missing libiconv dep
2015-11-10 15:29:13 +03:00
Arseniy Seroka
2092b833bb Merge pull request #10895 from sjourdois/libidn
darwin: libidn: add missing libiconv dep
2015-11-10 15:29:01 +03:00
taku0
63385e9712 ncurses: revived clang patch (close #10622) 2015-11-10 09:08:09 +01:00
Karn Kallio
75ffec77ee signond : update the URL, which has changed
Patch contributed by Karn Kallio <tierpluspluslists@skami.org>.
Committed by falsifian <jcook@cs.berkeley.edu>.
2015-11-09 23:49:31 -08:00
Peter Simons
0435fe715c Merge pull request #10790 from mcmtroffaes/feature/openssl-mingw
openssl: cross build improvement
2015-11-09 20:53:22 +01:00
Thomas Tuegel
d9f64f975b Merge pull request #10916 from bjornfor/fix-qt55-qtmultimedia
qt55: fix qtmultimedia gstreamer support
2015-11-09 05:41:58 -06:00
Bjørn Forsman
2cec70ce6c qt55: fix qtmultimedia gstreamer support
Without this, configure will say:

  Checking for openal... no
  /tmp/nix-build-qtmultimedia-5.5.0.drv-0/qtmultimedia-opensource-src-5.5.0/qtmultimedia.pro:28:
  Variable GST_VERSION is not defined.
  Checking for resourcepolicy... no

And there may be application runtime errors like

  defaultServiceProvider::requestService(): no service found for - "org.qt-project.qt.camera"

After this fix, configure will say:

  Checking for openal... no
  Checking for gstreamer... yes
  Checking for gstreamer_photography... no
  Checking for gstreamer_encodingprofiles... yes
  Checking for gstreamer_appsrc... yes
  Checking for linux_v4l... yes
  Checking for resourcepolicy... no

And the above runtime error will not appear.

This fix is similar to 449b6028 ("qt5.multimedia: fix gstreamer
support."), except with Qt 5.5 we also need to set GST_VERSION.
2015-11-09 10:55:04 +01:00
Pascal Wittmann
fc6c73c3c2 Merge pull request #10887 from devhell/mediainfo
{lib}mediainfo-{gui}, libzen: 0.7.78 -> 0.7.79, 0.4.31 -> 0.4.32
2015-11-09 10:06:06 +01:00
William A. Kennington III
4674e53eea rdkafka: 0.8.6 -> 2015-11-03 2015-11-08 20:42:12 -08:00
William A. Kennington III
7e56400d4f rabbitmq-c: 0.7.0 -> 0.7.1 2015-11-08 20:42:12 -08:00
Stéphane Jourdois
d2452d1951 darwin: gnutls: add missing libiconv dep 2015-11-08 19:02:43 +01:00
Stéphane Jourdois
31c3301d23 darwin: libidn: add missing libiconv dep 2015-11-08 19:02:12 +01:00
devhell
e20ce69aca libzen: 0.4.31 -> 0.4.32
This is the update to `libzen` which is a dependency of `mediainfo{-gui}`.
2015-11-08 15:05:26 +00:00