diff options
| -rw-r--r-- | gnu/packages/c2rust.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/crates-io.scm | 38 |
2 files changed, 13 insertions, 27 deletions
diff --git a/gnu/packages/c2rust.scm b/gnu/packages/c2rust.scm index 1b249716e7..38fe829d44 100644 --- a/gnu/packages/c2rust.scm +++ b/gnu/packages/c2rust.scm @@ -191,7 +191,7 @@ #:skip-build? #f #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.65) ("rust-c2rust-build-paths" ,rust-c2rust-build-paths-0.18) - ("rust-clang-sys" ,rust-clang-sys-1.8) + ("rust-clang-sys" ,rust-clang-sys-1) ("rust-cmake" ,rust-cmake-0.1) ("rust-env-logger" ,rust-env-logger-0.10) ("rust-libc" ,rust-libc-0.2) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dbc83c77cd..ee39cce732 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13959,15 +13959,20 @@ interoperation between crates in Rust.") (define-public rust-clang-sys-1 (package (name "rust-clang-sys") - (version "1.0.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (crate-uri "clang-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0695kfrqx7n091fzm6msbqg2q2kyhka64q08lm63f3l9d964i8cx")))) + (base32 "1x1r9yqss76z8xwpdanw313ss6fniwc1r7dzb5ycjn0ph53kj0hb")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + (("version = \">=([[:digit:]]+(\\.[[:digit:]]+)*), <.*\"" _ version) + (string-append "version = \"^" version "\""))))))) (build-system cargo-build-system) (inputs (list clang)) @@ -13975,29 +13980,10 @@ interoperation between crates in Rust.") `(#:cargo-inputs (("rust-glob" ,rust-glob-0.3) ("rust-libc" ,rust-libc-0.2) - ("rust-libloading" ,rust-libloading-0.6)))) - (home-page "https://github.com/KyleMayes/clang-sys") - (synopsis "Rust bindings for libclang") - (description "This package provides Rust bindings for libclang.") - (license license:asl2.0))) - -(define-public rust-clang-sys-1.8 - (package - (name "rust-clang-sys") - (version "1.8.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "clang-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1x1r9yqss76z8xwpdanw313ss6fniwc1r7dzb5ycjn0ph53kj0hb")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-glob" ,rust-glob-0.3) - ("rust-libc" ,rust-libc-0.2) - ("rust-libloading" ,rust-libloading-0.8)))) + ("rust-libloading" ,rust-libloading-0.8)) + #:cargo-development-inputs (("rust-glob" ,rust-glob-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/KyleMayes/clang-sys") (synopsis "Rust bindings for libclang") (description "This package provides Rust bindings for libclang.") |