Commit Graph

20832 Commits

Author SHA1 Message Date
Daniel Peebles
d77db89c3f Merge pull request #21048 from LnL7/darwin-wxmac
wxmac: fix build with clang-3.8
2016-12-14 18:04:25 -05:00
Frederik Rietdijk
1626b1b652 json_glib: use multiple outputs 2016-12-11 19:34:07 +01:00
Vladimír Čunát
105fead2aa
nghttp2 cleanup: unneeded patching, unused inputs
Suggested on
https://github.com/NixOS/nixpkgs/pull/21029#issuecomment-266290756
2016-12-11 17:51:47 +01:00
Daiderd Jordan
a3dbada107
wxmac: fix build with clang-3.8 2016-12-10 19:10:54 +01:00
Vladimír Čunát
c3d20b2e43
gtk3: maintenance 3.22.4 -> 3.22.5 2016-12-10 15:28:51 +01:00
Vladimír Čunát
af220f2a7a
cairo: maintenance 1.14.6 -> 1.14.8 2016-12-10 15:22:52 +01:00
Vladimír Čunát
0fa8ead76c
Merge #21029: nghttp2: 1.16.1 -> 1.17.0 2016-12-10 00:52:26 +01:00
c0bw3b
10d9845a1a nghttp2: 1.16.1 -> 1.17.0
See release notes :
https://github.com/nghttp2/nghttp2/releases/tag/v1.17.0
2016-12-10 00:36:28 +01:00
Vladimír Čunát
b05b120779
Merge branch 'master' into staging 2016-12-09 19:11:05 +01:00
Vladimír Čunát
ff62e8a72e
glib: avoid runtime reference from gtk3
Fixes #21022.  Related: #15931.
2016-12-09 18:53:39 +01:00
Thomas Tuegel
2a02544b34 Merge pull request #21009 from acowley/qt5.6.2-darwin
qt5.6: darwin compatibility
2016-12-09 09:12:43 -06:00
Joachim F
8760a7efd8 Merge pull request #20991 from dtzWill/fix/qtwebengine-paxmark
qt5.6/5.7: PaX compat qtwebengine
2016-12-09 00:31:13 +01:00
Anthony Cowley
7a9400d338 qt5.6: darwin compatibility
- qtbase builds on darwin
- Downstream qmake and cmake build configurations supported

Darwin-specific changes:

Prevent `qmake -project` from adding build support files in the temp
directory to the project.

Shrink the temp directory used for building with qmake.

The issue here is that `lndir` recreates the entire directory structure
of the module we are merging into the temporary build environment. On
darwin, the framework directory structures mean that this shadow
directory tree is 17MB even though the file contents are all symlinks
into the store.

To address this, we symlink the framework directories explicitly and
use `lndir` for everything else.
2016-12-08 18:28:30 -05:00
Graham Christensen
78c7d1b47b Merge pull request #20973 from grahamc/rollup-12
Roundup Rollup 12 (WIP)
2016-12-08 17:50:03 -05:00
Peter Marheine
469e5e7768 libdwarf: version the shared object (#20996)
Upstream sets the soname, so binaries compiled against libdwarf.so will
link against libdwarf.so.1 at runtime. Install libdwarf.so.1 and
symlink libdwarf.so to it so both linking and runtime loading work again.
2016-12-08 19:34:25 +01:00
Michael Raskin
1e580945f0 libre: 0.4.17 -> 0.5.0 2016-12-08 16:15:18 +01:00
Michael Raskin
ff3fc6eef3 librem: 0.4.7 -> 0.5.0 2016-12-08 16:15:18 +01:00
Michael Raskin
1461981190 harfbuzz: 1.3.3 -> 1.3.4 2016-12-08 16:15:18 +01:00
Eelco Dolstra
5743506c6e
aws-sdk-cpp: Use multiple outputs 2016-12-08 14:19:48 +01:00
Will Dietz
7c29e476a7 qt5.6/5.7: PaX compat qtwebengine
* paxmark QtWebEngineProcess so it executes on PaX kernels
* when building on host w/PaX apply patch to fix mksnapshot

Patch taken from Gentoo[1], slightly modified to use paxctl directly.

[1] https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
2016-12-07 20:02:41 -06:00
Vladimír Čunát
49187304d8
libdwarf: security 20161021 -> 20161124
/cc #20972.  It seems safe API+ABI-wise:
https://abi-laboratory.pro/tracker/timeline/libdwarf/

Also nitpicks: meta.homepage, etc.

Note: `darwin.dtrace` probably contains an embedded copy of libdwarf,
which I didn't (attempt to) fix.
2016-12-07 18:27:37 +01:00
Graham Christensen
e42f6a11ac
gstreamer: 1.10.1 -> 1.10.2 for multiple CVEs
CVE-2016-9807, CVE-2016-9808, CVE-2016-9809, CVE-2016-9810, CVE-2016-9811, CVE-2016-9812, CVE-2016-9813, CVE-2016-9634, CVE-2016-9635, CVE-2016-9636

https://gstreamer.freedesktop.org/releases/1.10/#1.10.2
2016-12-07 09:10:29 -05:00
Jörg Thalheim
0df00d66d5 Merge pull request #20916 from montag451/corosync
corosync: 2.4.1 -> 2.4.2
2016-12-07 12:50:23 +01:00
Jörg Thalheim
a65deea6c6 Merge pull request #20953 from joelmo/master
portaudio: remove old version portaudioSVN
2016-12-07 09:14:23 +01:00
Savanni D'Gerinel
705e29046d icu: remove icu4c-54.1
Only zoom-us depends on icu4c-54.1. Since we know that version has some vulnerabilities, and zoom-us appears to work with icu4c-57.1, I remove the icu/54.1.nix file, remove icu_54_1 from all-packages.nix, and have zoom-us depend on icu (i.e., icu4c-57.1)
2016-12-06 17:51:11 -06:00
Joel Moberg
b165b5e924 portaudio: remove old version portaudioSVN
The project is now using git and the sha for the source is wrong. Can
not find other derivations using this.
2016-12-06 22:26:41 +01:00
montag451
e797cfaeb6 librdmacm: add pkg-config support 2016-12-05 11:45:13 +01:00
montag451
3798da2c41 libibverbs: add pkg-config support 2016-12-05 11:44:28 +01:00
Tuomas Tynkkynen
a7c31ce165 snack: Mark broken
Besides the hardeningDisable I added, something else is broken.

gcc -c -O -fPIC -DUSE_TCL_STUBS -DUSE_TK_STUBS -DOSS  -I/nix/store/q2k3anmbnwklaxih3brk9g6mxzjv155z-tcl-8.6.6/include -I/tmp/nix-build-tcl-8.6.6.drv-0/tcl8.6.6/generic -I/tmp/nix-build-tk-8.6.6.drv-0/tk8.6.6/generic   -DTCL_81_API -I./../generic -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1  ./../generic/jkFormatMP3.c
./../generic/jkFormatMP3.c:34:26: error: expected declaration specifiers or '...' before '(' token
 #define roundf(x) (floor((x)+(float )0.5f))
                          ^
2016-12-05 02:09:18 +02:00
Vladimír Čunát
ae0bfae810
cairomm: fixup url
I've got no idea why there are two tarballs with same name but different
hash.
2016-12-04 20:21:25 +01:00
Vladimír Čunát
ad0d7f6a05
Merge branch 'staging' 2016-12-04 19:22:36 +01:00
Vladimír Čunát
6e91b74839
Revert "cairomm: maintenance 1.12.0 -> 1.12.2"
This reverts commit d652b2cbee.
Some packages got broken by this (rawtherapee*, ardour*).
2016-12-04 19:20:47 +01:00
Frederik Rietdijk
e4f44475a6 Merge pull request #20899 from elitak/libxslt
libxslt: fixed crossDrv, where no python is available
2016-12-04 16:19:02 +01:00
Eric Litak
605f923e92 libxslt: fixed crossDrv, where no python is available 2016-12-04 07:11:23 -08:00
Vladimír Čunát
3dd219f071
Merge "forked" staging branches together 2016-12-04 10:07:19 +01:00
Frederik Rietdijk
ab39c29293 Merge pull request #20879 from mguentner/cpp_ipfs_api
cpp-ipfs-api: init at 2016-11-09
2016-12-04 08:54:31 +01:00
Graham Christensen
cdafc8e70d Merge pull request #20882 from lsix/update_libunistring
libunistring: 0.9.6 -> 0.9.7
2016-12-03 13:37:37 -05:00
Graham Christensen
3e617930e5
Merge branch 'staging' 2016-12-03 13:36:32 -05:00
Thomas Tuegel
7b05efb90d
qt5: factor out common makeQtWrapper setup hook 2016-12-03 09:57:17 -06:00
Thomas Tuegel
2c4995c013
qt5: factor out common qmake setup hook 2016-12-03 09:55:39 -06:00
Thomas Tuegel
53a694e096
qt5: factor out common qtSubmodule setup hook 2016-12-03 09:53:18 -06:00
Thomas Tuegel
851b5944bb
qt5: factor out common setup hook for qtbase 2016-12-03 09:51:31 -06:00
Thomas Tuegel
a6c75a7167 Merge pull request #20856 from avnik/qt5-mktemp
qt5: more reproducible builds
2016-12-03 09:49:12 -06:00
Vladimír Čunát
1191dac0f9
poppler: 0.47.0 -> 0.49.0 2016-12-03 14:14:41 +01:00
Vladimír Čunát
3e48bb2444
cairomm: use a mirror that actually contains the file 2016-12-03 14:13:57 +01:00
Vladimír Čunát
d652b2cbee
cairomm: maintenance 1.12.0 -> 1.12.2
1.13.x and 1.15.x are not stable ones (cairo uses the even-odd rule).
2016-12-03 13:29:09 +01:00
Vladimír Čunát
da97018f48
libdrm: 2.4.73 -> 2.4.74 2016-12-03 12:51:39 +01:00
Vladimír Čunát
cf205e4630
atk: 2.20.0 -> 2.22.0
That's the gnome-3.22 version.
2016-12-03 12:38:35 +01:00
Vladimír Čunát
b78ea7f6e0
glib: maintenance 2.50.1 -> 2.50.2 2016-12-03 12:33:13 +01:00
Vladimír Čunát
ea42d6fe62
dbus: 1.10.12 -> 1.10.14 2016-12-03 12:32:11 +01:00