From 95ca031be961fd4d8489bd6c95ca33f6bb66a6a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Feb 2013 17:45:20 +0100
Subject: [PATCH] firefox: Update to 19.0
---
.../browsers/firefox/{18.0.nix => 19.0.nix} | 12 ++++++------
.../mozilla-plugins/flashplayer-11/default.nix | 3 +--
pkgs/top-level/all-packages.nix | 6 +++---
pkgs/top-level/release.nix | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
rename pkgs/applications/networking/browsers/firefox/{18.0.nix => 19.0.nix} (93%)
diff --git a/pkgs/applications/networking/browsers/firefox/18.0.nix b/pkgs/applications/networking/browsers/firefox/19.0.nix
similarity index 93%
rename from pkgs/applications/networking/browsers/firefox/18.0.nix
rename to pkgs/applications/networking/browsers/firefox/19.0.nix
index f9258792a2ec..a46143066c1e 100644
--- a/pkgs/applications/networking/browsers/firefox/18.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/19.0.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, freetype, fontconfig, file, alsaLib, nspr, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
@@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
- firefoxVersion = "18.0.2";
+ firefoxVersion = "19.0";
- xulVersion = "18.0.2"; # this attribute is used by other packages
+ xulVersion = "19.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"
];
- sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b";
+ sha1 = "816d64e8c9432349cd208fd181d210c54f985351";
};
commonConfigureFlags =
@@ -60,7 +60,7 @@ rec {
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
- alsaLib nspr nss libnotify xlibs.pixman yasm mesa
+ alsaLib nspr libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
@@ -125,7 +125,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
- dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
+ dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 47f99a1d555c..202dfe2b02e9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -3,7 +3,6 @@
, zlib
, alsaLib
, curl
-, nss
, nspr
, fontconfig
, freetype
@@ -77,7 +76,7 @@ stdenv.mkDerivation {
};
rpath = stdenv.lib.makeLibraryPath
- [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
+ [ zlib alsaLib curl nspr fontconfig freetype expat libX11
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
libvdpau
];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cafe80758314..311b1ccdf7b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7075,7 +7075,7 @@ let
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
- firefoxPkgs = pkgs.firefox18Pkgs;
+ firefoxPkgs = pkgs.firefox19Pkgs;
firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gnome) libIDL;
@@ -7089,12 +7089,12 @@ let
firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
- firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix {
+ firefox19Pkgs = callPackage ../applications/networking/browsers/firefox/19.0.nix {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
};
- firefox18Wrapper = lowPrio (wrapFirefox { browser = firefox18Pkgs.firefox; });
+ firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; });
flac = callPackage ../applications/audio/flac { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b3b58f43e1b9..9772c3531020 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -349,7 +349,7 @@ with (import ./release-lib.nix);
};
firefox36Pkgs.firefox = linux;
- firefox18Pkgs.firefox = linux;
+ firefox19Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;