Vladimír Čunát 985d1ac425 Merge branch 'master' into staging-next ... There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611		2019-08-25 14:57:11 +02:00
..
config	nixos/vte: ensure bash vte snippet appears first	2019-08-23 10:11:48 -04:00
hardware	Merge staging-next into staging	2019-08-17 09:39:23 +02:00
i18n/input-method	nixos/ibus: do not default-install ibus-qt	2019-08-10 19:37:12 +02:00
installer	nixos/sd-image: Increase default firmware partition size	2019-08-18 22:55:39 +02:00
misc	nixos/modules/misc/crashdump: remove idle=poll (fix #66464)	2019-08-13 16:08:22 -07:00
profiles	Merge pull request #66687 from joachifm/feat/hardened-nixos-revert-graphene-malloc	2019-08-19 20:56:07 +02:00
programs	nixos/gnupg: Add gpg to systemPackages	2019-08-24 21:30:49 +02:00
security	nixos/hardened: make pti=on overridable	2019-07-30 02:24:56 +02:00
services	Merge pull request #67407 from jtojnar/gnome-bg	2019-08-24 18:33:41 -04:00
system	systemd-networkd: add tests	2019-08-21 11:11:28 +02:00
tasks	Merge branch 'master' into flip-map-foreach	2019-08-18 18:00:25 +03:00
testing	nixos/test: remove the stateVersion statement from the test-instrumentation	2019-06-03 15:05:24 +02:00
virtualisation	libvirtd: add onBoot option	2019-08-23 17:52:12 +02:00
module-list.nix	Merge pull request #67358 from jtojnar/ofono-progress	2019-08-24 21:37:42 +02:00
rename.nix	nixos/phpfpm: deprecate poolConfigs option	2019-08-23 07:54:51 -04:00