nixpkgs-suyu/pkgs
aszlig 392a4c0a26
Merge branch 'chromium'.
This introduces Chromium 39 as the new stable version along with a bunch
of fixes.

Fixes #2799, particularily the PDF plugin, which now is open source and
thus no longer an issue.

Also fixes #3219 and merges #2906, so we no longer get a crash while
trying to bring up the print preview dialog.

Thanks to @edwtjo for the CUPS version bump.

 * chromium: Switch to use open-source PDF plugin.
 * cups: bump 1.5.4 -> 1.7.5
 * chromium: Allow env vars for passing plugin paths.
 * chromium: Update all channels to latest versions.
 * protobuf: Clean up and update to version 2.6.1.
2014-11-22 04:34:16 +01:00
..
applications Merge branch 'chromium'. 2014-11-22 04:34:16 +01:00
build-support Fix patchelf RPM builds 2014-11-20 13:19:36 +01:00
data Symbola: bump from 7.17 to 7.18 2014-11-18 15:20:26 +01:00
desktops e17.terminology: update from 0.5.1 to 0.7.0 2014-11-17 18:11:03 +00:00
development Merge branch 'chromium'. 2014-11-22 04:34:16 +01:00
games Merge pull request #5046 from abbradar/checksum-fixes 2014-11-19 18:02:09 +01:00
misc Merge branch 'chromium'. 2014-11-22 04:34:16 +01:00
os-specific kernel: 3.12.32 -> 3.12.33 2014-11-21 14:39:15 -08:00
servers solr: bump 2014-11-21 15:10:59 -05:00
shells
stdenv Merge branch 'master' into staging 2014-11-14 14:28:23 +01:00
test
tools network-manager: patch for libnl-3.2.25 2014-11-21 21:15:18 -06:00
top-level Merge branch 'chromium'. 2014-11-22 04:34:16 +01:00