Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2018-12-26 09:30:32 +01:00
43 changed files with 264 additions and 176 deletions

View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
# the build daemon when building in a chroot. See
# <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> for
# <https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01056.html> for
# details.
# The test-suite needs to have a non-empty stdin: