From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id GEwEC7dixWIWOwAAbAwnHQ (envelope-from ) for ; Wed, 06 Jul 2022 12:23:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 4OvdCrdixWL06AAAauVa8A (envelope-from ) for ; Wed, 06 Jul 2022 12:23:51 +0200 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 E66BAEEED for ; Wed, 6 Jul 2022 12:23:50 +0200 (CEST) Received: from localhost ([::1]:47198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o92CE-0008G5-43 for larch@yhetil.org; Wed, 06 Jul 2022 06:23:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o927b-0000KP-EO for guix-patches@gnu.org; Wed, 06 Jul 2022 06:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o927b-0006vP-3D for guix-patches@gnu.org; Wed, 06 Jul 2022 06:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o927a-0002U9-Ub for guix-patches@gnu.org; Wed, 06 Jul 2022 06:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55903] [PATCH v4 02/41] gnu: Add go-github-com-creack-pty. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Jul 2022 10:19: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.16571027349399 (code B ref 55903); Wed, 06 Jul 2022 10:19:02 +0000 Received: (at 55903) by debbugs.gnu.org; 6 Jul 2022 10:18:54 +0000 Received: from localhost ([127.0.0.1]:52410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o927R-0002RV-Sj for submit@debbugs.gnu.org; Wed, 06 Jul 2022 06:18:54 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o927N-0002Qk-SB for 55903@debbugs.gnu.org; Wed, 06 Jul 2022 06:18:51 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2708B41CFC; Wed, 6 Jul 2022 12:18:49 +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 vOfebwUHWSHh; Wed, 6 Jul 2022 12:18:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1657102726; bh=uxrJ3vwSUrB21yUUw9+UrltHslRwIUlRigq6YL3qIIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DHqIYAVFcJ3NGVBZmt04cLccNDHWUWAuEaCPQUWpMyljPB3/AlGe/i2OUpliIbRlg mOX3lRgWsigU0sMrNi42nNI+eKZAdEw0yJq3WQcrEIDjVthin0bzdIcmc9ihVeNuAl 20TQEAoGhSlKpq0BW4rpibv8JNZLCrD5Y57RbS9FJTWbunE+5DzAqKayuDw0lsYZhp mDl4WQzDrKwGKD+Sr+wcUPR+8DF1IqDjzZsaRBbbg7d5on94R8gKc3gzD6U8FfXZGg 1D6dsaISza5KExWdBLqQeBRmsZRJkI7JBxd2CWK7CGPPSS/Qkg9matUFEZdIL9SphC +JCz3SMq0TmQw== Date: Wed, 6 Jul 2022 11:17:51 +0100 Message-Id: <20220706101830.12269-2-paren@disroot.org> In-Reply-To: <20220706101830.12269-1-paren@disroot.org> References: <20220706101830.12269-1-paren@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit 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: "\(" X-ACL-Warn: , "\( via Guix-patches" From: "\( via Guix-patches" via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1657103030; 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-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=MMPlMm7Yu7BpaDy2abogc1hfNQpqxiYiWskGCdaIcX0=; b=sT2+LXfGo3RVX4dNt0D9JFS4MejwO4Yr5mdhnJBX6EgeRAUMORBPcXjt7fmavNhS0vo5RK 5S67APtGlYG2QCJ3lCm+sikmo2QbZcqKEC9ZDuRkp0HeW6f1ktSONtatarG50+E7mgqH9B cfSvsckmYW53JJFAIfTv6l6TqOztkSYnL9BVdq8Z9MRPuGTbvHRU7lUO2aXxzEtAjnJO3W O7WB3NJ5kwbD4rktF50ojUgg6DfWgfYns0ur0iC+Bki9j1iAoZX02CP/Aush31ICEMR//y LMdGEV3ap+Sa7BHJFSMQRS8GPneoAwLeiFAdpzmu7UNnP1Y5JzfPNWDQKqtW6w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1657103030; a=rsa-sha256; cv=none; b=dWk5HUo4hVclY7xdd13pfsyK5NHrAW4gObE38MYqcB7cH5RB3U3Iw2hMsk4gq5pLS47lvf 84WBa68yZXQtXCyoIGOoxrnSWNwYrvcTyaLKtz5fawH7q5qNN8yCFmjJUMTRRCXyC3aWCp XionUE57uS0hfk3wD1ZFEbB6Wlted3T7+6btNyg0vI0CL1dJe2ZAIvmYBbL4OHC6sE6FTR AwX3HSPXbM3KfS2RpDgcni7J3JcJwsTUbhgu2PYpfAnje/Lr5Bm9nM6jI5A1ouN3MtNHsZ 2DGmfscV0tIE7kFcEaYPOmDMSMfzERQJtdvC0WiM/pB5HgVrnlPXQi1xoXTukw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=DHqIYAVF; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=DHqIYAVF; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E66BAEEED X-Spam-Score: -2.45 X-Migadu-Scanner: scn1.migadu.com X-TUID: znl+Wuq+rXTt 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 | 48 ++++++++++++++++++++++++++++++++++++++++ guix/build-system/go.scm | 1 + 2 files changed, 49 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7cf139b3a7..70e7441792 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -58,6 +58,7 @@ (define-module (gnu packages golang) #:use-module (guix memoization) #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system gnu) @@ -9920,3 +9921,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: -- 2.36.1