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
clickhouse.nix
couchdb.nix
firebird.nix
hbase.nix
influxdb.nix
memcached.nix
mongodb.nix
mysql.nix	Merge pull request #34028 from florianjacob/matomo	2018-02-26 06:53:58 +00:00
neo4j.nix
openldap.nix	openldap module: allow defining contents declaratively	2018-03-03 15:33:23 +01:00
opentsdb.nix
pgmanage.nix
postgresql.nix
postgresql.xml
redis.nix
rethinkdb.nix
riak-cs.nix
riak.nix
stanchion.nix
virtuoso.nix