X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=29440abf7548ab8d948e9d6602a2765d6f59f667;hb=776aa3603903616702b8bc1d9e955d3a6da9ee1e;hp=fd31984c88d0bbdfb0e315616e4218bc095462cf;hpb=c7b16397101fd534c41ede5ae7c55e7e120c06f7;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index fd31984..29440ab 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -1,7 +1,5 @@
-{ lib, pkgs, config, ... }:
+{ lib, pkgs, config, flakes, ... }:
 let
-  flakeCompat = import ../../../../../lib/flake-compat.nix;
-
   adminer = pkgs.callPackage ./adminer.nix {};
   ympd = pkgs.callPackage ./ympd.nix {
     env = config.myEnv.tools.ympd;
@@ -47,7 +45,7 @@ let
     inherit config;
   };
   grocy = pkgs.callPackage ./grocy.nix {
-    grocy = pkgs.webapps.grocy.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; };
+    grocy = flakes.subflakes.public.grocy.defaultPackage.x86_64-linux.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; };
   };
   phpbb = pkgs.callPackage ./phpbb.nix {
     phpbb = (pkgs.webapps.phpbb.withLangs (l: [ l.fr ])).withExts (e: [
@@ -75,7 +73,7 @@ let
   pcfg = config.services.phpfpm.pools;
 in {
   imports =
-    builtins.attrValues (flakeCompat ../../../../../flakes/private/paste).nixosModules;
+    builtins.attrValues flakes.subflakes.private.paste.nixosModules;
 
   options.myServices.websites.tools.tools = {
     enable = lib.mkEnableOption "enable tools website";