From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GMjRFvrMi2HesAAAgWs5BA (envelope-from ) for ; Wed, 10 Nov 2021 14:45:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0N5/EvrMi2E5OgAAbx9fmQ (envelope-from ) for ; Wed, 10 Nov 2021 13:45:30 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BB4F198ED for ; Wed, 10 Nov 2021 14:45:29 +0100 (CET) Received: from localhost ([::1]:58146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mknuq-0006zN-Dt for larch@yhetil.org; Wed, 10 Nov 2021 08:45:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mknsU-0004bC-4m for guix-patches@gnu.org; Wed, 10 Nov 2021 08:43:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mknsT-0003yp-SM for guix-patches@gnu.org; Wed, 10 Nov 2021 08:43:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mknsT-0006VJ-PL for guix-patches@gnu.org; Wed, 10 Nov 2021 08:43:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51752] [PATCH v2] gnu: Add mtm. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Nov 2021 13:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 45130@debbugs.gnu.org, 51752@debbugs.gnu.org X-Debbugs-Original-Cc: "45130@debbugs.gnu.org" <45130@debbugs.gnu.org>, phodina via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.163655174124941 (code B ref -1); Wed, 10 Nov 2021 13:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Nov 2021 13:42:21 +0000 Received: from localhost ([127.0.0.1]:37387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mknrl-0006U7-HJ for submit@debbugs.gnu.org; Wed, 10 Nov 2021 08:42:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:55410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mknrd-0006Th-AW for submit@debbugs.gnu.org; Wed, 10 Nov 2021 08:42:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mknrY-0003Zh-MR for guix-patches@gnu.org; Wed, 10 Nov 2021 08:42:05 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:29075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mknrW-0003nh-1L for guix-patches@gnu.org; Wed, 10 Nov 2021 08:42:04 -0500 Date: Wed, 10 Nov 2021 13:41:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636551718; bh=bdv1l3U3Wti2vwoKyM6GKwtgmRchOyfxGpL9beb91OE=; h=Date:To:From:Cc:Reply-To:Subject:From; b=KUb6kicurLL2tn0oryZOO6AZ27qxZp8rkJz6WfLZ1MFODzG3MyMt+CbnSZDzS7/ah 1Yh0J6hMEAoZ0DhIZgjQ+pwQRMtZMDx66dj2OMNK3m3Cf/thlNDqEad/7FAGPZpuK+ 5CaR3IvartVsJjsL+SsirUWgml9quX/vw6pztWyY= Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.43.16; envelope-from=phodina@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches From: phodina via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636551930; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=bdv1l3U3Wti2vwoKyM6GKwtgmRchOyfxGpL9beb91OE=; b=kxm3Sf0soNNTAG1fnxnMcyiNnE7rdAYHOmtiPI8xii2KoPWqIL8Tz6Q68Cv3smCGCeUBPa W8iY/oA1ikXN6XtVRvO2HrIDAP2avSp8VCYemxdE3CXASRvcyPo08CdTe15iwOUfpPDU7L L46PyJUD1G5xdrfg8eDHAgUph1nIEUuWVPQU3fxTytvKtXhxdivNNXbFYhihNdy/NzT9ah bYEk+nnmBVmuGy43HV5EQ54dh9qw05/EYMYPrZAHQrcCdt8qZQ4Y4LQTK+mSvUvrfZKzZI 43XLebRG+9wJ78dD2NVmXgjtZ2a1Hnm8Zyq0TnrO0x3adjvH6Lv+OoNd660Asw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636551930; a=rsa-sha256; cv=none; b=mmUC53c+oCqFgume/yn7zyerDZEY0PlqQARNGIzSG75Asb7HXfCl/jUPtkJe/Va6Pkklgy XctF2B0zor6SZOSQu4Vfk2GwViayHg7NbYqurwGzlU8veM0hdRwEDvA2yZOGsC8NsbXwvf 1pc3HcA6OzKJbRUAhEOw6DoCdLvMyaOWbategvKeJHRnDEVBwmxSLhMuXBPcSOuWU6vCYO jjCBm7NxuDkLrlu6Chj8Cp51DQzfBGo34qQOfr4yXE66KLmCOCzGM462euaclNO9zKIL2m lkIiPiU89g35QON6RjMsSnkJBaYhdb6HpHJM+QqRBIBgaT7TrOaDYNAj+8NyPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=KUb6kicu; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=KUb6kicu; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: BB4F198ED X-Spam-Score: -2.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: P552U6pTj5JE Hi Nicolas, here's updated patch. The mtm package is placed in terminals.scm with the s= uggestions you mentioned above. --- Kind regards Petr * gnu/packages/terminals.scm (mtm): New variable. diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8d751f6cce..b2c214275e 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -23,11 +23,13 @@ ;;; Copyright =C2=A9 2020, 2021 Marius Bakke ;;; Copyright =C2=A9 2020, 2021 Nicolas Goaziou ;;; Copyright =C2=A9 2020 Leo Famulari +;;; Copyright @ 2020 luhux ;;; Copyright =C2=A9 2021 Ekaitz Zarraga ;;; Copyright =C2=A9 2021 Rapha=C3=ABl M=C3=A9lotte ;;; Copyright =C2=A9 2021 ikasero ;;; Copyright =C2=A9 2021 Brice Waegeneire ;;; Copyright =C2=A9 2021 Solene Rapenne +;;; Copyright =C2=A9 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -424,6 +426,64 @@ (define-public mlterm Vietnamese, and bi-directional scripts like Arabic and Hebrew.") (license license:bsd-3))) +(define-public mtm + (package + (name "mtm") + (version "1.2.1") + (source + (origin + (uri (git-reference + (url "https://github.com/deadpixi/mtm") + (commit version))) + (method git-fetch) + (sha256 + (base32 "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (inputs + `(("ncurses" ,ncurses))) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list (string-append "CC=3D" ,(cc-for-target)) + (string-append "DESTDIR=3D" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-headers + (lambda _ + (substitute* "config.def.h" + (("ncursesw/curses.h") + "curses.h")))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + ;; install binary + (mkdir-p (string-append out "bin/")) + (install-file "mtm" (string-append out "/bin")) + ;; install manpage + (mkdir-p (string-append out "share/man/man1")) + (install-file "mtm.1" (string-append out "/share/man/man1")= ) + ;; install terminfo + (mkdir-p (string-append out "share/terminfo")) + (invoke (string-append (assoc-ref inputs "ncurses") "/bin/t= ic") + "-x" "-s" "-o" + (string-append + out "/share/terminfo") + "mtm.ti")))) + (delete 'configure)))) ; no configure script + ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is + ;; provided for usability reasons. See . + (native-search-paths + (list (search-path-specification + (variable "TERMINFO_DIRS") + (files '("share/terminfo"))))) + (home-page "https://github.com/deadpixi/mtm") + (synopsis "Micro Terminal Multiplexer") + (description + "This package provides multiplexer for the terminal focused on simpli= city, +compatibility, size and stability.") + (license license:gpl3+))) + (define-public picocom (package (name "picocom") -- 2.33.1