summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2024-01-04 11:55:28 +0200
committerEfraim Flashner <efraim@flashner.co.il>2024-02-20 13:57:19 +0200
commit5ee8c10f4cb3a6a8706b1b83f114047a44dd40eb (patch)
treeedd0cb5d501d9ea2b2b385b715ffcd2acd1ca0ae
parent435d25a135264150844734588079adaf283d7907 (diff)
downloadguix-5ee8c10f4cb3a6a8706b1b83f114047a44dd40eb.tar.gz
gnu: rust-x11rb-0.12: Move to (gnu packages crates-graphics).
* gnu/packages/crates-io.scm (rust-x11rb-0.12,
rust-x11rb-protocol-0.12): Move from here ...
* gnu/packages/crates-graphics.scm: ... to here.

Change-Id: I102886fb5cd974e1313164c62f1528edd1698e1e
-rw-r--r--gnu/packages/crates-graphics.scm44
-rw-r--r--gnu/packages/crates-io.scm58
2 files changed, 44 insertions, 58 deletions
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index a85bc764fa..132f9b5b68 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -4925,6 +4925,33 @@ the platform-specific getters provided by winit, or another library.")
     (description "This package provides Rust bindings to X11.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-x11rb-0.12
+  (package
+    (inherit rust-x11rb-0.13)
+    (name "rust-x11rb")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "x11rb" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02h492k920mb1733cdmly138zfiwkspil6ssqcvi7inyshk1nr5i"))))
+    (arguments
+     `(#:cargo-inputs (("rust-as-raw-xcb-connection" ,rust-as-raw-xcb-connection-1)
+                       ("rust-gethostname" ,rust-gethostname-0.3)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libloading" ,rust-libloading-0.7)
+                       ("rust-nix" ,rust-nix-0.26)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-winapi" ,rust-winapi-0.3)
+                       ("rust-winapi-wsapoll" ,rust-winapi-wsapoll-0.1)
+                       ("rust-x11rb-protocol" ,rust-x11rb-protocol-0.12))
+       #:cargo-development-inputs
+       (("rust-polling" ,rust-polling-2)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))))
+
 (define-public rust-x11rb-0.11
   (package
     (inherit rust-x11rb-0.13)
@@ -5013,6 +5040,23 @@ the platform-specific getters provided by winit, or another library.")
     (description "Rust bindings to X11.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-x11rb-protocol-0.12
+  (package
+    (inherit rust-x11rb-protocol-0.13)
+    (name "rust-x11rb-protocol")
+    (version "0.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "x11rb-protocol" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g24qdvq0mbyl2npz7zqy5v6hpdxq2qakkpnp3x02rzvl3ww7ml2"))))
+    (arguments
+     `(#:cargo-inputs (("rust-nix" ,rust-nix-0.26)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4))))))
+
 (define-public rust-x11rb-protocol-0.11
   (package
     (inherit rust-x11rb-protocol-0.13)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5e52e85d71..4270d56ed1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -83701,64 +83701,6 @@ non-cryptographic hashing algorithm and random number generator.")
      "This package provides a collection of utility functions.")
     (license license:expat)))
 
-(define-public rust-x11rb-0.12
-  (package
-    (name "rust-x11rb")
-    (version "0.12.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "x11rb" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "02h492k920mb1733cdmly138zfiwkspil6ssqcvi7inyshk1nr5i"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t     ; Needs a newer version of rust-polling-2.
-       #:cargo-inputs
-       (("rust-as-raw-xcb-connection" ,rust-as-raw-xcb-connection-1)
-        ("rust-gethostname" ,rust-gethostname-0.3)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-libloading" ,rust-libloading-0.7)
-        ("rust-nix" ,rust-nix-0.26)
-        ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-tracing" ,rust-tracing-0.1)
-        ("rust-winapi" ,rust-winapi-0.3)
-        ("rust-winapi-wsapoll" ,rust-winapi-wsapoll-0.1)
-        ("rust-x11rb-protocol" ,rust-x11rb-protocol-0.12))
-       #:cargo-development-inputs
-       (("rust-polling" ,rust-polling-2)
-        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
-    (home-page "https://github.com/psychon/x11rb")
-    (synopsis "Rust bindings to X11")
-    (description "This package provides Rust bindings to X11.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-x11rb-protocol-0.12
-  (package
-    (name "rust-x11rb-protocol")
-    (version "0.12.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "x11rb-protocol" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1g24qdvq0mbyl2npz7zqy5v6hpdxq2qakkpnp3x02rzvl3ww7ml2"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-nix" ,rust-nix-0.26)
-        ("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.4))))
-    (home-page "https://github.com/psychon/x11rb")
-    (synopsis "Rust bindings to X11")
-    (description "This package provides Rust bindings to X11.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-x25519-dalek-1
   (package
     (name "rust-x25519-dalek")