summary refs log tree commit diff
path: root/pkgs/development/ruby-modules/bundler-env/basic.nix
diff options
context:
space:
mode:
authorJudson <nyarly@gmail.com>2017-05-10 10:00:21 -0700
committerJudson <nyarly@gmail.com>2017-05-10 10:00:21 -0700
commit07f781bd8d8b114985b47762bf0930729a5247ce (patch)
tree12430c2b2382203075ea6ece43ee4b65fda13893 /pkgs/development/ruby-modules/bundler-env/basic.nix
parent0145ec999c3a5e3d205e94221ce07f11e9fc3b35 (diff)
downloadnixpkgs-07f781bd8d8b114985b47762bf0930729a5247ce.tar
nixpkgs-07f781bd8d8b114985b47762bf0930729a5247ce.tar.gz
nixpkgs-07f781bd8d8b114985b47762bf0930729a5247ce.tar.bz2
nixpkgs-07f781bd8d8b114985b47762bf0930729a5247ce.tar.lz
nixpkgs-07f781bd8d8b114985b47762bf0930729a5247ce.tar.xz
nixpkgs-07f781bd8d8b114985b47762bf0930729a5247ce.tar.zst
nixpkgs-07f781bd8d8b114985b47762bf0930729a5247ce.zip
Current round of tests pass, but filter function is failing to include when platform match in use.
Diffstat (limited to 'pkgs/development/ruby-modules/bundler-env/basic.nix')
-rw-r--r--pkgs/development/ruby-modules/bundler-env/basic.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundler-env/basic.nix
index 75fe7342344..80f12c14bfe 100644
--- a/pkgs/development/ruby-modules/bundler-env/basic.nix
+++ b/pkgs/development/ruby-modules/bundler-env/basic.nix
@@ -20,15 +20,13 @@
 , ...
 }@args:
 
-with (
-builtins.trace "basic functions"
-import ./functions.nix { inherit lib ruby gemConfig groups; });
+with  import ./functions.nix { inherit lib gemConfig; };
 
 let
 
   importedGemset = import gemset;
 
-  filteredGemset = filterGemset importedGemset;
+  filteredGemset = filterGemset { inherit ruby groups; } importedGemset;
 
   configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
     applyGemConfigs (attrs // { inherit ruby; gemName = name; })
@@ -66,13 +64,12 @@ let
 
   buildGem = name: attrs: (
     let
-      gemAttrs = composeGemAttrs gems name attrs;
+      gemAttrs = composeGemAttrs ruby gems name attrs;
     in
     if gemAttrs.type == "path" then
       pathDerivation gemAttrs
     else
-      builtins.trace (lib.showVal (gemAttrs.ruby or "def ruby"))
-        buildRubyGem gemAttrs
+      buildRubyGem gemAttrs
   );
 
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;