JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
287,712 Commits 1 Branch 0 Tags 12 GiB
8b30f2e15b
Commit Graph

213 Commits

Author SHA1 Message Date
Izorkin
7307c35f30 mariadb: 10.2.15 -> 10.2.16 2018-07-16 03:53:32 +00:00
Benjamin Hipple
3bb305515f mariadb: provide multiple src url mirrors 
Both mariadb.com and mariadb.org appear to be canonical upstream sources, and
have identical sha256 hashes at these URLs.

For the third-party mirrors, if we are just going to provide one URL, it should
be an HTTPS url instead of FTP or SSH, which many users may not be able to
access due to network security configurations.
 2018-06-24 19:03:18 +00:00
Orivej Desh
7f3de60758 Merge branch 'master' into staging 
* master: (161 commits)
  pcsclite: clean up after #41790
  tor: 0.3.3.6 -> 0.3.3.7
  opae: init at 1.0.0
  tinc: 1.0.33 -> 10.0.34
  tinc_pre: 1.1pre15 -> 1.1pre16
  sit: 0.3.2 -> 0.4.0 (#41863)
  platforms/raspberrypi: enable kernelAutoModules
  libupnp: 1.6.21 -> 1.8.3 (#41684)
  androidStudioPackages.{dev,canary}: 3.2.0.16 -> 3.2.0.17
  tdesktop: 1.3.0 -> 1.3.7
  gns3Packages.{server,gui}{Stable,Preview}: 2.1.6 -> 2.1.7
  aws-sam-cli: init at 0.3.0 (#41877)
  nixos/nat: optional networking.nat.externalInterface (#41864)
  linux: 4.17 -> 4.17.1
  linux: 4.16.14 -> 4.16.15
  linux: 4.14.48 -> 4.14.49
  nixos/unbound: add restart (#41885)
  maintainers/create-azure.sh: remove hydra.nixos.org as binary cache (#41883)
  gshogi: init at 0.5.1 (#41840)
  neovim: add missing libiconv
  ...
 2018-06-12 20:41:41 +00:00
Izorkin
1705428cf9 mariadb galera: fix build (#41813) 2018-06-11 20:42:53 +02:00
Michael Raskin
b4c38a5174 mariadb: galera: there is no galera_new_cluster 2018-06-11 20:06:27 +02:00
Michael Raskin
d871acb3b2
Merge pull request #33176 from Izorkin/mariadb-galera 
mariadb galera: init at 25.3.23
 2018-06-10 21:23:11 +00:00
Izorkin
9ed1a66ab2 mariadb.connector-c: 2.3.5 -> 2.3.6 2018-06-10 15:24:27 +03:00
Izorkin
13705c02ce mariadb: 10.2.14 -> 10.2.15 (#41497) 2018-06-06 22:19:57 +02:00
Izorkin
789c0614f0 mariadb galera: init at 25.3.23 2018-05-18 20:16:00 +03:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Félix Baylac-Jacqué
c462aa0706 maria-db: Fix mariadb_config include path. 
Fixes #39984.

Co-authored-by: Ekaitz Zarraga <ekaitz.zarraga@protonmail.com>
 2018-05-05 16:57:37 +02:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
John Ericson
ba52ae5048 treewide: isArm -> isAarch32 
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
 2018-04-25 15:28:55 -04:00
Matthew Justin Bauer
542412ec7a
Merge pull request #37976 from Izorkin/mariadb-connector-c-2.3.5 
mariadb.connector-c: 2.3.4 -> 2.3.5
 2018-04-17 10:09:00 -05:00
Izorkin
991fd430f3 mariadb.connector-c: 2.3.4 -> 2.3.5 2018-03-28 11:14:22 +03:00
Izorkin
610c49ef89 mariadb: 10.2.13 -> 10.2.14 2018-03-28 11:04:12 +03:00
Izorkin
2470d22ae1 mariadb: 10.2.12 -> 10.2.13 (#35119) 2018-02-20 22:24:38 +01:00
Will Dietz
24721aad18 mariadb: disable tokudb on musl, per docs (and fix build) 2018-02-13 09:45:02 -06:00
Daiderd Jordan
d71c8da8da
mariadb: fix connector-c library install_name on darwin 2018-01-27 22:52:33 +01:00
Orivej Desh
45f6d97e6e mariadb: clean up during the rebuild from merging #33513 2018-01-06 18:45:38 +00:00
Izorkin
08cde7d69f mariadb: 10.2.11 -> 10.2.12 2018-01-06 18:41:00 +01:00
Orivej Desh
306eefaa95 mariadb.client: fix darwin build 
Fixes #33517
 2018-01-06 16:31:42 +00:00
Daiderd Jordan
106d87b6c6 mariadb: fix darwin build 2018-01-06 16:36:48 +01:00
Orivej Desh
210a281a1a
Merge pull request #33267 from Izorkin/mariadb-mysqltest 
mariadb: disabling mysql-test and sql-bench directories
 2018-01-06 03:11:32 +00:00
Orivej Desh
4f5aa9bc25 mariadb: fix eval 2018-01-05 14:54:42 +00:00
Orivej Desh
b41e5ece14 mysql.connector-c: fix build on Darwin 
Broken by #30546.
 2018-01-05 14:19:50 +00:00
Izorkin
b2598d57d0 mariadb: disabling mysql-test and sql-bench directories 2018-01-01 11:45:45 +03:00
Izorkin
88657b3a50 mariadb: remove broken link file rcmysql 2017-12-29 02:18:35 +01:00
Izorkin
62a3561b5e mariadb connector-c: 2.3.3 -> 2.3.4 2017-12-29 02:18:35 +01:00
Robin Gloster
4fb9533511 mariadb: add lib/include path compatibility to mysql 2017-12-29 02:18:35 +01:00
Robin Gloster
1ca8a7aff6 mariadb: cleanup obsolete code and fix upstream cmake 2017-12-29 02:18:35 +01:00
Izorkin
b96bf4a891 mariadb: 10.2.9 -> 10.2.11 2017-12-29 02:18:35 +01:00
Robin Gloster
c707fa002d mariadb: 10.2.8 -> 10.2.9 2017-12-29 02:18:35 +01:00
Robin Gloster
3fcf6bf518 mariadb: 10.2.7 -> 10.2.8 2017-12-29 02:18:35 +01:00
Markus Mueller
3e241efe9b mariadb: fix socket path 
This also fixes mysql connections to localhost  in php because it gets
the socket path from mysql_config.
 2017-12-29 02:18:35 +01:00
Robin Gloster
52e65be0d6 mariadb: fix i686 build 2017-12-29 02:18:35 +01:00
Robin Gloster
5672ca2d0b mariadb: 10.2.6 -> 10.2.7 2017-12-29 02:18:35 +01:00
Robin Gloster
77af1d2000 mysql.server: fix build 
That moveToOutput should've been only for the client
 2017-12-29 02:18:35 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
9265012de6 mariadb: fix lib cycle and hash 2017-12-29 02:18:35 +01:00
Robin Gloster
a8df05ee2f mariadb: 10.1.26 -> 10.2.6 2017-12-29 02:18:35 +01:00
Florian Jacob
7504c75c9c mariadb: 10.1.26 -> 10.1.28 2017-10-02 22:22:25 +02:00
Florian Jacob
e911e39c26 mariadb: 10.1.25 -> 10.1.26 2017-09-27 09:42:32 +02:00
Tim Steinbach
820c7591f8
mariadb: 10.1.21 -> 10.1.25 2017-07-29 15:05:09 -04:00
Sebastian Hagen
cb9fe8cead Mariadb: Fix URL for source tarball. 
mariadb.org appears to have changed their URL schemes, and the tarball URL used
by this derivation no longer works, which makes this unbuildable from scratch.

This change updates that URL to a mariadb.org location that will still serve
this tarball.

Hash is unchanged.
 2017-07-03 02:53:13 +01:00
Graham Christensen
111b4e4c87
mariadb: 10.1.19 -> 10.1.21 for multiple CVEs 2017-01-25 20:53:24 -05:00
Tim Steinbach
0736bd2c53
mariadb: 10.1.18 -> 10.1.19 2016-11-16 12:04:41 -05:00
Tim Steinbach
697dbb9741
mariadb: 10.1.17 -> 10.1.18 2016-10-09 16:04:58 -04:00
Tim Steinbach
e525217269
mariadb: 10.1.16 -> 10.1.17 2016-09-23 11:45:42 -04:00
Eelco Dolstra
33da338bde mariadb: Don't install mysqlbug 
This causes a dependency on gcc.
 2016-09-19 20:03:40 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Dan Peebles
ccd16f87d5 mariadb: re-enable jemalloc on darwin and fix impurity 
CMake in its usual infinite wisdom searches all over the system for java
and finds the host OSX java and JNI headers. It then decides to build the
connector and fails later on because we didn't actually tell Nix that we
wanted java in scope. So instead, we just tell CMake that we don't want
the jdbc connector. I believe it does the same with GSS, so I disable
that stuff too. None of this should affect Linux, but let me know if it
does somheow.
 2016-08-14 15:08:23 -04:00
Vladimír Čunát
1c9307d348 mariadb on Darwin: another attempt to fix 
Adding jemalloc to buildInputs didn't work out a97df891,
as jemalloc doesn't build correctly on Darwin ATM.
 2016-08-13 09:03:33 +02:00
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
Phil Wetzel
6ce89e174f mariadb: wrap mysqld with --basedir 2016-05-12 18:22:53 -04: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
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
Vladimír Čunát
114b75ce97 mariadb: switch to a working download URL 2014-06-22 15:29:23 +02:00
Austin Seipp
463ed1bb64 mariadb: 10.0.10 -> 10.0.11 
Also, enable the TokuDB plugin, as it now builds (there were some bugs
in the non-GA release that prevented that).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-05 06:05:07 -05:00
Shea Levy
90cf41c0d7 mariadb: Bump 2014-04-02 09:05:01 -04:00
Shea Levy
1ce6fff4e2 Merge mysql55 module into mysql 
This also removes the default for services.mysql.package, as this should
not generally be updated automatically if we change the mysql attribute
 2014-02-26 07:54:12 -05:00
Shea Levy
a0a9430869 Add mariadb 2014-02-24 15:34:57 -05:00