Author: eelco
Date: Thu Apr 26 13:25:20 2012
New Revision: 33931
URL: https://nixos.org/websvn/nix/?rev=33931&sc=1
Log:
* Firefox 12.0.
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/12.0.nix
- copied, changed from r33914,
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix
Deleted:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/9.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/12.0.nix (from
r33914, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix
Wed Apr 25 12:04:10 2012 (r33914, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/12.0.nix
Thu Apr 26 13:25:20 2012 (r33931)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = "11.0";
+ firefoxVersion = "12.0";
- xulVersion = "11.0"; # this attribute is used by other packages
+ xulVersion = "12.0"; # this attribute is used by other packages
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
- md5 = "4b07acf47857aff72776d805409cdd1b";
+ sha1 = "0177185e54b7d63dc36bd5bd5c80ba6afd52e199";
};
commonConfigureFlags =
@@ -35,7 +35,7 @@
"--with-system-nspr"
# "--with-system-nss"
# "--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"
"--disable-crashreporter"
"--disable-tests"
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 26 13:24:58
2012 (r33930)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 26 13:25:20
2012 (r33931)
@@ -6752,12 +6752,6 @@
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 {
inherit (gnome) libIDL;
};
@@ -6770,6 +6764,12 @@
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 { };
flashplayer = flashplayer11;
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix Thu Apr 26 13:24:58 2012
(r33930)
+++ nixpkgs/trunk/pkgs/top-level/release.nix Thu Apr 26 13:25:20 2012
(r33931)
@@ -362,6 +362,7 @@
firefox36Pkgs.firefox = linux;
firefox10Pkgs.firefox = linux;
firefox11Pkgs.firefox = linux;
+ firefox12Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
