about summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorMalcolm <mmatalka@gmail.com>2012-11-11 16:34:10 +0100
committerPeter Simons <simons@cryp.to>2012-11-11 20:38:53 +0100
commit4fbd441418a260df7631f9375ee2cc034f5cea51 (patch)
treecf7c9ce70e8ac2471c6f8171c2554c50d365e749 /pkgs/development/interpreters
parent0757af169304b4987754acb7e8589d8fbf1338e1 (diff)
downloadnixlib-4fbd441418a260df7631f9375ee2cc034f5cea51.tar
nixlib-4fbd441418a260df7631f9375ee2cc034f5cea51.tar.gz
nixlib-4fbd441418a260df7631f9375ee2cc034f5cea51.tar.bz2
nixlib-4fbd441418a260df7631f9375ee2cc034f5cea51.tar.lz
nixlib-4fbd441418a260df7631f9375ee2cc034f5cea51.tar.xz
nixlib-4fbd441418a260df7631f9375ee2cc034f5cea51.tar.zst
nixlib-4fbd441418a260df7631f9375ee2cc034f5cea51.zip
Adding Erlang R15B02
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/erlang/R15B01.nix28
-rw-r--r--pkgs/development/interpreters/erlang/default.nix4
2 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/erlang/R15B01.nix b/pkgs/development/interpreters/erlang/R15B01.nix
new file mode 100644
index 000000000000..18cfeca63294
--- /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 18cfeca63294..50d818e1bb1a 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 =