From 2d24ee89dacbab42e5a6683c616eccd10a6a9a9b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 5 May 2009 15:46:24 +0000
Subject: [PATCH] All-packages.nix: update firefox beta, erlang

svn path=/nixpkgs/trunk/; revision=15453
---
 pkgs/top-level/all-packages.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfae49a5bec1..3455865024d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2073,7 +2073,7 @@ let
       libXpm libXext xextproto;
   };
 
-  erlang = selectVersion ../development/interpreters/erlang "R12B-1" {
+  erlang = import ../development/interpreters/erlang {
     inherit fetchurl stdenv perl gnum4 ncurses openssl;
   };
 
@@ -6065,6 +6065,27 @@ let
     #enableOfficialBranding = true;
   });
 
+  firefox3_5 = lowPrio (import ../applications/networking/browsers/firefox-3/3.5.nix {
+    inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo
+      python dbus dbus_glib freetype fontconfig bzip2;
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
+    inherit alsaLib;
+    #enableOfficialBranding = true;
+    xulrunner = xulrunner3_5;
+    autoconf = autoconf213;
+  });
+
+  xulrunner3_5 = lowPrio (import ../applications/networking/browsers/firefox-3/xulrunner-3.5.nix {
+    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
+      python dbus dbus_glib freetype fontconfig bzip2 xlibs file;
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
+    inherit alsaLib;
+    autoconf = autoconf213;
+    #enableOfficialBranding = true;
+  });
+
   firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox-3/binary.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
       python curl coreutils freetype fontconfig;