Daiderd Jordan db6fb869fb Merge pull request #30418 from LnL7/inline-set-environment ... nixos: inline set-environment for bash and zsh		2018-03-08 21:07:15 +01:00
..
config	Merge branch 'master' into nix-2.0	2018-03-03 18:02:35 +01:00
hardware	Merge #35554: nixos/opengl: unhide and document	2018-03-04 17:33:01 +01:00
i18n/input-method	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	nixos-enter: specify absolute path to bash	2018-03-04 16:19:52 +00:00
misc	Merge #35454: nixos/pump.io: remove	2018-03-04 10:49:25 +01:00
profiles	Add jq to the installation media	2018-02-27 20:20:37 +01:00
programs	Merge pull request #30418 from LnL7/inline-set-environment	2018-03-08 21:07:15 +01:00
security	Revert "Merge branch 'setuid-wrapper-readlink'"	2018-03-07 17:09:05 -05:00
services	nixos/tomcat: add types + proper systemd integration	2018-03-08 09:09:42 +00:00
system	nixos/initrd-network: add udhcpc.extraArgs option (#36305)	2018-03-05 15:53:59 +00:00
tasks	Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt	2018-03-05 17:31:22 +00:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	xen 4.10: link /etc/xen/oxenstored.conf	2018-03-07 22:39:19 +01:00
module-list.nix	Merge #35454: nixos/pump.io: remove	2018-03-04 10:49:25 +01:00
rename.nix	nixos/piwik: rename to matomo	2018-02-22 22:03:55 +01:00