Merge remote-tracking branch 'upstream/master' into staging

2015-04-29 11:33:28 -05:00
parent 85aafda509 182acabbae
commit 1fe28a1132
134 changed files with 2172 additions and 576 deletions
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jdk }:

 stdenv.mkDerivation rec {
-  version = "2.0.0-rc8";
+  version = "2.0.0-rc14";
  name = "boot-${version}";

  src = fetchurl {
    url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
-    sha256 = "1jqj04f33prb6nqsv7mffwdnz47ppi3szsbdzphjx8xzz394nl7j";
+    sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0";
  };

  inherit jdk;