Jan Malakhovski ad35019501 Merge branch 'master' into staging ... Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master		2018-05-26 00:20:17 +00:00
..
bundix	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
bundled-common	ruby-modules: Import gemset if it's a path OR a string. (#38959)	2018-04-15 11:53:15 +01:00
bundler	bundler: 1.14.6 -> 1.16.1	2018-04-27 10:54:55 +01:00
bundler-app	ruby bundlerApp: Allow passing gemConfig through to bundlerEnv	2018-04-09 18:51:34 +08:00
bundler-env	bundler-env: Remove unused args	2018-01-04 02:28:33 -05:00
gem	buildRubyGem: Make testing easier	2018-03-03 23:31:00 -08:00
gem-config	oxidized: init at 0.21.0	2018-05-24 04:40:45 +02:00
testing	Small changes in response to review.	2017-07-02 17:18:58 -07:00
runtests.sh	Small changes in response to review.	2017-07-02 17:18:58 -07:00