Ben Gamari
2e4124c8c9
libdaemon: Enable cross-compilation
2018-01-22 20:25:43 -05:00
Will Dietz
60d5e68a25
libedit: disable workaround for non-sandbox, avoid false groff dep
2018-01-22 17:24:53 -06:00
Frederik Rietdijk
6b0873440b
Merge remote-tracking branch 'upstream/master' into HEAD
2018-01-22 16:09:11 +01:00
Frederik Rietdijk
4c88132d25
Merge commit 'a0f8e3a' into HEAD
2018-01-22 16:08:37 +01:00
Vladimír Čunát
246ba46db7
Merge older staging (finished on Hydra)
...
https://hydra.nixos.org/eval/1427837?filter=&compare=1427817
Fixes #34087 .
2018-01-22 08:54:37 +01:00
Vladimír Čunát
720f498d7a
gtk2: 2.24.31 -> 2.24.32 (maintenance)
2018-01-21 16:13:03 +01:00
Vladimír Čunát
081b9c9d96
glib: 2.54.2 -> 2.54.3 (maintenance)
2018-01-21 16:09:24 +01:00
Vladimír Čunát
a94c7ba096
Merge branch 'master' into staging
...
Hydra: ?compare=1428079
2018-01-21 15:47:08 +01:00
Yegor Timoshenko
26c6f43119
libgumbo: rename to gumbo
2018-01-21 13:29:45 +00:00
Vladimír Čunát
b91e846639
mesa: 17.2.8 -> 17.3.3
...
TODO: verify that S3TC works without adding libtxc*,
and clean all the related code.
2018-01-21 11:01:47 +01:00
Vladimír Čunát
a0f8e3a30c
Merge #33590 : mesa: make it find drirc
2018-01-21 09:29:37 +01:00
Daiderd Jordan
1fa5c8abae
Merge pull request #34089 from mnacamura/sdl2-darwin-fix
...
SDL2_{gfx,mixer,net,ttf}: fix Darwin build
2018-01-21 00:30:36 +01:00
Mitsuhiro Nakamura
bd57ec3870
SDL2_{gfx,mixer,net,ttf}: move libobjc to buildInputs
2018-01-21 06:57:44 +09:00
Tuomas Tynkkynen
74e2b60999
libsigsegv: 2.11 -> 2.12
2018-01-20 22:44:50 +02:00
Frederik Rietdijk
75d8096108
Merge remote-tracking branch 'upstream/master' into HEAD
2018-01-20 21:04:17 +01:00
Thomas Tuegel
88464ecaca
Merge pull request #34047 from ttuegel/bugfix/qt-5/NIX_CFLAGS_COMPILE
...
Qt 5: Fix debug flags
2018-01-20 11:51:37 -06:00
Thomas Tuegel
67841d4115
Merge pull request #33466 from erosennin/master
...
qca2 and qca-qt5: use system CA certificates
2018-01-20 11:50:32 -06:00
Mitsuhiro Nakamura
4014b24ca1
SDL2_{gfx,mixer,net,ttf}: fix Darwin build
2018-01-21 00:26:21 +09:00
Thomas Tuegel
4a39533ab3
qt5: debug flag should never be null
2018-01-20 09:10:57 -06:00
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
Vladimír Čunát
94f4857bc5
Merge branch 'master' into staging
...
Hydra: ?compare=1427817
2018-01-20 10:05:27 +01: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
John Ericson
a18053bdfe
Merge remote-tracking branch 'upstream/master' into staging
2018-01-18 14:17:58 -05: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
Jörg Thalheim
57da1b6f02
Merge pull request #33885 from Izorkin/libnftnl
...
libnftnl: 1.0.8 -> 1.0.9
2018-01-17 16:44:27 +00: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