obadz 3de6e5be50 Merge branch 'master' into staging ...

Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix

2016-08-27 23:54:54 +01:00

..

fonts

freetype: re-add infinality patches

2016-08-20 03:21:05 +03:00

debug-info.nix

treewide: rename extraOutputs{ToLink,ToInstall}

2016-04-07 15:59:44 +02:00

gnu.nix

Revert "Remove lsh, broken & unmaintained"

2016-08-23 15:32:41 +00:00

i18n.nix

kbd: split keymaps into kbdKeymaps

2016-07-08 12:52:39 +03:00

krb5.nix

Add kerberos mappings for MIT exchange server

2016-05-11 09:09:24 -04:00

ldap.nix

ldap: Add option for NSS integration

2016-08-23 21:12:51 +02:00

networking.nix

networking config: specify resolv.conf options as list of strings

2016-05-28 14:28:13 +02:00

no-x-libs.nix

dbus: rename useX11 option into x11Support, cleanup a bit

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

nsswitch.nix

ldap: Add option for NSS integration

2016-08-23 21:12:51 +02:00

power-management.nix

Remove default scsiLinkPolicy

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

pulseaudio.nix

nixos/pulseaudio: remove stray load-modules

2016-08-25 19:34:57 +02:00

shells-environment.nix

Use shell packages to select the user's shell

2016-06-12 20:35:34 +01:00

swap.nix

nixos/swap: support for resizing swapfile

2016-07-06 16:04:27 +02:00

sysctl.nix

Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"

2016-03-01 20:52:06 +01: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

nixos: remove rsync from base install and add explicit path in nixos-install

2016-08-09 21:39:40 +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

unix-odbc-drivers module: update for new unixODBCDrivers

2016-04-26 23:58:11 +03:00

update-users-groups.pl

nixos/update-users-groups.pl: print UIDs and GIDs

2016-07-01 13:13:46 +02:00

users-groups.nix

modules/users-groups: add shell example

2016-06-25 19:41:24 +02:00

vpnc.nix

nixos/vpnc: fix formatting of example

2016-02-27 22:25:39 +13:00

zram.nix

modprobe service: drop kmod wrapper

2016-08-19 17:56:49 +03:00