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

4 files changed, 5 insertions, 17 deletions

diff --git a/pkgs/development/interpreters/erlang/R11B-5.nix b/pkgs/development/interpreters/erlang/R11B-5.nix
deleted file mode 100644
index 68cc3b5f2b5..00000000000
--- 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/R14B04.nix
index 05c8e1331ab..b5133bd7f83 100644
--- a/pkgs/development/interpreters/erlang/R13B.nix
+++ b/pkgs/development/interpreters/erlang/R14B04.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
 
-let version = "R13B"; in
+let version = "R14B04"; in
 
 stdenv.mkDerivation {
   name = "erlang-" + version;
   
   src = fetchurl {
     url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
-    sha256 = "112889v9axhrk9x9swcgql5kpj19p14504m06h4n7b99irzxf4rg";
+    sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
   };
   
   buildInputs = [ perl gnum4 ncurses openssl ];
diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix
index b5133bd7f83..0940936e531 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 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce0049c83f0..e0c8cff481c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2555,7 +2555,7 @@ let
 
   erlang = callPackage ../development/interpreters/erlang { };
 
-  erlangR13B = callPackage ../development/interpreters/erlang/R13B.nix { };
+  erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { };
 
   groovy = callPackage ../development/interpreters/groovy { };