(cherry picked from commit c3e57f3095d3c5e4631a5978702226ee2b6bd8cd)

(cherry picked from commit 82c0aa7d85183da8031d4c0ac7fd562887d03b89)

(cherry picked from commit 739b058779620bc0c8938b98b8c6172b59d8979b)

Regression introduced by 4dcb685af940efd74a7b2b66ae917129ef232d83.

Unsetting the environment variable shortly before using it is not going
to end up very well, so let's just filter out the variable from the
output of export and unset it shortly afterwards.

This fixes the runInMachine NixOS test.

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

This reverts commit 4cf7839305df45d83b97fd14b27169b7d6a56ff7.

Breaks kde5 test. http://hydra.nixos.org/build/41374761

Apply an upstream commit destined for next release like Debian is doing:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835731

Should fix http://hydra.nixos.org/build/40815848

(cherry picked from commit c08a84186f7f0145aebc063606bd654fea3efcf9)

go_1_7: 1.7 -> 1.7.1 on release 16.09

we want the content of attribute as a key:
b9df84cd4f6b70bdfa395a91dbf3d712adc7e18d broke this

(cherry picked from commit d6ce2e4bcb586870ef11a295b1634649fed36667)

(cherry picked from commit 328c2f00819d01933e6cb0aad1c5052d2fab86ea)

This ensures synchronous unit start.

(cherry picked from commit e993506d4c3d580495087c85c901d54908e445a0)

(cherry picked from commit 3b89a6e0209fb75e36473905dd8bbae1e30d2ac5)

See #19013 for details and discussion.

(cherry picked from commit e9687611b608690d1158ea0259970763e9bf76bc)

(cherry picked from commit 50e2161ee1b3ed9c107d6bc0c63df6463d11da64)

Also, strip the modules to prevent a dependency on gcc.

(cherry picked from commit c3bc8b2996f5a883dba07756ebc779799bc1d514)

(cherry picked from commit dbb9e2e847732d8cb39e89c63b5c5407e93344ec)

(cherry picked from commit 8b7f83a146866a323f7919e6b45ab071449b1c2b)

(cherry picked from commit 498af0bbb430b9323e6a922928f5814a6fa92477)

This fixes two bugs:

* When socket activation is detected, the service itself is added to stop-start list instead of its sockets.
* When service is marked to restart instead of stop (`StopIfChanged = no`) we don't need to restart sockets.

(cherry picked from commit d37458ad063b04439455fa7c54c3d2abf25a1f5a)

Also restart when configuration is changed.

(cherry picked from commit ff0b8b22250999d3274883fe4c1f7ba649753aa9)

(cherry picked from commit 613a12a8bde64b5ec26b512f34de7507eba7d861)

(cherry picked from commit 7e8eb6a7c3e6ccde23cbed05bf9bf3d9aa81aad7)

This doesn't work in a sandbox because it accesses the network.

(cherry picked from commit 590c164858688e2eb771ee53049eb02f83ba0da5)

The udev rule should do this. Not sure why it doesn't.

Fixes #19029.

(cherry picked from commit b692e06686fc3550f8076070780c10140e14eb0c)

This update was generated by hackage2nix v2.0.2-9-gc0b597f from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/9ca479bb22001e1318d005f917ce115a5a130581.

This patch closes https://github.com/NixOS/nixpkgs/issues/14897.

This change also wraps `torcs` with `mesa` to fix the runtime
crush due to this dependancy which was missing.

(cherry picked from commit d332b914ce02ebccb3273f4e80aecf95472e6bd4)

This reverts commit 6a12ff4cbdcb0729072eabd1b76a8c486548614a.

See: https://github.com/NixOS/nixpkgs/pull/19054
Closes #19054

This is a standard environment that doesn't contain a C/C++
compiler. This is mostly to prevent trivial builders like runCommand
and substituteAll from pulling in gcc for simple configuration changes
on NixOS.

(cherry picked from commit 0cb16a6955ff6ef447a81caab02a8389b2d19dd4)

(cherry picked from commit 020e88704ae0a0766908fb82d7b92a6ab9901329)

This reduces the runtime closure of a KDE4 system by ~172 MiB.

(cherry picked from commit c2495261a89bcb7393cf745040304c8c3679d2ce)

Obviously there are more improvements that can be done here,
especially moving headers to .dev, but that's not entirely trivial and
probably not worth it since kde4 is old.

(cherry picked from commit d65af1353372200e65f3a4cb87f07242af113802)

This is a pretty modest use of multiple outputs - mainly to eliminate
-dev outputs from Qt's closure.

(cherry picked from commit a5ee4d2c78ad20c73b30717c648fe196b069851d)

(cherry picked from commit 5df3ec85d8e9afd780fa80b9f96e496a61f699c1)

Fixes #18840: too large closure of mesa_drivers.

Tested atop 16.09:
- clang compiles a hello-world app;
- mesa seems to link OK;
- ispc builds.

Size comparison:
- 80 MB of full llvm-3.7 on 16.03;
- 200 MB of full llvm-3.9 on 16.09 before this patch;
- 50 MB of libLLVM after this commit.

(cherry picked from commit d2965a7d85f7ce3f5ce265ca8dc3b73feaae226f)

(cherry picked from commit b6f3e0801944320144eec5adb1499143317c28da)

(cherry picked from commit 7c31bc7e8987ca2b887573870871004cec09abfe)

(cherry picked from commit 39181d4418eebfe1d58bdfd5a93413b16cdaa819)

(cherry picked from commit 711b536934b737dc523ce68874dc08f399512ee5)

By deduplicating libXvMC*.so and {r600,radionsi}_drv_video.so, this
reduces the size of the drivers output from 63.3 MiB to 49.8 MiB.

(cherry picked from commit 28a659974ae94af79c80e327443108d46a5a5e11)

The use of multiple outputs in libarchive broke it. Since this is an
ancient version of cmake, let's fix it by just using
--no-system-libarchive.

(cherry picked from commit e03d1ababa86b2564043f0afd479c64ec55d5f83)

The configure script checks for it, but the only use (in
libkms/Makefile.am) is commented out.

(cherry picked from commit 5d8c54746066eb454bee5c10ba93b3a9e078bf45)

(cherry picked from commit b87d5abafd8e77669f69470ee17f47e8464d3370)

This prevents the NixOS base system from pulling in openldap,
cyris-sasl, and libkrb5.

(cherry picked from commit ff7368e944a904c0389f58f770576a230ab73c08)