ruby: exorcise the last few remaining rubyPackages

pkgs/applications/version-management/redmine/bootstrap.nix

@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0";
   };
   buildInputs = [
-    ruby rubyPackages.bundler libiconv libxslt libxml2 pkgconfig
+    ruby bundler libiconv libxslt libxml2 pkgconfig
     libffi imagemagickBig postgresql which stdenv
   ];
   installPhase = ''

pkgs/applications/version-management/redmine/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ruby, rubyPackages, bundler, libiconv, libiconvOrNull, libiconvOrLibc, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }:
+{ stdenv, fetchurl, ruby, bundler, libiconv, libiconvOrNull, libiconvOrLibc, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }:
 
 let
   gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix);

pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix

@@ -28,35 +28,21 @@ let
 in
 
 {
-  bundler = attrs: {
-    dontPatchShebangs = true;
-  };
-
   gpgme = attrs: {
     buildInputs = [ gpgme ];
   };
 
   libv8 = attrs: {
     buildInputs = [ which v8 python ];
-    # The  "--with-system-v8" flag doesn't seem to work...
+    buildFlags = [
+      "--with-system-v8=true"
+    ];
     patches = [
       (fetchpatch {
         url = https://github.com/cowboyd/libv8/pull/161.patch;
         sha256 = "1l6572cmigc22g249jj8h0xlbig88mj43kdqdbimhw2pmpv3q0rs";
       })
     ];
-    postPatch = ''
-      rm -r vendor
-      cat <<-EOF > ext/libv8/extconf.rb
-      require 'mkmf'
-      create_makefile('libv8')
-
-      require File.expand_path '../location', __FILE__
-      location = Libv8::Location::System.new
-
-      exit location.install!
-      EOF
-    '';
   };
 
   ncursesw = attrs: {
@@ -110,19 +96,6 @@ in
   };
 
   therubyracer = attrs: {
-    #preInstall = ''
-    #  ln -s ${clang}/bin/clang $TMPDIR/gcc
-    #  ln -s ${clang}/bin/clang++ $TMPDIR/g++
-    #  export PATH=$TMPDIR:$PATH
-    #'';
-
-    #buildInputs = [
-    #  utillinux # for `flock`
-    #];
-
-    #postInstall = ''
-    #'';
-
     buildFlags = [
       "--with-v8-dir=${v8}"
       "--with-v8-include=${v8}/include"

pkgs/development/interpreters/ruby/bundler-env/default.nix

@@ -264,10 +264,6 @@ stdenv.mkDerivation {
   ];
 
   installPhase = ''
-    # Copy the Gemfile and Gemfile.lock
-    #mkdir out
-    #out=$(pwd -P)/out
-
     mkdir -p $bundle
     export BUNDLE_GEMFILE=$bundle/Gemfile
     cp ${gemfile} $BUNDLE_GEMFILE
@@ -280,20 +276,21 @@ stdenv.mkDerivation {
     export GEM_PATH=$GEM_HOME
     mkdir -p $GEM_HOME
 
+    ${allBuildFlags}
+    #export
+
     mkdir gems
     ${copyGems}
 
-    mkdir env
-    ${runPreInstallers}
-
-    ${allBuildFlags}
-
     ${lib.optionalString (!documentation) ''
       mkdir home
       HOME="$(pwd -P)/home"
       echo "gem: --no-rdoc --no-ri" > $HOME/.gemrc
     ''}
 
+    mkdir env
+    ${runPreInstallers}
+
     mkdir $out/bin
     cp ${./monkey_patches.rb} monkey_patches.rb
     export RUBYOPT="-rmonkey_patches.rb -I $(pwd -P)"

pkgs/development/interpreters/ruby/packages.nix

@@ -1,11 +0,0 @@
-{ ruby, rubygemsFun, callPackage }:
-
-{
-  # Nix utilities
-  gemFixes = callPackage ../development/interpreters/ruby/fixes.nix { };
-  buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { inherit ruby; };
-  loadRubyEnv = callPackage ../development/interpreters/ruby/load-ruby-env.nix { inherit ruby; };
-
-  # Gems
-  rubygems = rubygemsFun ruby;
-}

pkgs/development/libraries/v8/3.16.14.nix

@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
   buildFlags = [
-    #"LINK=g++"
     "-C out"
     "builddir=$(CURDIR)/Release"
     "BUILDTYPE=Release"

pkgs/servers/monitoring/riemann-dash/default.nix

@@ -1,3 +1,8 @@
-{ loadRubyEnv }:
+{ bundlerEnv }:
 
-(loadRubyEnv { gemset = ./gemset.nix; }).riemann-dash
+bundlerEnv {
+  name = "riemann-dash-0.2.9";
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+}

pkgs/servers/monitoring/riemann-dash/gemset.nix

@@ -1,28 +1,28 @@
 {
   erubis = {
     version = "2.7.0";
-    src = {
+    source = {
       type = "gem";
       sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
     };
   };
   multi_json = {
     version = "1.3.6";
-    src = {
+    source = {
       type = "gem";
       sha256 = "0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr";
     };
   };
   rack = {
     version = "1.5.2";
-    src = {
+    source = {
       type = "gem";
       sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6";
     };
   };
   rack-protection = {
     version = "1.5.3";
-    src = {
+    source = {
       type = "gem";
       sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
     };
@@ -32,7 +32,7 @@
   };
   riemann-dash = {
     version = "0.2.9";
-    src = {
+    source = {
       type = "gem";
       sha256 = "0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3";
     };
@@ -46,14 +46,14 @@
   };
   sass = {
     version = "3.4.8";
-    src = {
+    source = {
       type = "gem";
       sha256 = "1ianyj2figwk314h10fkzpjql2xxi5l4njv1h0w8iyzjda85rqlp";
     };
   };
   sinatra = {
     version = "1.4.5";
-    src = {
+    source = {
       type = "gem";
       sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s";
     };
@@ -65,14 +65,14 @@
   };
   tilt = {
     version = "1.4.1";
-    src = {
+    source = {
       type = "gem";
       sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
     };
   };
   webrick = {
     version = "1.3.1";
-    src = {
+    source = {
       type = "gem";
       sha256 = "0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g";
     };

pkgs/top-level/all-packages.nix

@@ -4307,7 +4307,7 @@ let
   defaultGemConfig = callPackage ../development/interpreters/ruby/bundler-env/default-gem-config.nix { };
   buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { };
   loadRubyEnv = callPackage ../development/interpreters/ruby/load-ruby-env.nix { };
-  bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env.nix { };
+  bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
 
   ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
   ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { };
@@ -4326,8 +4326,6 @@ let
   ruby_2_1 = ruby_2_1_3;
   ruby_2_2 = ruby_2_2_0;
 
-  rubyPackages = callPackage ../development/interpreters/ruby/packages.nix { };
-
   rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
     inherit ruby makeWrapper;
   };