From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GKnmAg3wDmDnGAAA0tVLHw (envelope-from ) for ; Mon, 25 Jan 2021 16:21:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UFxBOgzwDmDzGwAAbx9fmQ (envelope-from ) for ; Mon, 25 Jan 2021 16:21:32 +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 67101940480 for ; Mon, 25 Jan 2021 16:21:32 +0000 (UTC) Received: from localhost ([::1]:46298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l44cM-0006AE-9o for larch@yhetil.org; Mon, 25 Jan 2021 11:21:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l44X4-0003Lw-Il for guix-patches@gnu.org; Mon, 25 Jan 2021 11:16:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l44X3-0006Vh-Rs for guix-patches@gnu.org; Mon, 25 Jan 2021 11:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l44X3-0008Rp-Np for guix-patches@gnu.org; Mon, 25 Jan 2021 11:16:01 -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 16:16:01 +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.161159135532458 (code B ref 45293); Mon, 25 Jan 2021 16:16:01 +0000 Received: (at 45293) by debbugs.gnu.org; 25 Jan 2021 16:15:55 +0000 Received: from localhost ([127.0.0.1]:39709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l44Wv-0008RR-R2 for submit@debbugs.gnu.org; Mon, 25 Jan 2021 11:15:54 -0500 Received: from out203-205-221-231.mail.qq.com ([203.205.221.231]:37125 helo=qq.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1l44Wg-0008Qr-Hi for 45293@debbugs.gnu.org; Mon, 25 Jan 2021 11:15:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1611591326; bh=IkbHHgyHWMh63LBuBtVbOQoMjuyQrxf8OI7C+QFreg4=; h=From:To:Cc:Subject:References:Date:In-Reply-To; b=GyB6nISqzU4/mJyW1n6T7/QwCLWrsq0CxEK0mHoAWvrKruzH6pbTHdZ2g9P8wc26A /gf/6lIRxKfYBYYGSSvvrGR+WaKDxmz7gYQKMoRLnommbVRFB13zAIZNM1pDfgVi5y RAXXIOOE+qh9y3vWnPTNeGs+A8PJmhdwWhN6hPDg= Received: from Z572 ([39.183.0.73]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id 3D703E43; Tue, 26 Jan 2021 00:15:23 +0800 X-QQ-mid: xmsmtpt1611591323td2i626em Message-ID: X-QQ-XMAILINFO: ME1n2Zj6vTGbDRuWRiZ+WJ17XJBVkpfxnIKx6B2HSbmuJhx4LHujKZt3XMs3aK SzPubAo4y6h9k/DhQFZO2zWO0H7oyLH4rrOGRfUIIVq64UM7snM4QgboaspVsui80tJGuKsARr1B dHcVNUsoOnz0gWAz5+K0gSEBly/mNdXj3cCg/lnWrr1rm2CG4ezKarSDUT48TrJ3yGWF8HU/mQsG Arrz1Tv7o9Bkw1UZnN6fI7PXVsJ/RNKHIDaMtZ5ePwqYDw2gxjGN5nCcpaYHLiEbosNgZYNdkYdw ish+QOaywSTij1i5BIi4ye0y23iVYXbghBi7pMVNDrp4wXsVqvSzuRACX4EeVUH6y1YhwFvRtC4w ZiLcyMz9Y3qqKavHy9pCDpnMLDRTs9PtfUfN0R+RI0anQ8OnuHHrowRkj8AEwPaSHTAoB5ZULag4 X+Mtnd8e91J7KAy5Ms6nCNgVnRly1ZE0hzqudaBO8sh1elWppXsSQ6BKspIIx5qbEKPW/yBCgNR4 ffvsmvQbc3NYEZ5/0Rm7G5RNzFOsNt9R6J/ce7QHjZy7S+FkyTVsQrofTPGcqd4mknWK+le1ASAf TewbemNqvGY17qxLHECh9H6mKO3VaB84MTWQgSfLV/fUNdb+7T8v3kAmdSiTm2SVrP00vnpcFhe3 SaC4xBj95R7/2yrPWKAXDBm81cSaBq+UFC8layJHQ1vDw7 From: Z572 <873216071@qq.com> References: <87o8is4lzp.fsf@qq.com> Date: Tue, 26 Jan 2021 00:15:23 +0800 In-Reply-To: (John Soo's message of "Mon, 25 Jan 2021 07:10:05 -0800") Message-ID: <871re9uh5w.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=GyB6nISq; 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: 67101940480 X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: CaeGofgA9rV3 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Move-rust-skim-to-rust-apps.patch Content-Transfer-Encoding: quoted-printable >From 8a25482b309a38b209c4ce529e9da0d465af25f9 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Tue, 26 Jan 2021 00:01:20 +0800 Subject: [PATCH 1/2] gnu: Move rust-skim to rust-apps. --- gnu/packages/crates-io.scm | 119 +------------------------------------ gnu/packages/rust-apps.scm | 119 +++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 118 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 16a59589a3..05d00f5ce6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) @@ -32725,124 +32726,6 @@ variants in pure Rust.") "Test your Rust markdown documentation via Cargo.") (license (list license:expat license:asl2.0)))) =20 -(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 - (origin - (method url-fetch) - (uri (crate-uri "skim" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1yiyd6fml5hd2l811sckkzmiiq9bd7018ajk4qk3ai4wyvqnw8mv")))) - (arguments - `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-2) - ("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.2) - ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-vte" ,rust-vte-0.3)))))) - (define-public rust-slab-0.4 (package (name "rust-slab") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e7a0c4fab2..24430120ca 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2020, 2021 Nicolas Goaziou ;;; Copyright =C2=A9 2021 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2021 Sharlatan Hellseher +;;; Copyright =C2=A9 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -502,6 +503,124 @@ gitignore rules.") (base32 "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))))) =20 +(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 + (origin + (method url-fetch) + (uri (crate-uri "skim" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yiyd6fml5hd2l811sckkzmiiq9bd7018ajk4qk3ai4wyvqnw8mv")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("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.2) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-vte" ,rust-vte-0.3)))))) + (define-public tectonic (package (name "tectonic") --=20 2.30.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Rename-rust-skim-to-skim.patch >From dbf352b787db782786f433a7cc26760cc283e42c Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Tue, 26 Jan 2021 00:03:55 +0800 Subject: [PATCH 2/2] gnu: Rename rust-skim to skim. --- gnu/packages/crates-io.scm | 7 +++++-- gnu/packages/rust-apps.scm | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 05d00f5ce6..32d889d11b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29874,11 +29874,11 @@ sub-processes using a fork-like interface.") ("rust-memchr" ,rust-memchr-2) ("rust-nix" ,rust-nix-0.18) ("rust-scopeguard" ,rust-scopeguard-1) - ("rust-skim" ,rust-skim-0.7) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-utf8parse" ,rust-utf8parse-0.2) - ("rust-winapi" ,rust-winapi-0.3)) + ("rust-winapi" ,rust-winapi-0.3) + ("skim" ,skim-0.7)) #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1.3) ("rust-doc-comment" ,rust-doc-comment-0.3) @@ -32726,6 +32726,9 @@ variants in pure Rust.") "Test your Rust markdown documentation via Cargo.") (license (list license:expat license:asl2.0)))) +(define-public rust-skim-0.7 + (deprecated-package "rust-skim-0.7" skim-0.7)) + (define-public rust-slab-0.4 (package (name "rust-slab") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 24430120ca..f2ab4a0c44 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -503,9 +503,9 @@ gitignore rules.") (base32 "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))))) -(define-public rust-skim-0.9 +(define-public skim (package - (name "rust-skim") + (name "skim") (version "0.9.3") (source (origin @@ -587,9 +587,9 @@ gitignore rules.") (description "This package provides a fuzzy finder in Rust.") (license license:expat))) -(define-public rust-skim-0.7 +(define-public skim-0.7 (package - (inherit rust-skim-0.9) + (inherit skim) (name "rust-skim") (version "0.7.0") (source -- 2.30.0 --=-=-=--