diff options
author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2016-11-17 22:18:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-17 22:18:30 -0500 |
commit | 29356a3ac19a1750c9ea546eafcc6d8f70178756 (patch) | |
tree | e1523a07bb4158b677778360b3bcbdfdcf9fbd75 /pkgs/development/interpreters/erlang | |
parent | 8458d6b72094a9990e9d7a272465bc9f7f65cec0 (diff) | |
parent | 2bcaa93aa7b7005b95f40ca06f19884ea1ba4d28 (diff) | |
download | nixlib-29356a3ac19a1750c9ea546eafcc6d8f70178756.tar nixlib-29356a3ac19a1750c9ea546eafcc6d8f70178756.tar.gz nixlib-29356a3ac19a1750c9ea546eafcc6d8f70178756.tar.bz2 nixlib-29356a3ac19a1750c9ea546eafcc6d8f70178756.tar.lz nixlib-29356a3ac19a1750c9ea546eafcc6d8f70178756.tar.xz nixlib-29356a3ac19a1750c9ea546eafcc6d8f70178756.tar.zst nixlib-29356a3ac19a1750c9ea546eafcc6d8f70178756.zip |
Merge pull request #20457 from DerTim1/erlang
erlang: 18.3.4 -> 18.3.4.4, erlang: 19.1 -> 19.1.6
Diffstat (limited to 'pkgs/development/interpreters/erlang')
-rw-r--r-- | pkgs/development/interpreters/erlang/R18.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R19.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 5d9c5dac3d8e..10e5313ce8bb 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -20,7 +20,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "18.3.4"; + version = "18.3.4.4"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "1f8nhybzsdmjvkmkzpjj3wj9jzx8mihlvi6gfp47fxkalansz39h"; + sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; }; buildInputs = diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index ddeccb29b59d..02a84580850d 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -20,7 +20,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "19.1"; + version = "19.1.6"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "0nnjj069d5pjhgcd8vvqbrkjdac3p1v4s3zb59i4h73vg7f5p736"; + sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y"; }; buildInputs = |