William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream

2015-06-30 23:58:07 -07:00

..

config

krb5: Break out into a lib and not lib version

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

hardware

types.uniq types.str -> types.str

2015-06-15 18:12:32 +02:00

installer

nixos/iso-image: Allow to customize menu label.

2015-06-28 23:30:17 +02:00

misc

nixos: added gitit service

2015-06-28 12:39:52 +02:00

profiles

Replaces https://github.com/NixOS/nixpkgs/pull/8368

2015-06-17 19:26:17 +02:00

programs

Merge branch 'master.upstream' into staging.upstream

2015-06-17 11:57:40 -07:00

security

Merge branch 'master.upstream' into staging.upstream

2015-06-17 11:57:40 -07:00

services

nixos: gnome-keyring: fix module description

2015-07-01 02:22:27 +02:00

system

nixos/install-grub: Fix grub1 installation

2015-06-17 11:47:36 -07:00

tasks

Some more type cleanup

2015-06-15 18:18:46 +02:00

testing

test-instrumentation.nix: Prevent calling a pager

2015-01-15 14:39:29 +01:00

virtualisation

Remove option ec2.metadata

2015-06-30 17:25:56 +02:00

module-list.nix

nixos: added gitit service

2015-06-28 12:39:52 +02:00

rename.nix

Remove option ec2.metadata

2015-06-30 17:25:56 +02:00