This reverts commit 73d9d2d5770dbfc698fa2e92080c5b49a79919e5.

It was pushed here accidentially, I've meant 17.03.

It's a release candidate but it works with new WebKitGTK and we don't build old
one anymore because of vulnerabilities.

(cherry picked from commit 4a6ba21bdd93df0d82b2f41e0dcbf8e6885ebb4e)

(cherry picked from commit e5dcce837a1a59491e1fc2bc6a479c1c51e2dfe0)
Signed-off-by: Domen Kožar <domen@dev.si>

(cherry picked from commit 579f5fd9dd644092dff29638e7d456af7607562d)

Also add myself as a maintainer.

(cherry picked from commit 7374105a96ee7d925b3e0530685c21566fa2a32c)

(cherry picked from commit 83a8cb1dc2343c00ddc26caea51cf7fa30ca1fd1)

(cherry picked from commit 43dcb662e72826beb70c4f298eee38727c91c61b)

Also remove patch for CVE-2015-8325 that has been fixed upstream.
(cherry picked from commit f6eae2efab68638259f27e0c56c3534155063543)

Unfortunately, the site is not available over HTTPS.

(cherry picked from commit 2dd09b634e8bac3ea7e88b3ef18570ce084a7aaa)

(cherry picked from commit f081a1aaf4ec30f953c8c68ce1be9f687179d4e5)

(cherry picked from commit ef1a188e079d6ae2a68d400eefc2104b159548e7)

(cherry picked from commit cd67a0aada863e1510c0573aed03b20959dfdebb)

For some reason, between Linux 4.4.19 and 4.4.20, the atkbd and libps2
kernel modules lost their dependency on i8042 in modules.dep, causing
i8042 not to be included in the initrd. This breaks keyboard in the
initrd, in turn breaking LUKS.

This only happens on the 16.03 branch; on 16.09, it appears i8042 is
pulled into the initrd anyway (through some other dependency,
presumably). But let's include it explicitly.

http://hydra.nixos.org/build/40468431
(cherry picked from commit e6088f77bee79e2d202b3ded195648e77207bb21)

(cherry picked from commit 76a57d83b5a4df7c3ac85b25c5ab10d6fb415eb2)

(cherry picked from commit 13f43c7ebc916a42d050a2ca7ac08e5ae9da1ea6)

(cherry picked from commit a699eb47982273f8a506f57fca7cc6a244b0d1d8)

(cherry picked from commit 613a12a8bde64b5ec26b512f34de7507eba7d861)

(cherry picked from commit c83f8a536a27c2618a0b6ae0e0467d422dbed7d5)

It's strange. Maybe they prune the history.

(cherry picked from commit e4d3254101c9e3b94b3ba735c400426d3e7cf2bc)

Per #17143 on GitHub, `gnome-maps` currently fails due to missing
Webkit2. Adding `webkitgtk` to `buildInputs` fixes the issue.

(cherry picked from commit ecd41c19b85852c7400ba9af7b24d8365bc91ecc)

[Bjørn: orig commit was for GNOME 3.20, I backported it to 3.18 (trivial).]

(cherry picked from commit ad6b2a68a7bbec8c3e6e5e2e440f4d1b90e4f6f5)

(cherry picked from commit 244aee5cd16991165fa22880249b50a0ac9a3df6)

(cherry picked from commit f2806a09c49d74eb58a123a06f312067ae71fbc1)

(cherry picked from commit 8e83bb42201ddc9a2e4e9ac028c7b645476bd482)

Dropped libressl.patch in the process since this code appears to be
included in newer versions of BIND.

(cherry picked from commit 240552cba1af2543a66e0e6b8149da2ed44415b6)

(cherry picked from commit 41e01461367965edff1426fb5b63e56b2bc69a02)

It contains security fixes.

(cherry picked from commit c3d1caf97b2b69c5125ff6887a89d29006bec85a)

(cherry picked from commit 33be079486e904cf0a4a11c9b956aee6d7e0fe4b)

Major bug-fix release; hundreds of issues resolved in issue tracker.

https://www.lighttpd.net/2016/7/16/1.4.40/
(cherry picked from commit 2173e6b49a16b721db7dd249d9de225278a90b4a)

(cherry picked from commit 669cd2adbf984fb509ed61585fc92bde41b65871)

The test runner would import all modules to check whether they might
have tests.

On a Linux system it would load the Tornado module that depends on
kqueue, which is BSD only, and fail.

(cherry picked from commit 6876eab511afd1c10b8e89a1ff99aa28c6a44b2d)

(cherry picked from commit 5b782924c1dc9d66d7aefaf99650ff52119b6358)

... to be compatible with https://github.com/NixOS/nix/pull/933
while not breaking compatibility with current nix.

(cherry picked from commit d4de02c46e04103ff51c42dcd0165aa5e548e5d1)

Using types.str doesn't work if you want to mkBefore/mkAfter across
different module definitions, because it only allows for one definition
for the same priority.

This is especially useful if you deploy Hetzner machines via NixOps,
because the physical specification already defines localCommands.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 97801380b05447e59e47ba97d93f6c6cfefd56e4)

(cherry picked from commit 545040811b1fd20354d8d8e88447774c3fa61237)

See https://secure.php.net/ChangeLog-7.php#7.0.11.

(cherry picked from commit a32281639e196fb03680c2b3ad4ef835a7f6b76d)

(cherry picked from commit 85fdf8665f8513b3da6706da2115c68222864c9d)

(cherry picked from commit 8b6e522bf834354c2b44c84e11f764ab689a3335)

The define CURL_STRICTER is only set if CURL_NO_OLDIES is set, but that breaks
compatibility with this package. Defining CURL_STRICTER is enough to fix the
build.

(cherry picked from commit 46790f360d55bb3940dba47809d0cc6ec917b24b)

(cherry picked from commit 4ecd0e74348d25f9942b6eda32ddcd5926b5a379)

(cherry picked from commit 77b9abf78c01d79320353d5f9c1d6d6ed3ef000b)

(cherry picked from commit 2edb28ffc53b343ebed5838856afb2249615c287)

(cherry picked from commit 822e1ddd8920e3bd3e631a5bb1892fea60debd4b)

(cherry picked from commit 02ee9d83d06b812009dc1f7fd203490a080fc35c)

(cherry picked from commit 445a39a23b189e03607bd0445be5b0cb44ab1014)

Looks like this got disabled accidentally in
ec5b66eb4add9d494d8fb16f6899028750d317a2.

(cherry picked from commit 6a9fb8b9e0ab806ae83a19a001f742f78087dd5d)

(cherry picked from commit bc7e4e390a9cc20c86b1af66778f75275e4ceb8c)

(cherry picked from commit f2ddf2a9be551e5c1baa8b653e1677e0f06e812f)

Fixes #17804.

(cherry picked from commit 3996aa89534b7960034fb19eeb15bc62bfe3a289)

(cherry picked from commit 125188b0dc651fc81709fd7bf380a57cf39b260c)

(cherry picked from commit 8b96b391db09c8662fb3bb6e46e7422c3103b2a4)

(cherry picked from commit e3033d87b3a0cd40d0ccb4d33199f464a57b3374)

(cherry picked from commit 43a8ce0f5eebf351d720612d22c207dc6eb3404a)

(cherry picked from commit 605ddb1047b143e755a982cfd87eaeea405d5c51)

[Bjørn: add missing hash update.]

(cherry picked from commit a83f70c2495a99c7b7bd5b14254f4bf4a36b55c2)

(cherry picked from commit daf068c33bab05956afd4cc1316c07435a174acf)

Updated to latest stable version.

(cherry picked from commit 5e9a344e62d4da2a62e3a7c0606d8704931b0159)

http://hydra.nixos.org/build/40042712