From patchwork Mon Dec 6 09:56:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 34995 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 8FCD827BBEC; Mon, 6 Dec 2021 09:57:15 +0000 (GMT) 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=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 2886427BBE9 for ; Mon, 6 Dec 2021 09:57:15 +0000 (GMT) Received: from localhost ([::1]:37766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muAkE-0000df-8G for patchwork@mira.cbaines.net; Mon, 06 Dec 2021 04:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muAk5-0000c7-3F for guix-patches@gnu.org; Mon, 06 Dec 2021 04:57:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49057) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muAk2-0002jn-4D for guix-patches@gnu.org; Mon, 06 Dec 2021 04:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1muAk2-0006eK-0t for guix-patches@gnu.org; Mon, 06 Dec 2021 04:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52326] [PATCH 1/2] gnu: Add rust-diffr-lib-0.1. References: <20211206044900.GB28045@gac.attlocal.net> In-Reply-To: <20211206044900.GB28045@gac.attlocal.net> Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Dec 2021 09:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52326 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52326@debbugs.gnu.org Cc: jgart Received: via spool by 52326-submit@debbugs.gnu.org id=B52326.163878461725536 (code B ref 52326); Mon, 06 Dec 2021 09:57:01 +0000 Received: (at 52326) by debbugs.gnu.org; 6 Dec 2021 09:56:57 +0000 Received: from localhost ([127.0.0.1]:60600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muAjw-0006dm-RD for submit@debbugs.gnu.org; Mon, 06 Dec 2021 04:56:57 -0500 Received: from mx1.dismail.de ([78.46.223.134]:10978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muAju-0006dQ-U8 for 52326@debbugs.gnu.org; Mon, 06 Dec 2021 04:56:55 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 8204e285 for <52326@debbugs.gnu.org>; Mon, 6 Dec 2021 10:56:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20190914; bh=AKNzcqAanvdcxU/9/3I6yNlFhcQuTcWrbhBD6m7SaOM=; b= k2Nz5yoD2OYmIvOYePz7/nCes3j1NWVE9danPjmGzSJBpw+QGtGBZ/1/MT/VfmSp eU3gLFSe4GUZnFUxQrLXh+WBghUzpA3MoR0cBNnY4EU5+gQm2t7+iGdiY7u+3Bj7 3zQPTK++9A5nZUgacEvrCQMrOT4Rw6PMP1igIA8dZ/BsN9uuHzd+nOQI2m+CMVsz 80dITBk+KzNCTdQQLGfbZ2Np763aw3pAzjnx5PLCF10WeEZgWCCWELQHi0vOq7b2 aGBcaJqclsVj/WLECPJZaaCdbbWzH7mRmbadseo6cqow59j/4s1NCk9wJ9o25rYB ctTnjEfuQT5oRvkwytnHIA== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 417f9d17 for <52326@debbugs.gnu.org>; Mon, 6 Dec 2021 10:56:48 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 3d759304 for <52326@debbugs.gnu.org>; Mon, 6 Dec 2021 10:56:48 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id d006dddc (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Mon, 6 Dec 2021 10:56:48 +0100 (CET) Date: Mon, 6 Dec 2021 04:56:37 -0500 Message-Id: <20211206095638.28357-1-jgart@dismail.de> X-Mailer: git-send-email 2.34.0 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: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-diffr-lib-0.1): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4a1599a11..0bce547fac 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14768,6 +14768,24 @@ (define-public rust-difflib-0.4 "This crate provides all necessary tools for comparing word sequences.") (license license:expat))) +(define-public rust-diffr-lib-0.1 + (package + (name "rust-diffr-lib") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "diffr-lib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0id3hpblvvcw4ydcd1cc7wgcwqjbh3grlihrmd8zp7k0d2h47i3g")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/mookid/diffr") + (synopsis "Implementation of Myers diff algorithm") + (description "An implementation of Myers diff algorithm.") + (license license:expat))) + (define-public rust-diffs-0.3 (package (name "rust-diffs") From patchwork Mon Dec 6 09:56:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 34996 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 3186027BBE9; Mon, 6 Dec 2021 09:57:16 +0000 (GMT) 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=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 6409227BBEA for ; Mon, 6 Dec 2021 09:57:15 +0000 (GMT) Received: from localhost ([::1]:37760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muAkE-0000dT-Ft for patchwork@mira.cbaines.net; Mon, 06 Dec 2021 04:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muAk5-0000cA-4A for guix-patches@gnu.org; Mon, 06 Dec 2021 04:57:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muAk2-0002jp-EH for guix-patches@gnu.org; Mon, 06 Dec 2021 04:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1muAk2-0006eR-ER for guix-patches@gnu.org; Mon, 06 Dec 2021 04:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52326] [PATCH 2/2] gnu: Add diffr. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Dec 2021 09:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52326 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52326@debbugs.gnu.org Cc: jgart Received: via spool by 52326-submit@debbugs.gnu.org id=B52326.163878461725542 (code B ref 52326); Mon, 06 Dec 2021 09:57:02 +0000 Received: (at 52326) by debbugs.gnu.org; 6 Dec 2021 09:56:57 +0000 Received: from localhost ([127.0.0.1]:60602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muAjx-0006dp-2J for submit@debbugs.gnu.org; Mon, 06 Dec 2021 04:56:57 -0500 Received: from mx1.dismail.de ([78.46.223.134]:10978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muAjv-0006dQ-U8 for 52326@debbugs.gnu.org; Mon, 06 Dec 2021 04:56:56 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 9e4402a2 for <52326@debbugs.gnu.org>; Mon, 6 Dec 2021 10:56:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20190914; bh=8nm56xIYZzbkQ1iKq7yIe HEFasqoUVToGfvxFMF+8Ak=; b=TIRmDWc+0ICJOaiImf0jwdMQoQkkWvg+ZE+Ns WzOw5j0BU8OE3eeIt3PB/J2I5gwP4x+B+Sdja4pwa/0L/wl1q+h1FI4NNTpeDdBc XZS/o5OXrJHTihdygYNfLjJbA9oGgttyv85fBvQ2TcsyIwp6vVDgC0n9obZuyfKx QX0ddvfExBGn5cHMOw59pv5VUTFXglY/Ys/SDclSWVQ9TYgMwugBM9i0y61D3Ymm F2s8hPqrx2xX1DKMEIUdMZrAXJ+uo8ALZpBgJDl9jlHydV8UF/mKtOXlb2jTEsu5 3JYfg3rcnYB3Kx41L24VSbB+L3qZjVHnM1+5+MCQTE6HqPl9A== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 247452e9 for <52326@debbugs.gnu.org>; Mon, 6 Dec 2021 10:56:50 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 5dd04f2d for <52326@debbugs.gnu.org>; Mon, 6 Dec 2021 10:56:49 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 2e57d9e1 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Mon, 6 Dec 2021 10:56:49 +0100 (CET) Date: Mon, 6 Dec 2021 04:56:38 -0500 Message-Id: <20211206095638.28357-2-jgart@dismail.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211206095638.28357-1-jgart@dismail.de> References: <20211206095638.28357-1-jgart@dismail.de> 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: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust-apps.scm (diffr): New variable. --- gnu/packages/rust-apps.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 50095fd38b..5ec42201ce 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -518,6 +518,44 @@ (define-public i3status-rust bar. It is also compatible with sway.") (license license:gpl3))) +(define-public diffr + (package + (name "diffr") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "diffr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b0mz1ki2ksxni6g49x5l5j9ijpyhc11mywvxr9i9h3nr098nc5l")))) + (build-system cargo-build-system) + (arguments + ;; https://github.com/mookid/diffr/issues/79 + `(#:cargo-test-flags + '("--release" "--" + "--skip=tests::success" + "--skip=test_cli::color_invalid_attribute_name" + "--skip=test_cli::color_invalid_color_not_done" + "--skip=test_cli::color_invalid_color_value_ansi" + "--skip=test_cli::color_invalid_color_value_name" + "--skip=test_cli::color_invalid_color_value_rgb" + "--skip=test_cli::color_invalid_face_name" + "--skip=test_cli::color_ok" + "--skip=test_cli::color_ok_multiple" + "--skip=test_cli::color_only_face_name" + "--skip=test_cli::debug_flag") + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-diffr-lib" ,rust-diffr-lib-0.1) + ("rust-termcolor" ,rust-termcolor-1)))) + (home-page "https://github.com/mookid/diffr") + (synopsis "LCS based diff highlighting tool") + (description +"An LCS based diff highlighting tool to ease code review from your terminal.") + (license license:expat))) + (define-public ripgrep (package (name "ripgrep")