diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2014-10-27 22:13:36 +0000 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2014-10-27 22:13:36 +0000 |
| commit | 9eedf0f2184f496cbf51a08e9fa0503c368522bd (patch) | |
| tree | fd2ad1a26629bbf0962a13aa82acdc84e1161a16 /pkgs/development/interpreters | |
| parent | b4c81a1f15094120b612ce627600ba13e11d2b1c (diff) | |
| download | nixpkgs-9eedf0f2184f496cbf51a08e9fa0503c368522bd.tar nixpkgs-9eedf0f2184f496cbf51a08e9fa0503c368522bd.tar.gz nixpkgs-9eedf0f2184f496cbf51a08e9fa0503c368522bd.tar.bz2 nixpkgs-9eedf0f2184f496cbf51a08e9fa0503c368522bd.tar.lz nixpkgs-9eedf0f2184f496cbf51a08e9fa0503c368522bd.tar.xz nixpkgs-9eedf0f2184f496cbf51a08e9fa0503c368522bd.tar.zst nixpkgs-9eedf0f2184f496cbf51a08e9fa0503c368522bd.zip | |
simplify expressions
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/ruby/fixes.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/gem.nix | 6 |
2 files changed, 5 insertions, 15 deletions
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 |