From e3b0aa3cf132d4f078a94ccd7d7d16a31bf57803 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:17:22 +0200 Subject: [PATCH 1/2] matterbridge: 1.26.0 -> 1.26.0-unstable-2024-08-27 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/servers/matterbridge/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 023bbe9ddc1e..d847c02f3aa2 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,25 +1,29 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: -buildGoModule rec { +buildGoModule { pname = "matterbridge"; - version = "1.26.0"; + version = "1.26.0-unstable-2024-08-27"; src = fetchFromGitHub { owner = "42wim"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-APlnJUu/ttK/S2AxO+SadU2ttmEnU+js/3GUf3x0aSQ="; + repo = "matterbridge"; + rev = "c4157a4d5b49fce79c80a30730dc7c404bacd663"; + hash = "sha256-ZnNVDlrkZd/I0NWmQMZzJ3RIruH0ARoVKJ4EyYVdMiw="; }; subPackages = [ "." ]; vendorHash = null; - meta = with lib; { + meta = { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; homepage = "https://github.com/42wim/matterbridge"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ryantm ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ ryantm ]; mainProgram = "matterbridge"; }; } From 6b82acb5777839889fa63adcd23c788e14aa996b Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:18:30 +0200 Subject: [PATCH 2/2] matterbridge: move to by-name Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../default.nix => by-name/ma/matterbridge/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{servers/matterbridge/default.nix => by-name/ma/matterbridge/package.nix} (100%) diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/by-name/ma/matterbridge/package.nix similarity index 100% rename from pkgs/servers/matterbridge/default.nix rename to pkgs/by-name/ma/matterbridge/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4be7ec3ca2cd..a9d2c5cd6d5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25137,7 +25137,6 @@ with pkgs; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };