* [bug#45293] [PATCH] gnu: Add skim.
@ 2020-12-17 13:10 ` Z572
2021-01-24 18:46 ` John Soo
0 siblings, 1 reply; 9+ messages in thread
From: Z572 @ 2020-12-17 13:10 UTC (permalink / raw)
To: 45293
[-- Attachment #1: 0001-gnu-Add-rust-tuikit-0.4.patch --]
[-- Type: text/x-patch, Size: 2020 bytes --]
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 © 2020 André Batista <nandre@riseup.net>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
+;;; Copyright © 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)))
--
2.29.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-rust-timer-0.2.patch --]
[-- Type: text/x-patch, Size: 1554 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0003-gnu-Add-rust-fuzzy-matcher-0.3.patch --]
[-- Type: text/x-patch, Size: 1494 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0004-gnu-Add-rust-defer-drop-1.patch --]
[-- Type: text/x-patch, Size: 1525 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0005-gnu-Add-rust-beef-0.4.patch --]
[-- Type: text/x-patch, Size: 1352 bytes --]
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
[-- Attachment #6: 0006-gnu-Add-skim.patch --]
[-- Type: text/x-patch, Size: 2500 bytes --]
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 © 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -401,6 +402,47 @@ 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))))
+ (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")
--
2.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#45293] [PATCH] gnu: Add skim.
2020-12-17 13:10 ` Z572
@ 2021-01-24 18:46 ` John Soo
2021-01-25 9:21 ` Z572
0 siblings, 1 reply; 9+ messages in thread
From: John Soo @ 2021-01-24 18:46 UTC (permalink / raw)
To: Z572; +Cc: 45293
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#45293] [PATCH] gnu: Add skim.
@ 2021-01-25 9:21 ` Z572
2021-01-25 15:10 ` John Soo
0 siblings, 1 reply; 9+ messages in thread
From: Z572 @ 2021-01-25 9:21 UTC (permalink / raw)
To: John Soo; +Cc: 45293
[-- Attachment #1: Type: text/plain, Size: 20 bytes --]
This is new patch.
[-- Attachment #2: 0001-gnu-Add-rust-tuikit-0.4.patch --]
[-- Type: text/x-patch, Size: 3273 bytes --]
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 © 2020 André Batista <nandre@riseup.net>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
+;;; 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))))
-(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 for 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 for 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 for TLS.")
"This package provides a toolkit for writing TUI applications in Rust.")
(license license:expat)))
+(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")
--
2.30.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-rust-defer-drop-1.patch --]
[-- Type: text/x-patch, Size: 1617 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-Add-rust-beef-0.4.patch --]
[-- Type: text/x-patch, Size: 1466 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-gnu-Add-rust-skim-0.9.patch --]
[-- Type: text/x-patch, Size: 5088 bytes --]
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#45293] [PATCH] gnu: Add skim.
2021-01-25 9:21 ` Z572
@ 2021-01-25 15:10 ` John Soo
2021-01-25 16:15 ` Z572
0 siblings, 1 reply; 9+ messages in thread
From: John Soo @ 2021-01-25 15:10 UTC (permalink / raw)
To: Z572; +Cc: 45293
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
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
[-- Attachment #2: Type: text/html, Size: 388 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#45293] [PATCH] gnu: Add skim.
@ 2021-01-25 16:15 ` Z572
2021-01-25 16:20 ` John Soo
0 siblings, 1 reply; 9+ messages in thread
From: Z572 @ 2021-01-25 16:15 UTC (permalink / raw)
To: John Soo; +Cc: 45293
[-- Attachment #1: 0001-gnu-Move-rust-skim-to-rust-apps.patch --]
[-- Type: text/x-patch, Size: 11462 bytes --]
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))))
-(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 © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
+;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -502,6 +503,124 @@ gitignore rules.")
(base32
"13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m"))))))
+(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")
--
2.30.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Rename-rust-skim-to-skim.patch --]
[-- Type: text/x-patch, Size: 2268 bytes --]
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#45293] [PATCH] gnu: Add skim.
2021-01-25 16:15 ` Z572
@ 2021-01-25 16:20 ` John Soo
2021-01-25 17:08 ` Z572
0 siblings, 1 reply; 9+ messages in thread
From: John Soo @ 2021-01-25 16:20 UTC (permalink / raw)
To: Z572; +Cc: 45293
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
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
[-- Attachment #2: Type: text/html, Size: 397 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#45293] [PATCH] gnu: Add skim.
@ 2021-01-25 17:08 ` Z572
2021-01-29 16:35 ` John Soo
0 siblings, 1 reply; 9+ messages in thread
From: Z572 @ 2021-01-25 17:08 UTC (permalink / raw)
To: John Soo; +Cc: 45293
[-- Attachment #1: Type: text/plain, Size: 33 bytes --]
rust-rustyline-6 need skim-0.7
[-- Attachment #2: 0001-gnu-Add-skim.patch --]
[-- Type: text/x-patch, Size: 8629 bytes --]
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 <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
+;;; 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#45293] [PATCH] gnu: Add skim.
2021-01-25 17:08 ` Z572
@ 2021-01-29 16:35 ` John Soo
2021-02-05 21:23 ` bug#45293: " Nicolas Goaziou
0 siblings, 1 reply; 9+ messages in thread
From: John Soo @ 2021-01-29 16:35 UTC (permalink / raw)
To: Z572; +Cc: 45293
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ò to see if they can merge
this.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#45293: [PATCH] gnu: Add skim.
2021-01-29 16:35 ` John Soo
@ 2021-02-05 21:23 ` Nicolas Goaziou
0 siblings, 0 replies; 9+ messages in thread
From: Nicolas Goaziou @ 2021-02-05 21:23 UTC (permalink / raw)
To: John Soo; +Cc: Z572, 45293-done
Hello,
John Soo <jsoo1@asu.edu> 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ò 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,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-02-05 21:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-17 13:10 [bug#45293] [PATCH] gnu: Add skim Z572
2020-12-17 13:10 ` Z572
2021-01-24 18:46 ` John Soo
2021-01-25 9:21 ` Z572
2021-01-25 9:21 ` Z572
2021-01-25 15:10 ` John Soo
2021-01-25 16:15 ` Z572
2021-01-25 16:15 ` Z572
2021-01-25 16:20 ` John Soo
2021-01-25 17:08 ` Z572
2021-01-25 17:08 ` Z572
2021-01-29 16:35 ` John Soo
2021-02-05 21:23 ` bug#45293: " Nicolas Goaziou
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.