Nikolay Amiantov 23dd97ee88 Merge commit 'refs/pull/13412/head' of git://github.com/NixOS/nixpkgs

2016-03-02 18:56:24 +03:00

..

config

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

2016-03-01 20:52:06 +01:00

hardware

Merge branch 'master' into staging

2016-02-17 10:06:31 +01:00

i18n/inputMethod

fcitx: show available engines in module description

2016-02-28 07:12:55 -06:00

installer

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

2016-03-01 20:52:06 +01:00

misc

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

2016-03-01 20:52:06 +01:00

profiles

qemu-guest.nix: Disable rngd

2016-02-23 11:56:09 +01:00

programs

nixos: remove top-level uim option

2016-02-28 07:12:55 -06:00

security

cacert: fix formatting of example

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

services

Merge commit 'refs/pull/13412/head' of git://github.com/NixOS/nixpkgs

2016-03-02 18:56:24 +03:00

system

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

2016-03-01 20:52:06 +01:00

tasks

Fix typo

2016-02-12 14:35:40 +01:00

testing

test-instrumentation.nix: Only clear $PAGER in the backdoor shell

2016-02-23 11:56:09 +01:00

virtualisation

ec2-data: ensure providing a SSH host key is actually optional

2016-02-25 20:11:49 -06:00

module-list.nix

Merge commit 'refs/pull/13412/head' of git://github.com/NixOS/nixpkgs

2016-03-02 18:56:24 +03:00

rename.nix

gitlab: 8.0.5 -> 8.5.0, service improvements

2016-02-26 07:08:31 +01:00