about summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-12-21 22:45:40 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-12-21 22:45:40 +0100
commita7d4fb8e1d53ac41bad98903781117db3241f345 (patch)
tree424da03a2478d80d1fa626c03abc365657d306f2 /pkgs/development/interpreters
parent31e5662785cd319959b77b3622ea33aa28c63ba7 (diff)
parentfc99ee5cebec0305d6f2407dc61a090eef60967a (diff)
downloadnixlib-a7d4fb8e1d53ac41bad98903781117db3241f345.tar
nixlib-a7d4fb8e1d53ac41bad98903781117db3241f345.tar.gz
nixlib-a7d4fb8e1d53ac41bad98903781117db3241f345.tar.bz2
nixlib-a7d4fb8e1d53ac41bad98903781117db3241f345.tar.lz
nixlib-a7d4fb8e1d53ac41bad98903781117db3241f345.tar.xz
nixlib-a7d4fb8e1d53ac41bad98903781117db3241f345.tar.zst
nixlib-a7d4fb8e1d53ac41bad98903781117db3241f345.zip
Merge branch 'master' into staging
Hydra: ?compare=1420346
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/elixir/1.5.nix4
-rw-r--r--pkgs/development/interpreters/erlang/R20.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index 469502a3f85e..d32f91275652 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.5.2";
-  sha256 = "0ng7z2gz1c8lkn07fric18b3awcw886s9xb864kmnn2iah5gc65j";
+  version = "1.5.3";
+  sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5";
   minimumOTPVersion = "18";
 }
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 866a38e25759..8e955349f2d7 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,8 +1,8 @@
 { mkDerivation, fetchurl }:
 
 mkDerivation rec {
-  version = "20.1.7";
-  sha256 = "0sbxl10d76bm7awxb9s07l9815jiwfg78bps07xj2ircxdr08pls";
+  version = "20.2.2";
+  sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'