about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-03-08 16:08:40 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-03-08 16:08:40 -0700
commit2e6e6f917861284f35e91f26de2c913ce408449f (patch)
tree9c4724a866218e65def8f8031bfca901306c6343 /pkgs/development/compilers
parent01ebf5582ca11cfa17aa9fbc4220a23f9ddd4e3e (diff)
parent7da51f9eb7c092beb157fba7aa21e25d9ff0abd1 (diff)
downloadnixlib-2e6e6f917861284f35e91f26de2c913ce408449f.tar
nixlib-2e6e6f917861284f35e91f26de2c913ce408449f.tar.gz
nixlib-2e6e6f917861284f35e91f26de2c913ce408449f.tar.bz2
nixlib-2e6e6f917861284f35e91f26de2c913ce408449f.tar.lz
nixlib-2e6e6f917861284f35e91f26de2c913ce408449f.tar.xz
nixlib-2e6e6f917861284f35e91f26de2c913ce408449f.tar.zst
nixlib-2e6e6f917861284f35e91f26de2c913ce408449f.zip
Merge pull request #6684 from j-keck/update-scala
update scala to 2.10.5 and 2.11.6
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/scala/2.10.nix4
-rw-r--r--pkgs/development/compilers/scala/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
index d7e7ecf1ce2e..b518a9a0e0ec 100644
--- a/pkgs/development/compilers/scala/2.10.nix
+++ b/pkgs/development/compilers/scala/2.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.10.4";
+  name = "scala-2.10.5";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "1hqhm1xvd7g78jspvl30zgdzw79xq5zl837h47p6w1n6qlwbcvdl";
+    sha256 = "1ckyz31gmf2pgdl51h1raa669mkl7sqfdl3vqkrmyc46w5ysz3ci";
   };
 
   buildInputs = [ jre makeWrapper ] ;
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 82cd9fd9087d..9e55d9f3ac2c 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.11.5";
+  name = "scala-2.11.6";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "0ip2nb4n68q8gqbc15dq55xfpvr0yi8fwsn8ycz4marl6qb0rhyv";
+    sha256 = "10v58jm0wbb4v71sfi03gskd6n84jqn6nvd62x166104c3j4bfj1";
   };
 
   buildInputs = [ jre makeWrapper ] ;