Adapt postgresql overlay

Many packages depend on postgresql but are not tied to custom version

diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix
index 0afce70ceb8aa22b9311b69f53b36975ab15d721..b113e9fd8a6967e986bc8e4337ec201ac7f649d1 100644 (file)
--- a/nixops/modules/databases/postgresql.nix
+++ b/nixops/modules/databases/postgresql.nix
@@ -14,6 +14,10 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [ (self: super: rec {
+      postgresql = self.postgresql_11_custom;
+    }) ];
+
     networking.firewall.allowedTCPPorts = [ 5432 ];
 
     security.acme.certs."postgresql" = config.services.myCertificates.certConfig // {

diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix
index 24bad1b6e551faf6336f0dac612397ced10aef9a..5e40284114df946b16e39450a953bd44eb0e04bc 100644 (file)
--- a/overlays/databases/mysql/default.nix
+++ b/overlays/databases/mysql/default.nix
@@ -3,5 +3,10 @@ self: super: rec {
   mariadbPAM = super.mariadb.overrideAttrs(old: {
     cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
     buildInputs = old.buildInputs ++ [ self.pam ];
+  }) // (with super.mariadb; {
+    inherit client;
+    servier = super.mariadb;
+    inherit connector-c;
+    inherit galera;
   });
 }

diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix
index 8dec7fff303989e28a4c1b321fe478b285f3500c..8d1405e34e436decac1ae60ef6f2db5f4fb8e7bc 100644 (file)
--- a/overlays/databases/postgresql/default.nix
+++ b/overlays/databases/postgresql/default.nix
@@ -1,6 +1,5 @@
 self: super: rec {
-  postgresql = postgresql_11;
-  postgresql_11 = super.postgresql_11.overrideAttrs(old: {
+  postgresql_11_custom = super.postgresql_11.overrideAttrs(old: {
     # datadir in /var/lib/postgresql is named after psqlSchema
     passthru = old.passthru // { psqlSchema = "11.0"; };
     configureFlags = old.configureFlags ++ [ "--with-pam" ];