Commit Graph

363 Commits

Author SHA1 Message Date
Vladimír Čunát
a97df891fe mariadb: use jemalloc on every platform
It seems to be failing to configure without it on Darwin:
http://hydra.nixos.org/build/38440660/nixlog/1/raw
This doesn't cause a rebuild on Linux platforms.
2016-08-11 19:25:51 +02:00
Vladimír Čunát
6f5c6fb6a1 mariadb: remove darwin patch that no longer applies
Hopefully it isn't needed anymore.
2016-08-10 22:07:33 +02:00
Vladimír Čunát
b94559dc7f mariadb: make the attribute point to the full build
It will create least surprises. Only those who want to go light
have to choose.
2016-08-07 22:44:57 +02:00
Vladimír Čunát
9a072482e6 mariadb: completely separate a server-less build
libmysqlclient is all that most closures need; now it's smaller and
quick to build. For cases that need a server (via executable or lib),
there's a full build for now; later it could be slimmed by removing the
client stuff.
2016-08-07 20:46:36 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Franz Pletz
8605d76f17 Revert "mariadb: 10.1.9 -> 10.1.16 (security)"
This reverts commit 55bd6da9fb.

Fixes #17340.
2016-07-28 22:31:43 +02:00
Franz Pletz
55bd6da9fb mariadb: 10.1.9 -> 10.1.16 (security) 2016-07-28 06:56:14 +02:00
Franz Pletz
975d33e640 mysql51: remove, not maintained anymore 2016-07-28 06:56:13 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Graham Christensen
f4d5d6e73e mysql: 5.5.49 -> 5.5.50 for CVEs (#17160)
Problems include buffer overflows, null pointer dereferences, and
other bugfixes.

 - CVE-2016-3477
 - CVE-2016-3521
 - CVE-2016-3615
 - CVE-2016-5440

Details:
https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-50.html
2016-07-23 01:13:28 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Matthias Beyer
0ac6b862ac postgresql: 9.5.1 -> 9.5.3, potentially fixes CVE-2016-2193, CVE-2016-3065 2016-05-31 15:51:23 +02:00
Matthias Beyer
c5ab5b7750 postgresql94: 9.4.6 -> 9.4.7 2016-05-31 15:51:22 +02:00
Matthias Beyer
f62bd73225 postgresql93: 9.3.11 -> 9.3.12 2016-05-31 15:51:22 +02:00
Matthias Beyer
fe5e3c2e59 postgresql92: 9.2.15 -> 9.2.16 2016-05-31 15:51:22 +02:00
Matthias Beyer
8b5c712648 postgresql91: 9.1.20 -> 9.1.21 2016-05-31 15:51:22 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Tobias Geerinckx-Rice
fd0a4c3910
mysql55: 5.5.48 -> 5.5.49
Should fix CVE-2016-0666, -0648, -0647, -0643, and -0642. CC @vcunat.
2016-05-24 15:00:49 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Vladimír Čunát
019e9a9aa6 Merge #15421: mariadb: wrap mysqld with --basedir 2016-05-20 10:50:13 +02:00
Tuomas Tynkkynen
8d473f107c treewide: Make explicit that 'dev' output of readline is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Sebastián Bernardo Galkin
edaecb41db
postgis: fix build after output splits
Fixes #15236

Two changes were needed:

- pg_config from postgresql package wasn't reporting the correct location for
the pgxs extension system, after the output split
- json_c is now split in dev and out outputs, postgis configure doesn't find the
library location properly

Closes #15470
2016-05-15 11:49:59 +02:00
Phil Wetzel
6ce89e174f mariadb: wrap mysqld with --basedir 2016-05-12 18:22:53 -04:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Arseniy Seroka
0b3827d04a Merge pull request #14772 from cleverca22/mariadb
mariadb: fix arm builds
2016-04-17 22:16:24 +03:00
Dan Peebles
5ced92f83b mariadb: fix build on darwin
My simplistic test seemed to work just fine, so I assume the
install_name_tool shenanigans became unnecessary at some point.
2016-04-17 14:49:25 -04:00
michael bishop
437468d5ea
mariadb: fix arm builds 2016-04-17 00:40:10 -03:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Robin Gloster
a73a28de7b fix grammar errors 2016-04-06 16:16:23 +00:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Eelco Dolstra
523f4f2f69 mariadb: Disable parallel building again
It still fails intermittently on lex_token.h.

http://hydra.nixos.org/build/33571559
2016-03-23 20:11:07 +01:00
Johannes Bornhold
67b1acd989 mysql55: Allow to build on darwin 2016-03-18 14:23:14 +01:00
Graham Christensen
dbf41ebee7 mysql_jdbc: 5.1.32 -> 5.1.38 2016-03-14 20:16:30 -05:00
Thomas Tuegel
3ef7671cea ncurses: combine $lib and $out outputs
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
2016-03-08 11:35:24 -06:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Graham Christensen
0a2c3ec971 mysql: 5.5.45 -> 5.5.48 for multiple CVEs: CVE-2015-4792 CVE-2015-4802 CVE-2015-4815 CVE-2015-4816 CVE-2015-4819 CVE-2015-4826 CVE-2015-4830 CVE-2015-4836 CVE-2015-4858 CVE-2015-4861 CVE-2015-4870 CVE-2015-4879 CVE-2015-4913 2016-02-27 15:31:52 -06:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Eelco Dolstra
5e6962ff2e postgresql: Update to 9.5.1, 9.4.6, 9.3.11, 9.2.15, 9.1.20 2016-02-12 13:20:11 +01:00
Eelco Dolstra
0140591eab postgresql: Remove EOL 9.0 branch 2016-02-12 13:20:11 +01:00
Tuomas Tynkkynen
8eb5d7d037 treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output 2016-01-24 10:03:38 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tom Burdick
2c23a311cd postgresql: (94 -> 95)
Updates postgresql to its latest versions
2016-01-08 10:13:01 -06:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Ryan Trinkle
5729cf7714 mariadb: 10.1.8 -> 10.1.9
Fixes build on darwin; might be related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777996;msg=2
2015-12-07 13:21:25 -05:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Ryan Trinkle
5d4595621d mariadb: fix missing CoreServices framework dependency on darwin 2015-11-15 14:57:06 -05: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
Jude Taylor
98395a07e9 mariadb: complete build on darwin 2015-10-28 13:34:53 -07:00
Tuomas Tynkkynen
934a6ddef6 mariadb: Reference correct outputs of zlib and openssl 2015-10-28 10:17:09 +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
Aristid Breitkreuz
054a5ee9d9 update postgresql binaries 2015-10-25 02:39:01 +02: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
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
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Eelco Dolstra
a6f466065c mysql: Update to 5.4.45 2015-08-11 11:46:31 +02:00
William A. Kennington III
6aa5502129 mariadb: 10.0.20 -> 10.0.21 2015-08-07 14:19:15 -07:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Eelco Dolstra
0770a49d8c Unify the PostgreSQL expressions again 2015-07-28 21:42:25 +02:00
Eelco Dolstra
2bc305c1c6 postgresql: Prevent runtime dependency on gcc-wrapper 2015-07-28 21:42:25 +02:00
Luca Bruno
13a1d3bb22 postgresql91: create doc directory (ZHF) 2015-07-28 18:11:05 +02:00
Luca Bruno
6525b63870 postgresql90: create doc directory (ZHF) 2015-07-28 18:10:59 +02:00
Vladimír Čunát
f5ca543c46 mariadb: disable parallel building
Discussed on:
    https://github.com/NixOS/nixpkgs/commit/01e37fe92dedabd
2015-07-28 13:32:27 +02:00
Eelco Dolstra
f7e13ad70c postgresql: Move docs to separate output
This cuts almost 15 MB.
2015-07-26 22:46:24 +02:00
Eelco Dolstra
c4a399f106 mariadb: Don't install static libraries
Issue #8990.
2015-07-26 22:46:23 +02: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
Austin Seipp
01e37fe92d pkgs: mariadb 10.0.19 -> 10.0.20
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-15 16:11:18 -05:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Lane Seppala
f5268e9f09 Enable uuid-ossp in Postgres 9.4 on Darwin
Based on documentation section F.44.2 at
http://www.postgresql.org/docs/9.4/static/uuid-ossp.html
2015-06-30 11:16:39 -06:00
William A. Kennington III
1e58156159 Merge branch 'master.upstream' into staging.upstream 2015-06-22 20:03:10 -07:00
Pascal Wittmann
abee7fbe2c mysql55: update from 5.5.43 to 5.5.44 2015-06-22 23:23:54 +02:00
William A. Kennington III
31cedc7ee7 mariadb: Fix for darwin 2015-06-18 23:47:08 -07:00
Michael Raskin
5d5bb71567 Update PostgreSQL to latest point-releases 2015-06-14 11:37:33 +03:00
Rok Garbas
b980b7445f cygwin: skip ssl support for postgresql (temporary) 2015-06-12 12:17:12 +02:00
Pascal Wittmann
62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +02:00
Arseniy Seroka
70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Eelco Dolstra
f08c8bc752 postgresql: Latest versions 2015-06-04 14:54:54 +02:00
Eelco Dolstra
22c627bf5b Remove PostgreSQL 8.4 (EOL) 2015-06-04 14:54:54 +02:00
Eelco Dolstra
fb2d45233a Fix typos 2015-06-04 14:54:54 +02:00
Eelco Dolstra
05f1457c1e Revert "postgresql: Refactor 8.4 into generic"
This reverts commit 1bb67e514b.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
5efd73fce6 Revert "postgresql: 9.0.19 -> 9.0.20"
This reverts commit 8c99f2e3d6.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
e3ab9804ba Revert "postgresql: 9.1.15 -> 9.1.16"
This reverts commit be94d4bc25.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
eb269336f1 Revert "postgresql: Add schema version"
This reverts commit 243dc10b0b.
2015-06-04 14:54:49 +02:00