From 5f2651eb3f227724f0b48bf689e0196d6912175f Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Thu, 30 Nov 2023 00:13:20 -0800 Subject: [PATCH 1/2] maintainers: add gigahawk --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 56685b5e3ba5..beffa5121311 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6578,6 +6578,12 @@ githubId = 127353; name = "Geoffrey Huntley"; }; + gigahawk = { + email = "Jasper Chan"; + name = "jasperchan515@gmail.com"; + github = "Gigahawk"; + githubId = 10356230; + }; gigglesquid = { email = "jack.connors@protonmail.com"; github = "gigglesquid"; From 5b8f923cab936de43e79df258e42842eef026219 Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Thu, 30 Nov 2023 00:14:56 -0800 Subject: [PATCH 2/2] xmpp-bridge: init at 0.6.0 Co-authored-by: Anderson Torres Co-authored-by: h7x4 --- pkgs/by-name/xm/xmpp-bridge/package.nix | 49 +++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/xm/xmpp-bridge/package.nix diff --git a/pkgs/by-name/xm/xmpp-bridge/package.nix b/pkgs/by-name/xm/xmpp-bridge/package.nix new file mode 100644 index 000000000000..ed11cccfeab5 --- /dev/null +++ b/pkgs/by-name/xm/xmpp-bridge/package.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, stdenv +, pkg-config +, libstrophe +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "xmpp-bridge"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "majewsky"; + repo = "xmpp-bridge"; + rev = "v${version}"; + hash = "sha256-JXhVi2AiV/PmWPfoQJl/N92GAZQ9UxReAiCkiDxgdFY="; + }; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + libstrophe + ]; + + strictDeps = true; + + # Makefile is hardcoded to install to /usr, install manually + installPhase = '' + runHook preInstall + + install -D -m 0755 build/xmpp-bridge "$out/bin/xmpp-bridge" + installManPage xmpp-bridge.1 + + runHook postInstall + ''; + + meta = { + description = "Connect command-line programs to XMPP"; + homepage = "https://github.com/majewsky/xmpp-bridge"; + license = lib.licenses.gpl3Plus; + mainProgram = "xmpp-bridge"; + maintainers = with lib.maintainers; [ gigahawk ]; + platforms = lib.platforms.unix; + }; +}