summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPascal Wittmann <PascalWittmann@gmx.net>2014-12-15 00:50:46 +0100
committerPascal Wittmann <PascalWittmann@gmx.net>2014-12-15 00:50:46 +0100
commit934afff8fbc388253fd09a3714b273296c519b73 (patch)
treede69cadd883bb8d141bd9026f933a3913aa2de93 /pkgs
parent8d3aaa2bb7130126ca56936b6db3470790d2a9d9 (diff)
parent1e7f7edd72e9bce32d76c88e0aa26a1a2537c375 (diff)
downloadnixlib-934afff8fbc388253fd09a3714b273296c519b73.tar
nixlib-934afff8fbc388253fd09a3714b273296c519b73.tar.gz
nixlib-934afff8fbc388253fd09a3714b273296c519b73.tar.bz2
nixlib-934afff8fbc388253fd09a3714b273296c519b73.tar.lz
nixlib-934afff8fbc388253fd09a3714b273296c519b73.tar.xz
nixlib-934afff8fbc388253fd09a3714b273296c519b73.tar.zst
nixlib-934afff8fbc388253fd09a3714b273296c519b73.zip
Merge pull request #5306 from sjmackenzie/erlang-bump
Erlang bump from 17.3 to 17.4 as 17.3 has a serious ssl bug
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/erlang/R17.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index a7378e69c3a5..667e513769bd 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}";
-  version = "17.3";
+  version = "17.4";
 
   src = fetchurl {
     url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
-    sha256 = "1r3n7drzgmwcv46n4lzic9ki19psgx1vjgnmjp5g85k06kmh7gnl";
+    sha256 = "0mhzfs64wa00g0bv9hwf0sbl8lgs83jj8cq9c3wg1iksmskfv0hd";
   };
 
   buildInputs =
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   postInstall = let
     manpages = fetchurl {
       url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";
-      sha256 = "1dys0903snk0ppip8hfckfd656pl9z3s4vqqv3yk4i2rn30dmarz";
+      sha256 = "0n4sczblx8mjcck56rpxvyvz186hkzg0c1xjqrnpnz1nkn7dn73c";
     };
   in ''
     ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call