3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

23983 commits

Author SHA1 Message Date
Thomas Tuegel c1720b412b
qt5.mkDerivation: honor argument NIX_CFLAGS_COMPILE
If ‘mkDerivation’ is passed ‘NIX_CFLAGS_COMPILE’, we should include those flags
along with the common flags.

See also: #34039 #34038 #33935 #33933 #33930 #33927
2018-01-20 09:10:57 -06:00
Thomas Tuegel a97eaae950
Merge pull request #33989 from LnL7/darwin-qt
qt510-qtbase: fix darwin build
2018-01-20 09:06:34 -06:00
Dan Peebles b81c65ce0a libsnark: init at 9e6b19ff 2018-01-20 00:05:26 -05:00
jammerful a42aef3bdc shibboleth-sp: 2.6.0 -> 2.6.1
Resolves #33875
2018-01-19 22:33:50 +00:00
jammerful edd3180aa2 opensaml-cpp: 2.6.0 -> 2.6.1
Resolves #33875
2018-01-19 22:33:46 +00:00
jammerful 4414b1b0a7 xml-tooling-c: 1.6.0 -> 1.6.3
Resolves #33875
2018-01-19 22:33:30 +00:00
Orivej Desh 9885029931
Merge pull request #33988 from dtzWill/fix/debian-patches
Fixup debian-patches script, use to fix dead patch URL's
2018-01-19 20:36:31 +00:00
Jan Tojnar 1848e17c0d
Merge pull request #33872 from pbogdan/yajl-cleanup
yajl: small clean up
2018-01-19 12:51:17 +01:00
Herwig Hochleitner 6a84b3fbe1 webkitgtk: 2.18.4 -> 2.18.5
CVE-2017-5753
CVE-2017-5715
2018-01-18 18:55:23 +01:00
John Ericson 5708396f47
Merge pull request #34018 from obsidiansystems/fetchpatch
fetchpatch: Add support for an arbitrary extra prefix
2018-01-18 12:39:39 -05:00
John Ericson 9bd437d4b4 fetchpatch: Add support for an arbitrary extra prefix
We still ensure the old and new ones start, respectfully, with `a/` and
`b/`. Use with `stripLen` to ensure tha the old `a/` and `/b` are gone
if a new prefix is added.
2018-01-18 12:19:49 -05:00
Michael Raskin 654542be52 libmpc: update source URL 2018-01-18 17:15:39 +01:00
Jörg Thalheim 1706698b1c
Merge pull request #33824 from peterhoeg/u/physfs
physfs: 2.0.3 -> 3.0.1
2018-01-18 15:36:30 +00:00
Frederik Rietdijk 27f6f9409b
Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall
maintainers: remove mornfall from packages
2018-01-18 11:27:31 +01:00
Daiderd Jordan 62633d0605
qt510-qtbase: fix darwin build
Includes most of the changes from 3793320958,
moved it to a separate patch to avoid accidental removal.
2018-01-17 22:07:35 +01:00
Will Dietz ea51cd255d gamin: fix debian-patches to use live URL
Also apparently 0.1.10-4 is gone, so "fixed" to 0.1.10-4.1
2018-01-17 13:22:34 -06:00
Peter Hoeg 7177c9e336 physfs: 2.0.3 -> 3.0.1 2018-01-17 21:59:55 +08:00
Tuomas Tynkkynen 67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02:00
Yegor Timoshenko 506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
Robin Gloster 1729c65736
libressl_2_6: 2.6.2 -> 2.6.4 2018-01-17 00:10:07 +01:00
Robin Gloster 6f41c5d805
rabbitmq-c: 0.7.1 -> 0.8.0 2018-01-17 00:10:07 +01:00
Tobias Geerinckx-Rice 0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
Tuomas Tynkkynen 2e56ba6fbd Merge remote-tracking branch 'upstream/master' into staging 2018-01-16 22:49:20 +02:00
John Ericson 5a754e75b4 Merge branch 'ericson2314-cross-master' into staging 2018-01-16 13:05:39 -05:00
Izorkin f6ee29dda2 libnetfilter_queue: 1.0.2 -> 1.0.3
fixes #33887
2018-01-16 16:41:01 +00:00
adisbladis df4746d2b2
Merge pull request #33930 from bkchr/fix_kinit
kinit: Fixes build
2018-01-16 19:48:41 +08:00
Bastian Köcher 97db143538 kinit: Fixes build 2018-01-16 12:21:18 +01:00
Guillaume Bouchard 2995066e9b alembic: use threadsafe hdf5 (#30682)
* hdf5: introduce hdf5-threadsafe variant

Compiled with thread safe support and without the High Level library
which is incompatible with thread safety.

* alembic: clean buildInputs to nativeBuildInputs

* alembic: use hdf5-threadsafe
2018-01-16 18:31:35 +08:00
Bastian Köcher f6c2fb3846 kimageformats: Fixes build 2018-01-16 09:52:04 +01:00
Thomas Tuegel 5783980fc6
qtbase: fix evaluation error
`git rebase` strikes again!
2018-01-15 19:12:01 -06:00
Thomas Tuegel 1c004da67e
Merge branch 'bugfix/kwidgetsaddons/5.42.1' into merge/qt-5.10.0 2018-01-15 19:08:27 -06:00
Thomas Tuegel 7e5346c584
kwidgetsaddons: 5.42.0 -> 5.42.1
Fix regression with Kate sidebar.

See also: https://mail.kde.org/pipermail/release-team/2018-January/010780.html
2018-01-15 19:07:05 -06:00
Thomas Tuegel 04239641b5
Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0 2018-01-15 18:49:27 -06:00
Thomas Tuegel 617c4f4220
Merge branch 'feature/qt-5/5.10.0' into merge/qt-5.10.0 2018-01-15 18:49:13 -06:00
Thomas Tuegel 75d2a7dc4d
qt5: reduce closure size
First, closure size is reduced by including the static libraries in $out instead
of trying to move them to $dev. The Qt build system cannot handle libraries
being split between different prefixes. Previously, the static libraries were
moved into $dev and the shared libraries were symlinked from $out to $dev to
fool the build system. However, this causes $dev to be retained at
runtime. Instead, we now keep the static libraries in $out. Fortunately, the
static libraries are not very large anyway.

Second, we build with QT_NO_DEBUG defined unless debugging is enabled. This
causes some assertions to be removed; when assertions are included, they pull
paths from $dev into the runtime closure by using the __FILE__ macro. We also
now patch qtbase to remove even more assertions when QT_NO_DEBUG is defined.
2018-01-15 18:48:37 -06:00
Piotr Bogdan 4340ee75fe yajl: small clean up
- ruby dependency is no longer needed
- cmake belongs in nativeBuildInputs
2018-01-15 13:01:59 +00:00
Michael Raskin ffb383eca0
Merge pull request #33652 from thefloweringash/libvncserver-deps
libvncserver: reduce dependencies; only use systemd on linux
2018-01-15 12:32:31 +00:00
adisbladis edd712e521
Merge pull request #33857 from adisbladis/kde-frameworks-5_42
kde-frameworks: 5.41 -> 5.42
2018-01-15 17:10:10 +08:00
Andrew Childs 48bf2c3e81 libvncserver: reduce dependencies; only use systemd on linux
Permits building on macOS.
2018-01-15 17:25:59 +09:00
Vladimír Čunát 990ff97c6d
glibc: 2.26-115 -> 2.26-131 to fix CVE-2018-1000001
/cc https://github.com/NixOS/nixpkgs/issues/33826#issuecomment-357436030
2018-01-14 20:41:43 +01:00
Tuomas Tynkkynen 6ed0fe7e45 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix
2018-01-14 21:18:27 +02:00
adisbladis 05d803ab5f
qmltermwidget: Use fetchFromGitHub 2018-01-15 01:47:42 +08:00
adisbladis ef2591ee01
kde-frameworks: 5.41 -> 5.42 2018-01-14 22:28:34 +08:00
Jörg Thalheim c08042ba4b
Merge pull request #33742 from lsix/gdbm_1_14
gdbm: 1.13 -> 1.14
2018-01-14 10:47:04 +00:00
adisbladis fa3aec7e4d
gst-plugins-bad: Fix CVE-2016-9447 2018-01-14 02:07:08 +08:00
Jörg Thalheim 3d7054964f
Merge pull request #33814 from rnhmjoj/vapoursynth
Update Vapoursynth machinery
2018-01-13 16:50:45 +00:00
Will Dietz c4e9e4a4d6 boehm-gc, libatomic_ops: 7.6.0 -> 7.6.2
These should be the same version.
2018-01-13 09:33:14 -06:00
Joachim F bba9f874b3
Merge pull request #33795 from romildo/upd.gstreamermm
gstreamermm: 1.8.0 -> 1.10.0
2018-01-13 14:19:12 +00:00
xurei b9ae8efca5 libzxcvbn: init at 2.3 (#33822)
* Add package libzxcvbn

* zxcvbn-c: name after the project not the library
2018-01-13 10:40:45 +00:00
Robert Helgesson ad3b2e8657
lombok: 1.16.8 -> 1.16.20
Also perform a few package cleanups.
2018-01-13 09:57:46 +01:00