Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
parent c979012631 53e0f8b1cd
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, unzip }:

 stdenv.mkDerivation rec {
-  name = "nim-0.11.2";
-
-  buildInputs = [ unzip ];
+  name = "nim-0.13.0";

  src = fetchurl {
-    url = "http://nim-lang.org/download/${name}.zip";
-    sha256 = "0ay8gkd8fki3d8kbnw2px7rjdlr54kyqh5n1rjhq4vjmqs2wg5s4";
+    url = "http://nim-lang.org/download/${name}.tar.xz";
+    sha256 = "1adiij20n1cigsc44dbp60jdbydmkfp7ixbddmcn6h4dfvjzaqfd";
  };

  buildPhase   = "sh build.sh";