From 31889c79644946ea8067da9eab3fa0149921df14 Mon Sep 17 00:00:00 2001 From: gyara Date: Sat, 27 Aug 2022 19:10:45 +0900 Subject: gnu: exa: Update to 0.10.1. * gnu/packages/rust-apps.scm (exa): Update to 0.10.1. [arguments]: Delete custom phase 'disable-failing-tests. Add custom 'build-manual phase. Remove trailing #t from phases. [cargo-inputs]: Replace rust-datetime-0.4 with 0.5, rust-git2-0.9 with 0.13, rust-number-prefix-0.3 with 0.4, rust-users-0.9 with 0.11, rust-zoneinfo-compiled-0.4 with 0.5. [cargo-native-inputs]: Replace rust-datetime-0.4 with 0.5. [native-inputs]: Add pandoc. Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 74 ++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 46 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 8e7c4a0ed5..b6d23e9893 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages ibus) @@ -365,7 +366,7 @@ Features include: (define-public exa (package (name "exa") - (version "0.9.0") + (version "0.10.1") (source (origin (method url-fetch) @@ -374,14 +375,14 @@ Features include: (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1s902xgplz1167k0r7x235p914lprpsqy2if0kpa1mlb0fswqqq4")))) + "1dd7waq2bnxc1xwygqphi8k1g2qzykr6fk0q4rgrhhxp2jd09f04")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-datetime" ,rust-datetime-0.4) + ("rust-datetime" ,rust-datetime-0.5) ("rust-env-logger" ,rust-env-logger-0.6) - ("rust-git2" ,rust-git2-0.9) + ("rust-git2" ,rust-git2-0.13) ("rust-glob" ,rust-glob-0.3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) @@ -389,64 +390,45 @@ Features include: ("rust-log" ,rust-log-0.4) ("rust-natord" ,rust-natord-1) ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-number-prefix" ,rust-number-prefix-0.3) + ("rust-number-prefix" ,rust-number-prefix-0.4) ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) ("rust-term-grid" ,rust-term-grid-0.1) ("rust-term-size" ,rust-term-size-0.3) ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-users" ,rust-users-0.9) - ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4)) + ("rust-users" ,rust-users-0.11) + ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5)) #:cargo-development-inputs - (("rust-datetime" ,rust-datetime-0.4)) + (("rust-datetime" ,rust-datetime-0.5)) #:phases (modify-phases %standard-phases - ;; Ignoring failing tests. - ;; Reported in https://github.com/ogham/exa/issues/318 - (add-before 'check 'disable-failing-tests + (add-after 'build 'build-manual (lambda _ - (substitute* "src/options/mod.rs" - (("^.*fn oneline_across.*" oneline-across) - (string-append "#[ignore]\n" oneline-across))) - - (substitute* "src/options/view.rs" - (("test!\\(across:.*") "") - (("test!\\(cr:.*") "") - (("test!\\(empty:.*") "") - (("test!\\(gracross:.*") "") - (("test!\\(grid:.*") "") - (("test!\\(icons:.*") "") - (("test!\\(just_binary:.*") "") - (("test!\\(just_blocks:.*") "") - (("test!\\(just_bytes:.*") "") - (("test!\\(just_git:.*") "") - (("test!\\(just_group:.*") "") - (("test!\\(just_header:.*") "") - (("test!\\(just_inode:.*") "") - (("test!\\(just_links:.*") "") - (("test!\\(leg:.*") "") - (("test!\\(lid:.*") "") - (("test!\\(original_g:.*") "")) - #t)) + (map (lambda (page) + (system (string-append + "pandoc --standalone -f markdown -t man man/" + page ".md > " page))) + `("exa.1" "exa_colors.5")))) (add-after 'install 'install-extras (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (share (string-append out "/share")) - (man1 (string-append share "/man/man1"))) - (install-file "contrib/man/exa.1" man1) + (man1 (string-append share "/man/man1")) + (man5 (string-append share "/man/man5"))) + (install-file "exa.1" man1) + (install-file "exa_colors.5" man5) (mkdir-p (string-append out "/etc/bash_completion.d")) (mkdir-p (string-append share "/fish/vendor_completions.d")) (mkdir-p (string-append share "/zsh/site-functions")) - (copy-file "contrib/completions.bash" + (copy-file "completions/completions.bash" (string-append out "/etc/bash_completion.d/exa")) - (copy-file "contrib/completions.fish" - (string-append share "/fish/vendor_completions.d/exa.fish")) - (copy-file "contrib/completions.zsh" - (string-append share "/zsh/site-functions/_exa")) - #t)))))) - (inputs - (list libgit2 zlib)) - (native-inputs - (list pkg-config)) + (copy-file "completions/completions.fish" + (string-append + share "/fish/vendor_completions.d/exa.fish")) + (copy-file "completions/completions.zsh" + (string-append + share "/zsh/site-functions/_exa")))))))) + (inputs (list libgit2 zlib)) + (native-inputs (list pkg-config pandoc)) (home-page "https://the.exa.website/") (synopsis "Modern replacement for ls") (description "@code{exa} is a modern replacement for the command-line -- cgit 1.4.1 From 62f80d215eea62b120416d638f62668482d40ffb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 13:34:07 +0300 Subject: gnu: exa: Don't install source. * gnu/packages/rust-apps.scm (exa)[arguments]: Add flag to not install the package source. --- gnu/packages/rust-apps.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index b6d23e9893..bced34bfdb 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -378,7 +378,8 @@ Features include: "1dd7waq2bnxc1xwygqphi8k1g2qzykr6fk0q4rgrhhxp2jd09f04")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:install-source? #f + #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-datetime" ,rust-datetime-0.5) ("rust-env-logger" ,rust-env-logger-0.6) -- cgit 1.4.1 From 1590d6d58e4d1dcb482982a88c7eba70c41bc226 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 13:47:54 +0300 Subject: gnu: exa: Only build with pandoc when supported. * gnu/packages/rust-apps.scm (exa)[arguments]: Adjust custom 'build-manual phase to only build when pandoc is available. Adjust custom 'install-extras to only install man pages when they are available. [native-inputs]: Only include pandoc on systems where it is supported. --- gnu/packages/rust-apps.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index bced34bfdb..74581bc1e5 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -403,20 +403,26 @@ Features include: #:phases (modify-phases %standard-phases (add-after 'build 'build-manual - (lambda _ - (map (lambda (page) - (system (string-append - "pandoc --standalone -f markdown -t man man/" - page ".md > " page))) - `("exa.1" "exa_colors.5")))) + (lambda* (#:key inputs #:allow-other-keys) + (when (assoc-ref inputs "pandoc") + (map (lambda (page) + (with-output-to-file page + (lambda _ + (invoke "pandoc" "--standalone" + "-f" "markdown" + "-t" "man" + (string-append "man/" page ".md"))))) + (list "exa.1" "exa_colors.5"))))) (add-after 'install 'install-extras (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (share (string-append out "/share")) (man1 (string-append share "/man/man1")) (man5 (string-append share "/man/man5"))) - (install-file "exa.1" man1) - (install-file "exa_colors.5" man5) + (when (file-exists? "exa.1") + (install-file "exa.1" man1)) + (when (file-exists? "exa_colors.5") + (install-file "exa_colors.5" man5)) (mkdir-p (string-append out "/etc/bash_completion.d")) (mkdir-p (string-append share "/fish/vendor_completions.d")) (mkdir-p (string-append share "/zsh/site-functions")) @@ -429,7 +435,13 @@ Features include: (string-append share "/zsh/site-functions/_exa")))))))) (inputs (list libgit2 zlib)) - (native-inputs (list pkg-config pandoc)) + (native-inputs + (append + (list pkg-config) + (if (member (%current-system) + (package-transitive-supported-systems pandoc)) + (list pandoc) + '()))) (home-page "https://the.exa.website/") (synopsis "Modern replacement for ls") (description "@code{exa} is a modern replacement for the command-line -- cgit 1.4.1 From 0aa4140f02d924f9e1a0e0b0ea78d1f72a2d166e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Oct 2022 23:15:57 +0300 Subject: gnu: git-absorb: Fix build. * gnu/packages/rust-apps.scm (git-absorb)[arguments]: Adjust custom 'relax-version-requirements phase to make all crate requirements follow standard cargo semver levels. [native-inputs]: Add pkg-config. [inputs]: Add libgit2-1.3. --- gnu/packages/rust-apps.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 74581bc1e5..86d8fdfa69 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1843,17 +1843,16 @@ Full featured offline client with caching support.") (add-after 'unpack 'relax-version-requirements (lambda _ (substitute* "Cargo.toml" - (("2.5") "2") - (("~2.3\"") "2\"") - (("~2.33\"") "2\"") ; clap - (("3.1") "3")))) + (("\"~") "\"")))) (add-after 'install 'install-manual-page (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1"))) (install-file "Documentation/git-absorb.1" man))))))) + (native-inputs + (list pkg-config)) (inputs - (list zlib)) + (list libgit2-1.3 zlib)) (home-page "https://github.com/tummychow/git-absorb") (synopsis "Git tool for making automatic fixup commits") (description -- cgit 1.4.1 From 1484e5f559c3206b479a99c189601d94c4096fa9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 22 Oct 2022 23:49:07 +0300 Subject: gnu: git-interactive-rebase-tool: Fix build. * gnu/packages/rust-apps.scm (git-interactive-rebase-tool) [native-inputs]: Add pkg-config. [inputs]: Add libgit2-1.3. --- gnu/packages/rust-apps.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 86d8fdfa69..76a95f01a3 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -825,8 +825,10 @@ touchscreen devices.") ("rust-rstest" ,rust-rstest-0.6) ("rust-serial-test" ,rust-serial-test-0.5) ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) (inputs - (list zlib)) + (list libgit2-1.3 zlib)) (home-page "https://gitrebasetool.mitmaro.ca/") (synopsis "Terminal based sequence editor for git interactive rebase") (description -- cgit 1.4.1 From 41659f9c1d2f6963c80df951f2b709466c7952c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Oct 2022 12:27:24 +0300 Subject: gnu: rust-swc-1: Move to rust-apps. * gnu/packages/crates-io.scm (rust-swc-1): Move from here ... * gnu/packages/rust-apps.scm (rust-swc-1): ... to here. --- gnu/packages/crates-io.scm | 95 -------------------------------------------- gnu/packages/rust-apps.scm | 98 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 96 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 22d619d575..e1ed9fd06c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -58692,101 +58692,6 @@ interface.") executed by swayipc.") (license license:expat))) -(define-public rust-swc-1 - (package - (name "rust-swc") - (version "1.2.24") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/swc-project/swc") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1w9al035x0gmard80vqvah8sy8szs6bnd1ynnyssiiylzg7vhyyv")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-base64" ,rust-base64-0.12) - ("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) - ("rust-crc" ,rust-crc-1) - ("rust-darling" ,rust-darling-0.10) - ("rust-dashmap" ,rust-dashmap-3) - ("rust-either" ,rust-either-1) - ("rust-fxhash" ,rust-fxhash-0.2) - ("rust-is-macro" ,rust-is-macro-0.1) - ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-log" ,rust-log-0.4) - ("rust-mimalloc" ,rust-mimalloc-0.1) - ("rust-napi" ,rust-napi-0.5) - ("rust-napi-build" ,rust-napi-build-0.2) - ("rust-napi-derive" ,rust-napi-derive-0.5) - ("rust-nom" ,rust-nom-5) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-parking-lot" ,rust-parking-lot-0.7) - ("rust-path-clean" ,rust-path-clean-0.1) - ("rust-petgraph" ,rust-petgraph-0.5) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-radix-fmt" ,rust-radix-fmt-1) - ("rust-regex" ,rust-regex-1) - ("rust-relative-path" ,rust-relative-path-1) - ("rust-retain-mut" ,rust-retain-mut-0.1) - ("rust-scoped-tls" ,rust-scoped-tls-1) - ("rust-st-map" ,rust-st-map-0.1) - ("rust-string-cache" ,rust-string-cache-0.8) - ("rust-walkdir" ,rust-walkdir-2) - ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)) - #:cargo-development-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-env-logger" ,rust-env-logger-0.7) - ("rust-num-bigint" ,rust-num-bigint-0.2) - ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) - ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-sourcemap" ,rust-sourcemap-6) - ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) - ("rust-tempfile" ,rust-tempfile-3)) - #:tests? #f ;; tests env_query_chrome_71 and project_env fail - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enable-unstable-features - (lambda _ - (setenv "RUSTC_BOOTSTRAP" "1") - (substitute* "ecmascript/jsdoc/src/lib.rs" - (("pub use self" all) - (string-append "#![feature(non_exhaustive)]\n" all))) - (substitute* "ecmascript/parser/src/lib.rs" - (("//! es2019" all) - (string-append "#![feature(non_exhaustive)] -#![feature(mem_take)] -#![feature(proc_macro_hygiene)] -" all))) - (substitute* "ecmascript/transforms/src/lib.rs" - (("#!\\[cfg_attr" all) - (string-append "#![feature(mem_take)]\n" all))) - #t)) - (add-after 'enable-unstable-features 'patch-build-failures - (lambda _ - (chmod ".cargo/config" 420) - (substitute* "ecmascript/transforms/macros/src/lib.rs" - (("use proc_macro::") - "extern crate proc_macro;\nuse proc_macro::")) - (substitute* "common/src/errors/emitter.rs" - ((" #\\[cfg\\(feature = \"tty-emitter\"\\)\\]\n") "")) - #t))))) - (home-page "https://swc.rs/") - (synopsis "Typescript/javascript compiler") - (description "@code{rust-swc} is a typescript/javascript compiler. It -consumes a javascript or typescript file which uses recently added features -like async-await and emits javascript code which can be executed on old -browsers.") - (license (list license:expat - license:asl2.0)))) - (define-public rust-syn-1 (package (name "rust-syn") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 76a95f01a3..85fc9e8192 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Mark H Weaver ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2020-2022 Nicolas Goaziou +;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> @@ -788,7 +789,102 @@ gitignore rules.") associated input devices using the built-in accelerometer; handy for convertible touchscreen devices.") (license license:expat))) - + +(define-public rust-swc-1 + (package + (name "rust-swc") + (version "1.2.24") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/swc-project/swc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w9al035x0gmard80vqvah8sy8szs6bnd1ynnyssiiylzg7vhyyv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-base64" ,rust-base64-0.12) + ("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-crc" ,rust-crc-1) + ("rust-darling" ,rust-darling-0.10) + ("rust-dashmap" ,rust-dashmap-3) + ("rust-either" ,rust-either-1) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-is-macro" ,rust-is-macro-0.1) + ("rust-jemallocator" ,rust-jemallocator-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-mimalloc" ,rust-mimalloc-0.1) + ("rust-napi" ,rust-napi-0.5) + ("rust-napi-build" ,rust-napi-build-0.2) + ("rust-napi-derive" ,rust-napi-derive-0.5) + ("rust-nom" ,rust-nom-5) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.7) + ("rust-path-clean" ,rust-path-clean-0.1) + ("rust-petgraph" ,rust-petgraph-0.5) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-radix-fmt" ,rust-radix-fmt-1) + ("rust-regex" ,rust-regex-1) + ("rust-relative-path" ,rust-relative-path-1) + ("rust-retain-mut" ,rust-retain-mut-0.1) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-st-map" ,rust-st-map-0.1) + ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sourcemap" ,rust-sourcemap-6) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) + ("rust-tempfile" ,rust-tempfile-3)) + #:tests? #f ;; tests env_query_chrome_71 and project_env fail + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1") + (substitute* "ecmascript/jsdoc/src/lib.rs" + (("pub use self" all) + (string-append "#![feature(non_exhaustive)]\n" all))) + (substitute* "ecmascript/parser/src/lib.rs" + (("//! es2019" all) + (string-append "#![feature(non_exhaustive)] +#![feature(mem_take)] +#![feature(proc_macro_hygiene)] +" all))) + (substitute* "ecmascript/transforms/src/lib.rs" + (("#!\\[cfg_attr" all) + (string-append "#![feature(mem_take)]\n" all))) + #t)) + (add-after 'enable-unstable-features 'patch-build-failures + (lambda _ + (chmod ".cargo/config" 420) + (substitute* "ecmascript/transforms/macros/src/lib.rs" + (("use proc_macro::") + "extern crate proc_macro;\nuse proc_macro::")) + (substitute* "common/src/errors/emitter.rs" + ((" #\\[cfg\\(feature = \"tty-emitter\"\\)\\]\n") "")) + #t))))) + (home-page "https://swc.rs/") + (synopsis "Typescript/javascript compiler") + (description "@code{rust-swc} is a typescript/javascript compiler. It +consumes a javascript or typescript file which uses recently added features +like async-await and emits javascript code which can be executed on old +browsers.") + (license (list license:expat + license:asl2.0)))) + (define-public git-interactive-rebase-tool (package (name "git-interactive-rebase-tool") -- cgit 1.4.1 From f2835233a19df3d99604825c83737fa66ef4a852 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Oct 2022 12:59:48 +0300 Subject: gnu: rust-swc: Rename from rust-swc-1. * gnu/packages/rust-apps.scm (rust-swc-1): Rename to ... (rust-swc): ... this. (rust-swc-1): Add as deprecated package. --- gnu/packages/rust-apps.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 85fc9e8192..482e44ebe3 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -41,6 +41,7 @@ #:use-module (guix build-system cargo) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix deprecation) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) @@ -790,7 +791,7 @@ associated input devices using the built-in accelerometer; handy for convertible touchscreen devices.") (license license:expat))) -(define-public rust-swc-1 +(define-public rust-swc (package (name "rust-swc") (version "1.2.24") @@ -885,6 +886,8 @@ browsers.") (license (list license:expat license:asl2.0)))) +(define-deprecated rust-swc-1 rust-swc) + (define-public git-interactive-rebase-tool (package (name "git-interactive-rebase-tool") -- cgit 1.4.1 From 569edeb4d66c1041ac6b478e911f230530ba5ee1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Oct 2022 13:01:00 +0300 Subject: gnu: rust-swc: Add missing inputs. * gnu/packages/rust-apps.scm (rust-swc)[cargo-inputs]: Add rust-ordered-float-1, rust-phf-0.8. --- gnu/packages/rust-apps.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 482e44ebe3..cdd01ad68b 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -825,9 +825,11 @@ touchscreen devices.") ("rust-napi-derive" ,rust-napi-derive-0.5) ("rust-nom" ,rust-nom-5) ("rust-once-cell" ,rust-once-cell-1) + ("rust-ordered-float" ,rust-ordered-float-1) ("rust-parking-lot" ,rust-parking-lot-0.7) ("rust-path-clean" ,rust-path-clean-0.1) ("rust-petgraph" ,rust-petgraph-0.5) + ("rust-phf" ,rust-phf-0.8) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-radix-fmt" ,rust-radix-fmt-1) ("rust-regex" ,rust-regex-1) -- cgit 1.4.1 From 09962d54c1c18c8893631613a3c84e910b98d968 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Oct 2022 13:56:39 +0300 Subject: gnu: rust-cargo-edit-0.8: Move to rust-apps.scm. * gnu/packages/crates-io.scm (rust-cargo-edit-0.8): Move to ... * gnu/packages/rust-apps.scm (rust-cargo-edit-0.8): ... here. --- gnu/packages/crates-io.scm | 49 -------------------------------------------- gnu/packages/rust-apps.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 50 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4e17efdf16..0e6ed24955 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9344,55 +9344,6 @@ capabilities.") the library crate of Cargo.") (license (list license:expat license:asl2.0)))) -(define-public rust-cargo-edit-0.8 - (package - (name "rust-cargo-edit") - (version "0.8.0") - (source (origin - (method url-fetch) - (uri (crate-uri "cargo-edit" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0yk5f4qjzflfqzgfws9zifij2fqchc9q551m7ljznmjrhlif2yh4")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-atty" ,rust-atty-0.2) - ("rust-error-chain" ,rust-error-chain-0.12) - ("rust-git2" ,rust-git2-0.13) - ("rust-hex" ,rust-hex-0.4) - ("rust-regex" ,rust-regex-1) - ("rust-semver" ,rust-semver-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-derive" ,rust-serde-derive-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-termcolor" ,rust-termcolor-1) - ("rust-toml-edit" ,rust-toml-edit-0.3) - ("rust-url" ,rust-url-2) - ("rust-crates-index" ,rust-crates-index-0.17) - ("rust-cargo-metadata" ,rust-cargo-metadata-0.14) - ("rust-dirs-next" ,rust-dirs-next-2) - ("rust-dunce" ,rust-dunce-1) - ("rust-env-proxy" ,rust-env-proxy-0.4) - ("rust-pathdiff" ,rust-pathdiff-0.2) - ("rust-structopt" ,rust-structopt-0.3) - ("rust-subprocess" ,rust-subprocess-0.2) - ("rust-toml-edit" ,rust-toml-edit-0.3) - ("rust-ureq" ,rust-ureq-1)) - #:cargo-development-inputs - (("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-assert-fs" ,rust-assert-fs-1) - ("rust-predicates" ,rust-predicates-2) - ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) - (home-page "https://github.com/killercup/cargo-edit") - (synopsis "Add and remove dependencies from the command line") - (description - "This package extends Cargo to allow you to add and remove dependencies -by modifying your @file{Cargo.toml} file from the command line.") - (license (list license:asl2.0 license:expat)))) - (define-public rust-cargo-metadata-0.14 (package (name "rust-cargo-metadata") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index cdd01ad68b..d4f4413b07 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Maxim Cournoyer -;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Nicolas Graves ;;; Copyright © 2022 Aleksandr Vityazev @@ -890,6 +890,55 @@ browsers.") (define-deprecated rust-swc-1 rust-swc) +(define-public rust-cargo-edit-0.8 + (package + (name "rust-cargo-edit") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (crate-uri "cargo-edit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yk5f4qjzflfqzgfws9zifij2fqchc9q551m7ljznmjrhlif2yh4")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-error-chain" ,rust-error-chain-0.12) + ("rust-git2" ,rust-git2-0.13) + ("rust-hex" ,rust-hex-0.4) + ("rust-regex" ,rust-regex-1) + ("rust-semver" ,rust-semver-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-toml-edit" ,rust-toml-edit-0.3) + ("rust-url" ,rust-url-2) + ("rust-crates-index" ,rust-crates-index-0.17) + ("rust-cargo-metadata" ,rust-cargo-metadata-0.14) + ("rust-dirs-next" ,rust-dirs-next-2) + ("rust-dunce" ,rust-dunce-1) + ("rust-env-proxy" ,rust-env-proxy-0.4) + ("rust-pathdiff" ,rust-pathdiff-0.2) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-subprocess" ,rust-subprocess-0.2) + ("rust-toml-edit" ,rust-toml-edit-0.3) + ("rust-ureq" ,rust-ureq-1)) + #:cargo-development-inputs + (("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-assert-fs" ,rust-assert-fs-1) + ("rust-predicates" ,rust-predicates-2) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) + (home-page "https://github.com/killercup/cargo-edit") + (synopsis "Add and remove dependencies from the command line") + (description + "This package extends Cargo to allow you to add and remove dependencies +by modifying your @file{Cargo.toml} file from the command line.") + (license (list license:asl2.0 license:expat)))) + (define-public git-interactive-rebase-tool (package (name "git-interactive-rebase-tool") -- cgit 1.4.1 From 7ace10db60c6a3dd4f96071ca2ffe31a6b06e20a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Oct 2022 13:58:18 +0300 Subject: gnu: rust-cargo-edit: Rename from rust-cargo-edit-0.8. * gnu/packages/rust-apps.scm (rust-cargo-edit): Rename from ... (rust-cargo-edit-0.8): ... this. Redefine as a deprecated package. --- gnu/packages/rust-apps.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index d4f4413b07..f843675186 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -890,7 +890,7 @@ browsers.") (define-deprecated rust-swc-1 rust-swc) -(define-public rust-cargo-edit-0.8 +(define-public rust-cargo-edit (package (name "rust-cargo-edit") (version "0.8.0") @@ -939,6 +939,8 @@ browsers.") by modifying your @file{Cargo.toml} file from the command line.") (license (list license:asl2.0 license:expat)))) +(define-deprecated rust-cargo-edit-0.8 rust-cargo-edit) + (define-public git-interactive-rebase-tool (package (name "git-interactive-rebase-tool") -- cgit 1.4.1 From 24964f7360102c661b109d7c17305850304cfaf1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Oct 2022 14:31:29 +0300 Subject: gnu: rust-cargo-edit: Add missing inputs. * gnu/packages/rust-apps.scm (rust-cargo-edit)[native-inputs]: Add pkg-config. [inputs]: Add libgit2-1.3, libssh2, openssl, zlib. --- gnu/packages/rust-apps.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index f843675186..f8b499f572 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -932,6 +932,13 @@ browsers.") ("rust-assert-fs" ,rust-assert-fs-1) ("rust-predicates" ,rust-predicates-2) ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) + (native-inputs + (list pkg-config)) + (inputs + (list libgit2-1.3 + libssh2 + openssl + zlib)) (home-page "https://github.com/killercup/cargo-edit") (synopsis "Add and remove dependencies from the command line") (description -- cgit 1.4.1 From a779b7ac84a8055559a8bdef37fa45bde6f254b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Oct 2022 17:11:01 +0300 Subject: gnu: rust-cargo-edit: Update to 0.10.4. * gnu/packages/rust-apps.scm (rust-cargo-edit): Update to 0.10.4. [arguments]: Don't skip build. Don't install source. [cargo-inputs]: Remove rust-atty-0.2, rust-error-chain-0.12, rust-structopt-0.3. Replace rust-cargo-metadata-0.14 with 0.15, rust-crates-index-0.17 with 0.18, rust-git2-0.12 with 0.14, rust-toml-edit-0.3 with 0.14, rust-ureq-1 with 2. Add rust-anyhow-1, rust-clap-3, rust-concolor-control-0.0.7, rust-indexmap-1, rust-native-tls-0.2. Sort alphabetically. [cargo-development-inputs]: Remove rust-pretty-assertions-0.6. Add rust-snapbox-0.2, rust-trycmd-0.13, rust-url-2. [inputs]: Replace libgit2-1.3 with libgit. --- gnu/packages/rust-apps.scm | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index f8b499f572..693489264d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -893,49 +893,52 @@ browsers.") (define-public rust-cargo-edit (package (name "rust-cargo-edit") - (version "0.8.0") + (version "0.10.4") (source (origin (method url-fetch) (uri (crate-uri "cargo-edit" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0yk5f4qjzflfqzgfws9zifij2fqchc9q551m7ljznmjrhlif2yh4")))) + "19wfjz7z4kqjfjmnq1bl6dhsvskjy6r656fqmbha9dfdspbsnmd0")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:install-source? #f #:cargo-inputs - (("rust-atty" ,rust-atty-0.2) - ("rust-error-chain" ,rust-error-chain-0.12) - ("rust-git2" ,rust-git2-0.13) + (("rust-anyhow" ,rust-anyhow-1) + ("rust-cargo-metadata" ,rust-cargo-metadata-0.15) + ("rust-clap" ,rust-clap-3) + ("rust-concolor-control" ,rust-concolor-control-0.0.7) + ("rust-crates-index" ,rust-crates-index-0.18) + ("rust-dirs-next" ,rust-dirs-next-2) + ("rust-dunce" ,rust-dunce-1) + ("rust-env-proxy" ,rust-env-proxy-0.4) + ("rust-git2" ,rust-git2-0.14) ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-pathdiff" ,rust-pathdiff-0.2) ("rust-regex" ,rust-regex-1) ("rust-semver" ,rust-semver-1) ("rust-serde" ,rust-serde-1) ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-termcolor" ,rust-termcolor-1) - ("rust-toml-edit" ,rust-toml-edit-0.3) - ("rust-url" ,rust-url-2) - ("rust-crates-index" ,rust-crates-index-0.17) - ("rust-cargo-metadata" ,rust-cargo-metadata-0.14) - ("rust-dirs-next" ,rust-dirs-next-2) - ("rust-dunce" ,rust-dunce-1) - ("rust-env-proxy" ,rust-env-proxy-0.4) - ("rust-pathdiff" ,rust-pathdiff-0.2) - ("rust-structopt" ,rust-structopt-0.3) ("rust-subprocess" ,rust-subprocess-0.2) - ("rust-toml-edit" ,rust-toml-edit-0.3) - ("rust-ureq" ,rust-ureq-1)) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-toml-edit" ,rust-toml-edit-0.14) + ("rust-ureq" ,rust-ureq-2) + ("rust-url" ,rust-url-2)) #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) ("rust-assert-fs" ,rust-assert-fs-1) ("rust-predicates" ,rust-predicates-2) - ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) + ("rust-snapbox" ,rust-snapbox-0.2) + ("rust-trycmd" ,rust-trycmd-0.13) + ("rust-url" ,rust-url-2)))) (native-inputs (list pkg-config)) (inputs - (list libgit2-1.3 + (list libgit2 libssh2 openssl zlib)) -- cgit 1.4.1 From b8a000b33b907ed161aef3cd08430e0905b4344f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Oct 2022 10:59:08 +0200 Subject: gnu: Add swayr. * gnu/packages/rust-apps.scm (swayr): New variable. Signed-off-by: Andrew Tropin --- gnu/packages/rust-apps.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 693489264d..66b89a6b2a 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1900,6 +1900,43 @@ workflow includes opening graphical programs from the terminal, as the locked terminal won't have to take up any space.") (license license:gpl3+))) +(define-public swayr + (package + (name "swayr") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "swayr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m443lwbs3lm20kkviw60db56w9i59dm393z1sn6llpfi2xihh3h")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-clap" ,rust-clap-3) + ("rust-directories" ,rust-directories-4) + ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-log" ,rust-log-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-rt-format" ,rust-rt-format-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-swayipc" ,rust-swayipc-3) + ("rust-toml" ,rust-toml-0.5)))) + (home-page "https://sr.ht/~tsdh/swayr/") + (synopsis "Window-switcher for the sway window manager") + (description + "This package provides a last-recently-used window-switcher for the sway +window manager. Swayr consists of a daemon, and a client. The swayrd daemon +records window/workspace creations, deletions, and focus changes using sway's +JSON IPC interface. The swayr client offers subcommands, and sends them to the +daemon which executes them.") + (license license:gpl3+))) + (define-public tealdeer (package (name "tealdeer") -- cgit 1.4.1 From 87e36d74782b9a343405eb8eff8d426c84b8b1e3 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 28 Nov 2022 13:36:27 +0400 Subject: Revert "gnu: Add swayr." This reverts commit b8a000b33b907ed161aef3cd08430e0905b4344f. --- gnu/packages/rust-apps.scm | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 66b89a6b2a..693489264d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1900,43 +1900,6 @@ workflow includes opening graphical programs from the terminal, as the locked terminal won't have to take up any space.") (license license:gpl3+))) -(define-public swayr - (package - (name "swayr") - (version "0.18.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "swayr" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1m443lwbs3lm20kkviw60db56w9i59dm393z1sn6llpfi2xihh3h")))) - (build-system cargo-build-system) - (arguments - `(#:tests? #f - #:cargo-inputs - (("rust-clap" ,rust-clap-3) - ("rust-directories" ,rust-directories-4) - ("rust-env-logger" ,rust-env-logger-0.9) - ("rust-log" ,rust-log-0.4) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-rand" ,rust-rand-0.8) - ("rust-regex" ,rust-regex-1) - ("rust-rt-format" ,rust-rt-format-0.3) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-swayipc" ,rust-swayipc-3) - ("rust-toml" ,rust-toml-0.5)))) - (home-page "https://sr.ht/~tsdh/swayr/") - (synopsis "Window-switcher for the sway window manager") - (description - "This package provides a last-recently-used window-switcher for the sway -window manager. Swayr consists of a daemon, and a client. The swayrd daemon -records window/workspace creations, deletions, and focus changes using sway's -JSON IPC interface. The swayr client offers subcommands, and sends them to the -daemon which executes them.") - (license license:gpl3+))) - (define-public tealdeer (package (name "tealdeer") -- cgit 1.4.1 From 691b672658d8aea6c9b2902337b707d455107d82 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Wed, 26 Oct 2022 10:59:08 +0200 Subject: gnu: Add swayr. * gnu/packages/rust-apps.scm (swayr): New variable. Signed-off-by: Andrew Tropin --- gnu/packages/rust-apps.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 693489264d..66b89a6b2a 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1900,6 +1900,43 @@ workflow includes opening graphical programs from the terminal, as the locked terminal won't have to take up any space.") (license license:gpl3+))) +(define-public swayr + (package + (name "swayr") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "swayr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m443lwbs3lm20kkviw60db56w9i59dm393z1sn6llpfi2xihh3h")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-clap" ,rust-clap-3) + ("rust-directories" ,rust-directories-4) + ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-log" ,rust-log-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-rt-format" ,rust-rt-format-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-swayipc" ,rust-swayipc-3) + ("rust-toml" ,rust-toml-0.5)))) + (home-page "https://sr.ht/~tsdh/swayr/") + (synopsis "Window-switcher for the sway window manager") + (description + "This package provides a last-recently-used window-switcher for the sway +window manager. Swayr consists of a daemon, and a client. The swayrd daemon +records window/workspace creations, deletions, and focus changes using sway's +JSON IPC interface. The swayr client offers subcommands, and sends them to the +daemon which executes them.") + (license license:gpl3+))) + (define-public tealdeer (package (name "tealdeer") -- cgit 1.4.1 From 9ca3f1bc1dbdf5d6824a36226b352226e590b8a3 Mon Sep 17 00:00:00 2001 From: "(" Date: Tue, 29 Nov 2022 07:01:04 +0000 Subject: gnu: zoxide: Update to 0.8.3. * gnu/packages/rust-apps.scm: Sort module imports. (zoxide): Update to 0.8.3. [arguments]: Use G-expressions. <#:phases>{'use-older-rust}: New phase. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/rust-apps.scm | 64 +++++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 20 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 66b89a6b2a..9fefde310d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Gabriel Arazas ;;; Copyright © 2022 Ricardo Wurmus ;;; Copyright © 2022 Mathieu Laparie +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,11 +38,12 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages rust-apps) - #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cargo) + #:use-module (guix deprecation) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) - #:use-module (guix deprecation) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) @@ -2066,32 +2068,54 @@ It will then write @code{fixup!} commits for each of those changes.") (define-public zoxide (package (name "zoxide") - (version "0.6.0") + (version "0.8.3") (source (origin (method url-fetch) (uri (crate-uri "zoxide" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ih01l3xp8plicxhmyxjkq12ncpdb8954jcj3dh3lwvkhvw29nkk")))) + (base32 "0y5v2vgl9f3n0n0w4b3iddbfyxv0hls0vw5406ry0hcvnnjyy2l3")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-askama" ,rust-askama-0.10) - ("rust-bincode" ,rust-bincode-1) - ("rust-clap" ,rust-clap-3) - ("rust-dirs-next" ,rust-dirs-next-2) - ("rust-dunce" ,rust-dunce-1) - ("rust-glob" ,rust-glob-0.3) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-ordered-float" ,rust-ordered-float-2) - ("rust-rand" ,rust-rand-0.7) - ("rust-serde" ,rust-serde-1) - ("rust-tempfile" ,rust-tempfile-3)) - #:cargo-development-inputs - (("rust-assert-cmd" ,rust-assert-cmd-1) - ("rust-seq-macro" ,rust-seq-macro-0.2)))) + (list #:cargo-inputs + `(("rust-anyhow" ,rust-anyhow-1) + ("rust-askama" ,rust-askama-0.11) + ("rust-bincode" ,rust-bincode-1) + ("rust-clap" ,rust-clap-3) + ("rust-clap-complete" ,rust-clap-complete-3) + ("rust-clap-complete-fig" ,rust-clap-complete-fig-3) + ("rust-dirs" ,rust-dirs-4) + ("rust-dunce" ,rust-dunce-1) + ("rust-fastrand" ,rust-fastrand-1) + ("rust-glob" ,rust-glob-0.3) + ("rust-nix" ,rust-nix-0.24) + ("rust-serde" ,rust-serde-1) + ("rust-which" ,rust-which-4)) + #:cargo-development-inputs + `(("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-rstest" ,rust-rstest-0.15) + ("rust-rstest-reuse" ,rust-rstest-reuse-0.4) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-older-rust + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1") + (substitute* "Cargo.toml" + (("^rust-version = .*$") + (string-append + "rust-version = \"" + #$(package-version rust) + "\"\n"))) + (substitute* "src/main.rs" + (("#!\\[allow\\(clippy::single_component_path_imports)]") + "#![feature(total_cmp)]")) + (substitute* "src/cmd/query.rs" + (("let handle = &mut io::stdout\\()\\.lock\\();") + "\ +let _stdout = io::stdout(); +let handle = &mut _stdout.lock();"))))))) (home-page "https://github.com/ajeetdsouza/zoxide/") (synopsis "Fast way to navigate your file system") (description -- cgit 1.4.1 From 3275068f191e76c8615b8719f3d1a286b9f1403c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 30 Nov 2022 11:13:23 +0200 Subject: gnu: gnuzilla.scm: Move rust packages to standard locations. * gnu/packages/gnuzilla.scm (rust-textwrap-0.15-promise, rust-lex-0.2, rust-clap-derive-3.2-promise): Remove variables. (icecat,icedove)[native-inputs]: Replace rust-cbindgen-0.23-promise with rust-cbindgen-0.23. (rust-cbindgen-0.24-promise, rust-cbindgen-0.23-promise): Move to ... * gnu/packages/rust-apps.scm (rust-cbindgen-0.24, rust-cbindgen-0.23): ... here. Rename without '-promise' suffix. --- gnu/packages/gnuzilla.scm | 149 +-------------------------------------------- gnu/packages/rust-apps.scm | 44 +++++++++++++ 2 files changed, 46 insertions(+), 147 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index feb80d81a2..52ece9bbd4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -19,7 +19,6 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Baptiste Strazzul -;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,7 +84,6 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages rust) #:use-module (gnu packages rust-apps) - #:use-module (gnu packages crates-io) #:use-module (gnu packages llvm) #:use-module (gnu packages nss) #:use-module (gnu packages icu4c) @@ -350,148 +348,6 @@ in C/C++.") (inputs (list icu4c readline zlib)))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Temporary packaging of rust-cbindgen-0.23 and its dependencies -;; follow, pending their inclusion into (gnu packages rust-apps) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define rust-textwrap-0.15-promise - (delay - (package - (inherit rust-textwrap-0.12) - (name "rust-textwrap") - (version "0.15.0") - (source (origin - (method url-fetch) - (uri (crate-uri "textwrap" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-hyphenation" ,rust-hyphenation-0.8) - ("rust-smawk" ,rust-smawk-0.3) - ("rust-terminal-size" ,rust-terminal-size-0.1) - ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1) - ("rust-unicode-width" ,rust-unicode-width-0.1))))))) - -(define rust-clap-lex-0.2 - (package - (name "rust-clap-lex") - (version "0.2.4") - (source (origin - (method url-fetch) - (uri (crate-uri "clap_lex" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6)))) - (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex") - (synopsis "Minimal, flexible command line parser") - (description "Minimal, flexible command line parser") - (license (list license:expat license:asl2.0)))) - -(define rust-clap-derive-3.2.15-promise - (delay - (package - (inherit rust-clap-derive-3) - (name "rust-clap-derive") - (version "3.2.15") - (source (origin - (method url-fetch) - (uri (crate-uri "clap_derive" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1d2c4vs345fwihkd8cc7m6acbiydcwramkd5mnp36p0a7g6jm9cv")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-heck" ,rust-heck-0.4) - ("rust-proc-macro-error" ,rust-proc-macro-error-1) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1))))))) - -(define rust-clap-3.2.16-promise - (delay - (package - (inherit rust-clap-3) - (name "rust-clap") - (version "3.2.16") - (source (origin - (method url-fetch) - (uri (crate-uri "clap" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1af06z8z7m3327yz1xvzxfjanclgpvvy3lssb745rig7adkbpnx3")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-backtrace" ,rust-backtrace-0.3) - ("rust-bitflags" ,rust-bitflags-1) - ("rust-clap-derive" ,(force rust-clap-derive-3.2.15-promise)) - ("rust-clap-lex" ,rust-clap-lex-0.2) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-regex" ,rust-regex-1) - ("rust-strsim" ,rust-strsim-0.10) - ("rust-termcolor" ,rust-termcolor-1) - ("rust-terminal-size" ,rust-terminal-size-0.1) - ("rust-textwrap" ,(force rust-textwrap-0.15-promise)) - ("rust-unicase" ,rust-unicase-2) - ("rust-yaml-rust" ,rust-yaml-rust-0.4))))))) - -(define rust-cbindgen-0.24-promise - (delay - (package - (inherit rust-cbindgen-0.19) - (name "rust-cbindgen") - (version "0.24.3") - (source (origin - (method url-fetch) - (uri (crate-uri "cbindgen" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))) - (arguments - `(#:cargo-inputs (("rust-clap" ,(force rust-clap-3.2.16-promise)) - ("rust-heck" ,rust-heck-0.4) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-log" ,rust-log-0.4) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-syn" ,rust-syn-1) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-toml" ,rust-toml-0.5)) - #:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.5))))))) - -;; Bug with IceCat 102 with cbindgen-0.24, see -;; https://bugzilla.mozilla.org/show_bug.cgi?id=1773259#c5 for -;; possible patch (untested) -(define rust-cbindgen-0.23-promise - (delay - (package - (inherit (force rust-cbindgen-0.24-promise)) - (name "rust-cbindgen") - (version "0.23.0") - (source (origin - (method url-fetch) - (uri (crate-uri "cbindgen" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav"))))))) - - (define mozilla-compare-locales (origin (method hg-fetch) @@ -865,10 +721,9 @@ in C/C++.") ;; ,(search-patch "icecat-use-system-graphite2+harfbuzz.patch")) ;; ("icecat-use-system-media-libs.patch" ;; ,(search-patch "icecat-use-system-media-libs.patch")) - ;; TODO: Change the following lines to use 'rust' when it's >= 1.59. rust `(,rust "cargo") - (force rust-cbindgen-0.23-promise) + rust-cbindgen-0.23 llvm clang perl @@ -1551,7 +1406,7 @@ ca495991b7852b855")) pkg-config python-wrapper rust - (force rust-cbindgen-0.23-promise) + rust-cbindgen-0.23 which yasm)) (home-page "https://www.thunderbird.net") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 9fefde310d..865e982f14 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2022 Ricardo Wurmus ;;; Copyright © 2022 Mathieu Laparie ;;; Copyright © 2022 ( +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -1030,6 +1031,49 @@ rebase.") "This package provides a tool for generating C/C++ bindings to Rust code.") (license license:mpl2.0))) +(define-public rust-cbindgen-0.24 + (package + (inherit rust-cbindgen) + (name "rust-cbindgen") + (version "0.24.3") + (source (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-3) + ("rust-heck" ,rust-heck-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-toml" ,rust-toml-0.5)) + #:cargo-development-inputs + (("rust-serial-test" ,rust-serial-test-0.5)))) + (native-inputs + (list python-cython)))) + +(define-public rust-cbindgen-0.23 + (package + (inherit rust-cbindgen-0.24) + (name "rust-cbindgen") + (version "0.23.0") + (source (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav")))))) + (define-public rust-cbindgen-0.19 (package (inherit rust-cbindgen) -- cgit 1.4.1 From f845b2b2238bd5195383216dd47d3ca768954e92 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 30 Nov 2022 11:44:03 +0200 Subject: gnu: crates-io: Resort some unsorted packages. * gnu/packages/crates-io.scm (rust-clap-conf-0.1, rust-rt-format-0.8, rust-enquote-1, rust-im-rc-15, rust-impl-codec-0.5, rust-impl-rlp-0.3, rust-impl-serde-0.3, rust-impl-trait-for-tuples-0.2, rust-indicatif-0.16, rust-inflections-1, rust-pam-sys-0.5, rust-rustc-workplace-hack-1, rust-svd-parser-0.9, rust-svgtypes-0.5, rust-sxd-document-0.3, rust-sxd-xpath-0.4, rust-xi-unicode-0.3): Sort into their proper places. (skim, skim-0.7, svd2rust): Move to ... * gnu/packages/rust-apps.scm: ... here. --- gnu/packages/crates-io.scm | 1001 +++++++++++++++++++------------------------- gnu/packages/rust-apps.scm | 158 +++++++ 2 files changed, 580 insertions(+), 579 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa23bc42d5..1fd91d1a25 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10517,6 +10517,36 @@ traits.") ("rust-libc" ,rust-libc-0.2) ("rust-libloading" ,rust-libloading-0.3)))))) +(define-public rust-clap-conf-0.1 + (package + (name "rust-clap-conf") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "clap_conf" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n29wr6ns660hi63mc30zvs7dhidaycw35am9spzknsal3nrs0sn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-2) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-toml" ,rust-toml-0.5)))) + (home-page "https://github.com/storyfeet/clap_conf") + (synopsis + "Library to unify commandline arguments, config files and environment variables") + (description + "This package provides a library to unify commandline arguments with config +files and environment variables. And make it easier for users to tell your program +how to behave across the three main input sources") + (license license:expat))) + (define-public rust-clap-derive-3 (package (name "rust-clap-derive") @@ -14010,6 +14040,32 @@ number ``crunching``.") "@code{roxmltree} represents an XML 1.0 document as a read-only tree.") (license (list license:expat license:asl2.0)))) +(define-public rust-rt-format-0.3 + (package + (name "rust-rt-format") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rt-format" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qjjwh9ny95xck1kp99gi6hfm9glrx54jx8npnj6yccxc7p7q225")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/vstojkovic/rt-format") + (synopsis "Runtime equivalent of the Rust format! macro") + (description "This package provides a runtime equivalent of the Rust +format! macro. It allows formatting strings like the format! macro, with the +formatting string and the arguments provided at runtime. This crate supports +all the formatting features of the format! macro, except for the fill +character.") + (license license:asl2.0))) + (define-public rust-rust-crypto-0.2 (package (name "rust-rust-crypto") @@ -18964,6 +19020,24 @@ Standard.") order.") (license license:expat))) +(define-public rust-enquote-1 + (package + (name "rust-enquote") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (crate-uri "enquote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0clrjghlfkkb7sndabs5wch0fz2nif6nj4b117s8kqxx3nqnrhq6")))) + (build-system cargo-build-system) + (home-page "https://github.com/reujab/enquote") + (synopsis "Rust library that quotes, unquotes, and unescapes strings") + (description "This package provides a Rust library quotes, unquotes, and +unescapes strings.") + (license license:unlicense))) + (define-public rust-entities-1 (package (name "rust-entities") @@ -27080,6 +27154,145 @@ let} expressions.") ignore files such as @file{.gitignore} against file paths.") (license (list license:unlicense license:expat)))) +(define-public rust-im-rc-15 + (package + (name "rust-im-rc") + (version "15.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "im-rc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gsgcs1nn38r40973l6zr1v4d85f4s9qyl32n5f20jphf5z9ba1w")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-arbitrary" ,rust-arbitrary-0.4) + ("rust-bitmaps" ,rust-bitmaps-2) + ("rust-proptest" ,rust-proptest-0.9) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.4) + ("rust-rayon" ,rust-rayon-1) + ("rust-refpool" ,rust-refpool-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-sized-chunks" ,rust-sized-chunks-0.6) + ("rust-typenum" ,rust-typenum-1) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-metrohash" ,rust-metrohash-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + ("rust-proptest" ,rust-proptest-0.9) + ("rust-proptest-derive" ,rust-proptest-derive-0.1) + ("rust-rand" ,rust-rand-0.7) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-version-check" ,rust-version-check-0.9)))) + (home-page "https://docs.rs/crate/im") + (synopsis "Fast immutable collection datatypes for Rust") + (description "@code{im-rc} provides immutable collection datatypes for +Rust that are very fast but not thread-safe. A thread-safe (and slower) +variant of this library is available separately as @code{im}.") + (license license:mpl2.0))) + +(define-public rust-impl-codec-0.5 + (package + (name "rust-impl-codec") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "impl-codec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hy4svffnw9idy9ipp0hkmbzk97fl583akqwyqmvbqy8qgzbs7hn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-parity-scale-codec" ,rust-parity-scale-codec-2)))) + (home-page "https://github.com/paritytech/parity-common") + (synopsis "Parity Codec serialization support for uint and fixed hash") + (description "This package provides Parity Codec serialization support +for uint and fixed hash.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-impl-rlp-0.3 + (package + (name "rust-impl-rlp") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "impl-rlp" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "021869d5s47ili9kmhm9y80qpsbf0wwdap14qzfpb84pjbw210pj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rlp" ,rust-rlp-0.5)))) + (home-page "https://github.com/paritytech/parity-common") + (synopsis "RLP serialization support for uint and fixed hash") + (description "This package provides RLP serialization support for uint +and fixed hash.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-impl-serde-0.3 + (package + (name "rust-impl-serde") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "impl-serde" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0p2zy8ikdxd28s3vb22nwqgnwjn8gx920sr2svdn93j3yd1g0la5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-uint" ,rust-uint-0.9)))) + (home-page "https://github.com/paritytech/parity-common") + (synopsis "Serde serialization support for uint and fixed hash") + (description "This package provides @code{serde} serialization support +for @code{uint} and @code{fixed_hash}.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-impl-trait-for-tuples-0.2 + (package + (name "rust-impl-trait-for-tuples") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "impl-trait-for-tuples" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vii634v1zvb680h28md42xpdrj1j1d50ix3dga95fxkql8cpnnm")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #false ; Some tests fail. Unstable compiler messages? + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/bkchr/impl-trait-for-tuples") + (synopsis "Attribute macro to implement a trait for tuples") + (description "This package provides attribute macro to implement +a trait for tuples.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-include-flate-0.1 (package (name "rust-include-flate") @@ -27214,6 +27427,34 @@ removals, and it allows lookup of its elements by either hash table key or numerical index. A corresponding hash set type is also provided.") (license (list license:asl2.0 license:expat)))) +(define-public rust-indicatif-0.16 + (package + (name "rust-indicatif") + (version "0.16.2") + (source (origin + (method url-fetch) + (uri (crate-uri "indicatif" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06xyjs0kzqiqkjn60n1miwm2l87sa9p2lmzz0ymq18y72z37s81d")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-console" ,rust-console-0.15) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-number-prefix" ,rust-number-prefix-0.4) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/console-rs/indicatif") + (synopsis "Progress bar and cli reporting library for Rust") + (description + "This package provides a progress bar and cli reporting library for +Rust.") + (license license:expat))) + (define-public rust-indicatif-0.15 (package (name "rust-indicatif") @@ -27356,6 +27597,27 @@ signature.") (description "This package provides DEFLATE decoding.") (license license:expat))) +(define-public rust-inflections-1 + (package + (name "rust-inflections") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "inflections" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yl3gas612q25c72lwf04405i87yxr02vgv3ckcnz2fyvhpmhmx2")))) + (build-system cargo-build-system) + (home-page "https://docs.rs/inflections") + (synopsis "Inflection transformation library for changing properties of words") + (description + "High performance inflection transformation library for changing properties of +words like the case.") + (license license:expat))) + (define-public rust-inflector-0.11 (package (name "rust-inflector") @@ -38272,6 +38534,29 @@ memory page size.") "This package pipes your Rust output through an external pager.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pam-sys-0.5 + (package + (name "rust-pam-sys") + (version "0.5.6") + (home-page "https://github.com/1wilkens/pam-sys") + (source (origin + (method url-fetch) + (uri (crate-uri "pam-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0d14501d5vybjnzxfjf96321xa5wa36x1xvf02h02zq938qmhj6d")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (inputs `(("linux-pam" ,linux-pam))) + (synopsis + "Rust FFI wrappers for the Linux Pluggable Authentication Modules (PAM)") + (description + "This crate uses bindgen to generate the raw FFI definitions for PAM. For a +rustified API consider using pam.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pancurses-0.16 (package (name "rust-pancurses") @@ -48069,6 +48354,26 @@ rust-lang/rust integration.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-workspace-hack-1 + (package + (name "rust-rustc-workspace-hack") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-workspace-hack" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yx8l58n2vb2ldpi3z1jn4dmi5hnxvikbhpd5lilpdvkl7xd4wgw")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rustc-workspace-hack") + (synopsis "Hack for the compiler's own build system") + (description "Hack for the compiler's own build system. It is used by +@code{cargo}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustc-std-workspace-std-1 (package (name "rust-rustc-std-workspace-std") @@ -56175,6 +56480,102 @@ values without proliferating generics.") (description "This package provides custom derive for @code{sval}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-svd-parser-0.9 + (package + (name "rust-svd-parser") + (version "0.10.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "svd-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fbr4m9cla6xvmrib7pad9hv29sn2d5hjbc77pz12lwzmm2pczk9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-xmltree" ,rust-xmltree-0.8)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/rust-embedded/svd") + (synopsis "CMSIS-SVD file parser") + (description "This package provides a CMSIS-SVD file parser.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-svgtypes-0.5 + (package + (name "rust-svgtypes") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "svgtypes" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zv0yb4nfyz78y8k7fmyjqgdh9vf7xc44c9pzry8640szym6ylww")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-float-cmp" ,rust-float-cmp-0.5) + ("rust-siphasher" ,rust-siphasher-0.2)))) + (home-page "https://github.com/RazrFalcon/svgtypes") + (synopsis "SVG types parser") + (description "This package provides SVG types parser.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-sxd-document-0.3 + (package + (name "rust-sxd-document") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "sxd-document" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y10shqmy9xb73g403rg1108wsagny9d8jrcm081pbwzpqvjzn4l")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-peresil" ,rust-peresil-0.3) + ("rust-typed-arena" ,rust-typed-arena-1)))) + (home-page "https://github.com/shepmaster/sxd-document") + (synopsis "Rust XML DOM library") + (description "This package provides a Rust XML DOM library.") + (license license:expat))) + +(define-public rust-sxd-xpath-0.4 + (package + (name "rust-sxd-xpath") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "sxd-xpath" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sin3g8lzans065gjcwrpm7gdpwdpdg4rpi91rlvb1q8sfjrvqrn")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-peresil" ,rust-peresil-0.3) + ("rust-quick-error" ,rust-quick-error-1) + ("rust-sxd-document" ,rust-sxd-document-0.3)))) + (home-page "https://github.com/shepmaster/sxd-xpath") + (synopsis "Rust XML XPath library") + (description "This package provides a Rust XML XPath library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-swayipc-3 (package (name "rust-swayipc") @@ -67273,6 +67674,27 @@ to XDG Base Directory specification.") "This package provides a moderately simple command line arguments parser.") (license (list license:expat license:asl2.0)))) +(define-public rust-xi-unicode-0.3 + (package + (name "rust-xi-unicode") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "xi-unicode" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12mvjgrhr7557cib69wm4q5s4srba27pg2df9l1zihrxgnbh0wx6")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/google/xi-editor") + (synopsis + "Unicode utilities for text editing, including a line breaking iterator") + (description + "This package provides Unicode utilities useful for text editing, +including a line breaking iterator.") + (license license:asl2.0))) + (define-public rust-xml-rs-0.8 (package (name "rust-xml-rs") @@ -68614,585 +69036,6 @@ file into an in-memory tree structure.") (("rust-indexmap" ,rust-indexmap-1) ("rust-xml-rs" ,rust-xml-rs-0.7)))))) -(define-public rust-svd-parser-0.9 - (package - (name "rust-svd-parser") - (version "0.10.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "svd-parser" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1fbr4m9cla6xvmrib7pad9hv29sn2d5hjbc77pz12lwzmm2pczk9")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-rayon" ,rust-rayon-1) - ("rust-regex" ,rust-regex-1) - ("rust-serde" ,rust-serde-1) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-xmltree" ,rust-xmltree-0.8)) - #:cargo-development-inputs - (("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://github.com/rust-embedded/svd") - (synopsis "CMSIS-SVD file parser") - (description - "This package provides a CMSIS-SVD file parser") - (license (list license:expat license:asl2.0)))) - -(define-public rust-svgtypes-0.5 - (package - (name "rust-svgtypes") - (version "0.5.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "svgtypes" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1zv0yb4nfyz78y8k7fmyjqgdh9vf7xc44c9pzry8640szym6ylww")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? - #t - #:cargo-inputs - (("rust-float-cmp" ,rust-float-cmp-0.5) - ("rust-siphasher" ,rust-siphasher-0.2)))) - (home-page "https://github.com/RazrFalcon/svgtypes") - (synopsis "SVG types parser") - (description "This package provides SVG types parser.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-sxd-document-0.3 - (package - (name "rust-sxd-document") - (version "0.3.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "sxd-document" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0y10shqmy9xb73g403rg1108wsagny9d8jrcm081pbwzpqvjzn4l")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-peresil" ,rust-peresil-0.3) - ("rust-typed-arena" ,rust-typed-arena-1)))) - (home-page "https://github.com/shepmaster/sxd-document") - (synopsis "Rust XML DOM library") - (description "This package provides a Rust XML DOM library.") - (license license:expat))) - -(define-public rust-sxd-xpath-0.4 - (package - (name "rust-sxd-xpath") - (version "0.4.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "sxd-xpath" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1sin3g8lzans065gjcwrpm7gdpwdpdg4rpi91rlvb1q8sfjrvqrn")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-peresil" ,rust-peresil-0.3) - ("rust-quick-error" ,rust-quick-error-1) - ("rust-sxd-document" ,rust-sxd-document-0.3)))) - (home-page "https://github.com/shepmaster/sxd-xpath") - (synopsis "Rust XML XPath library") - (description "This package provides a Rust XML XPath library.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-im-rc-15 - (package - (name "rust-im-rc") - (version "15.0.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "im-rc" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0gsgcs1nn38r40973l6zr1v4d85f4s9qyl32n5f20jphf5z9ba1w")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-arbitrary" ,rust-arbitrary-0.4) - ("rust-bitmaps" ,rust-bitmaps-2) - ("rust-proptest" ,rust-proptest-0.9) - ("rust-quickcheck" ,rust-quickcheck-0.9) - ("rust-rand-core" ,rust-rand-core-0.5) - ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.4) - ("rust-rayon" ,rust-rayon-1) - ("rust-refpool" ,rust-refpool-0.4) - ("rust-serde" ,rust-serde-1) - ("rust-sized-chunks" ,rust-sized-chunks-0.6) - ("rust-typenum" ,rust-typenum-1) - ("rust-version-check" ,rust-version-check-0.9)) - #:cargo-development-inputs - (("rust-metrohash" ,rust-metrohash-1) - ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) - ("rust-proptest" ,rust-proptest-0.9) - ("rust-proptest-derive" ,rust-proptest-derive-0.1) - ("rust-rand" ,rust-rand-0.7) - ("rust-rayon" ,rust-rayon-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-version-check" ,rust-version-check-0.9)))) - (home-page "https://docs.rs/crate/im") - (synopsis "Fast immutable collection datatypes for Rust") - (description "@code{im-rc} provides immutable collection datatypes for -Rust that are very fast but not thread-safe. A thread-safe (and slower) -variant of this library is available separately as @code{im}.") - (license license:mpl2.0))) - -(define-public rust-impl-codec-0.5 - (package - (name "rust-impl-codec") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "impl-codec" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0hy4svffnw9idy9ipp0hkmbzk97fl583akqwyqmvbqy8qgzbs7hn")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-parity-scale-codec" ,rust-parity-scale-codec-2)))) - (home-page "https://github.com/paritytech/parity-common") - (synopsis "Parity Codec serialization support for uint and fixed hash") - (description "This package provides Parity Codec serialization support -for uint and fixed hash.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-impl-rlp-0.3 - (package - (name "rust-impl-rlp") - (version "0.3.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "impl-rlp" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "021869d5s47ili9kmhm9y80qpsbf0wwdap14qzfpb84pjbw210pj")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-rlp" ,rust-rlp-0.5)))) - (home-page "https://github.com/paritytech/parity-common") - (synopsis "RLP serialization support for uint and fixed hash") - (description "This package provides RLP serialization support for uint -and fixed hash.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-impl-serde-0.3 - (package - (name "rust-impl-serde") - (version "0.3.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "impl-serde" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0p2zy8ikdxd28s3vb22nwqgnwjn8gx920sr2svdn93j3yd1g0la5")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-serde" ,rust-serde-1)) - #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) - ("rust-serde-derive" ,rust-serde-derive-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-uint" ,rust-uint-0.9)))) - (home-page "https://github.com/paritytech/parity-common") - (synopsis "Serde serialization support for uint and fixed hash") - (description "This package provides @code{serde} serialization support -for @code{uint} and @code{fixed_hash}.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-impl-trait-for-tuples-0.2 - (package - (name "rust-impl-trait-for-tuples") - (version "0.2.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "impl-trait-for-tuples" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1vii634v1zvb680h28md42xpdrj1j1d50ix3dga95fxkql8cpnnm")))) - (build-system cargo-build-system) - (arguments - `(#:tests? #false ; Some tests fail. Unstable compiler messages? - #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)) - #:cargo-development-inputs - (("rust-trybuild" ,rust-trybuild-1)))) - (home-page "https://github.com/bkchr/impl-trait-for-tuples") - (synopsis "Attribute macro to implement a trait for tuples") - (description "This package provides attribute macro to implement -a trait for tuples.") - (license (list license:asl2.0 license:expat)))) - -(define-public rust-indicatif-0.16 - (package - (name "rust-indicatif") - (version "0.16.2") - (source (origin - (method url-fetch) - (uri (crate-uri "indicatif" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "06xyjs0kzqiqkjn60n1miwm2l87sa9p2lmzz0ymq18y72z37s81d")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-console" ,rust-console-0.15) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-number-prefix" ,rust-number-prefix-0.4) - ("rust-rayon" ,rust-rayon-1) - ("rust-regex" ,rust-regex-1) - ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) - ("rust-unicode-width" ,rust-unicode-width-0.1)))) - (home-page "https://github.com/console-rs/indicatif") - (synopsis "Progress bar and cli reporting library for Rust") - (description - "This package provides a progress bar and cli reporting library for -Rust.") - (license license:expat))) - -(define-public rust-inflections-1 - (package - (name "rust-inflections") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "inflections" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0yl3gas612q25c72lwf04405i87yxr02vgv3ckcnz2fyvhpmhmx2")))) - (build-system cargo-build-system) - (home-page #f) - (synopsis - "Inflection transformation library for changing properties of words") - (description - "High performance inflection transformation library for changing properties of words like the case.") - (license license:expat))) - -(define-public rust-rt-format-0.3 - (package - (name "rust-rt-format") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rt-format" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1qjjwh9ny95xck1kp99gi6hfm9glrx54jx8npnj6yccxc7p7q225")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-regex" ,rust-regex-1)))) - (home-page "https://github.com/vstojkovic/rt-format") - (synopsis "Runtime equivalent of the Rust format! macro") - (description "This package provides a runtime equivalent of the Rust -format! macro. It allows formatting strings like the format! macro, with the -formatting string and the arguments provided at runtime. This crate supports -all the formatting features of the format! macro, except for the fill -character.") - (license license:asl2.0))) - -(define-public rust-rustc-workspace-hack-1 - (package - (name "rust-rustc-workspace-hack") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "rustc-workspace-hack" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1yx8l58n2vb2ldpi3z1jn4dmi5hnxvikbhpd5lilpdvkl7xd4wgw")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rustc-workspace-hack") - (synopsis "Hack for the compiler's own build system") - (description "Hack for the compiler's own build system. It is used by -@code{cargo}.") - (license (list license:expat license:asl2.0)))) - -(define-public skim - (package - (name "skim") - (version "0.9.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "skim" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1d5v9vq8frkdjm7bnw3455h6xf3c277d51il2qasn7r20kwik7ab")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-atty-0.2" ,rust-atty-0.2) - ("rust-beef" ,rust-beef-0.5) - ("rust-bitflags" ,rust-bitflags-1) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-2) - ("rust-crossbeam" ,rust-crossbeam-0.8) - ("rust-defer-drop" ,rust-defer-drop-1) - ("rust-derive-builder" ,rust-derive-builder-0.9) - ("rust-env-logger" ,rust-env-logger-0.8) - ("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.19) - ("rust-rayon" ,rust-rayon-1) - ("rust-regex" ,rust-regex-1) - ("rust-shlex" ,rust-shlex-0.1) - ("rust-time" ,rust-time-0.2) - ("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.9)) - #: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 rust-skim-0.7 - (deprecated-package "rust-skim-0.7" skim-0.7)) - -(define-public rust-clap-conf-0.1 - (package - (name "rust-clap-conf") - (version "0.1.5") - (source - (origin - (method url-fetch) - (uri (crate-uri "clap_conf" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1n29wr6ns660hi63mc30zvs7dhidaycw35am9spzknsal3nrs0sn")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-clap" ,rust-clap-2) - ("rust-serde" ,rust-serde-1) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-toml" ,rust-toml-0.5)))) - (home-page - "https://github.com/storyfeet/clap_conf") - (synopsis - "Library to unify commandline arguments, config files and environment variables") - (description - "This package provides a library to unify commandline arguments with config files and environment variables. And make it easier for users to tell your program how to behave across the three main input sources") - (license license:expat))) - -(define-public svd2rust - (package - (name "svd2rust") - (version "0.19.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "svd2rust" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0q8slfgjfhpljzlk2myb0i538mfq99q1ljn398jm17r1q2pjjxhv")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-cast" ,rust-cast-0.2) - ("rust-clap" ,rust-clap-2) - ("rust-clap-conf" ,rust-clap-conf-0.1) - ("rust-env-logger" ,rust-env-logger-0.7) - ("rust-inflections" ,rust-inflections-1) - ("rust-log" ,rust-log-0.4) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1) - ("rust-svd-parser" ,rust-svd-parser-0.9) - ("rust-syn" ,rust-syn-1) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page #f) - (synopsis - "Generate Rust register maps (`struct`s) from SVD files") - (description - "Generate Rust register maps (`struct`s) from SVD files") - (license (list license:expat license:asl2.0)))) - -(define-public rust-xi-unicode-0.3 - (package - (name "rust-xi-unicode") - (version "0.3.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "xi-unicode" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "12mvjgrhr7557cib69wm4q5s4srba27pg2df9l1zihrxgnbh0wx6")))) - (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) - (home-page "https://github.com/google/xi-editor") - (synopsis - "Unicode utilities for text editing, including a line breaking iterator") - (description - "This package provides Unicode utilities useful for text editing, -including a line breaking iterator.") - (license license:asl2.0))) - -(define-public rust-enquote-1 - (package - (name "rust-enquote") - (version "1.1.0") - (home-page "https://github.com/reujab/enquote") - (source (origin - (method url-fetch) - (uri (crate-uri "enquote" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0clrjghlfkkb7sndabs5wch0fz2nif6nj4b117s8kqxx3nqnrhq6")))) - (build-system cargo-build-system) - (synopsis "Rust library that quotes, unquotes, and unescapes strings") - (description "A Rust library quotes, unquotes, and unescapes strings") - (license license:unlicense))) - -(define-public rust-pam-sys-0.5 - (package - (name "rust-pam-sys") - (version "0.5.6") - (home-page "https://github.com/1wilkens/pam-sys") - (source (origin - (method url-fetch) - (uri (crate-uri "pam-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0d14501d5vybjnzxfjf96321xa5wa36x1xvf02h02zq938qmhj6d")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) - (inputs `(("linux-pam" ,linux-pam))) - (synopsis - "Rust FFI wrappers for the Linux Pluggable Authentication Modules (PAM)") - (description - "This crate uses bindgen to generate the raw FFI definitions for PAM. For a rustified API consider using pam.") - (license (list license:expat license:asl2.0)))) - ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 865e982f14..75742dcc76 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1921,6 +1921,164 @@ C-compatible) software.") consecutive lines and since program start.") (license license:expat))) +(define-public skim + (package + (name "skim") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "skim" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1d5v9vq8frkdjm7bnw3455h6xf3c277d51il2qasn7r20kwik7ab")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-atty-0.2" ,rust-atty-0.2) + ("rust-beef" ,rust-beef-0.5) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("rust-crossbeam" ,rust-crossbeam-0.8) + ("rust-defer-drop" ,rust-defer-drop-1) + ("rust-derive-builder" ,rust-derive-builder-0.9) + ("rust-env-logger" ,rust-env-logger-0.8) + ("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.19) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-time" ,rust-time-0.2) + ("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.9)) + #: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 rust-skim-0.7 + (deprecated-package "rust-skim-0.7" skim-0.7)) + +(define-public svd2rust + (package + (name "svd2rust") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "svd2rust" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0q8slfgjfhpljzlk2myb0i538mfq99q1ljn398jm17r1q2pjjxhv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-cast" ,rust-cast-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-clap-conf" ,rust-clap-conf-0.1) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-inflections" ,rust-inflections-1) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-1) + ("rust-svd-parser" ,rust-svd-parser-0.9) + ("rust-syn" ,rust-syn-1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/rust-embedded/svd2rust/") + (synopsis + "Generate Rust register maps (`struct`s) from SVD files") + (description + "This program can be used to generate Rust register maps (`struct`s) from SVD +files.") + (license (list license:expat license:asl2.0)))) + (define-public swayhide (package (name "swayhide") -- cgit 1.4.1 From 8073467c1c824cd13a3aedae8a9401f05a7b9691 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 30 Nov 2022 11:52:31 +0200 Subject: gnu: rust-svd-parser-0.9: Rename to rust-svd-parser-0.10. * gnu/packages/crates-io.scm (rust-svd-parser-0.9): Rename to rust-svd-parser-0.10. * gnu/packages/rust-apps.scm (svd2rust)[cargo-inputs]: Adjust accordingly. --- gnu/packages/crates-io.scm | 2 +- gnu/packages/rust-apps.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1fd91d1a25..431a37527c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56480,7 +56480,7 @@ values without proliferating generics.") (description "This package provides custom derive for @code{sval}.") (license (list license:asl2.0 license:expat)))) -(define-public rust-svd-parser-0.9 +(define-public rust-svd-parser-0.10 (package (name "rust-svd-parser") (version "0.10.2") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 75742dcc76..9c8c1ba4d4 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2068,7 +2068,7 @@ consecutive lines and since program start.") ("rust-log" ,rust-log-0.4) ("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-1) - ("rust-svd-parser" ,rust-svd-parser-0.9) + ("rust-svd-parser" ,rust-svd-parser-0.10) ("rust-syn" ,rust-syn-1) ("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/rust-embedded/svd2rust/") -- cgit 1.4.1 From 63a483265ae4ac853367f7af070e88f98dcc82ad Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 7 Nov 2022 20:05:38 +0000 Subject: gnu: Add htmlq. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/rust-apps.scm (htmlq): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/rust-apps.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 9c8c1ba4d4..20a1ebd4aa 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Mathieu Laparie ;;; Copyright © 2022 ( ;;; Copyright © 2022 John Kehayias +;;; Copyright © 2022 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -2325,3 +2326,27 @@ let handle = &mut _stdout.lock();"))))))) track of the directories you use most frequently, and uses a ranking algorithm to navigate to the best match.") (license license:expat))) + +(define-public htmlq + (package + (name "htmlq") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "htmlq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0912cdkz5xji1hzfj1cf42zh1kd860b52xmwwhb7q2jhp6qk25jh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-html5ever" ,rust-html5ever-0.25) + ("rust-kuchiki" ,rust-kuchiki-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-url" ,rust-url-2)))) + (home-page "https://github.com/mgdm/htmlq") + (synopsis "Like jq, but for HTML") + (description "Extract content from HTML files using CSS selectors.") + (license license:expat))) -- cgit 1.4.1 From 812ecf7ee673a3d619d1d3664350508c67e9d92c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 8 Jan 2023 19:25:26 +0100 Subject: gnu: tectonic: Update to 0.12.0. * gnu/packages/rust-apps.scm (tectonic): Update to 0.12.0. * gnu/packages/crates-io.scm (rust-tectonic-bridge-graphite2): Update to 0.2.1. [arguments]: Do not skip build. [native-inputs]: Add PKG-CONFIG. [inputs]: Add GRAPHITE2. (rust-tectonic-bundles): Update to 0.3. [arguments]: Do not skip build. <#:cargo-inputs>: Update RUST-TECTONIC-IO-BASE to 0.4. [native-inputs]: Add PKG-CONFIG. [inputs]: Add OPENSSL and ZLIB. (rust-tectonic-docmodel): Update to 0.2.0. [arguments]: Do not skip build. (rust-tectonic-engine-xetex): Update to 0.4.1. [arguments]: Do not skip build. <#:cargo-inputs>: Update RUST-TECTONIC-PDF-IO to 0.4 and RUST-TECTONIC-XETEX-LAYOUT to 0.2. [native-inputs]: Add PKG-CONFIG. [inputs]: Add FONTCONFIG, FREETYPE, GRAPHITE2, ICU4C and ZLIB. (rust-tectonic-engine-xdvipdfmx): Update to 0.4.0. [arguments]: Do not skip build. <#:cargo-inputs>: Remove RUST-CBINDGEN, update RUST-TECTONIC-BRIDGE-CORE to 0.3 and RUST-TECTONIC-PDF-IO to 0.4. [native-inputs]: Add PKG-CONFIG. [inputs]: Add LIBPNG and ZLIB. (rust-tectonic-pdf-io): Update to 0.4. [arguments]: Do not skip build. <#:cargo-inputs>: Update RUST-TECTONIC-BRIDGE-CORE to 0.3. (rust-tectonic-xetex-layout): Update to 0.2.1. [arguments]: Do not skip build. <#:cargo-inputs>: Update RUST-TECTONIC-BRIDGE-CORE to 0.3. [native-inputs]: Add PKG-CONFIG. [inputs]: Add FONTCONFIG, FREETYPE, GRAPHITE2, ICU4C and ZLIB. --- gnu/packages/crates-io.scm | 109 +++++++++++++++++++++++++++------------------ gnu/packages/rust-apps.scm | 15 +++---- 2 files changed, 72 insertions(+), 52 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f0f40207b9..1203d10b67 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2019, 2020, 2021, 2022 Efraim Flashner -;;; Copyright © 2019-2022 Nicolas Goaziou +;;; Copyright © 2019-2023 Nicolas Goaziou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 John Soo @@ -69,6 +69,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages jemalloc) #:use-module (gnu packages linux) @@ -57752,19 +57753,22 @@ Rust bindings.") (define-public rust-tectonic-bridge-graphite2-0.2 (package (name "rust-tectonic-bridge-graphite2") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (crate-uri "tectonic_bridge_graphite2" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1qsq337y4p3z832kmn2xcaj6xh3z6ngr0izn4jgdjrymnsq1ac81")))) + (base32 "1lkpqxz0y7m2ib1g0k850g2d7g6z8062niaw7vgvql33f2n94xkr")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-tectonic-dep-support" ,rust-tectonic-dep-support-0.1)))) + (native-inputs + (list pkg-config)) + (inputs + (list graphite2)) (home-page "https://tectonic-typesetting.github.io/") (synopsis "Expose the graphite2 library to Rust/Cargo") (description @@ -57824,28 +57828,31 @@ bindings.") bindings.") (license license:expat))) -(define-public rust-tectonic-bundles-0.2 +(define-public rust-tectonic-bundles-0.3 (package (name "rust-tectonic-bundles") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (crate-uri "tectonic_bundles" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17wwgfcl5nzvgzil7ayi42ljjkx9ffv4c35v6ywcmzdhk9zhki2f")))) + (base32 "1ccykccvddvx31h1dfkzdxsnqhgyls21ks2qbvad09m1jzqzl5nj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-flate2" ,rust-flate2-1) ("rust-fs2" ,rust-fs2-0.4) ("rust-tectonic-errors" ,rust-tectonic-errors-0.2) ("rust-tectonic-geturl" ,rust-tectonic-geturl-0.3) - ("rust-tectonic-io-base" ,rust-tectonic-io-base-0.3) + ("rust-tectonic-io-base" ,rust-tectonic-io-base-0.4) ("rust-tectonic-status-base" ,rust-tectonic-status-base-0.2) ("rust-zip" ,rust-zip-0.5)))) + (native-inputs + (list pkg-config)) + (inputs + (list openssl zlib)) (home-page "https://tectonic-typesetting.github.io/") (synopsis "Tectonic ``bundle'' (support file collection) implementations") (description @@ -57904,21 +57911,20 @@ providing whatever fiddly features are needed to enable the Tectonic build process.") (license license:expat))) -(define-public rust-tectonic-docmodel-0.1 +(define-public rust-tectonic-docmodel-0.2 (package (name "rust-tectonic-docmodel") - (version "0.1.2") + (version "0.2.0") (source (origin (method url-fetch) (uri (crate-uri "tectonic_docmodel" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1b5vdqcnjbbda6am0mb7qyxyc6pn8v0pqz0w10xia87ycyyfflxw")))) + (base32 "1z3yhw7h11a5xggi3bjip3kz1931mjl5gi53vx2zwd89rg99373y")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) ("rust-tectonic-errors" ,rust-tectonic-errors-0.2) ("rust-toml" ,rust-toml-0.5)))) @@ -57987,21 +57993,20 @@ document model, including the @file{Tectonic.toml} file.") output to HTML.") (license license:expat))) -(define-public rust-tectonic-engine-xetex-0.2 +(define-public rust-tectonic-engine-xetex-0.4 (package (name "rust-tectonic-engine-xetex") - (version "0.2.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (crate-uri "tectonic_engine_xetex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kn9gxkgf3jbwif14n1kmp869s4b69khhc7iwm78qqpmy79lrhkw")))) + (base32 "1ckx9sg1nwyghg7142zk5x75g32f4s19psk6c50y0n0ikf5xq9sd")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) ("rust-libc" ,rust-libc-0.2) ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.3) @@ -58010,8 +58015,16 @@ output to HTML.") ("rust-tectonic-bridge-harfbuzz" ,rust-tectonic-bridge-harfbuzz-0.2) ("rust-tectonic-cfg-support" ,rust-tectonic-cfg-support-0.1) ("rust-tectonic-errors" ,rust-tectonic-errors-0.2) - ("rust-tectonic-pdf-io" ,rust-tectonic-pdf-io-0.1) - ("rust-tectonic-xetex-layout" ,rust-tectonic-xetex-layout-0.1)))) + ("rust-tectonic-pdf-io" ,rust-tectonic-pdf-io-0.4) + ("rust-tectonic-xetex-layout" ,rust-tectonic-xetex-layout-0.2)))) + (native-inputs + (list pkg-config)) + (inputs + (list fontconfig + freetype + graphite2 + icu4c + zlib)) (home-page "https://tectonic-typesetting.github.io/") (synopsis "XeTeX engine as a reusable crate") (description @@ -58019,27 +58032,29 @@ output to HTML.") engine as a reusable crate.") (license license:expat))) -(define-public rust-tectonic-engine-xdvipdfmx-0.1 +(define-public rust-tectonic-engine-xdvipdfmx-0.4 (package (name "rust-tectonic-engine-xdvipdfmx") - (version "0.1.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (crate-uri "tectonic_engine_xdvipdfmx" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "00kjsxzlzlc8lmh8mhb5v6iw1lb7rq09ski2mjzlyw604dcq1k3p")))) + (base32 "0ajmb9pcq5pak28z4bhsnxfgfy9hpr1mm02bp6ph16nvdn8m2ir1")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-cbindgen" ,rust-cbindgen-0.16) - ("rust-cc" ,rust-cc-1) + `(#:cargo-inputs + (("rust-cc" ,rust-cc-1) ("rust-libc" ,rust-libc-0.2) - ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.1) + ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.3) ("rust-tectonic-errors" ,rust-tectonic-errors-0.2) - ("rust-tectonic-pdf-io" ,rust-tectonic-pdf-io-0.1)))) + ("rust-tectonic-pdf-io" ,rust-tectonic-pdf-io-0.4)))) + (native-inputs + (list pkg-config)) + (inputs + (list libpng zlib)) (home-page "https://tectonic-typesetting.github.io/") (synopsis "@code{xdvipdfmx} program as a reusable crate") (description @@ -58192,23 +58207,22 @@ streams.") ("rust-tectonic-status-base" ,rust-tectonic-status-base-0.1) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-tectonic-pdf-io-0.1 +(define-public rust-tectonic-pdf-io-0.4 (package (name "rust-tectonic-pdf-io") - (version "0.1.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (crate-uri "tectonic_pdf_io" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ry5g6vh54i8ih8rjlz3ci7b8gi4irsllg34pv57mcwrhwcikg6x")))) + (base32 "0rmk31n96r299k5j2ydyqryzywn2dbfbnl1rwh0lx86zaqac9qcn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) - ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.1) + ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.3) ("rust-tectonic-bridge-flate" ,rust-tectonic-bridge-flate-0.1) ("rust-tectonic-cfg-support" ,rust-tectonic-cfg-support-0.1) ("rust-tectonic-dep-support" ,rust-tectonic-dep-support-0.1)))) @@ -58287,29 +58301,36 @@ types for reporting status messages to a user.") used by XeTeX and Tectonic.") (license license:expat))) -(define-public rust-tectonic-xetex-layout-0.1 +(define-public rust-tectonic-xetex-layout-0.2 (package (name "rust-tectonic-xetex-layout") - (version "0.1.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (crate-uri "tectonic_xetex_layout" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "063fq6bhhqac30bg6vmcfpd9zikn0p6rd189avz0f34ka4mir0yi")))) + (base32 "102z52hhazz2b2qsbr93dn2y4q0103s548ixzws40il7imzg99ly")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) - ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.1) + ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.3) ("rust-tectonic-bridge-freetype2" ,rust-tectonic-bridge-freetype2-0.2) ("rust-tectonic-bridge-graphite2" ,rust-tectonic-bridge-graphite2-0.2) ("rust-tectonic-bridge-harfbuzz" ,rust-tectonic-bridge-harfbuzz-0.2) ("rust-tectonic-bridge-icu" ,rust-tectonic-bridge-icu-0.2) ("rust-tectonic-cfg-support" ,rust-tectonic-cfg-support-0.1) ("rust-tectonic-dep-support" ,rust-tectonic-dep-support-0.1)))) + (native-inputs + (list pkg-config)) + (inputs + (list fontconfig + freetype + graphite2 + icu4c + zlib)) (home-page "https://tectonic-typesetting.github.io/") (synopsis "XeTeX's font loading and layout interface encapsulation") (description diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 20a1ebd4aa..b8cb06af64 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Mark H Weaver ;;; Copyright © 2020 Gabriel Arazas -;;; Copyright © 2020-2022 Nicolas Goaziou +;;; Copyright © 2020-2023 Nicolas Goaziou ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sharlatan Hellseher @@ -1314,14 +1314,14 @@ of the project is to be runnable on untrusted networks without crashing.") (define-public tectonic (package (name "tectonic") - (version "0.8.2") + (version "0.12.0") (source (origin (method url-fetch) (uri (crate-uri "tectonic" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "041v887a3aybrkn5fnrjwy95wxfk4npl6lj8ar8dnidjmfh92bka")))) + (base32 "1q4mz2c32gfypx33zlzgd1q9h4322jrk13fzvsf8h676ylclqzpc")))) (build-system cargo-build-system) (arguments `(#:cargo-build-flags '("--release" "--features" "external-harfbuzz") @@ -1341,18 +1341,17 @@ of the project is to be runnable on untrusted networks without crashing.") ("rust-sha2" ,rust-sha2-0.9) ("rust-structopt" ,rust-structopt-0.3) ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.3) - ("rust-tectonic-bundles" ,rust-tectonic-bundles-0.2) - ("rust-tectonic-docmodel" ,rust-tectonic-docmodel-0.1) + ("rust-tectonic-bundles" ,rust-tectonic-bundles-0.3) + ("rust-tectonic-docmodel" ,rust-tectonic-docmodel-0.2) ("rust-tectonic-engine-bibtex" ,rust-tectonic-engine-bibtex-0.1) ("rust-tectonic-engine-spx2html" ,rust-tectonic-engine-spx2html-0.1) - ("rust-tectonic-engine-xdvipdfmx" ,rust-tectonic-engine-xdvipdfmx-0.1) - ("rust-tectonic-engine-xetex" ,rust-tectonic-engine-xetex-0.2) + ("rust-tectonic-engine-xdvipdfmx" ,rust-tectonic-engine-xdvipdfmx-0.4) + ("rust-tectonic-engine-xetex" ,rust-tectonic-engine-xetex-0.4) ("rust-tectonic-errors" ,rust-tectonic-errors-0.2) ("rust-tectonic-geturl" ,rust-tectonic-geturl-0.3) ("rust-tectonic-io-base" ,rust-tectonic-io-base-0.4) ("rust-tectonic-status-base" ,rust-tectonic-status-base-0.2) ("rust-tectonic-xdv" ,rust-tectonic-xdv-0.2) - ("rust-tectonic-xetex-layout" ,rust-tectonic-xetex-layout-0.1) ("rust-tempfile" ,rust-tempfile-3) ("rust-termcolor" ,rust-termcolor-1) ("rust-toml" ,rust-toml-0.5) -- cgit 1.4.1