nixpkgs/nixos/modules/system
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
..
activation Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
boot Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
etc environment.etc: add user/group option 2017-07-29 23:56:46 +01:00