Author: cillian
Date: Tue May 15 17:57:50 2012
New Revision: 34117
URL: https://nixos.org/websvn/nix/?rev=34117&sc=1
Log:
Upgrading default erlang to R15 and keeping R14 as an older option, removing
extra random older versions. I assume they are not of interest.
Added:
nixpkgs/trunk/pkgs/development/interpreters/erlang/R14B04.nix
- copied unchanged from r34116,
nixpkgs/trunk/pkgs/development/interpreters/erlang/default.nix
Replaced:
nixpkgs/trunk/pkgs/development/interpreters/erlang/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/interpreters/erlang/R11B-5.nix
nixpkgs/trunk/pkgs/development/interpreters/erlang/R13B.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied: nixpkgs/trunk/pkgs/development/interpreters/erlang/R14B04.nix (from
r34116, nixpkgs/trunk/pkgs/development/interpreters/erlang/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/erlang/R14B04.nix Tue May
15 17:57:50 2012 (r34117, copy of r34116,
nixpkgs/trunk/pkgs/development/interpreters/erlang/default.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}";
+}
Added: nixpkgs/trunk/pkgs/development/interpreters/erlang/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/interpreters/erlang/default.nix Tue May
15 17:57:50 2012 (r34117)
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
+
+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 ];
+
+ 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}";
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 15 17:54:05
2012 (r34116)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 15 17:57:50
2012 (r34117)
@@ -2555,7 +2555,7 @@
erlang = callPackage ../development/interpreters/erlang { };
- erlangR13B = callPackage ../development/interpreters/erlang/R13B.nix { };
+ erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { };
groovy = callPackage ../development/interpreters/groovy { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
