diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-25 10:02:15 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-25 10:02:25 +0100 |
| commit | 2af19df36448dad74e5428987ef33135167b6ffa (patch) | |
| tree | 86bc22dba9bcef4499859854f178e9fd3a656b12 /pkgs/development/interpreters/ruby | |
| parent | 9b980baa9db36aebf1396cafaa4dfc385d7b7009 (diff) | |
| parent | 7362936cd6952b24a3ec14f2e961522691892fcf (diff) | |
| download | nixlib-2af19df36448dad74e5428987ef33135167b6ffa.tar nixlib-2af19df36448dad74e5428987ef33135167b6ffa.tar.gz nixlib-2af19df36448dad74e5428987ef33135167b6ffa.tar.bz2 nixlib-2af19df36448dad74e5428987ef33135167b6ffa.tar.lz nixlib-2af19df36448dad74e5428987ef33135167b6ffa.tar.xz nixlib-2af19df36448dad74e5428987ef33135167b6ffa.tar.zst nixlib-2af19df36448dad74e5428987ef33135167b6ffa.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters/ruby')
4 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix index d050faca2454..c5b9fba37aa0 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix @@ -18,7 +18,8 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, buildRubyGem +{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, + buildRubyGem, darwin } @ defs: lib.makeOverridable ( @@ -85,6 +86,7 @@ stdenv.mkDerivation (attrs // { buildInputs = [ ruby rubygems makeWrapper ] ++ lib.optionals (type == "git") [ git bundler ] + ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; name = attrs.name or (namePrefix + gemName); diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb index 647b83b52c38..48ab5270c22f 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb @@ -107,7 +107,6 @@ if spec.executables.any? spec.executables.each do |exe| wrapper = File.join(bin_dir, exe) File.open(wrapper, "w") do |f| - stub = generate_stub(spec.name, exe) f.write(<<-EOF) #!#{ruby} # diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix index ae8c0ee6e6ad..787c3be54e35 100644 --- a/pkgs/development/interpreters/ruby/gemconfig/default.nix +++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix @@ -79,7 +79,6 @@ in "--with-exslt-lib=${libxslt}/lib" "--with-exslt-include=${libxslt}/include" ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; }; patron = attrs: { @@ -143,10 +142,6 @@ in ''; }; - unf_ext = attrs: { - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; - }; - xapian-ruby = attrs: { # use the system xapian dontBuild = false; diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix index b6ac04808979..fb210ceff4bf 100644 --- a/pkgs/development/interpreters/ruby/rubygems.nix +++ b/pkgs/development/interpreters/ruby/rubygems.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "rubygems-${version}"; - version = "2.4.1"; + version = "2.4.8"; src = fetchurl { url = "http://production.cf.rubygems.org/rubygems/${name}.tgz"; - sha256 = "0cpr6cx3h74ykpb0cp4p4xg7a8j0bhz3sk271jq69l4mm4zy4h4f"; + sha256 = "0pl4civyf0vhqsqbqaivvxrb3fsg8sid9a8jv5vfnk4hypz3ahss"; }; patches = [ ./gem_hook.patch ]; |