crans
/
nixos
mirror of https://gitlab.crans.org/nounous/nixos
19
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some fixes

belenios
Lyes Saadi 2026-03-22 19:30:56 +01:00
parent 1509b60542
commit cbd3318de3
No known key found for this signature in database
GPG Key ID: 55A1D803917CF39A
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/belenios/lib.nix
View File

@ -26,4 +26,3 @@ ocamlPackages.buildDunePackage {
yojson yojson
]); ]);
} }

5
pkgs/belenios/server.nix
View File

@ -3,7 +3,6 @@
belenios-lib, belenios-lib,
belenios-platform-native, belenios-platform-native,
belenios-platform-js, belenios-platform-js,
ocsipersist-sqlite-config,
ocamlPackages, ocamlPackages,
}: }:
@ -23,15 +22,15 @@ ocamlPackages.buildDunePackage {
belenios-lib belenios-lib
belenios-platform-native belenios-platform-native
belenios-platform-js belenios-platform-js
ocsipersist-sqlite-config
] ]
++ (with ocamlPackages; [ ++ (with ocamlPackages; [
calendar calendar
csv csv
(eliom.override {ocsipersist = ocsipersist ;}) eliom
gettext-camomile gettext-camomile
lwt lwt
ocamlnet ocamlnet
ocsipersist-sqlite-config
]); ]);
} }

6
pkgs/belenios/services.nix
View File

@ -3,7 +3,7 @@
let let
cfg = config.services.belenios; 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; inherit (lib) mkEnableOption mkPackageOption mkOption mkIf;
in in
@ -11,7 +11,7 @@ in
options.services.belenios = { options.services.belenios = {
enable = mkEnableOption "Whether to enable the Belenios Web server."; enable = mkEnableOption "Whether to enable the Belenios Web server.";
package = mkPackageOption pkgs "belenios" {}; # package = mkPackageOption pkgs "belenios" {};
config = mkOption { config = mkOption {
type = lib.types.str; type = lib.types.str;
@ -141,7 +141,7 @@ in
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/bin/belenios-server -c ${configFile}"; ExecStart = "${pkgs.local.belenios-server}/bin/belenios-server -c ${configFile}";
Restart = "always"; Restart = "always";
User = "belenios"; User = "belenios";
}; };

12
pkgs/packages.nix
View File

@ -5,10 +5,10 @@ let
in in
rec { rec {
belenios = pkgs.callPackage ./belenios { inherit ocamlPackages belenios-server belenios-tool; }; belenios = pkgs.callPackage ./belenios { inherit ocamlPackages belenios-server belenios-tool; };
belenios-lib = pkgs.callPackage ./belenios/belenios-lib.nix { inherit belenios ocamlPackages belenios-platform; }; belenios-lib = pkgs.callPackage ./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-tool = pkgs.callPackage ./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-server = pkgs.callPackage ./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 = pkgs.callPackage ./belenios/platform.nix { inherit belenios ocamlPackages; };
belenios-platform-native = pkgs.callPackage ./belenios/belenios-platform-native.nix { inherit belenios ocamlPackages belenios-platform; }; belenios-platform-native = pkgs.callPackage ./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-platform-js = pkgs.callPackage ./belenios/platform-js.nix { inherit belenios ocamlPackages belenios-platform; };
} }