diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-19 16:59:42 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-19 16:59:42 +0200 |
| commit | 0b12d44c06dccbfedaae89cb00f782d7c89fc814 (patch) | |
| tree | 914258a15b689afcd266bd9fdb7225911daa3f0c /pkgs/development/compilers | |
| parent | 105abdd52cfb3795a867ab5d80f314950b86eadd (diff) | |
| parent | 6ff8b675e0c2730e54f95d232a93e5b01813f389 (diff) | |
| download | nixlib-0b12d44c06dccbfedaae89cb00f782d7c89fc814.tar nixlib-0b12d44c06dccbfedaae89cb00f782d7c89fc814.tar.gz nixlib-0b12d44c06dccbfedaae89cb00f782d7c89fc814.tar.bz2 nixlib-0b12d44c06dccbfedaae89cb00f782d7c89fc814.tar.lz nixlib-0b12d44c06dccbfedaae89cb00f782d7c89fc814.tar.xz nixlib-0b12d44c06dccbfedaae89cb00f782d7c89fc814.tar.zst nixlib-0b12d44c06dccbfedaae89cb00f782d7c89fc814.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/scala/2.12.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/scala/2.13.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index 0e4207dccac6..9e11daced4a9 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.9"; + name = "scala-2.12.10"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy"; + sha256 = "0sk5n3ir5zkgr8jayq5pn4l87ia5zmjr2zzwchgxkv8g62ivs4iv"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix index ab27d93a7cf9..6bba11af9d46 100644 --- a/pkgs/development/compilers/scala/2.13.nix +++ b/pkgs/development/compilers/scala/2.13.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.13.0"; + name = "scala-2.13.1"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p"; + sha256 = "1nq49acx3j6vnw0lhyrfqa23f671y3kc9lja4nki0j73jk2cq639"; }; propagatedBuildInputs = [ jre ] ; |