Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 50d8295cc6ae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01c4c15ef558
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 31, 2019

  1. ruby: --disable-rubygems for baseruby 

    This works just fine, and means we don't run into an issue with RubyGems
trying to install into a different Ruby's prefix when cross-compiling.
See #51842 (comment).
    @alyssais
    alyssais committed Aug 31, 2019
    Copy the full SHA
    5b08510 View commit details

  2. ruby: replace bundled RubyGems with our RubyGems 

    This should prevent problems caused by trying to install our own
RubyGems over the top of the one that comes with Ruby.
    @alyssais
    alyssais committed Aug 31, 2019
    Copy the full SHA
    01c4c15 View commit details
Showing with 6 additions and 8 deletions.
  1. +6 −8 pkgs/development/interpreters/ruby/default.nix
14 changes: 6 additions & 8 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,11 +29,13 @@ let
baseruby = self.override {
useRailsExpress = false;
docSupport = false;
rubygemsSupport = false;
};
self = lib.makeOverridable (
{ stdenv, buildPackages, lib
, fetchurl, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true
, rubygemsSupport ? true
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
@@ -90,8 +92,10 @@ let
patchLevel = ver.patchLevel;
}).${ver.majMinTiny};

postUnpack = ''
cp -r ${rubygems} $sourceRoot/rubygems
postUnpack = opString rubygemsSupport ''
rm -rf $sourceRoot/{lib,test}/rubygems*
cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
cp -r ${rubygems}/test/rubygems $sourceRoot/test
'';

postPatch = if atLeast25 then ''
@@ -136,12 +140,6 @@ let
installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory
postInstall = ''
# Update rubygems
pushd rubygems
chmod +w bundler/bundler.gemspec
${buildRuby} setup.rb --destdir $GEM_HOME
popd
# Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb