diff options
| author | Judson <nyarly@gmail.com> | 2017-04-09 15:36:03 -0700 |
|---|---|---|
| committer | Judson <nyarly@gmail.com> | 2017-04-09 15:36:03 -0700 |
| commit | ed77e113c503c82da47298c3748c410687097f72 (patch) | |
| tree | 7b4d536bb1380cfbbbc46f46fb6ff2561c459bef /pkgs/development/ruby-modules | |
| parent | 7f6e8a1cd5297d35e7cf431f682b1b1abfa26f16 (diff) | |
| parent | b64163a90d395c9b0edc2c38c12875802968c191 (diff) | |
| download | nixlib-ed77e113c503c82da47298c3748c410687097f72.tar nixlib-ed77e113c503c82da47298c3748c410687097f72.tar.gz nixlib-ed77e113c503c82da47298c3748c410687097f72.tar.bz2 nixlib-ed77e113c503c82da47298c3748c410687097f72.tar.lz nixlib-ed77e113c503c82da47298c3748c410687097f72.tar.xz nixlib-ed77e113c503c82da47298c3748c410687097f72.tar.zst nixlib-ed77e113c503c82da47298c3748c410687097f72.zip | |
Merge remote-tracking branch 'nixos/master'
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/bundler/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index f3737afdb222..9251c4d2a415 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.14.4"; - sha256 = "1hafmb7p41pm40a2z7f4x5zpgrb72xvgwlvkxnflmzqkvq2prkfv"; + version = "1.14.6"; + sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 20dc23979f5a..02fe9f50558e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -19,7 +19,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 +, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc }@args: @@ -89,7 +89,7 @@ in msgpack = attrs: { buildInputs = [ libmsgpack ]; }; - + mysql = attrs: { buildInputs = [ mysql.lib zlib openssl ]; }; @@ -218,7 +218,7 @@ in --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; }; - + uuid4r = attrs: { buildInputs = [ which libossp_uuid ]; }; @@ -226,12 +226,12 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - buildInputs = [ xapian pkgconfig zlib ]; + buildInputs = [ xapian_1_2_22 pkgconfig zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile ''; preInstall = '' - export XAPIAN_CONFIG=${xapian}/bin/xapian-config + export XAPIAN_CONFIG=${xapian_1_2_22}/bin/xapian-config ''; }; |