From 9eedf0f2184f496cbf51a08e9fa0503c368522bd Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 27 Oct 2014 22:13:36 +0000
Subject: simplify expressions

---
 pkgs/development/interpreters/ruby/fixes.nix | 14 ++++----------
 pkgs/development/interpreters/ruby/gem.nix   |  6 +-----
 2 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'pkgs/development/interpreters')

diff --git a/pkgs/development/interpreters/ruby/fixes.nix b/pkgs/development/interpreters/ruby/fixes.nix
index ddd673004d3..7314bc2a008 100644
--- a/pkgs/development/interpreters/ruby/fixes.nix
+++ b/pkgs/development/interpreters/ruby/fixes.nix
@@ -21,6 +21,7 @@
 , which, postgresql, v8_3_16_14, clang }:
 
 let
+  id = x: x;
   v8 = v8_3_16_14;
 
   gems = lib.mapAttrs (name: config:
@@ -31,17 +32,10 @@ let
   instantiate = (name: attrs:
     let
       # Turn dependency strings into actual derivations.
-      gemPath = map (name: builtins.getAttr name gems) (attrs.dependencies or []);
-      fix = if (builtins.hasAttr name fixes)
-            then (builtins.getAttr name fixes) attrs
-            else {};
+      gemPath = map (name: gems."${name}") (attrs.dependencies or []);
+      fixedAttrs = (fixes."${name}" or id) attrs;
     in
-      buildRubyGem (attrs // {
-        inherit gemPath;
-        # Disable the checkPhase as there no single way to run tests for a given
-        # gem: https://github.com/rubygems/rubygems/issues/730
-        checkPhase = ":";
-      } // fix)
+      buildRubyGem (fixedAttrs // { inherit gemPath; })
   );
 
   fixes = {
diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix
index 95246797a70..ce0b8e15fec 100644
--- a/pkgs/development/interpreters/ruby/gem.nix
+++ b/pkgs/development/interpreters/ruby/gem.nix
@@ -48,11 +48,7 @@ in ruby.stdenv.mkDerivation (attrs // {
     fi
   '';
 
-  checkPhase = ''
-    runHook preCheck
-    ${attrs.checkPhase or "${rake}/bin/rake spec"}
-    runHook postCheck
-  '';
+  checkPhase = "true";
 
   buildPhase = ''
     runHook preBuild
-- 
cgit 1.4.1