Nikolay Amiantov c9f2753c7b syncthing service: fix invalid conflict resolution

2016-04-14 17:38:25 +03:00

..

config

Merge branch 'master' into closure-size

2016-04-10 11:17:52 +02:00

hardware

opengl.extraPackages32: pkgsi686Linux in example

2016-03-26 00:50:56 +11:00

i18n/input-method

input-method module: fix folder case

2016-04-12 19:50:26 +09:00

installer

Merge branch 'staging', containing closure-size #7701

2016-04-13 09:25:28 +02:00

misc

nixos.locate: fix update-locatedb service failure

2016-04-14 13:51:17 +02:00

profiles

Merge 'staging' into closure-size

2016-04-07 14:40:51 +02:00

programs

Merge branch 'master' into closure-size

2016-04-10 11:17:52 +02:00

security

Merge branch 'staging', containing closure-size #7701

2016-04-13 09:25:28 +02:00

services

syncthing service: fix invalid conflict resolution

2016-04-14 17:38:25 +03:00

system

Restore default core limit of 0:infinity

2016-04-14 13:18:09 +02:00

tasks

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

testing

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

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

virtualisation

replace makeSearchPath tree-wise to take care of possible multiple outputs

2016-04-13 22:09:41 +03:00

module-list.nix

flexget nixos module: run the service and specify configuration

2016-04-13 12:08:02 +08:00

rename.nix

nixos: fix incorrect rename for input-methods options

2016-04-13 02:32:53 +02:00