Commit graph

19379 commits

Author SHA1 Message Date
Marc Scholten 45f9fd8c51 libmcrypt: Fixed missing nmedit on darwin (#15775) 2016-05-31 09:18:37 +01:00
Thomas Tuegel 0d11f9beb5 Merge branch 'qt-cmake-paths' 2016-05-30 17:01:21 -05:00
Thomas Tuegel e0d03c43bf qt56: make symlink farm for CMake builds like QMake 2016-05-30 16:29:41 -05:00
Bjørn Forsman d248aef1cf gstreamer: 1.8.0 -> 1.8.1 (bugfixes)
Release notes:
https://gstreamer.freedesktop.org/releases/gstreamer/1.8.1.html

Tested with nox-review; this change does not introduce build breakage.
2016-05-30 21:51:29 +02:00
Franz Pletz 7d580b8339 gd: 2.1.1 -> 2.2.1 2016-05-30 09:49:12 +02:00
Thomas Tuegel fde2093b44 Merge branch 'qmake-rpath' 2016-05-29 20:29:45 -05:00
Thomas Tuegel 95c5bfc2dc qt55.qmakeHook: remove temporary directory in postInstall
Fixes #15556. If the temporary directory is not removed, it will be
retained in RPATH, which is a serious security concern.
2016-05-29 14:07:03 -05:00
Joachim Fasting ca227d3746 Merge pull request #15502 from nathan7/master
sqlite: pass --enable-readline when interactive mode is enabled
2016-05-29 12:19:15 +02:00
Herwig Hochleitner aea7158e79 opencl icd: init at 2.2.9 2016-05-29 10:44:42 +02:00
Thomas Tuegel 747517da48 qt56.qmakeHook: remove temporary directory in postInstall
Fixes #15556. If the temporary directory is not removed, it will be
retained in RPATH, which is a serious security concern.
2016-05-28 16:06:03 -05:00
Frederik Rietdijk 373455e237 Merge pull request #15613 from womfoo/facter
facter: 3.1.5 -> 3.1.6 (add ruby support) and dependency leatherman: 0.4.2 -> 0.7.0
2016-05-28 15:29:31 +02:00
Tobias Pflug 84f31ded3f libpipeline: fix build for osx (#15754) 2016-05-27 18:40:46 +02:00
Vladimír Čunát e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Vladimír Čunát dc13593b9f libxml2: disable checks on Darwin
Apparently they won't work there.
2016-05-27 09:45:46 +02:00
Joachim Fasting e746e1ffbc Merge pull request #15667 from joachifm/delete-box2d_2_0_1
box2d_2_0_1: delete expression
2016-05-27 00:34:27 +02:00
Franz Pletz 28395e85da libndp: 1.5 -> 1.6 (security)
Fix CVE-2016-3698.

See https://lwn.net/Articles/688591/.
2016-05-26 17:22:46 +02:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Vladimír Čunát 21df05d1ad xine-lib: drop libdvdcss dependency
There's no mention in log, etc... it's probably not useful anymore.
2016-05-26 15:43:48 +02:00
Vladimír Čunát 91c66ec1d2 xine-lib: 1.2.4 -> 1.2.6 2016-05-26 15:43:48 +02:00
Vladimír Čunát d51bf88e61 xine-lib: fixup build, probably after libxcb update 2016-05-26 15:43:48 +02:00
Vladimír Čunát f4bddaf51f libxml2: doCheck = true
That wouldn't uncover the problem fixed in parent commit,
but it shouldn't hurt.
2016-05-26 15:09:28 +02:00
Vladimír Čunát 3069606108 libxml2: fixup validation problems with 2.9.4
... by reverting an upstream commit
/cc #15697.

I should make some distro pay me for digging into such things :-)
2016-05-26 13:49:08 +02:00
Joachim Fasting 0dd4a30ec2
libmp3splt: 0.9.1 -> 0.9.2
While we're at it, also do some light refactorings
- multiple outputs
- use sourceforge mirror
- meta cleanup
2016-05-26 13:43:57 +02:00
Vladimír Čunát 6d16979d7a Merge #15622: remove fltk-2, improve fltk13 2016-05-26 10:55:25 +02:00
Vladimír Čunát 34e558274d fltk13: xftSupport = true by default
It seems often desired.
2016-05-26 10:38:17 +02:00
Vladimír Čunát e5c500475c fltk13: various fixups 2016-05-26 10:35:29 +02:00
Bjørn Forsman b9f30bdc20 goocanvas: 0.10 -> 1.0 (fixes build)
I'm not updating to the 2.x version yet, because the only dependee of
this package is 'shutter' (which I'm about to package) and it doesn't
support 2.x.
2016-05-26 10:31:27 +02:00
Arseniy Seroka c6b3aca4e2 Merge pull request #15654 from wavewave/magma
magma: init at 2.0.2
2016-05-26 01:02:14 +03:00
Arseniy Seroka 844d3fcb75 Merge pull request #15664 from wavewave/cudnn
cudnn: init at 4.0
2016-05-26 00:19:42 +03:00
Ian-Woo Kim e47070ad64 cudnn: init at 4.0 2016-05-25 18:26:57 +00:00
Ian-Woo Kim fd42fccd4c magma: init at 2.0.2 2016-05-25 18:14:41 +00:00
Rickard Nilsson 4e706a13c8 openldap: Remove unused patch 2016-05-25 16:32:52 +00:00
Rickard Nilsson 92ce529880 Revert "openldap: Remove dontPatchELF"
This reverts commit 366c1e88fc, that
caused OpenLDAP to not find its own libs. See discussion in
366c1e88fc
2016-05-25 16:31:23 +00:00
Graham Christensen 772851ff46 libxml2: 2.9.3 -> 2.9.4 for three CVEs (close #15697)
- CVE-2016-4447: libxml2: Heap-based buffer underreads due to xmlParseName
   https://bugzilla.redhat.com/show_bug.cgi?id=1338686

 - CVE-2016-4448 libxml2: Format string vulnerability
   https://bugzilla.redhat.com/show_bug.cgi?id=1338700

 - CVE-2016-4449 libxml2: Inappropriate fetch of entities content
   https://bugzilla.redhat.com/show_bug.cgi?id=1338701

and many other fixed issues, available at http://www.xmlsoft.org/news.html
2016-05-25 18:28:52 +02:00
Rok Garbas f78831c8b6 vaapi: 1.6.2 -> 1.7.0 2016-05-25 11:02:19 +02:00
Rok Garbas e5f20dc34d libva: 1.6.2 -> 1.7.0 2016-05-25 11:02:19 +02:00
Tobias Geerinckx-Rice 823ec00fdf
libwps: 0.4.2 -> 0.4.3 2016-05-25 02:06:47 +02:00
Arseniy Seroka c39f716f91 Merge pull request #15650 from rycee/bump/hiredis
hiredis: 0.13.1 -> 0.13.3
2016-05-24 22:05:50 +03:00
Guillaume Maudoux 830b58f562 pcre2: 10.20 -> 10.21 2016-05-24 16:22:43 +02:00
Tobias Geerinckx-Rice dc6172b0f0
libwacom: 0.15 -> 0.19 2016-05-24 15:00:49 +02:00
Joachim Fasting 45aa2743e2
box2d_2_0_1: delete expression
Not used anywhere, appears to be no reason to keep it around.

See also #4210
2016-05-24 14:05:30 +02:00
Alexander Ried aacb157976 wayland-protocols: 1.3 -> 1.4 (#15644) 2016-05-24 13:36:50 +02:00
Robert Helgesson 43dab9d372 hiredis: 0.13.1 -> 0.13.3 2016-05-23 22:29:53 +02:00
Tobias Geerinckx-Rice 4f281384a4
libpsl: list 2016-05-10 -> 2016-05-23 2016-05-23 20:12:37 +02:00
Franz Pletz 26964c2fb5 libvirt: enable zfs on linux 2016-05-23 15:49:07 +02:00
Eelco Dolstra 77f7f497e1 Merge pull request #15628 from joachifm/gd-split-outputs
gd: multiple outputs
2016-05-23 11:30:20 +02:00
Joachim Fasting 6a2244e8f4
Revert "Merge pull request #15595 from laMudri/agda-stdlib"
This reverts commit ce4f6c215f, reversing
changes made to 7817d0901d.

See 68e1419cb8 (r64175487)
2016-05-23 09:07:02 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Julien Dehos 2607b53e9d fltk: 2-alpha -> 1.3.3 2016-05-23 08:37:19 +02:00
Joachim Fasting ce4f6c215f Merge pull request #15595 from laMudri/agda-stdlib
Agda: 2.4.2.3 -> 2.5.1
2016-05-23 08:23:55 +02:00
Eelco Dolstra 1a52fdc3c6 mesa: Use symlinks instead of hard links for the DRI/vdpau drivers
This reduces the size of the drivers output from 193 MiB to 44 MiB.

@vcunat
2016-05-22 23:05:10 +02:00
Joachim Fasting 63a8c58185
gd: multiple outputs 2016-05-22 20:03:00 +02:00
Kranium Gikos Mendoza a6734bdd27 lasso: init at 2.5.1 2016-05-23 02:02:25 +08:00
Bjørn Forsman 1cc4e03a7c wildmidi: 0.3.8 -> 0.3.9 2016-05-22 17:12:31 +02:00
Kranium Gikos Mendoza bac12280ef leatherman: 0.4.2 -> 0.7.0 2016-05-22 18:44:54 +08:00
Vladimír Čunát 4c646dd6cb harfbuzz: 1.1.2 -> 1.2.7
Updated, after longer time.
2016-05-22 12:10:42 +02:00
Vladimír Čunát 41d3aa5cd2 libpng: 1.6.20 -> 1.6.21 2016-05-22 12:10:42 +02:00
Vladimír Čunát 8456b0fad3 dbus-glib: update 0.104 -> 0.106 2016-05-22 12:10:41 +02:00
Vladimír Čunát 656a7dcf1e at-spi2-{atk,core}: update 2.18.1 -> 2.20.1 2016-05-22 12:10:41 +02:00
Vladimír Čunát 6352251cbe atk: update 2.18.0 -> 2.20.0 2016-05-22 12:10:41 +02:00
Vladimír Čunát 3c46131169 gtk3: maintenance update 3.20.3 -> 3.20.5 2016-05-22 12:10:41 +02:00
Vladimír Čunát 3d82d58d9b pango: update 1.38.1 -> 1.40.1 2016-05-22 12:10:40 +02:00
Vladimír Čunát 7875b6ae3a gtk2: maintenance update 2.24.29 -> 2.24.30 2016-05-22 12:10:40 +02:00
Vladimír Čunát 5ff3fc0a93 glib: maintenance update 2.48.0 -> 2.48.1 2016-05-22 12:10:40 +02:00
Vladimír Čunát 61f63d5ddc mesa: feature update 11.1.3 -> 11.2.2 2016-05-22 12:10:39 +02:00
Vladimír Čunát 1c253e7729 libdrm: 2.4.66 -> 2.4.68 2016-05-22 12:10:39 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
laMudri 6343cf8ae7 Agda: marked some old packages as broken 2016-05-21 23:24:49 +01:00
Anthony Cowley 7b56411fef tinyxml: darwin compatibility
- Relax the baked-in assumption that g++ is used to build and link
- Use the appropriate shared library extension on darwin
2016-05-21 21:04:41 +02:00
laMudri 92b843f9a5 agda-prelude: 2014-09-27 -> 2016-04-18 2016-05-21 17:27:31 +01:00
laMudri 072ce88eb9 agda-stdlib: 2.4.2.3 -> v0.12 (for Agda-2.5.1) 2016-05-21 17:27:31 +01:00
Anthony Cowley e4e422aa91 pcl: visualization components in darwin
Supplies the necessary frameworks and build system tweaks to build the
vtkWithQt4 components on darwin. This follows on from PRs #14705 and #14749.
2016-05-21 17:38:28 +02:00
Vladimír Čunát a6b6f6e049 Merge branch 'staging'
This is to get security fix for expat soon-ish.
Causes ~8k rebuilds; whole staging would be a stdenv rebuild.
2016-05-20 16:33:28 +02:00
Vladimír Čunát c2ee8e1033 qt56.qtbase: fix evaluation on darwin
/cc @ttuegel.
Maybe there's a better way; I didn't want to spend much time.
2016-05-20 12:48:50 +02:00
Robert Helgesson 34cf7934c3 expat: patch CVE-2015-1283 and CVE-2016-0718 (close #15561)
Note, CVE-2015-1283 is already patched in expat version 2.1.1 but, as
explained in the patch, the fix was insufficient.
2016-05-20 09:43:29 +02:00
zimbatm 857a5229fb Merge pull request #15543 from groxxda/bump/libuv
libuv: 1.9.0 -> 1.9.1, nodejs-4.3.1 -> 4.4.4, nodejs-5.11.0 -> 5.11.1
2016-05-19 15:40:12 +01:00
Vladimír Čunát 5eea16ee90 Merge branch 'master' into staging
... to get expat mass rebuild.
Hydra nixpkgs: ?compare=1272431
2016-05-19 15:42:18 +02:00
Tuomas Tynkkynen 0f19dfd0ef treewide: Make explicit that 'dev' output of libXft is used 2016-05-19 10:04:40 +02:00
Tuomas Tynkkynen 7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen 8d473f107c treewide: Make explicit that 'dev' output of readline is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen d42e94472d treewide: Make explicit that 'dev' output of pcre is used 2016-05-19 10:02:28 +02:00
Tuomas Tynkkynen 2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen 5eb01cd0ad treewide: Make explicit that 'dev' output of openldap is used 2016-05-19 10:00:50 +02:00
Tuomas Tynkkynen 99acb412ab treewide: Make explicit that 'dev' output of ncurses is used 2016-05-19 10:00:49 +02:00
Tuomas Tynkkynen ad1a47061e treewide: Make explicit that 'dev' output of libtiff is used 2016-05-19 10:00:46 +02:00
Tuomas Tynkkynen 8638a08c9e treewide: Make explicit that 'dev' output of libsoup is used 2016-05-19 10:00:45 +02:00
Tuomas Tynkkynen 309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Tuomas Tynkkynen 674eb400ef treewide: Make explicit that 'dev' output of libevent is used 2016-05-19 10:00:40 +02:00
Tuomas Tynkkynen d6dc1bce76 treewide: Make explicit that 'dev' output of json_c is used 2016-05-19 10:00:39 +02:00
Tuomas Tynkkynen f81af4e6f0 treewide: Make explicit that 'dev' output of glib is used 2016-05-19 10:00:35 +02:00
Tuomas Tynkkynen 288912c2c4 treewide: Make explicit that 'dev' output of freetype is used 2016-05-19 10:00:34 +02:00
Tuomas Tynkkynen 8bbc3fe801 treewide: Make explicit that 'dev' output of expat is used 2016-05-19 10:00:30 +02:00
Tuomas Tynkkynen d298b52fd3 treewide: Make explicit that 'dev' output of aprutil is used 2016-05-19 10:00:25 +02:00
Tuomas Tynkkynen 29694b43b6 treewide: Make explicit that 'dev' output of apr is used 2016-05-19 10:00:24 +02:00
Alexander Ried 88ffa3ae89 libuv: 1.9.0 -> 1.9.1 2016-05-18 18:36:53 +02:00
Robert Helgesson 6658077815 expat: 2.1.0 -> 2.1.1
Also remove CVE patch merged upstream and enable tests.
2016-05-17 21:20:48 +02:00
Domen Kožar 00ead3178b mailcore2: remove git conflict line, still doesn't build 2016-05-17 13:07:22 +01:00
Vladimír Čunát 4e6b45d0a0 Merge branch 'master' into staging
... to get the ffmpeg changes which cause nontrivial rebuilds.
2016-05-17 11:46:37 +02:00
Vladimír Čunát 604b0c86bf boost: fix build on mingw after b465dc202f
We passed bogus --libdir even in standard native builds;
apparently it wasn't a problem, but I also fixed that.
2016-05-17 10:41:06 +02:00
Franz Pletz 28e051f066
ffmpeg: add patches for libvpx 1.5
ffmpeg bug report: https://trac.ffmpeg.org/ticket/4956
ffmepg fix commit: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
2016-05-17 01:02:30 +02:00
Christian Albrecht fd294521e6
libav: add patches for libvpx 1.5
ffmpeg bug report: https://trac.ffmpeg.org/ticket/4956
ffmepg fix commit: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
2016-05-17 01:01:55 +02:00
taku0 67cb0eaae3
libvpx: 1.4.0 -> 1.5.0
Closes #15136.
2016-05-17 01:00:13 +02:00
Franz Pletz e98a0bc9e0 Merge pull request #15476 from matthiasbeyer/update-unmaintained
Update unmaintained packages
2016-05-16 23:45:11 +02:00
Peter Simons 385b21c92d boost/generic.nix: fix Emacs syntax highlighting (cosmetic) 2016-05-16 22:49:55 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Tobias Geerinckx-Rice 2b3e994587
webkitgtk212x: move libXdmcp to buildInputs 2016-05-16 20:27:31 +02:00
Shea Levy da998cffcd gsasl: Maintain, fix gssapi support 2016-05-16 14:10:29 -04:00
Nathan Zadoks f8b2c439d6 sqlite: pass --enable-readline when interactive mode is enabled
Fix #14378
2016-05-16 13:30:19 -04:00
Matthias Beyer e958e827fe libgit2: 0.23.2 -> 0.24.1 2016-05-16 16:12:23 +02:00
Matthias Beyer 17cf80dfb5 log4cplus: 1.1.2 -> 1.2.0 2016-05-16 16:12:23 +02:00
Matthias Beyer 3c8681646d soundtouch: 1.8.0 -> 1.9.2 2016-05-16 16:12:22 +02:00
Matthias Beyer 8f2eb1b7ff http-parser: 2.6.1 -> 2.7.0 2016-05-16 16:12:21 +02:00
Matthias Beyer 2636145368 incrtcl: 3.4.1 -> 4.0.4 2016-05-16 16:12:21 +02:00
Matthias Beyer 950764f9f8 gdcm: 2.4.4 -> 2.4.6 2016-05-16 16:12:20 +02:00
Matthias Beyer 673b6d6d01 bwidget: 1.9.8 -> 1.9.10 2016-05-16 16:12:19 +02:00
Matthias Beyer 48f94e2aea cloog: 0.18.3 -> 0.18.4 2016-05-16 16:12:19 +02:00
Vladimír Čunát e5d40c6fa3 Merge branch 'staging'
Hydra is only half-finished, but we'd better get secure glibc fast.
2016-05-16 10:15:28 +02:00
Evgeny Egorochkin 4b979eef29 atlas: put the name suffix where it belongs 2016-05-16 10:19:38 +03:00
Michael Raskin 40fd39e88e libre: 0.4.15 -> 0.4.16 2016-05-15 23:49:44 +02:00
Tobias Geerinckx-Rice 85148e8ed2
webkitgtk212x: add missing X library inputs
Conservatively added to buildInputs, but not really sure why
libXdmcp is native. @bendlas?
2016-05-15 23:20:34 +02:00
Joachim Fasting 58736aec93 Merge pull request #15467 from juliendehos/cpputest
cpputest: init at 3.7.2
2016-05-15 15:06:08 +02:00
Julien Dehos 6400283c09 cpputest: init at 3.7.2 2016-05-15 14:54:19 +02:00
Joachim Fasting 397b356383 Merge pull request #15323 from joachifm/libgd
gd: 2.0.35 -> 2.1.1
2016-05-15 14:12:28 +02:00
Sebastián Bernardo Galkin edaecb41db
postgis: fix build after output splits
Fixes #15236

Two changes were needed:

- pg_config from postgresql package wasn't reporting the correct location for
the pgxs extension system, after the output split
- json_c is now split in dev and out outputs, postgis configure doesn't find the
library location properly

Closes #15470
2016-05-15 11:49:59 +02:00
Joachim Fasting 577d999ea6 Merge pull request #15448 from joachifm/libksba
libksba: 1.3.3 -> 1.3.4
2016-05-15 10:30:59 +02:00
Rok Garbas 4aa0e50388 libmpack: init at 1.0.2 2016-05-15 06:52:55 +02:00
Rok Garbas e5177a9642 libxkbcommon: 0.5.0 -> 0.6.1
and ...
- added license
- added myself as a maintainer
2016-05-15 06:52:55 +02:00
Vladimír Čunát 45a14c873b Merge #15447: glibc security updates 2016-05-14 21:38:18 +02:00
Vladimír Čunát b1ac3404e0 Merge branch 'master' into staging 2016-05-14 21:37:55 +02:00
Scott R. Parish 64f5845418 glibc: patch 2.23 for CVE-2016-3075, CVE-2016-1234, CVE-2016-3706
This addresses the following security advisories:

+ CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r
+ CVE-2016-1234: glob: buffer overflow with GLOB_ALTDIRFUNC due to incorrect
                 NAME_MAX limit assumption
+ CVE-2016-3706: getaddrinfo: stack overflow in hostent conversion

Patches cherry-picked from glibc's release/2.23/master branch.

The "glob-simplify-interface.patch" was a dependency for
"cve-2016-1234.patch".
2016-05-13 23:47:17 -07:00
Joachim Fasting 7e4db700dc
libksba: 1.3.3 -> 1.3.4
Contains a fix for https://access.redhat.com/security/cve/CVE-2016-4574
2016-05-14 08:25:36 +02:00
Joachim Fasting 220836d066
gd: apply patch for CVE-2016-3074 from upstream
Source:
2bb97f407c.patch

The original patch contains binary data, however, which is not supported
by `patch`; we could use `git apply` here, of course, but it was simpler
to just copy-paste only the fix into a separate file and include it in
the repo.
2016-05-14 07:15:41 +02:00
Joachim Fasting f8bdd7969d
gd: 2.0.35 -> 2.1.1
Upstream claims 2.1 is fully API compatible with 2.0

https://libgd.github.io/release-2.1.0.html
https://libgd.github.io/release-2.1.1.html

Also includes meta updates, adds pkg-config to the build environment,
for proper detection of dependencies, and adds optional support for tiff
and xpm image formats.
2016-05-14 07:15:41 +02:00
Nikolay Amiantov 4cb218b76a xgboost: fix license
Looks like `nix-env -qaP --drv-path` is not enough and one need to
either add `--json` too to catch problems like this... or just use
`nox-review wip`.
2016-05-14 02:38:12 +03:00
Nikolay Amiantov c403235585 xgboost: init at 2016-05-14 2016-05-14 02:16:13 +03:00
Joachim Fasting aab9a5f0d1 Merge pull request #15351 from groxxda/bump/libinput
libinput: 1.2.3 -> 1.3.0
2016-05-13 20:36:33 +02:00
Franz Pletz 7a2accbf5a jemalloc: 4.0.3 -> 4.1.1 2016-05-13 17:04:50 +02:00
Franz Pletz 479a40182a nghttp2: 1.9.2 -> 1.10.0 2016-05-13 17:04:15 +02:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Ricardo Ardissone 79914075f4 SDL: Revert "SDL: use mesa_noglu instead of mesa"
This reverts commit a9a94df4e6.
2016-05-12 18:40:33 -03:00
Pascal Wittmann 8ce8226655 libfilezilla: 0.5.0 -> 0.5.1 2016-05-12 20:59:15 +02:00
Joachim Fasting f236168662 Merge pull request #15401 from acowley/libass-darwin
libass: darwin compatibility
2016-05-12 10:08:22 +02:00
Carles Pagès d077506443 assimp: 3.1.1 -> 3.2 2016-05-12 09:13:07 +02:00
Anthony Cowley 6360ad48af libass: darwin compatibility 2016-05-12 01:50:13 -04:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Bjørn Forsman f768098e3e libserialport: 0.1.0 -> 0.1.1 2016-05-11 22:23:29 +02:00
Thomas Tuegel d22df66c54 qt56: remove fixQtModuleCMakeConfig 2016-05-11 10:19:28 -05:00
Nikolay Amiantov 700e2952be Merge pull request #15012 from abbradar/unixodbc
UnixODBC updates
2016-05-11 17:42:33 +03:00