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
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
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
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
Tuomas Tynkkynen
8eb5d7d037
treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output
2016-01-24 10:03:38 +02: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
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
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
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
William A. Kennington III
6aa5502129
mariadb: 10.0.20 -> 10.0.21
2015-08-07 14:19:15 -07: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
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
31cedc7ee7
mariadb: Fix for darwin
2015-06-18 23:47:08 -07:00
William A. Kennington III
9c6d4533d0
mariadb: 10.0.18 -> 10.0.19
2015-05-23 19:07:13 -07:00
William A. Kennington III
c9395e1e92
Merge branch 'master' into staging
2015-05-08 05:59:50 -07:00
William A. Kennington III
bce08b7aca
mariadb: 10.0.17 -> 10.0.18
2015-05-08 05:40:35 -07:00
Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
William A. Kennington III
0405651521
mariadb: Propagate library paths in mysql_config
2015-04-28 18:27:39 -07:00
William A. Kennington III
171275c7f9
mariadb: Add zlib dependency removed from propagation under libxml2
2015-04-28 18:27:39 -07:00
Vladimír Čunát
9ff2ec090f
mariadb: fix by disabling automatic output actions
...
Now qt4 builds again.
I failed to split headers away from the libs
while making qt4 still detect and use mysql.
2015-04-19 14:30:14 +02:00
William A. Kennington III
3adb47d7d3
mariadb: Remove superfluous files
2015-04-11 22:32:43 -07:00
William A. Kennington III
14602b8a43
mariadb: properly propagate libs
2015-04-02 14:20:11 -07:00
William A. Kennington III
475e43ee22
mariadb: Fix on i686
2015-04-01 19:10:24 -07:00
William A. Kennington III
e97b63a727
mariadb: Fix mysql_config generation
2015-04-01 16:12:22 -07:00
William A. Kennington III
be9aa93ddc
mariadb: Fix input propagation
2015-04-01 15:10:04 -07:00
William A. Kennington III
53f1d8147d
mariadb: Make derivation smaller and split out libs
2015-04-01 13:24:29 -07:00
Eric Seidel
d3f69cdf67
mariadb: oqgraph fails to build on darwin
2015-03-14 09:09:23 -07:00
William A. Kennington III
6c82932799
mariadb: 10.0.16 -> 10.0.17
2015-03-11 18:50:03 -07:00
William A. Kennington III
760699aea9
mariadb: 10.0.15 -> 10.0.16
2015-02-06 12:59:38 -08:00
Domen Kožar
557114628b
mariadb: 10.0.14 -> 10.0.15
2014-12-09 11:29:16 +01:00
Vladimír Čunát
06c6d4696d
*: fix builds by disregarding warning from new glibc
...
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.
In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
2014-11-28 18:42:03 +01:00
Austin Seipp
37b9a2bad5
mariadb: 10.0.13 -> 10.0.14
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:01:06 -05:00
Patrick Mahoney
1e06594c0c
mariadb: Patch to compile on OS X.
...
* perl is required at build time on darwin. Copied from the
mysql/5.5.x.nix
* CMake on darwin creates shared libraries with relative 'install_name'
paths which are made absolute by fixDarwinDylibNames.
See http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library/
* The asm patch was needed to compile on darwin, though I do not
understand what is going on. Error before the patch:
[ 15%] Building C object mysys/CMakeFiles/mysys.dir/my_context.c.o
.../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Unknown pseudo-op: .cfi_escape
.../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Rest of line ignored. 1st junk character valued 48 (0).
make[2]: *** [mysys/CMakeFiles/mysys.dir/my_context.c.o] Error 1
2014-08-30 14:41:51 -05:00
Austin Seipp
db2a37514d
mariadb: 10.0.11 -> 10.0.13
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:48:42 -05:00