Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xandikos: 0.1.0 -> 0.2.2 #89498

Merged
merged 4 commits into from
Jul 6, 2020
Merged

xandikos: 0.1.0 -> 0.2.2 #89498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b5a1e4
xandikos: 0.1.0 -> 0.2.1
0x4A6F May 5, 2020
71a137a
nixos/xandikos: update listen-address parameter
0x4A6F May 8, 2020
79df7e6
nixosTests.xandikos: fix route-prefix
0x4A6F May 8, 2020
b51258e
xandikos: 0.2.1 -> 0.2.2
0x4A6F Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/xandikos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ in
ExecStart = ''
${cfg.package}/bin/xandikos \
--directory /var/lib/xandikos \
--listen_address ${cfg.address} \
--listen-address ${cfg.address} \
--port ${toString cfg.port} \
--route-prefix ${cfg.routePrefix} \
${lib.concatStringsSep " " cfg.extraOptions}
Expand Down
4 changes: 2 additions & 2 deletions nixos/tests/xandikos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import ./make-test-python.nix (
services.xandikos.enable = true;
services.xandikos.address = "localhost";
services.xandikos.port = 8080;
services.xandikos.routePrefix = "/xandikos/";
services.xandikos.routePrefix = "/xandikos-prefix/";
services.xandikos.extraOptions = [
"--defaults"
];
Expand All @@ -28,7 +28,7 @@ import ./make-test-python.nix (
serverName = "xandikos.local";
basicAuth.xandikos = "snakeOilPassword";
locations."/xandikos/" = {
proxyPass = "http://localhost:8080/";
proxyPass = "http://localhost:8080/xandikos-prefix/";
};
};
};
Expand Down
7 changes: 5 additions & 2 deletions pkgs/servers/xandikos/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@

python3Packages.buildPythonApplication rec {
pname = "xandikos";
version = "0.1.0";
version = "0.2.2";

src = fetchFromGitHub {
owner = "jelmer";
repo = "xandikos";
rev = "v${version}";
sha256 = "12r8fciid2qpqf054584ywwh49yddyhhpkpcm6jihzyr5y2r4kn1";
sha256 = "1b75r3ipjmk48nvc99zib8gc8xpsb3m0ssg7k0am3zmryi7i19h7";
};

propagatedBuildInputs = with python3Packages; [
aiohttp
dulwich
defusedxml
icalendar
jinja2
multidict
prometheus_client
];

meta = with stdenv.lib; {
Expand Down