From 163209681ba8419c38ea253a6ec4d082070eb72d Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Thu, 18 Dec 2025 17:18:17 +0100
Subject: modules/sharkey: Use the up-streamed nixpkgs module

This works now, as we updated to 25.11.
---
 modules/by-name/sh/sharkey/module.nix | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'modules')

diff --git a/modules/by-name/sh/sharkey/module.nix b/modules/by-name/sh/sharkey/module.nix
index 155d658..18bf394 100644
--- a/modules/by-name/sh/sharkey/module.nix
+++ b/modules/by-name/sh/sharkey/module.nix
@@ -3,22 +3,11 @@
   lib,
   pkgs,
   pkgsUnstable,
-  nixpkgs-unstable,
   ...
 }: let
   cfg = config.vhack.sharkey;
 in {
-  imports = [
-    # TODO(@bpeetz): Remove this import once we update to NixOS 25.11 <2025-07-12>
-    "${nixpkgs-unstable}/nixos/modules/services/web-apps/sharkey.nix"
-  ];
-
   options = {
-    services.meilisearch.settings = lib.mkOption {
-      type = lib.types.attrsOf lib.type.anything;
-      default = {};
-    };
-
     vhack.sharkey = {
       enable = lib.mkEnableOption "sharkey";
 
@@ -88,14 +77,10 @@ in {
     };
 
     systemd.services.sharkey = {
-      # TODO(@bpeetz): `postgresql.target` is only available in NixOS 25.11, as such we
-      # need to override this back to the postgresql.service. <2025-07-12>
-      after = lib.mkForce [
-        "postgresql.service"
+      after = [
         "redis-sharkey.service"
       ];
-      bindsTo = lib.mkForce [
-        "postgresql.service"
+      bindsTo = [
         "redis-sharkey.service"
       ];
 
-- 
cgit 1.4.1