From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KMDyOKoXRWEMnAAAgWs5BA (envelope-from ) for ; Sat, 18 Sep 2021 00:33:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id GEuaNKoXRWGPPQAAB5/wlQ (envelope-from ) for ; Fri, 17 Sep 2021 22:33:14 +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 DAEB6213AC for ; Sat, 18 Sep 2021 00:33:13 +0200 (CEST) Received: from localhost ([::1]:37496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRMPw-0006lr-27 for larch@yhetil.org; Fri, 17 Sep 2021 18:33:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRMPm-0006lU-Qk for guix-patches@gnu.org; Fri, 17 Sep 2021 18:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRMPm-0003nV-JM for guix-patches@gnu.org; Fri, 17 Sep 2021 18:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mRMPm-00078s-Co for guix-patches@gnu.org; Fri, 17 Sep 2021 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50648] [PATCH] gnu: Add tealdeer. Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Sep 2021 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50648 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50648@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163191798027445 (code B ref -1); Fri, 17 Sep 2021 22:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Sep 2021 22:33:00 +0000 Received: from localhost ([127.0.0.1]:33225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRMPj-00078a-S3 for submit@debbugs.gnu.org; Fri, 17 Sep 2021 18:33:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:40904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRMPg-00078R-BT for submit@debbugs.gnu.org; Fri, 17 Sep 2021 18:32:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRMPf-0006k4-Py for guix-patches@gnu.org; Fri, 17 Sep 2021 18:32:56 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:42506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRMPc-0003ZR-PL for guix-patches@gnu.org; Fri, 17 Sep 2021 18:32:55 -0400 Received: by mail-pj1-x1031.google.com with SMTP id p12-20020a17090adf8c00b0019c959bc795so2813978pjv.1 for ; Fri, 17 Sep 2021 15:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=O5YTgshXPlphPKzPvQ7DlUJX/rhBTah32qQXEp7sQPE=; b=OAV30TbWu9yQGN55UR8mrYhHRF2gZ/TzsyrO4PPHSI2GmlJ5wlJfM0nmmg52HHvSJV LTWD0c8laY9Wr5JZTmFzpEnUA8W73GVVRR2ddOEY9DEqm0TO2iHTmZ9lA6b8x9O3LZix NW9e65P6MR1R/AYitAQOcybTxLIwi0ISqFCJjIz9pKiYZIsC8FS37yVnYA8ziNga5IfK HNRB5JIdVx5kCg009XDqPpXECYgkT0+UVcipyLtOr1LRblu7Vb4+nfR4lToXAbPcCukJ iSylDioUooJwdiSdZhTrnUyvNMyUgT9Qt/AZfiTt9g4HphQeEKj2KlR0zwGOvP8nckbP 5Otg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=O5YTgshXPlphPKzPvQ7DlUJX/rhBTah32qQXEp7sQPE=; b=wIh/GJd5mr7KAYYKSMdIfqTwTw5pZrspgsimq8hnsoSjfL8AbN4CuWQjVLcbbjGg+Y 8poF2iDCve4Q6rdywb2u4N91M8CMQT7mwG/6pQ4OuP0dkJIHNmKGuIi8goQkVlrprQaJ pLAKRT5jtEohZFygnOKPd+/0NDKJ+V6kLwZd175HsaKwPQFpKgChyHk3m2jQoATQunN8 o+Awxic3YnhxWJQobeIJ213YJ5b+Fnix9gyu/uYXlZ9dYKGbLmrangn1t5LvewOctKd1 QsteR6Du8EAo2vkMKFS782DIZWyIQx9rB9327jpCs/6DgrLxXdQj0E6h1gGY73nGT7iq gFuA== X-Gm-Message-State: AOAM531AbyFFEK7jnaUw8RVoLjO36zAbEjjz14+mV+jg9XfcdoNs7hZf /JDry683PSsb/codxqgxc/mMKO2DEujvL6Em X-Google-Smtp-Source: ABdhPJw6YuAyId4TL5cs74VRaYDzXP9OYGg9YqaxHqMSmtX0hz2OKwWi9lHtlzzGGSQtrSSW8v7zJg== X-Received: by 2002:a17:90b:1089:: with SMTP id gj9mr15235249pjb.228.1631917968134; Fri, 17 Sep 2021 15:32:48 -0700 (PDT) Received: from ecenter (2603-8001-3c01-90b6-0000-0000-0000-1ca6.res6.spectrum.com. [2603:8001:3c01:90b6::1ca6]) by smtp.gmail.com with ESMTPSA id z9sm6795338pfn.22.2021.09.17.15.32.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 15:32:47 -0700 (PDT) From: John Soo Date: Fri, 17 Sep 2021 15:32:46 -0700 Message-ID: <871r5mx27l.fsf@asu.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=jsoo1@asu.edu; helo=mail-pj1-x1031.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631917994; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=O5YTgshXPlphPKzPvQ7DlUJX/rhBTah32qQXEp7sQPE=; b=lVjY1dwDLngsVieCTP55bp9pAwLrxH4RvFtRzLs4mJ2+PpaJaLMCtBKM5vjiWF9Ii6rROE m7+K61eHEulwPbWC0cuhQi73h4bOGC8k30E/8Mp7Y7kFue0hUV8nNr6ET25PAcHVfxez0q FW8TVVF+txIxNbP7P2lnkF3/E7gLep+2yBsOc6yx2ceDavvt7ogHYjLMVT2rukiISRTzoz FqSgGrhik17k8kYnSDIe9E+YRoGMd46EwTmnLqzPvQ6L7Z4BwT/C0YheKwXs1DCCok9N+a 3bZlZFv3+xTO2WQe4PheAkSzUPFYPbbcnQPqv1ckBDKylHyhJSVU+N03sCRPTA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631917994; a=rsa-sha256; cv=none; b=I1+nw5hVlt9JL39s5wur/aeUl6H1nqneazJIfE0FiDWDJ1Wb4k+qRBY6g4tD1g+bGcCEX+ 4HZc/sJC6FMbgm/nZlY46TQTlB+2v45wnBemYQnhaYwn8JAxM1mZrAlv0VKt8b0bgNi/bI ecYaUCL+DzZbybJgvGwb+fTJzlikTBlkB2YYp7vYtFU7VLNLpcXoThjZYqowUG8YiPsB6r OR2uqC6RY92hPRRvol1UcSB1dIXono0Kb5lBSerO6BwfMyyZt2jWUXnwGhTdOQXyR4SaD5 bv4zK4aRUc3BxaeQNIzLyWoF9ms1+Ak/YHHdAQEUHXrhZoDhQHMRnaoDp9o6fQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=asu-edu.20210112.gappssmtp.com header.s=20210112 header.b=OAV30TbW; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=asu-edu.20210112.gappssmtp.com header.s=20210112 header.b=OAV30TbW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=asu.edu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: DAEB6213AC X-Spam-Score: -1.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: OKtHE0Nzt3yw --=-=-= Content-Type: text/plain Hi Guix, I wanted to check out tealdeer and I didn't see it upstream. Here are my patches for it, thanks! - John --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-rust-pager-0.15.patch >From dbbe5128f579a9204ba44541cf508637a63144de Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 17 Sep 2021 12:40:16 -0700 Subject: [PATCH 1/3] gnu: Add rust-pager-0.15. * gnu/packages/crates-io.scm (rust-pager-0.15): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d1aaa40c71..ea0e06a3ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31880,6 +31880,31 @@ normally prevent moving a type that has been borrowed from.") "This package provides a library for padding strings at runtime.") (license license:expat))) +(define-public rust-pager-0.15 + (package + (name "rust-pager") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pager" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a35mg68s0p63ya2k5hsg620c4llkjw2fx1sfi0laz4pz8myv75n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-errno" ,rust-errno-0.2) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://gitlab.com/imp/pager-rs.git") + (synopsis + "Helps pipe your output through an external pager") + (description + "This package pipes your Rust output through an external pager.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-palette-0.5 (package (name "rust-palette") -- 2.33.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-rust-remove-dir-all-0.5.2.patch >From dc325e08dcc09ac8dd2d760fa4dd02f76a13252b Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 17 Sep 2021 14:40:58 -0700 Subject: [PATCH 2/3] gnu: Add rust-remove-dir-all-0.5.2. * gnu/packages/crates-io.scm (rust-remove-dir-all-0.5.2): New variable. --- gnu/packages/crates-io.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea0e06a3ba..ddfca76b59 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38408,6 +38408,23 @@ uses finite automata and guarantees linear time matching on all inputs.") (license (list license:asl2.0 license:expat)))) +;; rust-remove-dir-all-0.5.2 is only needed for tealdeer at 1.4.1 +;; Remove rust-remove-dir-all-0.5.2 when tealdeer is updated +(define-public rust-remove-dir-all-0.5.2 + (package + (inherit rust-remove-dir-all-0.5) + (name "rust-remove-dir-all") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "remove_dir_all" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa")))))) + (define-public rust-reopen-0.3 (package (name "rust-reopen") -- 2.33.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-Add-tealdeer.patch >From 6d8dd5ebcb448096ce43b68934c39066e38680fa Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 17 Sep 2021 12:37:56 -0700 Subject: [PATCH 3/3] gnu: Add tealdeer. * gnu/packages/rust-apps.scm (tealdeer): New variable. --- gnu/packages/rust-apps.scm | 74 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e81c7d8748..800ba49fb9 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1051,6 +1051,80 @@ library and a dynamic library, and a C header to be used by any C (and C-compatible) software.") (license license:expat))) +(define-public tealdeer + (package + (name "tealdeer") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tealdeer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cwf46k2rszcpydrqajnm4dvhggr3ms7sjma0jx02ch4fjicxch7")))) + (build-system cargo-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (install-file + "bash_tealdeer" + (string-append out "/etc/bash_completion.d")) + (install-file + "fish_tealdeer" + (string-append + out "/share/completions/vendor_completions.d")))))) + #:cargo-test-flags + '("--release" "--" + ;; These tests go to the network + "--skip=test_quiet_old_cache" + "--skip=test_quiet_cache" + "--skip=test_quiet_failures" + "--skip=test_pager_flag_enable" + "--skip=test_markdown_rendering" + "--skip=test_spaces_find_command" + "--skip=test_autoupdate_cache" + "--skip=test_update_cache") + #:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-app-dirs2" ,rust-app-dirs2-2) + ("rust-atty" ,rust-atty-0.2) + ("rust-docopt" ,rust-docopt-1) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-flate2" ,rust-flate2-1) + ("rust-log" ,rust-log-0.4) + ("rust-pager" ,rust-pager-0.15) + ("rust-reqwest" ,rust-reqwest-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-tar" ,rust-tar-0.4) + ("rust-toml" ,rust-toml-0.5) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-xdg" ,rust-xdg-2)) + #:cargo-development-inputs + (("rust-assert-cmd" ,rust-assert-cmd-1) + ("rust-escargot" ,rust-escargot-0.5) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-predicates" ,rust-predicates-1) + ;; This earlier version is required to fix a bug. + ;; Remove rust-remove-dir-all-0.5.2 when tealdeer gets upgraded + ("rust-remove-dir-all" ,rust-remove-dir-all-0.5.2) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("openssl" ,openssl))) + (home-page "https://github.com/dbrgn/tealdeer/") + (synopsis "Fetch and show tldr help pages for many CLI commands") + (description + "This package fetches and shows tldr help pages for many CLI commands. +Full featured offline client with caching support.") + (license (list license:expat license:asl2.0)))) + (define-public zoxide (package (name "zoxide") -- 2.33.0 --=-=-=--