Migrate packageOverrides to overlays

diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix
index a625d48be46f44f085985f85d27ce481314c4dfd..635f212c2d49a48ccb62d06d1376ca0281162a62 100644 (file)
--- 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 2e658f8fd232c7a3d90040359fb39d8195754062..f839d6338a10eadd73df4c3c921e13de5e111b8a 100644 (file)
--- 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 ];
 

diff --git a/nixops/modules/ftp/default.nix b/nixops/modules/ftp/default.nix
index 7f3fd621009b1ae9d09c803f6ee2ba6dc4b21d80..af9a75c0f04c2f9961a1077285587060042c1ff1 100644 (file)
--- a/nixops/modules/ftp/default.nix
+++ b/nixops/modules/ftp/default.nix
@@ -19,9 +19,9 @@
       extraDomains = { "ftp.immae.eu" = null; };
     };
 
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
-      pure-ftpd = pkgs.callPackage ./pure-ftpd.nix {};
-    };
+    nixpkgs.overlays = [ (self: super: {
+      pure-ftpd = self.callPackage ./pure-ftpd.nix {};
+    }) ];
 
     networking = {
       firewall = {

diff --git a/nixops/modules/gitolite/default.nix b/nixops/modules/gitolite/default.nix
index 21eabc44783e028d7ccf3f9fff1e952193f67076..44442ea131c191e281baa0db9c5c1ad9fcb09169 100644 (file)
--- a/nixops/modules/gitolite/default.nix
+++ b/nixops/modules/gitolite/default.nix
@@ -11,18 +11,18 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
-      gitolite = oldpkgs.gitolite.overrideAttrs(old: rec {
+    nixpkgs.overlays = [ (self: super: rec {
+      gitolite = super.gitolite.overrideAttrs(old: rec {
         name = "gitolite-${version}";
         version = "3.6.10";
-        src = pkgs.fetchFromGitHub {
+        src = self.fetchFromGitHub {
           owner = "sitaramc";
           repo = "gitolite";
           rev = "v${version}";
           sha256 = "0p2697mn6rwm03ndlv7q137zczai82n41aplq1g006ii7f12xy8h";
         };
       });
-    };
+    }) ];
 
     networking.firewall.allowedTCPPorts = [ 9418 ];
 

diff --git a/nixops/modules/irc/default.nix b/nixops/modules/irc/default.nix
index a7e45ba48a0f577c9785c913d07bd6aea3f5dfea..37cb53b881429533666894d25ef456ea47951acb 100644 (file)
--- a/nixops/modules/irc/default.nix
+++ b/nixops/modules/irc/default.nix
@@ -69,11 +69,11 @@ in
       '';
     };
 
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
-      bitlbee = oldpkgs.bitlbee.overrideAttrs(old: {
+    nixpkgs.overlays = [ (self: super: rec {
+      bitlbee = super.bitlbee.overrideAttrs(old: {
         patches = (old.patches or []) ++ [ ./bitlbee_long_nicks.patch ];
       });
-    };
+    }) ];
 
     networking.firewall.allowedTCPPorts = [ 6697 ];
     services.bitlbee = {

diff --git a/nixops/modules/websites/commons/stats.nix b/nixops/modules/websites/commons/stats.nix
index e2c1e62f73402a52a821fb670bb513b0682f1792..921cde28157e9e3b3ab4045674177afcc6f345c8 100644 (file)
--- a/nixops/modules/websites/commons/stats.nix
+++ b/nixops/modules/websites/commons/stats.nix
@@ -23,18 +23,18 @@ in {
       pkgs.goaccess
     ];
 
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
-      goaccess = oldpkgs.goaccess.overrideAttrs(old: rec {
+    nixpkgs.overlays = [ (self: super: rec {
+      goaccess = super.goaccess.overrideAttrs(old: rec {
         name = "goaccess-${version}";
         version = "1.3";
-        src = pkgs.fetchurl {
+        src = self.fetchurl {
           url = "https://tar.goaccess.io/${name}.tar.gz";
           sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc";
         };
         configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ];
-        buildInputs = old.buildInputs ++ [ pkgs.tokyocabinet pkgs.bzip2 ];
+        buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ];
       });
-    };
+    }) ];
 
     services.cron = {
       enable = true;

diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index c8f7481935ba3cae48ab7b9b3385da06758b9da9..14f21160a71d98a83bce8aab32e3b7e99b025668 100644 (file)
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -179,10 +179,10 @@ in
       ];
     };
 
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
+    nixpkgs.overlays = [ (self: super: rec {
       php = php72;
-      php72 = (oldpkgs.php72.override {
-        mysql.connector-c = pkgs.mariadb;
+      php72 = (super.php72.override {
+        mysql.connector-c = self.mariadb;
         config.php.mysqlnd = false;
         config.php.mysqli = false;
       }).overrideAttrs(old: rec {
@@ -196,11 +196,11 @@ in
         #     ext/mysqli/mysqli.c ext/mysqli/mysqli_prop.c
         #   '';
       });
-      phpPackages = oldpkgs.php72Packages.override { inherit php; };
+      phpPackages = super.php72Packages.override { inherit php; };
       composerEnv = import ./commons/composer-env.nix {
-        inherit (pkgs) stdenv writeTextFile fetchurl php unzip;
+        inherit (self) stdenv writeTextFile fetchurl php unzip;
       };
-    };
+    }) ];
 
     services.myWebsites.tools.databases.enable = true;
     services.myWebsites.tools.tools.enable = true;

diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix
index 2aa86cda6f9a72557f122e02a8245f99eb7db123..11b0245c1c29867d5f19b3df5277bb10ed2b1fab 100644 (file)
--- a/nixops/modules/websites/tools/git/default.nix
+++ b/nixops/modules/websites/tools/git/default.nix
@@ -15,13 +15,13 @@ in {
   config = lib.mkIf cfg.enable {
     security.acme.certs."eldiron".extraDomains."git.immae.eu" = null;
 
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
-      gitweb = oldpkgs.gitweb.overrideAttrs(old: {
+    nixpkgs.overlays = [ (self: super: rec {
+      gitweb = super.gitweb.overrideAttrs(old: {
         installPhase = old.installPhase + ''
           cp -r ${./gitweb/theme} $out/gitweb-theme;
           '';
       });
-    };
+    }) ];
 
     services.myWebsites.tools.modules =
       gitweb.apache.modules ++

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index e0181c4f82a9bcd4d616e654fe818334b690ae92..3b490772bf64559e6568456cf31175ee619914a7 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -156,9 +156,9 @@ in {
       ln -s ${yourls.webRoot} $out/webapps/${yourls.apache.webappName}
       '';
 
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
-      ympd = oldpkgs.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json);
-    };
+    nixpkgs.overlays = [ (self: super: rec {
+      ympd = super.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json);
+    }) ];
 
     systemd.services.tt-rss = {
       description = "Tiny Tiny RSS feeds update daemon";