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

2015-07-05 13:06:02 -07:00

..

config

Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -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

Merge remote-tracking branch 'projectorhq/riemann-tools'

2015-07-01 08:45:33 -04: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-07-05 13:06:02 -07:00

services

Merge pull request #8573 from lihop/shellinabox-service

2015-07-04 14:02:06 +03:00

system

grub installation: fix: simplify code

2015-07-05 21:55:56 +02: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

nixos docker: fix service and test

2015-07-05 13:57:23 +02:00

module-list.nix

Merge pull request #8602 from ts468/upstream.pam

2015-07-05 00:40:49 +02:00

rename.nix

Remove option ec2.metadata

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