Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix

2016-05-03 23:12:48 +03:00

..

config

Revert "pulseaudio: select correct outputs"

2016-04-28 17:06:09 +03:00

hardware

rtl8723bs-firmware: init, split off from rtl8723bs

2016-04-25 00:41:25 -07:00

i18n/input-method

input-method module: fix folder case

2016-04-12 19:50:26 +09:00

installer

installer: simple PXE bootable NixOS installer

2016-04-29 10:42:39 +01:00

misc

graylog service: Initial graylog service

2016-04-28 23:27:57 +02:00

profiles

treewide: Use correct output in ${config.nix.package}/bin

2016-04-25 16:44:37 +02:00

programs

Merge pull request #14212 from aneeshusa/add-mosh-service

2016-04-18 14:31:59 -07:00

security

grsecurity module: fix grsec-lock unit ordering

2016-05-02 11:28:24 +02:00

services

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

2016-05-03 23:12:48 +03:00

system

dbus: Fix for new 1.10 version

2016-05-02 13:04:20 -05:00

tasks

networking module: Add some missing literalExample

2016-04-25 18:15:52 +02:00

testing

test-instrumentation.nix: Only clear $PAGER in the backdoor shell

2016-02-23 11:56:09 +01:00

virtualisation

Update EC2 AMIs to 16.03.659.011ea84

2016-04-29 10:28:35 +02:00

module-list.nix

graylog service: Initial graylog service

2016-04-28 23:27:57 +02:00

rename.nix

nixos: rename chroot* to sandbox*

2016-04-25 11:04:08 +02:00