Merge branch 'master' into staging-next

There's been some large rebuild on master. I don't really have time ATM to find what it was.
2018-08-06 12:07:37 +02:00
parent 11ceef4769 6820e2f0dd
commit f504af072b
112 changed files with 2429 additions and 2492 deletions
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "yarn-${version}";
-  version = "1.9.2";
+  version = "1.9.4";

  src = fetchzip {
    url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "0bk006zs1bk6nwj9x07ry314fgxi21sk79h1paljbs6yzrv62h4g";
+    sha256 = "0lxncqvz66167ijhsi76ds2yp8140d9ywn89y5vm92010irsgs20";
  };

  buildInputs = [ nodejs ];