From patchwork Mon Jan 25 17:08:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 26635 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 E4EBC27BC1B; Mon, 25 Jan 2021 17:09:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 51A5A27BC1A for ; Mon, 25 Jan 2021 17:09:33 +0000 (GMT) Received: from localhost ([::1]:47364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l45Mq-0002vz-AZ for patchwork@mira.cbaines.net; Mon, 25 Jan 2021 12:09:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l45MM-0002te-VT for guix-patches@gnu.org; Mon, 25 Jan 2021 12:09:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l45MM-0006mK-M7 for guix-patches@gnu.org; Mon, 25 Jan 2021 12:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l45MM-0001LH-FD for guix-patches@gnu.org; Mon, 25 Jan 2021 12:09: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 17:09: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.16115945205102 (code B ref 45293); Mon, 25 Jan 2021 17:09:02 +0000 Received: (at 45293) by debbugs.gnu.org; 25 Jan 2021 17:08:40 +0000 Received: from localhost ([127.0.0.1]:39766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l45Lz-0001KE-FX for submit@debbugs.gnu.org; Mon, 25 Jan 2021 12:08:40 -0500 Received: from out203-205-221-173.mail.qq.com ([203.205.221.173]:43061 helo=qq.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1l45Lp-0001Jk-0s for 45293@debbugs.gnu.org; Mon, 25 Jan 2021 12:08:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1611594497; bh=OzgD272Fq9i6vXbYHEbYAVtN/nPf8zPParkyf4UbLBM=; h=From:To:Cc:Subject:References:Date:In-Reply-To; b=BsfWol8QjDNGErYvSfc5tLJ/fPhGGSUAo9ssHNHgDUNP9VxecoWvrQdhh60I3V0DH lkkXwtSsTl+czaSBVu4xeySte9vnCRcnMJTxmaF9H0OeYphNDvCAWZ+tY7BBNDPUe6 btdJ7XHOC0JL0oGUV8sgCtqCoZeqN71+i5ik/hb0= Received: from Z572 ([39.183.0.73]) by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP id 20CAB622; Tue, 26 Jan 2021 01:08:12 +0800 X-QQ-mid: xmsmtpt1611594492tsydb28la Message-ID: X-QQ-XMAILINFO: NbCyqzZBd0V3ZWBHPhL0CRsXm9kizWMIsN/OumonP7IPus4IggThvAC2JP4k+h tR08zYuuxRidfx6r81G/ynbgAzgK7QRb2rLPu9bN0+fh410HGbqu3fADzwWGHzWttZGnnC7OUaEZ K744bfWNy3hNHPvobmTpl3J3iZLjNVVGorzyNziLo0nQ2d+QXDAXTV27nQGhc3usHL+NbehjHpBa 5jkA/qaVSAvms7YOVZ5gybBISrgYCXf4b0/X00PF0gqnKXNaFj+vvw7Ce6+ZyXOc1FB+B5azRNMR lgOjtVqdXeWScXrnykffYGuIlGIjFpZn+fnh2KyzQBr5jfknaOOe5h3gM8hNdMQQYYIWp8qxhhhx hesU33KrmaCyDzLsc6aWZHrMEH5gZyABoSco7bCWL4I4jQFpBrmHX+NvYNieL5q+ih6TOaphLzaj ASnUMfp8NPi63pRpYjhrU1AAcBzZj4C7bKSAdz/PLeWTurJbVENnbNYce+y2fDKmlur06eIata05 6MWAYY773W+ckdaZFSneOpsFMs9Ov/qucDW4ETEtTwZ845TQjdsq5/5lahjcTMTPb/M6x+TqcL5D a4Vpj427x0vhd24CouFmoLbnOE0HBYZk1RzpHrvqORR6dmQPW+xHg+wjfFYuc0+FIraq6osGtWGq Ntdn0VE62ankd+HQTg+rnKfDnD95on8pqKFcd5sxCr2PEJ6An/raJ4rWV+n4ROeBAipODBkRgUka vCg9dVAnYjTT+n1FjWV8TFro5PUkNrF9/5UIxUNFk+r9RzmuVB6yhEyA== From: Z572 <873216071@qq.com> References: <87o8is4lzp.fsf@qq.com> <587ff7d5-f7ba-4865-bdc9-72e742ece70c@Johns-iPhone> Date: Tue, 26 Jan 2021 01:08:12 +0800 In-Reply-To: <587ff7d5-f7ba-4865-bdc9-72e742ece70c@Johns-iPhone> (John Soo's message of "Mon, 25 Jan 2021 08:20:52 -0800") Message-ID: <87y2ght05f.fsf_-_@qq.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches rust-rustyline-6 need skim-0.7 From acade4623d85fad69b78651aa50fc0efdc38e9a7 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Mon, 25 Jan 2021 16:57:31 +0800 Subject: [PATCH] gnu: Add skim. --- gnu/packages/crates-io.scm | 42 ++----------- gnu/packages/rust-apps.scm | 119 +++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 38 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 02ba3c1ecb..32d889d11b 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) @@ -29873,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,42 +32727,7 @@ variants in pure Rust.") (license (list license:expat license:asl2.0)))) (define-public rust-skim-0.7 - (package - (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")))) - (build-system cargo-build-system) - (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)))) - (home-page "https://github.com/lotabout/skim") - (synopsis "Fuzzy Finder in Rust") - (description "This package provides a fuzzy finder in Rust.") - (license license:expat))) + (deprecated-package "rust-skim-0.7" skim-0.7)) (define-public rust-slab-0.4 (package diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e7a0c4fab2..728a8ad9e5 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -502,6 +503,124 @@ gitignore rules.") (base32 "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))))) +(define-public skim + (package + (name "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 skim-0.7 + (package + (inherit skim) + (name "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") -- 2.30.0