Merge pull request #18869 from couchemar/erlang-r19.1

erlang: 19.0.2 -> 19.1
This commit is contained in:
Daiderd Jordan 2016-09-24 00:48:38 +02:00 committed by GitHub
commit 306bfa889a

View File

@ -20,7 +20,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
+ "${optionalString javacSupport "-javac"}";
version = "19.0.2";
version = "19.1";
# 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 = "1vsykghhzpgmc42jwj48crl11zzzpvrqvh2lk8lxfqbflzflxm6j";
sha256 = "0nnjj069d5pjhgcd8vvqbrkjdac3p1v4s3zb59i4h73vg7f5p736";
};
buildInputs =
@ -42,15 +42,6 @@ stdenv.mkDerivation rec {
debugInfo = enableDebugInfo;
envAndCpPatch = fetchurl {
url = "https://github.com/binarin/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch";
sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f";
};
patches = [
envAndCpPatch
];
preConfigure = ''
./otp_build autoconf
'';