From 24ca462fe989811f907be0091eb29bfafdca3481 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 15:46:50 +0200 Subject: [PATCH] Update mautrix-whatsapp 0.1.8 patch --- patches/133015.patch | 52 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/patches/133015.patch b/patches/133015.patch index 0facbf45..a89b7c61 100644 --- a/patches/133015.patch +++ b/patches/133015.patch @@ -1,7 +1,7 @@ From bb550a67d820bc581a58cf96e1e4dff3ad6f4ce9 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 14:37:26 +0200 -Subject: [PATCH] mautrix-whatsapp: 0.1.7 -> 0.1.8 +Subject: [PATCH 1/3] mautrix-whatsapp: 0.1.7 -> 0.1.8 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- @@ -33,3 +33,53 @@ index a5b2f14e9d58d..0b2da872bd06e 100644 doCheck = false; + +From 57e621437054555b6b1e563208badec390e4efea Mon Sep 17 00:00:00 2001 +From: Charlotte Van Petegem +Date: Sat, 7 Aug 2021 15:21:51 +0200 +Subject: [PATCH 2/3] mautrix-whatsapp: update repository location + +--- + pkgs/servers/mautrix-whatsapp/default.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix +index 0b2da872bd06e..759d53df66638 100644 +--- a/pkgs/servers/mautrix-whatsapp/default.nix ++++ b/pkgs/servers/mautrix-whatsapp/default.nix +@@ -5,8 +5,8 @@ buildGoModule rec { + version = "0.1.8"; + + src = fetchFromGitHub { +- owner = "tulir"; +- repo = "mautrix-whatsapp"; ++ owner = "mautrix"; ++ repo = "whatsapp"; + rev = "v${version}"; + sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U="; + }; + +From a6692271eb99c51137e8604d4c4a58b2e71bb7d0 Mon Sep 17 00:00:00 2001 +From: Charlotte Van Petegem +Date: Sat, 7 Aug 2021 15:22:16 +0200 +Subject: [PATCH 3/3] mautrix-whatsapp: specify agpl3plus license + +e.g. https://github.com/mautrix/whatsapp/blob/f4a7394b670db59aadd6ad99f761acbff255e1b6/bridgestate.go +mentions the option of using a later version. +--- + pkgs/servers/mautrix-whatsapp/default.nix | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix +index 759d53df66638..c2f9e206e9cb7 100644 +--- a/pkgs/servers/mautrix-whatsapp/default.nix ++++ b/pkgs/servers/mautrix-whatsapp/default.nix +@@ -22,7 +22,7 @@ buildGoModule rec { + meta = with lib; { + homepage = "https://github.com/tulir/mautrix-whatsapp"; + description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; +- license = licenses.agpl3; ++ license = licenses.agpl3Plus; + maintainers = with maintainers; [ vskilet ma27 ]; + }; + }