From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 17 08:10:50 2020 Received: (at submit) by debbugs.gnu.org; 17 Dec 2020 13:10:50 +0000 Received: from localhost ([127.0.0.1]:35047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kpt3N-0001hL-5U for submit@debbugs.gnu.org; Thu, 17 Dec 2020 08:10:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:41994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1kpt3H-0001hA-NH for submit@debbugs.gnu.org; Thu, 17 Dec 2020 08:10:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1kpt3H-0007Bi-GV for guix-patches@gnu.org; Thu, 17 Dec 2020 08:10:39 -0500 Received: from out203-205-251-66.mail.qq.com ([203.205.251.66]:33521 helo=qq.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1kpt33-0004EF-Cb for guix-patches@gnu.org; Thu, 17 Dec 2020 08:10:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1608210606; bh=c8JOZ6nUkL8SbkAGI+bFQLUNbI1uXPdXttzsiCV7cmk=; h=From:To:Subject:Date; b=K9TvCi0evVSPvi3VSvCUUiySFDkAifmv9Pn/yVkXzXKlzBT0PhF8f7ytSmqX/9Ls0 WEYgSQ/0muSScS06lZ6N7qYerOfyx83Yb8qgXPt+AYeTO3tgj6JSdR9DSwhwjuelfU 6F8mZuHL8MMPFOzcLJidtvf+Iz6aROVAMeF2F7pw= Received: from Z572 ([112.10.12.72]) by newxmesmtplogicsvrszc8.qq.com (NewEsmtp) with SMTP id 28410406; Thu, 17 Dec 2020 21:10:04 +0800 X-QQ-mid: xmsmtpt1608210604t6v3iwxz5 Message-ID: X-QQ-XMAILINFO: N8dIm/EmOvl3FPmixYOCT9TLEgRSDog4I8ft8BgTI0feW/kQrlFFaKFIFyoIB+ tbn3D0PasyyLF12cPx+9xu8rYnUSLicj2KUxsrGBqjQ811pym77wPqNea2GoCZbAA1ebs4RLexcm 2DA2guunXc/srGL4rtoCD8IR0RyrHQvsamGZszaKOt+nw7VNIPEMXeaSNo1JvQJXq0jJLKkCRilf lJtjxLMaqsSMVEd80VxtIn5WvoW+QySVOon07UZdAj9cF2VZ9kvKoB+bMIbjOe53XnxZoAeWi/Or f1dF9ZYhb4/nkLXqruJFDRXCsI4aSPdNH5ixq7WgHJ4trD6TspE0NLl/l0dx6NADtQ94VZ3v7H4u KAEWdLE1wlx1PHogs1OUa0nXddFH9sPPgccJNzQVOovMXicBKhqcvpNW2dO/Vi/We8dhJR/rT5IG L4gNAQbbErexBwOUnqSePlwrjSyFO1Gu5Cwh21HGngivj4axF3aLI60K/ugGHRerDKyWqD72MAuc QupmJlQay3JNR4eXbbmYIiMjhLaWnkZpP0EQfgDCJzRqhYsC88pR/tP4v5dgu+/SRAlFjxaDD7x3 Hg3zyHk2jBE/5Uv4NP59gXDqdj5BZ12OsihpIfu0tl6veA75Xsw3CB82zMK6+nv/fJzT72Z4KtOO NsTHiOTWVMbg0Lz6ivcvb36A0= From: Z572 <873216071@qq.com> To: guix-patches@gnu.org Subject: [PATCH] gnu: Add skim. Date: Thu, 17 Dec 2020 21:10:02 +0800 Message-ID: <87o8is4lzp.fsf@qq.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=203.205.251.66; envelope-from=873216071@qq.com; helo=qq.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 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_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) --=-=-= 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 73ff533214c54fe65ba7b7a20fd6c6bed302a52c Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Thu, 17 Dec 2020 21:00:52 +0800 Subject: [PATCH 1/6] gnu: Add rust-tuikit-0.4. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f42816d47d..57751cc772 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 =C2=A9 2020 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35889,3 +35890,33 @@ formatters with per-field documentation generated = for each structure. (description "Generate Rust register maps (`struct`s) from SVD files") (license (list license:expat license:asl2.0)))) + +(define-public rust-tuikit-0.4 + (package + (name "rust-tuikit") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tuikit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01x99x184k3p3knbzvr263has5rhpgkv81ijiqa8aqm1fl2azzfz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? + #t + #: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.6) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/lotabout/tuikit") + (synopsis "Toolkit for writing TUI applications") + (description + "Toolkit for writing TUI applications") + (license license:expat))) --=20 2.29.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-rust-timer-0.2.patch >From 404cc212db56de26f81d3a30f9426a1b5c224236 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Thu, 17 Dec 2020 21:01:15 +0800 Subject: [PATCH 2/6] gnu: Add rust-timer-0.2. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57751cc772..b9cb436935 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35920,3 +35920,29 @@ formatters with per-field documentation generated for each structure. (description "Toolkit for writing TUI applications") (license license:expat))) + +(define-public rust-timer-0.2 + (package + (name "rust-timer") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "timer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0srhqyp7fr91d1i43aqs7wc6yn1i3kdkh1pm05bicdw961v23m1i")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? + #t + #:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4)))) + (home-page "https://github.com/Yoric/timer.rs") + (synopsis + "A simple timer. Use it to schedule execution of closures after a delay or at a given timestamp.") + (description + "This package provides a simple timer. Use it to schedule execution of closures after a delay or at a given timestamp.") + (license license:mpl2.0))) -- 2.29.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-Add-rust-fuzzy-matcher-0.3.patch >From 251e1e0c8c753ccd7d9c05c1699b8f37fa694969 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Thu, 17 Dec 2020 21:02:22 +0800 Subject: [PATCH 3/6] gnu: Add rust-fuzzy-matcher-0.3 --- 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 b9cb436935..dc7d38530b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35946,3 +35946,28 @@ formatters with per-field documentation generated for each structure. (description "This package provides a simple timer. Use it to schedule execution of closures after a delay or at a given timestamp.") (license license:mpl2.0))) + +(define-public rust-fuzzy-matcher-0.3 + (package + (name "rust-fuzzy-matcher") + (version "0.3.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "fuzzy-matcher" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "153csv8rsk2vxagb68kpmiknvdd3bzqj03x805khckck28rllqal")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? + #t + #:cargo-inputs + (("rust-thread-local" ,rust-thread-local-1.0)))) + (home-page + "https://github.com/lotabout/fuzzy-matcher") + (synopsis "Fuzzy Matching Library") + (description "Fuzzy Matching Library") + (license license:expat))) -- 2.29.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-Add-rust-defer-drop-1.patch >From 6320df9034b5dda9e5c75f077ceebdb444a5518f Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Thu, 17 Dec 2020 21:02:58 +0800 Subject: [PATCH 4/6] gnu: Add rust-defer-drop-1. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc7d38530b..aa91f7c1aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35971,3 +35971,31 @@ formatters with per-field documentation generated for each structure. (synopsis "Fuzzy Matching Library") (description "Fuzzy Matching Library") (license license:expat))) + +(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 "") + (synopsis + "Defer dropping large types to a background thread") + (description + "Defer dropping large types to a background thread") + (license license:mpl2.0))) -- 2.29.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-Add-rust-beef-0.4.patch >From b6df1554b77913dba0990beea7d9141f896f0e82 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Thu, 17 Dec 2020 21:03:18 +0800 Subject: [PATCH 5/6] gnu: Add rust-beef-0.4. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa91f7c1aa..95d274e79a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35999,3 +35999,27 @@ formatters with per-field documentation generated for each structure. (description "Defer dropping large types to a background thread") (license license:mpl2.0))) + +(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 "") + (synopsis "More compact Cow") + (description "More compact Cow") + (license (list license:expat license:asl2.0)))) -- 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0006-gnu-Add-skim.patch Content-Transfer-Encoding: quoted-printable >From 42d30ecae2a16f6dfdd65f99e1eb936520811827 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Thu, 17 Dec 2020 21:03:39 +0800 Subject: [PATCH 6/6] gnu: Add skim. --- gnu/packages/rust-apps.scm | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index c3d1d3bb26..a5228b1576 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2020 Mark H Weaver ;;; Copyright =C2=A9 2020 Gabriel Arazas ;;; Copyright =C2=A9 2020 Nicolas Goaziou +;;; Copyright =C2=A9 2020 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -401,6 +402,47 @@ gitignore rules.") (base32 "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))))) =20 +(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)))) + (home-page "https://github.com/lotabout/skim") + (synopsis "Fuzzy Finder in rust!") + (description "Fuzzy Finder in rust!") + (license license:expat))) + (define-public tokei (package (name "tokei") --=20 2.29.2 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 24 13:46:17 2021 Received: (at 45293) by debbugs.gnu.org; 24 Jan 2021 18:46:17 +0000 Received: from localhost ([127.0.0.1]:37255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3kOv-0001ch-5H for submit@debbugs.gnu.org; Sun, 24 Jan 2021 13:46:17 -0500 Received: from mail-pl1-f175.google.com ([209.85.214.175]:42666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3kOs-0001cU-KU for 45293@debbugs.gnu.org; Sun, 24 Jan 2021 13:46:15 -0500 Received: by mail-pl1-f175.google.com with SMTP id s15so6218296plr.9 for <45293@debbugs.gnu.org>; Sun, 24 Jan 2021 10:46:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=5r/f4ckGG7dGql2kH4zwV1S5ZLUVC4mHR2DQxj4aOq0=; b=uz+ESi3tSeu9LWwZQZO2mORLmy9wli9/oHLZW3lK7UIar/s1LAb6Y/UpBjBeelFTDo ufB4Wjgck+DSvVmdbJwENwWnvCvRVHPFCWUWLIfR8Q/12MKnva7cv6VhrV5+L3AuBYdF spop4jSxJ/r+YK6kuMet+FDzFtGguJLT53gOr3sTisffuC7liTo12XmMyoIOJwri57yc kcZXdII6ONypvQwxGPGbxq9zoo7mf23d9K6iX6k115VRJLL/zvwp9PNEeHmLLLfUfm4q O5WNDXRt2sXd9ye9q3m4E5d+t17x4k57Pn/0h8h0rol3UFcGvnUd4bgSlvvhokeaSjQ+ cGyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=5r/f4ckGG7dGql2kH4zwV1S5ZLUVC4mHR2DQxj4aOq0=; b=AA7JM2nRk4bZUYIh9IYZzJseVcTtXVJggGmIqtjKjoTtlPUTPi27K8f/4IOcfodp6B PYXUVuguAfwKG19jnDZGb1zCA9wWXReMhWaG7wwZnZXdTH0/g1uu4ZCv/wim5pY4Akkb kxa0XhBj6N8IKfv1FFLS1Ro6r44ewVTu2uqHUYRlPz9N2DcLKCH3z4eaKIO0XpDRYSJK 95K3f1725cj1pXxsWKtLrhwcM8My8JaOIF+EyMqKRtpnFcPWRLvlb6Y7m0iHVApRIuv3 7mdmCtuvLcMaiUpnXgmj/rAYDmdZR/n87hhzyN7jB4Il6AxvCuO45LVc1JOnAlW7XLUT T7Uw== X-Gm-Message-State: AOAM530kbFcVAXoxuxLKo0UTSaHuA2FwXBLClJ8vWHWah1amFRs6S8Jw KQvO1MEpeHTRlUswXNlwADPuL2PRZaC1CA== X-Google-Smtp-Source: ABdhPJxJzsOgz5rhco7ysKTOaAR7xaT+84XREXBGcJjAPEw4rzBWk61VCFQt/1bT9g21wBboXus4yw== X-Received: by 2002:a17:90b:e15:: with SMTP id ge21mr6674600pjb.185.1611513968639; Sun, 24 Jan 2021 10:46:08 -0800 (PST) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id z16sm13999813pgj.51.2021.01.24.10.46.07 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Jan 2021 10:46:08 -0800 (PST) From: John Soo To: Z572 <873216071@qq.com> Subject: Re: bug#45293: [PATCH] gnu: Add skim. References: Date: Sun, 24 Jan 2021 10:46:07 -0800 In-Reply-To: (873216071@qq.com's message of "Thu, 17 Dec 2020 21:10:02 +0800") Message-ID: <877do2w4uo.fsf@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45293 Cc: 45293@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, I made some patches for skim also. Yours look good but there are some extras not installed. In particular the manpages, vim plugins and shell completions are missing. Can you add something like the following to the #:phases part of the arguments? (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")))))) Thanks! John From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 25 04:21:50 2021 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> To: John Soo Subject: Re: bug#45293: [PATCH] gnu: Add skim. 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-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: 45293 Cc: 45293@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) --=-=-= 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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 25 10:10:16 2021 Received: (at 45293) by debbugs.gnu.org; 25 Jan 2021 15:10:16 +0000 Received: from localhost ([127.0.0.1]:39612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l43VP-0006lA-TI for submit@debbugs.gnu.org; Mon, 25 Jan 2021 10:10:16 -0500 Received: from mail-pf1-f178.google.com ([209.85.210.178]:44168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l43VN-0006ku-9B for 45293@debbugs.gnu.org; Mon, 25 Jan 2021 10:10:14 -0500 Received: by mail-pf1-f178.google.com with SMTP id t29so8528383pfg.11 for <45293@debbugs.gnu.org>; Mon, 25 Jan 2021 07:10:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:message-id:in-reply-to:subject:mime-version; bh=LQnAnuhaimFFJYr57ZlbrFtGXZXelMixdf4Lk9yLTcs=; b=YER+/1gNMKpy05gqP9yvkSvFCMUxVJGiNLiPFeiJoJvAFXkDdGs8jl0NgB5WPGgKii ZD5ZXdv8QzhMlx6KLmuwuLiKNpm1i9UgnmDbvPqPSQ2YwCowfY3ecOoOdGfc+mq/GLkK LmsPQQ9u7DcAXVUvhZzSlqEv1q29mV/6BOU+0A7nfuT6o145CvaK44ptQ/BnURqHAVAy uBQc5/ene0T9SVgQ8LOkL4+PSKZg26Ex1EJ35Fk9QASkyRfhkPqGYdEIVzqeFqu3X8pN LkffN9kUW3Sc4TdjGY7sA/9F3gLfQUItFWR0PYu/J11F5GmTxvAzJd/GQ1FqUVt5HVif ltDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to:subject :mime-version; bh=LQnAnuhaimFFJYr57ZlbrFtGXZXelMixdf4Lk9yLTcs=; b=KEvkkWQjKF9+QiaeV2wEtyuYGRCkuD+surQ/ZCJLGmsxdUwvloeFx6L+uzlhB2Qm9P rsv+HbMm9cVpwP9k41I8lsBrVjcltQ4xGwjCKQHH7ma0hKOseDnAeNweHzLXjNEnOISF u4sRRTZ+u7WqdFXyGRjz6P4f4CJro0ztKMDzTGZTgsN9EyDg8rEbul0v91EuiLCDkui3 WHUbzBY89+SxT/+khd/mVZbj7ylUVW/BT9E3k4SVl5VZWiQsLpLFPdjzwHMtDpn15hvs xuvNM7tdL3JmehMbvm1IWLJR3qOLDmzBE06RkPWOwZhLKjlOEE8fpAm35uV/MNloYrJe d6VQ== X-Gm-Message-State: AOAM531UvQVXVvFiUu67zMGqtCCMh8FIRrIfV7ivoiQdpd0hzihqzLtr 4kbbbtX073zU3TEk35CpJbrnSg== X-Google-Smtp-Source: ABdhPJxfc8X2dq3WwRfc6TITiNd4FL/0FmeDd0BxhSiqX1zHP0lol+8EStEf9oFesCCaPlV1N9nyxg== X-Received: by 2002:a62:1d46:0:b029:1b7:fe6e:4bb4 with SMTP id d67-20020a621d460000b02901b7fe6e4bb4mr832516pfd.4.1611587407301; Mon, 25 Jan 2021 07:10:07 -0800 (PST) Received: from [2600:1700:83b0:8bd0:30d1:1d81:200:0] ([2600:1700:83b0:8bd0:10c6:45f9:ed30:dffe]) by smtp.gmail.com with ESMTPSA id o10sm16818199pfp.87.2021.01.25.07.10.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jan 2021 07:10:06 -0800 (PST) Date: Mon, 25 Jan 2021 07:10:05 -0800 From: John Soo To: Z572 <873216071@qq.com> Message-ID: In-Reply-To: Subject: Re: bug#45293: [PATCH] gnu: Add skim. MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="600edf4d_6b8b4567_180fc" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45293 Cc: 45293 <45293@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --600edf4d_6b8b4567_180fc Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Ah! Looks good! One last thing I think you should do is move rust-skim to rust-apps.scm and rename to just skim. You may also want to deprecate the versions called rust-skim. Thanks again! John --600edf4d_6b8b4567_180fc Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline
Ah=21 Looks good=21 &n= bsp;One last thing I think you should do is move rust-skim to rust-apps.s= cm and rename to just skim. You may also want to deprecate the versions c= alled rust-skim. 

Thanks again=21
John
--600edf4d_6b8b4567_180fc-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 25 11:15:55 2021 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> To: John Soo Subject: Re: bug#45293: [PATCH] gnu: Add skim. 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-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: 45293 Cc: 45293@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) --=-=-= 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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 25 11:21:02 2021 Received: (at 45293) by debbugs.gnu.org; 25 Jan 2021 16:21:02 +0000 Received: from localhost ([127.0.0.1]:39714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l44bu-00008G-Cg for submit@debbugs.gnu.org; Mon, 25 Jan 2021 11:21:02 -0500 Received: from mail-pl1-f174.google.com ([209.85.214.174]:38887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l44bs-00007R-3Y for 45293@debbugs.gnu.org; Mon, 25 Jan 2021 11:21:00 -0500 Received: by mail-pl1-f174.google.com with SMTP id d4so7926623plh.5 for <45293@debbugs.gnu.org>; Mon, 25 Jan 2021 08:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:message-id:in-reply-to:subject:mime-version; bh=JOVCSzWVDHSeggFnVFb61RnEbEOYjlkjcTE/4AotnE4=; b=RHepUDgs3l9yiF1gPAVYSvU6LLyRDwF9MOSS+IyIoeHSBOisG93olud+lXMZRVlxTU YC8ZcYtPncr8bgXjvSAVBNVvHNazV4Qh3EK2/9jVHb5KiUpEU0+K8knTqSWr0e7Vl+4W 3Ry2nmna8BYLNvyAXxud7rjkLc2rplDJpV1hdzAqWYdIMasszziyuzNRntieBA9XdjSS TedMP/FUauRuGRWGAcTq/hoEsWOBON7s2J/JgUXNYzUvZ0fhnDU708fmmvPhEYj9Cbx6 QMe2XBaF1expdCV7qrY1XwFli6VkjwyANKl4Jp7mNbEEmNp6+iotSlfzBN8olX0QiXFn 1QOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to:subject :mime-version; bh=JOVCSzWVDHSeggFnVFb61RnEbEOYjlkjcTE/4AotnE4=; b=meuFpXFmSAsmPKSsyrXihs1ghdnS33+i09JFPzsroPPp5GB00dIkpEHYgBXewUHnOk TzkgoNG1nUTwrEkT4YzJqnIP4woxVLAEbBIw90VxuOpsEsDm3CkDjqHlm5vX0BUNvsJG TxfWUzNZBGzbUJOdXx5uPqpwyQencgJxRocTGmaFoHk8XijvmTxpqv/0vtfFCBBh3dFo +Hm6OZ/estHzb6bqbdbCWA4GHN+94Uii9v9CBCDClea0Llod7oSUfYTqhIYtbBnrlfg3 Jgcn3ZkOb/jgDnMrIf8sWoarKYUyBPUHj33rXZpFjQLvFz9BMb4pBOEqdLWh4+98WJHo a2bg== X-Gm-Message-State: AOAM530GfJ62yogK9mYMFOwzegiB2kEslfCZPrJeToNxlGfjdJ44YRat YTBX+60iA13SLlz/2eX4Z9eyEg== X-Google-Smtp-Source: ABdhPJxjnvnuE/I/F4h8riF7mxVbqYfnW04bExfNCV7kwbBWj9+9E8fjOeHNCfqYpS++PkQgrjv5ZQ== X-Received: by 2002:a17:902:c38d:b029:de:af89:10e0 with SMTP id g13-20020a170902c38db02900deaf8910e0mr1226385plg.61.1611591654190; Mon, 25 Jan 2021 08:20:54 -0800 (PST) Received: from [2600:1700:83b0:8bd0:c042:2882:200:0] ([2600:1700:83b0:8bd0:9a8:82f4:ce5d:f0fe]) by smtp.gmail.com with ESMTPSA id x19sm662070pff.192.2021.01.25.08.20.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jan 2021 08:20:53 -0800 (PST) Date: Mon, 25 Jan 2021 08:20:52 -0800 From: John Soo To: Z572 <873216071@qq.com> Message-ID: <587ff7d5-f7ba-4865-bdc9-72e742ece70c@Johns-iPhone> In-Reply-To: Subject: Re: bug#45293: [PATCH] gnu: Add skim. MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="600eefe4_6b8b4567_1859a" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45293 Cc: 45293 <45293@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --600eefe4_6b8b4567_1859a Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Can you rename rust-skim to skim (both variable name and package name) please? I think ideally you should also remove the old rust-skim versions from crates-io.scm if no other packages depend on it. Can also you also squash the commit doing the move and rename into the commit adding skim please? Thanks! John --600eefe4_6b8b4567_1859a Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Can you rename rust-skim to skim (both variable name and pack= age name) please=3F  I think ideally you should also remove the old = rust-skim versions from crates-io.scm if no other packages depend on it. =  Can also you also squash the commit doing the move and rename into = the commit adding skim please=3F

Thanks=21
<= br>
John
--600eefe4_6b8b4567_1859a-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 25 12:08:40 2021 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> To: John Soo Subject: Re: bug#45293: [PATCH] gnu: Add skim. 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 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: 45293 Cc: 45293@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) --=-=-= Content-Type: text/plain rust-rustyline-6 need skim-0.7 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-skim.patch Content-Transfer-Encoding: quoted-printable >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)))) =20 (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)) =20 (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 =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 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") --=20 2.30.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 29 11:36:01 2021 Received: (at 45293) by debbugs.gnu.org; 29 Jan 2021 16:36:01 +0000 Received: from localhost ([127.0.0.1]:52841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5WkX-0000dU-F4 for submit@debbugs.gnu.org; Fri, 29 Jan 2021 11:36:01 -0500 Received: from mail-pf1-f175.google.com ([209.85.210.175]:43159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5WkU-0000dA-N3 for 45293@debbugs.gnu.org; Fri, 29 Jan 2021 11:35:56 -0500 Received: by mail-pf1-f175.google.com with SMTP id q131so6549971pfq.10 for <45293@debbugs.gnu.org>; Fri, 29 Jan 2021 08:35:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=HVMBKpsH3PxnWwAyNfzrKQkkI+Vv+XQV+475BX5J3Gc=; b=ocqABJeMgwVv3WNLKDxK5U9UmNw0Wdli2d8XaloKxfFxSCs7aiZrlb9WllynvvBsE6 /e3WNbd/s2+pY+as4oR7uJB9oXWN13n48pJIkH3U9qztbTtOUTq01o9m8OkSIECyHsu7 +vNESq3aIRUR/OpHSj8E7YB0urmrfQvzWCYnsrXX5+/kUWgRozcWtH2+kfYUfotKveWb 7F2ILbfxrmsSS1UI9rfd1pym01qX7u3NhIr01GHG3DWZZkXsu150rxRMe8CFLfJmgmHp wdB2LKJGsT/jkUnSLz6eFJhnyObpy4uUbcZswjWznSjQCpoHuipxLvDsFwZYUi4d75Rc MCvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=HVMBKpsH3PxnWwAyNfzrKQkkI+Vv+XQV+475BX5J3Gc=; b=jPnplBO6Xukk1GiOlsCNam1k97LWEKkCiVMRdV7qABX42YyFhciJ6HiZpLegXm0vdK /5l8SuONh9rvbOe7jPrNfsp4YHZ7JVo3+DVilS4tnwKvCONdjqxXAOjnSrd7kIiVBy1P wJqpwgP/LeN1mUwv9GlI08kIi4zEZLkmIrp8nQYGvMqp5zRse9KkOms+YJk6Y0DBdTU1 14kGPQlrD97uFVUVtL2Dq3Q64PSW/KcJMuEyQa0y0+mbhe1IDvsKp8zqIcujcFzoS3lI 6tgKekOMsGvSo9rXQmikSoCLW4+sxejF1pF5r9HlIkcjHwlPDJMACg+J1brceWwnRSon ctTA== X-Gm-Message-State: AOAM533AECH3iULN0Bc7J2zTsKMlc8k0cgzRvDg9ZWwnwtxQTw3PJe/z alZ+DkWZ1EsWviM60ZIlNAeo8A== X-Google-Smtp-Source: ABdhPJxOg4LyHnchCfgMrfmTmmktUwtyNOzRjoi05i0vMemGR/i5OVDYtzJjhRGVCXNWl92XXcHqmw== X-Received: by 2002:a65:5283:: with SMTP id y3mr5655444pgp.174.1611938148792; Fri, 29 Jan 2021 08:35:48 -0800 (PST) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id i6sm9621123pgc.58.2021.01.29.08.35.47 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jan 2021 08:35:48 -0800 (PST) From: John Soo To: Z572 <873216071@qq.com> Subject: Re: bug#45293: [PATCH] gnu: Add skim. References: <87o8is4lzp.fsf@qq.com> <587ff7d5-f7ba-4865-bdc9-72e742ece70c@Johns-iPhone> Date: Fri, 29 Jan 2021 08:35:47 -0800 In-Reply-To: (873216071@qq.com's message of "Tue, 26 Jan 2021 01:08:12 +0800") Message-ID: <87v9bfituk.fsf@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45293 Cc: 45293@debbugs.gnu.org, nicolo@nixo.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Looks good! I don't have commit access, but this should be ready to go when someone looks at it. I have cc'd Nicol=C3=B2 to see if they can merge this. From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 05 16:23:56 2021 Received: (at 45293-done) by debbugs.gnu.org; 5 Feb 2021 21:23:57 +0000 Received: from localhost ([127.0.0.1]:44749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l88a4-00077u-O9 for submit@debbugs.gnu.org; Fri, 05 Feb 2021 16:23:56 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:57385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l88a2-00077g-O6 for 45293-done@debbugs.gnu.org; Fri, 05 Feb 2021 16:23:55 -0500 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 45F01E000C; Fri, 5 Feb 2021 21:23:47 +0000 (UTC) From: Nicolas Goaziou To: John Soo Subject: Re: [bug#45293] [PATCH] gnu: Add skim. References: <87o8is4lzp.fsf@qq.com> <587ff7d5-f7ba-4865-bdc9-72e742ece70c@Johns-iPhone> <87v9bfituk.fsf@asu.edu> Date: Fri, 05 Feb 2021 22:23:46 +0100 In-Reply-To: <87v9bfituk.fsf@asu.edu> (John Soo's message of "Fri, 29 Jan 2021 08:35:47 -0800") Message-ID: <87tuqqw6n1.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 45293-done Cc: Z572 <873216071@qq.com>, 45293-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, John Soo writes: > Looks good! I don't have commit access, but this should be ready to go > when someone looks at it. I have cc'd Nicol=C3=B2 to see if they can merge > this. I improved the commit messages and pushed. Thanks to Zheng Junjie for the patches and to you for the review. Regards, --=20 Nicolas Goaziou From unknown Thu Jun 19 14:31:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 06 Mar 2021 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator