From patchwork Fri Oct 21 21:10:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 43780 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 9C3BC27BBEB; Sat, 22 Oct 2022 00:45:51 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 DE91327BBE9 for ; Sat, 22 Oct 2022 00:45:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1om0Df-0004EF-C9; Fri, 21 Oct 2022 18:10:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olzJC-0007Tm-Qi for guix-patches@gnu.org; Fri, 21 Oct 2022 17:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olzJC-0002N3-KA for guix-patches@gnu.org; Fri, 21 Oct 2022 17:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olzJC-0000Zw-FE for guix-patches@gnu.org; Fri, 21 Oct 2022 17:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55903] [PATCH v13 02/42] gnu: Add go-github-com-creack-pty. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Oct 2022 21:12:02 +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.16663867102027 (code B ref 55903); Fri, 21 Oct 2022 21:12:02 +0000 Received: (at 55903) by debbugs.gnu.org; 21 Oct 2022 21:11:50 +0000 Received: from localhost ([127.0.0.1]:39107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olzIz-0000WT-Dc for submit@debbugs.gnu.org; Fri, 21 Oct 2022 17:11:49 -0400 Received: from knopi.disroot.org ([178.21.23.139]:33648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olzIw-0000W0-Ri for 55903@debbugs.gnu.org; Fri, 21 Oct 2022 17:11:47 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 315F64E883; Fri, 21 Oct 2022 23:11:46 +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 QGxDmHcmT1c3; Fri, 21 Oct 2022 23:11:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1666386702; bh=U8SQFZ7SBn0br4bDAOXg14L5dkwR5gKU9DMJFbzNH+k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dBMwytU1KM2Q0SGwBVcmkoZ+4MlAmmBYG7W0Fllwl0++tI2eQwzDlxfpGn7m09WcE 56JYYZQ+CqrMJfqZ0KdXv+cY59FUcQhlC8BM+JOBV4zXUAjsbB8EJj5XufIXQK95ky J7t5X1+1HshhNTDPrxQfO4hl7eJf7xHdJzs7SxAfavd4TALS0RS6tiUHDKg5WzLGol M8WCe3Z6NXHwYmJlAR5Spv8dr/Aa6CA6K7YPSInastxLnLzHscpiS7fG1xt9VZBpb/ BHc8IR7OQ9oDKDvFQzC/7nmciKsIm857TohZKDU3j/ZUObp/ZUMrFMFZV2z3KLmNbI LJ4zx6d48IwvQ== Date: Fri, 21 Oct 2022 22:10:57 +0100 Message-Id: <20221021211137.3296-2-paren@disroot.org> In-Reply-To: <20221021211137.3296-1-paren@disroot.org> References: <20221021211137.3296-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: , Sender: "Guix-patches" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org 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 e74185973c..2229365993 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10377,6 +10377,53 @@ (define-public go-github-com-zenhack-go-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))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 4b3b67b08f..0a9761aac7 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: