summary refs log tree commit diff
diff options
context:
space:
mode:
authorJudson <nyarly@gmail.com>2017-05-12 09:44:39 -0700
committerJudson <nyarly@gmail.com>2017-05-12 09:44:39 -0700
commit56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c (patch)
treeabceea500d102b8017df50e8f54e34765f665795
parent07f781bd8d8b114985b47762bf0930729a5247ce (diff)
downloadnixlib-56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c.tar
nixlib-56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c.tar.gz
nixlib-56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c.tar.bz2
nixlib-56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c.tar.lz
nixlib-56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c.tar.xz
nixlib-56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c.tar.zst
nixlib-56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c.zip
Fixed platform filtering.
-rw-r--r--pkgs/development/ruby-modules/bundler-env/functions.nix6
-rw-r--r--pkgs/development/ruby-modules/bundler-env/test.nix3
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundler-env/functions.nix
index 5a51f4d82081..d9f02324cc2d 100644
--- a/pkgs/development/ruby-modules/bundler-env/functions.nix
+++ b/pkgs/development/ruby-modules/bundler-env/functions.nix
@@ -4,12 +4,10 @@ rec {
 
   platformMatches = {rubyEngine, version, ...}@ruby: attrs: (
   !(attrs ? "platforms") ||
-  builtins.trace "ruby engine: ${rubyEngine}"
-  builtins.trace "ruby version ${version.majMin}"
+  builtins.length attrs.platforms == 0 ||
     builtins.any (platform:
-    builtins.trace "checking: ${platform.engine}/${platform.version}"
       platform.engine == rubyEngine &&
-        (!(platform ? "version") || platform.version == version.majMin)
+        (!(platform ? "version") || platform.version.majMin == version.majMin)
     ) attrs.platforms
   );
 
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index af3d81d483d8..c3de862f1537 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -41,6 +41,9 @@ let
     ( let gemSet = { test = { groups = ["x" "y"]; }; };
       in
       test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet))
+    ( let gemSet = { test = { platforms = []; }; };
+      in
+      test.run "Filter matches empty platforms list" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
     ( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version;}]; }; };
       in
       test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))