Frederik Rietdijk 804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD		2018-01-02 19:10:45 +01:00
..
config	pinentry: override pinentry_ncurses instead of the other way around	2017-12-16 04:39:29 +01:00
hardware	intel-ocl: r4.0-59481 -> 5.0-63503	2017-11-01 17:59:49 +00:00
i18n/input-method	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	Merge pull request #32031 from NixOS/unstable-aarch64	2017-12-12 17:44:07 -05:00
misc	ghostOne: remove	2017-12-29 02:18:35 +01:00
profiles	nixos/profiles/all-hardware: remove unavailable modules	2017-12-29 11:37:21 +01:00
programs	tmux module: add secureSocket option	2017-12-29 15:05:20 +03:00
security	pam: add optional pam_gnome_keyring integration	2018-01-01 21:58:37 +03:00
services	Merge remote-tracking branch 'upstream/staging' into HEAD	2018-01-02 19:10:45 +01:00
system	luksRoot: add the missing ECB dependency to fix XTS support, resolves #30940	2017-12-22 07:50:09 +02:00
tasks	nixos: zfs: correct the networking.hostId error message	2017-12-20 17:56:03 -05:00
testing	tests: logToJournal has been renamed	2017-12-06 17:45:40 +08:00
virtualisation	Merge pull request #31157 from sorki/lxcfs_pam_related	2018-01-01 15:42:03 +01:00
module-list.nix	Merge branch 'master' into staging	2017-12-31 09:53:49 +01:00
rename.nix	Revert "nixos: doc: implement related packages in the manual"	2017-12-23 07:19:45 -05:00