gnu: rust-rustix-0.38: Update to 0.38.40.

* gnu/packages/crates-io.scm (rust-rustix-0.38): Update to 0.38.40.
[cargo-development-inputs]: Remove rust-ctor-0.2.
(rust-rustix-for-bcachefs-tools): Remove variable.
* gnu/packages/file-systems.scm (bcachefs-tools-minimal)[cargo-inputs]:
Replace rust-rustix-for-bcachefs-tools with rust-rustix-0.38.

Change-Id: Icf15985e558f096be53632833d8c9cd4512befc7

2 files changed, 3 insertions, 18 deletions

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 923f15c721..2749413531 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68439,14 +68439,14 @@ rustc compiler.")
 (define-public rust-rustix-0.38
   (package
     (name "rust-rustix")
-    (version "0.38.31") ;XXX drop rust-rustix-for-bcachefs-tools when updating
+    (version "0.38.40")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rustix" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0jg9yj3i6qnzk1y82hng7rb1bwhslfbh57507dxcs9mgcakf38vf"))
+        (base32 "1h33ilqk4psn6kqfmd232df3x3lrwp4gjl2nisdmajyw3hzfmr4r"))
        (snippet
         #~(begin (use-modules (guix build utils))
                  (for-each delete-file (find-files "." "\\.a$"))
@@ -68478,7 +68478,6 @@ rustc compiler.")
         ("rust-windows-sys" ,rust-windows-sys-0.52))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.4)
-        ("rust-ctor" ,rust-ctor-0.2)
         ("rust-errno" ,rust-errno-0.3)
         ("rust-flate2" ,rust-flate2-1)
         ("rust-libc" ,rust-libc-0.2)
@@ -68493,20 +68492,6 @@ rustc compiler.")
     ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat.
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-rustix-for-bcachefs-tools
-  ;; The package above is too old; too many dependents to update it directly.
-  (package
-    (inherit rust-rustix-0.38)
-    (name (package-name rust-rustix-0.38))
-    (version "0.38.34")
-    (source
-     (origin
-       (inherit (package-source rust-rustix-0.38))
-       (uri (crate-uri "rustix" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "03vkqa2ism7q56rkifyy8mns0wwqrk70f4i4fd53r97p8b05xp3h"))))))
-
 (define-public rust-rustix-0.37
   (package
     (inherit rust-rustix-0.38)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index e36751e774..46febebb0d 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -664,7 +664,7 @@ from a mounted file system.")
         ("rust-log" ,rust-log-0.4)
         ("rust-memoffset" ,rust-memoffset-0.8)
         ("rust-owo-colors" ,rust-owo-colors-4)
-        ("rust-rustix" ,rust-rustix-for-bcachefs-tools)
+        ("rust-rustix" ,rust-rustix-0.38)
         ("rust-strum" ,rust-strum-0.26)
         ("rust-strum-macros" ,rust-strum-macros-0.26)
         ("rust-udev" ,rust-udev-0.7)