From cbd3318de33cfadd71504706d8c7135b843dce3c Mon Sep 17 00:00:00 2001
From: Lyes Saadi <dev@lyes.eu>
Date: Sun, 22 Mar 2026 19:30:56 +0100
Subject: [PATCH] Some fixes

---
 pkgs/belenios/lib.nix      |  1 -
 pkgs/belenios/server.nix   |  5 ++---
 pkgs/belenios/services.nix |  6 +++---
 pkgs/packages.nix          | 12 ++++++------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/belenios/lib.nix b/pkgs/belenios/lib.nix
index 21856d1..ca3c50b 100644
--- a/pkgs/belenios/lib.nix
+++ b/pkgs/belenios/lib.nix
@@ -26,4 +26,3 @@ ocamlPackages.buildDunePackage {
       yojson
     ]);
 }
-
diff --git a/pkgs/belenios/server.nix b/pkgs/belenios/server.nix
index 17634be..8e9bbfc 100644
--- a/pkgs/belenios/server.nix
+++ b/pkgs/belenios/server.nix
@@ -3,7 +3,6 @@
   belenios-lib,
   belenios-platform-native,
   belenios-platform-js,
-  ocsipersist-sqlite-config,
   ocamlPackages,
 }:
 
@@ -23,15 +22,15 @@ ocamlPackages.buildDunePackage {
       belenios-lib
       belenios-platform-native
       belenios-platform-js
-      ocsipersist-sqlite-config
     ]
     ++ (with ocamlPackages; [
       calendar
       csv
-      (eliom.override {ocsipersist = ocsipersist ;})
+      eliom
       gettext-camomile
       lwt
       ocamlnet
+      ocsipersist-sqlite-config
     ]);
 }
 
diff --git a/pkgs/belenios/services.nix b/pkgs/belenios/services.nix
index 7d8f356..1d19ec0 100644
--- a/pkgs/belenios/services.nix
+++ b/pkgs/belenios/services.nix
@@ -3,7 +3,7 @@
 let
   cfg = config.services.belenios;
 
-  configFile = pkgs.writeText "beleniosserver.conf" cfg.config;
+  configFile = pkgs.writeText "belenios-server.conf" cfg.config;
 
   inherit (lib) mkEnableOption mkPackageOption mkOption mkIf;
 in
@@ -11,7 +11,7 @@ in
   options.services.belenios = {
     enable = mkEnableOption "Whether to enable the Belenios Web server.";
 
-    package = mkPackageOption pkgs "belenios" {};
+    # package = mkPackageOption pkgs "belenios" {};
 
     config = mkOption {
       type = lib.types.str;
@@ -141,7 +141,7 @@ in
       after = [ "network.target" ];
 
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/belenios-server -c ${configFile}";
+        ExecStart = "${pkgs.local.belenios-server}/bin/belenios-server -c ${configFile}";
         Restart = "always";
         User = "belenios";
       };
diff --git a/pkgs/packages.nix b/pkgs/packages.nix
index 661e1c4..c112367 100644
--- a/pkgs/packages.nix
+++ b/pkgs/packages.nix
@@ -5,10 +5,10 @@ let
 in
 rec {
   belenios = pkgs.callPackage ./belenios { inherit ocamlPackages belenios-server belenios-tool; };
-  belenios-lib = pkgs.callPackage ./belenios/belenios-lib.nix { inherit belenios ocamlPackages belenios-platform; };
-  belenios-tool = pkgs.callPackage ./belenios/belenios-tool.nix { inherit belenios ocamlPackages belenios-lib belenios-platform belenios-platform-native; };
-  belenios-server = pkgs.callPackage ./belenios/belenios-server.nix { inherit belenios ocamlPackages belenios-lib belenios-platform-native belenios-platform-js; };
-  belenios-platform = pkgs.callPackage ./belenios/belenios-platform.nix { inherit belenios ocamlPackages; };
-  belenios-platform-native = pkgs.callPackage ./belenios/belenios-platform-native.nix { inherit belenios ocamlPackages belenios-platform; };
-  belenios-platform-js = pkgs.callPackage ./belenios/belenios-platform-js.nix { inherit belenios ocamlPackages belenios-platform; };
+  belenios-lib = pkgs.callPackage ./belenios/lib.nix { inherit belenios ocamlPackages belenios-platform; };
+  belenios-tool = pkgs.callPackage ./belenios/tool.nix { inherit belenios ocamlPackages belenios-lib belenios-platform belenios-platform-native; };
+  belenios-server = pkgs.callPackage ./belenios/server.nix { inherit belenios ocamlPackages belenios-lib belenios-platform-native belenios-platform-js; };
+  belenios-platform = pkgs.callPackage ./belenios/platform.nix { inherit belenios ocamlPackages; };
+  belenios-platform-native = pkgs.callPackage ./belenios/platform-native.nix { inherit belenios ocamlPackages belenios-platform; };
+  belenios-platform-js = pkgs.callPackage ./belenios/platform-js.nix { inherit belenios ocamlPackages belenios-platform; };
 }