diff --git a/.guix/modules/crates-io.scm b/.guix/modules/crates-io.scm index b77eb34..b5e6cb0 100644 --- a/.guix/modules/crates-io.scm +++ b/.guix/modules/crates-io.scm @@ -621,3 +621,226 @@ your own custom string type).") (description "Web framework with a focus on usability, security, extensibility, and speed.") (license (list license:expat license:asl2.0)))) +(define-public rust-quick-xml-0.29 + (package + (name "rust-quick-xml") + (version "0.29.0") + (source (origin + (method url-fetch) + (uri (crate-uri "quick-xml" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lfaciwimmlsx9c6w3vhypk5ssqkhzi1vv0g95hpnb6q2n125fc1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-memchr" ,rust-memchr-2) + ("rust-serde" ,rust-serde-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/tafia/quick-xml") + (synopsis "High performance xml reader and writer") + (description "High performance xml reader and writer") + (license license:expat))) + +(define-public rust-plist-1 + (package + (name "rust-plist") + (version "1.5.0") + (source (origin + (method url-fetch) + (uri (crate-uri "plist" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01mfd4129p1iqadvpylpbx5ma3p2x4cdih2bwai5gnx3zqf01h5x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-base64" ,rust-base64-0.21) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-line-wrap" ,rust-line-wrap-0.1) + ("rust-quick-xml" ,rust-quick-xml-0.29) + ("rust-serde" ,rust-serde-1) + ("rust-time" ,rust-time-0.3)))) + (home-page "https://github.com/ebarnard/rust-plist/") + (synopsis "A rusty plist parser. Supports Serde serialization.") + (description + "This package provides a rusty plist parser. Supports Serde serialization.") + (license license:expat))) + +(define-public rust-fancy-regex-0.11 + (package + (name "rust-fancy-regex") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (crate-uri "fancy-regex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18j0mmzfycibhxhhhfja00dxd1vf8x5c28lbry224574h037qpxr")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-bit-set" ,rust-bit-set-0.5) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/fancy-regex/fancy-regex") + (synopsis + "An implementation of regexes, supporting a relatively rich set of features, including backreferences and look-around.") + (description + "An implementation of regexes, supporting a relatively rich set of features, +including backreferences and look-around.") + (license license:expat))) + +(define-public rust-syntect-5 + (package + (name "rust-syntect") + (version "5.1.0") + (source (origin + (method url-fetch) + (uri (crate-uri "syntect" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14cg314vzabi45cdbqgcpav0dlx3d18blp24n3z8pl7q7cq4naz0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-fancy-regex" ,rust-fancy-regex-0.11) + ("rust-flate2" ,rust-flate2-1) + ("rust-fnv" ,rust-fnv-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-onig" ,rust-onig-6) + ("rust-plist" ,rust-plist-1) + ("rust-regex-syntax" ,rust-regex-syntax-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-yaml-rust" ,rust-yaml-rust-0.4)))) + (home-page "https://github.com/trishume/syntect") + (synopsis + "library for high quality syntax highlighting and code intelligence using Sublime Text's grammars") + (description + "library for high quality syntax highlighting and code intelligence using Sublime +Text's grammars") + (license license:expat))) + +(define-public rust-emojis-0.5 + (package + (name "rust-emojis") + (version "0.5.3") + (source (origin + (method url-fetch) + (uri (crate-uri "emojis" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pdrhzlx53ksb41dx3qjl6qg9nj711vj28r8d92pv0lij5sbq1rl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-phf" ,rust-phf-0.11)))) + (home-page "https://github.com/rossmacarthur/emojis") + (synopsis + "✨ Lookup and iterate over emoji names, shortcodes, and groups") + (description + "✨ Lookup and iterate over emoji names, shortcodes, and groups") + (license (list license:expat license:asl2.0)))) + +(define-public rust-comrak-0.16 + (package + (name "rust-comrak") + (version "0.16.0") + (source (origin + (method url-fetch) + (uri (crate-uri "comrak" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "004m3512w5xwzxmsmmvgf5708is8d2qwj36cg4ay1b9dh783cj3q")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-emojis" ,rust-emojis-0.5) + ("rust-entities" ,rust-entities-1) + ("rust-memchr" ,rust-memchr-2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-regex" ,rust-regex-1) + ("rust-shell-words" ,rust-shell-words-1) + ("rust-slug" ,rust-slug-0.1) + ("rust-syntect" ,rust-syntect-5) + ("rust-typed-arena" ,rust-typed-arena-2) + ("rust-unicode-categories" ,rust-unicode-categories-0.1) + ("rust-xdg" ,rust-xdg-2)))) + (home-page "https://github.com/kivikakk/comrak") + (synopsis + "A 100% CommonMark-compatible GitHub Flavored Markdown parser and formatter") + (description + "This package provides a 100% @code{CommonMark-compatible} @code{GitHub} Flavored +Markdown parser and formatter") + (license license:bsd-2))) + +(define-public rust-askama-derive-0.12 + (package + (name "rust-askama-derive") + (version "0.12.1") + (source (origin + (method url-fetch) + (uri (crate-uri "askama_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "157w36qk4l6nzcy23bhm0bhkkl6d4bzncsg5b21hjp2l2c2bwby2")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-basic-toml" ,rust-basic-toml-0.1) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-nom" ,rust-nom-7) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/djc/askama") + (synopsis "Procedural macro package for Askama") + (description "Procedural macro package for Askama") + (license (list license:expat license:asl2.0)))) + +(define-public rust-askama-0.12 + (package + (name "rust-askama") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (crate-uri "askama" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zmmrzwy1l5mlzwxlwjvssh23i55bf1y9gkvf8rri3gsfg7w7js7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-askama-derive" ,rust-askama-derive-0.12) + ("rust-askama-escape" ,rust-askama-escape-0.10) + ("rust-comrak" ,rust-comrak-0.16) + ("rust-humansize" ,rust-humansize-2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.9)))) + (home-page "https://github.com/djc/askama") + (synopsis "Type-safe, compiled Jinja-like templates for Rust") + (description "Type-safe, compiled Jinja-like templates for Rust") + (license (list license:expat license:asl2.0)))) + diff --git a/.guix/modules/meowy-webring.scm b/.guix/modules/meowy-webring.scm index b11699f..e16b8cc 100644 --- a/.guix/modules/meowy-webring.scm +++ b/.guix/modules/meowy-webring.scm @@ -23,12 +23,9 @@ #:recursive? #t #:select? keep-file?)) (build-system cargo-build-system) - (arguments (list #:rust backported-rust)) - (native-inputs - (list rust-async-stream-3.5 - rust-rocket-0.5 - rust-askama-0.11 - rust-serde-1)) + (arguments (list #:rust backported-rust + #:cargo-inputs `(("rust-rocket" ,rust-rocket-0.5) + ("rust-askama" ,rust-askama-0.12)))) (synopsis "") (description "") (home-page "") diff --git a/.guix/modules/rust.scm b/.guix/modules/rust.scm index 5f86c0a..492c8e9 100644 --- a/.guix/modules/rust.scm +++ b/.guix/modules/rust.scm @@ -50,7 +50,7 @@ ;; will expect a precompiled binary library. This patch will enable the cargo ;; cc feature flag inside the fd-lock vendored Cargo.toml file, which is the ;; crate that uses rustix. - (patches (list ".guix/modules/patches/rust-1.70-fix-rustix-build.patch")) + (patches (list "./patches/rust-1.70-fix-rustix-build.patch")) (patch-flags '("-p1")))) (arguments (substitute-keyword-arguments (package-arguments base-rust)