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

firefox: Update to 19.0

Browse Source
This commit is contained in:
Eelco Dolstra 2013-02-21 17:45:20 +01:00
parent 085a51f60a
commit 95ca031be9
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/firefox/18.0.nix → pkgs/applications/networking/browsers/firefox/19.0.nix
View File

@ -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
];

3
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@ -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
];

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

@ -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 { };

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

@ -349,7 +349,7 @@ with (import ./release-lib.nix);
};
firefox36Pkgs.firefox = linux;
firefox18Pkgs.firefox = linux;
firefox19Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;