JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
271,618 Commits 1 Branch 0 Tags 12 GiB
9633889d67
Commit Graph

211 Commits

Author SHA1 Message Date
Jan Tojnar
da76deffd1
Merge branch 'master' into staging-next 2019-11-14 23:25:36 +01:00
Aaron Andersen
2295a94fc1 mariadb: 10.3.18 -> 10.3.20 2019-11-14 10:13:27 -08:00
Izorkin
571c59fa42 mariadb-connector-c: 3.1.4 -> 3.1.5 2019-11-12 14:51:45 +01:00
Frederik Rietdijk
d9642e006f mariadb-connector-c: make patch only for darwin to reduce rebuilds 2019-10-30 15:01:52 +01:00
Izorkin
638edb9528 mariadb-connector-c: fix crypt_libs 2019-10-30 15:00:43 +01:00
Izorkin
527372f2ec mariadb-connector-c: fix mysql_version.h search error 2019-10-25 12:40:53 +03:00
Izorkin
ffae858195 mariadb-connector-c: 3.1.2 -> 3.1.4 2019-10-23 10:01:40 +03:00
Dmitry Kalinkin
1f9882cb29
Merge pull request #70841 from callahad/mariadb 
mariadb: fix builds on darwin
 2019-10-10 22:58:28 -04:00
Dan Callahan
b0b0bb7e0b
mariadb: fix darwin build 
We want to disable `PLUGIN_AUTH_PAM` when building:

1. `mariadb` on macOS.
2. `mariadb-client` on any platform

Unfortunately, the interaction of these two commits
  6c97b0486c
  7e43b4d0ae
created a situation where we disable it *twice* when building on macOS.
Once in a darwin-specific `prePatch` script, and again in the `patches`
section for client builds.

This removes the redundant `prePatch` script and conditionally applies
the patch to `mariadb` server builds on darwin.

Fixes #70835
 2019-10-09 21:56:59 +01:00
ajs124
532c3a6075 mariadb-connector-c: fix socket path 2019-09-29 13:03:05 +02:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Matthew Bauer
067b4dbb93 mariadb: add patch for missing libcrypt on darwin 
Really fixes #69034
 2019-09-22 17:34:24 -04:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'" 
This reverts commit f8a8fc6c7c.
 2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'" 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
 2019-09-21 20:05:09 +02:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Matthew Bauer
7e43b4d0ae mariadb: disable auth_pam plugin on darwin 
Fixes #69034

This plugin doesn’t work right for us now, needs to be disabled. It
was added first in 10.3.18:

91fdb931fa (diff-7cea40646c6b8df9a67a3eac4eec9bc6)
 2019-09-21 00:18:34 -04:00
Vladimír Čunát
fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Yurii Izorkin
6c97b0486c mariadb: 10.3.17 -> 10.3.18 (#68541) 
* mariadb: fix library locate

* mariadb: 10.3.17 -> 10.3.18
 2019-09-15 23:48:37 -04:00
Izorkin
edf389d92b mariadb-connector-c: drop v2.3 2019-09-09 16:05:01 +03:00
Izorkin
50fbe46ae7 mariadb-galera: 25.3.26 -> 25.3.27 2019-09-09 15:55:34 +03:00
Izorkin
e2bd655822 mariadb-galera: move to external package 2019-09-09 15:55:34 +03:00
Izorkin
3def2b4b6a mariadb-connector-c: init at 3.1.2 2019-09-09 15:55:34 +03:00
Izorkin
cfb909229d mariadb-connector-c: move to external package 2019-09-09 15:55:34 +03:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Izorkin
21e891efd1 mariadb: fix build in Darwin 2019-08-02 13:31:13 +03:00
Izorkin
12f95f7572 mariadb: remove c++11 narrowing error patch 2019-08-01 20:26:23 +03:00
Izorkin
ac90575382 mariadb: clean config 2019-08-01 20:26:21 +03:00
Izorkin
0692c615e5 mariadb: remove test binaries 2019-08-01 14:22:10 +03:00
Izorkin
0a4562277f mariadb: fix config build mariadb client 2019-08-01 14:18:12 +03:00
Izorkin
c8488b913a mariadb: add option to build server without client binary files 2019-08-01 14:15:55 +03:00
Izorkin
f0d88f05b6 mariadb: fix mariadb_config path 2019-08-01 14:08:45 +03:00
Izorkin
9d5e531dff mariadb: 10.3.15 -> 10.3.17 2019-08-01 14:01:56 +03:00
Aaron Andersen
ccb9ada402 mariadb: fix mytop script 2019-07-31 22:35:15 -04:00
Andrew Childs
b8a6649797 mariadb: fix clang and darwin build 
The contents of `clang-isfinite.patch` are no longer necessary after
upstream revision 031fa6d4258574379ca3c1cbe912d235e9581982, which
includes a similar change.

Building in c++11 mode removes support for the GCC `typeof` extension
in favor of the standardized `__typeof__`. This causes errors when
using the `strmake_buf` macro, which relies on `typeof`.
 2019-06-07 00:29:40 +09:00
Matthew Bauer
75a82b54a1
Merge pull request #44343 from Izorkin/mariadb-10.3 
mariadb: 10.2.17 -> 10.3.15
 2019-06-04 12:28:31 -04:00
Izorkin
a3da901ec7 mariadb: 10.2.17 -> 10.3.15 2019-06-04 19:02:16 +03:00
Izorkin
c9d2d2fa82 mariadb: change default codepage to utf8mb4 2019-05-19 16:06:13 +03:00
Izorkin
3a6e362ec3 mariadb: change client config 2019-05-19 16:06:13 +03:00
Izorkin
1db3a91bab mariadb: change server config 2019-05-19 16:06:11 +03:00
Izorkin
e71d172982 mariadb.galera: 25.3.24 -> 25.3.26 2019-04-23 20:59:57 +03:00
Jörg Thalheim
b5c1deca8a
treewide: remove wkennington as maintainer 
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
 2019-01-26 10:05:32 +00:00
Matthew Bauer
bfbfe941ab treewide: use scons setup hook 
Lots of packages can use it. Here is the list:

- jackmix
- klick
- mixx
- nova-filters
- rhvoice
- giv
- mypaint
- swift-im
- bombono
- mapnik
- serf
- nuitka
- pyexiv2
- godot
- hammer
- toluapp
- btanks
- dxx-rebirth
- endless-sky
- globulation
- the-powder-toy
- fceux
- gpsd
- mongodb
- rippled
- mariadb
- lprof
 2018-11-13 19:14:10 -06:00
florianjacob
98e5a0f9f4 mariadb.connector-c: 2.3.6 -> 2.3.7 (#48078) 2018-10-16 09:04:37 +02:00
Yurii Izorkin
963dcd935d mariadb galera: 25.3.23 -> 25.3.24 (#47905) 2018-10-06 16:03:15 +02:00
Andreas Rammhold
5da1d01bf2
mariadb: 10.2.16 -> 10.2.17 (#45199) 
Bump to latest stable version of the 10.2.x branch. Besides many bug fixes the
following security related issues have been fixed:
 - CVE-2018-3060
 - CVE-2018-3064
 - CVE-2018-3063
 - CVE-2018-3058
 - CVE-2018-3066

Release notes: https://mariadb.com/kb/en/library/mariadb-10217-release-notes/
 2018-08-18 12:14:13 +02:00
Cray Elliott
4c45016c29 Revert "mariadb: 10.2.16 -> 10.3.8" 
This reverts commit 00ab5c5b6a.

The commit listed broke darwin and held up Hydra. sorry about that!
 2018-08-05 20:12:18 -07:00
Cray Elliott
00ab5c5b6a mariadb: 10.2.16 -> 10.3.8 2018-08-01 20:57:08 -07:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
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