From 17655b127670e8368cfc8c1bc808646e5d83d524 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 25 Dec 2024 19:57:44 +0200
Subject: [PATCH] gnu: rust-clang-sys-1: Update to 1.8.1.

* gnu/packages/crates-io.scm (rust-clang-sys-1): Update to 1.8.1.
[source]: Add snippet to allow for newer versions of dependencies.
[cargo-inputs]: Replace rust-libloading-0.6 with 0.8.
[cargo-development-inputs]: Add rust-lazy-static-1, rust-tempfile-3.
(rust-clang-sys-1.8): Remove variable.
* gnu/packages/c2rust.scm (rust-c2rust-ast-exporter-0.18): Adjust
accordingly.

Change-Id: I4888b70305775625bd128fb067435be01d7dc85c
---
 gnu/packages/c2rust.scm    |  2 +-
 gnu/packages/crates-io.scm | 46 +++++++++++++-------------------------
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/c2rust.scm b/gnu/packages/c2rust.scm
index 1b249716e73..38fe829d440 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 dbc83c77cd0..ee39cce7321 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13957,31 +13957,6 @@ interoperation between crates in Rust.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-clang-sys-1
-  (package
-    (name "rust-clang-sys")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "clang-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0695kfrqx7n091fzm6msbqg2q2kyhka64q08lm63f3l9d964i8cx"))))
-    (build-system cargo-build-system)
-    (inputs
-     (list clang))
-    (arguments
-     `(#: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")
@@ -13991,13 +13966,24 @@ interoperation between crates in Rust.")
        (uri (crate-uri "clang-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1x1r9yqss76z8xwpdanw313ss6fniwc1r7dzb5ycjn0ph53kj0hb"))))
+        (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))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-glob" ,rust-glob-0.3)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-libloading" ,rust-libloading-0.8))))
+     `(#:cargo-inputs
+       (("rust-glob" ,rust-glob-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("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.")