public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89498 from 0x4A6F/master-xandikos

Browse Source 
xandikos: 0.1.0 -> 0.2.2
This commit is contained in:
Benjamin Hipple 2020-07-05 20:04:50 -04:00 committed by GitHub
commit 1e835d98c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/xandikos.nix
View File

@ -122,7 +122,7 @@ in
ExecStart = '' ExecStart = ''
${cfg.package}/bin/xandikos \ ${cfg.package}/bin/xandikos \
--directory /var/lib/xandikos \ --directory /var/lib/xandikos \
--listen_address ${cfg.address} \ --listen-address ${cfg.address} \
--port ${toString cfg.port} \ --port ${toString cfg.port} \
--route-prefix ${cfg.routePrefix} \ --route-prefix ${cfg.routePrefix} \
${lib.concatStringsSep " " cfg.extraOptions} ${lib.concatStringsSep " " cfg.extraOptions}

4
nixos/tests/xandikos.nix
View File

@ -17,7 +17,7 @@ import ./make-test-python.nix (
services.xandikos.enable = true; services.xandikos.enable = true;
services.xandikos.address = "localhost"; services.xandikos.address = "localhost";
services.xandikos.port = 8080; services.xandikos.port = 8080;
services.xandikos.routePrefix = "/xandikos/"; services.xandikos.routePrefix = "/xandikos-prefix/";
services.xandikos.extraOptions = [ services.xandikos.extraOptions = [
"--defaults" "--defaults"
]; ];
@ -28,7 +28,7 @@ import ./make-test-python.nix (
serverName = "xandikos.local"; serverName = "xandikos.local";
basicAuth.xandikos = "snakeOilPassword"; basicAuth.xandikos = "snakeOilPassword";
locations."/xandikos/" = { locations."/xandikos/" = {
proxyPass = "http://localhost:8080/"; proxyPass = "http://localhost:8080/xandikos-prefix/";
}; };
}; };
}; };

7
pkgs/servers/xandikos/default.nix
View File

@ -5,20 +5,23 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "xandikos"; pname = "xandikos";
version = "0.1.0"; version = "0.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jelmer"; owner = "jelmer";
repo = "xandikos"; repo = "xandikos";
rev = "v${version}"; rev = "v${version}";
sha256 = "12r8fciid2qpqf054584ywwh49yddyhhpkpcm6jihzyr5y2r4kn1"; sha256 = "1b75r3ipjmk48nvc99zib8gc8xpsb3m0ssg7k0am3zmryi7i19h7";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
aiohttp
dulwich dulwich
defusedxml defusedxml
icalendar icalendar
jinja2 jinja2
multidict
prometheus_client
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {