diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
| commit | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (patch) | |
| tree | 28f7989183b690ecafdb0360c0fee406aac88bcc /pkgs/development/ruby-modules | |
| parent | 6b2aa16ec1926f7027ad03ebf2b9b43370cb5e54 (diff) | |
| parent | 447d625edc3a488deee1c9b2e5890dd974e55ee3 (diff) | |
| download | nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.gz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.bz2 nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.lz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.xz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.zst nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.zip | |
Merge branch 'staging' into staging-next
This brings openssl CVE fixes, and I can't see anything too risky in there, so let's merge these two staging iterations together.
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 642d5515cb87..9a02f4f374af 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -20,7 +20,7 @@ { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi -, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl +, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz @@ -349,11 +349,11 @@ in }; mysql = attrs: { - buildInputs = [ mysql.connector-c zlib openssl ]; + buildInputs = [ libmysqlclient zlib openssl ]; }; mysql2 = attrs: { - buildInputs = [ mysql.connector-c zlib openssl ]; + buildInputs = [ libmysqlclient zlib openssl ]; }; ncursesw = attrs: { |