From 72f3f8cc82e5a85728d902e953f46c064432dcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 26 May 2021 07:34:06 +0200 Subject: [PATCH 1/4] SDL_Pango: fix darwin build (cherry picked from commit 056d7221aadbca98a23fdadb3b2963d43433ac2d) --- pkgs/development/libraries/SDL_Pango/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 83afeaf2d67..7c90092fe8d 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ]; preConfigure = "autoreconf -i -f"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; From 0fe73dc3bb740565609fbe44f4ad5d6ea8e57537 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 14:37:26 +0200 Subject: [PATCH 2/4] mautrix-whatsapp: 0.1.7 -> 0.1.8 (cherry picked from commit bb550a67d820bc581a58cf96e1e4dff3ad6f4ce9) --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index a5b2f14e9d5..0b2da872bd0 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE="; + sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4="; + vendorSha256 = "NTORR0ixVozUllWlGziTUSJNy1zHoPWQMZbmPUchpQ0="; doCheck = false; From 598282f8ed789db17e7faa180f635e936652b83d Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 15:21:51 +0200 Subject: [PATCH 3/4] mautrix-whatsapp: update repository location (cherry picked from commit 57e621437054555b6b1e563208badec390e4efea) --- 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 0b2da872bd0..759d53df666 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 a9c04292f28ff411b059c83e6abe02fac8be7cd7 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 15:22:16 +0200 Subject: [PATCH 4/4] mautrix-whatsapp: specify agpl3plus license e.g. https://github.com/mautrix/whatsapp/blob/f4a7394b670db59aadd6ad99f761acbff255e1b6/bridgestate.go mentions the option of using a later version. (cherry picked from commit a6692271eb99c51137e8604d4c4a58b2e71bb7d0) --- 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 759d53df666..c2f9e206e9c 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 ]; }; }