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

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

2018-05-18 03:54:38 +03: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

nixos/tests: prevent stateVersion warnings in eval

2018-05-15 00:22:35 +02:00

misc

nixos: version: produce a warning when no system.nixos.stateVersion is explicitly set

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

profiles

base profile: add mkpasswd to system packages

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

programs

Merge pull request #40223 from jD91mZM2/shouldnt-we-just-use-the-pam-environment-file-instead

2018-05-16 00:52:31 -05: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-18 03:54:38 +03:00

system

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

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

tasks

lxd: 2.16 -> 3.0.0

2018-04-14 11:02:24 +01: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

sysprof: 1.2.0 -> 3.28.1

2018-05-16 16:54:12 +02:00

rename.nix

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

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