public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32443 from andir/erlang-cve-2017-1000385 

Erlang CVE-2017-1000385 erlangR{18,19,20}
This commit is contained in:
Daiderd Jordan 2017-12-08 12:57:58 +01:00 committed by GitHub
parent 695027f61c 2b72043079
commit 5bc910a6ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/erlang/R18.nix
View File

@ -12,8 +12,8 @@ let
}; };
in mkDerivation rec { in mkDerivation rec {
version = "18.3.4.4"; version = "18.3.4.7";
sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l";
patches = [ patches = [
rmAndPwdPatch rmAndPwdPatch

4
pkgs/development/interpreters/erlang/R19.nix
View File

@ -1,8 +1,8 @@
{ mkDerivation, fetchurl, fetchpatch }: { mkDerivation, fetchurl, fetchpatch }:
mkDerivation rec { mkDerivation rec {
version = "19.3"; version = "19.3.6.4";
sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071";
patches = [ patches = [
# macOS 10.13 crypto fix from OTP-20.1.2 # macOS 10.13 crypto fix from OTP-20.1.2

4
pkgs/development/interpreters/erlang/R20.nix
View File

@ -1,8 +1,8 @@
{ mkDerivation, fetchurl }: { mkDerivation, fetchurl }:
mkDerivation rec { mkDerivation rec {
version = "20.1"; version = "20.1.7";
sha256 = "13f53lzgq2himg9kax41f66rzv5pjfrb1ln8b54yv9spkqx2hqqi"; sha256 = "0sbxl10d76bm7awxb9s07l9815jiwfg78bps07xj2ircxdr08pls";
prePatch = '' prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'

3
pkgs/top-level/beam-packages.nix
View File

@ -14,8 +14,6 @@ rec {
erlang_nox = erlangR19_nox; erlang_nox = erlangR19_nox;
# These are standard Erlang versions, using the generic builder. # 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 = lib.callErlang ../development/interpreters/erlang/R17.nix {};
erlangR17_odbc = erlangR17.override { odbcSupport = true; }; erlangR17_odbc = erlangR17.override { odbcSupport = true; };
erlangR17_javac = erlangR17.override { javacSupport = true; }; erlangR17_javac = erlangR17.override { javacSupport = true; };
@ -75,7 +73,6 @@ rec {
# Packages built with default Erlang version. # Packages built with default Erlang version.
erlang = packagesWith interpreters.erlang; erlang = packagesWith interpreters.erlang;
erlangR16 = packagesWith interpreters.erlangR16;
erlangR17 = packagesWith interpreters.erlangR17; erlangR17 = packagesWith interpreters.erlangR17;
erlangR18 = packagesWith interpreters.erlangR18; erlangR18 = packagesWith interpreters.erlangR18;
erlangR19 = packagesWith interpreters.erlangR19; erlangR19 = packagesWith interpreters.erlangR19;