Merge branch 'master.upstream' into staging.upstream

2015-08-13 11:55:02 -07:00
parent 257db17ee9 bc9bd5c02c
commit 952def0e3c
146 changed files with 14613 additions and 9539 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "sbt-${version}";
-  version = "0.13.8";
+  version = "0.13.9";

  src = fetchurl {
    url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar";
-    sha256 = "0n4ivla8s8ygfnf95dj624nhcyganigf7fy0gamgyf31vw1vnw35";
+    sha256 = "04k411gcrq35ayd2xj79bcshczslyqkicwvhkf07hkyr4j3blxda";
  };

  phases = [ "installPhase" ];