1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

465 commits

Author SHA1 Message Date
Nikolay Amiantov 5445e521b6 firefox: restore gstreamer support for older firefox releases 2016-05-19 00:28:49 +03:00
Franz Pletz 2007e9b140
firefox: reenable libvpx as 1.5 is now available 2016-05-17 01:05:46 +02:00
Nikolay Amiantov e81c6c7768 firefox: upstream moved to ffmpeg from gstreamer
Sadly, they don't support using system library yet (or I was unattentive).
2016-05-15 01:06:39 +03:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Eelco Dolstra cb37ab146b Add mirror://mozilla scheme 2016-05-09 19:37:22 +02:00
Eelco Dolstra de22402f85 firefox-esr: 45.0.2 -> 45.1.1 2016-05-09 15:28:13 +02:00
Eelco Dolstra 02d01dc7c5 firefox: 46.0 -> 46.0.1 2016-05-09 15:27:06 +02:00
Wei Tang 4d15758984 firefox: Fix build due to commit #ab0a0c 2016-05-08 05:58:02 +02:00
Nikolay Amiantov 3a52c5fa7d firefox: fix library path
Fixes #15126
2016-05-01 12:26:39 +03:00
Eelco Dolstra 930d243ea4 firefox: 45.0.2 -> 46.0
Still using GTK+ 2 for now, since apparently building with GTK+ 3
still requires GTK+ 2, increasing the closure size. (#15008)
2016-04-28 13:39:12 +02:00
Arseniy Seroka f6d7cefa7b
esteidfirefoxplugin: init at 3.12.1.1142 2016-04-27 11:38:09 +03:00
Eelco Dolstra 18a6403c59 firefox-esr: 45.0.1esr -> 45.0.2esr
Also, switch to upstream SHA-512 hashes.
2016-04-13 14:11:18 +02:00
Franz Pletz 84edf81d71 firefox: 45.0.1 -> 45.0.2 2016-04-12 15:48:13 +02:00
Eelco Dolstra 2f0195003e firefox-esr: Fix name
The Firefox wrapped called itself "firefox" rather than "firefox-esr".

Also eliminate a use of splitString which is evil and should never be
used.
2016-04-01 13:51:24 +02:00
Vladimír Čunát ec4685cf70 firefox-esr: fix build after 574a6d34d2
We're now using only newer versions that have ./configure in the root.
${pname} isn't the correct directory name for esr versions.
2016-03-26 09:13:58 +01:00
Eelco Dolstra 574a6d34d2 firefox-esr: 38.6.1 -> 45.0.1 2016-03-25 15:03:31 +01:00
Eelco Dolstra 79d6dc91fe firefox: 45.0 -> 45.0.1 2016-03-25 15:00:50 +01:00
Vladimír Čunát 9be0c7d463 firefox: disable optimization hack (i686-linux)
It seems to build fine even without it, so the original reason doesn't
hold anymore:
https://github.com/NixOS/nixpkgs/commit/f4b5671b0d9e8904a4ad6b3fd85268
2016-03-16 10:05:09 +01:00
Eelco Dolstra 0d6d91739f firefox: 44.0.2 -> 45.0 2016-03-11 15:10:05 +01:00
Franz Pletz 657c56678c firefox-esr: 38.5.2esr -> 38.6.1esr 2016-02-12 08:02:31 +01:00
Franz Pletz 70925f0a92 firefox: 44.0 -> 44.0.2 2016-02-12 08:02:24 +01:00
Vladimír Čunát 177464ade9 wrapFirefox: add enableAdobeReader
So far we only have 32-bit package.
It will be silently missed on 64-bit ATM.
2016-02-09 18:21:40 +01:00
Franz Pletz 1026673f37 firefox: 43.0.4 -> 44.0 2016-02-01 18:10:47 +01:00
Vladimír Čunát c29df5f8a7 firefox: fixup ${name} problems introduced in 2e78e19
Fixes #12403. I'm sorry for the problems. Thanks to @mdorman!
2016-01-15 13:32:36 +01:00
Vladimír Čunát 2e78e19de0 firefox: put "unwrapped" into its name
I'm not certain about this, so I'm trying for firefox only.
Rationale: it might be confusing to see two firefox-${version} instances
in logs or paths, so I wanted to differentiate them.
2016-01-15 08:36:22 +01:00
Vladimír Čunát a8f1d40c1f all-packages: browserWrapper -> browser
- I chose to keep `browser-unwrapped` attributes so that it's much
  easier to override parameters for the browser (through `packageOverrides`).
- Aliases `browserWrapper` are retained for now, as usual.
2016-01-15 08:36:08 +01:00
Vladimír Čunát 95c1429e62 wrapFirefox: move out of all-packages.nix, change defaults
- I don't think that amount of code belonged into all-packages.nix.
- Now the default name of the wrapped package is identical
  with the command that runs the browser.
- Other defaults were changed according to how the wrapper is
  (almost always) used.
- `meta` is improved: mostly inherited with priority above
  the unwrapped package.
2016-01-10 15:08:00 +01:00
Eelco Dolstra 094723f0bc firefox: 43.0.3 -> 43.0.4 2016-01-07 16:14:51 +01:00
Eelco Dolstra bab578f961 firefox-esr: 38.5.0 -> 38.5.2 2016-01-05 12:29:31 +01:00
Eelco Dolstra 9bce31e9b6 firefox: 43.0 -> 43.0.3 2016-01-05 12:29:31 +01:00
Eelco Dolstra 7651680615 firefox: 42.0 -> 43.0 2015-12-16 17:24:58 +01:00
Eelco Dolstra d8d04c8cf3 firefox-esr: 38.4.0 -> 38.5.0 2015-12-16 16:03:39 +01:00
William A. Kennington III 588a950df9 firefox: Updates
- 41.0.2 -> 42.0
  - 38.3.0 -> 38.4.0
2015-11-04 00:58:28 -08:00
Michael Raskin fe6226af8a firefox: 41.0.1 -> 41.0.2 2015-10-16 19:28:34 +03:00
Eelco Dolstra 25bb1e10f3 firefox: Update to 41.0.1 2015-10-01 13:51:24 +02:00
aszlig 592f0f7ead
firefox: Drop crash_OTMC+GTK3.patch.
The patch only applies for Firefox versions between 37.0 and 40.1.

Because we're on version 41.0 the changes are already included upstream
and thus the patch doesn't apply and is even unnecessary.

As for version 38.3 for ESR, the patch doesn't apply as well if compiled
with enableGTK3. Of course, this is a bit unfortunate but I don't have
the time right now to properly rebase the patch on 38.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
2015-09-25 13:42:02 +02:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Eelco Dolstra f46fe7b909 firefox: Update to 41.0 2015-09-22 20:28:21 +02:00
Eelco Dolstra 4bcbfb33f8 firefox-esr: Update to 38.3.0esr 2015-09-22 20:28:21 +02:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Eelco Dolstra a536eda82e Add firefox-esr 2015-09-03 11:15:53 +02:00
Vladimír Čunát f2d25c5a4d firefox-gtk3: fix crashes by a Fedora-backported patch
These might be the same crashes as with gtk2 and system cairo #9368.
2015-09-01 21:34:17 +02:00
Vladimír Čunát f65b692a07 firefox: fix argv0 with enableGTK3 (/cc #9562)
Also add a simple test detecting such problems.
2015-09-01 21:34:16 +02:00
Thomas Tuegel 875f660481 wrapFirefox: remove (broken) sed trick
This sed trick to set argv[0] is made obsolete by c234f37, which sets
argv[0] correctly anyway.
2015-08-30 08:33:44 -05:00
Eelco Dolstra 0619a23236 firefox: Update to 40.0.3 2015-08-28 11:26:44 +02:00
Eelco Dolstra 320f963e16 firefox: Build with internal cairo
This might fix the recent segfaults, according to
https://bugzilla.redhat.com/show_bug.cgi?id=1253086.

Fixes #9368.
2015-08-27 11:18:39 +02:00
Nikolay Amiantov 8f59f4c78c firefox: build with pulseaudio support (close #8087) 2015-08-19 20:08:54 +02:00
William A. Kennington III 54dee45402 Revert "firefoxWrapper: switch to GStreamer 1.0"
This reverts commit 69269bebeb.
2015-08-19 00:39:16 -07:00
William A. Kennington III 5711761622 firefox: Revert gstreamer-1.0 changes
This causes firefox to sometimes crash and hang when playing videos.
2015-08-19 00:39:14 -07:00
kmicu 69269bebeb
firefoxWrapper: switch to GStreamer 1.0
wkennington@f6c1004 switched Firefox to GStreamer 1.0 by changing its
buildInput *only*, but that is not enough. We need to fix Firefox
wrappers by changing their buildInputs and set GST_PLUGIN_SYSTEM_PATH_1_0
instead of GST_PLUGIN_SYSTEM_PATH.

With above changes playing H.264/MP4 media works in firefoxWrapper and
conkerorWrapper as tested with
http://www.quirksmode.org/html5/tests/video.html and
https://soundcloud.com/immclovin33/synthetix-sundays-53-with-marko-maric-19715

It should help with peti#9247

Reviewed-by: kmicu <kmicu@protonmail.ch>
Tested-by: kmicu <kmicu@protonmail.ch>
2015-08-17 10:48:26 +02:00
William A. Kennington III 435c5d2c42 firefox: 40.0 -> 40.0.2 2015-08-14 13:58:36 -07:00
William A. Kennington III 30f1d5b3cf firefox: 39.0.3 -> 40.0 2015-08-11 11:26:46 -07:00
James Cook 9f79830345 firefox: 39.0 -> 39.0.3 2015-08-06 21:21:07 -07:00
William A. Kennington III f6c1004b2a firefox: Use more system libraries
Use system libpng with apng support.
Use the system icu which works fine in newer firefox builds.
Use jemalloc to speed up memory allocations and reduce fragmentation.
2015-08-05 23:26:34 -07:00
Michael Raskin 62da31931c Firefox: update 38.0.6 -> 39.0 2015-07-05 00:32:54 +03:00
William A. Kennington III c5b17670e1 firefox: 38.0.5 -> 38.0.6 2015-06-24 23:04:29 -07:00
Vladimír Čunát ddeb2f5cce firefox: fix file-dialogs and icons with gtk3
There was the usual crashing and a few icons missing.
@lethalman: I think it's best to start putting $XDG_ICON_DIRS into suffix
instead of prefix (as here), so user-installed icons take precedence.

/cc #7743.
2015-06-18 14:48:41 +02:00
Kirill Elagin e5b56cdfff firefox: add option to build with GTK3 (close #7743) 2015-06-11 21:15:48 +02:00
Eelco Dolstra 4564a0e5e2 firefox: Update to 38.0.5 2015-06-03 11:35:06 +02:00
Thomas Tuegel 04622fe3ba firefoxWrapper: fix typo
Accidentally tried to hardlink a directory! Should have been `ln -s` all
along. Affects non-Firefox browsers that use firefoxWrapper.
2015-05-18 08:53:51 -05:00
Thomas Tuegel 6803ddbf60 firefoxWrapper: install icon to hicolor theme 2015-05-17 20:20:24 -05:00
Thomas Tuegel 9474fefe28 firefoxWrapper: unquote shell glob 2015-05-17 20:20:24 -05:00
William A. Kennington III 0700e844e2 firefox: 38.0 -> 38.0.1 2015-05-15 18:38:13 -07:00
William A. Kennington III 8ffc461f91 firefox: 37.0.2 -> 38.0 2015-05-13 14:50:57 -07:00
Eelco Dolstra 9f3370a9c9 firefox: Update to 37.0.2 2015-04-21 16:48:46 +02:00
Brayden 1ac6acff90 Fix firefoxWrapper's icon 2015-04-11 15:34:36 -07:00
Michael Raskin 4b0e70f89a Update Firefox to 37.0.1 2015-04-04 13:11:40 +03:00
Eelco Dolstra 4c8f0e8d1c firefox: Update to 37.0 2015-04-01 14:04:19 +02:00
Marcin Falkiewicz 6a6470b793 change icon name to var 2015-03-22 15:22:52 -05:00
Marcin Falkiewicz bacf3be4fc change firefox's hardcoded paths to variables 2015-03-22 15:22:52 -05:00
Marcin Falkiewicz cea1f1b770 remove x-scheme-handler/mailto from .desktop file; change icon to follow xdg scheme 2015-03-22 15:22:52 -05:00
Michael Raskin 166614ee41 Update Firefox. Second take. 2015-03-22 13:22:41 +03:00
Ricardo M. Correia a246b849eb firefox: Update from 36.0.1 -> 36.0.3 2015-03-21 06:49:17 +01:00
Ricardo M. Correia 02b91f93c4 firefox: Update from 36.0 -> 36.0.1 2015-03-06 05:13:58 +01:00
Ricardo M. Correia 1e4287645c firefox: Fix hash 2015-02-26 19:02:34 +01:00
Eelco Dolstra 8196962097 firefox: Update to 36.0 2015-02-24 18:50:15 +01:00
Ricardo M. Correia 934ea63e8f firefox: Update from 35.0 -> 35.0.1 2015-01-27 04:39:45 +01:00
Thomas Tuegel 3c15d2aa0d firefox: set mime-type in desktop entry 2015-01-25 14:43:42 -06:00
Vladimír Čunát 1072635cf0 firefox: major bump 34.0.5 -> 35.0 2015-01-13 19:58:11 +01:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Michael Raskin 2c85888a04 Fix Firefox wrapper set-as-default functionality 2014-12-12 22:03:06 +03:00
Benno Fünfstück e177e90b9b firefox-wrapper: use gstreamer hook 2014-12-05 20:14:50 +01:00
Benno Fünfstück effaa51680 firefox-wrapper: add missing gstreamer plugins
These GStreamer plugins are required for H264 <video> tag support in Firefox.
2014-12-05 14:22:51 +01:00
Eelco Dolstra d6c3b564c4 firefox: Update to 34.0.5 2014-12-02 23:15:32 +01:00
Ricardo M. Correia d4b4bae307 Update my maintainership 2014-11-29 02:15:39 +01:00
Eelco Dolstra c4364d5914 firefox: Update to 33.1.1 2014-11-18 09:56:41 +01:00
Eelco Dolstra 19e5c3c306 firefox-13.0: Remove
It's outdated, insecure and not used anywhere in Nixpkgs.
2014-11-11 15:37:58 +01:00
Vladimír Čunát fb3e83d091 firefox: update to 33.1 2014-11-11 07:46:26 +01:00
Michael Raskin 0934ddf3e0 Update firefox source build, too 2014-11-07 21:42:45 +03:00
Michael Raskin ed6babd391 Update firefox 2014-11-03 16:54:38 +03:00
Eelco Dolstra 240665d906 firefox: Update to 33.0.1 2014-10-27 10:31:22 +01:00
Eelco Dolstra f4b5671b0d firefox: Fix build on 32-bit by using the gold linker 2014-10-21 18:07:25 +02:00
Domen Kožar dd9ebf6eea firefox: use -O3 on 32bit linux to reduce memory usage on linker 2014-10-16 11:12:26 +02:00
Eelco Dolstra fc964fa924 firefox: Update to 33.0 2014-10-14 22:53:56 +02:00
Ricardo M. Correia 14fe149856 firefox: Fix running firefox under grsec kernels 2014-10-03 01:04:37 +02:00
Eelco Dolstra d265c213b4 firefox: Update to 32.0.3
CVE-2014-1568
2014-09-25 11:40:34 +02:00
James Cook 27f3301650 firefox: Update to 32.0.2. 2014-09-23 08:19:47 +01:00
Eelco Dolstra 0c152324d2 firefox: Update to 32.0.1 2014-09-15 20:08:26 +02:00
Eelco Dolstra 4ead67b785 firefox: Workaround for building on i686-linux
http://hydra.nixos.org/build/13992569
2014-09-07 00:47:17 +02:00
Thomas Tuegel ad83a961ae zotero: update to 4.0.22
Drop firefox-30.0, which we were only keeping around for
xulrunner-30.0. New Zotero version is compatible up to firefox-32.0.
2014-09-04 11:52:24 -05:00
Eelco Dolstra 88964f37a0 firefox: Update to 32.0 2014-09-03 22:51:55 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Thomas Tuegel cab7fd67ce firefox: bring back version 30.0 for zotero 2014-08-04 13:43:58 -05:00
Eelco Dolstra 5c5f115603 firefox: Build without xulrunner
Fixes #2950.
2014-07-23 17:28:36 +02:00
Eelco Dolstra 21c7ed54e3 firefox: Update to 31.0
Also boldly re-enable parallel building.
2014-07-23 17:28:36 +02:00
Eelco Dolstra 97ced6f718 firefox-3.6: Remove
This version is ancient.
2014-07-23 12:56:53 +02:00
Vladimír Čunát 9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
James Cook 2fec892959 firefox: bump to 30.0. 2014-06-11 11:02:28 -07:00
Vladimír Čunát 872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Eelco Dolstra 8b89cba9c6 firefox: Update to 29.0.1 2014-05-19 16:04:46 +02:00
Ricardo M. Correia ca0eb9818f firefox: Add support for grsecurity 2014-05-15 13:25:47 +02:00
Eelco Dolstra 1235f693ee firefox: Update to 29.0 2014-04-29 18:46:06 +02:00
Eelco Dolstra a96b1eb745 firefox: Update to 28.0 2014-04-22 14:45:27 +02:00
Ricardo M. Correia 17b473449b Add myself as maintainer of pkgs I wish to keep up-to-date 2014-03-14 21:22:09 +01:00
Eelco Dolstra 203f4d6ec8 firefoxWrapper: Fix the name 2014-03-10 15:25:47 +01:00
Ricardo M. Correia 92794f775a firefox: Fix hash 2014-02-21 21:23:56 +01:00
Ricardo M. Correia 2a462ff6ae firefox: Update from 27.0 -> 27.0.1 2014-02-21 21:07:59 +01:00
Vladimír Čunát efa7adcca1 xulrunner: disable parallel builds (until fixed)
cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
2014-02-16 14:24:46 +01:00
Vladimír Čunát 161d029d7d preferLocalBuild: set to true for wrappers and fetchers 2014-02-10 21:04:17 +01:00
Domen Kožar b95b70c7a6 firefox: whitespace change to trigger a rebuild 2014-02-08 23:05:57 +01:00
James Cook d7eb849349 firefox: update to 27.0. 2014-02-06 14:41:54 -08:00
Mathijs Kwik 939a0d3b4a firefox: enable gstreamer for h.264 support in HTML5 video 2013-12-23 15:48:36 +01:00
Mathijs Kwik e9a61d523e firefox: use system icu
- cleanup of debug/optimize flags
2013-12-23 10:25:13 +01:00
James Cook 8ddc7b8db2 firefox: Hack to get it to compile. 2013-12-13 00:11:52 -08:00
James Cook d9f3dab48e Firefox 26.0. (Doesn't build.) 2013-12-12 20:27:07 -08:00
Eelco Dolstra 678bcc6d4d firefox: Update to 25.0.1 2013-11-18 18:04:17 +01:00
Eelco Dolstra 8150f1a362 firefox: Update to 25.0 2013-10-29 23:47:09 +01:00
Eelco Dolstra 3293421dd3 Fix references to pkgs/lib 2013-10-10 13:28:22 +02:00
James Cook b0d4b8bcaa firefox: add an option to build with debugging enabled. 2013-10-05 21:07:42 -07:00
Mathijs Kwik 8e4a53ba95 firefox: enable gstreamer support
This finally brings H.264/MP3/AAC support for HTML5 <video> to linux.
2013-09-18 14:37:39 +02:00
Mathijs Kwik a918a0b366 firefox: use system cairo now upstream properly supports it 2013-09-18 14:37:39 +02:00
Mathijs Kwik 36b503e06a firefox: upgrade to 24.0 2013-09-18 14:37:39 +02:00
Mathijs Kwik 17237cf8e4 firefox: upgrade to 23.0.1 2013-08-31 12:09:17 +02:00
Eelco Dolstra 288811f5e1 firefox: Update to 23.0 2013-08-07 17:12:33 +02:00
Mathijs Kwik d51c01ac8e firefox 22: use system libpng 2013-06-27 21:35:22 +02:00
Eelco Dolstra 94d9f18e47 firefox: Update to 22.0 2013-06-25 20:58:25 +02:00
Eelco Dolstra 9da4ccaf3d firefox: Rename 21.0.nix to default.nix 2013-06-25 20:58:25 +02:00
Eelco Dolstra 1802152e93 Remove Firefox 20.0 2013-06-25 20:58:25 +02:00
Mathijs Kwik 0813e7b748 firefox-21: make "use system cairo" optional, defaulting to false 2013-06-13 10:21:47 +02:00
Vladimír Čunát 6b433019fa libvpx: update
Also set the shared-vpx for firefox, just to be sure.
Firefox, Chromium, and other seem to work fine.
2013-06-11 18:03:48 +02:00
Mathijs Kwik c1bec6fb5b firefox-21: use more system libraries
Conflicts:
	pkgs/applications/networking/browsers/firefox/21.0.nix
2013-06-11 14:05:15 +02:00
Michael Raskin 1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Mathijs Kwik 1fb979b4f5 firefox-21: fix search box not working when built on xulrunner 2013-06-11 09:32:39 +02:00
Mathijs Kwik ad5970b680 firefox-21: fix building with system cairo 2013-06-11 09:32:38 +02:00
Mathijs Kwik 9aa7f55017 firefox: use system jpeg library 2013-06-10 09:04:07 +02:00
Mathijs Kwik 5fb93bd27e firefox: enable the (enabled by default) elf hack
It's supposed to speed things up but had some troubles in the past
that seem to have been fixed
2013-06-10 08:58:54 +02:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Eelco Dolstra ebe6b96698 firefox: Update to 21.0
Only problem was that the chrome resources were not in the right place
(and you only see that by running with the -jsconsole flag).
2013-06-06 13:07:54 +02:00
Eelco Dolstra 34dbf4face Remove Firefox 19 2013-06-06 11:59:05 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00