Author: eelco
Date: Tue Mar 22 14:30:13 2011
New Revision: 26460
URL: https://svn.nixos.org/websvn/nix/?rev=26460&sc=1
Log:
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 22 14:14:50
2011 (r26459)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 22 14:30:13
2011 (r26460)
@@ -5996,12 +5996,14 @@
inherit (gnome) libIDL;
};
+ firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
+
firefox40Pkgs = callPackage
../applications/networking/browsers/firefox/4.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
- firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
+ firefox40Wrapper = lowPrio (wrapFirefox firefox40Pkgs.firefox "firefox" "");
flac = callPackage ../applications/audio/flac { };
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix Tue Mar 22 14:14:50 2011
(r26459)
+++ nixpkgs/trunk/pkgs/top-level/release.nix Tue Mar 22 14:30:13 2011
(r26460)
@@ -380,9 +380,8 @@
jdee = linux;
};
- firefox36Pkgs = {
- firefox = linux;
- };
+ firefox36Pkgs.firefox = linux;
+ firefox40Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
