diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-09-24 00:48:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-24 00:48:38 +0200 |
| commit | 306bfa889ad2dc230e03a6b0cafb390f91f43519 (patch) | |
| tree | dd77004b2533379a1d7ad09737cce11d7be0ee4c /pkgs/development/interpreters | |
| parent | c37e76b4d2ac59139df8956cc2b1ec6921bea11d (diff) | |
| parent | 0a1ae92bb9315cfc69debc31b250a89c83784a43 (diff) | |
| download | nixlib-306bfa889ad2dc230e03a6b0cafb390f91f43519.tar nixlib-306bfa889ad2dc230e03a6b0cafb390f91f43519.tar.gz nixlib-306bfa889ad2dc230e03a6b0cafb390f91f43519.tar.bz2 nixlib-306bfa889ad2dc230e03a6b0cafb390f91f43519.tar.lz nixlib-306bfa889ad2dc230e03a6b0cafb390f91f43519.tar.xz nixlib-306bfa889ad2dc230e03a6b0cafb390f91f43519.tar.zst nixlib-306bfa889ad2dc230e03a6b0cafb390f91f43519.zip | |
Merge pull request #18869 from couchemar/erlang-r19.1
erlang: 19.0.2 -> 19.1
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/R19.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 1cd68221fa70..ddeccb29b59d 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.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 ''; |