Migrate packageOverrides to overlays

2 files changed, 9 insertions, 9 deletions

diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix
index a625d48..635f212 100644
--- a/nixops/modules/databases/mysql.nix
+++ b/nixops/modules/databases/mysql.nix
@@ -14,13 +14,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 ];
 
diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix
index 2e658f8..f839d63 100644
--- a/nixops/modules/databases/postgresql.nix
+++ b/nixops/modules/databases/postgresql.nix
@@ -14,22 +14,22 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
+    nixpkgs.overlays = [ (self: super: rec {
       postgresql = postgresql111;
-      postgresql111 = oldpkgs.postgresql100.overrideAttrs(old: rec {
+      postgresql111 = super.postgresql100.overrideAttrs(old: rec {
         passthru = old.passthru // { psqlSchema = "11.0"; };
         name = "postgresql-11.1";
-        src = pkgs.fetchurl {
+        src = self.fetchurl {
           url = "mirror://postgresql/source/v11.1/${name}.tar.bz2";
           sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
         };
         configureFlags = old.configureFlags ++ [ "--with-pam" ];
-        buildInputs = (old.buildInputs or []) ++ [ pkgs.pam ];
+        buildInputs = (old.buildInputs or []) ++ [ self.pam ];
         patches = old.patches ++ [
           ./postgresql_run_socket_path.patch
         ];
       });
-    };
+    }) ];
 
     networking.firewall.allowedTCPPorts = [ 5432 ];