John Ericson d7144e708b Merge remote-tracking branch 'upstream/master' into staging

2018-05-23 16:00:04 -04:00

..

config

iproute2: module to create rt_table file & co

2018-05-15 21:55:04 +09:00

hardware

Merge branch 'master' into staging

2018-04-10 09:13:36 +02:00

i18n/input-method

Added cross-references to NixOS manual

2018-04-12 09:39:14 +10:00

installer

Remove all references to absent nixos-prepare-root

2018-05-18 09:53:11 -04:00

misc

nixos/ids: information when to use static uids/gids

2018-05-20 10:56:55 +01:00

profiles

base profile: add mkpasswd to system packages

2018-05-09 00:20:02 +03:00

programs

Revert "zsh: move setEnvironment stuff to zprofile"

2018-05-19 10:17:41 +02:00

security

manual: Clarify that limits.conf doesn't apply to systemd services. (#40267)

2018-05-12 17:44:57 +02:00

services

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

2018-05-23 16:00:04 -04:00

system

Merge pull request #39978 from hedning/plymouth-quit-wait

2018-05-15 14:28:47 -05:00

tasks

Merge pull request #39982 from tadfisher/scsi-link-policy

2018-05-22 23:53:24 +03:00

testing

nixos/tests: set default stateVersion in test VMs

2018-05-14 00:01:15 +02:00

virtualisation

nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1

2018-05-12 19:27:09 +00:00

module-list.nix

nixos/xss-lock: add module (#40619)

2018-05-18 18:24:53 +02:00

rename.nix

nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1

2018-05-12 19:27:09 +00:00