From 2368a4b7e827b985c3758ad0bfe13e4a08d27c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 23 Mar 2019 15:35:32 +0100
Subject: Migrate packageOverrides to overlays

---
 nixops/modules/websites/tools/git/default.nix   | 6 +++---
 nixops/modules/websites/tools/tools/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'nixops/modules/websites/tools')

diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix
index 2aa86cd..11b0245 100644
--- 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 e0181c4..3b49077 100644
--- 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";
-- 
cgit v1.2.3