From 4e9874aaa6f9d065e17bdf774abeb2cd26973da7 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Tue, 22 Aug 2023 23:51:11 +0200 Subject: listmonk: 2.2.0 -> 2.5.1 It was impossible to package further versions before because listmonk upstream was using a very EOL Go version. I was waiting for upstream to bump this, but it didn't happen, so I take the matters in my hand. Hopefully, the upstream PR will be accepted. --- pkgs/servers/mail/listmonk/default.nix | 15 +++++++++++---- pkgs/servers/mail/listmonk/frontend.nix | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'pkgs/servers/mail/listmonk') diff --git a/pkgs/servers/mail/listmonk/default.nix b/pkgs/servers/mail/listmonk/default.nix index 97ec1924c2a83..7e55fde4504eb 100644 --- a/pkgs/servers/mail/listmonk/default.nix +++ b/pkgs/servers/mail/listmonk/default.nix @@ -1,17 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests, fetchpatch }: buildGoModule rec { pname = "listmonk"; - version = "2.2.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${version}"; - sha256 = "sha256-dtIM0dkr8y+GbyCqrBlR5VRq6qMiZdmQyFvIoVY1eUg="; + sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; }; - vendorSha256 = "sha256-qeBuDM3REUxgu3ty02d7qsULH04USE0JUvBrtVnW8vg="; + patches = [ + (fetchpatch { + url = "https://github.com/knadh/listmonk/pull/1479.patch"; + hash = "sha256-SYACM8r+NgeSWn9VJV4+wkm+6s/MhNGwn5zyc2tw7FU="; + }) + ]; + + vendorSha256 = "sha256-0sgC1+ueZTUCP+7JwI/OKLktfMHQq959GEk1mC0TQgE="; nativeBuildInputs = [ stuffbin diff --git a/pkgs/servers/mail/listmonk/frontend.nix b/pkgs/servers/mail/listmonk/frontend.nix index 81e5afa8fd96c..1e5cccc36415a 100644 --- a/pkgs/servers/mail/listmonk/frontend.nix +++ b/pkgs/servers/mail/listmonk/frontend.nix @@ -5,13 +5,13 @@ yarn2nix-moretea.mkYarnPackage rec { pname = "listmonk-frontend"; - version = "2.2.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${version}"; - sha256 = "sha256-dtIM0dkr8y+GbyCqrBlR5VRq6qMiZdmQyFvIoVY1eUg="; + sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; }; packageJSON = ./package.json; -- cgit 1.4.1