From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QHWwA3nerWHybwEAgWs5BA (envelope-from ) for ; Mon, 06 Dec 2021 10:57:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gG4NO3jerWGvQAAAB5/wlQ (envelope-from ) for ; Mon, 06 Dec 2021 09:57:12 +0000 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 C7AD83B72B for ; Mon, 6 Dec 2021 10:57:12 +0100 (CET) Received: from localhost ([::1]:37760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muAkB-0000dT-Vf for larch@yhetil.org; Mon, 06 Dec 2021 04:57:12 -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 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: jgart X-ACL-Warn: , jgart via Guix-patches From: jgart via Guix-patches via 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=1638784632; 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=bRVPUrNHlfiflygPeewIjOfTuGDAcm+rKcUvWdyyUnU=; b=IG/jxBKloJCHc61KHu9bqAHCwmU2jRXK65Ab6N2j3egqScO2bgheM2lxQPuTtqZ0F5HmO1 +aQYgCUt74KO/tyU+lXyE0mvU3Ba2UGLgFAUj8YYoHL9ufVs5ycJnjXR7msP8lFc8yNjH+ C+9xEzBj/paJr31/e2pFqSiSSk2DGA0hGtNcGb9dQiB13eCXh3sh10lCtN5+b8fje+b88Y NgAZYI9wjm+Wfds34lGKPOCoHe3aCAwObfvoKkqAuQhlST6NeC9gAZ30W0EE0+/tyMbZWZ TV1w44PxSDVGEdYj4+3VWtxgiRQqlHGDfmyIPFDpGOMVvCg9Gpm1elCZ02ubHw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638784632; a=rsa-sha256; cv=none; b=kXHNQj79u3VgWBI3mW+fcTsMKABr6oiveDLVFSvZLNqjHpnxE2I2LtYOYxr7Og149pwugo 6FXyPp7WOJW0EPvZBsuQomyLf8b+XnFG3oRdnXhBeFpcNBoLp76eGPXuAi/D2G3wFGV1mt 8UL/2x6YkAn6XBtZQhHlcojToL16WKcLUfzZeIBPG8dixGUg4jMyx8kTCQRSwgn/RZ4+Xs Bg/V4K/2k9+tFIQivvjoI70tn1xGcMfYal2F3MC6NQv0IPKc1JJwkrZE0QPY4Eaa5M5Wxa zQHuSQEWcS5oyWhPMLiclE6tUzh0NFDzsna1r5Qe+tGow+FZv3wiMRStTzpS5g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=TIRmDWc+; 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: -3.04 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=TIRmDWc+; 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: C7AD83B72B X-Spam-Score: -3.04 X-Migadu-Scanner: scn0.migadu.com X-TUID: n0Zpgr/yIJN/ * 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") -- 2.34.0