From fced35fa44098be0296d8b42166583bd5e505141 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sat, 3 Mar 2018 23:24:15 -0800 Subject: [PATCH] buildRubyGem: Make testing easier Don't default `doCheck` to false, and use the default set of phases so the phases list does not need to be overriden in order to add checkPhase or installCheckPhase. --- pkgs/development/ruby-modules/gem/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 5bde59eab04d28..d00ce7fccf5c1f 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -36,7 +36,6 @@ lib.makeOverridable ( rubyName = builtins.parseDrvName ruby.name; in "${rubyName.name}${rubyName.version}-") , buildInputs ? [] -, doCheck ? false , meta ? {} , patches ? [] , gemPath ? [] @@ -79,7 +78,6 @@ in stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; - inherit doCheck; inherit dontBuild; inherit dontStrip; inherit type; @@ -96,8 +94,6 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit src; - phases = attrs.phases or [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "fixupPhase" ]; - unpackPhase = attrs.unpackPhase or '' runHook preUnpack