Marek Mahut 60100a7c92 Merge pull request #83769 from dadada/nixos/dokuwiki-multi-server ... nixos/dokuwiki: add support for multi-site, additional plugins and templates		2020-04-20 19:39:48 +02:00
..
config	Merge master into staging-next	2020-04-03 21:54:40 +02:00
hardware	libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl options	2020-04-20 03:19:41 +02:00
i18n/input-method	nixos/ibus: fix evaluation	2020-04-05 02:23:38 +02:00
installer	nixos/nixos-generate-config.pl: use modulesPath instead of <nixpkgs>	2020-04-20 09:57:17 -05:00
misc	treewide: Per RFC45, remove all unquoted URLs	2020-04-10 17:54:53 +01:00
profiles	nixos/hardened: add emily to maintainers	2020-04-17 16:13:39 +01:00
programs	Merge pull request #82339 from Ma27/captive-browser-xdg	2020-04-16 00:06:12 +02:00
security	Merge pull request #85365 from immae/fix_acme_postrun	2020-04-18 13:16:16 -04:00
services	Merge pull request #83769 from dadada/nixos/dokuwiki-multi-server	2020-04-20 19:39:48 +02:00
system	Merge pull request #85371 from Mic92/tmpfiles	2020-04-20 10:32:58 +01:00
tasks	nixos/networking: move network-link-${i.name} to scripted networking	2020-04-13 22:03:35 +02:00
testing	nixos/service-runner.nix: Allow quotes in commands + test	2020-02-28 14:26:29 +01:00
virtualisation	nixos-containers: Add support for custom nixpkgs argument	2020-04-20 07:33:46 +01:00
module-list.nix	Merge pull request #83301 from evils/tuptime	2020-04-19 23:38:53 +02:00
rename.nix	nixos: fix module paths in rename.nix	2020-03-11 15:59:22 +01:00