From 87630f28811526ad90f9bb6b8f6b9d5cec7a73fe Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 14:48:18 +0200
Subject: gnu: rust-windows: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-windows-0.48, rust-windows-0.46,
rust-windows-0.44, rust-windows-0.39, rust-windows-0.32,
rust-windows-0.9, rust-windows-aarch64-gnullvm-0.52,
rust-windows-aarch64-gnullvm-0.48, rust-windows-aarch64-gnullvm-0.42,
rust-windows-aarch64-msvc-0.52, rust-windows-aarch64-msvc-0.48,
rust-windows-aarch64-msvc-0.42, rust-windows-aarch64-msvc-0.39,
rust-windows-aarch64-msvc-0.36, rust-windows-aarch64-msvc-0.32,
rust-windows-aarch64-msvc-0.28, rust-windows-bindgen-0.51,
rust-windows-i686-gnu-0.52, rust-windows-i686-gnu-0.48,
rust-windows-i686-gnu-0.42, rust-windows-i686-gnu-0.36,
rust-windows-i686-gnu-0.32, rust-windows-i686-gnu-0.28,
rust-windows-i686-msvc-0.52, rust-windows-i686-msvc-0.48,
rust-windows-i686-msvc-0.42, rust-windows-i686-msvc-0.39,
rust-windows-i686-msvc-0.36, rust-windows-i686-msvc-0.32,
rust-windows-i686-msvc-0.28, rust-windows-implement-0.48,
rust-windows-implement-0.46, rust-windows-implement-0.44,
rust-windows-implement-0.39, rust-windows-implement-0.32,
rust-windows-interface-0.48, rust-windows-interface-0.46,
rust-windows-interface-0.44, rust-windows-interface-0.39,
rust-windows-metadata-0.51, rust-windows-sys-0.52,
rust-windows-sys-0.48, rust-windows-sys-0.45, rust-windows-sys-0.42,
rust-windows-sys-0.36, rust-windows-sys-0.28, rust-windows-gen-0.9,
rust-windows-macros-0.9, rust-windows-targets-0.52,
rust-windows-targets-0.48, rust-windows-targets-0.42,
rust-windows-targets-0.39, rust-windows-targets-0.32,
rust-windows-x86-64-gnu-0.52, rust-windows-x86-64-gnu-0.48,
rust-windows-x86-64-gnu-0.42, rust-windows-x86-64-gnu-0.39,
rust-windows-x86-64-gnu-0.36, rust-windows-x86-64-gnu-0.32,
rust-windows-x86-64-gnu-0.28, rust-windows-x86-64-gnullvm-0.52,
rust-windows-x86-64-gnullvm-48, rust-windows-x86-64-gnullvm-0.42,
rust-windows-x86-64-msvc-0.52, rust-windows-x86-64-msvc-0.48,
rust-windows-x86-64-msvc-0.42, rust-windows-x86-64-msvc-0.39,
rust-windows-x86-64-msvc-0.36, rust-windows-x86-64-msvc-0.32,
rust-windows-x86-64-msvc-0.28): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I5abaa9402ae75199d4ec26b1e37b3a7293437c93
---
 gnu/packages/crates-windows.scm | 1286 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 1286 insertions(+)
 create mode 100644 gnu/packages/crates-windows.scm

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
new file mode 100644
index 0000000000..279f11af7f
--- /dev/null
+++ b/gnu/packages/crates-windows.scm
@@ -0,0 +1,1286 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2022 ( <paren@disroot.org>
+;;; Copyright © 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
+;;; Copyright © 2023 Daniel Ziltener <dziltener@lyrion.ch>
+;;;
+;;; 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-windows)
+  #:use-module (guix build-system cargo)
+  #: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-io))
+
+(define-public rust-windows-0.48
+  (package
+    (name "rust-windows")
+    (version "0.48.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03vh89ilnxdxdh0n9np4ns4m10fvm93h3b0cc05ipg3qq1mqi1p6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-implement" ,rust-windows-implement-0.48)
+        ("rust-windows-interface" ,rust-windows-interface-0.48)
+        ("rust-windows-targets" ,rust-windows-targets-0.48))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Rust for Windows")
+    (description "The windows crate lets you call any Windows API past,
+present, and future using code generated on the fly directly from the metadata
+describing the API and right into your Rust package where you can call them as
+if they were just another Rust module.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-0.46
+  (package
+    (inherit rust-windows-0.48)
+    (name "rust-windows")
+    (version "0.46.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "098crdz9gxgy3614ygznqqhn28q097r498b3rg35584nd8gb9b6d"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-implement" ,rust-windows-implement-0.46)
+        ("rust-windows-interface" ,rust-windows-interface-0.46)
+        ("rust-windows-targets" ,rust-windows-targets-0.42))))))
+
+(define-public rust-windows-0.44
+  (package
+    (inherit rust-windows-0.48)
+    (name "rust-windows")
+    (version "0.44.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ax1ip82dhszxz4hhsrdj3b0681xw6axahnfldxcgi506nmmsx4y"))))
+    (arguments
+     `(#:tests? #f      ; Test suite only runs on Windows.
+       #:cargo-inputs
+       (("rust-windows-implement" ,rust-windows-implement-0.44)
+        ("rust-windows-interface" ,rust-windows-interface-0.44)
+        ("rust-windows-targets" ,rust-windows-targets-0.42))))))
+
+(define-public rust-windows-0.39
+  (package
+    (inherit rust-windows-0.46)
+    (name "rust-windows")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jkr4rxj6jn7brqxycr1pjgvnixsimsiywl4a7v20q5ca05bvi7i"))))
+    (arguments
+     `(#:cargo-inputs (("rust-windows-implement" ,rust-windows-implement-0.39)
+                       ("rust-windows-interface" ,rust-windows-interface-0.39)
+                       ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.39)
+                       ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.39)
+                       ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.39)
+                       ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.39)
+                       ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.39))))))
+
+(define-public rust-windows-0.32
+  (package
+    (inherit rust-windows-0.46)
+    (name "rust-windows")
+    (version "0.32.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1v0h5b5g1ak2f2a6gkgjqgrqkkbdcfmf02nfmmj27g4nj3dzdvgv"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-windows-implement" ,rust-windows-implement-0.32)
+        ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.32)
+        ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.32)
+        ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.32)
+        ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.32)
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.32))))))
+
+(define-public rust-windows-0.9
+  (package
+    (inherit rust-windows-0.46)
+    (name "rust-windows")
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zy9jmhkhmsng7l9qiznxpdh5ns303s875p5kf6a5q9ym0rka7rn"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-const-sha1" ,rust-const-sha1-0.2)
+        ("rust-windows-gen" ,rust-windows-gen-0.9)
+        ("rust-windows-macros" ,rust-windows-macros-0.9))))))
+
+(define-public rust-windows-aarch64-gnullvm-0.52
+  (package
+    (name "rust-windows-aarch64-gnullvm")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_aarch64_gnullvm" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1shmn1kbdc0bpphcxz0vlph96bxz0h1jlmh93s9agf2dbpin8xyb"))
+       (snippet
+        '(delete-file "lib/libwindows.0.52.0.a"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-aarch64-gnullvm-0.48
+  (package
+    (inherit rust-windows-aarch64-gnullvm-0.52)
+    (name "rust-windows-aarch64-gnullvm")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_aarch64_gnullvm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1g71yxi61c410pwzq05ld7si4p9hyx6lf5fkw21sinvr3cp5gbli"))
+              (snippet
+               '(delete-file "lib/libwindows.0.48.0.a"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-aarch64-gnullvm-0.42
+  (package
+    (inherit rust-windows-aarch64-gnullvm-0.48)
+    (name "rust-windows-aarch64-gnullvm")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_aarch64_gnullvm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1y4q0qmvl0lvp7syxvfykafvmwal5hrjb4fmv04bqs0bawc52yjr"))
+              (snippet
+               '(delete-file "lib/libwindows.a"))))
+    (arguments
+     (list #:skip-build? #t))))
+
+(define-public rust-windows-aarch64-msvc-0.52
+  (package
+    (name "rust-windows-aarch64-msvc")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_aarch64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1vvmy1ypvzdvxn9yf0b8ygfl85gl2gpcyvsvqppsmlpisil07amv"))
+              (snippet
+               '(delete-file "lib/windows.0.52.0.lib"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description "This package provides code gen support for the windows
+crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-aarch64-msvc-0.48
+  (package
+    (inherit rust-windows-aarch64-msvc-0.52)
+    (name "rust-windows-aarch64-msvc")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_aarch64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1wvwipchhywcjaw73h998vzachf668fpqccbhrxzrz5xszh2gvxj"))
+              (snippet
+               #~(delete-file "lib/windows.0.48.0.lib"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-aarch64-msvc-0.42
+  (package
+    (inherit rust-windows-aarch64-msvc-0.48)
+    (name "rust-windows-aarch64-msvc")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_aarch64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hsdikjl5sa1fva5qskpwlxzpc5q9l909fpl1w6yy1hglrj8i3p0"))
+              (snippet
+               #~(delete-file "lib/windows.lib"))))
+    (arguments
+     (list #:skip-build? #t))))
+
+(define-public rust-windows-aarch64-msvc-0.39
+  (package
+    (inherit rust-windows-aarch64-msvc-0.42)
+    (name "rust-windows-aarch64-msvc")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_aarch64_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wj0nfmyli4bn5af243r4s3zncxv0n4j6dd8zyb41gcnc1k12xzc"))
+       (snippet
+        #~(delete-file "lib/windows.lib"))))))
+
+(define-public rust-windows-aarch64-msvc-0.36
+  (package
+    (inherit rust-windows-aarch64-msvc-0.42)
+    (name "rust-windows-aarch64-msvc")
+    (version "0.36.1")
+    (source
+     (origin
+       (inherit (package-source rust-windows-aarch64-msvc-0.42))
+       (method url-fetch)
+       (uri (crate-uri "windows_aarch64_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ixaxs2c37ll2smprzh0xq5p238zn8ylzb3lk1zddqmd77yw7f4v"))))))
+
+(define-public rust-windows-aarch64-msvc-0.32
+  (package
+    (inherit rust-windows-aarch64-msvc-0.36)
+    (name "rust-windows-aarch64-msvc")
+    (version "0.32.0")
+    (source (origin
+              (inherit (package-source rust-windows-aarch64-msvc-0.36))
+              (method url-fetch)
+              (uri (crate-uri "windows_aarch64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1x8bnafz15ksgpbjbgk1l1j2jx4rq4a2ylzcahb1jhy4n59jgsfq"))))))
+
+(define-public rust-windows-aarch64-msvc-0.28
+  (package
+    (inherit rust-windows-aarch64-msvc-0.32)
+    (name "rust-windows-aarch64-msvc")
+    (version "0.28.0")
+    (source (origin
+              (inherit (package-source rust-windows-aarch64-msvc-0.32))
+              (method url-fetch)
+              (uri (crate-uri "windows_aarch64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1hpk0n2z0jzzvwlvs98b75sa4q920953nqfc119rv19nwm0mlsaj"))))))
+
+(define-public rust-windows-bindgen-0.51
+  (package
+    (name "rust-windows-bindgen")
+    (version "0.51.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xfdq4q958qal5iks8xkaanf7w3akzfxc58dxvz7amhjg2vic7xw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-windows-metadata" ,rust-windows-metadata-0.51))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Windows metadata compiler")
+    (description "Windows metadata compiler.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-i686-gnu-0.52
+  (package
+    (name "rust-windows-i686-gnu")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04zkglz4p3pjsns5gbz85v4s5aw102raz4spj4b0lmm33z5kg1m2"))
+              (snippet
+               '(delete-file "lib/libwindows.0.52.0.a"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-i686-gnu-0.48
+  (package
+    (inherit rust-windows-i686-gnu-0.52)
+    (name "rust-windows-i686-gnu")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hd2v9kp8fss0rzl83wzhw0s5z8q1b4875m6s1phv0yvlxi1jak2"))
+              (snippet
+               #~(delete-file "lib/libwindows.0.48.0.a"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-i686-gnu-0.42
+  (package
+    (inherit rust-windows-i686-gnu-0.48)
+    (name "rust-windows-i686-gnu")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0kx866dfrby88lqs9v1vgmrkk1z6af9lhaghh5maj7d4imyr47f6"))
+              (snippet
+               #~(delete-file "lib/libwindows.a"))))
+    (arguments
+     (list #:skip-build? #t))))
+
+(define-public rust-windows-i686-gnu-0.39
+  (package
+    (inherit rust-windows-i686-gnu-0.42)
+    (name "rust-windows-i686-gnu")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_i686_gnu" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06wynhxklmh3s1ril9bh00rhv1npppcyirsp60p09xx501qwagvn"))
+       (snippet
+        #~(delete-file "lib/libwindows.a"))))))
+
+(define-public rust-windows-i686-gnu-0.36
+  (package
+    (inherit rust-windows-i686-gnu-0.42)
+    (name "rust-windows-i686-gnu")
+    (version "0.36.1")
+    (source (origin
+              (inherit (package-source rust-windows-i686-gnu-0.42))
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1dm3svxfzamrv6kklyda9c3qylgwn5nwdps6p0kc9x6s077nq3hq"))))))
+
+(define-public rust-windows-i686-gnu-0.32
+  (package
+    (inherit rust-windows-i686-gnu-0.36)
+    (name "rust-windows-i686-gnu")
+    (version "0.32.0")
+    (source (origin
+              (inherit (package-source rust-windows-i686-gnu-0.36))
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05g6kpdfxwxnw2gn1nrd7bsf5997rci0k3h3nqby168ph5l1qwba"))))))
+
+(define-public rust-windows-i686-gnu-0.28
+  (package
+    (inherit rust-windows-i686-gnu-0.32)
+    (name "rust-windows-i686-gnu")
+    (version "0.28.0")
+    (source (origin
+              (inherit (package-source rust-windows-i686-gnu-0.32))
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12hx7qpsjg9p7jggfcplqa3mf1mzr7k7s5ybzqwg1zmg4fn2aizm"))))))
+
+(define-public rust-windows-i686-msvc-0.52
+  (package
+    (name "rust-windows-i686-msvc")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "16kvmbvx0vr0zbgnaz6nsks9ycvfh5xp05bjrhq65kj623iyirgz"))
+              (snippet
+               '(delete-file "lib/windows.0.52.0.lib"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-i686-msvc-0.48
+  (package
+    (inherit rust-windows-i686-msvc-0.52)
+    (name "rust-windows-i686-msvc")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "004fkyqv3if178xx9ksqc4qqv8sz8n72mpczsr2vy8ffckiwchj5"))
+              (snippet
+               #~(delete-file "lib/windows.0.48.0.lib"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-i686-msvc-0.42
+  (package
+    (inherit rust-windows-i686-msvc-0.48)
+    (name "rust-windows-i686-msvc")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0q0h9m2aq1pygc199pa5jgc952qhcnf0zn688454i7v4xjv41n24"))
+              (snippet
+               #~(delete-file "lib/windows.lib"))))
+    (arguments
+     (list #:skip-build? #t))))
+
+(define-public rust-windows-i686-msvc-0.39
+  (package
+    (inherit rust-windows-i686-msvc-0.42)
+    (name "rust-windows-i686-msvc")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_i686_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01hiv9msxssy5iqxs7bczvf094k4mz56yi4z1bhj32c2b3zcpivv"))
+       (snippet
+        #~(delete-file "lib/windows.lib"))))))
+
+(define-public rust-windows-i686-msvc-0.36
+  (package
+    (inherit rust-windows-i686-msvc-0.42)
+    (name "rust-windows-i686-msvc")
+    (version "0.36.1")
+    (source (origin
+              (inherit (package-source rust-windows-i686-msvc-0.42))
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "097h2a7wig04wbmpi3rz1akdy4s8gslj5szsx8g2v0dj91qr3rz2"))))))
+
+(define-public rust-windows-i686-msvc-0.32
+  (package
+    (inherit rust-windows-i686-msvc-0.36)
+    (name "rust-windows-i686-msvc")
+    (version "0.32.0")
+    (source (origin
+              (inherit (package-source rust-windows-i686-msvc-0.36))
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0wj1wi01fc8hrasbakjcq8y5a7ynw9l2mcw08svmsq823axi2v0l"))))))
+
+(define-public rust-windows-i686-msvc-0.28
+  (package
+    (inherit rust-windows-i686-msvc-0.32)
+    (name "rust-windows-i686-msvc")
+    (version "0.28.0")
+    (source (origin
+              (inherit (package-source rust-windows-i686-msvc-0.32))
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0r0z8s1wcdwd20azsdfilf2a6bz68xkavl990wy64hyc8f51bmai"))))))
+
+(define-public rust-windows-implement-0.48
+  (package
+    (name "rust-windows-implement")
+    (version "0.48.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-implement" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1764n853zd7bb0wn94i0qxfs6kdy7wrz7v9qhdn7x7hvk64fabjy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "The implement macro for the windows crate")
+    (description "This package provides the @code{implement} macro for the
+windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-implement-0.46
+  (package
+    (inherit rust-windows-implement-0.48)
+    (name "rust-windows-implement")
+    (version "0.46.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-implement" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "09kw706qcms5yy34lf714zspj34v8jirfxv7yycavpcsa9czpd69"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
+(define-public rust-windows-implement-0.44
+  (package
+    (inherit rust-windows-implement-0.48)
+    (name "rust-windows-implement")
+    (version "0.44.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-implement" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ij5q9khlcfn43a1p3ypjbn711k50s9pc8la5bf04ys1wfl7rs3c"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
+(define-public rust-windows-implement-0.39
+  (package
+    (inherit rust-windows-implement-0.46)
+    (name "rust-windows-implement")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-implement" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ryfy5sgf26xmflf33zabzqn10pp6pjrbz75yh2xrdcwa27zj0ds"))))
+    (arguments
+     `(#:cargo-inputs (("rust-syn" ,rust-syn-1)
+                       ("rust-windows-tokens" ,rust-windows-tokens-0.39))))))
+
+(define-public rust-windows-implement-0.32
+  (package
+    (inherit rust-windows-implement-0.46)
+    (name "rust-windows-implement")
+    (version "0.32.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-implement" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0f3lnjs9rlihin9cjf9y7np1x15c0v09v0cwlw1n7c30145xmciz"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-syn" ,rust-syn-1)
+        ("rust-windows-tokens" ,rust-windows-tokens-0.32))))))
+
+(define-public rust-windows-interface-0.48
+  (package
+    (name "rust-windows-interface")
+    (version "0.48.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-interface" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1iqcilw0hfyzwhk12xfmcy40r10406sgf4xmdansijlv1kr8vyz6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "The interface macro for the windows crate")
+    (description "This package provides the interface macro for the windows
+crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-interface-0.46
+  (package
+    (inherit rust-windows-interface-0.48)
+    (name "rust-windows-interface")
+    (version "0.46.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-interface" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0a87zxh3wq5ng1vvgqf7jhydsshrpc5w39pyvr0l1vyv3q5k67xc"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
+(define-public rust-windows-interface-0.44
+  (package
+    (inherit rust-windows-interface-0.48)
+    (name "rust-windows-interface")
+    (version "0.44.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-interface" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zwwwfzjdf087gvgy48bbfq9yd0fsh1fj5wzs88gim7cj6jnjgw5"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
+(define-public rust-windows-interface-0.39
+  (package
+    (inherit rust-windows-interface-0.46)
+    (name "rust-windows-interface")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-interface" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00h56znmak3p8bh28y3s48m5zv6q7dn40vnvf3dzf0sz5rszrym2"))))))
+
+(define-public rust-windows-metadata-0.51
+  (package
+    (name "rust-windows-metadata")
+    (version "0.51.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03h0c6qs1yyl0z69p4k1hdq636j868qdxnri1dy47nprjvckacbm"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Windows metadata reader")
+    (description "Windows metadata reader.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-sys-0.52
+  (package
+    (name "rust-windows-sys")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0gd3v4ji88490zgb6b5mq5zgbvwv7zx1ibn8v3x83rwcdbryaar8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-windows-targets" ,rust-windows-targets-0.52))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Rust for Windows")
+    (description "The windows crate lets you call any Windows API past,
+present, and future using code generated on the fly directly from the metadata
+describing the API and right into your Rust package where you can call them as
+if they were just another Rust module.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-sys-0.48
+  (package
+    (inherit rust-windows-sys-0.52)
+    (name "rust-windows-sys")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1aan23v5gs7gya1lc46hqn9mdh8yph3fhxmhxlw36pn6pqc28zb7"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-windows-targets" ,rust-windows-targets-0.48))))))
+
+(define-public rust-windows-sys-0.45
+  (package
+    (inherit rust-windows-sys-0.48)
+    (name "rust-windows-sys")
+    (version "0.45.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1l36bcqm4g89pknfp8r9rl1w4bn017q6a8qlx8viv0xjxzjkna3m"))))
+    (arguments
+     (list #:skip-build? #t
+           #:cargo-inputs
+           `(("rust-windows-targets" ,rust-windows-targets-0.42))))))
+
+(define-public rust-windows-sys-0.42
+  (package
+    (inherit rust-windows-sys-0.45)
+    (name "rust-windows-sys")
+    (version "0.42.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19waf8aryvyq9pzk0gamgfwjycgzk4gnrazpfvv171cby0h1hgjs"))))
+    (arguments
+     (list #:skip-build? #t
+           #:cargo-inputs
+           `(("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.42)
+             ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.42)
+             ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.42)
+             ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.42)
+             ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.42)
+             ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.42)
+             ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.42))))))
+
+(define-public rust-windows-sys-0.36
+  (package
+    (inherit rust-windows-sys-0.42)
+    (name "rust-windows-sys")
+    (version "0.36.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1lmqangv0zg1l46xiq7rfnqwsx8f8m52mqbgg2mrx7x52rd1a17a"))))
+    (arguments
+     (list #:skip-build? #t
+           #:cargo-inputs
+           `(("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.36)
+             ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.36)
+             ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.36)
+             ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.36)
+             ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.36))))))
+
+(define-public rust-windows-sys-0.28
+  (package
+    (inherit rust-windows-sys-0.36)
+    (name "rust-windows-sys")
+    (version "0.28.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1xkghf343nll9i1yvha1a4spf53mnb5knzmnqj9adgsw5mh3kjl2"))))
+    (arguments
+     (list #:skip-build? #t
+           #:cargo-inputs
+           `(("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.28)
+             ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.28)
+             ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.28)
+             ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.28)
+             ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.28))))))
+
+(define-public rust-windows-gen-0.9
+  (package
+    (name "rust-windows-gen")
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_gen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0lh492px26rrna0harikyy4p7nk520pw2lv0dczp4n2xa6y4s5al"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t #:cargo-inputs (("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description "Code gen support for the windows crate")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-macros-0.9
+  (package
+    (name "rust-windows-macros")
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xivsg3lf023hs83xiab2k40fmrl11nbihcdrdkc8pc4ab398xqg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-syn" ,rust-syn-1) ("rust-windows-gen" ,rust-windows-gen-0.9))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Macros for the windows crate")
+    (description "Macros for the windows crate")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-targets-0.52
+  (package
+    (name "rust-windows-targets")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-targets" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1kg7a27ynzw8zz3krdgy6w5gbqcji27j1sz4p7xk2j5j8082064a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.52)
+        ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.52)
+        ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.52)
+        ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.52)
+        ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.52)
+        ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.52)
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.52))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-targets-0.48
+  (package
+    (inherit rust-windows-targets-0.52)
+    (name "rust-windows-targets")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-targets" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1mfzg94w0c8h4ya9sva7rra77f3iy1712af9b6bwg03wrpqbc7kv"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.48)
+        ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.48)
+        ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.48)
+        ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.48)
+        ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.48)
+        ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.48)
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.48))))))
+
+(define-public rust-windows-targets-0.42
+  (package
+    (inherit rust-windows-targets-0.48)
+    (name "rust-windows-targets")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-targets" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0wfhnib2fisxlx8c507dbmh97kgij4r6kcxdi0f9nk6l1k080lcf"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.42)
+        ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.42)
+        ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.42)
+        ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.42)
+        ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.42)
+        ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.42)
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.42))))))
+
+(define-public rust-windows-tokens-0.39
+  (package
+    (name "rust-windows-tokens")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-tokens" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15zmsz8ji6z7471xwznrm4hqp6j94s7pjjz7i34vmrjzw4pxwf7q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description "This package provides code generation support for the
+windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-tokens-0.32
+  (package
+    (inherit rust-windows-tokens-0.39)
+    (name "rust-windows-tokens")
+    (version "0.32.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-tokens" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1rrqbxjkyk6h6p6jjzbcxr0mhqbz0yfndd2s2dsgmbl75f4yy7gn"))))))
+
+(define-public rust-windows-x86-64-gnu-0.52
+  (package
+    (name "rust-windows-x86-64-gnu")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1zdy4qn178sil5sdm63lm7f0kkcjg6gvdwmcprd2yjmwn8ns6vrx"))
+              (snippet
+               '(delete-file "lib/libwindows.0.52.0.a"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-x86-64-gnu-0.48
+  (package
+    (inherit rust-windows-x86-64-gnu-0.52)
+    (name "rust-windows-x86-64-gnu")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1cblz5m6a8q6ha09bz4lz233dnq5sw2hpra06k9cna3n3xk8laya"))
+              (snippet
+               #~(delete-file "lib/libwindows.0.48.0.a"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-x86-64-gnu-0.42
+  (package
+    (inherit rust-windows-x86-64-gnu-0.48)
+    (name "rust-windows-x86-64-gnu")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0dnbf2xnp3xrvy8v9mgs3var4zq9v9yh9kv79035rdgyp2w15scd"))
+              (snippet
+               #~(delete-file "lib/libwindows.a"))))
+    (arguments
+     (list #:skip-build? #t))))
+
+(define-public rust-windows-x86-64-gnu-0.39
+  (package
+    (inherit rust-windows-x86-64-gnu-0.42)
+    (name "rust-windows-x86-64-gnu")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_x86_64_gnu" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0r9b4lmapq66nn2dga7a0mkdv5sgbp184kfwx3hklrbxcdjw2s38"))
+       (snippet
+        #~(delete-file "lib/libwindows.a"))))))
+
+(define-public rust-windows-x86-64-gnu-0.36
+  (package
+    (inherit rust-windows-x86-64-gnu-0.42)
+    (name "rust-windows-x86-64-gnu")
+    (version "0.36.1")
+    (source (origin
+              (inherit (package-source rust-windows-x86-64-gnu-0.42))
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qfrck3jnihymfrd01s8260d4snql8ks2p8yaabipi3nhwdigkad"))))))
+
+(define-public rust-windows-x86-64-gnu-0.32
+  (package
+    (inherit rust-windows-x86-64-gnu-0.36)
+    (name "rust-windows-x86-64-gnu")
+    (version "0.32.0")
+    (source (origin
+              (inherit (package-source rust-windows-x86-64-gnu-0.36))
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1g34xhcayig9sndq3555w95q6lr7jr839zxv6l365ijlfhpv24n9"))))))
+
+(define-public rust-windows-x86-64-gnu-0.28
+  (package
+    (inherit rust-windows-x86-64-gnu-0.32)
+    (name "rust-windows-x86-64-gnu")
+    (version "0.28.0")
+    (source (origin
+              (inherit (package-source rust-windows-x86-64-gnu-0.32))
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0m79bhdr54g4h4wh2q8wkjlkypb5wvl7xzhc2csiaqb5yl4z8cdw"))))))
+
+(define-public rust-windows-x86-64-gnullvm-0.52
+  (package
+    (name "rust-windows-x86-64-gnullvm")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnullvm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "17lllq4l2k1lqgcnw1cccphxp9vs7inq99kjlm2lfl9zklg7wr8s"))
+              (snippet
+               '(delete-file "lib/libwindows.0.52.0.a"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-x86-64-gnullvm-0.48
+  (package
+    (inherit rust-windows-x86-64-gnullvm-0.52)
+    (name "rust-windows-x86-64-gnullvm")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnullvm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0lxryz3ysx0145bf3i38jkr7f9nxiym8p3syklp8f20yyk0xp5kq"))
+              (snippet
+               '(delete-file "lib/libwindows.0.48.0.a"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-x86-64-gnullvm-0.42
+  (package
+    (inherit rust-windows-x86-64-gnullvm-0.48)
+    (name "rust-windows-x86-64-gnullvm")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnullvm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "18wl9r8qbsl475j39zvawlidp1bsbinliwfymr43fibdld31pm16"))
+              (snippet
+               '(delete-file "lib/libwindows.a"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-x86-64-msvc-0.52
+  (package
+    (name "rust-windows-x86-64-msvc")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "012wfq37f18c09ij5m6rniw7xxn5fcvrxbqd0wd8vgnl3hfn9yfz"))
+              (snippet
+               '(delete-file "lib/windows.0.52.0.lib"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-windows-x86-64-msvc-0.48
+  (package
+    (inherit rust-windows-x86-64-msvc-0.52)
+    (name "rust-windows-x86-64-msvc")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "12ipr1knzj2rwjygyllfi5mkd0ihnbi3r61gag5n2jgyk5bmyl8s"))
+              (snippet
+               #~(delete-file "lib/windows.0.48.0.lib"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-x86-64-msvc-0.42
+  (package
+    (inherit rust-windows-x86-64-msvc-0.48)
+    (name "rust-windows-x86-64-msvc")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1w5r0q0yzx827d10dpjza2ww0j8iajqhmb54s735hhaj66imvv4s"))
+              (snippet
+               #~(delete-file "lib/windows.lib"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-x86-64-msvc-0.39
+  (package
+    (inherit rust-windows-x86-64-msvc-0.42)
+    (name "rust-windows-x86-64-msvc")
+    (version "0.39.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_x86_64_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02g8fy1sv8g0p4fi2yk62j9a5zwhcfknp9vwg1ifkjp97a440kay"))
+        (snippet
+         #~(delete-file "lib/windows.lib"))))))
+
+(define-public rust-windows-x86-64-msvc-0.36
+  (package
+    (inherit rust-windows-x86-64-msvc-0.42)
+    (name "rust-windows-x86-64-msvc")
+    (version "0.36.1")
+    (source (origin
+              (inherit (package-source rust-windows-x86-64-msvc-0.42))
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "103n3xijm5vr7qxr1dps202ckfnv7njjnnfqmchg8gl5ii5cl4f8"))))))
+
+(define-public rust-windows-x86-64-msvc-0.32
+  (package
+    (inherit rust-windows-x86-64-msvc-0.36)
+    (name "rust-windows-x86-64-msvc")
+    (version "0.32.0")
+    (source (origin
+              (inherit (package-source rust-windows-x86-64-msvc-0.36))
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05l392h518dxn808dc1zkv6d0r9z38q68qqc0ix9fs9741v28jjh"))))))
+
+(define-public rust-windows-x86-64-msvc-0.28
+  (package
+    (inherit rust-windows-x86-64-msvc-0.32)
+    (name "rust-windows-x86-64-msvc")
+    (version "0.28.0")
+    (source (origin
+              (inherit (package-source rust-windows-x86-64-msvc-0.32))
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "17z8q25pd3dp6b84qm9nlayd3ym78sbryxlqmgcxvz9vpmy8qarz"))))))
+
-- 
cgit v1.2.3


From 956e4c32d2a0226e2f67bdb2376787e0a34d2006 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 14:56:46 +0200
Subject: gnu: rust-anstyle-wincon: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-anstyle-wincon-3,
rust-anstyle-wincon-1): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I51d7823806cc4e17bb51ad8d9ba29c96aaf4c151
---
 gnu/packages/crates-io.scm      | 40 ----------------------------------------
 gnu/packages/crates-windows.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 80793200f6..b0a703410b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2267,46 +2267,6 @@ (define-public rust-anstyle-query-1
     (description "Look up colored console capabilities")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-anstyle-wincon-3
-  (package
-    (name "rust-anstyle-wincon")
-    (version "3.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "anstyle-wincon" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "19v0fv400bmp4niqpzxnhg83vz12mmqv7l2l8vi80qcdxj0lpm8w"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)
-                       ("rust-windows-sys" ,rust-windows-sys-0.52))
-       #:cargo-development-inputs (("rust-lexopt" ,rust-lexopt-0.3))))
-    (home-page "https://github.com/rust-cli/anstyle")
-    (synopsis "Styling legacy Windows terminals")
-    (description "Styling legacy Windows terminals.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-anstyle-wincon-1
-  (package
-    (inherit rust-anstyle-wincon-3)
-    (name "rust-anstyle-wincon")
-    (version "1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "anstyle-wincon" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "12714vwjf4c1wm3qf49m5vmd93qvq2nav6zpjc0bxbh3ayjby2hq"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-anstyle" ,rust-anstyle-1)
-        ("rust-windows-sys" ,rust-windows-sys-0.48))
-       #:cargo-development-inputs
-       (("rust-lexopt" ,rust-lexopt-0.3))))))
-
 (define-public rust-antidote-1
   (package
     (name "rust-antidote")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 279f11af7f..831bed295a 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -32,6 +32,46 @@ (define-module (gnu packages crates-windows)
   #:use-module (gnu packages)
   #:use-module (gnu packages crates-io))
 
+(define-public rust-anstyle-wincon-3
+  (package
+    (name "rust-anstyle-wincon")
+    (version "3.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "anstyle-wincon" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19v0fv400bmp4niqpzxnhg83vz12mmqv7l2l8vi80qcdxj0lpm8w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)
+                       ("rust-windows-sys" ,rust-windows-sys-0.52))
+       #:cargo-development-inputs (("rust-lexopt" ,rust-lexopt-0.3))))
+    (home-page "https://github.com/rust-cli/anstyle")
+    (synopsis "Styling legacy Windows terminals")
+    (description "Styling legacy Windows terminals.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-anstyle-wincon-1
+  (package
+    (inherit rust-anstyle-wincon-3)
+    (name "rust-anstyle-wincon")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "anstyle-wincon" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12714vwjf4c1wm3qf49m5vmd93qvq2nav6zpjc0bxbh3ayjby2hq"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anstyle" ,rust-anstyle-1)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-lexopt" ,rust-lexopt-0.3))))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 4ded52a8502379f4e8ea7d3359af9bc64f5edd6f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 14:57:52 +0200
Subject: gnu: rust-cargo-credential-wincred-0.3: Move to crates-windows.scm.

* gnu/packages/crates-io.scm (rust-cargo-credential-wincred-0.3): Move
from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I391de6891c92f5e99fea200ac2ed0b4823409d95
---
 gnu/packages/crates-io.scm      | 24 ------------------------
 gnu/packages/crates-windows.scm | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b0a703410b..d58cf240f9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10065,30 +10065,6 @@ (define-public rust-cargo-credential-macos-keychain-0.3
 @code{macOS} keychain.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-cargo-credential-wincred-0.3
-  (package
-    (name "rust-cargo-credential-wincred")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cargo-credential-wincred" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0w8ciyyrq0vp25bdpsmj8221xh09x4np80wrhc53br8gkldljdv6"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cargo-credential" ,rust-cargo-credential-0.3)
-        ("rust-windows-sys" ,rust-windows-sys-0.48))))
-    (home-page "https://github.com/rust-lang/cargo")
-    (synopsis
-     "Cargo credential process that stores tokens with Windows Credential Manager")
-    (description
-     "This package provides a Cargo credential process that stores tokens with
-Windows Credential Manager.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-cargo-metadata-0.18
   (package
     (name "rust-cargo-metadata")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 831bed295a..5c4e273e8b 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -72,6 +72,30 @@ (define-public rust-anstyle-wincon-1
        #:cargo-development-inputs
        (("rust-lexopt" ,rust-lexopt-0.3))))))
 
+(define-public rust-cargo-credential-wincred-0.3
+  (package
+    (name "rust-cargo-credential-wincred")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cargo-credential-wincred" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0w8ciyyrq0vp25bdpsmj8221xh09x4np80wrhc53br8gkldljdv6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cargo-credential" ,rust-cargo-credential-0.3)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))))
+    (home-page "https://github.com/rust-lang/cargo")
+    (synopsis
+     "Cargo credential process that stores tokens with Windows Credential Manager")
+    (description
+     "This package provides a Cargo credential process that stores tokens with
+Windows Credential Manager.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 8b379ea6caa4fcc0b556323b7bdafd700b691ec8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 14:58:53 +0200
Subject: gnu: rust-conpty-0.5: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-conpty-0.5): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: Ief3f25ed5eb8cfcaaf2a78445f24e17fe2f8a4b2
---
 gnu/packages/crates-io.scm      | 24 ------------------------
 gnu/packages/crates-windows.scm | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d58cf240f9..51d2e33591 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13154,30 +13154,6 @@ (define-public rust-compound-duration-1
 minutes, seconds.")
     (license license:bsd-3)))
 
-(define-public rust-conpty-0.5
-  (package
-    (name "rust-conpty")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "conpty" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1nmkhiysnssvbi4kqaq8cybb0ffngbl64kfpk8s86ihdg940caxp"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t     ; Specifically for Windows.
-       #:cargo-inputs
-       (("rust-windows" ,rust-windows-0.44))
-       #:cargo-development-inputs
-       (("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1))))
-    (home-page "https://github.com/zhiburt/conpty")
-    (synopsis "Library which provides an interface for ConPTY")
-    (description
-     "This package provides a library which provides an interface for @code{ConPTY}.")
-    (license license:expat)))
-
 (define-public rust-const-cstr-0.3
   (package
     (name "rust-const-cstr")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 5c4e273e8b..aaa779b3ae 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -96,6 +96,30 @@ (define-public rust-cargo-credential-wincred-0.3
 Windows Credential Manager.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-conpty-0.5
+  (package
+    (name "rust-conpty")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "conpty" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1nmkhiysnssvbi4kqaq8cybb0ffngbl64kfpk8s86ihdg940caxp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Specifically for Windows.
+       #:cargo-inputs
+       (("rust-windows" ,rust-windows-0.44))
+       #:cargo-development-inputs
+       (("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1))))
+    (home-page "https://github.com/zhiburt/conpty")
+    (synopsis "Library which provides an interface for ConPTY")
+    (description
+     "This package provides a library which provides an interface for @code{ConPTY}.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From fc5de28e860e3f54eee6c2e32bafa98822798d5b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:00:32 +0200
Subject: gnu: rust-clipboard-win: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-clipboard-win-4,
rust-clipboard-win-3): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I72c54d9458a335dc053ca204b2382394b5e2c5c1
---
 gnu/packages/crates-io.scm      | 42 ---------------------------------------
 gnu/packages/crates-windows.scm | 44 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 43 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 51d2e33591..79ecaecc0e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12162,48 +12162,6 @@ (define-public rust-clicolors-control-1
 colorization.")
     (license license:expat)))
 
-(define-public rust-clipboard-win-4
-  (package
-    (name "rust-clipboard-win")
-    (version "4.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "clipboard-win" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1a1cpp4yyizz41bkij5x85p220xxrlja6l6wwj9wkvwj364a2kjf"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-error-code" ,rust-error-code-2)
-        ("rust-str-buf" ,rust-str-buf-1)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/DoumanAsh/clipboard-win")
-    (synopsis "Simple way to interact with Windows clipboard")
-    (description
-     "This package provides simple way to interact with Windows clipboard.")
-    (license license:boost1.0)))
-
-(define-public rust-clipboard-win-3
-  (package
-    (inherit rust-clipboard-win-4)
-    (name "rust-clipboard-win")
-    (version "3.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "clipboard-win" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0hh3npqfa1lfn62fwvkmjlpfnizq343a994b898ffsvb100mxpwz"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-lazy-bytes-cast" ,rust-lazy-bytes-cast-5)
-        ("rust-winapi" ,rust-winapi-0.3))))))
-
 (define-public rust-clippy-0.0
   (package
     (name "rust-clippy")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index aaa779b3ae..0bbdc1ab93 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;; Copyright © 2023 Daniel Ziltener <dziltener@lyrion.ch>
 ;;;
@@ -96,6 +96,48 @@ (define-public rust-cargo-credential-wincred-0.3
 Windows Credential Manager.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-clipboard-win-4
+  (package
+    (name "rust-clipboard-win")
+    (version "4.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clipboard-win" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1a1cpp4yyizz41bkij5x85p220xxrlja6l6wwj9wkvwj364a2kjf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-error-code" ,rust-error-code-2)
+        ("rust-str-buf" ,rust-str-buf-1)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/DoumanAsh/clipboard-win")
+    (synopsis "Simple way to interact with Windows clipboard")
+    (description
+     "This package provides simple way to interact with Windows clipboard.")
+    (license license:boost1.0)))
+
+(define-public rust-clipboard-win-3
+  (package
+    (inherit rust-clipboard-win-4)
+    (name "rust-clipboard-win")
+    (version "3.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clipboard-win" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hh3npqfa1lfn62fwvkmjlpfnizq343a994b898ffsvb100mxpwz"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-lazy-bytes-cast" ,rust-lazy-bytes-cast-5)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
 (define-public rust-conpty-0.5
   (package
     (name "rust-conpty")
-- 
cgit v1.2.3


From f5128a6f50f50769945ea4e78931945533458a5a Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:02:10 +0200
Subject: gnu: rust-codepage-0.1: Move to (gnu packages crates-windows).

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

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 79ecaecc0e..583daedc94 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12522,29 +12522,6 @@ (define-public rust-codegenrs-2
     (description "Moving code-gen our of build.rs")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-codepage-0.1
-  (package
-    (name "rust-codepage")
-    (version "0.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "codepage" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1sdxp0f8dy2rscln646326lny9i0jm7ncgyp4yncdwndq0i943lb"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-encoding-rs" ,rust-encoding-rs-0.8))))
-    (home-page "https://docs.rs/codepage/")
-    (synopsis "Mapping between Windows code page and @code{encoding_rs}")
-    (description
-     "This package provides mapping between Windows code page numbers and
-@code{encoding_rs} character encodings.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-codespan-reporting-0.11
   (package
     (name "rust-codespan-reporting")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 0bbdc1ab93..38e2d93a8a 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -138,6 +138,29 @@ (define-public rust-clipboard-win-3
        (("rust-lazy-bytes-cast" ,rust-lazy-bytes-cast-5)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
+(define-public rust-codepage-0.1
+  (package
+    (name "rust-codepage")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "codepage" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1sdxp0f8dy2rscln646326lny9i0jm7ncgyp4yncdwndq0i943lb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-encoding-rs" ,rust-encoding-rs-0.8))))
+    (home-page "https://docs.rs/codepage/")
+    (synopsis "Mapping between Windows code page and @code{encoding_rs}")
+    (description
+     "This package provides mapping between Windows code page numbers and
+@code{encoding_rs} character encodings.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-conpty-0.5
   (package
     (name "rust-conpty")
-- 
cgit v1.2.3


From 1f26de02f0c2122ef6622422facaef0787961c69 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:04:06 +0200
Subject: gnu: rust-dunce-1: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-dunce-1): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I230d2476df38f735cb20a4b375befa6e9ae94509
---
 gnu/packages/crates-io.scm      | 22 ----------------------
 gnu/packages/crates-windows.scm | 22 ++++++++++++++++++++++
 gnu/packages/shells.scm         |  1 +
 3 files changed, 23 insertions(+), 22 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 583daedc94..d796d0edf8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21769,28 +21769,6 @@ (define-public rust-duct-0.13
      "A library for running child processes.")
     (license license:expat)))
 
-(define-public rust-dunce-1
-  (package
-    (name "rust-dunce")
-    (version "1.0.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "dunce" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0fqcbwfclldbknmawi69l6zyncaiqzxkpbybcb2cc7jmlxnqrkjn"))))
-    (build-system cargo-build-system)
-    (home-page "https://gitlab.com/kornelski/dunce")
-    (synopsis "Normalize Windows paths to the most compatible format")
-    (description
-     "This crate converts Windows UNC paths to the MS-DOS-compatible format
-whenever possible, but leaves UNC paths as-is when they can't be unambiguously
-expressed in a simpler way.  This allows legacy programs to access all paths
-they can possibly access, and doesn't break any paths for UNC-aware
-programs.")
-    (license (list license:cc0 license:expat-0 license:asl2.0))))
-
 (define-public rust-dyn-clone-1
   (package
     (name "rust-dyn-clone")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 38e2d93a8a..0de0031aaf 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -185,6 +185,28 @@ (define-public rust-conpty-0.5
      "This package provides a library which provides an interface for @code{ConPTY}.")
     (license license:expat)))
 
+(define-public rust-dunce-1
+  (package
+    (name "rust-dunce")
+    (version "1.0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dunce" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0fqcbwfclldbknmawi69l6zyncaiqzxkpbybcb2cc7jmlxnqrkjn"))))
+    (build-system cargo-build-system)
+    (home-page "https://gitlab.com/kornelski/dunce")
+    (synopsis "Normalize Windows paths to the most compatible format")
+    (description
+     "This crate converts Windows UNC paths to the MS-DOS-compatible format
+whenever possible, but leaves UNC paths as-is when they can't be unambiguously
+expressed in a simpler way.  This allows legacy programs to access all paths
+they can possibly access, and doesn't break any paths for UNC-aware
+programs.")
+    (license (list license:cc0 license:expat-0 license:asl2.0))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index be8fa8d7a7..cfbc4cd97e 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages shells)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages groff)
-- 
cgit v1.2.3


From 9edffd4296b06c39517048d24dccafe40e70dbfd Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:06:24 +0200
Subject: gnu: rust-embed-resource-1: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-embed-resource-1): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: Icabdde1d670e07c6d8e1b8050fd9cf8cf6330faf
---
 gnu/packages/crates-io.scm      | 28 ----------------------------
 gnu/packages/crates-windows.scm | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 28 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d796d0edf8..408c2789dc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22487,34 +22487,6 @@ (define-public rust-lettre-email-0.9
 and authentication, easy email builders, and async support.")
     (license license:expat)))
 
-(define-public rust-embed-resource-1
-  (package
-    (name "rust-embed-resource")
-    (version "1.8.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "embed-resource" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0piayd947h4dswbpwqs02zq42y4kfzxcl52wmr7pbr07dj3vnap6"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1)
-        ("rust-rustc-version" ,rust-rustc-version-0.4)
-        ("rust-toml" ,rust-toml-0.5)
-        ("rust-vswhom" ,rust-vswhom-0.1)
-        ("rust-winreg" ,rust-winreg-0.10))))
-    (home-page "https://github.com/nabijaczleweli/rust-embed-resource")
-    (synopsis
-     "Cargo library to handle compilation and inclusion of Windows resources")
-    (description
-     "This package provides a Cargo library to handle compilation and
-inclusion of Windows resources in the most resilient fashion imaginable.")
-    (license license:expat)))
-
 (define-public rust-embedded-hal-0.2
   (package
     (name "rust-embedded-hal")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 0de0031aaf..33b7cbecc5 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
@@ -207,6 +209,33 @@ (define-public rust-dunce-1
 programs.")
     (license (list license:cc0 license:expat-0 license:asl2.0))))
 
+(define-public rust-embed-resource-1
+  (package
+    (name "rust-embed-resource")
+    (version "1.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "embed-resource" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0piayd947h4dswbpwqs02zq42y4kfzxcl52wmr7pbr07dj3vnap6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-toml" ,rust-toml-0.5)
+        ("rust-vswhom" ,rust-vswhom-0.1)
+        ("rust-winreg" ,rust-winreg-0.10))))
+    (home-page "https://github.com/nabijaczleweli/rust-embed-resource")
+    (synopsis
+     "Cargo library to handle compilation and inclusion of Windows resources")
+    (description
+     "This package provides a Cargo library to handle compilation and
+inclusion of Windows resources in the most resilient fashion imaginable.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 39c87baf8722005d53336ca87b147d100a911698 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:07:28 +0200
Subject: gnu: rust-gdi32-sys-0.2: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-gdi32-sys-0.2): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I66940bd81c50c04f928e110a2b81cfe594ca107f
---
 gnu/packages/crates-io.scm      | 25 -------------------------
 gnu/packages/crates-windows.scm | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 408c2789dc..237fd23875 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27650,31 +27650,6 @@ (define-public rust-gcc-0.3
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-gdi32-sys-0.2
-  (package
-    (name "rust-gdi32-sys")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "gdi32-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0605d4ngjsspghwjv4jicajich1gnl0aik9f880ajjzjixd524h9"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.2)
-        ("rust-winapi-build" ,rust-winapi-build-0.1))))
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Function definitions for the Windows API library gdi32")
-    (description "This package contains function definitions for the Windows
-API library @code{gdi32}.")
-    (license license:expat)))
-
 (define-public rust-generational-arena-0.2
   (package
     (name "rust-generational-arena")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 33b7cbecc5..923070c9af 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -236,6 +236,31 @@ (define-public rust-embed-resource-1
 inclusion of Windows resources in the most resilient fashion imaginable.")
     (license license:expat)))
 
+(define-public rust-gdi32-sys-0.2
+  (package
+    (name "rust-gdi32-sys")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gdi32-sys" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0605d4ngjsspghwjv4jicajich1gnl0aik9f880ajjzjixd524h9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.2)
+        ("rust-winapi-build" ,rust-winapi-build-0.1))))
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Function definitions for the Windows API library gdi32")
+    (description "This package contains function definitions for the Windows
+API library @code{gdi32}.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From fe576da503a424e8ca28b17127cb7a2680c6582e Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:09:10 +0200
Subject: gnu: rust-ipconfig: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-ipconfig-0.3, rust-ipconfig-0.2):
Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: Ic4e968f6a7bc22cf92646e75f451de03e76112ed
---
 gnu/packages/crates-io.scm      | 46 ---------------------------------------
 gnu/packages/crates-web.scm     |  1 +
 gnu/packages/crates-windows.scm | 48 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 46 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 237fd23875..7ed3a6f05c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33420,52 +33420,6 @@ (define-public rust-iovec-0.1
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-ipconfig-0.3
-  (package
-    (name "rust-ipconfig")
-    (version "0.3.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ipconfig" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1gn5j5sp58mz0630dhs1b8by7j0jqagldbd5iyln690gp7qjlc5x"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-socket2" ,rust-socket2-0.4)
-        ("rust-widestring" ,rust-widestring-0.5)
-        ("rust-winapi" ,rust-winapi-0.3)
-        ("rust-winreg" ,rust-winreg-0.10))))
-    (home-page "https://github.com/liranringel/ipconfig")
-    (synopsis "Get network adapters and configuration information for Windows")
-    (description "This package lets you get network adapters information and
-network configuration for Windows.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-ipconfig-0.2
-  (package
-    (inherit rust-ipconfig-0.3)
-    (name "rust-ipconfig")
-    (version "0.2.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ipconfig" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1mzsagc6bk3i3fpggqlq8am5rxn4hgs297rsaya90w79xj5g3qpp"))))
-    (arguments
-     `(#:tests? #f  ; failed to resolve: could not find `computer` in `ipconfig`
-       #:cargo-inputs
-       (("rust-socket2" ,rust-socket2-0.3)
-        ("rust-widestring" ,rust-widestring-0.4)
-        ("rust-winapi" ,rust-winapi-0.3)
-        ("rust-winreg" ,rust-winreg-0.6))))))
-
 (define-public rust-is-ci-1
   (package
     (name "rust-is-ci")
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index a1c0de634f..e25abcb085 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages crates-web)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-gtk)
   #:use-module (gnu packages crates-tls)
+  #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 923070c9af..576bfbe807 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
+;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
@@ -261,6 +262,53 @@ (define-public rust-gdi32-sys-0.2
 API library @code{gdi32}.")
     (license license:expat)))
 
+(define-public rust-ipconfig-0.3
+  (package
+    (name "rust-ipconfig")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ipconfig" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gn5j5sp58mz0630dhs1b8by7j0jqagldbd5iyln690gp7qjlc5x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-socket2" ,rust-socket2-0.4)
+        ("rust-widestring" ,rust-widestring-0.5)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-winreg" ,rust-winreg-0.10))))
+    (home-page "https://github.com/liranringel/ipconfig")
+    (synopsis "Get network adapters and configuration information for Windows")
+    (description "This package lets you get network adapters information and
+network configuration for Windows.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-ipconfig-0.2
+  (package
+    (inherit rust-ipconfig-0.3)
+    (name "rust-ipconfig")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ipconfig" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1mzsagc6bk3i3fpggqlq8am5rxn4hgs297rsaya90w79xj5g3qpp"))))
+    (arguments
+     `(#:tests? #f  ; failed to resolve: could not find `computer` in `ipconfig`
+       #:cargo-inputs
+       (("rust-socket2" ,rust-socket2-0.3)
+        ("rust-widestring" ,rust-widestring-0.4)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-winreg" ,rust-winreg-0.6))))))
+
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From c491da2d4af02bddcc9e0485590ad043bf2b7521 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:10:56 +0200
Subject: gnu: rust-kernel32-sys-0.2: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-kernel32-sys-0.2): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I2b2e3078836618dddf7c332848cb67eee3bd171f
---
 gnu/packages/crates-io.scm      | 24 ------------------------
 gnu/packages/crates-windows.scm | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 24 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7ed3a6f05c..f5c334f46d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34814,30 +34814,6 @@ (define-public rust-keccak-0.1
 keccak-f and keccak-p variants.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-kernel32-sys-0.2
-  (package
-    (name "rust-kernel32-sys")
-    (version "0.2.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "kernel32-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.2)
-        ("rust-winapi-build" ,rust-winapi-build-0.1))))
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Function definitions for the Windows API library kernel32")
-    (description "Contains function definitions for the Windows API library
-kernel32.")
-    (license license:expat)))
-
 (define-public rust-keyring-2
   (package
     (name "rust-keyring")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 576bfbe807..d19b9658aa 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1,4 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019, 2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@@ -308,6 +310,29 @@ (define-public rust-ipconfig-0.2
         ("rust-winapi" ,rust-winapi-0.3)
         ("rust-winreg" ,rust-winreg-0.6))))))
 
+(define-public rust-kernel32-sys-0.2
+  (package
+    (name "rust-kernel32-sys")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "kernel32-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.2)
+        ("rust-winapi-build" ,rust-winapi-build-0.1))))
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Function definitions for the Windows API library kernel32")
+    (description "Contains function definitions for the Windows API library
+kernel32.")
+    (license license:expat)))
 
 (define-public rust-windows-0.48
   (package
-- 
cgit v1.2.3


From b8d587810f4d9db3877d492194c3606ae8ab2440 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:13:30 +0200
Subject: gnu: rust-miow: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-miow-0.6, rust-miow-0.5,
rust-miow-0.4, rust-miow-0.3, rust-miow-0.2): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I663b33b5c50d20505a0ac3997aa2b0038452c8b5
---
 gnu/packages/crates-io.scm      | 105 ---------------------------------------
 gnu/packages/crates-windows.scm | 107 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 106 insertions(+), 106 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f5c334f46d..883e72f31b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40642,111 +40642,6 @@ (define-public rust-mio-uds-0.6
      "Unix domain socket bindings for mio.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-miow-0.6
-  (package
-    (name "rust-miow")
-    (version "0.6.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "miow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0i307jyhxnhgzj148cdb9zq59rhlhr1b65g142g9z9r01d1pd7rm"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-windows-sys" ,rust-windows-sys-0.48))
-       #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.8)
-        ("rust-socket2" ,rust-socket2-0.5))))
-    (home-page "https://github.com/yoshuawuyts/miow")
-    (synopsis "Rust I/O library for Windows")
-    (description
-     "This package provides a zero overhead I/O library for Windows, focusing on
-IOCP and Async I/O abstractions.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-miow-0.5
-  (package
-    (inherit rust-miow-0.6)
-    (name "rust-miow")
-    (version "0.5.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "miow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "08qi8xm2zf8dqacdbnrp19aqk2xiwmw75n1mpq43rqsmysibrzsj"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-windows-sys" ,rust-windows-sys-0.42))
-       #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.8)
-        ("rust-socket2" ,rust-socket2-0.4))))))
-
-(define-public rust-miow-0.4
-  (package
-    (inherit rust-miow-0.5)
-    (name "rust-miow")
-    (version "0.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "miow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "03p0dgbahlysgxk0sihhf09k5h13r9aam3d6rfivdbxkj9vpydx7"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-windows-sys" ,rust-windows-sys-0.28))
-       #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.8)
-        ("rust-socket2" ,rust-socket2-0.4))))))
-
-(define-public rust-miow-0.3
-  (package
-    (inherit rust-miow-0.4)
-    (name "rust-miow")
-    (version "0.3.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "miow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "15sqdhh29dqgw5xh59clwv6scbsbvdkbmdc16hbfvyq7b2sw2css"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-socket2" ,rust-socket2-0.3)
-        ("rust-winapi" ,rust-winapi-0.3))
-       #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.4))))))
-
-(define-public rust-miow-0.2
-  (package
-    (inherit rust-miow-0.3)
-    (name "rust-miow")
-    (version "0.2.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "miow" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0kcl8rnv0bhiarcdakik670w8fnxzlxhi1ys7152sck68510in7b"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
-        ("rust-net2" ,rust-net2-0.2)
-        ("rust-winapi" ,rust-winapi-0.2)
-        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))
-       #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.3))))))
-
 (define-public rust-mock-instant-0.2
   (package
     (name "rust-mock-instant")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index d19b9658aa..18997e045a 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 ( <paren@disroot.org>
@@ -334,6 +334,111 @@ (define-public rust-kernel32-sys-0.2
 kernel32.")
     (license license:expat)))
 
+(define-public rust-miow-0.6
+  (package
+    (name "rust-miow")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "miow" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0i307jyhxnhgzj148cdb9zq59rhlhr1b65g142g9z9r01d1pd7rm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-socket2" ,rust-socket2-0.5))))
+    (home-page "https://github.com/yoshuawuyts/miow")
+    (synopsis "Rust I/O library for Windows")
+    (description
+     "This package provides a zero overhead I/O library for Windows, focusing on
+IOCP and Async I/O abstractions.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-miow-0.5
+  (package
+    (inherit rust-miow-0.6)
+    (name "rust-miow")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "miow" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "08qi8xm2zf8dqacdbnrp19aqk2xiwmw75n1mpq43rqsmysibrzsj"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-sys" ,rust-windows-sys-0.42))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-socket2" ,rust-socket2-0.4))))))
+
+(define-public rust-miow-0.4
+  (package
+    (inherit rust-miow-0.5)
+    (name "rust-miow")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "miow" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03p0dgbahlysgxk0sihhf09k5h13r9aam3d6rfivdbxkj9vpydx7"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-sys" ,rust-windows-sys-0.28))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-socket2" ,rust-socket2-0.4))))))
+
+(define-public rust-miow-0.3
+  (package
+    (inherit rust-miow-0.4)
+    (name "rust-miow")
+    (version "0.3.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "miow" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15sqdhh29dqgw5xh59clwv6scbsbvdkbmdc16hbfvyq7b2sw2css"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-socket2" ,rust-socket2-0.3)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.4))))))
+
+(define-public rust-miow-0.2
+  (package
+    (inherit rust-miow-0.3)
+    (name "rust-miow")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "miow" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0kcl8rnv0bhiarcdakik670w8fnxzlxhi1ys7152sck68510in7b"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
+        ("rust-net2" ,rust-net2-0.2)
+        ("rust-winapi" ,rust-winapi-0.2)
+        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.3))))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From bbe1a55ff9e77fc89d820f9de31f780447822cd2 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:14:54 +0200
Subject: gnu: rust-output-vt100-0.1: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-output-vt100-0.1): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I4dc63c5e0651c15a34e0f6018619b639f164ba35
---
 gnu/packages/crates-io.scm      | 25 -------------------------
 gnu/packages/crates-windows.scm | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 883e72f31b..bef32b36b8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -46577,31 +46577,6 @@ (define-public rust-ouroboros-0.14
         ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.14)
         ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
 
-(define-public rust-output-vt100-0.1
-  (package
-    (name "rust-output-vt100")
-    (version "0.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "output_vt100" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1ygqplpxz4gg3i8f3rkan2q69pqll7gv65l2mmd8r9dphnvwbkak"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/Phundrak/output-vt100-rs")
-    (synopsis
-     "Utility to activate escape codes in Windows' CMD and PowerShell")
-    (description
-     "Utility to activate escape codes in Windows' CMD and PowerShell.")
-    (license license:expat)))
-
 (define-public rust-overload-0.1
   (package
     (name "rust-overload")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 18997e045a..f38405d213 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -439,6 +439,31 @@ (define-public rust-miow-0.2
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.3))))))
 
+(define-public rust-output-vt100-0.1
+  (package
+    (name "rust-output-vt100")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "output_vt100" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1ygqplpxz4gg3i8f3rkan2q69pqll7gv65l2mmd8r9dphnvwbkak"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/Phundrak/output-vt100-rs")
+    (synopsis
+     "Utility to activate escape codes in Windows' CMD and PowerShell")
+    (description
+     "Utility to activate escape codes in Windows' CMD and PowerShell.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From e0aa529716ca736010783f628d05487ebd7cdcfe Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:16:14 +0200
Subject: gnu: rust-python3-dll-a-0.2: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-python3-dll-a-0.2): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bef32b36b8..12e3d0a60a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53894,28 +53894,6 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
-(define-public rust-python3-dll-a-0.2
-  (package
-    (name "rust-python3-dll-a")
-    (version "0.2.6")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "python3-dll-a" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1a676r8xlbkijdagywwz838rbdnc9h28lgmx1ccvyqj9h9rbs5d9"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f                      ;Windows-like targets only
-       #:cargo-inputs (("rust-cc" ,rust-cc-1))))
-    (home-page "https://github.com/pyo3/python3-dll-a")
-    (synopsis "Python import library generator")
-    (description
-     "This crate generates import libraries for the Python shared library
-for MinGW-w64 and MSVC (cross-)compile targets.")
-    (license license:expat)))
-
 (define-public rust-qstring-0.7
   (package
     (name "rust-qstring")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index f38405d213..882787dc07 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 ( <paren@disroot.org>
+;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
@@ -464,6 +465,28 @@ (define-public rust-output-vt100-0.1
      "Utility to activate escape codes in Windows' CMD and PowerShell.")
     (license license:expat)))
 
+(define-public rust-python3-dll-a-0.2
+  (package
+    (name "rust-python3-dll-a")
+    (version "0.2.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "python3-dll-a" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1a676r8xlbkijdagywwz838rbdnc9h28lgmx1ccvyqj9h9rbs5d9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f                      ;Windows-like targets only
+       #:cargo-inputs (("rust-cc" ,rust-cc-1))))
+    (home-page "https://github.com/pyo3/python3-dll-a")
+    (synopsis "Python import library generator")
+    (description
+     "This crate generates import libraries for the Python shared library
+for MinGW-w64 and MSVC (cross-)compile targets.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From f197a0835a2fef07c06d5a878051b42b2e1a82e4 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:18:07 +0200
Subject: gnu: rust-remove-dir-all: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-remove-dir-all-0.5,
rust-remove-dir-all-0.8): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I37c560a330a51722401ec325c8a262782c8d3fce
---
 gnu/packages/crates-io.scm      | 58 --------------------------------------
 gnu/packages/crates-windows.scm | 62 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 60 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 12e3d0a60a..5948238cd3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56912,64 +56912,6 @@ (define-public rust-relative-path-1
     (description "This package provides portable, relative paths for Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-remove-dir-all-0.8
-  (package
-    (name "rust-remove-dir-all")
-    (version "0.8.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "remove_dir_all" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0ay0mi06ak1n5gw3yjgp0hvzl59nj31ahxpdqvczw5qrvkx5r293"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-aligned" ,rust-aligned-0.4)
-        ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-clap" ,rust-clap-4)
-        ("rust-cvt" ,rust-cvt-0.1)
-        ("rust-env-logger" ,rust-env-logger-0.10)
-        ("rust-fs-at" ,rust-fs-at-0.1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-normpath" ,rust-normpath-1)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-windows-sys" ,rust-windows-sys-0.45))
-       #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-env-logger" ,rust-env-logger-0.10)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-test-log" ,rust-test-log-0.2))))
-    (home-page "https://github.com/XAMPPRocky/remove_dir_all.git")
-    (synopsis "Implementation of remove_dir_all for Windows")
-    (description
-     "This package provides a safe, reliable implementation of
-@code{remove_dir_all} for Windows")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-remove-dir-all-0.5
-  (package
-    (inherit rust-remove-dir-all-0.8)
-    (name "rust-remove-dir-all")
-    (version "0.5.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "remove_dir_all" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1rzqbsgkmr053bxxl04vmvsd1njyz0nxvly97aip6aa2cmb15k9s"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3))
-       #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3))))))
-
 (define-public rust-rend-0.3
   (package
     (name "rust-rend")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 882787dc07..362953b763 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019, 2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
+;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2021 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@@ -487,6 +487,64 @@ (define-public rust-python3-dll-a-0.2
 for MinGW-w64 and MSVC (cross-)compile targets.")
     (license license:expat)))
 
+(define-public rust-remove-dir-all-0.8
+  (package
+    (name "rust-remove-dir-all")
+    (version "0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "remove_dir_all" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ay0mi06ak1n5gw3yjgp0hvzl59nj31ahxpdqvczw5qrvkx5r293"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aligned" ,rust-aligned-0.4)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-cvt" ,rust-cvt-0.1)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-fs-at" ,rust-fs-at-0.1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-normpath" ,rust-normpath-1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-windows-sys" ,rust-windows-sys-0.45))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-test-log" ,rust-test-log-0.2))))
+    (home-page "https://github.com/XAMPPRocky/remove_dir_all.git")
+    (synopsis "Implementation of remove_dir_all for Windows")
+    (description
+     "This package provides a safe, reliable implementation of
+@code{remove_dir_all} for Windows")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-remove-dir-all-0.5
+  (package
+    (inherit rust-remove-dir-all-0.8)
+    (name "rust-remove-dir-all")
+    (version "0.5.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "remove_dir_all" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1rzqbsgkmr053bxxl04vmvsd1njyz0nxvly97aip6aa2cmb15k9s"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 18526761648f8165777e2ef18d91ee3e3c7c8623 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:19:33 +0200
Subject: gnu: rust-schannel-0.1: Move to (gnu packages crates-windows).

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

Change-Id: If83411c1a155d69fc92953900231e02da3d7443a
---
 gnu/packages/crates-io.scm      | 24 ------------------------
 gnu/packages/crates-tls.scm     |  1 +
 gnu/packages/crates-windows.scm | 24 ++++++++++++++++++++++++
 3 files changed, 25 insertions(+), 24 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5948238cd3..800e7d4e70 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61895,30 +61895,6 @@ (define-public rust-sce-0.1
 single-cell matrices.")
     (license license:bsd-3)))
 
-(define-public rust-schannel-0.1
-  (package
-    (name "rust-schannel")
-    (version "0.1.21")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "schannel" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1cxivcbczzfv4295pqi5s80kr7nhs7xc0i40zf43b7q5qw3gng3i"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-windows-sys" ,rust-windows-sys-0.42))))
-    (home-page "https://github.com/steffengy/schannel-rs")
-    (synopsis "Rust bindings to the Windows SChannel APIs")
-    (description
-     "Rust bindings to the Windows SChannel APIs providing TLS client and
-server functionality.")
-    (license license:expat)))
-
 (define-public rust-scheduled-thread-pool-0.2
   (package
     (name "rust-scheduled-thread-pool")
diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 29ad87c486..30f9084c2c 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages crates-tls)
   #:use-module (gnu packages)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-web)
+  #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages rust-apps)
   #:use-module (gnu packages tls))
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 362953b763..3dc6e7b50e 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -545,6 +545,30 @@ (define-public rust-remove-dir-all-0.5
        #:cargo-development-inputs
        (("rust-doc-comment" ,rust-doc-comment-0.3))))))
 
+(define-public rust-schannel-0.1
+  (package
+    (name "rust-schannel")
+    (version "0.1.21")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "schannel" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1cxivcbczzfv4295pqi5s80kr7nhs7xc0i40zf43b7q5qw3gng3i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-windows-sys" ,rust-windows-sys-0.42))))
+    (home-page "https://github.com/steffengy/schannel-rs")
+    (synopsis "Rust bindings to the Windows SChannel APIs")
+    (description
+     "Rust bindings to the Windows SChannel APIs providing TLS client and
+server functionality.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 418b547739a1fd1d501f7804103c49ce25702e3f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:20:28 +0200
Subject: gnu: rust-serde-ini-0.2: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-serde-ini-0.2): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I995da190bbc23fd3dcd64c9b73858290eca0ee03
---
 gnu/packages/crates-io.scm      | 25 -------------------------
 gnu/packages/crates-windows.scm | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 800e7d4e70..5c8a221dfc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63633,31 +63633,6 @@ (define-public rust-serde-indextree-0.2
     (description "Serializing indextree structure.")
     (license license:expat)))
 
-(define-public rust-serde-ini-0.2
-  (package
-    (name "rust-serde-ini")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serde_ini" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0f8ir1bbcdyad50aj1c53dkiwr24x6dr88f045skl1xvwa3nc8zb"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-result" ,rust-result-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-void" ,rust-void-1))))
-    (home-page "https://github.com/arcnmx/serde-ini")
-    (synopsis "Windows INI file {de,}serialization")
-    (description
-     "@code{serde_ini} provides a serde @code{Serializer} and
-@code{Deserializer} for the INI format.")
-    (license license:expat)))
-
 (define-public rust-serde-hjson-0.9
   (package
     (name "rust-serde-hjson")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 3dc6e7b50e..6e5219e0f8 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -569,6 +569,31 @@ (define-public rust-schannel-0.1
 server functionality.")
     (license license:expat)))
 
+(define-public rust-serde-ini-0.2
+  (package
+    (name "rust-serde-ini")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "serde_ini" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0f8ir1bbcdyad50aj1c53dkiwr24x6dr88f045skl1xvwa3nc8zb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-result" ,rust-result-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-void" ,rust-void-1))))
+    (home-page "https://github.com/arcnmx/serde-ini")
+    (synopsis "Windows INI file {de,}serialization")
+    (description
+     "@code{serde_ini} provides a serde @code{Serializer} and
+@code{Deserializer} for the INI format.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From d0ab4a279418d0e90a34b773462a8a3f95e1044f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:22:07 +0200
Subject: gnu: rust-uds-windows: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-uds-windows-1, rust-uds-windows-0.1):
Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I1a3601922dd222d315cba462742678c1286cba4f
---
 gnu/packages/crates-io.scm      | 40 ----------------------------------------
 gnu/packages/crates-windows.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5c8a221dfc..5e423655a0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -78886,46 +78886,6 @@ (define-public rust-ucd-util-0.1
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-uds-windows-1
-  (package
-    (name "rust-uds-windows")
-    (version "1.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "uds_windows" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "03ckj6vnzvm4r5xd17dxyyqqqcfgs3xqj53hcswykk6k4i1n0rff"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-tempfile" ,rust-tempfile-3)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/haraldh/rust_uds_windows")
-    (synopsis "Unix Domain Sockets for Windows")
-    (description "This library integrates Unix Domain Sockets on Windows.")
-    (license license:expat)))
-
-(define-public rust-uds-windows-0.1
-  (package
-    (inherit rust-uds-windows-1)
-    (name "rust-uds-windows")
-    (version "0.1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "uds_windows" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0mdv9xyrf8z8zr2py5drbilkncgrkg61axq6h7hcvgggklv9f14z"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
-        ("rust-tempdir" ,rust-tempdir-0.3)
-        ("rust-winapi" ,rust-winapi-0.2)
-        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))))))
-
 (define-public rust-ufmt-0.1
   (package
     (name "rust-ufmt")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 6e5219e0f8..0660f287e2 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -594,6 +594,46 @@ (define-public rust-serde-ini-0.2
 @code{Deserializer} for the INI format.")
     (license license:expat)))
 
+(define-public rust-uds-windows-1
+  (package
+    (name "rust-uds-windows")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "uds_windows" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "03ckj6vnzvm4r5xd17dxyyqqqcfgs3xqj53hcswykk6k4i1n0rff"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-tempfile" ,rust-tempfile-3)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/haraldh/rust_uds_windows")
+    (synopsis "Unix Domain Sockets for Windows")
+    (description "This library integrates Unix Domain Sockets on Windows.")
+    (license license:expat)))
+
+(define-public rust-uds-windows-0.1
+  (package
+    (inherit rust-uds-windows-1)
+    (name "rust-uds-windows")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uds_windows" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0mdv9xyrf8z8zr2py5drbilkncgrkg61axq6h7hcvgggklv9f14z"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
+        ("rust-tempdir" ,rust-tempdir-0.3)
+        ("rust-winapi" ,rust-winapi-0.2)
+        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From ee772f7d1bf7a94ca057f3c95728aaada3083134 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:23:31 +0200
Subject: gnu: rust-user32-sys-0.2: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-user32-sys-0.2): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: Ibb805a990170200cbcb21c0b42aa90a6c04f3be2
---
 gnu/packages/crates-io.scm      | 33 ---------------------------------
 gnu/packages/crates-windows.scm | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 33 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5e423655a0..b3a92ecbbe 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80112,39 +80112,6 @@ (define-public rust-urlencoding-1
 encoding.")
     (license license:expat)))
 
-(define-public rust-user32-sys-0.2
-  (package
-    (name "rust-user32-sys")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "user32-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.2))
-       #:cargo-development-inputs
-       (("rust-winapi-build" ,rust-winapi-build-0.1))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               ((", path =.*}") "}"))
-             #t)))))
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Function definitions for the Windows API library user32")
-    (description
-     "Contains function definitions for the Windows API library user32.
-See winapi for types and constants.")
-    (license license:expat)))
-
 (define-public rust-users-0.11
   (package
     (name "rust-users")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 0660f287e2..6f0d289688 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -634,6 +634,34 @@ (define-public rust-uds-windows-0.1
         ("rust-winapi" ,rust-winapi-0.2)
         ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))))))
 
+(define-public rust-user32-sys-0.2
+  (package
+    (name "rust-user32-sys")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "user32-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.2))
+       #:cargo-development-inputs (("rust-winapi-build" ,rust-winapi-build-0.1))
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-cargo-toml
+                    (lambda _
+                      (substitute* "Cargo.toml"
+                        ((", path =.*}")
+                         "}")) #t)))))
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Function definitions for the Windows API library user32")
+    (description
+     "Contains function definitions for the Windows API library user32.
+See winapi for types and constants.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 8ce9e24cb46e26b5f352b1563d2e39fc482b6ca6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:25:19 +0200
Subject: gnu: rust-win-crypto-ng-0.5: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-win-crypto-ng-0.5): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I78b4e9c93f3ed76b8305113c424028434b62a2da
---
 gnu/packages/crates-io.scm      | 27 ---------------------------
 gnu/packages/crates-windows.scm | 27 +++++++++++++++++++++++++++
 gnu/packages/sequoia.scm        |  1 +
 3 files changed, 28 insertions(+), 27 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b3a92ecbbe..72d28994a5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82423,33 +82423,6 @@ (define-public rust-wild-2
 command-line, uniformly on all platforms")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-win-crypto-ng-0.5
-  (package
-    (name "rust-win-crypto-ng")
-    (version "0.5.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "win-crypto-ng" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0faf5bd4d5kaf642yw91lh0n2bfwnz0l70bm85ysmj3dsj4hg9mf"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t     ; Windows library
-       #:cargo-inputs
-       (("rust-cipher" ,rust-cipher-0.4)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-rand-core" ,rust-rand-core-0.5)
-        ("rust-winapi" ,rust-winapi-0.3)
-        ("rust-zeroize" ,rust-zeroize-1))
-       #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3))))
-    (home-page "https://github.com/emgre/win-crypto-ng")
-    (synopsis "Safe bindings to Windows Cryptography API: Next Generation")
-    (description "Safe bindings to Windows Cryptography API: Next Generation")
-    (license license:bsd-3)))
-
 (define-public rust-winapi-0.3
   (package
     (name "rust-winapi")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 6f0d289688..0aec946917 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -662,6 +662,33 @@ (define-public rust-user32-sys-0.2
 See winapi for types and constants.")
     (license license:expat)))
 
+(define-public rust-win-crypto-ng-0.5
+  (package
+    (name "rust-win-crypto-ng")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "win-crypto-ng" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0faf5bd4d5kaf642yw91lh0n2bfwnz0l70bm85ysmj3dsj4hg9mf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Windows library
+       #:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-rand-core" ,rust-rand-core-0.5)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "https://github.com/emgre/win-crypto-ng")
+    (synopsis "Safe bindings to Windows Cryptography API: Next Generation")
+    (description "Safe bindings to Windows Cryptography API: Next Generation")
+    (license license:bsd-3)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index ea90340897..0501bdaf15 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages sequoia)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-tls)
   #:use-module (gnu packages crates-web)
+  #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages nettle)
-- 
cgit v1.2.3


From 3247e8712510c0d8e676205f87d620ab9b751283 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:28:20 +0200
Subject: gnu: rust-winapi: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-winapi-0.3, rust-winapi-0.2,
rust-winapi-build-0.1, rust-winapi-i686-pc-windows-gnu-0.4,
rust-winapi-util-0.1, rust-winapi-wsapoll-0.1,
rust-winapi-x86-64-pc-windows-gnu-0.4): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: Ida3a2a0cdae7f823c11c3b4a6d0dd36a158ec021
---
 gnu/packages/admin.scm          |   1 +
 gnu/packages/crates-gtk.scm     |   3 +-
 gnu/packages/crates-io.scm      | 156 ---------------------------------------
 gnu/packages/crates-windows.scm | 157 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 160 insertions(+), 157 deletions(-)

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

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 47c82e9678..34ea3e0aa3 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -113,6 +113,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages cryptsetup)
   #:use-module (gnu packages curl)
diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index f21ff8a2ea..6144a23daf 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -27,8 +27,9 @@ (define-module (gnu packages crates-gtk)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)
-  #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-graphics)
+  #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages crates-windows)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 72d28994a5..3cb73001f2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82423,162 +82423,6 @@ (define-public rust-wild-2
 command-line, uniformly on all platforms")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-winapi-0.3
-  (package
-    (name "rust-winapi")
-    (version "0.3.9")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "06gl025x418lchw1wxj64ycr7gha83m44cjr5sarhynd9xkrm0sw"))))
-    (build-system cargo-build-system)
-    ;; This package depends unconditionally on these two crates.
-    (arguments
-     `(#:cargo-inputs
-       (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4)
-        ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4))))
-    (inputs
-     (list rust-winapi-i686-pc-windows-gnu-0.4
-           rust-winapi-x86-64-pc-windows-gnu-0.4))
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Raw FFI bindings for all of Windows API")
-    (description
-     "Raw FFI bindings for all of Windows API.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-winapi-0.2
-  (package
-    (inherit rust-winapi-0.3)
-    (name "rust-winapi")
-    (version "0.2.8")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n"))))
-    (arguments '(#:skip-build? #t))))
-
-(define-public rust-winapi-build-0.1
-  (package
-    (name "rust-winapi-build")
-    (version "0.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi-build" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Common code for build.rs in WinAPI -sys crates")
-    (description
-     "Common code for build.rs in WinAPI -sys crates.")
-    (license license:expat)))
-
-(define-public rust-winapi-i686-pc-windows-gnu-0.4
-  (package
-    (name "rust-winapi-i686-pc-windows-gnu")
-    (version "0.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi-i686-pc-windows-gnu" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin
-            (for-each delete-file (find-files "." "\\.a$"))))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Import libraries for the i686-pc-windows-gnu target")
-    (description "This crate provides import libraries for the
-i686-pc-windows-gnu target.  Please don't use this crate directly, depend on
-@code{winapi} instead.")
-    (license (list license:asl2.0
-                   license:expat))))
-
-(define-public rust-winapi-util-0.1
-  (package
-    (name "rust-winapi-util")
-    (version "0.1.6")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi-util" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "15i5lm39wd44004i9d5qspry2cynkrpvwzghr6s2c3dsk28nz7pj"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/BurntSushi/winapi-util")
-    (synopsis "Dumping ground for high level safe wrappers over winapi")
-    (description
-     "This package provides a dumping ground for high level safe wrappers over
-winapi.")
-    (license (list license:unlicense
-                   license:expat))))
-
-(define-public rust-winapi-wsapoll-0.1
-  (package
-    (name "rust-winapi-wsapoll")
-    (version "0.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "winapi-wsapoll" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0vnzlcm6yrlx0xdx4g7zr41n84aj73h0p8fwh0m60mbiyl873ha4"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/psychon/winapi-wsapoll")
-    (synopsis "Safe wrapper around WSAPoll")
-    (description "This package provides safe wrapper around WSAPoll.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-winapi-x86-64-pc-windows-gnu-0.4
-  (package
-    (name "rust-winapi-x86-64-pc-windows-gnu")
-    (version "0.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winapi-x86_64-pc-windows-gnu" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin
-            (for-each delete-file (find-files "." "\\.a$"))))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Import libraries for the x86_64-pc-windows-gnu target")
-    (description "This package provides import libraries for the
-x86_64-pc-windows-gnu target.  Please don't use this crate directly, depend on
-@code{winapi} instead.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-wincolor-1
   (package
     (name "rust-wincolor")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 0aec946917..d0f173d6ce 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
@@ -689,6 +690,162 @@ (define-public rust-win-crypto-ng-0.5
     (description "Safe bindings to Windows Cryptography API: Next Generation")
     (license license:bsd-3)))
 
+(define-public rust-winapi-0.3
+  (package
+    (name "rust-winapi")
+    (version "0.3.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winapi" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "06gl025x418lchw1wxj64ycr7gha83m44cjr5sarhynd9xkrm0sw"))))
+    (build-system cargo-build-system)
+    ;; This package depends unconditionally on these two crates.
+    (arguments
+     `(#:cargo-inputs
+       (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4)
+        ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4))))
+    (inputs
+     (list rust-winapi-i686-pc-windows-gnu-0.4
+           rust-winapi-x86-64-pc-windows-gnu-0.4))
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Raw FFI bindings for all of Windows API")
+    (description
+     "Raw FFI bindings for all of Windows API.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-winapi-0.2
+  (package
+    (inherit rust-winapi-0.3)
+    (name "rust-winapi")
+    (version "0.2.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winapi" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n"))))
+    (arguments '(#:skip-build? #t))))
+
+(define-public rust-winapi-build-0.1
+  (package
+    (name "rust-winapi-build")
+    (version "0.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winapi-build" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Common code for build.rs in WinAPI -sys crates")
+    (description
+     "Common code for build.rs in WinAPI -sys crates.")
+    (license license:expat)))
+
+(define-public rust-winapi-i686-pc-windows-gnu-0.4
+  (package
+    (name "rust-winapi-i686-pc-windows-gnu")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winapi-i686-pc-windows-gnu" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin
+            (for-each delete-file (find-files "." "\\.a$"))))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Import libraries for the i686-pc-windows-gnu target")
+    (description "This crate provides import libraries for the
+i686-pc-windows-gnu target.  Please don't use this crate directly, depend on
+@code{winapi} instead.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+(define-public rust-winapi-util-0.1
+  (package
+    (name "rust-winapi-util")
+    (version "0.1.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winapi-util" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "15i5lm39wd44004i9d5qspry2cynkrpvwzghr6s2c3dsk28nz7pj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/BurntSushi/winapi-util")
+    (synopsis "Dumping ground for high level safe wrappers over winapi")
+    (description
+     "This package provides a dumping ground for high level safe wrappers over
+winapi.")
+    (license (list license:unlicense
+                   license:expat))))
+
+(define-public rust-winapi-wsapoll-0.1
+  (package
+    (name "rust-winapi-wsapoll")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winapi-wsapoll" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vnzlcm6yrlx0xdx4g7zr41n84aj73h0p8fwh0m60mbiyl873ha4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/psychon/winapi-wsapoll")
+    (synopsis "Safe wrapper around WSAPoll")
+    (description "This package provides safe wrapper around WSAPoll.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-winapi-x86-64-pc-windows-gnu-0.4
+  (package
+    (name "rust-winapi-x86-64-pc-windows-gnu")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winapi-x86_64-pc-windows-gnu" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin
+            (for-each delete-file (find-files "." "\\.a$"))))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Import libraries for the x86_64-pc-windows-gnu target")
+    (description "This package provides import libraries for the
+x86_64-pc-windows-gnu target.  Please don't use this crate directly, depend on
+@code{winapi} instead.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 2cce2f8f4f112e1bcedd28c574eb5de3ed680787 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:30:09 +0200
Subject: gnu: rust-wincolor: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-wincolor-1, rust-wincolor-0.1): Move
from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I08b132c77005da87116330d9e9b019d233505c7f
---
 gnu/packages/crates-io.scm      | 42 -----------------------------------------
 gnu/packages/crates-windows.scm | 42 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 42 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3cb73001f2..e179f27130 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82423,48 +82423,6 @@ (define-public rust-wild-2
 command-line, uniformly on all platforms")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-wincolor-1
-  (package
-    (name "rust-wincolor")
-    (version "1.0.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "wincolor" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "017x33ljndwc76cp5z9llgndn0nh7v8jcjaykbizkawmwy9n3pyp"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3)
-        ("rust-winapi-util" ,rust-winapi-util-0.1))))
-    (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor")
-    (synopsis "Windows API for controlling text color in a Windows console")
-    (description
-     "This package provides a simple Windows specific API for controlling text
-color in a Windows console.")
-    (license (list license:unlicense
-                   license:expat))))
-
-(define-public rust-wincolor-0.1
-  (package
-    (inherit rust-wincolor-1)
-    (name "rust-wincolor")
-    (version "0.1.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "wincolor" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0rvpvv26a8c4dla5i5hsxlkvjcjjbl0dylhhg4147m54lfcn9c7f"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3))))))
-
 (define-public rust-winnow-0.5
   (package
     (name "rust-winnow")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index d0f173d6ce..85074d3917 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -846,6 +846,48 @@ (define-public rust-winapi-x86-64-pc-windows-gnu-0.4
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-wincolor-1
+  (package
+    (name "rust-wincolor")
+    (version "1.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "wincolor" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "017x33ljndwc76cp5z9llgndn0nh7v8jcjaykbizkawmwy9n3pyp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3)
+        ("rust-winapi-util" ,rust-winapi-util-0.1))))
+    (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor")
+    (synopsis "Windows API for controlling text color in a Windows console")
+    (description
+     "This package provides a simple Windows specific API for controlling text
+color in a Windows console.")
+    (license (list license:unlicense
+                   license:expat))))
+
+(define-public rust-wincolor-0.1
+  (package
+    (inherit rust-wincolor-1)
+    (name "rust-wincolor")
+    (version "0.1.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wincolor" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rvpvv26a8c4dla5i5hsxlkvjcjjbl0dylhhg4147m54lfcn9c7f"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3))))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 44d33deb17fcc6c4011daf4013a000f10f6a97dd Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:31:32 +0200
Subject: gnu: rust-winreg: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-winreg-0.50, rust-winreg-0.10,
rust-winreg-0.8, rust-winreg-0.7, rust-winreg-0.6, rust-winreg-0.5):
Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I6f5fe23957b0d3b2fd36f7304f64b182f2fd925e
---
 gnu/packages/crates-io.scm      | 143 ----------------------------------------
 gnu/packages/crates-windows.scm | 143 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+), 143 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e179f27130..bd513111e4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82470,149 +82470,6 @@ (define-public rust-winnow-0.4
         ("rust-memchr" ,rust-memchr-2)
         ("rust-terminal-size" ,rust-terminal-size-0.2))))))
 
-(define-public rust-winreg-0.50
-  (package
-    (name "rust-winreg")
-    (version "0.50.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "winreg" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1cddmp929k882mdh6i9f2as848f13qqna6czwsqzkh1pqnr5fkjj"))
-       (snippet
-        #~(begin (use-modules (guix build utils))
-                 (substitute* "Cargo.toml"
-                   (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
-                    (string-append "\"^" version)))))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t ; OS not supported
-       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
-                       ("rust-chrono" ,rust-chrono-0.4)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-windows-sys" ,rust-windows-sys-0.48))
-       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)
-                                   ("rust-serde-bytes" ,rust-serde-bytes-0.11)
-                                   ("rust-serde-derive" ,rust-serde-derive-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/gentoo90/winreg-rs")
-    (synopsis "Rust bindings to the MS Windows Registry API")
-    (description
-     "This package provides Rust bindings to MS Windows Registry API.")
-    (license license:expat)))
-
-(define-public rust-winreg-0.10
-  (package
-    (inherit rust-winreg-0.50)
-    (name "rust-winreg")
-    (version "0.10.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "winreg" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "17c6h02z88ijjba02bnxi5k94q5cz490nf3njh9yypf8fbig9l40"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))))
-
-(define-public rust-winreg-0.8
-  (package
-    (inherit rust-winreg-0.10)
-    (name "rust-winreg")
-    (version "0.8.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "winreg" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1364vyx4kh170pxfg8iwlvv8xskvry53xfya0565q8qnx73gh1yi"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))))
-
-(define-public rust-winreg-0.7
-  (package
-    (inherit rust-winreg-0.8)
-    (name "rust-winreg")
-    (version "0.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "winreg" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0sdxcyvda4v1v6a0k1j2v1400z3ng323k9a56gxvkq51x21dn801"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))
-       #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.3)
-        ("rust-serde-derive" ,rust-serde-derive-1))))))
-
-(define-public rust-winreg-0.6
-  (package
-    (name "rust-winreg")
-    (version "0.6.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "winreg" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1jdcqr6zmvwyrp87h48miasfdvv16gjsb60rc8dy2kqwb3mnv65j"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))
-       #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.3)
-        ("rust-serde-derive" ,rust-serde-derive-1))))
-    (home-page "https://github.com/gentoo90/winreg-rs")
-    (synopsis "Rust bindings to MS Windows Registry API")
-    (description
-     "This package provides Rust bindings to MS Windows Registry API.")
-    (license license:expat)))
-
-(define-public rust-winreg-0.5
-  (package
-    (inherit rust-winreg-0.7)
-    (name "rust-winreg")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "winreg" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0jkh4jj2g8g0bl7r1xvq9vv9hr4gdzphg9ndqm65q6f1jn9paym2"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-clippy" ,rust-clippy-0.0)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))))
-
 (define-public rust-winres-0.1
   (package
     (name "rust-winres")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 85074d3917..380372c29e 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -888,6 +888,149 @@ (define-public rust-wincolor-0.1
        #:cargo-inputs
        (("rust-winapi" ,rust-winapi-0.3))))))
 
+(define-public rust-winreg-0.50
+  (package
+    (name "rust-winreg")
+    (version "0.50.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winreg" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cddmp929k882mdh6i9f2as848f13qqna6czwsqzkh1pqnr5fkjj"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (substitute* "Cargo.toml"
+                   (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                    (string-append "\"^" version)))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; OS not supported
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)
+                                   ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+                                   ("rust-serde-derive" ,rust-serde-derive-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/gentoo90/winreg-rs")
+    (synopsis "Rust bindings to the MS Windows Registry API")
+    (description
+     "This package provides Rust bindings to MS Windows Registry API.")
+    (license license:expat)))
+
+(define-public rust-winreg-0.10
+  (package
+    (inherit rust-winreg-0.50)
+    (name "rust-winreg")
+    (version "0.10.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winreg" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17c6h02z88ijjba02bnxi5k94q5cz490nf3njh9yypf8fbig9l40"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
+(define-public rust-winreg-0.8
+  (package
+    (inherit rust-winreg-0.10)
+    (name "rust-winreg")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winreg" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1364vyx4kh170pxfg8iwlvv8xskvry53xfya0565q8qnx73gh1yi"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
+(define-public rust-winreg-0.7
+  (package
+    (inherit rust-winreg-0.8)
+    (name "rust-winreg")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winreg" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0sdxcyvda4v1v6a0k1j2v1400z3ng323k9a56gxvkq51x21dn801"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.3)
+        ("rust-serde-derive" ,rust-serde-derive-1))))))
+
+(define-public rust-winreg-0.6
+  (package
+    (name "rust-winreg")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winreg" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1jdcqr6zmvwyrp87h48miasfdvv16gjsb60rc8dy2kqwb3mnv65j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.3)
+        ("rust-serde-derive" ,rust-serde-derive-1))))
+    (home-page "https://github.com/gentoo90/winreg-rs")
+    (synopsis "Rust bindings to MS Windows Registry API")
+    (description
+     "This package provides Rust bindings to MS Windows Registry API.")
+    (license license:expat)))
+
+(define-public rust-winreg-0.5
+  (package
+    (inherit rust-winreg-0.7)
+    (name "rust-winreg")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winreg" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jkh4jj2g8g0bl7r1xvq9vv9hr4gdzphg9ndqm65q6f1jn9paym2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-clippy" ,rust-clippy-0.0)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 41c0346a831871b6e4cdc1c2eab5c54c35363c03 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:32:40 +0200
Subject: gnu: rust-winres-0.1: Move to (gnu packages crates-windows).

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

Change-Id: Ic5fc23f3d3559469f487969961a5aedc5609ad0e
---
 gnu/packages/crates-io.scm      | 22 ----------------------
 gnu/packages/crates-windows.scm | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bd513111e4..53e363d4dc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82470,28 +82470,6 @@ (define-public rust-winnow-0.4
         ("rust-memchr" ,rust-memchr-2)
         ("rust-terminal-size" ,rust-terminal-size-0.2))))))
 
-(define-public rust-winres-0.1
-  (package
-    (name "rust-winres")
-    (version "0.1.12")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "winres" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0v2gvqnd8iwwvb6fs69nv0mmk1z96430527n0qlfbsarxxhv53dn"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-toml" ,rust-toml-0.5))))
-    (home-page "https://github.com/mxre/winres")
-    (synopsis "Create and set windows icons and metadata for executables")
-    (description "A simple library to facilitate adding metainformation and
-icons to windows executables and dynamic libraries.")
-    (license license:expat)))
-
 (define-public rust-winutil-0.1
   (package
     (name "rust-winutil")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 380372c29e..f30322ea78 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1031,6 +1031,28 @@ (define-public rust-winreg-0.5
         ("rust-serde" ,rust-serde-1)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
+(define-public rust-winres-0.1
+  (package
+    (name "rust-winres")
+    (version "0.1.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winres" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0v2gvqnd8iwwvb6fs69nv0mmk1z96430527n0qlfbsarxxhv53dn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-toml" ,rust-toml-0.5))))
+    (home-page "https://github.com/mxre/winres")
+    (synopsis "Create and set windows icons and metadata for executables")
+    (description "A simple library to facilitate adding metainformation and
+icons to windows executables and dynamic libraries.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From c218f4e9953d52108fc9cfb7e62b873cb3ff0db5 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:33:20 +0200
Subject: gnu: rust-winutil-0.1: Move to (gnu packages crates-windows).

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

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

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 53e363d4dc..c35275d501 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82470,29 +82470,6 @@ (define-public rust-winnow-0.4
         ("rust-memchr" ,rust-memchr-2)
         ("rust-terminal-size" ,rust-terminal-size-0.2))))))
 
-(define-public rust-winutil-0.1
-  (package
-    (name "rust-winutil")
-    (version "0.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "winutil" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3))))
-    (build-system cargo-build-system)
-    (home-page "https://bitbucket.org/DaveLancaster/winutil")
-    (synopsis "Library wrapping a handful of useful winapi functions")
-    (description
-     "A simple library wrapping a handful of useful winapi functions.")
-    (license license:expat)))
-
 (define-public rust-wio-0.2
   (package
     (name "rust-wio")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index f30322ea78..e92c0ad050 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1053,6 +1053,29 @@ (define-public rust-winres-0.1
 icons to windows executables and dynamic libraries.")
     (license license:expat)))
 
+(define-public rust-winutil-0.1
+  (package
+    (name "rust-winutil")
+    (version "0.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "winutil" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3))))
+    (build-system cargo-build-system)
+    (home-page "https://bitbucket.org/DaveLancaster/winutil")
+    (synopsis "Library wrapping a handful of useful winapi functions")
+    (description
+     "A simple library wrapping a handful of useful winapi functions.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From b50b5dca93cc107285b5c92cc142565787a61eff Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:34:01 +0200
Subject: gnu: rust-wio-0.2: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-wio-0.2): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I929b0208dcdf12a06a7986e9eba8831e5a90758c
---
 gnu/packages/crates-io.scm      | 24 ------------------------
 gnu/packages/crates-windows.scm | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c35275d501..058ba655e1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82470,30 +82470,6 @@ (define-public rust-winnow-0.4
         ("rust-memchr" ,rust-memchr-2)
         ("rust-terminal-size" ,rust-terminal-size-0.2))))))
 
-(define-public rust-wio-0.2
-  (package
-    (name "rust-wio")
-    (version "0.2.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "wio" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "199p404fp96w1f1c93bf1jrvaqwypxf3hmmldhww4jk4yhr9j4jx"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/retep998/wio-rs")
-    (synopsis "Windows IO wrapper")
-    (description
-     "Wio is a middle-level wrapper around various things in Windows API.  It
-is designed to be a very thin layer around Windows API to provide a safe Rusty
-API but without hiding any functionality.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-wmi-0.12
   (package
     (name "rust-wmi")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index e92c0ad050..a7a053498f 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1076,6 +1076,30 @@ (define-public rust-winutil-0.1
      "A simple library wrapping a handful of useful winapi functions.")
     (license license:expat)))
 
+(define-public rust-wio-0.2
+  (package
+    (name "rust-wio")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "199p404fp96w1f1c93bf1jrvaqwypxf3hmmldhww4jk4yhr9j4jx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/retep998/wio-rs")
+    (synopsis "Windows IO wrapper")
+    (description
+     "Wio is a middle-level wrapper around various things in Windows API.  It
+is designed to be a very thin layer around Windows API to provide a safe Rusty
+API but without hiding any functionality.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 6cc1287774622834096048eb0bac9fb7ae7cd338 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:34:44 +0200
Subject: gnu: rust-wio-0.12: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-wio-0.120: Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I8b53eb6a54d3cced633639ea09731f7ba835926d
---
 gnu/packages/crates-io.scm      | 33 ---------------------------------
 gnu/packages/crates-windows.scm | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 33 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 058ba655e1..50788ee233 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82470,39 +82470,6 @@ (define-public rust-winnow-0.4
         ("rust-memchr" ,rust-memchr-2)
         ("rust-terminal-size" ,rust-terminal-size-0.2))))))
 
-(define-public rust-wmi-0.12
-  (package
-    (name "rust-wmi")
-    (version "0.12.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "wmi" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "000sdzx8fnw913ws28ranf8bhm8dvvdpz89s4fhqfbkxpd5b9zys"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
-                       ("rust-futures" ,rust-futures-0.3)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-time" ,rust-time-0.3)
-                       ("rust-windows" ,rust-windows-0.48))
-       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
-                                   ("rust-criterion" ,rust-criterion-0.4)
-                                   ("rust-serde-json" ,rust-serde-json-1)
-                                   ("rust-tempdir" ,rust-tempdir-0.3)
-                                   ("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://github.com/ohadravid/wmi-rs")
-    (synopsis "WMI crate for Rust")
-    (description
-     "This package provides the WMI (Windows Management Instrumentation) crate
-for Rust.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-write-json-0.1
   (package
     (name "rust-write-json")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index a7a053498f..12e46c70e3 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1100,6 +1100,39 @@ (define-public rust-wio-0.2
 API but without hiding any functionality.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-wmi-0.12
+  (package
+    (name "rust-wmi")
+    (version "0.12.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wmi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "000sdzx8fnw913ws28ranf8bhm8dvvdpz89s4fhqfbkxpd5b9zys"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-time" ,rust-time-0.3)
+                       ("rust-windows" ,rust-windows-0.48))
+       #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)
+                                   ("rust-criterion" ,rust-criterion-0.4)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-tempdir" ,rust-tempdir-0.3)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/ohadravid/wmi-rs")
+    (synopsis "WMI crate for Rust")
+    (description
+     "This package provides the WMI (Windows Management Instrumentation) crate
+for Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From 31a026b252b004d662afbe7e0a08308f28ef947b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 27 Dec 2023 15:35:35 +0200
Subject: gnu: rust-ws2-32-sys-0.2: Move to (gnu packages crates-windows).

* gnu/packages/crates-io.scm (rust-ws2-32-sys-0.2): Move from here ...
* gnu/packages/crates-windows.scm: ... to here.

Change-Id: I468228276166fc03c53baf00b2d7c480bfb2b121
---
 gnu/packages/crates-io.scm      | 24 ------------------------
 gnu/packages/crates-windows.scm | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 50788ee233..f12c40e145 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -82494,30 +82494,6 @@ (define-public rust-write-json-0.1
 serialization.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-ws2-32-sys-0.2
-  (package
-    (name "rust-ws2-32-sys")
-    (version "0.2.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "ws2_32-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.2)
-        ("rust-winapi-build" ,rust-winapi-build-0.1))))
-    (home-page "https://github.com/retep998/winapi-rs")
-    (synopsis "Function definitions for the Windows API library ws2_32")
-    (description
-     "Contains function definitions for the Windows API library ws2_32.")
-    (license license:expat)))
-
 (define-public rust-wycheproof-0.5
   (package
     (name "rust-wycheproof")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 12e46c70e3..4ef101a544 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1133,6 +1133,30 @@ (define-public rust-wmi-0.12
 for Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ws2-32-sys-0.2
+  (package
+    (name "rust-ws2-32-sys")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ws2_32-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.2)
+        ("rust-winapi-build" ,rust-winapi-build-0.1))))
+    (home-page "https://github.com/retep998/winapi-rs")
+    (synopsis "Function definitions for the Windows API library ws2_32")
+    (description
+     "Contains function definitions for the Windows API library ws2_32.")
+    (license license:expat)))
+
 (define-public rust-windows-0.48
   (package
     (name "rust-windows")
-- 
cgit v1.2.3


From cc003b74e2cebfc79430533ebaae4b96470381e1 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 3 Jan 2024 09:47:33 +0200
Subject: gnu: Add rust-cargo-credential-wincred-0.4.

* gnu/packages/crates-windows.scm (rust-cargo-credential-wincred-0.4):
New variable.
(rust-cargo-credential-wincred-0.3): Inherit from
rust-cargo-credential-wincred-0.4.

Change-Id: Ia24b1f84f4ed06750963b225b1bd98063981e3a6
---
 gnu/packages/crates-windows.scm | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 4ef101a544..ca92a9a613 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020, 2021 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
@@ -79,22 +79,21 @@ (define-public rust-anstyle-wincon-1
        #:cargo-development-inputs
        (("rust-lexopt" ,rust-lexopt-0.3))))))
 
-(define-public rust-cargo-credential-wincred-0.3
+(define-public rust-cargo-credential-wincred-0.4
   (package
     (name "rust-cargo-credential-wincred")
-    (version "0.3.0")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cargo-credential-wincred" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0w8ciyyrq0vp25bdpsmj8221xh09x4np80wrhc53br8gkldljdv6"))))
+        (base32 "1d3h1y0f42xv2sjvn2bmyib4pdimpxjmsi17npx0bd6wlsn568xs"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-cargo-credential" ,rust-cargo-credential-0.3)
-        ("rust-windows-sys" ,rust-windows-sys-0.48))))
+     `(#:cargo-inputs (("rust-cargo-credential" ,rust-cargo-credential-0.4)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))))
     (home-page "https://github.com/rust-lang/cargo")
     (synopsis
      "Cargo credential process that stores tokens with Windows Credential Manager")
@@ -103,6 +102,23 @@ (define-public rust-cargo-credential-wincred-0.3
 Windows Credential Manager.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cargo-credential-wincred-0.3
+  (package
+    (inherit rust-cargo-credential-wincred-0.4)
+    (name "rust-cargo-credential-wincred")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cargo-credential-wincred" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0w8ciyyrq0vp25bdpsmj8221xh09x4np80wrhc53br8gkldljdv6"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cargo-credential" ,rust-cargo-credential-0.3)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))))))
+
 (define-public rust-clipboard-win-4
   (package
     (name "rust-clipboard-win")
-- 
cgit v1.2.3


From 3eaae51dd0274de3acadf3a6392155f567e5d08f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 11:56:26 +0200
Subject: gnu: rust-clipboard-win-4: Update to 4.5.0.

* gnu/packages/crates-windows.scm (rust-clipboard-win-4): Update to
4.5.0.
[arguments]: Don't skip the build.  Skip the tests.

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

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index ca92a9a613..9a2588289f 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -122,17 +122,17 @@ (define-public rust-cargo-credential-wincred-0.3
 (define-public rust-clipboard-win-4
   (package
     (name "rust-clipboard-win")
-    (version "4.2.1")
+    (version "4.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "clipboard-win" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1a1cpp4yyizz41bkij5x85p220xxrlja6l6wwj9wkvwj364a2kjf"))))
+        (base32 "0qh3rypkf1lazniq4nr04hxsck0d55rigb5sjvpvgnap4dyc54bi"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f  ; unresolved import `clipboard_win::raw`
        #:cargo-inputs
        (("rust-error-code" ,rust-error-code-2)
         ("rust-str-buf" ,rust-str-buf-1)
-- 
cgit v1.2.3


From 12a5eec12d45c9edce3c23c9e81f10e9b35f427c Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 11:57:03 +0200
Subject: gnu: Add rust-embed-resource-2.

* gnu/packages/crates-windows.scm (rust-embed-resource-2): New variable.
(rust-embed-resource-1): Inherit from rust-embed-resource-2.

Change-Id: Iee1cbaeda0df558d4b19c00094b13405aabf7fb8
---
 gnu/packages/crates-windows.scm | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 9a2588289f..5b7941c472 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -230,25 +230,24 @@ (define-public rust-dunce-1
 programs.")
     (license (list license:cc0 license:expat-0 license:asl2.0))))
 
-(define-public rust-embed-resource-1
+(define-public rust-embed-resource-2
   (package
     (name "rust-embed-resource")
-    (version "1.8.0")
+    (version "2.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "embed-resource" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0piayd947h4dswbpwqs02zq42y4kfzxcl52wmr7pbr07dj3vnap6"))))
+        (base32 "1cicrqlblz5xf4ns7yk4aifpskbvvvg436ls4c93h77f4zlc6k7m"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1)
-        ("rust-rustc-version" ,rust-rustc-version-0.4)
-        ("rust-toml" ,rust-toml-0.5)
-        ("rust-vswhom" ,rust-vswhom-0.1)
-        ("rust-winreg" ,rust-winreg-0.10))))
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-rustc-version" ,rust-rustc-version-0.4)
+                       ("rust-toml" ,rust-toml-0.8)
+                       ("rust-vswhom" ,rust-vswhom-0.1)
+                       ("rust-winreg" ,rust-winreg-0.51))))
     (home-page "https://github.com/nabijaczleweli/rust-embed-resource")
     (synopsis
      "Cargo library to handle compilation and inclusion of Windows resources")
@@ -257,6 +256,26 @@ (define-public rust-embed-resource-1
 inclusion of Windows resources in the most resilient fashion imaginable.")
     (license license:expat)))
 
+(define-public rust-embed-resource-1
+  (package
+    (inherit rust-embed-resource-2)
+    (name "rust-embed-resource")
+    (version "1.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "embed-resource" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0piayd947h4dswbpwqs02zq42y4kfzxcl52wmr7pbr07dj3vnap6"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-toml" ,rust-toml-0.5)
+        ("rust-vswhom" ,rust-vswhom-0.1)
+        ("rust-winreg" ,rust-winreg-0.10))))))
+
 (define-public rust-gdi32-sys-0.2
   (package
     (name "rust-gdi32-sys")
-- 
cgit v1.2.3


From 82d4666445d5496ff80e471b9554955b98b7e6e7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 4 Jan 2024 11:57:33 +0200
Subject: gnu: Add rust-winreg-0.51.

* gnu/packages/crates-windows.scm (rust-winreg-0.51): New variable.
(rust-winreg-0.50): Inherit from rust-winreg-0.51.

Change-Id: Ic7d039d0197ac7d5548674b93658ef18bf1d5862
---
 gnu/packages/crates-windows.scm | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 5b7941c472..5b67742003 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -923,17 +923,17 @@ (define-public rust-wincolor-0.1
        #:cargo-inputs
        (("rust-winapi" ,rust-winapi-0.3))))))
 
-(define-public rust-winreg-0.50
+(define-public rust-winreg-0.51
   (package
     (name "rust-winreg")
-    (version "0.50.0")
+    (version "0.51.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "winreg" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1cddmp929k882mdh6i9f2as848f13qqna6czwsqzkh1pqnr5fkjj"))
+        (base32 "1z48nmaskwsiyyq9576sgf8ya3fvf1xg3kma8q7n8ml1jkvkszwk"))
        (snippet
         #~(begin (use-modules (guix build utils))
                  (substitute* "Cargo.toml"
@@ -956,6 +956,34 @@ (define-public rust-winreg-0.50
      "This package provides Rust bindings to MS Windows Registry API.")
     (license license:expat)))
 
+(define-public rust-winreg-0.50
+  (package
+    (inherit rust-winreg-0.51)
+    (name "rust-winreg")
+    (version "0.50.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winreg" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cddmp929k882mdh6i9f2as848f13qqna6czwsqzkh1pqnr5fkjj"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (substitute* "Cargo.toml"
+                   (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                    (string-append "\"^" version)))))))
+    (arguments
+     `(#:skip-build? #t ; OS not supported
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)
+                                   ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+                                   ("rust-serde-derive" ,rust-serde-derive-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-winreg-0.10
   (package
     (inherit rust-winreg-0.50)
-- 
cgit v1.2.3


From 242aee557434b0ef4c50af9bc63da1b1b5c7cab8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 7 Jan 2024 12:02:21 +0200
Subject: gnu: Add rust-anstyle-wincon-0.2.

* gnu/packages/crates-windows.scm (rust-anstyle-wincon-0.2): New variable.

Change-Id: Iadfd77f8ac8ac799a5d90582a9ecb3fd17975587
---
 gnu/packages/crates-windows.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 5b67742003..b9f1c722d0 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -79,6 +79,23 @@ (define-public rust-anstyle-wincon-1
        #:cargo-development-inputs
        (("rust-lexopt" ,rust-lexopt-0.3))))))
 
+(define-public rust-anstyle-wincon-0.2
+  (package
+    (inherit rust-anstyle-wincon-3)
+    (name "rust-anstyle-wincon")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "anstyle-wincon" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yil703c9gp5hn1d8fn5m3dr4mlwml80v6mvhwr9y52v2kv7l4n3"))))
+    (arguments
+     `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-0.3)
+                       ("rust-windows-sys" ,rust-windows-sys-0.45))
+       #:cargo-development-inputs (("rust-lexopt" ,rust-lexopt-0.3))))))
+
 (define-public rust-cargo-credential-wincred-0.4
   (package
     (name "rust-cargo-credential-wincred")
-- 
cgit v1.2.3


From 72d66a063c460f9e25f7093c05a17100e60de742 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 14 Jan 2024 16:41:12 +0200
Subject: gnu: rust-python3-dll-a-0.2: Update to 0.2.9.

* gnu/packages/crates-windows.scm (rust-python3-dll-a-0.2): Update to
0.2.9.

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

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index b9f1c722d0..2131609dff 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -521,14 +521,14 @@ (define-public rust-output-vt100-0.1
 (define-public rust-python3-dll-a-0.2
   (package
     (name "rust-python3-dll-a")
-    (version "0.2.6")
+    (version "0.2.9")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "python3-dll-a" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1a676r8xlbkijdagywwz838rbdnc9h28lgmx1ccvyqj9h9rbs5d9"))))
+                "0grlz344xq435qgs5mic0yz1p643qh3h1m11lw4zms1b87a7rw6m"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ;Windows-like targets only
-- 
cgit v1.2.3


From 55d48b8bb88e4f6973e1fa993fc4739edfe64897 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 21 Jan 2024 15:05:36 +0200
Subject: gnu: rust-cipher: Move to (gnu packages crates-crypto).

* gnu/packages/crates-io.scm (rust-cipher-0.4, rust-cipher-0.3,
rust-cipher-0.2): Move from here ...
* gnu/packages/crates-crypto.scm: ... to here.

Change-Id: I52d8ae28b64ad7e81eaea349fdd4ffa045928c5c
---
 gnu/packages/crates-crypto.scm  | 59 +++++++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm      | 59 -----------------------------------------
 gnu/packages/crates-windows.scm |  1 +
 3 files changed, 60 insertions(+), 59 deletions(-)

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

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index 59cc42eb77..7ad9e2fcc0 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -705,6 +705,65 @@ (define-public rust-c2-chacha-0.2
      "The ChaCha family of stream ciphers.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-cipher-0.4
+  (package
+    (name "rust-cipher")
+    (version "0.4.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "cipher" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32 "1b9x9agg67xq5nq879z66ni4l08m6m3hqcshk37d4is4ysd3ngvp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-blobby" ,rust-blobby-0.3)
+        ("rust-crypto-common" ,rust-crypto-common-0.1)
+        ("rust-inout" ,rust-inout-0.1)
+        ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://docs.rs/cipher/")
+    (synopsis "Traits for describing block ciphers and stream ciphers")
+    (description "This package provides traits which define the functionality
+of block ciphers and stream ciphers.  See RustCrypto/block-ciphers and
+RustCrypto/stream-ciphers for algorithm implementations which use these
+traits.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-cipher-0.3
+  (package
+    (inherit rust-cipher-0.4)
+    (name "rust-cipher")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "cipher" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32 "1dyzsv0c84rgz98d5glnhsz4320wl24x3bq511vnyf0mxir21rby"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-blobby" ,rust-blobby-0.3)
+        ("rust-generic-array" ,rust-generic-array-0.14))))))
+
+(define-public rust-cipher-0.2
+  (package
+    (inherit rust-cipher-0.3)
+    (name "rust-cipher")
+    (version "0.2.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "cipher" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32 "00b8imbmdg7zdrbaczlivmdfdy09xldg95wl4iijl15xgjcfgy0j"))))))
+
 (define-public rust-crypto-secretbox-0.1
   (package
     (name "rust-crypto-secretbox")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 269d07cbf6..ea1bac6913 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11291,65 +11291,6 @@ (define-public rust-claxon-0.4
     (description "This package provides a FLAC decoding library.")
     (license license:asl2.0)))
 
-(define-public rust-cipher-0.4
-  (package
-    (name "rust-cipher")
-    (version "0.4.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "cipher" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32 "1b9x9agg67xq5nq879z66ni4l08m6m3hqcshk37d4is4ysd3ngvp"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-blobby" ,rust-blobby-0.3)
-        ("rust-crypto-common" ,rust-crypto-common-0.1)
-        ("rust-inout" ,rust-inout-0.1)
-        ("rust-zeroize" ,rust-zeroize-1))))
-    (home-page "https://docs.rs/cipher/")
-    (synopsis "Traits for describing block ciphers and stream ciphers")
-    (description "This package provides traits which define the functionality
-of block ciphers and stream ciphers.  See RustCrypto/block-ciphers and
-RustCrypto/stream-ciphers for algorithm implementations which use these
-traits.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-cipher-0.3
-  (package
-    (inherit rust-cipher-0.4)
-    (name "rust-cipher")
-    (version "0.3.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "cipher" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32 "1dyzsv0c84rgz98d5glnhsz4320wl24x3bq511vnyf0mxir21rby"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-blobby" ,rust-blobby-0.3)
-        ("rust-generic-array" ,rust-generic-array-0.14))))))
-
-(define-public rust-cipher-0.2
-  (package
-    (inherit rust-cipher-0.3)
-    (name "rust-cipher")
-    (version "0.2.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "cipher" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32 "00b8imbmdg7zdrbaczlivmdfdy09xldg95wl4iijl15xgjcfgy0j"))))))
-
 (define-public rust-clang-sys-0.29
   (package
     (inherit rust-clang-sys-1)
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 2131609dff..f03de31fca 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -37,6 +37,7 @@ (define-module (gnu packages crates-windows)
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (gnu packages)
+  #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-io))
 
 (define-public rust-anstyle-wincon-3
-- 
cgit v1.2.3


From 6e9c33bffb109e153716ad376160961103a3fbf3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 21:18:13 +0200
Subject: gnu: rust-miow-0.3: Update to 0.3.7.

* gnu/packages/crates-windows.scm (rust-miow-0.3): Update to 0.3.7.
[cargo-inputs]: Remove rust-socket2-0.3.
[cargo-development-inputs]: Add rust-socket2-0.4.  Replace rust-rand-0.4
with 0.8.

Change-Id: I9e3d74872cb83cee4be2a6380ae8cd706103d9a2
---
 gnu/packages/crates-windows.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index f03de31fca..ee3a8390ca 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -456,20 +456,20 @@ (define-public rust-miow-0.3
   (package
     (inherit rust-miow-0.4)
     (name "rust-miow")
-    (version "0.3.6")
+    (version "0.3.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "miow" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "15sqdhh29dqgw5xh59clwv6scbsbvdkbmdc16hbfvyq7b2sw2css"))))
+        (base32 "08afp2xfpxmdw003111lxz6g9jgbj4zi2fpldvv7da6d4nqcbwdr"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-socket2" ,rust-socket2-0.3)
-        ("rust-winapi" ,rust-winapi-0.3))
+       (("rust-winapi" ,rust-winapi-0.3))
        #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.4))))))
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-socket2" ,rust-socket2-0.4))))))
 
 (define-public rust-miow-0.2
   (package
-- 
cgit v1.2.3


From 895e9ac0105208f13ce8f71679047ffb0e14c1e1 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 21:19:04 +0200
Subject: gnu: rust-uds-windows-1: Update to 1.1.0.

* gnu/packages/crates-windows.scm (rust-uds-windows-1): Update to 1.1.0.
[cargo-inputs]: Add rust-memoffset-0.9.

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

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index ee3a8390ca..6949119519 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -651,18 +651,19 @@ (define-public rust-serde-ini-0.2
 (define-public rust-uds-windows-1
   (package
     (name "rust-uds-windows")
-    (version "1.0.2")
+    (version "1.1.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "uds_windows" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "03ckj6vnzvm4r5xd17dxyyqqqcfgs3xqj53hcswykk6k4i1n0rff"))))
+                "1fb4y65pw0rsp0gyfyinjazlzxz1f6zv7j4zmb20l5pxwv1ypnl9"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-tempfile" ,rust-tempfile-3)
+       (("rust-memoffset" ,rust-memoffset-0.9)
+        ("rust-tempfile" ,rust-tempfile-3)
         ("rust-winapi" ,rust-winapi-0.3))))
     (home-page "https://github.com/haraldh/rust_uds_windows")
     (synopsis "Unix Domain Sockets for Windows")
-- 
cgit v1.2.3


From ba21c3197a59460267ad1f65552ca6f42274f7be Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 22 Jan 2024 21:19:38 +0200
Subject: gnu: rust-uds-windows-0.1: Update to 0.1.6.

* gnu/packages/crates-windows.scm (rust-uds-windows-0.1): Update to
0.1.6.
[cargo-inputs]: Replace rust-winapi-0.2 with 0.3.  Remove
rust-kernel32-sys-0.2, rust-tempdir-0.3, rust-ws2-32-sys-0.2.

Change-Id: I75bdadf8b56edeeec3e2dde667f78d7b269e0a0d
---
 gnu/packages/crates-windows.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 6949119519..79a8674454 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -674,20 +674,18 @@ (define-public rust-uds-windows-0.1
   (package
     (inherit rust-uds-windows-1)
     (name "rust-uds-windows")
-    (version "0.1.5")
+    (version "0.1.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "uds_windows" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0mdv9xyrf8z8zr2py5drbilkncgrkg61axq6h7hcvgggklv9f14z"))))
+        (base32 "1v7g9hl06s13xc4d2bn6khqn2cz6ha2f2d71j8l6mvlhypsjpch9"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
-        ("rust-tempdir" ,rust-tempdir-0.3)
-        ("rust-winapi" ,rust-winapi-0.2)
-        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))))))
+       (("rust-tempdir" ,rust-tempdir-0.3)
+        ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-user32-sys-0.2
   (package
-- 
cgit v1.2.3


From 90818b39c8e847c2135c60bc186a8523055a294e Mon Sep 17 00:00:00 2001
From: Tomas Volf <~@wolfsden.cz>
Date: Thu, 15 Feb 2024 21:26:56 +0100
Subject: gnu: Add rust-windows-metadata-0.52.

* gnu/packages/crates-windows.scm (rust-windows-metadata-0.52): New
variable.
(rust-windows-metadata-0.51): Inherit from rust-windows-metadata-0.52.

Change-Id: Ic8c951050bec955b05d2c9fe25da186e23b16f9a
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/crates-windows.scm | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 79a8674454..ac2271e5ad 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;; Copyright © 2023 Daniel Ziltener <dziltener@lyrion.ch>
+;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1936,23 +1937,36 @@ (define-public rust-windows-interface-0.39
        (sha256
         (base32 "00h56znmak3p8bh28y3s48m5zv6q7dn40vnvf3dzf0sz5rszrym2"))))))
 
-(define-public rust-windows-metadata-0.51
+(define-public rust-windows-metadata-0.52
   (package
     (name "rust-windows-metadata")
-    (version "0.51.1")
+    (version "0.52.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "windows-metadata" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "03h0c6qs1yyl0z69p4k1hdq636j868qdxnri1dy47nprjvckacbm"))))
+        (base32 "1vz49s2mm74fmjabh3kxxhzbz16ys41b78jgi6xwssp2069db3r1"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/microsoft/windows-rs")
     (synopsis "Windows metadata reader")
     (description "Windows metadata reader.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-metadata-0.51
+  (package
+    (inherit rust-windows-metadata-0.52)
+    (name "rust-windows-metadata")
+    (version "0.51.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "03h0c6qs1yyl0z69p4k1hdq636j868qdxnri1dy47nprjvckacbm"))))))
+
 (define-public rust-windows-sys-0.52
   (package
     (name "rust-windows-sys")
-- 
cgit v1.2.3


From a95171d412038fc77d1820a41602ec5bc78ab41e Mon Sep 17 00:00:00 2001
From: Tomas Volf <~@wolfsden.cz>
Date: Thu, 15 Feb 2024 21:26:57 +0100
Subject: gnu: Add rust-windows-bindgen-0.52.

* gnu/packages/crates-windows.scm (rust-windows-bindgen-0.52): New
variable.
(rust-windows-bindgen-0.51): Inherit from rust-windows-bindgen-0.52.

Change-Id: Ib84ff26569bc34d94c1a69062d70960eac58152d
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/crates-windows.scm | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index ac2271e5ad..e50c63f80f 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1527,28 +1527,46 @@ (define-public rust-windows-aarch64-msvc-0.28
                (base32
                 "1hpk0n2z0jzzvwlvs98b75sa4q920953nqfc119rv19nwm0mlsaj"))))))
 
-(define-public rust-windows-bindgen-0.51
+(define-public rust-windows-bindgen-0.52
   (package
     (name "rust-windows-bindgen")
-    (version "0.51.1")
+    (version "0.52.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "windows-bindgen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0xfdq4q958qal5iks8xkaanf7w3akzfxc58dxvz7amhjg2vic7xw"))))
+        (base32 "071lrbhbvh0l8m1wf5000xxmcry1gjpqdxcqm23qmss9d05zn3lp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
                        ("rust-rayon" ,rust-rayon-1)
                        ("rust-syn" ,rust-syn-2)
-                       ("rust-windows-metadata" ,rust-windows-metadata-0.51))))
+                       ("rust-windows-metadata" ,rust-windows-metadata-0.52))))
     (home-page "https://github.com/microsoft/windows-rs")
     (synopsis "Windows metadata compiler")
     (description "Windows metadata compiler.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-bindgen-0.51
+  (package
+    (inherit rust-windows-bindgen-0.52)
+    (name "rust-windows-bindgen")
+    (version "0.51.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xfdq4q958qal5iks8xkaanf7w3akzfxc58dxvz7amhjg2vic7xw"))))
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-windows-metadata" ,rust-windows-metadata-0.51))))))
+
 (define-public rust-windows-i686-gnu-0.52
   (package
     (name "rust-windows-i686-gnu")
-- 
cgit v1.2.3