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

Conflicts:
	pkgs/top-level/all-packages.nix

2018-04-03 02:22:54 +03:00

..

config

user/group assertion to not exceed the 32 character limit

2018-03-30 23:43:23 +02:00

hardware

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

2018-03-28 09:36:47 -04:00

i18n/input-method

…

installer

nixos/sd-image-*: Raspberry Pi firmware no longer falls under unfree

2018-04-02 23:46:18 +03:00

misc

nixos/version: fix nixops pre 1.6 compatibility

2018-03-28 02:30:50 +02:00

profiles

treewide: replace depecated alias s/mssys/ms-sys/g

2018-03-22 10:13:21 +00:00

programs

Merge commit '3ab2949' from staging into master

2018-03-15 22:30:56 +02:00

security

Merge pull request #37840 from matthewbauer/unixtools

2018-03-27 18:43:03 -05:00

services

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

2018-04-03 02:22:54 +03:00

system

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

2018-03-28 09:36:47 -04:00

tasks

nixos/manual: fixed example config for networking.interfaces

2018-03-17 19:53:06 +01:00

testing

nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix

2018-01-30 16:57:27 +02:00

virtualisation

qemu-vm service: quote arguments in qemu runner

2018-03-26 14:01:49 +03:00

module-list.nix

Merge pull request #37921 from gnidorah/gitweb

2018-03-30 00:18:44 +02:00

rename.nix

nixos/version: fix nixops pre 1.6 compatibility

2018-03-28 02:30:50 +02:00