Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-11-29 08:12:56 +01:00
177 changed files with 4259 additions and 2087 deletions
@@ -6,13 +6,13 @@ buildRubyGem rec {
name = "${gemName}-${version}";
gemName = "bundix";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "manveru";
repo = "bundix";
rev = version;
sha256 = "0ap23abv6chiv7v97ic6b1qf5by6b26as5yrpxg5q7p2giyiv33v";
sha256 = "1lq8nday6031mj7ivnk2wd47v2smz6frnb8xh2yhyhpld045v1rz";
};
buildInputs = [ ruby bundler ];
@@ -29,6 +29,7 @@
, buildInputs ? []
, postBuild ? ""
, gemConfig ? null
, passthru ? {}
}@args:
let