From baa47f0b1233ab588af19c8f13421e755aa93cdd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 Jan 2021 10:06:32 +0100 Subject: gnu: Add tectonic * gnu/packages/rust-apps.scm (tectonic): New variable. --- gnu/packages/rust-apps.scm | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 3745a8377c..4703443e57 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -33,6 +33,8 @@ #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages documentation) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gtk) #:use-module (gnu packages jemalloc) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) @@ -458,6 +460,77 @@ gitignore rules.") (base32 "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))))) +(define-public tectonic + (package + (name "tectonic") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tectonic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16fm2bfvfizrydmirzf0bhr1fidb5slcbvr6150and8yqr8jc4lf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-app-dirs2" ,rust-app-dirs2-2) + ("rust-atty" ,rust-atty-0.2) + ("rust-byte-unit" ,rust-byte-unit-4) + ("rust-cbindgen" ,rust-cbindgen-0.16) + ("rust-cc" ,rust-cc-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-error-chain" ,rust-error-chain-0.12) + ("rust-flate2" ,rust-flate2-1) + ("rust-fs2" ,rust-fs2-0.4) + ("rust-headers" ,rust-headers-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-md-5" ,rust-md-5-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-tectonic-cfg-support" ,rust-tectonic-cfg-support-0.1) + ("rust-tectonic-xdv" ,rust-tectonic-xdv-0.1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-toml" ,rust-toml-0.5) + ("rust-vcpkg" ,rust-vcpkg-0.2) + ("rust-zip" ,rust-zip-0.5)) + #:cargo-development-inputs + (("rust-filetime" ,rust-filetime-0.2) + ("rust-futures" ,rust-futures-0.1) + ("rust-headers" ,rust-headers-0.2) + ("rust-hyper" ,rust-hyper-0.12) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tokio" ,rust-tokio-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (copy-recursively "docs/src" doc) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("fontconfig" ,fontconfig) + ("harfbuzz" ,harfbuzz) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://tectonic-typesetting.github.io/") + (synopsis "Complete, embeddable TeX/LaTeX engine") + (description + "This package provides a modernized, complete, embeddable +TeX/LaTeX engine. Tectonic is forked from the XeTeX extension to the +classic Web2C implementation of TeX and uses the TeXLive distribution +of support files.") + (license license:expat))) + (define-public tokei (package (name "tokei") -- cgit v1.2.3 From fb51912d37b85463dc11a821b004c71e1306a642 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 20 Jan 2021 15:26:52 +0000 Subject: gnu: Add drill. * gnu/packages/rust-apps.scm (drill): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/rust-apps.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 4703443e57..2a16eebcfd 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,6 +93,47 @@ highlighting for a large number of languages, git integration, and automatic paging.") (license (list license:expat license:asl2.0)))) +(define-public drill + (package + (name "drill") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "drill" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m73d7rzi0p5c1hn0081d2235kcyapdza7h0vqf5jhnirpnjn793")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-clap" ,rust-clap-2) + ("rust-colored" ,rust-colored-1) + ("rust-csv" ,rust-csv-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-rand" ,rust-rand-0.7) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-0.2) + ("rust-url" ,rust-url-2) + ("rust-yaml-rust" ,rust-yaml-rust-0.4)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("openssl" ,openssl))) + (home-page "https://github.com/fcsonline/drill") + (synopsis "HTTP load testing application") + (description + "Drill is a HTTP load testing application written in Rust inspired by +Ansible syntax. Benchmark files can be written in YAML.") + (license license:gpl3))) + (define-public exa (package (name "exa") -- cgit v1.2.3 From d94f7530434fe3efd61b7d3301eff7501ae044f6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 01:16:25 +0100 Subject: gnu: tokei: Update to 12.1.2. * gnu/packages/rust-apps.scm (tokei): Update to 12.1.2. --- gnu/packages/rust-apps.scm | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 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 2a16eebcfd..eac55ae3e0 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -576,43 +576,45 @@ of support files.") (define-public tokei (package (name "tokei") - (version "10.1.1") + (version "12.1.2") (source - (origin - (method url-fetch) - (uri (crate-uri "tokei" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "07f5laqw2k9l3k8wrg9h8p2m5d9hkfxngyacwrn3vs7mlnw8l81m")))) + (origin + (method url-fetch) + (uri (crate-uri "tokei" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "000w549v1bpw7r57xw656p40ywf1gimvxxx5cjnri2js0xg927x4")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-clap" ,rust-clap-2) - ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) - ("rust-dirs" ,rust-dirs-2.0) + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-clap" ,rust-clap-2) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-dashmap" ,rust-dashmap-4) + ("rust-dirs" ,rust-dirs-3) ("rust-encoding-rs-io" ,rust-encoding-rs-io-0.1) - ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-env-logger" ,rust-env-logger-0.8) ("rust-grep-searcher" ,rust-grep-searcher-0.1) ("rust-hex" ,rust-hex-0.4) ("rust-ignore" ,rust-ignore-0.4) + ("rust-ignore" ,rust-ignore-0.4) ("rust-log" ,rust-log-0.4) + ("rust-num-format" ,rust-num-format-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1) - ("rust-serde-cbor" ,rust-serde-cbor-0.10) - ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-cbor" ,rust-serde-cbor-0.11) + ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-tera" ,rust-tera-1) ("rust-term-size" ,rust-term-size-0.3) ("rust-toml" ,rust-toml-0.5)) #:cargo-development-inputs - (("rust-git2" ,rust-git2-0.11) - ("rust-handlebars" ,rust-handlebars-2.0) - ("rust-ignore" ,rust-ignore-0.4) - ("rust-lazy-static" ,rust-lazy-static-1) + (("rust-git2" ,rust-git2-0.13) ("rust-regex" ,rust-regex-1) - ("rust-serde-json" ,rust-serde-json-1) ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 486e79790e59fecd5b4625395f20c995e9b8ab71 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 Jan 2021 23:06:09 +0100 Subject: gnu: tokei: Remove duplicate Cargo inputs. * gnu/packages/rust-apps.scm (tokei)[arguments]: Remove duplicates Cargo inputs. --- gnu/packages/rust-apps.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index eac55ae3e0..e7a0c4fab2 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -597,7 +597,6 @@ of support files.") ("rust-grep-searcher" ,rust-grep-searcher-0.1) ("rust-hex" ,rust-hex-0.4) ("rust-ignore" ,rust-ignore-0.4) - ("rust-ignore" ,rust-ignore-0.4) ("rust-log" ,rust-log-0.4) ("rust-num-format" ,rust-num-format-0.4) ("rust-once-cell" ,rust-once-cell-1) @@ -607,7 +606,6 @@ of support files.") ("rust-serde" ,rust-serde-1) ("rust-serde-cbor" ,rust-serde-cbor-0.11) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-tera" ,rust-tera-1) ("rust-term-size" ,rust-term-size-0.3) -- cgit v1.2.3 From 880e6334b7aeda04ad8572f9c68a9055de15aeb8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 Jan 2021 23:59:25 +0100 Subject: gnu: rust-dirs-2: Drop minor version from name. * gnu/packages/crates-io.scm (rust-dirs-2): Drop minor version from name. (rust-dirs-1.0): (rust-term-0.6): * gnu/packages/rust-apps.scm (fd): * gnu/packages/sequoia.scm (sequoia): * gnu/packages/web.scm (castor): Apply renaming. --- gnu/packages/crates-io.scm | 6 +++--- gnu/packages/rust-apps.scm | 2 +- gnu/packages/sequoia.scm | 2 +- gnu/packages/web.scm | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/rust-apps.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 130180b4bc..36ebbe692c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9558,7 +9558,7 @@ Directory guidelines on macOS.") standard locations of directories for config, cache and other data.") (license (list license:expat license:asl2.0)))) -(define-public rust-dirs-2.0 +(define-public rust-dirs-2 (package (inherit rust-dirs-3) (name "rust-dirs") @@ -9577,7 +9577,7 @@ standard locations of directories for config, cache and other data.") (define-public rust-dirs-1.0 (package - (inherit rust-dirs-2.0) + (inherit rust-dirs-2) (name "rust-dirs") (version "1.0.5") (source @@ -35219,7 +35219,7 @@ template language.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-dirs" ,rust-dirs-2.0) + (("rust-dirs" ,rust-dirs-2) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/Stebalien/term") (synopsis "Terminal formatting library") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e7a0c4fab2..59f73eb90d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -248,7 +248,7 @@ also knows about symlinks, extended attributes, and Git.") ("rust-atty" ,rust-atty-0.2) ("rust-clap" ,rust-clap-2) ("rust-ctrlc" ,rust-ctrlc-3.1) - ("rust-dirs" ,rust-dirs-2.0) + ("rust-dirs" ,rust-dirs-2) ("rust-globset" ,rust-globset-0.4) ("rust-humantime" ,rust-humantime-2) ("rust-ignore" ,rust-ignore-0.4) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index ce3396a7c4..bd8c6248d9 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -83,7 +83,7 @@ ("rust-colored" ,rust-colored-1.9.1) ("rust-crossterm" ,rust-crossterm-0.13) ("rust-ctor" ,rust-ctor-0.1) - ("rust-dirs" ,rust-dirs-2.0) + ("rust-dirs" ,rust-dirs-2) ("rust-dyn-clone" ,rust-dyn-clone-1) ("rust-ed25519-dalek" ,rust-ed25519-dalek-1) ("rust-eax" ,rust-eax-0.3) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1fe393c14b..8797411661 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019, 2020 Nicolas Goaziou +;;; Copyright © 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel @@ -6521,7 +6521,7 @@ collection creation and deletion, and locking operations.") (arguments `(#:cargo-inputs (("rust-ansi-parser" ,rust-ansi-parser-0.6) - ("rust-dirs" ,rust-dirs-2.0) + ("rust-dirs" ,rust-dirs-2) ("rust-gdk" ,rust-gdk-0.13) ("rust-gtk" ,rust-gtk-0.8) ("rust-linkify" ,rust-linkify-0.4) -- cgit v1.2.3 From 0f27a97c698fb943dd022661de80d44bd77f60ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 Jan 2021 00:01:29 +0100 Subject: gnu: rust-embed-resource-1: Drop minor version from name. * gnu/packages/crates-io.scm (rust-embed-resource-1): Drop minor version from name. * gnu/packages/rust-apps.scm (watchexec): Apply renaming. --- 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 36ebbe692c..978448ebd1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10291,7 +10291,7 @@ signing, and verification in pure Rust.") @code{Right} is a general purpose sum type with two cases.") (license (list license:expat license:asl2.0)))) -(define-public rust-embed-resource-1.3 +(define-public rust-embed-resource-1 (package (name "rust-embed-resource") (version "1.3.3") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 59f73eb90d..2f27f94222 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -654,7 +654,7 @@ blanks grouped by language.") (install-file "README.md" doc) #t)))) #:cargo-inputs - (("rust-embed-resource" ,rust-embed-resource-1.3) + (("rust-embed-resource" ,rust-embed-resource-1) ("rust-derive-builder" ,rust-derive-builder-0.9) ("rust-env-logger" ,rust-env-logger-0.7) ("rust-glob" ,rust-glob-0.3) -- cgit v1.2.3