Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ...

Let's get rid of those merge conflicts.

2016-02-03 16:57:19 +01:00

..

fonts

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00

debug-info.nix

Add option environment.enableDebugInfo

2015-10-30 15:21:16 +01:00

gnu.nix

…

gtk-exe-env.nix

uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt

2014-07-14 21:33:05 +09:00

i18n.nix

i18n: add color scheme option (close #9626)

2015-11-09 14:53:59 +01:00

krb5.nix

krb5: Break out into a lib and not lib version

2015-06-26 22:05:47 -07:00

ldap.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

networking.nix

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00

no-x-libs.nix

dbus: rename useX11 option into x11Support, cleanup a bit

2015-03-29 23:28:30 +00:00

nsswitch.nix

nsswitch.conf: Omit ldap unless ldap is enabled

2015-02-25 14:31:13 +01:00

power-management.nix

Remove default scsiLinkPolicy

2015-12-17 16:40:35 +01:00

pulseaudio.nix

Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00

qt-plugin-env.nix

uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt

2014-07-14 21:33:05 +09:00

shells-environment.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

swap.nix

swap service: don't restart mkswap.service on switches

2016-01-12 17:27:21 +03:00

sysctl.nix

sysctl: use literalExample in docs

2015-12-30 10:22:04 -08:00

system-environment.nix

nixos,lib: move environment generation related copy-paste to lib

2015-09-18 18:48:49 +00:00

system-path.nix

Merge branch 'master' into closure-size

2015-12-31 09:53:02 +01:00

timezone.nix

nixos: let's not forget types in the timezone module

2015-07-31 01:57:47 +00:00

unix-odbc-drivers.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

update-users-groups.pl

Ensure that the home directory exists even if the user already exists

2015-02-24 11:57:38 +01:00

users-groups.nix

Fix package name typo

2016-01-02 12:37:20 -08:00

vpnc.nix

vpnc: Fix building of system config.

2014-08-31 21:39:03 +02:00

zram.nix

nixos: Add zram swap module

2014-05-06 20:04:22 +02:00