public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Firefox 12.0.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33931
This commit is contained in:
Eelco Dolstra 2012-04-26 13:25:20 +00:00
parent fbd90d2103
commit 48b2a26898
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/browsers/firefox/9.0.nix → pkgs/applications/networking/browsers/firefox/12.0.nix
View File

@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec { rec {
firefoxVersion = "9.0.1"; firefoxVersion = "12.0";
xulVersion = "9.0.1"; # this attribute is used by other packages xulVersion = "12.0"; # this attribute is used by other packages
src = fetchurl { src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "e0748d86753eead5c0929d74158c601bf33b5db0"; sha1 = "0177185e54b7d63dc36bd5bd5c80ba6afd52e199";
}; };
commonConfigureFlags = commonConfigureFlags =
@ -35,7 +35,7 @@ rec {
"--with-system-nspr" "--with-system-nspr"
# "--with-system-nss" # "--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
"--enable-system-cairo" # "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite" "--enable-system-sqlite"
"--disable-crashreporter" "--disable-crashreporter"
"--disable-tests" "--disable-tests"
@ -139,7 +139,7 @@ rec {
[ "--enable-application=browser" [ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar" "--enable-chrome-format=jar"
"--disable-elf-hack" "--disable-elf-hack"
] ]
++ commonConfigureFlags ++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
@ -170,6 +170,7 @@ rec {
meta = { meta = {
description = "Mozilla Firefox - the browser, reloaded"; description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/; homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = [ stdenv.lib.maintainers.eelco ];
}; };
passthru = { passthru = {

12
pkgs/top-level/all-packages.nix
View File

@ -6752,12 +6752,6 @@ let
firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
firefox9Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
inherit (gnome) libIDL;
};
firefox9Wrapper = wrapFirefox { browser = firefox9Pkgs.firefox; };
firefox10Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix { firefox10Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
@ -6770,6 +6764,12 @@ let
firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; }; firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; };
firefox12Pkgs = callPackage ../applications/networking/browsers/firefox/12.0.nix {
inherit (gnome) libIDL;
};
firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; };
flac = callPackage ../applications/audio/flac { }; flac = callPackage ../applications/audio/flac { };
flashplayer = flashplayer11; flashplayer = flashplayer11;

1
pkgs/top-level/release.nix
View File

@ -362,6 +362,7 @@ with (import ./release-lib.nix);
firefox36Pkgs.firefox = linux; firefox36Pkgs.firefox = linux;
firefox10Pkgs.firefox = linux; firefox10Pkgs.firefox = linux;
firefox11Pkgs.firefox = linux; firefox11Pkgs.firefox = linux;
firefox12Pkgs.firefox = linux;
gnome = { gnome = {
gnome_panel = linux; gnome_panel = linux;