Eelco Dolstra
bc1773fe16
Merge remote-tracking branch 'origin/staging' into systemd-219
...
Conflicts:
pkgs/os-specific/linux/kernel/linux-3.4.nix
pkgs/os-specific/linux/systemd/default.nix
2015-07-20 22:57:23 +02:00
Thomas Tuegel
feafb17926
Merge branch 'qt5-psql'
2015-07-20 15:05:41 -05:00
Thomas Tuegel
6a10139bba
qt53: disable unsupported SIMD instruction sets
2015-07-20 15:04:44 -05:00
Thomas Tuegel
4d36b10f90
qt53: override postgresql autodetection
2015-07-20 15:03:52 -05:00
Austin Seipp
6dac59b096
nixpkgs: libseccomp 2.2.1 -> 2.2.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
Thomas Tuegel
5eae46fc93
Merge branch 'qt5-psql'
2015-07-20 08:49:30 -05:00
Thomas Tuegel
965f330c65
qt5.base: disable unsupported SIMD instruction sets
...
If not explicitly disabled, Qt tries to detect support for the various
instruction sets. As a result, binaries built on Hydra may use
instruction sets unsupported by clients.
2015-07-20 08:46:20 -05:00
Thomas Tuegel
17a65c4bf0
qt5.base: override postgresql autodetection
2015-07-20 08:41:57 -05:00
Vladimír Čunát
52b3546e4a
merge #8617 : recoll: filters for LaTeX, RTF, and WP
2015-07-20 11:00:04 +02:00
William A. Kennington III
f6bc130bc8
libssh: 0.7.0 -> 0.7.1
2015-07-19 17:00:16 -07:00
William A. Kennington III
05c0fc15c0
Merge branch 'master.upstream' into staging.upstream
2015-07-19 15:20:04 -07:00
William A. Kennington III
33ff74ced6
libdrm: Remove valgrind as a dependency
...
cc @vcunat
2015-07-19 12:04:55 -07:00
Thomas Tuegel
3f3da5ccbd
qt5.base: install setupHook correctly
2015-07-19 13:38:51 -05:00
Thomas Tuegel
bb6459dd0b
qt5.base: use pkgconfig unconditionally
2015-07-19 13:38:36 -05:00
Thomas Strobel
88be5eb371
gstreamer-vaapi: 0.5.10 -> 0.6.0
2015-07-19 17:06:32 +02:00
Matthias Beyer
20882964f5
zlog: init at 1.2.12
...
[Bjørn: add name= to fetchzip, remove unneeded -r flag from sed.]
2015-07-19 13:58:28 +02:00
Vladimír Čunát
bde4ea1a8b
poppler: small update
...
/cc maintainer @ttuegel.
2015-07-19 13:33:04 +02:00
Vladimír Čunát
a06de72c2f
harfbuzz: small update
2015-07-19 13:33:03 +02:00
Vladimír Čunát
dcea851434
mesa: tweak the patch after 7fe69244af
...
In particular, do not try dlopening libudev by a non-absolute path.
/cc @wkennington.
2015-07-19 13:31:07 +02:00
Vladimír Čunát
6437b2108d
libdrm: update and add valgrind dependency
...
I couldn't find an easy way around this new build-time dependency,
unfortunately. It creates some new mass-rebuild chains...
2015-07-19 11:26:10 +02:00
William A. Kennington III
2ad250f4fa
Merge branch 'staging.next' into staging.upstream
2015-07-19 02:21:28 -07:00
Vladimír Čunát
9a80550cc4
Merge branch 'staging', discussion #8844
2015-07-19 08:09:29 +02:00
Boris Sukholitko
ff6fd0ea86
uriparser: init at 0.8.2
2015-07-18 14:17:46 +03:00
Thomas Tuegel
49791a4dd4
Merge branch 'kf512'
2015-07-18 05:34:14 -05:00
Thomas Tuegel
479e248e42
kf512: add missing dependencies for kwallet
2015-07-18 05:32:54 -05:00
Thomas Tuegel
db5335a662
kf512: fix bluez-qt udev rules path
2015-07-18 05:32:54 -05:00
Thomas Tuegel
3dc7f41d6d
add kde-frameworks-5.12
2015-07-18 05:32:41 -05:00
Arseniy Seroka
30f1c9da75
Merge pull request #8855 from bosu/add-cpptest
...
cpptest: init at 1.1.2
2015-07-18 12:55:20 +03:00
Vladimír Čunát
0a00e06f91
libao: fix list nesting
2015-07-18 10:23:16 +02:00
Boris Sukholitko
3d17e2d658
cpptest: init at 1.1.2
2015-07-18 10:12:50 +03:00
William A. Kennington III
7fe69244af
mesa: Fix dlopen patch
2015-07-17 18:33:19 -07:00
William A. Kennington III
83f295f1af
mpfr: 3.1.2 -> 3.1.3
2015-07-17 15:41:50 -07:00
William A. Kennington III
4877451d2e
gettext: 0.19.5 -> 0.19.5.1
2015-07-17 14:38:00 -07:00
William A. Kennington III
35664f4569
gettext: 0.19.4 -> 0.19.5
2015-07-17 14:37:11 -07:00
William A. Kennington III
67ebbc9a78
nghttp2: 1.0.2 -> 1.1.1
2015-07-17 14:35:45 -07:00
William A. Kennington III
de8e6f6021
Merge branch 'staging.upstream' into staging.next
2015-07-17 14:34:37 -07:00
William A. Kennington III
42ccbd9950
boost: Add 1.58 and make it the default
2015-07-17 14:34:19 -07:00
William A. Kennington III
440954ab88
mesa: 10.6.1 -> 10.6.2
2015-07-17 14:16:26 -07:00
Vladimír Čunát
9f37e91ec5
Merge master into staging
...
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
541f6617f9
libinput: 0.17.0 -> 0.20.0
2015-07-16 20:07:17 -07:00
Mateusz Kowalczyk
70a67803eb
Merge pull request #8712 from andrewrk/ffmpeg
...
ffmpeg: 2.6.3 -> 2.7.1
2015-07-16 17:35:43 +01:00
William A. Kennington III
8486784227
Merge pull request #8848 from rycee/fix/libwmf-some-CVEs
...
libwmf: fix some security issues
2015-07-15 17:39:05 -07:00
Robert Helgesson
11947a55c8
libwmf: fix some security issues
...
The added patches (sourced from Debian) fixes the following security
issues:
- CVE-2006-3376
- CVE-2009-1364
- CVE-2015-0848
- CVE-2015-4588
- CVE-2015-4695
- CVE-2015-4696
2015-07-15 23:23:53 +02:00
William A. Kennington III
08ef62c100
gnutls: 3.4.2 -> 3.4.3
2015-07-15 12:48:02 -07:00
William A. Kennington III
b48e49ddc3
gnutls: 3.3.15 -> 3.3.16
2015-07-15 12:42:40 -07:00
Joachim Fasting
ba03068c21
libwpd: add meta.{description,license,homepage}
2015-07-15 17:03:18 +02:00
William A. Kennington III
25e60feb72
Merge branch 'master.upstream' into staging.upstream
2015-07-15 02:02:46 -07:00
Luca Bruno
82d2960f15
libusb1: fix on darwin
2015-07-15 10:31:22 +02:00
Tobias Geerinckx-Rice
828f9ea8cc
keyfinder-cli: use old libkeyfinder 0.11 "for now"
...
The tool doesn't compile against versions 2.x.
Also, fix the incorrect version number & use src.meta.homepage.
2015-07-15 03:31:55 +02:00
Tobias Geerinckx-Rice
da9b997233
libkeyfinder 0.11 -> 2.1
2015-07-15 03:31:54 +02:00