Merge pull request #178852 from NickCao/maddy

maddy: 0.5.4 -> 0.6.2
This commit is contained in:
Mario Rodas 2022-07-01 22:54:01 -05:00 committed by GitHub
commit 10dde21ef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View File

@ -49,7 +49,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
server.wait_for_open_port(143) server.wait_for_open_port(143)
server.wait_for_open_port(587) 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") server.succeed("maddyctl imap-acct create postmaster@server")
client.succeed("send-testmail") client.succeed("send-testmail")

View File

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "maddy"; pname = "maddy";
version = "0.5.4"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "foxcpp"; owner = "foxcpp";
repo = "maddy"; repo = "maddy";
rev = "v${version}"; 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}" ]; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ];
subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; subPackages = [ "cmd/maddy" ];
nativeBuildInputs = [ installShellFiles scdoc ]; nativeBuildInputs = [ installShellFiles scdoc ];
@ -26,6 +26,8 @@ buildGoModule rec {
installManPage "$page" installManPage "$page"
done done
ln -s "$out/bin/maddy" "$out/bin/maddyctl"
mkdir -p $out/lib/systemd/system mkdir -p $out/lib/systemd/system
substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \