nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs

Browse Source 
--enable-official-branding to get a browser that calls itself
  "Firefox".  But I'll leave the flag in for the moment.
* Removed Firefox 8.0.

svn path=/nixpkgs/trunk/; revision=31984
This commit is contained in:
Eelco Dolstra 2012-02-02 15:44:22 +00:00
parent bd2c29d553
commit 9d9e33b98d
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/firefox/8.0.nix → pkgs/applications/networking/browsers/firefox/10.0.nix
View File

@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec { rec {
firefoxVersion = "8.0.1"; firefoxVersion = "10.0";
xulVersion = "8.0.1"; # this attribute is used by other packages xulVersion = "10.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 = "0dd207c5cee9d53114c55aa23eeca36b754bc128"; sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c";
}; };
commonConfigureFlags = commonConfigureFlags =
@ -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";

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

@ -6838,13 +6838,6 @@ let
firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; };
firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix { firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
inherit (gtkLibs) gtk pango; inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL; inherit (gnome) libIDL;
@ -6852,6 +6845,13 @@ let
firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; }; firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; };
firefox100Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; };
flac = callPackage ../applications/audio/flac { }; flac = callPackage ../applications/audio/flac { };
flashplayer = flashplayer11; flashplayer = flashplayer11;

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

@ -363,8 +363,8 @@ with (import ./release-lib.nix);
}; };
firefox36Pkgs.firefox = linux; firefox36Pkgs.firefox = linux;
firefox80Pkgs.firefox = linux;
firefox90Pkgs.firefox = linux; firefox90Pkgs.firefox = linux;
firefox100Pkgs.firefox = linux;
gnome = { gnome = {
gnome_panel = linux; gnome_panel = linux;