Merge branch 'master' into staging-next

Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
@@ -6,13 +6,13 @@ buildRubyGem rec {

  name = "${gemName}-${version}";
  gemName = "bundix";
-  version = "2.4.2";
+  version = "2.5.0";

  src = fetchFromGitHub {
-    owner = "manveru";
+    owner = "nix-community";
    repo = "bundix";
    rev = version;
-    sha256 = "03jhj1dy0ljrymjnpi6mcxn36a29qxr835l1lc11879jjzvnr2ax";
+    sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8";
  };

  buildInputs = [ ruby bundler ];