diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-02 02:43:40 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-02 02:43:59 +0200 |
commit | 851f25966e419564e2288c6dc675d0954da7e8cf (patch) | |
tree | 61527f980722691be22bc0d70586fdcc33c004a2 | |
parent | c1b6f97a72e0b4897ce11414df28259d4ea3c5ab (diff) | |
download | Nix-851f25966e419564e2288c6dc675d0954da7e8cf.tar.gz Nix-851f25966e419564e2288c6dc675d0954da7e8cf.tar.zst Nix-851f25966e419564e2288c6dc675d0954da7e8cf.zip |
Adapt postgresql overlay
Many packages depend on postgresql but are not tied to custom version
-rw-r--r-- | nixops/modules/databases/postgresql.nix | 4 | ||||
-rw-r--r-- | overlays/databases/mysql/default.nix | 5 | ||||
-rw-r--r-- | overlays/databases/postgresql/default.nix | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix index 0afce70..b113e9f 100644 --- a/nixops/modules/databases/postgresql.nix +++ b/nixops/modules/databases/postgresql.nix | |||
@@ -14,6 +14,10 @@ in { | |||
14 | }; | 14 | }; |
15 | 15 | ||
16 | config = lib.mkIf cfg.enable { | 16 | config = lib.mkIf cfg.enable { |
17 | nixpkgs.overlays = [ (self: super: rec { | ||
18 | postgresql = self.postgresql_11_custom; | ||
19 | }) ]; | ||
20 | |||
17 | networking.firewall.allowedTCPPorts = [ 5432 ]; | 21 | networking.firewall.allowedTCPPorts = [ 5432 ]; |
18 | 22 | ||
19 | security.acme.certs."postgresql" = config.services.myCertificates.certConfig // { | 23 | security.acme.certs."postgresql" = config.services.myCertificates.certConfig // { |
diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix index 24bad1b..5e40284 100644 --- a/overlays/databases/mysql/default.nix +++ b/overlays/databases/mysql/default.nix | |||
@@ -3,5 +3,10 @@ self: super: rec { | |||
3 | mariadbPAM = super.mariadb.overrideAttrs(old: { | 3 | mariadbPAM = super.mariadb.overrideAttrs(old: { |
4 | cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; | 4 | cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; |
5 | buildInputs = old.buildInputs ++ [ self.pam ]; | 5 | buildInputs = old.buildInputs ++ [ self.pam ]; |
6 | }) // (with super.mariadb; { | ||
7 | inherit client; | ||
8 | servier = super.mariadb; | ||
9 | inherit connector-c; | ||
10 | inherit galera; | ||
6 | }); | 11 | }); |
7 | } | 12 | } |
diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix index 8dec7ff..8d1405e 100644 --- a/overlays/databases/postgresql/default.nix +++ b/overlays/databases/postgresql/default.nix | |||
@@ -1,6 +1,5 @@ | |||
1 | self: super: rec { | 1 | self: super: rec { |
2 | postgresql = postgresql_11; | 2 | postgresql_11_custom = super.postgresql_11.overrideAttrs(old: { |
3 | postgresql_11 = super.postgresql_11.overrideAttrs(old: { | ||
4 | # datadir in /var/lib/postgresql is named after psqlSchema | 3 | # datadir in /var/lib/postgresql is named after psqlSchema |
5 | passthru = old.passthru // { psqlSchema = "11.0"; }; | 4 | passthru = old.passthru // { psqlSchema = "11.0"; }; |
6 | configureFlags = old.configureFlags ++ [ "--with-pam" ]; | 5 | configureFlags = old.configureFlags ++ [ "--with-pam" ]; |