Upgrade mysql and postgresql

[perso/Immae/Config/Nix.git] / nixops / modules / databases / mysql.nix

diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix
index a625d48be46f44f085985f85d27ce481314c4dfd..39d25d30cc78dd22a5a72200aae615cafbaf543f 100644 (file)
--- a/nixops/modules/databases/mysql.nix
+++ b/nixops/modules/databases/mysql.nix
@@ -1,5 +1,6 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }:
 let
+    pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays;
     cfg = config.services.myDatabases;
 in {
   options.services.myDatabases = {
@@ -14,13 +15,13 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
+    nixpkgs.overlays = [ (self: super: rec {
       mariadb = mariadbPAM;
-      mariadbPAM = oldpkgs.mariadb.overrideAttrs(old: rec {
+      mariadbPAM = super.mariadb.overrideAttrs(old: rec {
         cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
-        buildInputs = old.buildInputs ++ [ pkgs.pam ];
+        buildInputs = old.buildInputs ++ [ self.pam ];
       });
-    };
+    }) ];
 
     networking.firewall.allowedTCPPorts = [ 3306 ];