From 059af7e759a2e6af724e8f04763a294f3d446322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:44:49 +0200 Subject: [PATCH 1/3] Revert "Firefox 20 reference in release.nix. Fixing." This reverts commit 19dd9dc877150f74be172409132855c190b6d778. --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 32494f64ad2..11102f89155 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -359,7 +359,7 @@ let }; firefox36Pkgs.firefox = linux; - firefox21Pkgs.firefox = linux; + firefox20Pkgs.firefox = linux; gnome = { gnome_panel = linux; From b7e5f363c756d396a2be02bd5b6f4031b1badd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:45:00 +0200 Subject: [PATCH 2/3] Revert "Fixing firefox reference" This reverts commit a17b45686b3f1ad656771848ab5bf3bc3c758e2a. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8493daf2de0..0e3eca2ca95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7192,7 +7192,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox21Pkgs; + firefoxPkgs = pkgs.firefox20Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; From 2e6c1ebf4258dbb012474efb3b73f83ae5922058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:45:10 +0200 Subject: [PATCH 3/3] Revert "firefox update to 21.0" This reverts commit 971337a119d708d78a152f4d918694e7b5a2b7e8. --- .../networking/browsers/firefox/{21.0.nix => 20.0.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/applications/networking/browsers/firefox/{21.0.nix => 20.0.nix} (97%) diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix similarity index 97% rename from pkgs/applications/networking/browsers/firefox/21.0.nix rename to pkgs/applications/networking/browsers/firefox/20.0.nix index 1a23c9d9cf9..1480a300820 100644 --- a/pkgs/applications/networking/browsers/firefox/21.0.nix +++ b/pkgs/applications/networking/browsers/firefox/20.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "21.0"; + firefoxVersion = "20.0"; - xulVersion = "21.0"; # this attribute is used by other packages + xulVersion = "20.0"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha256 = "076rfh82m1b1hw10dzbgg13h63wmnispgyvag4nb20ylnlf0629r"; + sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218"; }; commonConfigureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e3eca2ca95..f87abe9082c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7213,12 +7213,12 @@ let firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; }); - firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix { + firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; - firefox21Wrapper = lowPrio (wrapFirefox { browser = firefox21Pkgs.firefox; }); + firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; }); flac = callPackage ../applications/audio/flac { };