diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/development/ruby-modules/gem-config | |
parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) | |
download | nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2 nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config')
-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 157e15e375f..a03e40e8097 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, tzdata, icu, libffi -, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl +, cmake, libssh2, openssl, mysql, 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 = [ libmysqlclient zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; mysql2 = attrs: { - buildInputs = [ libmysqlclient zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; ncursesw = attrs: { |