From e9548cc845f8c13201c9a03e9b25ae5a8abe38b1 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Tue, 15 May 2012 17:57:50 +0000
Subject: Upgrading default erlang to R15 and keeping R14 as an older option,
 removing extra random older versions. I assume they are not of interest.

svn path=/nixpkgs/trunk/; revision=34117
---
 pkgs/development/interpreters/erlang/R11B-5.nix  | 12 ------------
 pkgs/development/interpreters/erlang/R13B.nix    | 23 -----------------------
 pkgs/development/interpreters/erlang/R14B04.nix  | 23 +++++++++++++++++++++++
 pkgs/development/interpreters/erlang/default.nix |  4 ++--
 4 files changed, 25 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/interpreters/erlang/R11B-5.nix
 delete mode 100644 pkgs/development/interpreters/erlang/R13B.nix
 create mode 100644 pkgs/development/interpreters/erlang/R14B04.nix

(limited to 'pkgs/development/interpreters')

diff --git a/pkgs/development/interpreters/erlang/R11B-5.nix b/pkgs/development/interpreters/erlang/R11B-5.nix
deleted file mode 100644
index 68cc3b5f2b5d..000000000000
--- a/pkgs/development/interpreters/erlang/R11B-5.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "erlang-" + version;
-  src = fetchurl {
-    url = http://www.erlang.org/download/otp_src_R11B-5.tar.gz;
-    md5 = "96acec41da87d6ee0ef18e1aab36ffdd";
-  };
-  buildInputs = [perl gnum4 ncurses openssl];
-  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
-  configureFlags = "--with-ssl=${openssl}";
-}
diff --git a/pkgs/development/interpreters/erlang/R13B.nix b/pkgs/development/interpreters/erlang/R13B.nix
deleted file mode 100644
index 05c8e1331abf..000000000000
--- a/pkgs/development/interpreters/erlang/R13B.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
-
-let version = "R13B"; in
-
-stdenv.mkDerivation {
-  name = "erlang-" + version;
-  
-  src = fetchurl {
-    url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
-    sha256 = "112889v9axhrk9x9swcgql5kpj19p14504m06h4n7b99irzxf4rg";
-  };
-  
-  buildInputs = [ perl gnum4 ncurses openssl ];
-  
-  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/R14B04.nix b/pkgs/development/interpreters/erlang/R14B04.nix
new file mode 100644
index 000000000000..b5133bd7f83c
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R14B04.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
+
+let version = "R14B04"; in
+
+stdenv.mkDerivation {
+  name = "erlang-" + version;
+  
+  src = fetchurl {
+    url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
+    sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
+  };
+  
+  buildInputs = [ perl gnum4 ncurses openssl ];
+  
+  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 b5133bd7f83c..0940936e531c 100644
--- a/pkgs/development/interpreters/erlang/default.nix
+++ b/pkgs/development/interpreters/erlang/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
 
-let version = "R14B04"; in
+let version = "R15B01"; in
 
 stdenv.mkDerivation {
   name = "erlang-" + version;
   
   src = fetchurl {
     url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
-    sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
+    sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr";
   };
   
   buildInputs = [ perl gnum4 ncurses openssl ];
-- 
cgit 1.4.1