aszlig
9846e69ae2
mariadb: 10.0.21 -> 10.0.22
...
Fixes the following security vulnerabilities:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4802
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4807
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4815
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4826
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4830
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4836
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4858
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4861
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4870
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4913
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4792
Release notes can be found here:
https://mariadb.com/kb/en/mariadb/mariadb-10022-release-notes/
Detailled changelog:
https://mariadb.com/kb/en/mariadb/mariadb-10022-changelog/
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-06 16:10:23 +01:00
Domen Kožar
0a05adc711
Merge pull request #10056 from pmahoney/s6-rc
...
s6-rc: new derivation
2015-11-06 11:11:56 +01:00
William A. Kennington III
1e7aa4f17d
Merge branch 'master.upstream' into staging.upstream
2015-11-05 18:30:11 -08:00
William A. Kennington III
97d215deba
pulseaudio: 7.0 -> 7.1
2015-11-05 18:21:43 -08:00
William A. Kennington III
4251612faa
Merge branch 'master.upstream' into staging.upstream
2015-11-04 01:00:48 -08:00
Joachim Fasting
2456dd0246
hyperdex: blindly fix hashes of local dependencies
...
This patch blindly fixes the source archive checksums for the local dependencies
of hyperdex. I have not looked into why those hashes changed, but I have
verified that the hyperdex package now builds successfully.
2015-11-03 15:22:50 +01:00
Nikolay Amiantov
9265cc58c3
Merge pull request #10474 from abbradar/nginx-pam-modules
...
nginx: factor out modules into a separate file, add new "pam" module
2015-11-02 01:05:54 +03:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Vladimír Čunát
4e1fdadd02
mariadb: fix non-Darwin builds after 86dae701
...
I took care to get the same derivation as before that commit on Linux
and not to change derivation on Darwin.
2015-10-30 09:29:02 +01:00
Jude Taylor
86dae70173
mariadb: fix multiple outputs on darwin
2015-10-29 12:52:30 -07:00
Lluís Batlle i Rossell
61c6597246
Bringing back eo symbols for xkb
...
I port the patch for esperanto symbols removed in
1be2acd1317aadc8e1a08d17312e524fb5fc2a4300 to the current
xkeyboardconfig.
(cherry picked from commit 4a830de0323e34592a36dea660d9a3ec8348964e)
2015-10-29 13:32:35 +01:00
Jude Taylor
e6bc23a801
Merge pull request #10603 from datakurre/datakurre-rabbitmq
...
darwin: erlangR18 + rabbitmq_server: add needed inputs
2015-10-28 17:23:11 -07:00
Jude Taylor
c749714170
clean up xquartz arguments
2015-10-28 13:56:13 -07:00
Jude Taylor
98395a07e9
mariadb: complete build on darwin
2015-10-28 13:34:53 -07:00
Vladimír Čunát
787f322540
$docdev fixups: mostly to avoid empty output
...
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
Domen Kožar
4355ef9e41
mailman: use python2.7 package dns
2015-10-28 18:23:17 +01:00
Domen Kožar
27d5fb07a0
pythonPackages{dns, dnspython}: merge
2015-10-28 18:20:43 +01:00
Sander van der Burg
b054207813
axis2: bump to version 1.6.3
2015-10-28 10:24:29 +00:00
Tuomas Tynkkynen
f302d78d6c
apacheHttpd_2_4: Port multiple-output changes from 2.2
2015-10-28 10:23:03 +01:00
Tuomas Tynkkynen
7a68c25baf
apacheHttpd_2_2: Remove obsolete cruft
2015-10-28 10:23:02 +01:00
Tuomas Tynkkynen
b81515c2d4
apacheHttpd_2_2: Fix setting installbuilddir
...
Otherwise mod_dnssd doesn't build.
Also move apxs to $dev.
2015-10-28 10:23:02 +01:00
Vladimír Čunát
e153b68fce
xorg-server: avoid runtime references to xorgserver-dev
2015-10-28 10:22:58 +01:00
Tuomas Tynkkynen
db81e22148
treewide: Mass-replace 'xorgserver}/bin' with correct output
...
vcunat added one fix in xdummy.
2015-10-28 10:17:12 +01:00
Tuomas Tynkkynen
c7e3ee4153
libXvMC: Split into multiple outputs
2015-10-28 10:17:11 +01:00
Tuomas Tynkkynen
934a6ddef6
mariadb: Reference correct outputs of zlib and openssl
2015-10-28 10:17:09 +01:00
Vladimír Čunát
06eba7d320
xorg: remove $man where it was only man3
...
Now man3 is deleted if not specified otherwise,
and I don't really see a reason for X libs to produce them.
(This fixes failures due to not producing $man outputs.)
The $doc outputs are also development docs (all probably),
but I left those for now.
2015-10-28 10:17:07 +01:00
Vladimír Čunát
261961c97d
postgresql: split and fixup some referrers
2015-10-28 10:09:32 +01:00
Vladimír Čunát
40455f27c3
mariadb: build without snappy on 32-bit
...
... to work around a build problem
https://mariadb.atlassian.net/browse/MDEV-9000
I took care not to cause a rebuild on 64-bit.
2015-10-27 14:34:31 +01:00
Jude Taylor
5469e9c581
fix xquartz build
2015-10-26 18:37:05 -07:00
Jude Taylor
cf12f3e4d2
patch out system include in libAppleWM
2015-10-26 17:13:29 -07:00
Jude Taylor
2e29399993
update packages with new cf-private compatibility
2015-10-26 17:13:29 -07:00
Asko Soukka
3ea269a7e6
darwin: rabbitmq_server: add needed inputs for Darwin
2015-10-26 22:02:57 +02:00
Gabriel Ebner
929e734f19
postfix: 2.11.5 -> 3.0.3
2015-10-26 11:46:17 +01:00
Austin Seipp
0939e6f613
nixpkgs: plex 0.9.12.11.1406 -> 0.9.12.13.1464
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-10-25 06:32:19 -05:00
Aristid Breitkreuz
054a5ee9d9
update postgresql binaries
2015-10-25 02:39:01 +02:00
goibhniu
352a4e4a73
Merge pull request #10576 from simonvandel/tvheadend
...
tvheadend: 4.0.6 -> 4.0.7
2015-10-24 18:01:42 +02:00
Simon Vandel Sillesen
c62f051e5a
tvheadend: 4.0.6 -> 4.0.7
...
Also patches a file that would cause a runtime error otherwise
2015-10-24 17:50:30 +02:00
Jude Taylor
f35f421d60
apache-httpd: add libiconv for darwin
2015-10-23 10:57:43 -07:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
William A. Kennington III
491764afc0
samba: 4.3.0 -> 4.3.1
2015-10-21 21:49:10 -07:00
aszlig
f15420b0fe
thttpd: Fix SHA256 of the upstream tarball.
...
It's a bit unfortunate to see this, but while looking online to download
the old version of the file I found that MacPorts and FreeBSD had the
same issue:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199562
I've checked the diff as well and found no big functional changes,
except a function rename, copyright updates and changed syslog
priorities:
https://bz-attachments.freebsd.org/attachment.cgi?id=155775
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-21 17:15:18 +02:00
Arseniy Seroka
77803f4cb7
Merge pull request #10505 from simonvandel/tvheadend-4-0-6
...
tvheadend: 4.0.4 -> 4.0.6
2015-10-21 16:18:15 +03:00
Simon Vandel Sillesen
d495ac2957
tvheadend: 4.0.4 -> 4.0.6
...
Added a comment about network download, and cleaned it up a little
2015-10-21 09:01:42 +02:00
Jude Taylor
68087185e3
rethinkdb: build on darwin
2015-10-19 18:40:55 -07:00
Hajo Möller
0baef5b806
asterisk: 13.3.2 -> 13.6.0
2015-10-19 19:05:41 +02:00
Tobias Geerinckx-Rice
e07faf00f0
cassandra 2.1.10 -> 2.1.11
2015-10-19 18:19:00 +02:00
Nikolay Amiantov
d2fc6e6a02
nginxModules.pam: init at 1.4
2015-10-19 16:46:09 +03:00
Nikolay Amiantov
9424238d14
nginx: factor out modules in a separate file
2015-10-19 16:46:02 +03:00
Eelco Dolstra
9a3276b4b3
Merge pull request #10463 from mayflower/update-apache-httpd
...
apacheHttpd: 2.4.16 -> 2.4.17
2015-10-19 11:00:55 +02:00
Vladimír Čunát
2755d2b241
xorg: adjust generator to work with other archive types
...
In the end I didn't utilize it, but it shouldn't hurt.
2015-10-19 10:08:16 +02:00
Vladimír Čunát
b6059b2c6a
xorg: add three missing video drivers - chips, s3virge, xgi
...
Only building was tested.
2015-10-19 10:06:48 +02:00
Vladimír Čunát
ff94673659
xorg.xf86-video-sis: minor update 0.10.7 -> 0.10.8
2015-10-19 09:39:32 +02:00
Vladimír Čunát
801a843bdb
xorg.xorg-server: use the generated expression
...
... to avoid future surprises. Also add libunwind to deps.
I don't know why libxshmfence is no longer detected.
2015-10-19 09:35:07 +02:00
Vladimír Čunát
15f27723b3
xorg.xf86-input-libinput: update 0.12.0 -> 0.14.0
2015-10-19 09:20:13 +02:00
Robert Irelan
678c81b74d
xorg.xf86-video-ast: 0.98.0 -> 1.1.5 ( close #10451 )
...
Fix failure of 0.98.0 to compile with NixOS 15.09 (due to referencing a
symbol `IOADDRESS` that has been removed from X.org drivers).
2015-10-19 09:06:33 +02:00
William A. Kennington III
480b289f5b
mongodb: 3.0.6 -> 3.0.7
...
Use the vendored wiredtiger as the system one is not compatible
2015-10-18 17:23:51 -07:00
Robin Gloster
8521bc097c
apacheHttpd: 2.4.16 -> 2.4.17
2015-10-18 17:42:55 +00:00
William A. Kennington III
e58996cba1
mariadb: Add extra dependencies for 10.1
2015-10-17 14:14:34 -07:00
William A. Kennington III
2cfb8d11cf
mariadb: 10.0.21 -> 10.1.8
...
Also try enabling parallel building again to see if the issue was fixed.
2015-10-17 13:46:08 -07:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Nikolay Amiantov
8dec927f46
uwsgi: 2.0.11.1 -> 2.0.11.2
2015-10-15 17:07:38 +03:00
Vladimír Čunát
e25da7e5c8
xorg: split outputs of various libs
2015-10-14 14:27:07 +02:00
Vladimír Čunát
fa6ddd7fa6
xorg.{libICE,libSM}: split dev and doc outputs
2015-10-13 20:19:01 +02:00
Vladimír Čunát
783c40eb68
dbus: split into multiple outputs and fix referrers
2015-10-13 20:19:01 +02:00
Vladimír Čunát
12487536d2
libgpgerror: split dev and info outputs
2015-10-13 20:19:00 +02:00
Vladimír Čunát
47305626ab
xorg{xcb-util-keysyms,libxkbfile}: split the dev output
2015-10-13 20:18:59 +02:00
Vladimír Čunát
8db97583ae
pulseaudio: split the "dev" output
...
This is meant mainly for the `libpulseaudio` attribute.
2015-10-13 20:18:56 +02:00
Vladimír Čunát
90a0c45775
libtasn1: split "dev" and "doc" outputs
2015-10-13 20:18:52 +02:00
Vladimír Čunát
1197003966
fix references to ${libtool}/lib
2015-10-13 20:18:47 +02:00
Vladimír Čunát
17a3f6a6fa
icu: split into multiple outputs
2015-10-13 20:18:44 +02:00
goibhniu
d7c0612f4b
Merge pull request #10049 from anderslundstedt/upgradeplex
...
Upgrade plex to 0.9.12.11.1406
2015-10-10 19:49:43 +02:00
Arseniy Seroka
9c61b4fe4d
Merge pull request #10216 from offlinehacker/pkgs/rippled/0.29.0-hf1
...
rippled: 0.28.1 -> 0.30.0-rc1
2015-10-09 20:32:36 +03:00
Andrey Pavlov
d9e1d3f14b
rabbitmq-server: 3.4.3 -> 3.5.6
2015-10-08 12:44:03 +03:00
Tobias Geerinckx-Rice
65bb240357
cassandra 2.1.9 -> 2.1.10
2015-10-08 01:42:46 +02:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Vladimír Čunát
e4f38fb050
xorg.xcb-util: split into multiple outputs
...
I see no references likely to break.
2015-10-05 16:00:55 +02:00
Vladimír Čunát
6d86a93c43
libevent: split into multiple outputs
...
Hopefully all references are fixed.
2015-10-05 15:58:37 +02:00
Vladimír Čunát
38313d5d87
libxml2,libxslt: split into multiple outputs
...
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Vladimír Čunát
f8c211fd2b
fontconfig: split into multiple outputs
...
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát
32b31398eb
xorg.libXt: re-split into multiple outputs
...
Fixed all 'libXt}' references, too.
2015-10-05 11:23:34 +02:00
Arseniy Seroka
2e3f646d1b
Merge pull request #10225 from aespinosa/update-fleet
...
fleet: 0.9.0 -> 0.11.5
2015-10-05 02:47:57 +03:00
Jaka Hudoklin
a6c4c9df1f
rippled: 0.28.1 -> 0.30.0-rc1
2015-10-04 22:44:13 +02:00
Gabriel Ebner
8fd982ec2b
spamassassin: 3.4.0 -> 3.4.1
2015-10-04 17:26:12 +02:00
Allan Espinosa
7d3b92f6c1
fleet: 0.9.0 -> 0.11.5
2015-10-04 20:20:32 +09:00
Tuomas Tynkkynen
753cfbe09b
libXmu: Split into multiple outputs
...
We need to override BITMAPDIR, since the default:
-DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
would cause cycles between the outputs. Setting it to a nonexistent path
doesn't affect the code logic, since the corresponding single-output
directory $out/include/X11/bitmaps doesn't exist either.
(cherry picked from commit 15007c88108d9c6a3bc82b22eff53175bbddf75e)
2015-10-03 16:36:21 +02:00
Vladimír Čunát
f361938b21
Merge staging into closure-size
...
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Tuomas Tynkkynen
7cd13b9003
apache-httpd: Enable SSL via buildInputs
...
The old approach doesn't seem to work with multiple outputs.
2015-10-03 14:08:53 +02:00
Tuomas Tynkkynen
0100b27069
imake: Add uberhack to workaround broken 'gcc -x c'
...
Our cc-wrapper is broken whenever the '-x' flag is used:
'gcc -x c foo.c -o bar' doesn't work the same way as 'gcc foo.c -o bar'
does. (Try both with NIX_DEBUG=1.)
What happens is that passing '-x' causes linker-related flags (such as
-Wl,-dynamic-linker) not to be added, just like if '-c' is passed.
The bug happens outside the multiple-outputs branch as well, but it
doesn't break imake there. It only breaks in multiple-outputs because
linking without -Wl,-dynamic-linker produces a binary with an invalid
ELF interpreter path. (Which arguably, is a bug in its own.)
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
947542be6d
libxft: Fix reference to incorrect output
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
f72376fd20
x11: Remove conflicting outputs produced by auto merge
2015-10-03 13:39:33 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
f7d5210677
mysql55: remove lib/*.a, as probably noone needs it
...
/cc #172 .
2015-10-03 11:24:17 +02:00
Peter Simons
3018739223
mini-httpd: update to version 1.5
2015-10-02 22:13:49 +02:00
William A. Kennington III
2ef6508c7f
Merge branch 'master.upstream' into staging.post-15.06
2015-10-02 12:41:09 -07:00
Gabriel Ebner
0dfddc5a54
opensmtpd: support filters.
2015-10-02 13:01:50 +02:00
Gabriel Ebner
db18b6e828
opensmtpd-extras: init at 5.7.1
2015-10-02 13:01:47 +02:00
Gabriel Ebner
c5f2f2d814
opensmtpd: 5.4.5p1 -> 5.7.1p1
2015-10-02 13:01:43 +02:00
William A. Kennington III
98172435f7
Merge branch 'master.upstream' into staging.upstream
2015-10-01 10:43:44 -07:00
Thomas Strobel
e0d5b14ce4
neard: enable support for Secure Elements
2015-10-01 15:30:34 +02:00
Arseniy Seroka
b752952a33
Merge pull request #10132 from matthiasbeyer/update-jetty
...
jetty: 5.1.4 -> 6.1.4
2015-10-01 14:21:38 +03:00