types.nix: Add ‘either’ type

(cherry picked from commit f932910323bf7188f70c49789ce85392c36e06b4)
man-pages: Update to 3.70

(cherry picked from commit c37057240fa89339f570043b0ade28fe4517de5a)
linux: Enable ACLs in ext3

http://hydra.nixos.org/build/13462892
(cherry picked from commit e4752d7877e4adcca25ca6228f1d36b58a83e8a5)
Don't barf if /var/log doesn't support ACLs

http://hydra.nixos.org/build/13462892
(cherry picked from commit 7c4591d010ad827f9927ce84b2e1bd2db8762f92)
man-pages: Update to 3.71.

(cherry picked from commit f61fb466eb09c4c7432d29838b752d5285163388)
flashplayer: Update from 11.2.202.359 -> 11.2.202.378

Signed-off-by: Domen Kožar <domen@dev.si>
flashplayer: Update from 11.2.202.378 -> 11.2.202.394

Signed-off-by: Domen Kožar <domen@dev.si>
flashplayer: Update from 11.2.202.394 -> 11.2.202.400

Signed-off-by: Domen Kožar <domen@dev.si>
Bump the amount of memory for the installer test

It randomly OOMs.

http://hydra.nixos.org/build/13587153
(cherry picked from commit 619f18956da87517131ad4429b2c24e16796411d)
linux: Update to 3.12.27

CVE-2014-3534
nspr: Update to 4.10.7

(cherry picked from commit 0dbdc857d75d9dc82dc3d7a37014ef0ae484b0ec)
nss: Update to 3.16.4

(cherry picked from commit b3b06af89a0179e023c69808fd00b36b57d27316)
firefox: Update to 32.0

(cherry picked from commit 88964f37a0f024b71326c3b0c99a2beccabe41d1)
Cache::Cache: Disable tests

(cherry picked from commit aa8a728b047c3955f8bacda1016aeef39de90518)
lttng-modules: Mark as broken

These do not build for any kernel:

  http://hydra.nixos.org/eval/1149989?filter=lttng&compare=1149981

(cherry picked from commit 4b7f1a9be33bcc098d5bf5a9c1f7310d68e6c08d)
/dev/sda1 -> "/dev/sda1"

Otherwise Nix might try to copy /dev/sda1 under certain circumstances
:-)

(cherry picked from commit f6b4214567979247f6dac2b5b6bc92fa89a619db)
Remove reference to icecat

(cherry picked from commit d2539605e1545428c404ddaa73265b30988c044b)
firefox: Workaround for building on i686-linux

http://hydra.nixos.org/build/13992569
(cherry picked from commit 4ead67b785fc666aaebaa3958b034dca28d61f19)
linux: Update to 3.12.28

(cherry picked from commit 19b1fafe5fac5eccb426b8d9854db3ac93a448f7)