Author: raskin
Date: Thu Jun 16 08:08:10 2011
New Revision: 27478
URL: https://svn.nixos.org/websvn/nix/?rev=27478&sc=1

Log:
Adding Firefox 5.0 RC1

Added:
   nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix
      - copied, changed from r27469, 
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Copied and modified: 
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix (from 
r27469, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Wed Jun 
15 12:04:31 2011        (r27469, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix Thu Jun 
16 08:08:10 2011        (r27478)
@@ -15,14 +15,16 @@
 
 rec {
 
-  firefoxVersion = "4.0.1";
+  firefoxVersion = "5.0";
   
-  xulVersion = "2.0.1"; # this attribute is used by other packages
+  xulVersion = "5.0"; # this attribute is used by other packages
+
+  versionSuffix = "-rc1";
 
   
   src = fetchurl {
-    url = 
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
-    sha1 = "c89bc5106266aa0097a7be15be84555bd2649f03";
+    url = 
"http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/5.0-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";;
+    sha256 = "0i6zxvhvf717bzz3mwlbvrk601k81r38fym0fv2nlvr9r207vybb";
   };
 
   
@@ -50,7 +52,7 @@
 
 
   xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
+    name = "xulrunner-${xulVersion}${versionSuffix}";
     
     inherit src;
 
@@ -119,7 +121,7 @@
 
 
   firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
+    name = "firefox-${firefoxVersion}${versionSuffix}";
 
     inherit src;
 

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Thu Jun 16 05:55:47 
2011        (r27477)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Thu Jun 16 08:08:10 
2011        (r27478)
@@ -6225,6 +6225,13 @@
 
   firefox40Wrapper = wrapFirefox firefox40Pkgs.firefox "firefox" "";
 
+  firefox50Pkgs = callPackage 
../applications/networking/browsers/firefox/5.0.nix {
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
+  };
+
+  firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" "";
+
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = flashplayer10;
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to