Merge master into staging-next

2019-10-20 16:22:45 +02:00
parent ba36219220 eb7a680d96
commit ad8bd84fc9
193 changed files with 1984 additions and 1864 deletions
@@ -3,7 +3,7 @@
  tree, hexRegistrySnapshot }:

 let
-  version = "3.11.1";
+  version = "3.12.0";

  bootstrapper = ./rebar3-nix-bootstrap;

@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
    owner = "erlang";
    repo = pname;
    rev = version;
-    sha256 = "124l1alf7wx4hqjpf63l0nx70q68lilmgh582c1d413fz5ip0byd";
+    sha256 = "0936ix7lfwsamssap58b265zid7x2m97azrr2qpjcln3xysd16lg";
  };

  inherit bootstrapper;