Unverified Commit e139dbfa authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

mailhog: update mhsendmail to support the new args; nixosTests.mailhog:... 

mailhog: update mhsendmail to support the new args; nixosTests.mailhog: reenable the flags (#399461)
parents 32c543a3 6b2d2f75

nixos/tests/mailhog.nix

+4 −6
Original line number Diff line number Diff line
@@ -6,9 +6,7 @@ 
    RTUnreal

  ];



  nodes.machine =

    { pkgs, ... }:

    {

  nodes.machine = _: {

    services.mailhog.enable = true;

  };
@@ -19,7 +17,7 @@ 
    machine.wait_for_open_port(1025)

    machine.wait_for_open_port(8025)

    # Test sendmail wrapper (this uses smtp, which tests the connection)

    machine.succeed('printf "To: root@example.com\r\n\r\nthis is the body of the email" | sendmail -f sender@example.com')

    machine.succeed('printf "To: root@example.com\r\n\r\nthis is the body of the email" | sendmail -t -i -f sender@example.com')

    res = machine.succeed(

        "curl --fail http://localhost:8025/api/v2/messages"

    )

pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch

+27 −22
Original line number Diff line number Diff line 
From ba00547a25bfea641d0c8a5dba42a6ace990767b Mon Sep 17 00:00:00 2001

From 0ffd4dcbc7df1510213ec8f2c20b94fb016d390e Mon Sep 17 00:00:00 2001

From: wxt <3264117476@qq.com>

Date: Mon, 4 Nov 2024 11:04:05 +0800

Subject: [PATCH] Add go.mod & go.sum

Date: Thu, 17 Apr 2025 20:52:12 +0800

Subject: [PATCH] Update go.mod & go.sum



---

 go.mod | 36 ++++++++++++++++++++++++++++

 go.sum | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 2 files changed, 112 insertions(+)

 go.mod | 37 +++++++++++++++++++++++++++

 go.sum | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 2 files changed, 117 insertions(+)

 create mode 100644 go.mod

 create mode 100644 go.sum



diff --git a/go.mod b/go.mod

new file mode 100644

index 0000000..b09f764

index 0000000..594f99f

--- /dev/null

+++ b/go.mod

@@ -0,0 +1,36 @@

@@ -0,0 +1,37 @@

+module github.com/mailhog/MailHog

+

+go 1.23.2

+go 1.24.1

+

+require (

+	github.com/gorilla/pat v1.0.2
@@ -27,8 +27,8 @@ index 0000000..b09f764 
+	github.com/mailhog/MailHog-Server v1.0.1

+	github.com/mailhog/MailHog-UI v1.0.1

+	github.com/mailhog/http v1.0.1

+	github.com/mailhog/mhsendmail v0.2.0

+	golang.org/x/crypto v0.28.0

+	github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c

+	golang.org/x/crypto v0.37.0

+)

+

+require (
@@ -45,19 +45,20 @@ index 0000000..b09f764 
+	github.com/ogier/pflag v0.0.1 // indirect

+	github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect

+	github.com/smartystreets/goconvey v1.8.1 // indirect

+	github.com/stretchr/testify v1.9.0 // indirect

+	github.com/spf13/pflag v1.0.6 // indirect

+	github.com/stretchr/testify v1.10.0 // indirect

+	github.com/t-k/fluent-logger-golang v1.0.0 // indirect

+	github.com/tinylib/msgp v1.2.4 // indirect

+	github.com/tinylib/msgp v1.2.5 // indirect

+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

+	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect

+	gopkg.in/yaml.v2 v2.4.0 // indirect

+)

diff --git a/go.sum b/go.sum

new file mode 100644

index 0000000..9089971

index 0000000..87a8922

--- /dev/null

+++ b/go.sum

@@ -0,0 +1,76 @@

@@ -0,0 +1,80 @@

+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=

+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=

+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -100,6 +101,8 @@ index 0000000..9089971 
+github.com/mailhog/http v1.0.1/go.mod h1:91oqUCI9ZoSDY2cTj4pWDJVBHCK1U762V2a4if4KlOw=

+github.com/mailhog/mhsendmail v0.2.0 h1:C5HUC4obHfXIkttLfGBUopYbsJmh+bnExGWHBpWQ8IA=

+github.com/mailhog/mhsendmail v0.2.0/go.mod h1:B0778+OoPEc5aEFqatEnSO4ZWl9FCTxvaY+c7OOQadM=

+github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c h1:Tci7WxOyjr3Vs+oCoMT4F4LMNsaxh4eJzq9CKivNRuo=

+github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c/go.mod h1:B0778+OoPEc5aEFqatEnSO4ZWl9FCTxvaY+c7OOQadM=

+github.com/mailhog/smtp v1.0.1 h1:igL3N/L+pWuGCqUaje21HX3VIVnqHoVlqWO0t+wJEYE=

+github.com/mailhog/smtp v1.0.1/go.mod h1:GMrAdv1hXro38xj5dsWPAk5ZiXJHFx9t7W9Yqsk0XUM=

+github.com/mailhog/storage v1.0.1 h1:uut2nlG5hIxbsl6f8DGznPAHwQLf3/7Na2t4gmrIais=
@@ -117,14 +120,16 @@ index 0000000..9089971 
+github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=

+github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=

+github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=

+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=

+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=

+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=

+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=

+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=

+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=

+github.com/t-k/fluent-logger-golang v1.0.0 h1:4IQzY+/l66Zkkhk9eB3LwF9vPkgKHJ1rpYdrRiap0EI=

+github.com/t-k/fluent-logger-golang v1.0.0/go.mod h1:6vC3Vzp9Kva0l5J9+YDY5/ROePwkAqwLK+KneCjSm4w=

+github.com/tinylib/msgp v1.2.4 h1:yLFeUGostXXSGW5vxfT5dXG/qzkn4schv2I7at5+hVU=

+github.com/tinylib/msgp v1.2.4/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=

+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=

+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=

+github.com/tinylib/msgp v1.2.5 h1:WeQg1whrXRFiZusidTQqzETkRpGjFjcIhW6uqWH09po=

+github.com/tinylib/msgp v1.2.5/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=

+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=

+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=

+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -135,5 +140,5 @@ index 0000000..9089971 
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

-- 

2.46.1

2.48.1

pkgs/by-name/ma/mailhog/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ buildGoModule rec { 
  };



  patches = [

    # Generate by go mod init github.com/mailhog/MailHog && go mod tidy

    # Generate by go mod init github.com/mailhog/MailHog && go mod tidy && go get github.com/mailhog/mhsendmail@9e70164f299c9e06af61402e636f5bbdf03e7dbb

    ./0001-Add-go.mod-go.sum.patch

  ];



  vendorHash = "sha256-yYMgNpthBwmDeD4pgnVj88OJWiPNWuwzxDzC6eejabU=";

  vendorHash = "sha256-YfqC8MEdiLcucOaXOsLI9H4NDQ/4T0newb6q7v0uDbw=";



  deleteVendor = true;