[Nix-dev] Re: [Nix-commits] SVN commit: nix - r28625 - in nixpkgs/trunk/pkgs: applications/networking/browsers/firefox top-level

[shea at shealevy.com]

FYI, this fails to build on my machine (where 5.0 builds fine). Log file
here: http://shealevy.com/xulrunner-6.0.log.txt

> Author: raskin
> Date: Tue Aug 16 21:53:43 2011
> New Revision: 28625
> URL: https://svn.nixos.org/websvn/nix/?rev=28625&sc=1
>
> Log:
> Adding Firefox 6.0. Mozilla says it is seamless upgrade from 5.0, so I am
> trying not to change anything...
>
> Added:
>    nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
>       - copied, changed from r28528,
> nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.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/6.0.nix (from
> r28528,
> nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix)
> ==============================================================================
> ---
> nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix	Fri
> Aug 12 18:43:28 2011	(r28528, copy source)
> +++
> nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix	Tue
> Aug 16 21:53:43 2011	(r28625)
> @@ -15,14 +15,14 @@
>
>  rec {
>
> -  firefoxVersion = "5.0.1";
> +  firefoxVersion = "6.0";
>
> -  xulVersion = "5.0.1"; # this attribute is used by other packages
> +  xulVersion = "6.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";
> -    sha1 = "c93b3513e160d87535a9d61c5e06a6a701e9cd3e";
> +    sha256 = "0ws96gc1mkmilgsikirhmqc6s7m0bcyh58820l08wd82r9abagyc";
>    };
>
>
>
> Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
> ==============================================================================
> --- nixpkgs/trunk/pkgs/top-level/all-packages.nix	Tue Aug 16 21:32:48
> 2011	(r28624)
> +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix	Tue Aug 16 21:53:43
> 2011	(r28625)
> @@ -6474,6 +6474,13 @@
>
>    firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" "";
>
> +  firefox60Pkgs = callPackage
> ../applications/networking/browsers/firefox/6.0.nix {
> +    inherit (gtkLibs) gtk pango;
> +    inherit (gnome) libIDL;
> +  };
> +
> +  firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" "";
> +
>    flac = callPackage ../applications/audio/flac { };
>
>    flashplayer = flashplayer10;
>
> Modified: nixpkgs/trunk/pkgs/top-level/release.nix
> ==============================================================================
> --- nixpkgs/trunk/pkgs/top-level/release.nix	Tue Aug 16 21:32:48
> 2011	(r28624)
> +++ nixpkgs/trunk/pkgs/top-level/release.nix	Tue Aug 16 21:53:43
> 2011	(r28625)
> @@ -387,6 +387,7 @@
>
>    firefox36Pkgs.firefox = linux;
>    firefox50Pkgs.firefox = linux;
> +  firefox60Pkgs.firefox = linux;
>
>    gnome = {
>      gnome_panel = linux;
> _______________________________________________
> nix-commits mailing list
> nix-commits at cs.uu.nl
> http://mail.cs.uu.nl/mailman/listinfo/nix-commits
>