Merge pull request #32443 from andir/erlang-cve-2017-1000385
Erlang CVE-2017-1000385 erlangR{18,19,20}
This commit is contained in:
commit
5bc910a6ef
|
@ -12,8 +12,8 @@ let
|
|||
};
|
||||
|
||||
in mkDerivation rec {
|
||||
version = "18.3.4.4";
|
||||
sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk";
|
||||
version = "18.3.4.7";
|
||||
sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l";
|
||||
|
||||
patches = [
|
||||
rmAndPwdPatch
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ mkDerivation, fetchurl, fetchpatch }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "19.3";
|
||||
sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86";
|
||||
version = "19.3.6.4";
|
||||
sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071";
|
||||
|
||||
patches = [
|
||||
# macOS 10.13 crypto fix from OTP-20.1.2
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ mkDerivation, fetchurl }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "20.1";
|
||||
sha256 = "13f53lzgq2himg9kax41f66rzv5pjfrb1ln8b54yv9spkqx2hqqi";
|
||||
version = "20.1.7";
|
||||
sha256 = "0sbxl10d76bm7awxb9s07l9815jiwfg78bps07xj2ircxdr08pls";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
|
||||
|
|
|
@ -14,8 +14,6 @@ rec {
|
|||
erlang_nox = erlangR19_nox;
|
||||
|
||||
# These are standard Erlang versions, using the generic builder.
|
||||
erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {};
|
||||
erlangR16_odbc = erlangR16.override { odbcSupport = true; };
|
||||
erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {};
|
||||
erlangR17_odbc = erlangR17.override { odbcSupport = true; };
|
||||
erlangR17_javac = erlangR17.override { javacSupport = true; };
|
||||
|
@ -75,7 +73,6 @@ rec {
|
|||
|
||||
# Packages built with default Erlang version.
|
||||
erlang = packagesWith interpreters.erlang;
|
||||
erlangR16 = packagesWith interpreters.erlangR16;
|
||||
erlangR17 = packagesWith interpreters.erlangR17;
|
||||
erlangR18 = packagesWith interpreters.erlangR18;
|
||||
erlangR19 = packagesWith interpreters.erlangR19;
|
||||
|
|
Loading…
Reference in New Issue