John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base ...

Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh

2017-07-26 13:46:04 -04:00

..

config

environment.noXlibs: Disable gnome when noXLibs is set (#27567)

2017-07-26 08:54:42 +02:00

hardware

nvidia module: link proper output as OpenGL drivers

2017-05-31 16:30:21 +03:00

i18n/input-method

Remove top-level kde5 attribute

2017-02-27 11:49:10 -06:00

installer

nix: 1.11.12 -> 1.11.13

2017-07-18 10:54:01 +02:00

misc

Merge pull request #26907 from volth/vault

2017-07-11 15:02:29 -04:00

profiles

all-hardware.nix: add VMware support. (#27430)

2017-07-17 02:38:10 +02:00

programs

Merge pull request #26761 from gnidorah/master3

2017-07-26 22:44:45 +08:00

security

nixos/auditd: init at 2.7.6 (#27261)

2017-07-09 17:59:09 +01:00

service-managers

Simple proof of concept for how to do other types of services

2017-05-26 18:14:31 -04:00

services

Merge remote-tracking branch 'upstream/master' into staging-base

2017-07-26 13:46:04 -04:00

system

Merge pull request #26912 from knedlsepp/fix-autoResize

2017-07-16 16:54:54 -04:00

tasks

Merge pull request #26170 from kirelagin/wlan-fix

2017-06-17 15:31:22 +01:00

testing

kdm: drop service

2017-02-11 13:55:09 -05:00

virtualisation

docker module: fix autoPrune.enable description

2017-07-21 16:54:40 +02:00

module-list.nix

Merge pull request #27347 from cstrahan/osquery-new

2017-07-24 21:51:10 -04:00

rename.nix

programs.zsh: rename oh-my-zsh to ohMyZsh

2017-05-25 10:51:26 +02:00