diff options
| -rw-r--r-- | nixos/tests/maddy.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/maddy/default.nix | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nixos/tests/maddy.nix b/nixos/tests/maddy.nix index 581748c1fa59b..b9d0416482da1 100644 --- a/nixos/tests/maddy.nix +++ b/nixos/tests/maddy.nix @@ -49,7 +49,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { server.wait_for_open_port(143) server.wait_for_open_port(587) - server.succeed("echo test | maddyctl creds create postmaster@server") + server.succeed("maddyctl creds create --password test postmaster@server") server.succeed("maddyctl imap-acct create postmaster@server") client.succeed("send-testmail") diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 11da56c6eb991..6ea2128409711 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "maddy"; - version = "0.5.4"; + version = "0.6.2"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-FWoPAb/aHaQLxT+UUUoViCmLvauVuAzUyOmRNB8F72U="; + sha256 = "sha256-DBSqC4EteESYb6RbC2xyS+6YczGviWYnyMz7QvCO3Uc="; }; - vendorSha256 = "sha256-rcHboPfs2mWg3sgsLmN1IPoppmuDcsx0bQICp6EzYsQ="; + vendorSha256 = "sha256-10cLNl9jWYX8XIKQkCxJ+/ymZC1YJRHUJWZQhq7zeV4="; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; - subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; + subPackages = [ "cmd/maddy" ]; nativeBuildInputs = [ installShellFiles scdoc ]; @@ -26,6 +26,8 @@ buildGoModule rec { installManPage "$page" done + ln -s "$out/bin/maddy" "$out/bin/maddyctl" + mkdir -p $out/lib/systemd/system substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ |