about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-07-05 12:47:35 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-07-05 12:47:35 +0000
commit06664135a4588c21375a2e08f4eeda8cfb99e7e2 (patch)
treee3f02bb544661be2ffe03db426924c15040765af /pkgs
parent6c77fda8c1a6ddfb16cf6d31e6d4b9ce1220f842 (diff)
downloadnixlib-06664135a4588c21375a2e08f4eeda8cfb99e7e2.tar
nixlib-06664135a4588c21375a2e08f4eeda8cfb99e7e2.tar.gz
nixlib-06664135a4588c21375a2e08f4eeda8cfb99e7e2.tar.bz2
nixlib-06664135a4588c21375a2e08f4eeda8cfb99e7e2.tar.lz
nixlib-06664135a4588c21375a2e08f4eeda8cfb99e7e2.tar.xz
nixlib-06664135a4588c21375a2e08f4eeda8cfb99e7e2.tar.zst
nixlib-06664135a4588c21375a2e08f4eeda8cfb99e7e2.zip
Ejabberd will use old Erlang for now
svn path=/nixpkgs/trunk/; revision=22477
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ebe466f7e99..d422c8abd4c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2738,6 +2738,10 @@ let
     inherit fetchurl stdenv perl gnum4 ncurses openssl;
   };
 
+  erlangR13B = import ../development/interpreters/erlang/R13B.nix {
+    inherit fetchurl stdenv perl gnum4 ncurses openssl;
+  };
+
   groovy = import ../development/interpreters/groovy {
     inherit stdenv fetchurl unzip;
   };
@@ -5820,7 +5824,8 @@ let
   };
 
   ejabberd = import ../servers/xmpp/ejabberd {
-    inherit fetchurl stdenv expat erlang zlib openssl pam lib;
+    inherit fetchurl stdenv expat zlib openssl pam lib;
+    erlang = erlangR13B ;
   };
 
   couchdb = import ../servers/http/couchdb {