From af1fe99d2323612aea20e125c73db30a574bd911 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Mon, 18 Dec 2023 12:53:09 -0600 Subject: [PATCH 1/3] Update integration test to latest nixos-unstable --- nix-integration-test/integration-test.nix | 6 +++--- nix-integration-test/nixpkgs-commit.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nix-integration-test/integration-test.nix b/nix-integration-test/integration-test.nix index 57ab223..916256e 100644 --- a/nix-integration-test/integration-test.nix +++ b/nix-integration-test/integration-test.nix @@ -21,9 +21,9 @@ in enable = true; enableSubmission = true; enableSubmissions = true; - sslCACert = certs.ca.cert; - sslCert = certs."acme.test".cert; - sslKey = certs."acme.test".key; + tlsTrustedAuthorities = "${certs.ca.cert}"; + sslCert = "${certs."acme.test".cert}"; + sslKey = "${certs."acme.test".key}"; submissionOptions = { smtpd_sasl_auth_enable = "yes"; smtpd_client_restrictions = "permit"; diff --git a/nix-integration-test/nixpkgs-commit.nix b/nix-integration-test/nixpkgs-commit.nix index 1a8e75c..1098491 100644 --- a/nix-integration-test/nixpkgs-commit.nix +++ b/nix-integration-test/nixpkgs-commit.nix @@ -1,4 +1,4 @@ fetchTarball { - url = "https://github.com/typetetris/nixpkgs/tarball/685d2b8895faf86998877d23a7a51317e5b31425"; - sha256 = "1yl49ldh0y5v76jx3fvqf76i21mypj869jj7ffbs8slpsbd5496k"; + url = "https://github.com/NixOS/nixpkgs/tarball/a9bf124c46ef298113270b1f84a164865987a91c"; + sha256 = "0wdjv548d84s74wrncqqj5pdzfq7nj8xn97l0v7r82jl6124jil2"; } From 4c724c80814ab1da7c37256a6c10e04c88b9af95 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Mon, 18 Dec 2023 12:53:54 -0600 Subject: [PATCH 2/3] Switch to crypton-connection --- smtp-mail.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smtp-mail.cabal b/smtp-mail.cabal index c317abe..99753ab 100644 --- a/smtp-mail.cabal +++ b/smtp-mail.cabal @@ -34,7 +34,7 @@ library , base16-bytestring , base64-bytestring , bytestring - , connection + , crypton-connection , filepath , mime-mail , network From 3112eb9181d291eb1208012d0c7f28d6b29cbc3d Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Fri, 29 Mar 2024 12:32:31 -0500 Subject: [PATCH 3/3] Changelog and version bump --- CHANGELOG.md | 5 +++++ smtp-mail.cabal | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e20680..71e124d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,11 @@ A template is provided: - Indicate if changes are major, minor, or patch changes. ``` +## 0.4.0.0 + +- [#5](https://github.com/haskell-github-trust/smtp-mail/pull/5) @spencerjanssen + - Switch to `crypton-connection` because the `connection` package is no longer maintained + ## 0.3.0.0 - [#32](https://github.com/jhickner/smtp-mail/pull/32) @typetetris diff --git a/smtp-mail.cabal b/smtp-mail.cabal index 99753ab..be6620c 100644 --- a/smtp-mail.cabal +++ b/smtp-mail.cabal @@ -1,5 +1,5 @@ name: smtp-mail -version: 0.3.0.0 +version: 0.4.0.0 synopsis: Simple email sending via SMTP description: This packages provides a simple interface for mail over SMTP. PLease see the README for more information. homepage: http://github.com/jhickner/smtp-mail