diff options
Diffstat (limited to 'pkgs/development/interpreters/ruby')
5 files changed, 22 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile b/pkgs/development/interpreters/ruby/bundix/Gemfile index 7d2f78133c5..4899cafc373 100644 --- a/pkgs/development/interpreters/ruby/bundix/Gemfile +++ b/pkgs/development/interpreters/ruby/bundix/Gemfile @@ -1,4 +1,4 @@ source "http://rubygems.org" gem "bundix", :git => "https://github.com/cstrahan/bundix.git", - :ref => "v1.0.2" + :ref => "v1.0.3" diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock index 038fa1a7a50..f241a3bafd4 100644 --- a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock +++ b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/cstrahan/bundix.git - revision: e098b8c04087079c897aaf9542990e9fdd503bcf - ref: v1.0.2 + revision: c879cf901ff8084b4c97aaacfb5ecbdb0f95cc03 + ref: v1.0.3 specs: bundix (1.0.2) thor (~> 0.19.1) diff --git a/pkgs/development/interpreters/ruby/bundix/gemset.nix b/pkgs/development/interpreters/ruby/bundix/gemset.nix index adde97a49f2..f8f6546671d 100644 --- a/pkgs/development/interpreters/ruby/bundix/gemset.nix +++ b/pkgs/development/interpreters/ruby/bundix/gemset.nix @@ -4,8 +4,8 @@ source = { type = "git"; url = "https://github.com/cstrahan/bundix.git"; - rev = "e098b8c04087079c897aaf9542990e9fdd503bcf"; - sha256 = "0www8srjqlxy1pzn2b6himy5y768dni54m7rv67gj8yvx48vd803"; + rev = "c879cf901ff8084b4c97aaacfb5ecbdb0f95cc03"; + sha256 = "05kmdnq4qa5h8l3asv05cjpnyplnqqx6hrqybj2cjlzmdxnkkgyj"; fetchSubmodules = false; }; dependencies = [ diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index cadda288764..38b7ce530ae 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -25,13 +25,12 @@ let v8 = v8_3_16_14; - mysql = assert false; (import <nixpkgs> {}).mysql; in { charlock_holmes = attrs: { - buildInputs = [ which icu ]; + buildInputs = [ which icu zlib ]; }; ffi = attrs: { diff --git a/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb b/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb index f3849446fe6..f68a20212ce 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb +++ b/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb @@ -74,16 +74,24 @@ Bundler::Fetcher.class_eval do spec_list = gem_names.map do |name| spec = Bundler.nix_gemspecs.detect {|spec| spec.name == name } - dependencies = spec.dependencies. - select {|dep| dep.type != :development}. - map do |dep| - deps_list << dep.name - dep - end - - [spec.name, spec.version, spec.platform, dependencies] + if spec.nil? + msg = "WARNING: Could not find gemspec for '#{name}'" + Bundler.ui.warn msg + nil + else + dependencies = spec.dependencies. + select {|dep| dep.type != :development}. + map do |dep| + deps_list << dep.name + dep + end + + [spec.name, spec.version, spec.platform, dependencies] + end end + spec_list.compact! + [spec_list, deps_list.uniq] end end |