From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
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 SGXkBMGuhWPiNAEAbAwnHQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 29 Nov 2022 08:03:29 +0100
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 UMW4BMGuhWMzOwAAauVa8A
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 29 Nov 2022 08:03:29 +0100
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 C997F13D07
	for <larch@yhetil.org>; Tue, 29 Nov 2022 08:03:28 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1ozudS-0003Az-33; Tue, 29 Nov 2022 02:02:30 -0500
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 <Debian-debbugs@debbugs.gnu.org>)
 id 1ozudF-00038f-3f
 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:17 -0500
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 <Debian-debbugs@debbugs.gnu.org>)
 id 1ozudE-0003u2-Q6
 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:16 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ozudE-0004rn-Mb
 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:16 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#59670] [PATCH 40/50] gnu: Add rust-termion-2.
Resent-From: "(" <paren@disroot.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Tue, 29 Nov 2022 07:02:16 +0000
Resent-Message-ID: <handler.59670.B59670.166970531018439@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 59670
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 59670@debbugs.gnu.org
Cc: "\(" <paren@disroot.org>
Received: via spool by 59670-submit@debbugs.gnu.org id=B59670.166970531018439
 (code B ref 59670); Tue, 29 Nov 2022 07:02:16 +0000
Received: (at 59670) by debbugs.gnu.org; 29 Nov 2022 07:01:50 +0000
Received: from localhost ([127.0.0.1]:53736 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1ozucn-0004nG-Pr
 for submit@debbugs.gnu.org; Tue, 29 Nov 2022 02:01:50 -0500
Received: from knopi.disroot.org ([178.21.23.139]:53598)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <paren@disroot.org>) id 1ozucO-0004g8-Se
 for 59670@debbugs.gnu.org; Tue, 29 Nov 2022 02:01:26 -0500
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id A5B9D4144E;
 Tue, 29 Nov 2022 08:01:24 +0100 (CET)
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 PAxY_bc7DNnt; Tue, 29 Nov 2022 08:01:23 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1669705280; bh=/QndFmzr2qChH00fiNHMrvA4enUNDhsSg+oHAtwYCBk=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=eeT9Lg8Yv2CbGhS5MVGfvEf59IufIZT5CX6+ANKiGhwUXFbsNlIsRuPYbcC5l51BC
 OD1sdE0335V0j3sFcDnRXCQdDDPMX0X/eAsTXKrdGswHJCwTYDhlmzoOQDqyd/Ti8R
 5+b0IHT4CzKWwWRSS9U1o/cdQOj6mQtHjIVnTpO5VtN9si1d/O8+K6Ice3P205RmHD
 t3IT8aD1GjD1S/B3Yrn2rczU+STsyTq1E4F+sbsgrsQrWC1p41sB4tanQetFXQw6Z3
 nBtdjVv4n0QPJziXE8SVk1perGRMcNjYDSk/vwLPPPbQp47rV6u2ghqrbwg3tokk/u
 mo7GEqq1MymhQ==
Date: Tue, 29 Nov 2022 07:00:54 +0000
Message-Id: <20221129070104.8007-40-paren@disroot.org>
In-Reply-To: <20221129070104.8007-1-paren@disroot.org>
References: <20221129070104.8007-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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Reply-to:  "\(" <paren@disroot.org>
X-ACL-Warn: ,  "\( via Guix-patches" <guix-patches@gnu.org>
From:  "\( via Guix-patches" via <guix-patches@gnu.org>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1669705408;
	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=hr1MU3kjh4T5bDrUh0UTwZ93MgDNz8hY/ULjVQMXoBY=;
	b=SjILd3baEEBUEgBIcIP6K+gdFEdOP3bas917gaOyFuSXLXpDfaOYjbUAxIXBd/C4b+/r4Y
	z0FwDUmb1ZK7gLqHfDpniAjdzyAJgMuz5eRgVspVSUz+7SidbRYNUs3KWk01i54afYaAd9
	EP5fImBn9jsYN8/91nR4HlB9xRHgy0MRp8brrkBE0vfEM9iab7/+JlFJpdULQfdsVMh0Fl
	H2AeuSd4LVr3DHraXN/F0hePYODi0zQtBcRK7olAQlxYk5wDNGf6WFH7dVe4T+nOF3fEv7
	WpPmZLomadgC77k/92/0fAa6pO70Hf1Slh1Luh8p7PaCfNplqFgR5sQdmEJBFw==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669705408; a=rsa-sha256; cv=none;
	b=Ju3K1p5kn6NyUw65Ku8zW7Qc48h5c3TjmBU9VxzZuUfs2gpHUBSWLgmr9Bg0LAknil6/l3
	mEHgKKQLwdFDw2mcGn9GprviL7ilk6slfvbM0nXazFNP/BBAJ22H8fWbSNakEbmQqNykGb
	HNCUM/NUwQxWP2HzGC8QewXugyl340Q6jQBhsHEpiKNGl279zoMjCy//VnG9C0s75ZiHxj
	i5+yXqz5l69nhsYyC+iV6QKMEeFfxXDkBkNDxZV5wU70QECLKbVUmltJSB1Q1QxdVl74JG
	E1ead/iLqkIe82wEXngr8Y42atEKD0n+/VbwXAvH8wKkMj9dCX0tAXT3IKTQuA==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=eeT9Lg8Y;
	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.96
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=eeT9Lg8Y;
	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: C997F13D07
X-Spam-Score: -2.96
X-Migadu-Scanner: scn1.migadu.com
X-TUID: ZYcgKPzTsLlm

* gnu/packages/crates-io.scm (rust-termion-2): New variable.
(rust-termion-1): Inherit from RUST-TERMION-2.
---
 gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 35e2ad69b2..fb6e10f502 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58195,8 +58195,35 @@ (define-public rust-terminfo-0.7
     (description "Terminal capabilities with type-safe getters.")
     (license license:wtfpl2)))
 
+(define-public rust-termion-2
+  (package
+    (name "rust-termion")
+    (version "2.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "termion" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "147c0a9l2dj4l8xhd7bb1f0f611lv6k0szacx3jwf21lkwviz735"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:tests? #f ;tests require a terminal
+           #:cargo-inputs
+           `(("rust-libc" ,rust-libc-0.2)
+             ("rust-numtoa" ,rust-numtoa-0.1)
+             ("rust-redox-syscall" ,rust-redox-syscall-0.2)
+             ("rust-redox-termios" ,rust-redox-termios-0.1)
+             ("rust-serde" ,rust-serde-1))))
+    (home-page "https://gitlab.redox-os.org/redox-os/termion")
+    (synopsis "Library for manipulating terminals")
+    (description
+     "This package provides a bindless library for manipulating terminals.")
+    (license license:expat)))
+
 (define-public rust-termion-1
   (package
+    (inherit rust-termion-2)
     (name "rust-termion")
     (version "1.5.5")
     (source
@@ -58207,19 +58234,13 @@ (define-public rust-termion-1
         (sha256
          (base32
           "01f9787d5nx445bqbj644v38bn0hl2swwjy9baz0dnbqi6fyqb62"))))
-    (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f      ; Tests want a terminal.
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-numtoa" ,rust-numtoa-0.1)
-        ("rust-redox-syscall" ,rust-redox-syscall-0.1)
-        ("rust-redox-termios" ,rust-redox-termios-0.1))))
-    (home-page "https://gitlab.redox-os.org/redox-os/termion")
-    (synopsis "Library for manipulating terminals")
-    (description
-     "This package provides a bindless library for manipulating terminals.")
-    (license license:expat)))
+     (list #:tests? #f ;tests require a terminal
+           #:cargo-inputs
+           `(("rust-libc" ,rust-libc-0.2)
+             ("rust-numtoa" ,rust-numtoa-0.1)
+             ("rust-redox-syscall" ,rust-redox-syscall-0.1)
+             ("rust-redox-termios" ,rust-redox-termios-0.1))))))
 
 (define-public rust-termios-0.3
   (package
-- 
2.38.1