Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ...

Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix

2018-03-10 20:38:13 +00:00

..

4store-endpoint.nix

nixos: Move uses of stdenv.shell to runtimeShell.

2018-03-01 14:38:53 -05:00

4store.nix

nixos: Move uses of stdenv.shell to runtimeShell.

2018-03-01 14:38:53 -05:00

cassandra.nix

treewide: use boolToString function

2017-04-11 18:18:53 +02:00

clickhouse.nix

clickhouse: init at 1.1.54190

2017-04-27 13:25:58 +00:00

couchdb.nix

couchdb: add support for version 2.0.0

2017-03-06 11:42:02 +01:00

firebird.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

hbase.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

influxdb.nix

influxdb sevice: make postStart test work with non-localhost configurations (#29734)

2017-09-24 15:37:17 +01:00

memcached.nix

nixos/memcached: make unix sockets usuable

2018-01-03 12:33:36 +01:00

mongodb.nix

mongodb: we already set quiet in config

2017-07-27 13:26:36 +01:00

mysql.nix

Merge pull request #34028 from florianjacob/matomo

2018-02-26 06:53:58 +00:00

neo4j.nix

neo4j service: neo4j-wrapper is deprecated, merge into neo4j.conf

2017-03-19 16:56:53 -05:00

openldap.nix

openldap module: allow defining contents declaratively

2018-03-03 15:33:23 +01:00

opentsdb.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

pgmanage.nix

postage: replaced by pgmanage-10.0.2

2017-11-03 00:14:00 +01:00

postgresql.nix

postgis: get rid of composableDerivation

2018-02-20 22:17:16 +01:00

postgresql.xml

doc: use postgresql94

2015-01-07 13:21:18 +01:00

redis.nix

nixos/redis: remove static uid/gid assignment

2018-01-03 11:18:04 +01:00

rethinkdb.nix

rethinkdb service: initial implementation

2017-06-27 02:09:15 +02:00

riak-cs.nix

riak-cs: init at 2.1.1

2016-11-21 12:30:11 +01:00

riak.nix

riak: added extraAdvancedConfig option to service module

2016-11-21 15:46:04 +01:00

stanchion.nix

stanchion: remove ssl option

2017-02-17 13:24:51 +01:00

virtuoso.nix

treewide: deprecate ip-up.target (#18319)

2016-09-10 18:03:59 +02:00