From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cP+dEM+NDmDAUQAA0tVLHw (envelope-from ) for ; Mon, 25 Jan 2021 09:22:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sM2EDM+NDmBwSwAA1q6Kng (envelope-from ) for ; Mon, 25 Jan 2021 09:22:23 +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 1FD6A940485 for ; Mon, 25 Jan 2021 09:22:19 +0000 (UTC) Received: from localhost ([::1]:38636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3y4g-0001GZ-Pl for larch@yhetil.org; Mon, 25 Jan 2021 04:22:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3y4Q-0001Et-TI for guix-patches@gnu.org; Mon, 25 Jan 2021 04:22:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3y4Q-00008U-KU for guix-patches@gnu.org; Mon, 25 Jan 2021 04:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3y4Q-0000Q2-FD for guix-patches@gnu.org; Mon, 25 Jan 2021 04:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45293] [PATCH] gnu: Add skim. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jan 2021 09:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45293 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Soo Received: via spool by 45293-submit@debbugs.gnu.org id=B45293.16115665101587 (code B ref 45293); Mon, 25 Jan 2021 09:22:02 +0000 Received: (at 45293) by debbugs.gnu.org; 25 Jan 2021 09:21:50 +0000 Received: from localhost ([127.0.0.1]:37887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3y49-0000PM-O6 for submit@debbugs.gnu.org; Mon, 25 Jan 2021 04:21:50 -0500 Received: from out203-205-221-239.mail.qq.com ([203.205.221.239]:34816 helo=qq.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1l3y42-0000Oo-Um for 45293@debbugs.gnu.org; Mon, 25 Jan 2021 04:21:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1611566487; bh=e48h6flmfoznuKgguokpdBrGWKKNMZR1fYTM9aI6NI4=; h=From:To:Cc:Subject:References:Date:In-Reply-To; b=Tk+TY77311Nl3yT/N0h7OoeLUYrY73d2I7cpGsBYmvGSEA1xtDwMR3o6/T6ZWhB3e 1rZXpTi9oq3lszEQ8bUrZu65RBfQ1jtJc3uqSHh+K8SoiGmvkPGRHOjv81LuLpYDe8 s+GYaH6MJTKxu3WgSCldE1k7Ah2QMO7edBNZKaoE= Received: from Z572 ([39.183.0.73]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id 559190AB; Mon, 25 Jan 2021 17:21:25 +0800 X-QQ-mid: xmsmtpt1611566485tozwxz8o8 Message-ID: X-QQ-XMAILINFO: MZDAXiv8lLL6XZrgmOYAUW7s3R46Y1/XJWEIHTMn+CTzwyf7AH22UXOiPb1GYL IwnY7zpYtEUvN5SCyB6XX/YXngro31ECT456amLEuQF/LeDgc9egchBJq+MTmjmt3fwyG28PWElL m2agxRg3/ZEBLSL2oKtQtXGzUFvv0AEAiMBdgCsD1/YL4GCwd6P8C3s77Trd8XF7wICQ1kSEc+np G/agmTFcVjwZBTZ7awwBMwxFWZxAB6lejX9AAVyXuPE+UZ3uKYb/74cbzhM3l26FqfNMEBK4Gc/l kDrTJq9Pnk/sTgVOfalZpa6PjfbVhvufFECAH/D+QSoUWytdj4gl4zxIhCFZmbmWtHV4W00ddOgY Ps8nO4UMIbVm3UUMyUI8HyytQPPL25yXsf7akrsPbzxfemWEVSHqs2yEleBmOwYWd2X9mstx2yU8 RxH3NlLwlRkTSj/zKiN6EDvv7WrROnPjE/QNfDOr9EppO+XnZRaS0zyD5qL7z3XErB9OE3jfDAtE TeQACvloyEGM8XjcSe6dhSTDCXeF/U8h55DoHs+lv22CB/UGKxBmsgFFVb7qucFX2gFV5OSEPtGZ lZWfeB1fH5UjEMRiqssA1bM27he3VnGlQPul8/GWrDGRnCHmukPjemLz3CkxKuYk8i15atwzsJ4p aY6pF+kvdXwUKOOghtUNj/qwEA/LGynK4FdvJu6P4dGIC4YyVz20Ba/PYFIHIIUpfGrH53cyMVZL /H2vhFvn+CLx+9k08m7zO0dE5tUfFzt4MjZlxD+4Eo3erLcod8AuKfynBZ/yJdcQRZ From: Z572 <873216071@qq.com> References: <877do2w4uo.fsf@asu.edu> Date: Mon, 25 Jan 2021 17:21:24 +0800 In-Reply-To: <877do2w4uo.fsf@asu.edu> (John Soo's message of "Sun, 24 Jan 2021 10:46:07 -0800") Message-ID: <877do1v0bv.fsf_-_@qq.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: , Cc: 45293@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=Tk+TY773; dmarc=fail reason="SPF not aligned (relaxed)" header.from=qq.com (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: 1FD6A940485 X-Spam-Score: 3.65 X-Migadu-Scanner: scn1.migadu.com X-TUID: vbKnAxQiZ0Ue --=-=-= Content-Type: text/plain This is new patch. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-rust-tuikit-0.4.patch Content-Transfer-Encoding: quoted-printable >From 0cdaab0fcdadd8603641e5d28120e91462323cee Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Mon, 25 Jan 2021 13:21:12 +0800 Subject: [PATCH 1/4] gnu: Add rust-tuikit-0.4. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 36f0b98112..39b3fb5189 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12,6 +12,7 @@ ;;; Copyright =C2=A9 2020 Andr=C3=A9 Batista ;;; Copyright =C2=A9 2020 Arun Isaac ;;; Copyright =C2=A9 2020 Antoine C=C3=B4t=C3=A9 +;;; Copyright @ 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38719,10 +38720,10 @@ extension for the Trust-DNS client to use rustls = for TLS.") "Test harness for ui tests of compiler diagnostics.") (license (list license:expat license:asl2.0)))) =20 -(define-public rust-tuikit-0.2 +(define-public rust-tuikit-0.4 (package (name "rust-tuikit") - (version "0.2.9") + (version "0.4.3") (source (origin (method url-fetch) @@ -38731,7 +38732,7 @@ extension for the Trust-DNS client to use rustls fo= r TLS.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "19f3jp12kqcx7aaykxbaj1j17zahd4drv049agpxaminr63w2sw4")))) + "1hf6pgclb2lj08jzb45q0mpjq2a9zw27h7kwyi5cibjz5skd054b")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; tests fail in the build environment. @@ -38740,7 +38741,7 @@ extension for the Trust-DNS client to use rustls fo= r TLS.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-nix" ,rust-nix-0.14) - ("rust-term" ,rust-term-0.5) + ("rust-term" ,rust-term-0.6) ("rust-unicode-width" ,rust-unicode-width-0.1)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.6)))) @@ -38750,6 +38751,32 @@ extension for the Trust-DNS client to use rustls f= or TLS.") "This package provides a toolkit for writing TUI applications in Rust= .") (license license:expat))) =20 +(define-public rust-tuikit-0.2 + (package + (inherit rust-tuikit-0.4) + (name "rust-tuikit") + (version "0.2.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "tuikit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19f3jp12kqcx7aaykxbaj1j17zahd4drv049agpxaminr63w2sw4")))) + (arguments + `(#:tests? #f ; tests fail in the build environment. + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.14) + ("rust-term" ,rust-term-0.5) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.6)))))) + (define-public rust-typeable-0.1 (package (name "rust-typeable") --=20 2.30.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-rust-defer-drop-1.patch >From f7b63404e89889ab2f9a59fc1786744091949812 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Mon, 25 Jan 2021 13:34:04 +0800 Subject: [PATCH 2/4] gnu: Add rust-defer-drop-1. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 39b3fb5189..1357f52c19 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8815,6 +8815,33 @@ sizes. Big-endian order is used. WARNING: Block must be aligned!") "Decimal floating point arithmetic for Rust.") (license license:asl2.0))) +(define-public rust-defer-drop-1 + (package + (name "rust-defer-drop") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "defer-drop" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1d3pmmn5k2ir3yv8z8fnv4jprs5aijkz5pbdyl8x8kp18m90bbhq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-crossbeam-channel" + ,rust-crossbeam-channel-0.4) + ("rust-once-cell" ,rust-once-cell-1)))) + (home-page "https://github.com/Lucretiel/defer-drop") + (synopsis + "Defer dropping large types to a background thread") + (description + "This package provides a defer dropping large types to a background thread.") + (license license:mpl2.0))) + (define-public rust-deflate-0.8 (package (name "rust-deflate") -- 2.30.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-Add-rust-beef-0.4.patch >From 3f85f899095a7664b778942f588c0622715c2db4 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Mon, 25 Jan 2021 13:53:37 +0800 Subject: [PATCH 3/4] gnu: Add rust-beef-0.4. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1357f52c19..02ba3c1ecb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3034,6 +3034,29 @@ c6e7d37. However, this package works only up to 128 bytes.") (description "This library provides for encoding and decoding any base.") (license license:expat))) +(define-public rust-beef-0.4 + (package + (name "rust-beef") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "beef" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hva1rmbx2a54q4ncs8i5lbr26669wyvnya1sh3x22r0cxm64jj7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/maciejhirsz/beef") + (synopsis "More compact Cow") + (description "This package provides a More compact Cow.") + (license (list license:expat license:asl2.0)))) + (define-public rust-bencher-0.1 (package (name "rust-bencher") -- 2.30.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-Add-rust-skim-0.9.patch >From c7d9525e5197a34d4a5c2fbfeb790c2a91bfd01f Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Mon, 25 Jan 2021 16:57:31 +0800 Subject: [PATCH 4/4] gnu: Add rust-skim-0.9. --- gnu/packages/crates-io.scm | 92 +++++++++++++++++++++++++++++++++++--- 1 file changed, 86 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 02ba3c1ecb..16a59589a3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32725,8 +32725,93 @@ variants in pure Rust.") "Test your Rust markdown documentation via Cargo.") (license (list license:expat license:asl2.0)))) +(define-public rust-skim-0.9 + (package + (name "rust-skim") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "skim" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qir6m4cpd63bnp0lqq4si1ccgd6rbv4m1662v771fkyynrdrj0s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-beef" ,rust-beef-0.4) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("rust-crossbeam" ,rust-crossbeam-0.7) + ("rust-defer-drop" ,rust-defer-drop-1) + ("rust-derive-builder" ,rust-derive-builder-0.9) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.14) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-time" ,rust-time-0.1) + ("rust-timer" ,rust-timer-0.2) + ("rust-tuikit" ,rust-tuikit-0.4) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-vte" ,rust-vte-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (man (string-append out "/share/man")) + (vimfiles (string-append share "/vim/vimfiles/plugin")) + (bash-completion + (string-append share "/bash-completions/completions")) + (zsh-site (string-append share "/zsh/site-functions")) + (fish-vendor + (string-append share "/fish/vendor-completions.d"))) + ;; Binaries + (for-each + (lambda (binary) (install-file binary bin)) + (find-files "bin")) + (mkdir-p share) + ;; Manpages + (copy-recursively "man" man) + ;; Vim plugins + (mkdir-p vimfiles) + (copy-recursively "plugin" vimfiles) + ;; Completions + (mkdir-p bash-completion) + (copy-file + "shell/completion.bash" + (string-append bash-completion "/skim")) + (copy-file + "shell/key-bindings.bash" + (string-append bash-completion "/skim-bindings")) + (mkdir-p zsh-site) + (copy-file + "shell/completion.zsh" + (string-append zsh-site "/_skim")) + (copy-file + "shell/key-bindings.zsh" + (string-append zsh-site "/_skim-bindings")) + (mkdir-p fish-vendor) + (copy-file + "shell/key-bindings.fish" + (string-append fish-vendor "/skim-bindings.fish")))))))) + (home-page "https://github.com/lotabout/skim") + (synopsis "Fuzzy Finder in Rust") + (description "This package provides a fuzzy finder in Rust.") + (license license:expat))) + (define-public rust-skim-0.7 (package + (inherit rust-skim-0.9) (name "rust-skim") (version "0.7.0") (source @@ -32738,7 +32823,6 @@ variants in pure Rust.") (sha256 (base32 "1yiyd6fml5hd2l811sckkzmiiq9bd7018ajk4qk3ai4wyvqnw8mv")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -32757,11 +32841,7 @@ variants in pure Rust.") ("rust-timer" ,rust-timer-0.2) ("rust-tuikit" ,rust-tuikit-0.2) ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-vte" ,rust-vte-0.3)))) - (home-page "https://github.com/lotabout/skim") - (synopsis "Fuzzy Finder in Rust") - (description "This package provides a fuzzy finder in Rust.") - (license license:expat))) + ("rust-vte" ,rust-vte-0.3)))))) (define-public rust-slab-0.4 (package -- 2.30.0 --=-=-=--