Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "elixir-${version}";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchurl {
    url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "0ml0sl1l5ibb8qh505fsd7y87wq9qjvaxw9y1dyfcw00d3i1z989";
+    sha256 = "09s8469830s4070i0m04fxdhqimkdyc5k9jylm5vpfz9l3z4wvl8";
  };

  buildInputs = [ erlang rebar makeWrapper ];