From 6a56702df71ffebf9fceeef140876dd490974112 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 14:21:00 +0200
Subject: gnu: rust-block: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-block-0.1, rust-block2-0.3,
rust-block2-0.2, rust-block-sys-0.2, rust-block-sys-0.1): Move from
here ...
* gnu/packages/crates-apple.scm: ... to here.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register new file.

Change-Id: I278dfdb829340fba937d29691b1451401675c87b
---
 gnu/packages/crates-apple.scm | 128 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 gnu/packages/crates-apple.scm

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
new file mode 100644
index 0000000000..c2275334e1
--- /dev/null
+++ b/gnu/packages/crates-apple.scm
@@ -0,0 +1,128 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
+;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages crates-apple)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages crates-io))
+
+(define-public rust-block-0.1
+  (package
+    (name "rust-block")
+    (version "0.1.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "block" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "16k9jgll25pzsq14f244q22cdv0zb4bqacldg3kx6h89d7piz30d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-development-inputs
+       (("rust-objc-test-utils" ,rust-objc-test-utils-0.0))))
+    (home-page "https://github.com/SSheldon/rust-block")
+    (synopsis "Rust interface for Apple's C language extension of blocks")
+    (description "This package provides a rust interface for Apple's C language
+extension of blocks.")
+    (license license:expat)))
+
+(define-public rust-block2-0.3
+  (package
+    (name "rust-block2")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "block2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s2ywcis2xf9444vmdgzr7ankrrkpchn8zimaw950cszm1imdd8m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; link kind `framework` is only supported on Apple targets
+       #:cargo-inputs (("rust-block-sys" ,rust-block-sys-0.2)
+                       ("rust-objc2" ,rust-objc2-0.4))))
+    (home-page "https://github.com/madsmtm/objc2")
+    (synopsis "Apple's C language extension of blocks")
+    (description "This package contains Apple's C language extension of blocks.")
+    (license license:expat)))
+
+(define-public rust-block2-0.2
+  (package
+    (inherit rust-block2-0.3)
+    (name "rust-block2")
+    (version "0.2.0-alpha.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "block2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hpcdl81rmwvhfni9413hrg1wd4xwf6vhch3yv15bxs42wyfdncd"))))
+    (arguments
+     `(#:tests? #f  ; Tests require gcc-objc.
+       #:cargo-inputs
+       (("rust-block-sys" ,rust-block-sys-0.1)
+        ("rust-objc2-encode" ,rust-objc2-encode-2))))))
+
+(define-public rust-block-sys-0.2
+  (package
+    (name "rust-block-sys")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "block-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14pddxc4rma833prvlbh5a22q6qwx32hhz7aqmnw1p9cj58czmrd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Needs to bind to MacOS libraries.
+       #:cargo-inputs (("rust-objc-sys" ,rust-objc-sys-0.3))))
+    (home-page "https://github.com/madsmtm/objc2")
+    (synopsis "Raw bindings to Apple's C language extension of blocks")
+    (description "This package contains raw bindings to Apple's C language
+extension of blocks.")
+    (license license:expat)))
+
+(define-public rust-block-sys-0.1
+  (package
+    (inherit rust-block-sys-0.2)
+    (name "rust-block-sys")
+    (version "0.1.0-beta.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "block-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ihiar08hk0das4q0ii1gsmql975z3rslli1h13jb44hxr0mg98g"))))
+    (arguments
+     `(#:tests? #f  ; Tests require gcc-objc.
+       #:cargo-inputs
+       (("rust-objc-sys" ,rust-objc-sys-0.2))))))
-- 
cgit v1.2.3


From 81d9082a0d5b2001e23d50d59e466d51887c2ba5 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 18:53:25 +0200
Subject: gnu: rust-coreaudio: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-coreaudio-rs-0.10,
rust-coreaudio-sys-0.2): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I3c9dec888f543cc63152d2a51f8699cc072a05f5
---
 gnu/packages/crates-apple.scm | 45 +++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 44 ------------------------------------------
 2 files changed, 45 insertions(+), 44 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index c2275334e1..5f27975cae 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -126,3 +127,47 @@ extension of blocks.")
      `(#:tests? #f  ; Tests require gcc-objc.
        #:cargo-inputs
        (("rust-objc-sys" ,rust-objc-sys-0.2))))))
+
+(define-public rust-coreaudio-rs-0.10
+  (package
+    (name "rust-coreaudio-rs")
+    (version "0.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "coreaudio-rs" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "125d4zr3n363ybga4629p41ym7iqjfb2alnwrc1zj7zyxch4p28i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; Only builds for macos or ios.
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-coreaudio-sys" ,rust-coreaudio-sys-0.2))))
+    (home-page "https://github.com/RustAudio/coreaudio-rs")
+    (synopsis "Rust interface for Apple's CoreAudio API")
+    (description
+     "This package provides a rust interface for Apple's CoreAudio API.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-coreaudio-sys-0.2
+  (package
+    (name "rust-coreaudio-sys")
+    (version "0.2.12")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "coreaudio-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "091b4sq3kl8n4dy86l4mxq9vjzsn8w8b51xzfcpxwjkciqjv4d7h"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; Only builds for macos or ios.
+       #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.64))))
+    (home-page "https://github.com/RustAudio/coreaudio-sys")
+    (synopsis
+     "Bindings for Apple's CoreAudio frameworks generated via rust-bindgen")
+    (description
+     "Bindings for Apple's CoreAudio frameworks generated via rust-bindgen.")
+    (license license:expat)))
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6e2f5ff2e0..ff0586f627 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14550,50 +14550,6 @@ contents of the OS-level clipboard.")
 numbers using the CORDIC method.")
     (license license:bsd-3)))
 
-(define-public rust-coreaudio-rs-0.10
-  (package
-    (name "rust-coreaudio-rs")
-    (version "0.10.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "coreaudio-rs" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "125d4zr3n363ybga4629p41ym7iqjfb2alnwrc1zj7zyxch4p28i"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t ; Only builds for macos or ios.
-       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
-                       ("rust-coreaudio-sys" ,rust-coreaudio-sys-0.2))))
-    (home-page "https://github.com/RustAudio/coreaudio-rs")
-    (synopsis "Rust interface for Apple's CoreAudio API")
-    (description
-     "This package provides a rust interface for Apple's CoreAudio API.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-coreaudio-sys-0.2
-  (package
-    (name "rust-coreaudio-sys")
-    (version "0.2.12")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "coreaudio-sys" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "091b4sq3kl8n4dy86l4mxq9vjzsn8w8b51xzfcpxwjkciqjv4d7h"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t ; Only builds for macos or ios.
-       #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.64))))
-    (home-page "https://github.com/RustAudio/coreaudio-sys")
-    (synopsis
-     "Bindings for Apple's CoreAudio frameworks generated via rust-bindgen")
-    (description
-     "Bindings for Apple's CoreAudio frameworks generated via rust-bindgen.")
-    (license license:expat)))
-
 (define-public rust-core-extensions-1
   (package
     (name "rust-core-extensions")
-- 
cgit v1.2.3


From 0d66aa4a9d6b5f89c1edc28bd3706069b44eb631 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:23:59 +0200
Subject: gnu: rust-core-foundation: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-core-foundation-0.9,
rust-core-foundation-0.7, rust-core-foundation-0.6,
rust-core-foundation-0.2, rust-core-foundation-sys-0.8,
rust-core-foundation-sys-0.7, rust-core-foundation-sys-0.6,
rust-core-foundation-sys-0.2): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I01b1ab7a3bef25d33ea3bd0edc33398acad882e8
---
 gnu/packages/crates-apple.scm    | 153 ++++++++++++++++++++++++++++++++++++++-
 gnu/packages/crates-graphics.scm |   1 +
 gnu/packages/crates-io.scm       | 148 -------------------------------------
 3 files changed, 153 insertions(+), 149 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 5f27975cae..9cec1826ed 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -1,6 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019, 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
-;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
+;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -171,3 +174,151 @@ extension of blocks.")
     (description
      "Bindings for Apple's CoreAudio frameworks generated via rust-bindgen.")
     (license license:expat)))
+
+(define-public rust-core-foundation-0.9
+  (package
+    (name "rust-core-foundation")
+    (version "0.9.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-foundation" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ii1ihpjb30fk38gdikm5wqlkmyr8k46fh4k2r8sagz5dng7ljhr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f             ;tests fail with a lot of "undefined reference"
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-uuid" ,rust-uuid-0.5))))
+    (home-page "https://github.com/servo/core-foundation-rs")
+    (synopsis "Bindings to Core Foundation for macOS")
+    (description "This package provides bindings to Core Foundation for macOS.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-core-foundation-0.7
+  (package
+    (inherit rust-core-foundation-0.9)
+    (name "rust-core-foundation")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-foundation" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0wbias8f0m5kyn2pcksi0h58fdslams6nmf16w78fgn42dx4rljp"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-uuid" ,rust-uuid-0.5))))))
+
+(define-public rust-core-foundation-0.6
+  (package
+    (inherit rust-core-foundation-0.7)
+    (name "rust-core-foundation")
+    (version "0.6.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-foundation" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0va97wf49c8dzm9c8pgyk1jn7z21rl0bj1syf2zz5m2z2hzy1f95"))))
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-uuid" ,rust-uuid-0.5))))))
+
+(define-public rust-core-foundation-0.2
+  (package
+    (inherit rust-core-foundation-0.6)
+    (name "rust-core-foundation")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-foundation" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0rvcn7ab5r69wvn7gby745jlpy8pirfywcdxbiypy083s93dggr5"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
+        ("rust-libc" ,rust-libc-0.2))))))
+
+(define-public rust-core-foundation-sys-0.8
+  (package
+    (name "rust-core-foundation-sys")
+    (version "0.8.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-foundation-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13w6sdf06r0hn7bx2b45zxsg1mm2phz34jikm6xc5qrbr6djpsh6"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/servo/core-foundation-rs")
+    (synopsis "Bindings to Core Foundation for macOS")
+    (description "This package provides bindings to Core Foundation for macOS.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-core-foundation-sys-0.7
+  (package
+    (inherit rust-core-foundation-sys-0.8)
+    (name "rust-core-foundation-sys")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-foundation-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1b5qfnnmg49sawwfsb0c0wbj81bqi7h7lh68pmhbidf0jjs1m9xk"))))))
+
+(define-public rust-core-foundation-sys-0.6
+  (package
+    (inherit rust-core-foundation-sys-0.7)
+    (name "rust-core-foundation-sys")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-foundation-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7"))))))
+
+(define-public rust-core-foundation-sys-0.2
+  (package
+    (inherit rust-core-foundation-sys-0.6)
+    (name "rust-core-foundation-sys")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-foundation-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "13f7f3kblyj6yxcxm74yg84vj9ahaprlc1vgblagmj6bzmzmsnh6"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2))))))
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 9f65d9e2ba..b5247bde89 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -38,6 +38,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages assembly)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crates-apple)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages fontutils)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ff0586f627..b0dbf6ca5a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14837,154 +14837,6 @@ in @code{no_std}.  Alloc support is optional.")
 intrinsics.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-core-foundation-0.9
-  (package
-    (name "rust-core-foundation")
-    (version "0.9.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-foundation" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0ii1ihpjb30fk38gdikm5wqlkmyr8k46fh4k2r8sagz5dng7ljhr"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f             ;tests fail with a lot of "undefined reference"
-       #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-uuid" ,rust-uuid-0.5))))
-    (home-page "https://github.com/servo/core-foundation-rs")
-    (synopsis "Bindings to Core Foundation for macOS")
-    (description "This package provides bindings to Core Foundation for macOS.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-core-foundation-0.7
-  (package
-    (inherit rust-core-foundation-0.9)
-    (name "rust-core-foundation")
-    (version "0.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-foundation" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0wbias8f0m5kyn2pcksi0h58fdslams6nmf16w78fgn42dx4rljp"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-uuid" ,rust-uuid-0.5))))))
-
-(define-public rust-core-foundation-0.6
-  (package
-    (inherit rust-core-foundation-0.7)
-    (name "rust-core-foundation")
-    (version "0.6.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-foundation" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0va97wf49c8dzm9c8pgyk1jn7z21rl0bj1syf2zz5m2z2hzy1f95"))))
-    (arguments
-     `(#:tests? #f
-       #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-uuid" ,rust-uuid-0.5))))))
-
-(define-public rust-core-foundation-0.2
-  (package
-    (inherit rust-core-foundation-0.6)
-    (name "rust-core-foundation")
-    (version "0.2.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-foundation" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0rvcn7ab5r69wvn7gby745jlpy8pirfywcdxbiypy083s93dggr5"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
-        ("rust-libc" ,rust-libc-0.2))))))
-
-(define-public rust-core-foundation-sys-0.8
-  (package
-    (name "rust-core-foundation-sys")
-    (version "0.8.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-foundation-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "13w6sdf06r0hn7bx2b45zxsg1mm2phz34jikm6xc5qrbr6djpsh6"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/servo/core-foundation-rs")
-    (synopsis "Bindings to Core Foundation for macOS")
-    (description "This package provides bindings to Core Foundation for macOS.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-core-foundation-sys-0.7
-  (package
-    (inherit rust-core-foundation-sys-0.8)
-    (name "rust-core-foundation-sys")
-    (version "0.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-foundation-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1b5qfnnmg49sawwfsb0c0wbj81bqi7h7lh68pmhbidf0jjs1m9xk"))))))
-
-(define-public rust-core-foundation-sys-0.6
-  (package
-    (inherit rust-core-foundation-sys-0.7)
-    (name "rust-core-foundation-sys")
-    (version "0.6.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-foundation-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7"))))))
-
-(define-public rust-core-foundation-sys-0.2
-  (package
-    (inherit rust-core-foundation-sys-0.6)
-    (name "rust-core-foundation-sys")
-    (version "0.2.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-foundation-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "13f7f3kblyj6yxcxm74yg84vj9ahaprlc1vgblagmj6bzmzmsnh6"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2))))))
-
 (define-public rust-core-text-20
   (package
     (name "rust-core-text")
-- 
cgit v1.2.3


From ba40456e864fcfabdc33be0325503b073603fe9c Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:27:06 +0200
Subject: gnu: rust-core-text: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-core-text-20, rust-core-text-19):
Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: Idbad69dd6e1bcbff80e6cb3ce699120edb5fa25c
---
 gnu/packages/crates-apple.scm | 45 ++++++++++++++++++++++++++++++++++++++++++-
 gnu/packages/crates-io.scm    | 43 -----------------------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 9cec1826ed..7e4d1ee543 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019, 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
-;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
@@ -322,3 +322,46 @@ extension of blocks.")
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-libc" ,rust-libc-0.2))))))
+
+(define-public rust-core-text-20
+  (package
+    (name "rust-core-text")
+    (version "20.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-text" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mffma8w0ic11ydv6zclamw4dslzmsych1fwz14msih8bh5pkln9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; link kind `framework` is only supported on Apple targets
+       #:cargo-inputs (("rust-core-foundation" ,rust-core-foundation-0.9)
+                       ("rust-core-graphics" ,rust-core-graphics-0.23)
+                       ("rust-foreign-types" ,rust-foreign-types-0.5)
+                       ("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/servo/core-foundation-rs")
+    (synopsis "Bindings to the Core Text framework")
+    (description "This package provides bindings to the Core Text framework.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-core-text-19
+  (package
+    (inherit rust-core-text-20)
+    (name "rust-core-text")
+    (version "19.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "core-text" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q1sr55v8zq82y0dwnwwksz1radh515i0a45nbsda3w2idpg9iyj"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-core-graphics" ,rust-core-graphics-0.22)
+        ("rust-foreign-types" ,rust-foreign-types-0.3)
+        ("rust-libc" ,rust-libc-0.2))))))
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b0dbf6ca5a..b1235909ab 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14837,49 +14837,6 @@ in @code{no_std}.  Alloc support is optional.")
 intrinsics.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-core-text-20
-  (package
-    (name "rust-core-text")
-    (version "20.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-text" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1mffma8w0ic11ydv6zclamw4dslzmsych1fwz14msih8bh5pkln9"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t ; link kind `framework` is only supported on Apple targets
-       #:cargo-inputs (("rust-core-foundation" ,rust-core-foundation-0.9)
-                       ("rust-core-graphics" ,rust-core-graphics-0.23)
-                       ("rust-foreign-types" ,rust-foreign-types-0.5)
-                       ("rust-libc" ,rust-libc-0.2))))
-    (home-page "https://github.com/servo/core-foundation-rs")
-    (synopsis "Bindings to the Core Text framework")
-    (description "This package provides bindings to the Core Text framework.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-core-text-19
-  (package
-    (inherit rust-core-text-20)
-    (name "rust-core-text")
-    (version "19.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "core-text" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0q1sr55v8zq82y0dwnwwksz1radh515i0a45nbsda3w2idpg9iyj"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-core-foundation" ,rust-core-foundation-0.9)
-        ("rust-core-graphics" ,rust-core-graphics-0.22)
-        ("rust-foreign-types" ,rust-foreign-types-0.3)
-        ("rust-libc" ,rust-libc-0.2))))))
-
 (define-public rust-cov-mark-2
   (package
     (name "rust-cov-mark")
-- 
cgit v1.2.3


From 7a6e7b0e65be8f35099a7881120d6a60d918f5ca Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:28:25 +0200
Subject: gnu: rust-dispatch: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-dispatch-0.2, rust-dispatch-0.1):
Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: Ia7452e335031b66d14359f2ef9236fd210685506
---
 gnu/packages/crates-apple.scm | 35 +++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 35 -----------------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 7e4d1ee543..c9032bfac2 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -365,3 +365,38 @@ extension of blocks.")
         ("rust-core-graphics" ,rust-core-graphics-0.22)
         ("rust-foreign-types" ,rust-foreign-types-0.3)
         ("rust-libc" ,rust-libc-0.2))))))
+
+(define-public rust-dispatch-0.2
+  (package
+    (name "rust-dispatch")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dispatch" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0fwjr9b7582ic5689zxj8lf7zl94iklhlns3yivrnv8c9fxr635x"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://github.com/SSheldon/rust-dispatch")
+    (synopsis "Rust wrapper for Apple's Grand Central Dispatch")
+    (description "This package provides a Rust wrapper for Apple's Grand
+Central Dispatch.")
+    (license license:expat)))
+
+(define-public rust-dispatch-0.1
+  (package
+    (inherit rust-dispatch-0.2)
+    (name "rust-dispatch")
+    (version "0.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dispatch" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84"))))
+    (arguments '(#:tests? #f))))  ; Tests only run on Mac.
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b1235909ab..5ee6447498 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21099,41 +21099,6 @@ memory but not other memory.  This package provides a discard trait which allows
 for intentionally leaking memory")
     (license license:expat)))
 
-(define-public rust-dispatch-0.2
-  (package
-    (name "rust-dispatch")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "dispatch" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0fwjr9b7582ic5689zxj8lf7zl94iklhlns3yivrnv8c9fxr635x"))))
-    (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://github.com/SSheldon/rust-dispatch")
-    (synopsis "Rust wrapper for Apple's Grand Central Dispatch")
-    (description "This package provides a Rust wrapper for Apple's Grand
-Central Dispatch.")
-    (license license:expat)))
-
-(define-public rust-dispatch-0.1
-  (package
-    (inherit rust-dispatch-0.2)
-    (name "rust-dispatch")
-    (version "0.1.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "dispatch" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84"))))
-    (arguments '(#:tests? #f))))  ; Tests only run on Mac.
-
 (define-public rust-displaydoc-0.2
   (package
     (name "rust-displaydoc")
-- 
cgit v1.2.3


From 8278eff1dabc88b81d79327e604018be2d7b4399 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:30:30 +0200
Subject: gnu: rust-objc: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-objc-0.2, rust-objc-exception-0.1,
rust-objc-foundation-0.1, rust-objc-id-0.1, rust-objc-sys-0.3,
rust-objc-sys-0.2, rust-objc-test-utils-0.0, rust-objc2-0.4,
rust-objc2-0.3, rust-objc2-encode-3, rust-objc2-encode-2,
rust-objc2-proc-macros-0.1): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I7dedf9dd15aa36a6fd11c2e444499d87ef506107
---
 gnu/packages/crates-apple.scm | 261 ++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 261 ------------------------------------------
 gnu/packages/terminals.scm    |   1 +
 3 files changed, 262 insertions(+), 261 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index c9032bfac2..2749fb9971 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -400,3 +400,264 @@ Central Dispatch.")
         (base32
          "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84"))))
     (arguments '(#:tests? #f))))  ; Tests only run on Mac.
+
+(define-public rust-objc-0.2
+  (package
+    (name "rust-objc")
+    (version "0.2.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "objc" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1cbpf6kz8a244nn1qzl3xyhmp05gsg4n313c9m3567625d3innwi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Tests require gcc-objc.
+       #:cargo-inputs
+       (("rust-malloc-buf" ,rust-malloc-buf-0.0)
+        ("rust-objc-exception" ,rust-objc-exception-0.1))))
+    (home-page "https://github.com/SSheldon/rust-objc")
+    (synopsis "Objective-C Runtime bindings and wrapper for Rust")
+    (description "This package provides an Objective-C Runtime bindings and
+wrapper for Rust.")
+    (license license:expat)))
+
+(define-public rust-objc-exception-0.1
+  (package
+    (name "rust-objc-exception")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "objc_exception" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "191cmdmlypp6piw67y4m8y5swlxf5w0ss8n1lk5xd2l1ans0z5xd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-cc" ,rust-cc-1))))
+    (home-page "https://github.com/SSheldon/rust-objc-exception")
+    (synopsis "Rust interface for Objective-C's throw and try/catch statements")
+    (description
+     "This package provides a Rust interface for Objective-C's throw and
+try/catch statements.")
+    (license license:expat)))
+
+(define-public rust-objc-foundation-0.1
+  (package
+    (name "rust-objc-foundation")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "objc-foundation" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1y9bwb3m5fdq7w7i4bnds067dhm4qxv4m1mbg9y61j9nkrjipp8s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Only available on macOS.
+       #:cargo-inputs
+       (("rust-block" ,rust-block-0.1)
+        ("rust-objc" ,rust-objc-0.2)
+        ("rust-objc-id" ,rust-objc-id-0.1))))
+    (home-page "https://github.com/SSheldon/rust-objc-foundation")
+    (synopsis "Rust wrapper for Objective-C's Foundation framework")
+    (description "This package provides a rust wrapper for Objective-C's
+Foundation framework.")
+    (license license:expat)))
+
+(define-public rust-objc-id-0.1
+  (package
+    (name "rust-objc-id")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "objc_id" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0fq71hnp2sdblaighjc82yrac3adfmqzhpr11irhvdfp9gdlsbf9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Tests require gcc-objc.
+       #:cargo-inputs (("rust-objc" ,rust-objc-0.2))))
+    (home-page "https://github.com/SSheldon/rust-objc-id")
+    (synopsis "Rust smart pointers for Objective-C reference counting")
+    (description
+     "This package provides Rust smart pointers for Objective-C reference counting.")
+    (license license:expat)))
+
+(define-public rust-objc-sys-0.3
+  (package
+    (name "rust-objc-sys")
+    (version "0.3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "objc-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0nbl4p4dmajhm0ji1z09jrlrxhqs4jfkvj1zjschh38qwhj17iy7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t         ; Needs gcc-objc
+       #:cargo-inputs (("rust-cc" ,rust-cc-1))))
+    (home-page "https://github.com/madsmtm/objc2")
+    (synopsis "Raw bindings to the Objective-C runtime and ABI")
+    (description
+     "This package provides raw bindings to the Objective-C runtime and ABI.")
+    (license license:expat)))
+
+(define-public rust-objc-sys-0.2
+  (package
+    (inherit rust-objc-sys-0.3)
+    (name "rust-objc-sys")
+    (version "0.2.0-beta.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "objc-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1msm1bwv69k12ikxm71mi1ifrbx2bzsmk2w2bah98mp9q4s9hfyz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t         ; Needs gcc-objc
+       #:cargo-inputs (("rust-cc" ,rust-cc-1))))))
+
+(define-public rust-objc-test-utils-0.0
+  (package
+    (name "rust-objc-test-utils")
+    (version "0.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "objc_test_utils" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "09rckmp5h9bbns08xzicdlk7y5lxj2ygbg3yqk1cszfnzd5n8kzx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-gcc" ,rust-gcc-0.3))))
+    (home-page "https://github.com/SSheldon/rust-objc")
+    (synopsis "Utilities for testing Objective-C interop")
+    (description
+     "This package provides utilities for testing Objective-C interop.")
+    (license license:expat)))
+
+(define-public rust-objc2-0.4
+  (package
+    (name "rust-objc2")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "objc2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13gr3zqv8gzlylff5d4za91f50asb7vsrkpv8kiva3nkzm05m72m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; link kind `framework` is only supported on Apple targets
+       #:cargo-inputs (("rust-malloc-buf" ,rust-malloc-buf-1)
+                       ("rust-objc-sys" ,rust-objc-sys-0.3)
+                       ("rust-objc2-encode" ,rust-objc2-encode-3)
+                       ("rust-objc2-proc-macros" ,rust-objc2-proc-macros-0.1))
+       #:cargo-development-inputs
+       (("rust-iai" ,rust-iai-0.1)
+        ("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/madsmtm/objc2")
+    (synopsis
+     "Objective-C interface and bindings to the Cocoa Foundation framework")
+    (description "This package provides Objective-C interface and bindings to
+the Cocoa Foundation framework.")
+    (license license:expat)))
+
+(define-public rust-objc2-0.3
+  (package
+    (inherit rust-objc2-0.4)
+    (name "rust-objc2")
+    (version "0.3.0-beta.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "objc2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jfnrwmp6n2d6snlpcyfk9l41nhm50wj9h42b6hqj2rxbm1facgy"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-block2" ,rust-block2-0.2)            ; 0.2.0-alpha.6
+        ("rust-objc-sys" ,rust-objc-sys-0.2)        ; 0.2.0-beta.2
+        ("rust-objc2-encode" ,rust-objc2-encode-2)  ; 2.0.0-pre.2
+        ("rust-objc2-proc-macros" ,rust-objc2-proc-macros-0.1)
+        ("rust-uuid" ,rust-uuid-1))))))
+
+(define-public rust-objc2-encode-3
+  (package
+    (name "rust-objc2-encode")
+    (version "3.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "objc2-encode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rknhkcnyj4qv1pzqp5j8l80726phz8fcxpsbpz9nhmg6xdq8yfh"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/madsmtm/objc2")
+    (synopsis "Objective-C type-encoding representation and parsing")
+    (description "This package provides objective-C type-encoding
+representation and parsing.")
+    (license license:expat)))
+
+(define-public rust-objc2-encode-2
+  (package
+    (inherit rust-objc2-encode-3)
+    (name "rust-objc2-encode")
+    (version "2.0.0-pre.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "objc2-encode" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04h5wns3hxmc9g652hr9xqzrijs4ij9sdnlgc0ha202v050srz5b"))))
+    (arguments
+     `(#:tests? #f      ; Test suite wants gcc-objc
+       #:cargo-inputs (("rust-objc-sys" ,rust-objc-sys-0.2))))))
+
+(define-public rust-objc2-proc-macros-0.1
+  (package
+    (name "rust-objc2-proc-macros")
+    (version "0.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "objc2-proc-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07j3snswvj6532x32zgn4llc2xaf31rj4iw18n6dsrf2p0jvh1xr"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/madsmtm/objc2")
+    (synopsis "Procedural macros for the objc2 project")
+    (description "This package provides procedural macros for the objc2 project.")
+    (license license:expat)))
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5ee6447498..da322335c2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45331,267 +45331,6 @@ form and deobfuscated locally.")
      "This package provides a package for loading Wavefront @code{.obj} files.")
     (license license:asl2.0)))
 
-(define-public rust-objc-0.2
-  (package
-    (name "rust-objc")
-    (version "0.2.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "objc" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1cbpf6kz8a244nn1qzl3xyhmp05gsg4n313c9m3567625d3innwi"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f  ; Tests require gcc-objc.
-       #:cargo-inputs
-       (("rust-malloc-buf" ,rust-malloc-buf-0.0)
-        ("rust-objc-exception" ,rust-objc-exception-0.1))))
-    (home-page "https://github.com/SSheldon/rust-objc")
-    (synopsis "Objective-C Runtime bindings and wrapper for Rust")
-    (description "This package provides an Objective-C Runtime bindings and
-wrapper for Rust.")
-    (license license:expat)))
-
-(define-public rust-objc-exception-0.1
-  (package
-    (name "rust-objc-exception")
-    (version "0.1.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "objc_exception" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "191cmdmlypp6piw67y4m8y5swlxf5w0ss8n1lk5xd2l1ans0z5xd"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cc" ,rust-cc-1))))
-    (home-page "https://github.com/SSheldon/rust-objc-exception")
-    (synopsis "Rust interface for Objective-C's throw and try/catch statements")
-    (description
-     "This package provides a Rust interface for Objective-C's throw and
-try/catch statements.")
-    (license license:expat)))
-
-(define-public rust-objc-foundation-0.1
-  (package
-    (name "rust-objc-foundation")
-    (version "0.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "objc-foundation" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1y9bwb3m5fdq7w7i4bnds067dhm4qxv4m1mbg9y61j9nkrjipp8s"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t     ; Only available on macOS.
-       #:cargo-inputs
-       (("rust-block" ,rust-block-0.1)
-        ("rust-objc" ,rust-objc-0.2)
-        ("rust-objc-id" ,rust-objc-id-0.1))))
-    (home-page "https://github.com/SSheldon/rust-objc-foundation")
-    (synopsis "Rust wrapper for Objective-C's Foundation framework")
-    (description "This package provides a rust wrapper for Objective-C's
-Foundation framework.")
-    (license license:expat)))
-
-(define-public rust-objc-id-0.1
-  (package
-    (name "rust-objc-id")
-    (version "0.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "objc_id" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0fq71hnp2sdblaighjc82yrac3adfmqzhpr11irhvdfp9gdlsbf9"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f  ; Tests require gcc-objc.
-       #:cargo-inputs (("rust-objc" ,rust-objc-0.2))))
-    (home-page "https://github.com/SSheldon/rust-objc-id")
-    (synopsis "Rust smart pointers for Objective-C reference counting")
-    (description
-     "This package provides Rust smart pointers for Objective-C reference counting.")
-    (license license:expat)))
-
-(define-public rust-objc-sys-0.3
-  (package
-    (name "rust-objc-sys")
-    (version "0.3.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "objc-sys" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0nbl4p4dmajhm0ji1z09jrlrxhqs4jfkvj1zjschh38qwhj17iy7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t         ; Needs gcc-objc
-       #:cargo-inputs (("rust-cc" ,rust-cc-1))))
-    (home-page "https://github.com/madsmtm/objc2")
-    (synopsis "Raw bindings to the Objective-C runtime and ABI")
-    (description
-     "This package provides raw bindings to the Objective-C runtime and ABI.")
-    (license license:expat)))
-
-(define-public rust-objc-sys-0.2
-  (package
-    (inherit rust-objc-sys-0.3)
-    (name "rust-objc-sys")
-    (version "0.2.0-beta.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "objc-sys" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1msm1bwv69k12ikxm71mi1ifrbx2bzsmk2w2bah98mp9q4s9hfyz"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t         ; Needs gcc-objc
-       #:cargo-inputs (("rust-cc" ,rust-cc-1))))))
-
-(define-public rust-objc-test-utils-0.0
-  (package
-    (name "rust-objc-test-utils")
-    (version "0.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "objc_test_utils" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "09rckmp5h9bbns08xzicdlk7y5lxj2ygbg3yqk1cszfnzd5n8kzx"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-gcc" ,rust-gcc-0.3))))
-    (home-page "https://github.com/SSheldon/rust-objc")
-    (synopsis "Utilities for testing Objective-C interop")
-    (description
-     "This package provides utilities for testing Objective-C interop.")
-    (license license:expat)))
-
-(define-public rust-objc2-0.4
-  (package
-    (name "rust-objc2")
-    (version "0.4.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "objc2" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "13gr3zqv8gzlylff5d4za91f50asb7vsrkpv8kiva3nkzm05m72m"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t ; link kind `framework` is only supported on Apple targets
-       #:cargo-inputs (("rust-malloc-buf" ,rust-malloc-buf-1)
-                       ("rust-objc-sys" ,rust-objc-sys-0.3)
-                       ("rust-objc2-encode" ,rust-objc2-encode-3)
-                       ("rust-objc2-proc-macros" ,rust-objc2-proc-macros-0.1))
-       #:cargo-development-inputs
-       (("rust-iai" ,rust-iai-0.1)
-        ("rust-static-assertions" ,rust-static-assertions-1))))
-    (home-page "https://github.com/madsmtm/objc2")
-    (synopsis
-     "Objective-C interface and bindings to the Cocoa Foundation framework")
-    (description "This package provides Objective-C interface and bindings to
-the Cocoa Foundation framework.")
-    (license license:expat)))
-
-(define-public rust-objc2-0.3
-  (package
-    (inherit rust-objc2-0.4)
-    (name "rust-objc2")
-    (version "0.3.0-beta.3")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "objc2" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0jfnrwmp6n2d6snlpcyfk9l41nhm50wj9h42b6hqj2rxbm1facgy"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-block2" ,rust-block2-0.2)            ; 0.2.0-alpha.6
-        ("rust-objc-sys" ,rust-objc-sys-0.2)        ; 0.2.0-beta.2
-        ("rust-objc2-encode" ,rust-objc2-encode-2)  ; 2.0.0-pre.2
-        ("rust-objc2-proc-macros" ,rust-objc2-proc-macros-0.1)
-        ("rust-uuid" ,rust-uuid-1))))))
-
-(define-public rust-objc2-encode-3
-  (package
-    (name "rust-objc2-encode")
-    (version "3.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "objc2-encode" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0rknhkcnyj4qv1pzqp5j8l80726phz8fcxpsbpz9nhmg6xdq8yfh"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/madsmtm/objc2")
-    (synopsis "Objective-C type-encoding representation and parsing")
-    (description "This package provides objective-C type-encoding
-representation and parsing.")
-    (license license:expat)))
-
-(define-public rust-objc2-encode-2
-  (package
-    (inherit rust-objc2-encode-3)
-    (name "rust-objc2-encode")
-    (version "2.0.0-pre.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "objc2-encode" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "04h5wns3hxmc9g652hr9xqzrijs4ij9sdnlgc0ha202v050srz5b"))))
-    (arguments
-     `(#:tests? #f      ; Test suite wants gcc-objc
-       #:cargo-inputs (("rust-objc-sys" ,rust-objc-sys-0.2))))))
-
-(define-public rust-objc2-proc-macros-0.1
-  (package
-    (name "rust-objc2-proc-macros")
-    (version "0.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "objc2-proc-macros" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "07j3snswvj6532x32zgn4llc2xaf31rj4iw18n6dsrf2p0jvh1xr"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/madsmtm/objc2")
-    (synopsis "Procedural macros for the objc2 project")
-    (description "This package provides procedural macros for the objc2 project.")
-    (license license:expat)))
-
 (define-public rust-object-0.30
   (package
     (name "rust-object")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 8d74cf1180..f417bfc0e0 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -76,6 +76,7 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crates-apple)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-windows)
-- 
cgit v1.2.3


From f5794c64636456e0ec545a3f0ffffd1d673a01ad Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:33:02 +0200
Subject: gnu: rust-readkey-0.1: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-readkey-0.1): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: Ie24d9c158ee88d4f82572ae55326e5967b754d19
---
 gnu/packages/crates-apple.scm | 20 ++++++++++++++++++++
 gnu/packages/crates-io.scm    | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 2749fb9971..f3965a0928 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -661,3 +661,23 @@ representation and parsing.")
     (synopsis "Procedural macros for the objc2 project")
     (description "This package provides procedural macros for the objc2 project.")
     (license license:expat)))
+
+(define-public rust-readkey-0.1
+  (package
+    (name "rust-readkey")
+    (version "0.1.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "readkey" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0iiip8bq4yhal5rv6wlws0xgz798blki7s5ly5cmlwm1ssv03m46"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://github.com/segeljakt/readkey")
+    (synopsis "Library for finding out if a key is currently pressed on macOS")
+    (description
+     "This package provides a very small library for finding out if a key is
+currently pressed on macOS.")
+    (license license:expat)))
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index da322335c2..0750b19784 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56527,26 +56527,6 @@ reference counting.")
 @code{rdrand} and @code{rdseed} instructions")
     (license license:isc)))
 
-(define-public rust-readkey-0.1
-  (package
-    (name "rust-readkey")
-    (version "0.1.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "readkey" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0iiip8bq4yhal5rv6wlws0xgz798blki7s5ly5cmlwm1ssv03m46"))))
-    (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://github.com/segeljakt/readkey")
-    (synopsis "Library for finding out if a key is currently pressed on macOS")
-    (description
-     "This package provides a very small library for finding out if a key is
-currently pressed on macOS.")
-    (license license:expat)))
-
 (define-public rust-recycler-0.1
   (package
     (name "rust-recycler")
-- 
cgit v1.2.3


From cf0af0603193d9454119792620f63a930b54d190 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:35:15 +0200
Subject: gnu: rust-security-framework: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-security-framework-2,
rust-security-framework-1, rust-security-framework-0.3,
rust-security-framework-0.2, rust-security-framework-0.1,
rust-security-framework-sys-2, rust-security-framework-sys-1,
rust-security-framework-sys-0.3, rust-security-framework-sys-0.2,
rust-security-framework-sys-0.1): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: Ic3fed59019265d19f8c0efa992566691a6a807f6
---
 gnu/packages/crates-apple.scm | 233 ++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 233 ------------------------------------------
 gnu/packages/crates-tls.scm   |   1 +
 3 files changed, 234 insertions(+), 233 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index f3965a0928..03de10a853 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -681,3 +681,236 @@ representation and parsing.")
      "This package provides a very small library for finding out if a key is
 currently pressed on macOS.")
     (license license:expat)))
+
+(define-public rust-security-framework-2
+  (package
+    (name "rust-security-framework")
+    (version "2.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f                      ;missing files
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-security-framework-sys" ,rust-security-framework-sys-2))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-tempdir" ,rust-tempdir-0.3)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-x509-parser" ,rust-x509-parser-0.15))))
+    (home-page "https://lib.rs/crates/security_framework")
+    (synopsis "@code{Security.framework} bindings for macOS and iOS")
+    (description "This package provides @code{Security.framework} bindings for
+macOS and iOS.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-security-framework-1
+  (package
+    (inherit rust-security-framework-2)
+    (name "rust-security-framework")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0axwlax65j1f79rsm4ylc8rc6p2knbi3dgnpbdq7a1bzh5k2hl5d"))))
+    (arguments
+     `(#:tests? #f      ; Not all files included
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-core-foundation" ,rust-core-foundation-0.7)
+        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-security-framework-sys" ,rust-security-framework-sys-1))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex-0.4)
+        ("rust-tempdir" ,rust-tempdir-0.3))))))
+
+(define-public rust-security-framework-0.3
+  (package
+    (inherit rust-security-framework-1)
+    (name "rust-security-framework")
+    (version "0.3.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1pqn79cl9njnnhsmjvvphkzx8is5jhfd8bhxpllgvrgggjfl5wlf"))))
+    (arguments
+     `(#:tests? #f      ; Some test files not included in release.
+       #:cargo-inputs
+       (("rust-core-foundation" ,rust-core-foundation-0.6)
+        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-security-framework-sys" ,rust-security-framework-sys-0.3))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex-0.4)
+        ("rust-tempdir" ,rust-tempdir-0.3))))))
+
+(define-public rust-security-framework-0.2
+  (package
+    (inherit rust-security-framework-0.3)
+    (name "rust-security-framework")
+    (version "0.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0gw3xxg8yzbjb4ny5cy07gky177c1nbgpxqjsw3hfzpfgrxji9bz"))))
+    (arguments
+     `(#:skip-build? #t ; MacOS specific
+       #:cargo-inputs
+       (("rust-core-foundation"
+         ,rust-core-foundation-0.6)
+        ("rust-core-foundation-sys"
+         ,rust-core-foundation-sys-0.6)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-security-framework-sys"
+         ,rust-security-framework-sys-0.2))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex-0.3)
+        ("rust-tempdir" ,rust-tempdir-0.3))))))
+
+(define-public rust-security-framework-0.1
+  (package
+    (inherit rust-security-framework-0.2)
+    (name "rust-security-framework")
+    (version "0.1.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0ci39ax08h2ngrl1yf1ra9smivhjs6xarmg7kp6fxracqpllx96z"))))
+    (arguments
+     `(#:skip-build? #t ; MacOS specific
+       #:cargo-inputs
+       (("rust-core-foundation" ,rust-core-foundation-0.2)
+        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-security-framework-sys" ,rust-security-framework-sys-0.1))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex-0.2)
+        ("rust-tempdir" ,rust-tempdir-0.3))))))
+
+(define-public rust-security-framework-sys-2
+  (package
+    (name "rust-security-framework-sys")
+    (version "2.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
+        ("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://lib.rs/crates/security-framework-sys")
+    (synopsis "Low-level FFI bindings to Apple @code{Security.framework}")
+    (description "This package provides low level FFI bindings to Apple
+@code{Security.framework}.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-security-framework-sys-1
+  (package
+    (inherit rust-security-framework-sys-2)
+    (name "rust-security-framework-sys")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1iynsjz53lqkkw4zbq8l99xn799chbx90lsmrlfnsyxii14v1kji"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7)
+        ("rust-libc" ,rust-libc-0.2))))))
+
+(define-public rust-security-framework-sys-0.3
+  (package
+    (inherit rust-security-framework-sys-1)
+    (name "rust-security-framework-sys")
+    (version "0.3.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "security-framework-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "15gqhhi206lzynd0pcbswxhvqc4p9bmpl2h9qnwfnpb16zy96573"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6))))))
+
+(define-public rust-security-framework-sys-0.2
+  (package
+    (inherit rust-security-framework-sys-0.3)
+    (name "rust-security-framework-sys")
+    (version "0.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "07zv0szz2kfy1hn251h0qsq0q9i1zia768d8vzril1g6xarj7mcj"))))
+    (arguments
+     `(#:skip-build? #t ; MacOS specific
+       #:cargo-inputs
+       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)
+        ("rust-libc" ,rust-libc-0.2))))))
+
+(define-public rust-security-framework-sys-0.1
+  (package
+    (inherit rust-security-framework-sys-0.2)
+    (name "rust-security-framework-sys")
+    (version "0.1.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "security-framework-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1bdy87gvmahiiyfzghsdg2dkhznww3p3d3r676qs0y32hcg648al"))))
+    (arguments
+     `(#:skip-build? #t ; MacOS specific
+       #:cargo-inputs
+       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
+        ("rust-libc" ,rust-libc-0.2))))))
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0750b19784..f0cecfc039 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63124,239 +63124,6 @@ SECG elliptic curve group secp256k1 and related utilities.")
 @code{libsecp256k1} library.")
     (license license:cc0)))
 
-(define-public rust-security-framework-2
-  (package
-    (name "rust-security-framework")
-    (version "2.9.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f                      ;missing files
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-core-foundation" ,rust-core-foundation-0.9)
-        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-num-bigint" ,rust-num-bigint-0.4)
-        ("rust-security-framework-sys" ,rust-security-framework-sys-2))
-       #:cargo-development-inputs
-       (("rust-env-logger" ,rust-env-logger-0.10)
-        ("rust-hex" ,rust-hex-0.4)
-        ("rust-tempdir" ,rust-tempdir-0.3)
-        ("rust-time" ,rust-time-0.3)
-        ("rust-x509-parser" ,rust-x509-parser-0.15))))
-    (home-page "https://lib.rs/crates/security_framework")
-    (synopsis "@code{Security.framework} bindings for macOS and iOS")
-    (description "This package provides @code{Security.framework} bindings for
-macOS and iOS.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-security-framework-1
-  (package
-    (inherit rust-security-framework-2)
-    (name "rust-security-framework")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0axwlax65j1f79rsm4ylc8rc6p2knbi3dgnpbdq7a1bzh5k2hl5d"))))
-    (arguments
-     `(#:tests? #f      ; Not all files included
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-core-foundation" ,rust-core-foundation-0.7)
-        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-security-framework-sys" ,rust-security-framework-sys-1))
-       #:cargo-development-inputs
-       (("rust-hex" ,rust-hex-0.4)
-        ("rust-tempdir" ,rust-tempdir-0.3))))))
-
-(define-public rust-security-framework-0.3
-  (package
-    (inherit rust-security-framework-1)
-    (name "rust-security-framework")
-    (version "0.3.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1pqn79cl9njnnhsmjvvphkzx8is5jhfd8bhxpllgvrgggjfl5wlf"))))
-    (arguments
-     `(#:tests? #f      ; Some test files not included in release.
-       #:cargo-inputs
-       (("rust-core-foundation" ,rust-core-foundation-0.6)
-        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-security-framework-sys" ,rust-security-framework-sys-0.3))
-       #:cargo-development-inputs
-       (("rust-hex" ,rust-hex-0.4)
-        ("rust-tempdir" ,rust-tempdir-0.3))))))
-
-(define-public rust-security-framework-0.2
-  (package
-    (inherit rust-security-framework-0.3)
-    (name "rust-security-framework")
-    (version "0.2.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0gw3xxg8yzbjb4ny5cy07gky177c1nbgpxqjsw3hfzpfgrxji9bz"))))
-    (arguments
-     `(#:skip-build? #t ; MacOS specific
-       #:cargo-inputs
-       (("rust-core-foundation"
-         ,rust-core-foundation-0.6)
-        ("rust-core-foundation-sys"
-         ,rust-core-foundation-sys-0.6)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-security-framework-sys"
-         ,rust-security-framework-sys-0.2))
-       #:cargo-development-inputs
-       (("rust-hex" ,rust-hex-0.3)
-        ("rust-tempdir" ,rust-tempdir-0.3))))))
-
-(define-public rust-security-framework-0.1
-  (package
-    (inherit rust-security-framework-0.2)
-    (name "rust-security-framework")
-    (version "0.1.16")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0ci39ax08h2ngrl1yf1ra9smivhjs6xarmg7kp6fxracqpllx96z"))))
-    (arguments
-     `(#:skip-build? #t ; MacOS specific
-       #:cargo-inputs
-       (("rust-core-foundation" ,rust-core-foundation-0.2)
-        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-security-framework-sys" ,rust-security-framework-sys-0.1))
-       #:cargo-development-inputs
-       (("rust-hex" ,rust-hex-0.2)
-        ("rust-tempdir" ,rust-tempdir-0.3))))))
-
-(define-public rust-security-framework-sys-2
-  (package
-    (name "rust-security-framework-sys")
-    (version "2.9.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
-        ("rust-libc" ,rust-libc-0.2))))
-    (home-page "https://lib.rs/crates/security-framework-sys")
-    (synopsis "Low-level FFI bindings to Apple @code{Security.framework}")
-    (description "This package provides low level FFI bindings to Apple
-@code{Security.framework}.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-security-framework-sys-1
-  (package
-    (inherit rust-security-framework-sys-2)
-    (name "rust-security-framework-sys")
-    (version "1.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1iynsjz53lqkkw4zbq8l99xn799chbx90lsmrlfnsyxii14v1kji"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.7)
-        ("rust-libc" ,rust-libc-0.2))))))
-
-(define-public rust-security-framework-sys-0.3
-  (package
-    (inherit rust-security-framework-sys-1)
-    (name "rust-security-framework-sys")
-    (version "0.3.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "security-framework-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "15gqhhi206lzynd0pcbswxhvqc4p9bmpl2h9qnwfnpb16zy96573"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6))))))
-
-(define-public rust-security-framework-sys-0.2
-  (package
-    (inherit rust-security-framework-sys-0.3)
-    (name "rust-security-framework-sys")
-    (version "0.2.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "07zv0szz2kfy1hn251h0qsq0q9i1zia768d8vzril1g6xarj7mcj"))))
-    (arguments
-     `(#:skip-build? #t ; MacOS specific
-       #:cargo-inputs
-       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)
-        ("rust-libc" ,rust-libc-0.2))))))
-
-(define-public rust-security-framework-sys-0.1
-  (package
-    (inherit rust-security-framework-sys-0.2)
-    (name "rust-security-framework-sys")
-    (version "0.1.16")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1bdy87gvmahiiyfzghsdg2dkhznww3p3d3r676qs0y32hcg648al"))))
-    (arguments
-     `(#:skip-build? #t ; MacOS specific
-       #:cargo-inputs
-       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
-        ("rust-libc" ,rust-libc-0.2))))))
-
 (define-public rust-selectors-0.24
   (package
     (name "rust-selectors")
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 30f9084c2c..f227f67723 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -31,6 +31,7 @@
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (gnu packages)
+  #:use-module (gnu packages crates-apple)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
-- 
cgit v1.2.3


From 84d49b4dff7dd588aa4849c12684371685ba64cc Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:46:16 +0200
Subject: gnu: rust-system-configuration: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-system-configuration-0.5,
rust-system-configuration-sys-0.5): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: Ia3794ce3ef56520dac26b44acfc91da7f7e3031f
---
 gnu/packages/crates-apple.scm | 45 +++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 45 -------------------------------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 03de10a853..5e8e67484c 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -914,3 +914,48 @@ macOS and iOS.")
        #:cargo-inputs
        (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
         ("rust-libc" ,rust-libc-0.2))))))
+
+(define-public rust-system-configuration-0.5
+  (package
+    (name "rust-system-configuration")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "system-configuration" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1rz0r30xn7fiyqay2dvzfy56cvaa3km74hnbz2d72p97bkf3lfms"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; struct `sockaddr_in` has no field named `sin_len`
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-system-configuration-sys" ,rust-system-configuration-sys-0.5))))
+    (home-page "https://github.com/mullvad/system-configuration-rs")
+    (synopsis "Bindings to SystemConfiguration framework for macOS")
+    (description
+     "Bindings to @code{SystemConfiguration} framework for @code{macOS}.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-system-configuration-sys-0.5
+  (package
+    (name "rust-system-configuration-sys")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "system-configuration-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1jckxvdr37bay3i9v52izgy52dg690x5xfg3hd394sv2xf4b2px7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
+                       ("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/mullvad/system-configuration-rs")
+    (synopsis "Low level bindings to SystemConfiguration framework for macOS")
+    (description
+     "Low level bindings to @code{SystemConfiguration} framework for @code{macOS}.")
+    (license (list license:expat license:asl2.0))))
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f0cecfc039..c1c5f22025 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72176,51 +72176,6 @@ processors, disks, components and networks.")
         ("rust-log" ,rust-log-0.3)
         ("rust-unix-socket" ,rust-unix-socket-0.5))))))
 
-(define-public rust-system-configuration-0.5
-  (package
-    (name "rust-system-configuration")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "system-configuration" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1rz0r30xn7fiyqay2dvzfy56cvaa3km74hnbz2d72p97bkf3lfms"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t ; struct `sockaddr_in` has no field named `sin_len`
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-core-foundation" ,rust-core-foundation-0.9)
-        ("rust-system-configuration-sys" ,rust-system-configuration-sys-0.5))))
-    (home-page "https://github.com/mullvad/system-configuration-rs")
-    (synopsis "Bindings to SystemConfiguration framework for macOS")
-    (description
-     "Bindings to @code{SystemConfiguration} framework for @code{macOS}.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-system-configuration-sys-0.5
-  (package
-    (name "rust-system-configuration-sys")
-    (version "0.5.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "system-configuration-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1jckxvdr37bay3i9v52izgy52dg690x5xfg3hd394sv2xf4b2px7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
-                       ("rust-libc" ,rust-libc-0.2))))
-    (home-page "https://github.com/mullvad/system-configuration-rs")
-    (synopsis "Low level bindings to SystemConfiguration framework for macOS")
-    (description
-     "Low level bindings to @code{SystemConfiguration} framework for @code{macOS}.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-system-deps-6
   (package
     (name "rust-system-deps")
-- 
cgit v1.2.3


From 8afcfb042a2aca7b125c65b5d2ac671e781181f5 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:47:31 +0200
Subject: gnu: rust-cargo-credential-macos-keychain: Move to crates-apple.scm.

* gnu/packages/crates-io.scm (rust-cargo-credential-macos-keychain-0.4,
rust-cargo-credential-macos-keychain-0.3): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I6e8becddbeeebe282227dc09c012735134c84665
---
 gnu/packages/crates-apple.scm | 39 +++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 39 ---------------------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 5e8e67484c..c54a04a660 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -131,6 +131,45 @@ extension of blocks.")
        #:cargo-inputs
        (("rust-objc-sys" ,rust-objc-sys-0.2))))))
 
+(define-public rust-cargo-credential-macos-keychain-0.4
+  (package
+    (name "rust-cargo-credential-macos-keychain")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cargo-credential-macos-keychain" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1df098axn8pab6l2mljbkxg3bw1v4mcr4k42x6xy6j15854nsz70"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cargo-credential" ,rust-cargo-credential-0.4)
+                       ("rust-security-framework" ,rust-security-framework-2))))
+    (home-page "https://github.com/rust-lang/cargo")
+    (synopsis "Cargo credential process that stores tokens in a macOS keychain")
+    (description
+     "This package provides a Cargo credential process that stores tokens in a
+@code{macOS} keychain.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-cargo-credential-macos-keychain-0.3
+  (package
+    (inherit rust-cargo-credential-macos-keychain-0.4)
+    (name "rust-cargo-credential-macos-keychain")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cargo-credential-macos-keychain" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15i7gq5z6a3896aq2bci9mc9h77g91ziij87c2zhhd91g1pf41rs"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cargo-credential" ,rust-cargo-credential-0.3)
+        ("rust-security-framework" ,rust-security-framework-2))))))
+
 (define-public rust-coreaudio-rs-0.10
   (package
     (name "rust-coreaudio-rs")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c1c5f22025..c99142c4a1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10074,45 +10074,6 @@ GNOME libsecret.")
         ("rust-cargo-credential" ,rust-cargo-credential-0.3)
         ("rust-libloading" ,rust-libloading-0.8))))))
 
-(define-public rust-cargo-credential-macos-keychain-0.4
-  (package
-    (name "rust-cargo-credential-macos-keychain")
-    (version "0.4.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cargo-credential-macos-keychain" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1df098axn8pab6l2mljbkxg3bw1v4mcr4k42x6xy6j15854nsz70"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-cargo-credential" ,rust-cargo-credential-0.4)
-                       ("rust-security-framework" ,rust-security-framework-2))))
-    (home-page "https://github.com/rust-lang/cargo")
-    (synopsis "Cargo credential process that stores tokens in a macOS keychain")
-    (description
-     "This package provides a Cargo credential process that stores tokens in a
-@code{macOS} keychain.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-cargo-credential-macos-keychain-0.3
-  (package
-    (inherit rust-cargo-credential-macos-keychain-0.4)
-    (name "rust-cargo-credential-macos-keychain")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cargo-credential-macos-keychain" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "15i7gq5z6a3896aq2bci9mc9h77g91ziij87c2zhhd91g1pf41rs"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cargo-credential" ,rust-cargo-credential-0.3)
-        ("rust-security-framework" ,rust-security-framework-2))))))
-
 (define-public rust-cargo-metadata-0.18
   (package
     (name "rust-cargo-metadata")
-- 
cgit v1.2.3


From aa60ba2d4a1a83533973fd90243ad5502b49d7a7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:48:52 +0200
Subject: gnu: rust-cocoa: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-cocoa-0.25, rust-cocoa-0.24,
rust-cocoa-0.23, rust-cocoa-0.22, rust-cocoa-0.19, rust-cocoa-0.18,
rust-cocoa-foundation-0.1): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: Ie751274ae50082a1fcbc020dbb288d6b7370d6fe
---
 gnu/packages/crates-apple.scm | 167 ++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 166 -----------------------------------------
 2 files changed, 167 insertions(+), 166 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index c54a04a660..ec07f96883 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -28,6 +28,7 @@
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages)
+  #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-io))
 
 (define-public rust-block-0.1
@@ -170,6 +171,172 @@ extension of blocks.")
        (("rust-cargo-credential" ,rust-cargo-credential-0.3)
         ("rust-security-framework" ,rust-security-framework-2))))))
 
+(define-public rust-cocoa-0.25
+  (package
+    (name "rust-cocoa")
+    (version "0.25.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cocoa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0g1pl5hq28arqmvsswf2ib7smj445miwa58qa7wrfvksz54h857n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-block" ,rust-block-0.1)
+                       ("rust-cocoa-foundation" ,rust-cocoa-foundation-0.1)
+                       ("rust-core-foundation" ,rust-core-foundation-0.9)
+                       ("rust-core-graphics" ,rust-core-graphics-0.23)
+                       ("rust-foreign-types" ,rust-foreign-types-0.5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-objc" ,rust-objc-0.2))))
+    (home-page "https://github.com/servo/core-foundation-rs")
+    (synopsis "Bindings to Cocoa for macOS")
+    (description "This package provides bindings to Cocoa for macOS.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-cocoa-0.24
+  (package
+    (inherit rust-cocoa-0.25)
+    (name "rust-cocoa")
+    (version "0.24.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cocoa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cp8hsajmi7gini22bmlsf9dac7cap7x1k169vxhwlr3j8p90qvg"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-block" ,rust-block-0.1)
+        ("rust-cocoa-foundation" ,rust-cocoa-foundation-0.1)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-core-graphics" ,rust-core-graphics-0.22)
+        ("rust-foreign-types" ,rust-foreign-types-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-objc" ,rust-objc-0.2))))))
+
+(define-public rust-cocoa-0.23
+  (package
+    (inherit rust-cocoa-0.24)
+    (name "rust-cocoa")
+    (version "0.23.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cocoa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cj4c2axmg7aiid2786mpzj7wxpd582biv7c7yimqfnggp002hn5"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-block" ,rust-block-0.1)
+        ("rust-cocoa-foundation" ,rust-cocoa-foundation-0.1)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-core-graphics" ,rust-core-graphics-0.22)
+        ("rust-foreign-types" ,rust-foreign-types-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-objc" ,rust-objc-0.2))))))
+
+(define-public rust-cocoa-0.22
+  (package
+    (inherit rust-cocoa-0.23)
+    (name "rust-cocoa")
+    (version "0.22.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cocoa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19qyyv01yzrm6aahn6cdxvb4jhl6v4fj0cgqkxmq38i7hq3dqzv6"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-block" ,rust-block-0.1)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-core-graphics" ,rust-core-graphics-0.21)
+        ("rust-foreign-types" ,rust-foreign-types-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-objc" ,rust-objc-0.2))))))
+
+(define-public rust-cocoa-0.19
+  (package
+    (inherit rust-cocoa-0.22)
+    (name "rust-cocoa")
+    (version "0.19.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cocoa" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0034vahbfv574q4b63rj241b8rnka5cjiqsqc6wiggnin9l7g7zj"))))
+    (arguments
+     `(#:skip-build? #t     ; only for macOS
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-block" ,rust-block-0.1)
+        ("rust-core-foundation" ,rust-core-foundation-0.6)
+        ("rust-core-graphics" ,rust-core-graphics-0.17)
+        ("rust-foreign-types" ,rust-foreign-types-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-objc" ,rust-objc-0.2))))))
+
+(define-public rust-cocoa-0.18
+  (package
+    (inherit rust-cocoa-0.19)
+    (name "rust-cocoa")
+    (version "0.18.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cocoa" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0m6fgdr4d2fp8jhkqvwr23hrqqqjv72g0j9vdgijc58k05j9j1hp"))))))
+
+(define-public rust-cocoa-foundation-0.1
+  (package
+    (name "rust-cocoa-foundation")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cocoa-foundation" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0633ipbd28z35rsdmsl505f1aasrjsrrnirs826aa32nbnv4kpks"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-block" ,rust-block-0.1)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-core-graphics-types" ,rust-core-graphics-types-0.1)
+        ("rust-foreign-types" ,rust-foreign-types-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-objc" ,rust-objc-0.2))))
+    (home-page "https://github.com/servo/core-foundation-rs")
+    (synopsis "Bindings to Cocoa Foundation for macOS")
+    (description
+     "This package provides bindings to Cocoa Foundation for macOS.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-coreaudio-rs-0.10
   (package
     (name "rust-coreaudio-rs")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c99142c4a1..81c338a976 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12387,172 +12387,6 @@ CMAKE environmental variable is set.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-cocoa-0.25
-  (package
-    (name "rust-cocoa")
-    (version "0.25.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cocoa" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0g1pl5hq28arqmvsswf2ib7smj445miwa58qa7wrfvksz54h857n"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
-                       ("rust-block" ,rust-block-0.1)
-                       ("rust-cocoa-foundation" ,rust-cocoa-foundation-0.1)
-                       ("rust-core-foundation" ,rust-core-foundation-0.9)
-                       ("rust-core-graphics" ,rust-core-graphics-0.23)
-                       ("rust-foreign-types" ,rust-foreign-types-0.5)
-                       ("rust-libc" ,rust-libc-0.2)
-                       ("rust-objc" ,rust-objc-0.2))))
-    (home-page "https://github.com/servo/core-foundation-rs")
-    (synopsis "Bindings to Cocoa for macOS")
-    (description "This package provides bindings to Cocoa for macOS.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-cocoa-0.24
-  (package
-    (inherit rust-cocoa-0.25)
-    (name "rust-cocoa")
-    (version "0.24.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cocoa" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0cp8hsajmi7gini22bmlsf9dac7cap7x1k169vxhwlr3j8p90qvg"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-block" ,rust-block-0.1)
-        ("rust-cocoa-foundation" ,rust-cocoa-foundation-0.1)
-        ("rust-core-foundation" ,rust-core-foundation-0.9)
-        ("rust-core-graphics" ,rust-core-graphics-0.22)
-        ("rust-foreign-types" ,rust-foreign-types-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-objc" ,rust-objc-0.2))))))
-
-(define-public rust-cocoa-0.23
-  (package
-    (inherit rust-cocoa-0.24)
-    (name "rust-cocoa")
-    (version "0.23.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cocoa" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1cj4c2axmg7aiid2786mpzj7wxpd582biv7c7yimqfnggp002hn5"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-block" ,rust-block-0.1)
-        ("rust-cocoa-foundation" ,rust-cocoa-foundation-0.1)
-        ("rust-core-foundation" ,rust-core-foundation-0.9)
-        ("rust-core-graphics" ,rust-core-graphics-0.22)
-        ("rust-foreign-types" ,rust-foreign-types-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-objc" ,rust-objc-0.2))))))
-
-(define-public rust-cocoa-0.22
-  (package
-    (inherit rust-cocoa-0.23)
-    (name "rust-cocoa")
-    (version "0.22.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cocoa" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "19qyyv01yzrm6aahn6cdxvb4jhl6v4fj0cgqkxmq38i7hq3dqzv6"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-block" ,rust-block-0.1)
-        ("rust-core-foundation" ,rust-core-foundation-0.9)
-        ("rust-core-graphics" ,rust-core-graphics-0.21)
-        ("rust-foreign-types" ,rust-foreign-types-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-objc" ,rust-objc-0.2))))))
-
-(define-public rust-cocoa-0.19
-  (package
-    (inherit rust-cocoa-0.22)
-    (name "rust-cocoa")
-    (version "0.19.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cocoa" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0034vahbfv574q4b63rj241b8rnka5cjiqsqc6wiggnin9l7g7zj"))))
-    (arguments
-     `(#:skip-build? #t     ; only for macOS
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-block" ,rust-block-0.1)
-        ("rust-core-foundation" ,rust-core-foundation-0.6)
-        ("rust-core-graphics" ,rust-core-graphics-0.17)
-        ("rust-foreign-types" ,rust-foreign-types-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-objc" ,rust-objc-0.2))))))
-
-(define-public rust-cocoa-0.18
-  (package
-    (inherit rust-cocoa-0.19)
-    (name "rust-cocoa")
-    (version "0.18.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cocoa" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0m6fgdr4d2fp8jhkqvwr23hrqqqjv72g0j9vdgijc58k05j9j1hp"))))))
-
-(define-public rust-cocoa-foundation-0.1
-  (package
-    (name "rust-cocoa-foundation")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cocoa-foundation" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0633ipbd28z35rsdmsl505f1aasrjsrrnirs826aa32nbnv4kpks"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-block" ,rust-block-0.1)
-        ("rust-core-foundation" ,rust-core-foundation-0.9)
-        ("rust-core-graphics-types" ,rust-core-graphics-types-0.1)
-        ("rust-foreign-types" ,rust-foreign-types-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-objc" ,rust-objc-0.2))))
-    (home-page "https://github.com/servo/core-foundation-rs")
-    (synopsis "Bindings to Cocoa Foundation for macOS")
-    (description
-     "This package provides bindings to Cocoa Foundation for macOS.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-codegenrs-2
   (package
     (name "rust-codegenrs")
-- 
cgit v1.2.3


From 2defccbb6c6eba91e2fbf13fadac3f20f345d7e7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 20:51:10 +0200
Subject: gnu: rust-fsevent: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-fsevent-2, rust-fsevent-0.4,
rust-fsevent-sys-4, rust-fsevent-sys-3, rust-fsevent-sys-2): Move from
here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I7455ed5e15d312dcf2cc57c1e27ae8caaa47ed8c
---
 gnu/packages/crates-apple.scm | 116 ++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 115 -----------------------------------------
 2 files changed, 116 insertions(+), 115 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index ec07f96883..c747c533fa 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -607,6 +608,121 @@ Central Dispatch.")
          "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84"))))
     (arguments '(#:tests? #f))))  ; Tests only run on Mac.
 
+(define-public rust-fsevent-2
+  (package
+    (name "rust-fsevent")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fsevent" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0qsylfbhgha319q6a8yvkznbm3hf47gy3y8nq82qijcm5hh4gwwp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-fsevent-sys" ,rust-fsevent-sys-3))
+       #:cargo-development-inputs
+       (("rust-tempfile" ,rust-tempfile-3)
+        ("rust-time" ,rust-time-0.2))))
+    (home-page "https://github.com/octplane/fsevent-rust")
+    (synopsis "Rust bindings to the fsevent-sys macOS API")
+    (description
+     "This package provides Rust bindings to the @code{fsevent-sys} macOS API
+for file changes notifications")
+    (license license:expat)))
+
+(define-public rust-fsevent-0.4
+  (package
+    (inherit rust-fsevent-2)
+    (name "rust-fsevent")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "fsevent" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1djxnc2fmv265xqf1iyfz56smh13v9r1p0w9125wjg6k3fyx3dss"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; only available on macOS
+       #:cargo-inputs
+        (("rust-bitflags" ,rust-bitflags-1)
+         ("rust-fsevent-sys" ,rust-fsevent-sys-2))
+        #:cargo-development-inputs
+        (("rust-tempdir" ,rust-tempdir-0.3)
+         ("rust-time" ,rust-time-0.1))))))
+
+(define-public rust-fsevent-sys-4
+  (package
+    (name "rust-fsevent-sys")
+    (version "4.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fsevent-sys" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1liz67v8b0gcs8r31vxkvm2jzgl9p14i78yfqx81c8sdv817mvkn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/octplane/fsevent-rust/tree/master/fsevent-sys")
+    (synopsis "Rust bindings to the fsevent macOS API")
+    (description "This package provides Rust bindings to the @code{fsevent}
+macOS API for file changes notifications")
+    (license license:expat)))
+
+(define-public rust-fsevent-sys-3
+  (package
+    (inherit rust-fsevent-sys-4)
+    (name "rust-fsevent-sys")
+    (version "3.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "fsevent-sys" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1mav57d1zcp4x17h0wprcr188d8yvxfz1c0f1z0p31q52xl5wvya"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2))))))
+
+(define-public rust-fsevent-sys-2
+  (package
+    (inherit rust-fsevent-sys-3)
+    (name "rust-fsevent-sys")
+    (version "2.0.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "fsevent-sys" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "18246vxk7rqn52m0sfrhivxq802i34p2wqqx5zsa0pamjj5086zl"))))
+    (arguments
+     `(#:skip-build? #t     ; only available on macOS
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))))
+
 (define-public rust-objc-0.2
   (package
     (name "rust-objc")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 81c338a976..6b45ebc43e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26438,121 +26438,6 @@ with the filesystem.")
      "This package provides cross-platform file locks and file duplication.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-fsevent-2
-  (package
-    (name "rust-fsevent")
-    (version "2.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "fsevent" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0qsylfbhgha319q6a8yvkznbm3hf47gy3y8nq82qijcm5hh4gwwp"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-fsevent-sys" ,rust-fsevent-sys-3))
-       #:cargo-development-inputs
-       (("rust-tempfile" ,rust-tempfile-3)
-        ("rust-time" ,rust-time-0.2))))
-    (home-page "https://github.com/octplane/fsevent-rust")
-    (synopsis "Rust bindings to the fsevent-sys macOS API")
-    (description
-     "This package provides Rust bindings to the @code{fsevent-sys} macOS API
-for file changes notifications")
-    (license license:expat)))
-
-(define-public rust-fsevent-0.4
-  (package
-    (inherit rust-fsevent-2)
-    (name "rust-fsevent")
-    (version "0.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fsevent" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1djxnc2fmv265xqf1iyfz56smh13v9r1p0w9125wjg6k3fyx3dss"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t     ; only available on macOS
-       #:cargo-inputs
-        (("rust-bitflags" ,rust-bitflags-1)
-         ("rust-fsevent-sys" ,rust-fsevent-sys-2))
-        #:cargo-development-inputs
-        (("rust-tempdir" ,rust-tempdir-0.3)
-         ("rust-time" ,rust-time-0.1))))))
-
-(define-public rust-fsevent-sys-4
-  (package
-    (name "rust-fsevent-sys")
-    (version "4.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "fsevent-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1liz67v8b0gcs8r31vxkvm2jzgl9p14i78yfqx81c8sdv817mvkn"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2))))
-    (home-page "https://github.com/octplane/fsevent-rust/tree/master/fsevent-sys")
-    (synopsis "Rust bindings to the fsevent macOS API")
-    (description "This package provides Rust bindings to the @code{fsevent}
-macOS API for file changes notifications")
-    (license license:expat)))
-
-(define-public rust-fsevent-sys-3
-  (package
-    (inherit rust-fsevent-sys-4)
-    (name "rust-fsevent-sys")
-    (version "3.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "fsevent-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1mav57d1zcp4x17h0wprcr188d8yvxfz1c0f1z0p31q52xl5wvya"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2))))))
-
-(define-public rust-fsevent-sys-2
-  (package
-    (inherit rust-fsevent-sys-3)
-    (name "rust-fsevent-sys")
-    (version "2.0.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "fsevent-sys" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "18246vxk7rqn52m0sfrhivxq802i34p2wqqx5zsa0pamjj5086zl"))))
-    (arguments
-     `(#:skip-build? #t     ; only available on macOS
-       #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))))
-
 (define-public rust-fslock-0.2
   (package
     (name "rust-fslock")
-- 
cgit v1.2.3


From f39373c4550f888ae536e46716080067b8f314fd Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 21:50:36 +0200
Subject: gnu: rust-icrate-0.0.4: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-icrate-0.0.4): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I567a637f64c4f5efc5f3cc73a28aee9f9a00c627
---
 gnu/packages/crates-apple.scm | 23 +++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 23 -----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index c747c533fa..7d3785000e 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -723,6 +723,29 @@ macOS API for file changes notifications")
      `(#:skip-build? #t     ; only available on macOS
        #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))))
 
+(define-public rust-icrate-0.0.4
+  (package
+    (name "rust-icrate")
+    (version "0.0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "icrate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06d3g8n6xw3f0ai84mya0dlknp2n33zqdxpxp8272mslibzsmlwr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-block2" ,rust-block2-0.3)
+                       ("rust-dispatch" ,rust-dispatch-0.2)
+                       ("rust-objc2" ,rust-objc2-0.4))
+       #:cargo-development-inputs
+       (("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/madsmtm/objc2")
+    (synopsis "Bindings to Apple's frameworks")
+    (description "This package provides bindings to Apple's frameworks.")
+    (license license:expat)))
+
 (define-public rust-objc-0.2
   (package
     (name "rust-objc")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6b45ebc43e..f9add906ff 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31689,29 +31689,6 @@ SystemTime}}.")
      "This package provides the IANA time zone for the current system.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-icrate-0.0.4
-  (package
-    (name "rust-icrate")
-    (version "0.0.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "icrate" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "06d3g8n6xw3f0ai84mya0dlknp2n33zqdxpxp8272mslibzsmlwr"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-block2" ,rust-block2-0.3)
-                       ("rust-dispatch" ,rust-dispatch-0.2)
-                       ("rust-objc2" ,rust-objc2-0.4))
-       #:cargo-development-inputs
-       (("rust-static-assertions" ,rust-static-assertions-1))))
-    (home-page "https://github.com/madsmtm/objc2")
-    (synopsis "Bindings to Apple's frameworks")
-    (description "This package provides bindings to Apple's frameworks.")
-    (license license:expat)))
-
 (define-public rust-idea-0.5
   (package
     (name "rust-idea")
-- 
cgit v1.2.3


From f900f84f802addb35a062f62afb6421c319157d6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 21:52:54 +0200
Subject: gnu: rust-metal-0.18: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-metal-0.18): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: Ica5be709b1a1136cdca0f8b7febf6cf0c68187a4
---
 gnu/packages/crates-apple.scm | 26 ++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 26 --------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 7d3785000e..6b324fdd14 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -746,6 +746,32 @@ macOS API for file changes notifications")
     (description "This package provides bindings to Apple's frameworks.")
     (license license:expat)))
 
+(define-public rust-metal-0.18
+  (package
+    (name "rust-metal")
+    (version "0.18.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "metal" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "08n3kfv78jm3pf7fafwfv67n40lgcdg7w9lqn9g4sdvfwdk90vrf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-block" ,rust-block-0.1)
+        ("rust-cocoa" ,rust-cocoa-0.22)
+        ("rust-foreign-types" ,rust-foreign-types-0.3)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-objc" ,rust-objc-0.2))))
+    (home-page "https://github.com/gfx-rs/metal-rs")
+    (synopsis "Rust bindings for Metal")
+    (description "This package provides Rust bindings for Metal.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-objc-0.2
   (package
     (name "rust-objc")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f9add906ff..1f9caebc10 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39629,32 +39629,6 @@ non-interactive protocols can be implemented as if they were interactive.")
     (description "Run pkg-config from declarative dependencies in Cargo.toml.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-metal-0.18
-  (package
-    (name "rust-metal")
-    (version "0.18.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "metal" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "08n3kfv78jm3pf7fafwfv67n40lgcdg7w9lqn9g4sdvfwdk90vrf"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-block" ,rust-block-0.1)
-        ("rust-cocoa" ,rust-cocoa-0.22)
-        ("rust-foreign-types" ,rust-foreign-types-0.3)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-objc" ,rust-objc-0.2))))
-    (home-page "https://github.com/gfx-rs/metal-rs")
-    (synopsis "Rust bindings for Metal")
-    (description "This package provides Rust bindings for Metal.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-thousands-0.2
   (package
     (name "rust-thousands")
-- 
cgit v1.2.3


From af59272f993812f518b319c5a48d29fd6e229d24 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 21:55:10 +0200
Subject: gnu: rust-commoncrypto: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-commoncrypto-0.2,
rust-commoncrypto-sys-0.2): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I080088e9cea2631736e6fe06158f9263cbddbc5e
---
 gnu/packages/crates-apple.scm | 52 +++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 51 ------------------------------------------
 2 files changed, 52 insertions(+), 51 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 6b324fdd14..6e9b73bce6 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;;
@@ -338,6 +339,57 @@ extension of blocks.")
      "This package provides bindings to Cocoa Foundation for macOS.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-commoncrypto-0.2
+  (package
+    (name "rust-commoncrypto")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "commoncrypto" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "01whnqcziclsj1gwavvqhrw2r5cmwh00j2fbc56iwnm2ddcahmnh"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-clippy" ,rust-clippy-0.0)
+         ("rust-commoncrypto-sys" ,rust-commoncrypto-sys-0.2))))
+    (home-page "https://github.com/malept/rust-commoncrypto")
+    (synopsis "Idiomatic Rust wrappers for Mac OS X's CommonCrypto library")
+    (description "The @{commoncrypto} library provides Rust FFI bindings and
+idiomatic wrappers for Mac OS X's CommonCrypto library.")
+    (license license:expat)))
+
+(define-public rust-commoncrypto-sys-0.2
+  (package
+    (name "rust-commoncrypto-sys")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "commoncrypto-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1ql381ziqh594a7z6m9bvs583lkrhbynk02pmbgp7aj7czs39v8z"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t                ;requires the Mac OS library
+        #:cargo-inputs
+        (("rust-clippy" ,rust-clippy-0.0)
+         ("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/malept/rust-commoncrypto")
+    (synopsis "FFI bindings to Mac OS X's CommonCrypto library")
+    (description "This package is a component of the @code{commoncrypto}
+library which provides Rust FFI bindings and idiomatic wrappers for Mac OS X's
+CommonCrypto library.")
+    (license license:expat)))
+
 (define-public rust-coreaudio-rs-0.10
   (package
     (name "rust-coreaudio-rs")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1f9caebc10..7a17de5f23 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12839,57 +12839,6 @@ wrapping.")
         ("rust-strum" ,rust-strum-0.20)
         ("rust-strum-macros" ,rust-strum-macros-0.20))))))
 
-(define-public rust-commoncrypto-sys-0.2
-  (package
-    (name "rust-commoncrypto-sys")
-    (version "0.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "commoncrypto-sys" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1ql381ziqh594a7z6m9bvs583lkrhbynk02pmbgp7aj7czs39v8z"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:skip-build? #t                ;requires the Mac OS library
-        #:cargo-inputs
-        (("rust-clippy" ,rust-clippy-0.0)
-         ("rust-libc" ,rust-libc-0.2))))
-    (home-page "https://github.com/malept/rust-commoncrypto")
-    (synopsis "FFI bindings to Mac OS X's CommonCrypto library")
-    (description "This package is a component of the @code{commoncrypto}
-library which provides Rust FFI bindings and idiomatic wrappers for Mac OS X's
-CommonCrypto library.")
-    (license license:expat)))
-
-(define-public rust-commoncrypto-0.2
-  (package
-    (name "rust-commoncrypto")
-    (version "0.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "commoncrypto" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "01whnqcziclsj1gwavvqhrw2r5cmwh00j2fbc56iwnm2ddcahmnh"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-clippy" ,rust-clippy-0.0)
-         ("rust-commoncrypto-sys" ,rust-commoncrypto-sys-0.2))))
-    (home-page "https://github.com/malept/rust-commoncrypto")
-    (synopsis "Idiomatic Rust wrappers for Mac OS X's CommonCrypto library")
-    (description "The @{commoncrypto} library provides Rust FFI bindings and
-idiomatic wrappers for Mac OS X's CommonCrypto library.")
-    (license license:expat)))
-
 (define-public rust-common-path-1
   (package
     (name "rust-common-path")
-- 
cgit v1.2.3


From 5a48e94dff3525debb7be4b6a3deef68ca8b0004 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 21:58:27 +0200
Subject: gnu: rust-mach: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-mach-0.3, rust-mach-0.2,
rust-mach-o-sys-0.1): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I7d52ea709974637355038e8b43b4d193940529e0
---
 gnu/packages/crates-apple.scm | 58 +++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 55 ----------------------------------------
 2 files changed, 58 insertions(+), 55 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 6e9b73bce6..b7a02ad724 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -2,11 +2,14 @@
 ;;; Copyright © 2019, 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -798,6 +801,61 @@ macOS API for file changes notifications")
     (description "This package provides bindings to Apple's frameworks.")
     (license license:expat)))
 
+(define-public rust-mach-0.3
+  (package
+    (name "rust-mach")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mach" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yksa8lwzqh150gr4417rls1wk20asy9vhp8kq5g9n7z58xyh8xq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+    (home-page "https://github.com/fitzgen/mach")
+    (synopsis "Rust interface to the Mach 3.0 kernel that underlies OSX")
+    (description
+     "This package provides a Rust interface to the user-space API of the
+Mach 3.0 kernel that underlies OSX.")
+    (license (list license:asl2.0 license:expat license:bsd-2))))
+
+(define-public rust-mach-0.2
+  (package
+    (inherit rust-mach-0.3)
+    (name "rust-mach")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mach" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qdhs16cl1j3w7kvy6ak7h8lbyqmr6i3i15qfzpnv9gyrn3j9pc6"))))))
+
+(define-public rust-mach-o-sys-0.1
+  (package
+    (name "rust-mach-o-sys")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mach_o_sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09l8p7nmzq37450x2h6nb7dzg1sk6dk36a5rkcrcy81zm21lb19y"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/fitzgen/mach_o_sys")
+    (synopsis "Bindings to the OSX mach-o system library")
+    (description "This package provides bindings to the OSX mach-o system
+library")
+  (license (list license:asl2.0 license:expat))))
+
 (define-public rust-metal-0.18
   (package
     (name "rust-metal")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7a17de5f23..1155dc10a1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38055,61 +38055,6 @@ lexer.")
      "This package provides a collection of great and ubiqutitous macros.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-mach-0.3
-  (package
-    (name "rust-mach")
-    (version "0.3.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mach" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1yksa8lwzqh150gr4417rls1wk20asy9vhp8kq5g9n7z58xyh8xq"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
-    (home-page "https://github.com/fitzgen/mach")
-    (synopsis "Rust interface to the Mach 3.0 kernel that underlies OSX")
-    (description
-     "This package provides a Rust interface to the user-space API of the
-Mach 3.0 kernel that underlies OSX.")
-    (license (list license:asl2.0 license:expat license:bsd-2))))
-
-(define-public rust-mach-0.2
-  (package
-    (inherit rust-mach-0.3)
-    (name "rust-mach")
-    (version "0.2.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mach" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1qdhs16cl1j3w7kvy6ak7h8lbyqmr6i3i15qfzpnv9gyrn3j9pc6"))))))
-
-(define-public rust-mach-o-sys-0.1
-  (package
-    (name "rust-mach-o-sys")
-    (version "0.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mach_o_sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "09l8p7nmzq37450x2h6nb7dzg1sk6dk36a5rkcrcy81zm21lb19y"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/fitzgen/mach_o_sys")
-    (synopsis "Bindings to the OSX mach-o system library")
-    (description "This package provides bindings to the OSX mach-o system
-library")
-  (license (list license:asl2.0 license:expat))))
-
 (define-public rust-macrotest-1
   (package
     (name "rust-macrotest")
-- 
cgit v1.2.3


From d715677cece3376259ea4c7b296a4bbbf4fdfe28 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 22:01:31 +0200
Subject: gnu: rust-fat-macho-0.4: Move to (gnu packages crates-apple).

* gnu/packages/crates-io.scm (rust-fat-macho-0.4): Move from here ...
* gnu/packages/crates-apple.scm: ... to here.

Change-Id: I94db36b2d2a02952f3ae141edbb72d7a8a445e9f
---
 gnu/packages/crates-apple.scm | 26 ++++++++++++++++++++++++++
 gnu/packages/crates-io.scm    | 25 -------------------------
 gnu/packages/rust-apps.scm    |  1 +
 3 files changed, 27 insertions(+), 25 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index b7a02ad724..58e6bb8ae5 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -31,6 +31,7 @@
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages crates-graphics)
@@ -663,6 +664,31 @@ Central Dispatch.")
          "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84"))))
     (arguments '(#:tests? #f))))  ; Tests only run on Mac.
 
+(define-public rust-fat-macho-0.4
+  (package
+    (name "rust-fat-macho")
+    (version "0.4.7")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "fat-macho" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ywr3xqi884i12d5mfidbma1hrd4rxj9f8jw7p4bignagmy13yk3"))
+              (snippet
+               #~(begin (use-modules (guix build utils))
+                        (delete-file-recursively "tests/fixtures")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Test files removed.
+       #:cargo-inputs
+       (("rust-goblin" ,rust-goblin-0.7)
+        ("rust-llvm-bitcode" ,rust-llvm-bitcode-0.1))))
+    (home-page "https://github.com/messense/fat-macho-rs.git")
+    (synopsis "Mach-O Fat Binary Reader and Writer")
+    (description "This package provides a Mach-O Fat Binary Reader and Writer.")
+    (license license:expat)))
+
 (define-public rust-fsevent-2
   (package
     (name "rust-fsevent")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1155dc10a1..fe9080c4f0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24461,31 +24461,6 @@ floats.")
         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
         ("rust-wyhash" ,rust-wyhash-0.5))))))
 
-(define-public rust-fat-macho-0.4
-  (package
-    (name "rust-fat-macho")
-    (version "0.4.7")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "fat-macho" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0ywr3xqi884i12d5mfidbma1hrd4rxj9f8jw7p4bignagmy13yk3"))
-              (snippet
-               #~(begin (use-modules (guix build utils))
-                        (delete-file-recursively "tests/fixtures")))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f      ; Test files removed.
-       #:cargo-inputs
-       (("rust-goblin" ,rust-goblin-0.7)
-        ("rust-llvm-bitcode" ,rust-llvm-bitcode-0.1))))
-    (home-page "https://github.com/messense/fat-macho-rs.git")
-    (synopsis "Mach-O Fat Binary Reader and Writer")
-    (description "This package provides a Mach-O Fat Binary Reader and Writer.")
-    (license license:expat)))
-
 (define-public rust-fd-lock-3
   (package
     (name "rust-fd-lock")
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 812efee26a..6a224762a8 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -58,6 +58,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crates-apple)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-tls)
-- 
cgit v1.2.3


From 3a1e307b3a48e41acd48a101dacb59cef41f8cc5 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 22:23:12 +0200
Subject: gnu: rust-metal-0.18: Downgrade to 0.18.0.

Later versions of this crate were yanked by upstream.

* gnu/packages/crates-apple.scm (rust-metal-0.18): Downgrade to 0.18.0.
[cargo-inputs]: Add rust-core-graphics-0.19.  Replace rust-cocoa-0.22
with 0.20.

Change-Id: I6d75e6bf94ebccd829c356cfe0bf1944ed1f3a0b
---
 gnu/packages/crates-apple.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 58e6bb8ae5..3ba49e647e 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -885,21 +885,22 @@ library")
 (define-public rust-metal-0.18
   (package
     (name "rust-metal")
-    (version "0.18.1")
+    (version "0.18.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "metal" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "08n3kfv78jm3pf7fafwfv67n40lgcdg7w9lqn9g4sdvfwdk90vrf"))))
+        (base32 "1h1dx42sdkn4jl1rnjisv687vd5jyck982wxq3r9xgmx8bpa1671"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-block" ,rust-block-0.1)
-        ("rust-cocoa" ,rust-cocoa-0.22)
+        ("rust-cocoa" ,rust-cocoa-0.20)
+        ("rust-core-graphics" ,rust-core-graphics-0.19)
         ("rust-foreign-types" ,rust-foreign-types-0.3)
         ("rust-log" ,rust-log-0.4)
         ("rust-objc" ,rust-objc-0.2))))
-- 
cgit v1.2.3


From b44eb4782bba9bd5bad693919aeb9ec5e4c90685 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 22:25:17 +0200
Subject: gnu: Add rust-cocoa-0.20.

* gnu/packages/crates-apple.scm (rust-cocoa-0.20): New variable.

Change-Id: I80b87f02d232ff46ab5709065437fdc217d85743
---
 gnu/packages/crates-apple.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 3ba49e647e..34ce39bd89 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -275,6 +275,28 @@ extension of blocks.")
         ("rust-libc" ,rust-libc-0.2)
         ("rust-objc" ,rust-objc-0.2))))))
 
+(define-public rust-cocoa-0.20
+  (package
+    (inherit rust-cocoa-0.25)
+    (name "rust-cocoa")
+    (version "0.20.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cocoa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1y0wd1lyiz8cgbsf0fwyw06gb1akg6rvg5jr3wah8mvdqdpyhj8c"))))
+    (arguments
+     `(#:skip-build? #t     ; only for macOS
+       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-block" ,rust-block-0.1)
+                       ("rust-core-foundation" ,rust-core-foundation-0.7)
+                       ("rust-core-graphics" ,rust-core-graphics-0.19)
+                       ("rust-foreign-types" ,rust-foreign-types-0.3)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-objc" ,rust-objc-0.2))))))
+
 (define-public rust-cocoa-0.19
   (package
     (inherit rust-cocoa-0.22)
-- 
cgit v1.2.3


From b600a9f19a9d8a903bcae1cb0fd223e8d144b62c Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 22:30:08 +0200
Subject: gnu: Remove rust-security-framework-sys-0.1.

* gnu/packages/crates-apple.scm (rust-security-framework-sys-0.1): Delete variable.

Change-Id: I4b56205eddbe227b4a88b143c21fd020c5138402
---
 gnu/packages/crates-apple.scm | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 34ce39bd89..f25baecdd2 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -1426,25 +1426,6 @@ macOS and iOS.")
        (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)
         ("rust-libc" ,rust-libc-0.2))))))
 
-(define-public rust-security-framework-sys-0.1
-  (package
-    (inherit rust-security-framework-sys-0.2)
-    (name "rust-security-framework-sys")
-    (version "0.1.16")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1bdy87gvmahiiyfzghsdg2dkhznww3p3d3r676qs0y32hcg648al"))))
-    (arguments
-     `(#:skip-build? #t ; MacOS specific
-       #:cargo-inputs
-       (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
-        ("rust-libc" ,rust-libc-0.2))))))
-
 (define-public rust-system-configuration-0.5
   (package
     (name "rust-system-configuration")
-- 
cgit v1.2.3


From e03f34ac9ed0adce725d209490b0d3f4c02d897a Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 22:30:08 +0200
Subject: gnu: Remove rust-security-framework-0.1.

* gnu/packages/crates-apple.scm (rust-security-framework-0.1): Delete variable.

Change-Id: I9d76a39d94e1365d43b9ef133212bae908d96d20
---
 gnu/packages/crates-apple.scm | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index f25baecdd2..8ae341869d 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -1324,31 +1324,6 @@ macOS and iOS.")
        (("rust-hex" ,rust-hex-0.3)
         ("rust-tempdir" ,rust-tempdir-0.3))))))
 
-(define-public rust-security-framework-0.1
-  (package
-    (inherit rust-security-framework-0.2)
-    (name "rust-security-framework")
-    (version "0.1.16")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "security-framework" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0ci39ax08h2ngrl1yf1ra9smivhjs6xarmg7kp6fxracqpllx96z"))))
-    (arguments
-     `(#:skip-build? #t ; MacOS specific
-       #:cargo-inputs
-       (("rust-core-foundation" ,rust-core-foundation-0.2)
-        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-security-framework-sys" ,rust-security-framework-sys-0.1))
-       #:cargo-development-inputs
-       (("rust-hex" ,rust-hex-0.2)
-        ("rust-tempdir" ,rust-tempdir-0.3))))))
-
 (define-public rust-security-framework-sys-2
   (package
     (name "rust-security-framework-sys")
-- 
cgit v1.2.3


From b1f8862e2c5f2c05cdf1a5d7e475dcf9b2bd27c8 Mon Sep 17 00:00:00 2001
From: Wilko Meyer <w@wmeyer.eu>
Date: Mon, 8 Jan 2024 02:52:53 +0100
Subject: gnu: Add rust-mach2-0.4.

* gnu/packages/crates-apple.scm (rust-mach2-0.4): New variable.

Change-Id: I20b06f1dfcb97c1cd9d9ac70dd47138746e2fc20
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/crates-apple.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 8ae341869d..806d0adc53 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2023 Steve George <steve@futurile.net>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
+;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -904,6 +905,28 @@ Mach 3.0 kernel that underlies OSX.")
 library")
   (license (list license:asl2.0 license:expat))))
 
+(define-public rust-mach2-0.4
+  (package
+    (name "rust-mach2")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "mach2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02gpyq89rcrqdbz4hgp5bpjas21dllxfc70jgw8vj0iaxg6mbf8r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; compile_error!("mach requires macOS or iOS");
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/JohnTitor/mach2")
+    (synopsis "Rust interface to the user-space API of the Mach 3.0 kernel")
+    (description
+     "This package provides a Rust interface to the user-space API of the Mach
+3.0 kernel that underlies OSX.")
+    (license (list license:bsd-2 license:expat license:asl2.0))))
+
 (define-public rust-metal-0.18
   (package
     (name "rust-metal")
-- 
cgit v1.2.3


From f02ea1d9a48cd8e11c9417c38dada03793cd8e89 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 21 Jan 2024 20:14:14 +0200
Subject: gnu: rust-x509-parser: Move to (gnu packages crates-tls).

* gnu/packages/crates-io.scm (rust-x509-parser-0.15,
rust-x509-parser-0.14, rust-x509-parser-0.12): Move from here ...
* gnu/packages/crates-tls.scm: ... to here.

Change-Id: If01b17cf9b418e15616f1b80cefe6b071c8a18b0
---
 gnu/packages/crates-apple.scm |  3 +-
 gnu/packages/crates-io.scm    | 83 -------------------------------------------
 gnu/packages/crates-tls.scm   | 83 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 84 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 806d0adc53..df1f2add34 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -36,7 +36,8 @@
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages crates-graphics)
-  #:use-module (gnu packages crates-io))
+  #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages crates-tls))
 
 (define-public rust-block-0.1
   (package
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9c4ec7640b..370b87ea9e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79135,89 +79135,6 @@ non-cryptographic hashing algorithm and random number generator.")
      "This package provides a collection of utility functions.")
     (license license:expat)))
 
-(define-public rust-x509-parser-0.15
-  (package
-    (name "rust-x509-parser")
-    (version "0.15.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "x509-parser" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0d7nshccpnybbh8mypirplf4bqxiy36bgh4rrd7jzng19bsw5c5s"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-asn1-rs" ,rust-asn1-rs-0.5)
-        ("rust-data-encoding" ,rust-data-encoding-2)
-        ("rust-der-parser" ,rust-der-parser-8)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-nom" ,rust-nom-7)
-        ("rust-oid-registry" ,rust-oid-registry-0.6)
-        ("rust-ring" ,rust-ring-0.16)
-        ("rust-rusticata-macros" ,rust-rusticata-macros-4)
-        ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-time" ,rust-time-0.3))))
-    (home-page "https://github.com/rusticata/x509-parser")
-    (synopsis "X.509 parser written in pure Rust")
-    (description "This crate provides a parser for the X.509 v3 format (RFC
-5280 certificates).")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-x509-parser-0.14
-  (package
-    (inherit rust-x509-parser-0.15)
-    (name "rust-x509-parser")
-    (version "0.14.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "x509-parser" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1j7b3xxpwik38y9rajglmhis551gj3zz5irw1vj1bqkwnsvvxv70"))))
-    (arguments
-     `(#:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.5)
-                       ("rust-base64" ,rust-base64-0.13)
-                       ("rust-data-encoding" ,rust-data-encoding-2)
-                       ("rust-der-parser" ,rust-der-parser-8)
-                       ("rust-lazy-static" ,rust-lazy-static-1)
-                       ("rust-nom" ,rust-nom-7)
-                       ("rust-oid-registry" ,rust-oid-registry-0.6)
-                       ("rust-ring" ,rust-ring-0.16)
-                       ("rust-rusticata-macros" ,rust-rusticata-macros-4)
-                       ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-time" ,rust-time-0.3))))))
-
-(define-public rust-x509-parser-0.12
-  (package
-    (inherit rust-x509-parser-0.15)
-    (name "rust-x509-parser")
-    (version "0.12.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "x509-parser" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1vanwazknxwd1kmlp443bpph9qyas021ayqk6iljxdscm0v0ijgz"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.13)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-data-encoding" ,rust-data-encoding-2)
-        ("rust-der-parser" ,rust-der-parser-6)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-nom" ,rust-nom-7)
-        ("rust-oid-registry" ,rust-oid-registry-0.2)
-        ("rust-ring" ,rust-ring-0.16)
-        ("rust-rusticata-macros" ,rust-rusticata-macros-4)
-        ("rust-thiserror" ,rust-thiserror-1))))))
-
 (define-public rust-x86-0.52
   (package
     (name "rust-x86")
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 99dbf8e013..509c407dd8 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -739,3 +739,86 @@ PEM-encodings commonly used to store keys and certificates at rest.")
     (synopsis "Parser for the TLS protocol")
     (description "This package provides a Rust parser for the TLS protocol.")
     (license (list license:expat license:asl2.0))))
+
+(define-public rust-x509-parser-0.15
+  (package
+    (name "rust-x509-parser")
+    (version "0.15.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "x509-parser" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0d7nshccpnybbh8mypirplf4bqxiy36bgh4rrd7jzng19bsw5c5s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-asn1-rs" ,rust-asn1-rs-0.5)
+        ("rust-data-encoding" ,rust-data-encoding-2)
+        ("rust-der-parser" ,rust-der-parser-8)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-oid-registry" ,rust-oid-registry-0.6)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-rusticata-macros" ,rust-rusticata-macros-4)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-time" ,rust-time-0.3))))
+    (home-page "https://github.com/rusticata/x509-parser")
+    (synopsis "X.509 parser written in pure Rust")
+    (description "This crate provides a parser for the X.509 v3 format (RFC
+5280 certificates).")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-x509-parser-0.14
+  (package
+    (inherit rust-x509-parser-0.15)
+    (name "rust-x509-parser")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "x509-parser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j7b3xxpwik38y9rajglmhis551gj3zz5irw1vj1bqkwnsvvxv70"))))
+    (arguments
+     `(#:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.5)
+                       ("rust-base64" ,rust-base64-0.13)
+                       ("rust-data-encoding" ,rust-data-encoding-2)
+                       ("rust-der-parser" ,rust-der-parser-8)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-nom" ,rust-nom-7)
+                       ("rust-oid-registry" ,rust-oid-registry-0.6)
+                       ("rust-ring" ,rust-ring-0.16)
+                       ("rust-rusticata-macros" ,rust-rusticata-macros-4)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3))))))
+
+(define-public rust-x509-parser-0.12
+  (package
+    (inherit rust-x509-parser-0.15)
+    (name "rust-x509-parser")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "x509-parser" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1vanwazknxwd1kmlp443bpph9qyas021ayqk6iljxdscm0v0ijgz"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.13)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-data-encoding" ,rust-data-encoding-2)
+        ("rust-der-parser" ,rust-der-parser-6)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-oid-registry" ,rust-oid-registry-0.2)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-rusticata-macros" ,rust-rusticata-macros-4)
+        ("rust-thiserror" ,rust-thiserror-1))))))
-- 
cgit v1.2.3


From 5924235667ca25832ac8fafe326fa4a7188b21f5 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 09:52:28 +0200
Subject: gnu: rust-block-sys-0.2: Update to 0.2.1.

* gnu/packages/crates-apple.scm (rust-block-sys-0.2): Update to 0.2.1.
[arguments]: Don't skip the build.  Skip the tests.

Change-Id: I748fed62c881e28fcb860b482bd30d8d92e79998
---
 gnu/packages/crates-apple.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index df1f2add34..2d2defa62e 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -105,17 +105,17 @@ extension of blocks.")
 (define-public rust-block-sys-0.2
   (package
     (name "rust-block-sys")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "block-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14pddxc4rma833prvlbh5a22q6qwx32hhz7aqmnw1p9cj58czmrd"))))
+        (base32 "1rzp0218mwigdmfd5rhmj5h7c1vp0bq0nxaklhsvi8vydrls11df"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t     ; Needs to bind to MacOS libraries.
+     `(#:tests? #f          ; Needs to bind to MacOS libraries.
        #:cargo-inputs (("rust-objc-sys" ,rust-objc-sys-0.3))))
     (home-page "https://github.com/madsmtm/objc2")
     (synopsis "Raw bindings to Apple's C language extension of blocks")
-- 
cgit v1.2.3


From 6513f6c7c182762763dacebc19183ada6705e47f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 09:52:58 +0200
Subject: gnu: rust-cocoa-0.24: Update to 0.24.1.

* gnu/packages/crates-apple.scm (rust-cocoa-0.24): Update to 0.24.1.

Change-Id: I4e9365ce4a182b3cd9be885080fbf7fc1d619b95
---
 gnu/packages/crates-apple.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 2d2defa62e..a2ecbc5d58 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -210,16 +210,16 @@ extension of blocks.")
   (package
     (inherit rust-cocoa-0.25)
     (name "rust-cocoa")
-    (version "0.24.0")
+    (version "0.24.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cocoa" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0cp8hsajmi7gini22bmlsf9dac7cap7x1k169vxhwlr3j8p90qvg"))))
+        (base32 "0flg2cwpqxyvsr1v3f54vi3d3qmbr1sn7gf3mr6nhb056xwxn9gl"))))
     (arguments
-     `(#:skip-build? #t
+     `(#:skip-build? #t ; link kind `framework` is only supported on Apple targets
        #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-block" ,rust-block-0.1)
-- 
cgit v1.2.3


From 81ffa946494cceaca28b0b7e580aadb9f97da868 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 09:53:19 +0200
Subject: gnu: rust-cocoa-foundation-0.1: Update to 0.1.2.

* gnu/packages/crates-apple.scm (rust-cocoa-foundation-0.1): Update to
0.1.2.

Change-Id: I0e2b0232e53979bbda9fb5175403edd10a14786a
---
 gnu/packages/crates-apple.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index a2ecbc5d58..4c0c5d8e74 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -342,17 +342,17 @@ extension of blocks.")
 (define-public rust-cocoa-foundation-0.1
   (package
     (name "rust-cocoa-foundation")
-    (version "0.1.0")
+    (version "0.1.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cocoa-foundation" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0633ipbd28z35rsdmsl505f1aasrjsrrnirs826aa32nbnv4kpks"))))
+        (base32 "1xwk1khdyqw3dwsl15vr8p86shdcn544fr60ass8biz4nb5k8qlc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:skip-build? #t ; link kind `framework` is only supported on Apple targets
        #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-block" ,rust-block-0.1)
-- 
cgit v1.2.3


From 468607deb625ab24cd09c50c2f0d780d693fb943 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 09:53:40 +0200
Subject: gnu: rust-coreaudio-sys-0.2: Update to 0.2.15.

* gnu/packages/crates-apple.scm (rust-coreaudio-sys-0.2): Update to
0.2.15.
[arguments]: Replace rust-bindgen-0.64 with 0.69.

Change-Id: I71d6bd0f69859f33f45d267687cd7cc3fb70bdae
---
 gnu/packages/crates-apple.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 4c0c5d8e74..3d15855fa0 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -443,18 +443,18 @@ CommonCrypto library.")
 (define-public rust-coreaudio-sys-0.2
   (package
     (name "rust-coreaudio-sys")
-    (version "0.2.12")
+    (version "0.2.15")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "coreaudio-sys" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "091b4sq3kl8n4dy86l4mxq9vjzsn8w8b51xzfcpxwjkciqjv4d7h"))))
+                "1agmf1idf5m08rgkvsdxqni985acmrs629xzlpqgazq54x85h0bz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t ; Only builds for macos or ios.
-       #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.64))))
+       #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69))))
     (home-page "https://github.com/RustAudio/coreaudio-sys")
     (synopsis
      "Bindings for Apple's CoreAudio frameworks generated via rust-bindgen")
-- 
cgit v1.2.3


From 67bc8a35b506bda1ec024b9feff2bb6b83ca8aa4 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 09:54:12 +0200
Subject: gnu: rust-core-foundation-0.9: Update to 0.9.4.

* gnu/packages/crates-apple.scm (rust-core-foundation-0.9): Update to
0.9.4.

Change-Id: I69fed7539853e530789e211b6a20979fb7ce46ce
---
 gnu/packages/crates-apple.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 3d15855fa0..2a3e999986 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -465,14 +465,14 @@ CommonCrypto library.")
 (define-public rust-core-foundation-0.9
   (package
     (name "rust-core-foundation")
-    (version "0.9.3")
+    (version "0.9.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "core-foundation" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ii1ihpjb30fk38gdikm5wqlkmyr8k46fh4k2r8sagz5dng7ljhr"))))
+        (base32 "13zvbbj07yk3b61b8fhwfzhy35535a583irf23vlcg59j7h9bqci"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f             ;tests fail with a lot of "undefined reference"
-- 
cgit v1.2.3


From 44be494dfd398f3f6910f5991caca6953cb516d0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 09:54:42 +0200
Subject: gnu: rust-core-text-19: Update to 19.2.0.

* gnu/packages/crates-apple.scm (rust-core-text-19): Update to 19.2.0.

Change-Id: I91f5024a11db3264643349c6bbf47ea93fccfc24
---
 gnu/packages/crates-apple.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 2a3e999986..17b56df920 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -637,16 +637,16 @@ CommonCrypto library.")
   (package
     (inherit rust-core-text-20)
     (name "rust-core-text")
-    (version "19.1.0")
+    (version "19.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "core-text" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0q1sr55v8zq82y0dwnwwksz1radh515i0a45nbsda3w2idpg9iyj"))))
+        (base32 "09aa9gfw0zvjwncskr721ljnyj2vfsxbz2lgl7piqz70cvd4mmwr"))))
     (arguments
-     `(#:skip-build? #t
+     `(#:skip-build? #t ; link kind `framework` is only supported on Apple targets
        #:cargo-inputs
        (("rust-core-foundation" ,rust-core-foundation-0.9)
         ("rust-core-graphics" ,rust-core-graphics-0.22)
-- 
cgit v1.2.3


From b71ef85bf23444a4ee867f984414e3207325fd6d Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 09:55:09 +0200
Subject: gnu: rust-fat-macho-0.4: Update to 0.4.8.

* gnu/packages/crates-apple.scm (rust-fat-macho-0.4): Update to 0.4.8.
[cargo-inputs]: Replace rust-goblins-0.7 with 0.8.

Change-Id: Ia66fc93bac3b9215987bba8ebdd9633345739f57
---
 gnu/packages/crates-apple.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 17b56df920..8f3ee84f51 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -691,14 +691,14 @@ Central Dispatch.")
 (define-public rust-fat-macho-0.4
   (package
     (name "rust-fat-macho")
-    (version "0.4.7")
+    (version "0.4.8")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "fat-macho" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0ywr3xqi884i12d5mfidbma1hrd4rxj9f8jw7p4bignagmy13yk3"))
+                "1pqsjf13pdbhki2sdh70575hwqd18gm3vp8hpir3vl5djgrr6k0d"))
               (snippet
                #~(begin (use-modules (guix build utils))
                         (delete-file-recursively "tests/fixtures")))))
@@ -706,7 +706,7 @@ Central Dispatch.")
     (arguments
      `(#:tests? #f      ; Test files removed.
        #:cargo-inputs
-       (("rust-goblin" ,rust-goblin-0.7)
+       (("rust-goblin" ,rust-goblin-0.8)
         ("rust-llvm-bitcode" ,rust-llvm-bitcode-0.1))))
     (home-page "https://github.com/messense/fat-macho-rs.git")
     (synopsis "Mach-O Fat Binary Reader and Writer")
-- 
cgit v1.2.3


From 7384237bee0c1da69e6f85b9e7461407c616e220 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 09:55:49 +0200
Subject: gnu: rust-fsevent-2: Update to 2.1.2.

* gnu/packages/crates-apple.scm (rust-fsevent-2): Update to 2.1.2.
[arguments]: Don't skip the build.
[cargo-inputs]: Replace rust-fsevent-sys-3 with 4.

Change-Id: I2db396cd390454327eb874e5f4604e218e0daf82
---
 gnu/packages/crates-apple.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/crates-apple.scm')

diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm
index 8f3ee84f51..1c06ab4ad8 100644
--- a/gnu/packages/crates-apple.scm
+++ b/gnu/packages/crates-apple.scm
@@ -716,22 +716,20 @@ Central Dispatch.")
 (define-public rust-fsevent-2
   (package
     (name "rust-fsevent")
-    (version "2.0.2")
+    (version "2.1.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "fsevent" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0qsylfbhgha319q6a8yvkznbm3hf47gy3y8nq82qijcm5hh4gwwp"))))
+         "0pvpz0n4yl64yvx3acchxnfd28vhx88x4pvsa6zrb8d08zqx2dl8"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-fsevent-sys" ,rust-fsevent-sys-3))
+        ("rust-fsevent-sys" ,rust-fsevent-sys-4))
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3)
         ("rust-time" ,rust-time-0.2))))
-- 
cgit v1.2.3