From patchwork Mon Feb 21 09:48:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 37387 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 CE58027BBEA; Mon, 21 Feb 2022 09:53:38 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, 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 C464B27BBE9 for ; Mon, 21 Feb 2022 09:53:32 +0000 (GMT) Received: from localhost ([::1]:53274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nM5Nr-0003SJ-Qb for patchwork@mira.cbaines.net; Mon, 21 Feb 2022 04:53:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nM5JW-0004sN-SQ for guix-patches@gnu.org; Mon, 21 Feb 2022 04:49:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nM5JW-0004Fx-Gb for guix-patches@gnu.org; Mon, 21 Feb 2022 04:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nM5JW-0004Ia-2p for guix-patches@gnu.org; Mon, 21 Feb 2022 04:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54085] [PATCH 3/3] gnu: Add jless. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Feb 2022 09:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54085@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.164543692516484 (code B ref -1); Mon, 21 Feb 2022 09:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Feb 2022 09:48:45 +0000 Received: from localhost ([127.0.0.1]:35079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nM5J9-0004Hf-5T for submit@debbugs.gnu.org; Mon, 21 Feb 2022 04:48:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:49050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nM5J6-0004HW-DR for submit@debbugs.gnu.org; Mon, 21 Feb 2022 04:48:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nM5J6-00048k-0M for guix-patches@gnu.org; Mon, 21 Feb 2022 04:48:36 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:26469) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nM5J0-0004CO-L6 for guix-patches@gnu.org; Mon, 21 Feb 2022 04:48:35 -0500 Date: Mon, 21 Feb 2022 09:48:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1645436893; bh=2+fAdlKJi3eRLQkcMtwgrljzguGb7+O5tpPkkAkU/ic=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID; b=bpukJH6olX1oRDhZNfhnsUsgnuckHTap3tpLjsmqcl8w+kn61Y6dn9zVCi0cyI89n hXnn/6NaoLyr6r5X9UbQQJt82eBRnlXpbqm/QsfjvgJWQu4D2VmzelqECFi6ErZIZn 52d1bnNOtKNA1I/FVInhG3OZGGpCre8RPqIndb8xlb1jvcbD0ssd6cXE+wx8Q+MkiI LV81WA8UYMfQl+N8+GhoXWZAZ+FVAIhO81IhF8OP90YupPPX8uaqt5/WrZJJztmfnT 1jtgbPiohLApaVYukjSNmU5OYKvKrIfCX7NbWkd44yjlFJBY38DmP5lynjUVwbOHdI JDVPxRDN+9mbQ== Message-ID: <7PPWo-rQGVQzTQfVhdIcwIR776XuP7D08guFk3dNHD5ovuGtYlTAUq34VTSOoAbHco8f4F42Acta5vt_skiSPsoh-uBd2lzAS1TWSdK9z9U=@protonmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.16; envelope-from=phodina@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, These patches add JSON viewer in Rust. ---- Petr From 0cd53505fbfd6e69a0ec227e92df3c9b35a0b310 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 16 Feb 2022 02:34:10 +0100 Subject: [PATCH 3/3] gnu: Add jless. * gnu/packages/rust-apps.scm (jless): New variable. diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index bb59f6b448..f77f9513f6 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Maxim Cournoyer -;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Nicolas Graves ;;; Copyright © 2022 Aleksandr Vityazev @@ -706,6 +706,50 @@ (define-public i3status-rust bar. It is also compatible with sway.") (license license:gpl3))) +(define-public jless + (package + (name "jless") + (version "0.7.1") + (source (origin + (method url-fetch) + (uri (crate-uri "jless" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0sz93gvingvxj68sxfbl8a0p8rmx46bdnw0a2hbm0fh38jx3xdzr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-logos" ,rust-logos-0.12) + ("rust-regex" ,rust-regex-1) + ("rust-rustyline" ,rust-rustyline-9) + ("rust-signal-hook" ,rust-signal-hook-0.3) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-termion" ,rust-termion-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version-requirements + (lambda _ + ;; isatty crate is deprecated use atty instead + (substitute* "src/main.rs" + (("isatty::stdout_isatty\\(") "atty::is(atty::Stream::Stdout") + (("isatty::stdin_isatty\\(") "atty::is(atty::Stream::Stdin")) + ;; fix requirement versions + (substitute* "Cargo.toml" + (("isatty") "atty") + (("1.5.6") ,(package-version rust-termion-1)) + (("\"0.1\"") (string-append "\"" + ,(package-version rust-atty-0.2) + "\""))) #t))))) + (home-page "https://github.com/PaulJuliusMartinez/jless") + (synopsis "Command-line JSON viewer") + (description "This package provides a command-line JSON viewer.") + (license license:expat))) + (define-public ripgrep (package (name "ripgrep") -- 2.34.0