(Cherry-picked from commit fba4a950685023bc792422665b2dbe9934ebc9c6.)

Update flash version

Some modules wouldn't load crc32c dependency due to module renaming.

(cherry picked from commit 57f2d329acec8265cf5ab6fc5c3fb7752e4ac5c1)

Conflicts (simple):
pkgs/top-level/all-packages.nix

Fixes #6193.
Disabling docs generation might be another alternative
to the build-time dependency blowup.

(cherry picked from commit 346c8d7a989c19d4186aa5b7c8e685cd0807f5d0)

Conflicts (simple):
pkgs/tools/X11/xdg-utils/default.nix

This probably breaks grsecurity build,
but I don't think anyone with that is still using this half-dead branch.

(cherry picked from commit efa8fc2b0a5e94fd22e26c31c82b643d2352e92a)

Conflicts:
nixos/modules/virtualisation/ec2-data.nix
nixos/modules/virtualisation/google-compute-image.nix

(cherry picked from commit b9c4569b6b4c7fc3eb96b55cbf4043f2ba35a901)

Conflicts:
nixos/modules/installer/tools/nixos-install.sh

Systemd-nspawn creates /root with 755 permission if it doesn't exist,
which is bad. So we have to create it ourselves before calling
systemd-nspawn.

(cherry picked from commit 3ca275d7ba92900fa793d4c9bf017e38394fcfec)

Conflicts:
nixos/modules/virtualisation/containers.nix

(cherry picked from commit 7eda68709e9e50b1c4a608ab141f6c7065708c0f)
(cherry picked from commit b985a9e0a1fe392c37e91eaddd624cfcb9fa4a25)

(cherry picked from commit 65a89fcce7ec021838dac824fce9908b6dcd794a)

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

See also:
http://permalink.gmane.org/gmane.os.netbsd.devel.pkgsrc.user/20888

(Cherry-picked from 173f41cf0bc618f0b2c313b1915fee8d8a6d0ee2.)

(cherry picked from commit 7f02b1f35042f6ac345933bd3823439535a95234)

(Cherry-picked from commit 1b5c9c24dea9d5241f4a46a471d77d185b31b524.)

(Cherry-picked from commit 951ac10ae15bf53ea919802a8c3570518f34d86b.)

Also update homepage.

(Cherry-picked from commit 90162e7dbd5b96f04e277e6d208c9a9940d818a9.)

Also switched to openssl instead of libgcrypt (wouldn't compile otherwise),
and fixed meta.license.

(cherry picked from commit 7357f0ae24ff0408d5b0f6e3a8f10ea60e9d94c5)

The upstream server is down.

(cherry picked from commit ca850deb9ed863ea0311cf3f90e7577c70c48105)

This most likely solves some vulnerabilities.
The grsecurity stuff were out of sync before this commit,
and maybe didn't get fixed by this.
CC #5386.

(cherry-picked from 7e8c5b578aae7972c1317df44019efdc2629d469)

(cherry picked from commit b48e41b8d75f8a450ed5333a222f85172bbbfc21)

I see git detects file moves well but not "directory moves".
Thanks to Travis for fast notification.

https://www.kde.org/info/security/advisory-20141113-1.txt
I couldn't find kio-extras, so I hope we don't have it disguised somewhere.

(cherry picked from commit 15b9626a3df5c453941c78729e5f825147a594b0)

(cherry picked from commit c8a53923fca610ea56c98d58c891fd8161f6ac01)

(cherry picked from commit 225ddcda9a4b6097f3c10ddac3b52aa7ca9a3f97)

75738437a4c2fcff57ae3de8a40eea2d9456eeaa only updated the version string...

(cherry picked from commit 55d59eefb3968be11cf40b96650f5cb4c64b60b7)

(cherry picked from commit 845f647b8651b8f2469723ca2ff6db7ced2ca38a)

(cherry picked from commit e660a70872bf153f8d07dd94287ec72d84eda6c5)

Also refactor the expression a little.

(cherry picked from commit 7ce485ff0fe8f7347db0609d82532bd7dc839c8a)

Let's wait for problems.

Also change "," placement to be consistent and remove unnecessary let.

(cherry picked from commit 05b83fe6a23e5ca0b531fb47269c419d6a549d7b)

(cherry picked from commit 43ed6b8f62d6705156c77b84c21cf5f0618a0b9e)

(cherry picked from commit 2e1bb14b9358fd8d0005ae893ae53454ce3b2078)

(cherry picked from commit d6c3b564c462550216a50e9ff005b23f59dcabf2)

Conflicts:
pkgs/tools/networking/openvpn/default.nix

Bug fixed in b0c5c2a was giving me segfaults...

(cherry picked from commit 97f35cf29a1701c0ad53cdbdb2f67af44b8484a5)

Conflicts:
pkgs/tools/package-management/nix/unstable.nix

(cherry picked from commit 30597a9c7acd4603f6ce5eb6b95b05e538b49eab)

(cherry picked from commit c4ab4ce59b8190cb5d2c27489b780030982cda13)

(cherry picked from commit 75738437a4c2fcff57ae3de8a40eea2d9456eeaa)

Closes #4824, thanks to @abh for processing my stupidity.

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

It's a critical security fix.
http://helpx.adobe.com/security/products/flash-player/apsb14-26.html
(cherry picked from commit a4beb6a2b65881849a858ba4ea42bc5763712df2)

This is a proper fix for problems described in ec985c8ffa6d29 .
The code is from @lethalman.

(cherry picked from commit b16994f7ce49ac1793837879f8e3ddc63c976a5f)

https://bugzilla.novell.com/show_bug.cgi?id=561317
(cherry picked from commit 9073d554a55b4870315184f55c41290e430e2ee0)

It builds on Nix >= 1.8pre3890 due to the removal of the
ADDR_LIMIT_3GB personality flag.

(cherry picked from commit bf17f43fe96e454d748261f6d1bcf84a29ca2cf1)

(cherry picked from commit c4364d591423d40bd3191f0235cac5c6d32d9f6f)

Option defaults should not refer to store paths, because they cause
the manual to be rebuilt gratuitously. It's especially bad to refer to
a highly variable path like a computed configuration file.

(cherry picked from commit ec4f38c56f0a7dfc9b2f9db111250f925e009c7d)

(cherry picked from commit ace49e400c484ac3fbcdf24835f8a7cfa338f508)

(cherry picked from commit 2838c2a7bc1638a421e68c645b91ca45a16aa13f)