Florian Klink 6303131eb9 nixos/redis: fix merging ...

https://github.com/NixOS/nixpkgs/pull/71584 did merging without mkMerge.

cc @jtojnar

2019-11-08 15:38:06 +01:00

..

4store-endpoint.nix

…

4store.nix

…

aerospike.nix

…

cassandra.nix

Merge branch 'master' into staging

2019-09-02 23:25:24 +02:00

clickhouse.nix

…

cockroachdb.nix

…

couchdb.nix

nixos/modules: Remove all usages of types.string

2019-08-31 18:19:00 +02:00

firebird.nix

…

foundationdb.nix

nixos/modules: Remove all usages of types.string

2019-08-31 18:19:00 +02:00

foundationdb.xml

Revert "nixos/doc: re-format"

2019-09-19 19:17:30 +02:00

hbase.nix

nixos/modules: Remove all usages of types.string

2019-08-31 18:19:00 +02:00

influxdb.nix

nixos/modules: Remove all usages of types.string

2019-08-31 18:19:00 +02:00

memcached.nix

nixos/memcached: Switch to a system user

2019-09-24 20:10:19 +02:00

monetdb.nix

…

mongodb.nix

nixos/modules: Remove all usages of types.string

2019-08-31 18:19:00 +02:00

mysql.nix

nixos/mysql: fix mysqlReplication test

2019-10-13 19:18:51 +03:00

neo4j.nix

…

openldap.nix

nixos/modules: Remove all usages of types.string

2019-08-31 18:19:00 +02:00

opentsdb.nix

nixos/modules: Remove all usages of types.string

2019-08-31 18:19:00 +02:00

pgmanage.nix

…

postgresql.nix

move from 19.09 to 20.03

2019-09-22 12:27:39 +03:00

postgresql.xml

Revert "nixos/doc: re-format"

2019-09-19 19:17:30 +02:00

redis.nix

nixos/redis: fix merging

2019-11-08 15:38:06 +01:00

rethinkdb.nix

treewide: Switch to system users

2019-10-12 22:25:28 +02:00

riak-cs.nix

…

riak.nix

nixos/modules: Remove all usages of types.string

2019-08-31 18:19:00 +02:00

stanchion.nix

…

virtuoso.nix

…