From patchwork Mon Jun 13 19:39:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 39957 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A102527BBEA; Mon, 13 Jun 2022 20:41:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B02227BBE9 for ; Mon, 13 Jun 2022 20:41:19 +0100 (BST) Received: from localhost ([::1]:53428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0pw6-0003A2-Cd for patchwork@mira.cbaines.net; Mon, 13 Jun 2022 15:41:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0pvs-00039K-6Q for guix-patches@gnu.org; Mon, 13 Jun 2022 15:41:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0pvr-0003Sw-9f for guix-patches@gnu.org; Mon, 13 Jun 2022 15:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o0pvr-0003dX-5v for guix-patches@gnu.org; Mon, 13 Jun 2022 15:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55903] [PATCH v3 02/35] gnu: Add go-github-com-creack-pty. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jun 2022 19:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55903@debbugs.gnu.org Cc: "\(unmatched-parenthesis" Received: via spool by 55903-submit@debbugs.gnu.org id=B55903.165514924913756 (code B ref 55903); Mon, 13 Jun 2022 19:41:03 +0000 Received: (at 55903) by debbugs.gnu.org; 13 Jun 2022 19:40:49 +0000 Received: from localhost ([127.0.0.1]:60435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0pvc-0003Zc-Mv for submit@debbugs.gnu.org; Mon, 13 Jun 2022 15:40:49 -0400 Received: from knopi.disroot.org ([178.21.23.139]:38526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0pva-0003Z8-1M for 55903@debbugs.gnu.org; Mon, 13 Jun 2022 15:40:46 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4F0CF43B89; Mon, 13 Jun 2022 21:40:45 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ARMrmPhg2Xg9; Mon, 13 Jun 2022 21:40:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1655149243; bh=65HNejBnwSbM29+uO5eIsx8dHWEuU05kHNzTYBqTg4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SPG+Nt4fTSqE9cKA+Wx975gx91cZXiz5HZ2tjnoLU9jMYyn77GQyiQ6BWdyeGt/wM ER5E8kjSXhMPFSIJm3JEnyBnKRdnhcZdUuMTCR5I+pbYmW3SbCWP6pM9YuQ1yM2TWh 7MBjmqplZTap0kzMUWTu2flkfKS6rnmT7WeyKF1H/YiCUMbCcsWa1bHWZ3+RUbXUi9 dNuAyq+vSqyIwhgWLeomUn24NytSwiZXGFKTVbrIZjyD2dMLgYn/OLkDpAcz297Io5 +Tkzrg+cLwWqO6R1jN8LIEUKsBZOQuvi9FB+nL2IAO61EDkOZHbPUMmfLjGEGxWhw0 qglBQKi8IV7fA== Date: Mon, 13 Jun 2022 20:39:57 +0100 Message-Id: <20220613194030.3540-2-paren@disroot.org> In-Reply-To: <20220613194030.3540-1-paren@disroot.org> References: <20220613194030.3540-1-paren@disroot.org> Mime-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches From: "(unmatched-parenthesis" * gnu/packages/golang.scm (go-github-com-creack-pty): New variable. * guix/build-system/go.scm (go-target): Add to exported variables. --- gnu/packages/golang.scm | 47 ++++++++++++++++++++++++++++++++++++++++ guix/build-system/go.scm | 1 + 2 files changed, 48 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8353aa280f..9f92ea9442 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9863,3 +9863,50 @@ (define-public go-github-com-zenhack-go-notmuch "The notmuch package provides a Go language binding to the notmuch email library.") (license license:gpl3+))) + +(define-public go-github-com-creack-pty + (package + (name "go-github-com-creack-pty") + (version "1.1.18") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/creack/pty") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qqhcgfym0napz8damj7dhfw28g2qn2f5h3lr93i0sxawq926yzc")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/creack/pty" + #:modules '((ice-9 popen) + (ice-9 textual-ports) + (guix build go-build-system) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'regenerate-types + (lambda* (#:key import-path #:allow-other-keys) + ;; Generated files are included (ztypes_*). We need to remake + ;; them with Cgo. + (with-directory-excursion (string-append "src/" import-path) + (let* ((go-arch + #$(car (go-target + (or (%current-target-system) + (nix-system->gnu-triplet (%current-system)))))) + (file (string-append "ztypes_" go-arch ".go")) + (pipe (open-input-pipe "go tool cgo -godefs types.go")) + (text (get-string-all pipe))) + (close-pipe pipe) + (for-each delete-file + (find-files (getcwd) (file-name-predicate + "ztypes_[a-zA-Z0-9_]+.go"))) + (call-with-output-file file + (lambda (port) + (display text port)))))))))) + (home-page "https://github.com/creack/pty") + (synopsis "Pseudoterminal handling in Go") + (description + "The pty package provides functions for working with Unix pseudoterminals.") + (license license:expat))) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 5e0e5bbad3..9e5f972c84 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -38,6 +38,7 @@ (define-module (guix build-system go) go-build-system go-pseudo-version? + go-target go-version->git-ref)) ;; Commentary: