TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-02 09:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename server -> restserver in nix setup

Browse Source 
While I'd like to rename it the other way around, it would be a much
more breaking change. So for now, this way.
This commit is contained in:
eikek 2024-03-10 10:22:36 +01:00
parent 8bcc88ed65
commit f3f246d798
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.nix
View File

@ -33,31 +33,31 @@
]; ];
docspellPkgs = pkgs.callPackage (import ./nix/pkg.nix) {}; docspellPkgs = pkgs.callPackage (import ./nix/pkg.nix) {};
dockerAmd64 = pkgs.pkgsCross.gnu64.callPackage (import ./nix/docker.nix) { dockerAmd64 = pkgs.pkgsCross.gnu64.callPackage (import ./nix/docker.nix) {
inherit (docspellPkgs) docspell-server docspell-joex; inherit (docspellPkgs) docspell-restserver docspell-joex;
}; };
dockerArm64 = pkgs.pkgsCross.aarch64-multiplatform.callPackage (import ./nix/docker.nix) { dockerArm64 = pkgs.pkgsCross.aarch64-multiplatform.callPackage (import ./nix/docker.nix) {
inherit (docspellPkgs) docspell-server docspell-joex; inherit (docspellPkgs) docspell-restserver docspell-joex;
}; };
in { in {
formatter = pkgs.alejandra; formatter = pkgs.alejandra;
packages = { packages = {
inherit (docspellPkgs) docspell-server docspell-joex; inherit (docspellPkgs) docspell-restserver docspell-joex;
}; };
legacyPackages = { legacyPackages = {
docker = { docker = {
amd64 = { amd64 = {
inherit (dockerAmd64) docspell-server docspell-joex; inherit (dockerAmd64) docspell-restserver docspell-joex;
}; };
arm64 = { arm64 = {
inherit (dockerArm64) docspell-server docspell-joex; inherit (dockerArm64) docspell-restserver docspell-joex;
}; };
}; };
}; };
checks = { checks = {
build-server = self.packages.${system}.docspell-server; build-server = self.packages.${system}.docspell-restserver;
build-joex = self.packages.${system}.docspell-joex; build-joex = self.packages.${system}.docspell-joex;
test = with import (nixpkgs + "/nixos/lib/testing-python.nix") test = with import (nixpkgs + "/nixos/lib/testing-python.nix")
@ -117,7 +117,7 @@
overlays.default = final: prev: let overlays.default = final: prev: let
docspellPkgs = final.callPackage (import ./nix/pkg.nix) {}; docspellPkgs = final.callPackage (import ./nix/pkg.nix) {};
in { in {
inherit (docspellPkgs) docspell-server docspell-joex; inherit (docspellPkgs) docspell-restserver docspell-joex;
}; };
nixosConfigurations = { nixosConfigurations = {

6
nix/docker.nix
View File

@ -9,7 +9,7 @@
tesseract4, tesseract4,
python3Packages, python3Packages,
unoconv, unoconv,
docspell-server, docspell-restserver,
docspell-joex, docspell-joex,
}: let }: let
mkImage = { mkImage = {
@ -64,10 +64,10 @@
tag = "v${pkg.version}"; tag = "v${pkg.version}";
}; };
in { in {
docspell-server = mkImage { docspell-restserver = mkImage {
name = "docspell-restserver"; name = "docspell-restserver";
port = 7880; port = 7880;
pkg = docspell-server; pkg = docspell-restserver;
tools = []; tools = [];
}; };
docspell-joex = mkImage { docspell-joex = mkImage {

4
nix/modules/server.nix
View File

@ -12,7 +12,7 @@ with lib; let
if cfg.runAs == null if cfg.runAs == null
then "docspell" then "docspell"
else cfg.runAs; else cfg.runAs;
configFile = pkgs.writeText "docspell-server.conf" '' configFile = pkgs.writeText "docspell-restserver.conf" ''
{"docspell": {"server": {"docspell": {"server":
${builtins.toJSON (lib.recursiveUpdate declared_config cfg.extraConfig)} ${builtins.toJSON (lib.recursiveUpdate declared_config cfg.extraConfig)}
}} }}
@ -878,7 +878,7 @@ in {
systemd.services.docspell-restserver = let systemd.services.docspell-restserver = let
args = builtins.concatStringsSep " " cfg.jvmArgs; args = builtins.concatStringsSep " " cfg.jvmArgs;
cmd = "${pkgs.docspell-server}/bin/docspell-restserver ${args} -- ${configFile}"; cmd = "${pkgs.docspell-restserver}/bin/docspell-restserver ${args} -- ${configFile}";
in { in {
description = "Docspell Rest Server"; description = "Docspell Rest Server";
after = ["networking.target"]; after = ["networking.target"];

5
nix/pkg.nix
View File

@ -14,9 +14,9 @@
sha256 = "sha256-flKWjEsMd2/XT3Bu6EjFgf3lCojvLbKFDEXemP1K+/8="; sha256 = "sha256-flKWjEsMd2/XT3Bu6EjFgf3lCojvLbKFDEXemP1K+/8=";
}; };
in { in {
docspell-server = stdenv.mkDerivation { docspell-restserver = stdenv.mkDerivation {
inherit version; inherit version;
pname = "docspell-server"; pname = "docspell-restserver";
src = fetchzip server; src = fetchzip server;
buildInputs = [jdk17]; buildInputs = [jdk17];
@ -30,6 +30,7 @@ in {
$out/docspell-restserver-${version}/bin/docspell-restserver -java-home ${jdk17} "\$@" $out/docspell-restserver-${version}/bin/docspell-restserver -java-home ${jdk17} "\$@"
EOF EOF
chmod 755 $out/bin/docspell-restserver chmod 755 $out/bin/docspell-restserver
''; '';
}; };

8
website/site/content/docs/install/nix.md
View File

@ -14,7 +14,7 @@ described below.
You can try out the server and joex packages by running the following: You can try out the server and joex packages by running the following:
``` ```
nix run github:eikek/docspell#docspell-server nix run github:eikek/docspell#docspell-restserver
nix run github:eikek/docspell#docspell-joex nix run github:eikek/docspell#docspell-joex
``` ```
@ -42,7 +42,7 @@ from this repository.
You could install the server and joex by running the following: You could install the server and joex by running the following:
``` ```
nix profile install github:eikek/docspell#docspell-server nix profile install github:eikek/docspell#docspell-restserver
nix profile install github:eikek/docspell#docspell-joex nix profile install github:eikek/docspell#docspell-joex
``` ```
@ -184,7 +184,7 @@ You can also look at `nix/test-vm.nix` for another example.
## Without Flakes ## Without Flakes
Of course, you can also use it without flakes. There is `nix/pkg.nix` Of course, you can also use it without flakes. There is `nix/pkg.nix`
which contains the derivation of both packages, `docspell-server` and which contains the derivation of both packages, `docspell-restserver` and
`docspell-joex`. Just call it with your nixpkgs instance as usual: `docspell-joex`. Just call it with your nixpkgs instance as usual:
``` nix ``` nix
@ -196,7 +196,7 @@ let
docspellPkgs = pkgs.callPackage (import "${repo}/nix/pkg.nix") {}; docspellPkgs = pkgs.callPackage (import "${repo}/nix/pkg.nix") {};
in in
# #
# use docspellPkgs.docspell-server or docspellPkgs.docspell-joex # use docspellPkgs.docspell-restserver or docspellPkgs.docspell-joex
# #
``` ```