diff --git a/gnu/packages/crates-vcs.scm b/gnu/packages/crates-vcs.scm index c7c45c8603..2634ae0152 100644 --- a/gnu/packages/crates-vcs.scm +++ b/gnu/packages/crates-vcs.scm @@ -38,6 +38,7 @@ (define-module (gnu packages crates-vcs) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-web) #:use-module (gnu packages crates-windows) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages llvm) #:use-module (gnu packages nettle) @@ -7332,51 +7333,73 @@ (define-public rust-libgit2-sys-0.8 (snippet '(begin (delete-file-recursively "libgit2") #t)))))) -;; Keep this package for future packaging of pijul. -(define-public rust-libpijul-0.12 +(define-public rust-libpijul-1 (package (name "rust-libpijul") - (version "0.12.2") + (version "1.0.0-beta.10") (source (origin (method url-fetch) (uri (crate-uri "libpijul" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "18d9n8xaq5ncq3375f0xrr96l8si1frczgzdlrz3fl1jby8vbl6f")))) + (base32 "0yjii3hh8s7cvp5aihngh49266iz9h5bwlfrcyd1dglinyv0f213")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; TODO: Fix build - #:tests? #f ; backend::file_header::test_fileheader_alignment fails - #:cargo-inputs - (("rust-base64" ,rust-base64-0.10) - ("rust-bincode" ,rust-bincode-1) - ("rust-bitflags" ,rust-bitflags-1) - ("rust-bs58" ,rust-bs58-0.2) - ("rust-byteorder" ,rust-byteorder-1) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-diffs" ,rust-diffs-0.3) - ("rust-failure" ,rust-failure-0.1) - ("rust-flate2" ,rust-flate2-1) - ("rust-hex" ,rust-hex-0.3) - ("rust-ignore" ,rust-ignore-0.4) - ("rust-log" ,rust-log-0.4) - ("rust-openssl" ,rust-openssl-0.10) - ("rust-rand" ,rust-rand-0.6) - ("rust-sanakirja" ,rust-sanakirja-0.10) - ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-0.9) - ("rust-serde" ,rust-serde-1) - ("rust-serde-derive" ,rust-serde-derive-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-tempdir" ,rust-tempdir-0.3) - ("rust-toml" ,rust-toml-0.4)))) - (native-inputs - (list pkg-config)) - (inputs - (list clang nettle openssl)) - (home-page "https://pijul.org/") + `(#:tests? #f ; file not found for module `rollback` + #:cargo-inputs (("rust-adler32" ,rust-adler32-1) + ("rust-aes" ,rust-aes-0.7) + ("rust-bincode" ,rust-bincode-1) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-blake3" ,rust-blake3-1) + ("rust-bs58" ,rust-bs58-0.4) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-canonical-path" ,rust-canonical-path-2) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-chardetng" ,rust-chardetng-0.1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) + ("rust-curve25519-dalek" ,rust-curve25519-dalek-3) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-diffs" ,rust-diffs-0.5) + ("rust-ed25519-dalek" ,rust-ed25519-dalek-1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-flate2" ,rust-flate2-1) + ("rust-generic-array" ,rust-generic-array-0.14) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-hmac" ,rust-hmac-0.11) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-lru-cache" ,rust-lru-cache-0.1) + ("rust-memchr" ,rust-memchr-2) + ("rust-nom" ,rust-nom-7) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-path-slash" ,rust-path-slash-0.1) + ("rust-pbkdf2" ,rust-pbkdf2-0.9) + ("rust-pijul-macros" ,rust-pijul-macros-0.5) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-sanakirja" ,rust-sanakirja-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-tar" ,rust-tar-0.4) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-toml" ,rust-toml-0.5) + ("rust-twox-hash" ,rust-twox-hash-1) + ("rust-zstd-seekable" ,rust-zstd-seekable-0.1)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-detone" ,rust-detone-1) + ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-chacha" ,rust-rand-chacha-0.3)))) + (home-page "https://nest.pijul.com/pijul/libpijul") (synopsis "Library component of the pijul version control system") (description "This crate contains the core API to access Pijul repositories.