put all rubies in scope

pkgs/development/interpreters/ruby/default.nix

@@ -6,7 +6,7 @@
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
-, autoreconfHook, bison
+, autoreconfHook, bison, autoconf
 , darwin ? null
 }:
 
@@ -20,6 +20,7 @@ let
   let
     versionNoPatch = "${majorVersion}.${minorVersion}.${teenyVersion}";
     isRuby21 = majorVersion == "2" && minorVersion == "1";
+    isRuby18 = majorVersion == "1" && minorVersion == "8";
     baseruby = self false;
     self = useRailsExpress: stdenv.mkDerivation rec {
       version = "${versionNoPatch}-p${patchLevel}";
@@ -57,19 +58,20 @@ let
         # support is disabled (if it's enabled, we already have it) and we're
         # running on darwin
         ++ (op (!cursesSupport && stdenv.isDarwin) readline)
-        ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]));
+        ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]))
+        ++ op isRuby18 autoconf;
 
       enableParallelBuilding = true;
 
-      patches = let patchsets = import ./patchsets.nix {
+      patches = (import ./patchsets.nix {
         inherit patchSet useRailsExpress ops patchLevel;
-      }; in patchsets."${versionNoPatch}";
+      })."${versionNoPatch}";
 
       postUnpack = opString isRuby21 ''
         rm "$sourceRoot/enc/unicode/name2ctype.h"
       '';
 
-      postPatch = if isRuby21 then ''
+      postPatch = opString (!isRuby18) (if isRuby21 then ''
         rm tool/config_files.rb
         cp ${config}/config.guess tool/
         cp ${config}/config.sub tool/
@@ -77,9 +79,9 @@ let
         sed -i configure.in -e '/config.guess/d'
         cp ${config}/config.guess tool/
         cp ${config}/config.sub tool/
-      '';
+      '');
 
-      configureFlags = ["--enable-shared"]
+      configureFlags = ["--enable-shared" "--enable-pthread"]
         ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
         ++ ops stdenv.isDarwin [
           # on darwin, we have /usr/include/tk.h -- so the configure script detects

pkgs/development/interpreters/ruby/ruby-1.8.7.nix

@@ -0,0 +1,104 @@
+{ stdenv, lib, fetchurl, fetchFromGitHub
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? true
+, groff, docSupport ? false
+, ruby_1_8_7, autoreconfHook, bison, useRailsExpress ? true
+}:
+
+let
+  op = stdenv.lib.optional;
+  ops = stdenv.lib.optionals;
+  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
+  baseruby = ruby_1_8_7.override { useRailsExpress = false; };
+in
+
+stdenv.mkDerivation rec {
+  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
+
+  name = "ruby-${version}";
+
+  src = if useRailsExpress then fetchFromGitHub {
+    owner  = "ruby";
+    repo   = "ruby";
+    rev    = "v1_8_7_${passthru.patchLevel}";
+    sha256 = "1xddhxr0j26hpxfixvhqdscwk2ri846w2129fcfwfjzvy19igswx";
+  } else fetchurl {
+    url = "http://cache.ruby-lang.org/pub/ruby/1.8/${name}.tar.bz2";
+    sha256 = "1qq7khilwkayrhwmzlxk83scrmiqfi7lgsn4c63znyvz2c1lgqxl";
+  };
+
+  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+  NROFF = "${groff}/bin/nroff";
+
+  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
+    ++ (ops cursesSupport [ ncurses readline ] )
+    ++ (op docSupport groff )
+    ++ (op zlibSupport zlib)
+    ++ (op opensslSupport openssl)
+    ++ (op gdbmSupport gdbm);
+
+  patches = ops useRailsExpress [
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/01-ignore-generated-files.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/02-fix-tests-for-osx.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/03-sigvtalrm-fix.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/04-railsbench-gc-patch.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/05-display-full-stack-trace.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/06-better-source-file-tracing.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/07-heap-dump-support.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/08-fork-support-for-gc-logging.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/09-track-malloc-size.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/10-track-object-allocation.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/11-expose-heap-slots.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/12-fix-heap-size-growth-logic.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/13-heap-slot-size.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/14-add-trace-stats-enabled-methods.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/15-track-live-dataset-size.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/16-add-object-size-information-to-heap-dump.patch"
+    "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/17-caller-for-all-threads.patch"
+  ];
+
+  configureFlags = [ "--enable-shared" "--enable-pthread" ]
+    # Without this fails due to not finding X11/Xlib.h
+    # Not sure why this isn't required on Linux
+    ++ ops stdenv.isDarwin [ "--without-tcl" "--without-tk" ]
+    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby";
+
+  installFlags = stdenv.lib.optionalString docSupport "install-doc";
+
+  postInstall = ''
+    # Bundler tries to create this directory
+    mkdir -pv $out/${passthru.gemPath}
+    mkdir -p $out/nix-support
+    cat > $out/nix-support/setup-hook <<EOF
+    addGemPath() {
+      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
+    }
+
+    envHooks+=(addGemPath)
+    EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
+  '';
+
+  meta = {
+    license = stdenv.lib.licenses.ruby;
+    homepage = "http://www.ruby-lang.org/en/";
+    description = "The Ruby language";
+  };
+
+  passthru = rec {
+    majorVersion = "1";
+    minorVersion = "8";
+    teenyVersion = "7";
+    patchLevel = "374";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -5087,13 +5087,14 @@ let
   buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { };
   bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
 
-  rubies = callPackage ../development/interpreters/ruby {};
+  ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
-  inherit (rubies)
+  inherit (callPackage ../development/interpreters/ruby {})
-    ruby_2_1_2
+    # TODO: uncomment when ruby_1_8_7 doesn't need autoconf
-    ruby_2_1_3
+    # ruby_1_8_7
-    ruby_2_1_6
+    ruby_1_9_3
-    ruby_2_2_0
+    ruby_2_0_0
-    ruby_2_2_2;
+    ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6
+    ruby_2_2_0 ruby_2_2_2;
 
   # Ruby aliases
   ruby = ruby_2_2;