From 56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c Mon Sep 17 00:00:00 2001 From: Judson Date: Fri, 12 May 2017 09:44:39 -0700 Subject: [PATCH] Fixed platform filtering. --- pkgs/development/ruby-modules/bundler-env/functions.nix | 6 ++---- pkgs/development/ruby-modules/bundler-env/test.nix | 3 +++ 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 5a51f4d8208..d9f02324cc2 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 af3d81d483d..c3de862f153 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))