From 4fbd441418a260df7631f9375ee2cc034f5cea51 Mon Sep 17 00:00:00 2001 From: Malcolm Date: Sun, 11 Nov 2012 16:34:10 +0100 Subject: [PATCH] Adding Erlang R15B02 --- .../interpreters/erlang/R15B01.nix | 28 +++++++++++++++++++ .../interpreters/erlang/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/erlang/R15B01.nix diff --git a/pkgs/development/interpreters/erlang/R15B01.nix b/pkgs/development/interpreters/erlang/R15B01.nix new file mode 100644 index 00000000000..18cfeca6329 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R15B01.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl +, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: + +assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; + +let version = "R15B01"; in + +stdenv.mkDerivation { + name = "erlang-" + version; + + src = fetchurl { + url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; + sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr"; + }; + + buildInputs = + [ perl gnum4 ncurses openssl + ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; + + preConfigure = '' + export HOME=$PWD/../ + sed -e s@/bin/pwd@pwd@g -i otp_build + ''; + + configureFlags = "--with-ssl=${openssl}"; +} diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index 18cfeca6329..50d818e1bb1 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -3,14 +3,14 @@ assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; -let version = "R15B01"; in +let version = "R15B02"; in stdenv.mkDerivation { name = "erlang-" + version; src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; - sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr"; + sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158"; }; buildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ba94454475..cb21994df6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2739,6 +2739,8 @@ let erlang = callPackage ../development/interpreters/erlang { }; + erlangR15B01 = callPackage ../development/interpreters/erlang/R15B01.nix { }; + erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; groovy = callPackage ../development/interpreters/groovy { };