[PATCH 01/27] added alacritty 0.10.1

Done

Details

5 participants

Efraim Flashner
Maxime Devos
phodina
Sharlatan Hellseher
Till Robin Zickel

Owner: unassigned

Submitted by: Till Robin Zickel

Severity: normal

Till Robin Zickel wrote on 8 Mar 2022 17:46

Recipients:(address . guix-patches@gnu.org)

Message-ID:20220308164628.19298-1-trzickel@illegalaliensfrom.space

---

gnu/packages/terminals.scm | 131 +++++++++++++++++++------------------

1 file changed, 68 insertions(+), 63 deletions(-)

Toggle diff (207 lines)diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 06fa341472..89620840ff 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
 ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
+;;; Copyritht © 2022 Till Robin Zickel <trzickel@illegalaliensfrom.space>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1387,25 +1388,25 @@ (define-public tio
 (define-public alacritty
   (package
     (name "alacritty")
-    (version "0.9.0")
-    (source
-     (origin
-       ;; XXX: The crate at "crates.io" has limited contents.  In particular,
-       ;; it does not contain "extra" directory with completions, icon, etc.
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/jwilm/alacritty")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "068y0b1a0m33r7a3j2xf6k602sc8062gm4d5568ynfx6w5n481lj"))))
+    (version "0.10.1")
+    (source (origin
+              ;; XXX: The crate at "crates.io" has limited contents.  In particular,
+              ;; it does not contain "extra" directory with completions, icon, etc.
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/jwilm/alacritty")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1s38gyx0ifcf1vcr6n8gzbk7rg1apxrz7js8cp8x5k1s0m3abys3"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:install-source? #f     ; virtual manifest
-       #:cargo-test-flags '("--release" "--" "--skip=config_read_eof")
+     `(#:install-source? #f ;virtual manifest
+       #:cargo-test-flags
+       '("--release" "--" "--skip=config_read_eof")
        #:cargo-inputs
-       (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1)
-        ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.15)
+       (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1) ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.15)
         ("rust-clap" ,rust-clap-2)
         ("rust-cocoa" ,rust-cocoa-0.24)
         ("rust-copypasta" ,rust-copypasta-0.7)
@@ -1415,7 +1416,7 @@ (define-public alacritty
         ("rust-gl-generator" ,rust-gl-generator-0.14)
         ;; XXX: Adjust `add-absolute-library-references' phase when updating
         ;; glutin input.
-        ("rust-glutin" ,rust-glutin-0.26)
+        ("rust-glutin" ,rust-glutin-0.28)
         ("rust-log" ,rust-log-0.4)
         ("rust-notify" ,rust-notify-4)
         ("rust-objc" ,rust-objc-0.2)
@@ -1425,6 +1426,8 @@ (define-public alacritty
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-yaml" ,rust-serde-yaml-0.8)
+        ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2)
+        ("rust-structopt" ,rust-structopt-0.3)
         ("rust-time" ,rust-time-0.1)
         ("rust-urlocator" ,rust-urlocator-0.1)
         ("rust-x11-dl" ,rust-x11-dl-2)
@@ -1437,17 +1440,20 @@ (define-public alacritty
                (("0.22.0") "^0.23.0"))))
          (add-after 'configure 'add-absolute-library-references
            (lambda* (#:key inputs cargo-inputs vendor-dir #:allow-other-keys)
-             (let* ((glutin-name ,(package-name rust-glutin-0.26))
-                    (glutin-version ,(package-version rust-glutin-0.26))
+             (let* ((glutin-name ,(package-name rust-glutin-0.28)) (glutin-version ,
+                                                                    (package-version
+                                                                     rust-glutin-0.28))
                     (glutin-api (string-append glutin-name "-" glutin-version
                                                ".tar.gz/src/api/"))
-                    (smithay-client-toolkit-name
-                     ,(package-name rust-smithay-client-toolkit-0.12))
-                    (smithay-client-toolkit-version
-                     ,(package-version rust-smithay-client-toolkit-0.12))
-                    (smithay-client-toolkit-src
-                     (string-append smithay-client-toolkit-name "-"
-                                    smithay-client-toolkit-version ".tar.gz/src"))
+                    (smithay-client-toolkit-name ,(package-name
+                                                   rust-smithay-client-toolkit-0.15))
+                    (smithay-client-toolkit-version ,(package-version
+                                                      rust-smithay-client-toolkit-0.15))
+                    (smithay-client-toolkit-src (string-append
+                                                 smithay-client-toolkit-name
+                                                 "-"
+                                                 smithay-client-toolkit-version
+                                                 ".tar.gz/src"))
                     (libxkbcommon (assoc-ref inputs "libxkbcommon"))
                     (mesa (assoc-ref inputs "mesa")))
                ;; Fix dlopen()ing some libraries on pure Wayland (no $DISPLAY):
@@ -1459,26 +1465,25 @@ (define-public alacritty
                (substitute* (string-append vendor-dir "/"
                                            smithay-client-toolkit-src
                                            "/seat/keyboard/ffi.rs")
-                 (("libxkbcommon\\.so")
-                  (string-append libxkbcommon "/lib/libxkbcommon.so")))
-
+                 (("libxkbcommon\\.so") (string-append libxkbcommon
+                                                       "/lib/libxkbcommon.so")))
                ;; Mesa is needed everywhere.
-               (substitute*
-                   (string-append vendor-dir "/" glutin-api "glx/mod.rs")
+               (substitute* (string-append vendor-dir "/" glutin-api
+                                           "glx/mod.rs")
                  (("libGL.so") (string-append mesa "/lib/libGL.so")))
-               (substitute*
-                   (string-append vendor-dir "/" glutin-api "egl/mod.rs")
+               (substitute* (string-append vendor-dir "/" glutin-api
+                                           "egl/mod.rs")
                  (("libEGL.so") (string-append mesa "/lib/libEGL.so")))
                #t)))
          (replace 'install
            ;; Upstream install script only takes care of executable.
            (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out   (assoc-ref outputs "out"))
-                    (bin   (string-append out "/bin"))
+             (let* ((out (assoc-ref outputs "out")) (bin (string-append out
+                                                          "/bin"))
                     (share (string-append out "/share"))
                     (icons (string-append share "/icons/hicolor/scalable/apps"))
-                    (tic   (search-input-file inputs "/bin/tic"))
-                    (man   (string-append share "/man/man1"))
+                    (tic (search-input-file inputs "/bin/tic"))
+                    (man (string-append share "/man/man1"))
                     (alacritty-bin "target/release/alacritty"))
                ;; Install the executable.
                (install-file alacritty-bin bin)
@@ -1497,8 +1502,12 @@ (define-public alacritty
                (mkdir-p (string-append share "/terminfo"))
                ;; We don't compile alacritty-common entry because
                ;; it's being used only for inheritance.
-               (invoke tic "-x" "-e" "alacritty,alacritty-direct"
-                       "-o" (string-append share "/terminfo/")
+               (invoke tic
+                       "-x"
+                       "-e"
+                       "alacritty,alacritty-direct"
+                       "-o"
+                       (string-append share "/terminfo/")
                        "extra/alacritty.info")
                ;; Install completions.
                (install-file "extra/completions/alacritty.bash"
@@ -1508,30 +1517,26 @@ (define-public alacritty
                (install-file "extra/completions/alacritty.fish"
                              (string-append share "/fish/vendor_completions.d"))
                #t))))))
-    (native-inputs
-     `(("cmake" ,cmake)
-       ("ncurses" ,ncurses)
-       ("pkg-config" ,pkg-config)
-       ("python3" ,python)))
-    (inputs
-     `(("expat" ,expat)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("libx11" ,libx11)
-       ("libxcb" ,libxcb)
-       ("libxcursor" ,libxcursor)
-       ("libxi" ,libxi)
-       ("libxkbcommon" ,libxkbcommon)
-       ("libxrandr" ,libxrandr)
-       ("libxxf86vm" ,libxxf86vm)
-       ("mesa" ,mesa)
-       ("rust-bitflags" ,rust-bitflags-1)
-       ("rust-dirs" ,rust-dirs-3)
-       ("rust-libc" ,rust-libc-0.2)
-       ("rust-unicode-width" ,rust-unicode-width-0.1)
-       ("rust-wayland-client" ,rust-wayland-client-0.28)
-       ("rust-winapi" ,rust-winapi-0.3)
-       ("wayland" ,wayland)))
+    (native-inputs `(("cmake" ,cmake) ("ncurses" ,ncurses)
+                     ("pkg-config" ,pkg-config)
+                     ("python3" ,python)))
+    (inputs `(("expat" ,expat) ("fontconfig" ,fontconfig)
+              ("freetype" ,freetype)
+              ("libx11" ,libx11)
+              ("libxcb" ,libxcb)
+              ("libxcursor" ,libxcursor)
+              ("libxi" ,libxi)
+              ("libxkbcommon" ,libxkbcommon)
+              ("libxrandr" ,libxrandr)
+              ("libxxf86vm" ,libxxf86vm)
+              ("mesa" ,mesa)
+              ("rust-bitflags" ,rust-bitflags-1)
+              ("rust-dirs" ,rust-dirs-3)
+              ("rust-libc" ,rust-libc-0.2)
+              ("rust-unicode-width" ,rust-unicode-width-0.1)
+              ("rust-wayland-client" ,rust-wayland-client-0.29)
+              ("rust-winapi" ,rust-winapi-0.3)
+              ("wayland" ,wayland)))
     (native-search-paths
      ;; FIXME: This should only be located in 'ncurses'.  Nonetheless it is
      ;; provided for usability reasons.  See <https://bugs.gnu.org/22138>.
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 03/27] added rust-android-logger@0.10

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-2-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 17 +++++++++++++++++

1 file changed, 17 insertions(+)

Toggle diff (30 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e982ab33b0..6b4c878fc8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2801,6 +2801,23 @@ (define-public rust-android-logger-0.8
 it outputs messages to Android's logcat.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-android-logger-0.10
+  (package
+    (inherit rust-android-logger-0.8)
+    (name "rust-android-logger")
+    (version "0.10.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "android_logger" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0rigzgkaik2y7pvsilpjdy19mdq1kkamw2rdf9fjkvb5hfqhkvfr"))))
+    (arguments
+     `(#:cargo-inputs (("rust-android-log-sys" ,rust-android-log-sys-0.2) ("rust-env-logger" ,rust-env-logger-0.8)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-log" ,rust-log-0.4))))))
+
 (define-public rust-ansi-parser-0.6
   (package
     (name "rust-ansi-parser")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 02/27] added rust-android-log-sys@0.2

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-1-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 13 +++++++++++++

1 file changed, 13 insertions(+)

Toggle diff (26 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 90c95b6368..e982ab33b0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2763,6 +2763,19 @@ (define-public rust-android-log-sys-0.1
     (description "This package provides FFI bindings to Android log Library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-android-log-sys-0.2
+  (package
+    (inherit rust-android-log-sys-0.1)
+    (name "rust-android-log-sys")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "android_log-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0bhhs1cgzp9vzjvkn2q31ppc7w4am5s273hkvl5iac5475kmp5l5"))))))
+
 (define-public rust-android-logger-0.8
   (package
     (name "rust-android-logger")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 06/27] updated rust-memmap2@0.3 to version 0.3.1

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-5-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 20 +++++++++++---------

1 file changed, 11 insertions(+), 9 deletions(-)

Toggle diff (36 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9de962d5c3..b8af85cd48 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34047,18 +34047,20 @@ (define-public rust-memmap2-0.3
   (package
     (inherit rust-memmap2-0.5)
     (name "rust-memmap2")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "memmap2" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1xcg3vv6rg8vhl0wdfy085gx4xsp2dah7anvn5816h6wgczj1zr0"))))
+    (version "0.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "memmap2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0mz3fdcq443m3a1phrhp2yvd1h9vrvbhinzmi23ik031zzmw5dh0"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2))))))
+       (("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-tempdir" ,rust-tempdir-0.3))))))
 
 (define-public rust-memmap2-0.2
   (package
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 07/27] added rust-ndk@0.5

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-6-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (34 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b8af85cd48..483b138054 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36380,6 +36380,27 @@ (define-public rust-ndk-0.2
      "This package provides safe Rust bindings to the Android NDK.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ndk-0.5
+  (package
+    (inherit rust-ndk-0.2)
+    (name "rust-ndk")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ndk" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "17b9imdmv6cffr12bdpvxw1myxdyvaf6jwkmd3w7abn7akv6in4n"))))
+    (arguments
+     `(#:skip-build? #t ;XXX: Android only
+       #:cargo-inputs
+       (("rust-jni" ,rust-jni-0.18) ("rust-jni-glue" ,rust-jni-glue-0.0)
+        ("rust-jni-sys" ,rust-jni-sys-0.3)
+        ("rust-ndk-sys" ,rust-ndk-sys-0.2)
+        ("rust-num-enum" ,rust-num-enum-0.5)
+        ("rust-thiserror" ,rust-thiserror-1))))))
+
 (define-public rust-ndk-glue-0.2
   (package
     (name "rust-ndk-glue")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 04/27] added rust-calloop@0.9

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-3-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++

1 file changed, 24 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6b4c878fc8..54fc4e64ff 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9486,6 +9486,30 @@ (define-public rust-calloop-0.6
     (description "This package provides a callback-based event loop.")
     (license license:expat)))
 
+(define-public rust-calloop-0.9
+  (package
+    (inherit rust-calloop-0.6)
+    (name "rust-calloop")
+    (version "0.9.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "calloop" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "10mbcsd7fj3cg0a463h3003wycv955cnj4pm2gla2sp5xxhyqbmz"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-log" ,rust-log-0.4) ("rust-nix" ,rust-nix-0.22)
+        ("rust-futures-io" ,rust-futures-io-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-futures" ,rust-futures-0.3))))
+    (home-page "https://github.com/Smithay/calloop")
+    (synopsis "Callback-based event loop")
+    (description "This package provides a callback-based event loop.")
+    (license license:expat)))
+
 (define-public rust-calloop-0.4
   (package
     (inherit rust-calloop-0.6)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 08/27] added rust-ndk-glue@0.5

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-7-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (40 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 483b138054..633123bc72 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36429,6 +36429,33 @@ (define-public rust-ndk-glue-0.2
      "This package provides startup code for Android binaries.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ndk-glue-0.5
+  (package
+    (name "rust-ndk-glue")
+    (version "0.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ndk-glue" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qkjqmz4hw37mf0igczhn90ifdyd0r1790x38ykwjprwd1q8zim1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ;XXX: Android only
+       #:cargo-inputs
+       (("rust-android-logger" ,rust-android-logger-0.10) ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-ndk" ,rust-ndk-0.5)
+        ("rust-ndk-context" ,rust-ndk-context-0.1)
+        ("rust-ndk-macro" ,rust-ndk-macro-0.3)
+        ("rust-ndk-sys" ,rust-ndk-sys-0.2))))
+    (home-page "https://github.com/rust-windowing/android-ndk-rs")
+    (synopsis "Startup code for Android binaries")
+    (description "This package provides startup code for Android binaries.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ndk-macro-0.2
   (package
     (name "rust-ndk-macro")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 05/27] added rust-dlib@0.5

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-4-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 18 ++++++++++++++++++

1 file changed, 18 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 54fc4e64ff..9de962d5c3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18467,6 +18467,24 @@ (define-public rust-dlib-0.4
 system libraries.")
     (license license:expat)))
 
+(define-public rust-dlib-0.5
+  (package
+    (inherit rust-dlib-0.4)
+    (name "rust-dlib")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dlib" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1547hy7nrhkrb2i09va244c0h8mr845ccbs2d2mc414c68bpa6xc"))))
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-libloading" ,rust-libloading-0.7))))
+    (inputs (list rust-libloading-0.7))))
+
 (define-public rust-dlv-list-0.2
   (package
     (name "rust-dlv-list")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 10/27] added rust-ndk-macro@0.3

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-9-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 18 ++++++++++++++++++

1 file changed, 18 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 57039afa79..f92f5864f0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36480,6 +36480,24 @@ (define-public rust-ndk-macro-0.2
     (description "This package provides helper macros for android ndk.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ndk-macro-0.3
+  (package
+    (inherit rust-ndk-macro-0.2)
+    (name "rust-ndk-macro")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ndk-macro" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0v3sxc11kq3d5vdwfml62l7y5dr0flsf6kp5xid9sbv7qh0arxqd"))))
+    (arguments
+     `(#:cargo-inputs (("rust-darling" ,rust-darling-0.13) ("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-ndk-sys-0.2
   (package
     (name "rust-ndk-sys")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 09/27] added rust-ndk-context@0.1

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-8-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 20 ++++++++++++++++++++

1 file changed, 20 insertions(+)

Toggle diff (33 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 633123bc72..57039afa79 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36498,6 +36498,26 @@ (define-public rust-ndk-sys-0.2
     (description "This package provides FFI bindings for the Android NDK.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ndk-context-0.1
+  (package
+    (name "rust-ndk-context")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ndk-context" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "112q689zc4338xmj55a8nxdlkjmrw34s3xkpy3l1zqiphv35qg2f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/rust-windowing/android-ndk-rs")
+    (synopsis "Rust on Android")
+    (description
+     "Collection of libraries and tools for Rust programming on Android targets")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-neli-0.4
   (package
     (name "rust-neli")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 11/27] updated rust-ndk-sys@0.2 to 0.2.2

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-10-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 19 ++++++++++---------

1 file changed, 10 insertions(+), 9 deletions(-)

Toggle diff (33 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f92f5864f0..1b99a5a90c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36501,16 +36501,17 @@ (define-public rust-ndk-macro-0.3
 (define-public rust-ndk-sys-0.2
   (package
     (name "rust-ndk-sys")
-    (version "0.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ndk-sys" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "13c68a217ag3k18vlffpcj2qjfinchxxchzlwnsp075v7p5j4jf4"))))
+    (version "0.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ndk-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "08915adplysmvx0ha12if1v7zxzx82xgj3nnmiddkm8aq9sdvg71"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
+    (arguments
+     `(#:skip-build? #t))
     (home-page "https://github.com/rust-windowing/android-ndk-rs")
     (synopsis "FFI bindings for the Android NDK")
     (description "This package provides FFI bindings for the Android NDK.")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 13/27] added rust-num-enum@0.5

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-12-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 51 +++++++++++++++++++++++++++++++++++---

1 file changed, 47 insertions(+), 4 deletions(-)

Toggle diff (99 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cac17e17d5..7723436b21 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38389,6 +38389,28 @@ (define-public rust-num-enum-0.4
 primitives and enums easier.")
     (license license:bsd-3)))
 
+(define-public rust-num-enum-0.5
+  (package
+    (inherit rust-num-enum-0.4)
+    (name "rust-num-enum")
+    (version "0.5.7")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "num_enum" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1j8rq7i4xnbzy72z82k41469xlj1bmn4ixagd9wlbvv2ark9alyg"))))
+    (arguments
+     `(#:tests? #f ;missing files
+       #:cargo-inputs
+       (("rust-derivative" ,rust-derivative-2) ("rust-num-enum" ,rust-num-enum-0.5)
+        ("rust-num-enum-derive" ,rust-num-enum-derive-0.5))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1) ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-walkdir" ,rust-walkdir-2)
+        ("rust-rustversion" ,rust-rustversion-1))))))
+
 (define-public rust-num-enum-derive-0.4
   (package
     (name "rust-num-enum-derive")
@@ -38415,6 +38437,27 @@ (define-public rust-num-enum-derive-0.4
 primitives and enums easier.")
     (license license:bsd-3)))
 
+(define-public rust-num-enum-derive-0.5
+  (package
+    (inherit rust-num-enum-derive-0.4)
+    (name "rust-num-enum-derive")
+    (version "0.5.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "num_enum_derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kj6b8f2fx8prlcl6y1k97668s5aiia4f9gjlk0nmpak3rj9h11v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f                      ;FIXME: some doc tests fail
+       #:cargo-inputs
+       (("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-num-format-0.4
   (package
     (name "rust-num-format")
@@ -59049,7 +59092,7 @@ (define-public rust-strsim-0.5
 (define-public rust-structopt-0.3
   (package
     (name "rust-structopt")
-    (version "0.3.21")
+    (version "0.3.22")
     (source
      (origin
        (method url-fetch)
@@ -59058,7 +59101,7 @@ (define-public rust-structopt-0.3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "136j0lvjmpv5syi751vxg8vb30gfyv4k81x8d18kxrj6xvbsqxsj"))))
+         "0wadrsmkvab04dkbs670hcyl41l89kj7nvky6356l8k7rg6l3c39"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -59100,7 +59143,7 @@ (define-public rust-structopt-0.2
 (define-public rust-structopt-derive-0.4
   (package
    (name "rust-structopt-derive")
-   (version "0.4.14")
+   (version "0.4.15")
    (source
     (origin
      (method url-fetch)
@@ -59109,7 +59152,7 @@ (define-public rust-structopt-derive-0.4
       (string-append name "-" version ".tar.gz"))
      (sha256
       (base32
-       "143gjwvz3s86hwp070km83y25n8kqp5f01kb1dr19f4ilkywvaav"))))
+       "044w7z0bnsvla4d26s1r8s4q9sbx4f60c02yfxa1mxgmxi5964vq"))))
    (build-system cargo-build-system)
    (arguments
     `(#:skip-build? #t
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 14/27] added rust-glutin@0.28

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-13-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 34 ++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (47 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index d1a9c4dd6d..71bb620b18 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1005,6 +1005,40 @@ (define-public rust-glutin-0.26
     (description "This package provides an OpenGL context provider.")
     (license license:asl2.0)))
 
+(define-public rust-glutin-0.28
+  (package
+    (inherit rust-glutin-0.26)
+    (name "rust-glutin")
+    (version "0.28.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "glutin" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1lpnf61x4jbm55bpdr10k1a1pl3cs719i9y4qibsdj2bajz9vsh0"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-android-glue" ,rust-android-glue-0.2) ("rust-cgl" ,rust-cgl-0.3)
+        ("rust-cocoa" ,rust-cocoa-0.24)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.1)
+        ("rust-glutin-emscripten-sys" ,rust-glutin-emscripten-sys-0.1)
+        ("rust-glutin-gles2-sys" ,rust-glutin-gles2-sys-0.1)
+        ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.1)
+        ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libloading" ,rust-libloading-0.6)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-objc" ,rust-objc-0.2)
+        ("rust-osmesa-sys" ,rust-osmesa-sys-0.1)
+        ("rust-parking-lot" ,rust-parking-lot-0.11)
+        ("rust-wayland-egl" ,rust-wayland-egl-0.29)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-winit" ,rust-winit-0.26))))
+    (inputs (list rust-wayland-client-0.29 rust-wayland-egl-0.29))))
+
 (define-public rust-glutin-0.22
   (package
     (inherit rust-glutin-0.26)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 15/27] updated rust-glutin-egl-sys@0.1 to 0.1.5

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-14-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 22 +++++++++-------------

1 file changed, 9 insertions(+), 13 deletions(-)

Toggle diff (37 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 71bb620b18..9261f6f6ae 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1113,21 +1113,17 @@ (define-public rust-glutin-0.21
 (define-public rust-glutin-egl-sys-0.1
   (package
     (name "rust-glutin-egl-sys")
-    (version "0.1.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "glutin-egl-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0k1x1frdp4wp47qkai8zzmgqxzpfcn7780m29qgd92lbnbrxwbkp"))))
+    (version "0.1.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "glutin-egl-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04f2ci9kb8q4dv4kviigvgfy54lr4jmbnmjsvi50qj13anjnmfra"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3)
-        ("rust-gl-generator" ,rust-gl-generator-0.13))))
+     `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3) ("rust-gl-generator" ,rust-gl-generator-0.14))))
     (home-page "https://github.com/rust-windowing/glutin")
     (synopsis "Egl bindings for glutin")
     (description "The egl bindings for glutin.")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 17/27] added rust-smithay-client-toolkit@0.15

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-16-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 31 +++++++++++++++++++++++++++++++

1 file changed, 31 insertions(+)

Toggle diff (44 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 2d87ea1c64..8b10015ccd 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2240,6 +2240,37 @@ (define-public rust-smithay-client-toolkit-0.12
      "This package provides a toolkit for making client Wayland applications.")
     (license license:expat)))
 
+(define-public rust-smithay-client-toolkit-0.15
+  (package
+    (name "rust-smithay-client-toolkit")
+    (version "0.15.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "smithay-client-toolkit" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12p627i1sg08mj9nb8d1zp4a82m348j96c2m0gapivlw429g498k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.9)
+        ("rust-dlib" ,rust-dlib-0.5)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-memmap2" ,rust-memmap2-0.3)
+        ("rust-nix" ,rust-nix-0.22)
+        ("rust-wayland-client" ,rust-wayland-client-0.29)
+        ("rust-wayland-cursor" ,rust-wayland-cursor-0.29)
+        ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)
+        ("rust-image" ,rust-image-0.23))))
+    (home-page "https://github.com/smithay/client-toolkit")
+    (synopsis "Toolkit for making client Wayland applications")
+    (description
+     "This package provides a toolkit for making client Wayland applications.")
+    (license license:expat)))
+
 (define-public rust-smithay-client-toolkit-0.6
   (package
     (inherit rust-smithay-client-toolkit-0.12)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 16/27] added rust-raw-window-handle@0.4

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-15-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 17 +++++++++++++++++

1 file changed, 17 insertions(+)

Toggle diff (30 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 9261f6f6ae..2d87ea1c64 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2139,6 +2139,23 @@ (define-public rust-raw-window-handle-0.3
      "Interoperability library for Rust Windowing applications.")
     (license license:expat)))
 
+(define-public rust-raw-window-handle-0.4
+  (package
+    (inherit rust-raw-window-handle-0.3)
+    (name "rust-raw-window-handle")
+    (version "0.4.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "raw-window-handle" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1dr24lzairc9hdw2a8sk03vixzngv42y3qf9d0x2gmd9jkp5x9zv"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-cty" ,rust-cty-0.2))))))
+
 (define-public rust-resize-0.3
   (package
     (name "rust-resize")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 18/27] reformatted rust-wayland-client@0.28

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-17-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 44 ++++++++++++++++----------------

1 file changed, 22 insertions(+), 22 deletions(-)

Toggle diff (61 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 8b10015ccd..502a62fcd6 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2471,32 +2471,32 @@ (define-public rust-wayland-client-0.28
   (package
     (name "rust-wayland-client")
     (version "0.28.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "wayland-client" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1mxnflzv9s3qpcp0z7kqvrzki5bknfar9n9yky06f8ivs00vxgdx"))))
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-client" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1mxnflzv9s3qpcp0z7kqvrzki5bknfar9n9yky06f8ivs00vxgdx"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-downcast-rs" ,rust-downcast-rs-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-nix" ,rust-nix-0.18)
-        ("rust-scoped-tls" ,rust-scoped-tls-1))
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-downcast-rs" ,rust-downcast-rs-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-nix" ,rust-nix-0.18)
+                       ("rust-scoped-tls" ,rust-scoped-tls-1)
+                       ("rust-wayland-commons" ,rust-wayland-commons-0.28)
+                       ("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
+                       ("rust-wayland-sys" ,rust-wayland-sys-0.28))
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))
-    (inputs
-     (list rust-bitflags-1
-           rust-downcast-rs-1
-           rust-libc-0.2
-           rust-nix-0.18
-           rust-scoped-tls-1
-           rust-wayland-commons-0.28
-           rust-wayland-scanner-0.28
-           rust-wayland-sys-0.28))
+    (inputs (list rust-bitflags-1
+                  rust-downcast-rs-1
+                  rust-libc-0.2
+                  rust-nix-0.18
+                  rust-scoped-tls-1
+                  rust-wayland-commons-0.28
+                  rust-wayland-scanner-0.28
+                  rust-wayland-sys-0.28))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis
      "Rust bindings to the standard C implementation of the wayland protocol")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 19/27] added rust-wayland-client@0.29

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-18-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 33 ++++++++++++++++++++++++++++++++

1 file changed, 33 insertions(+)

Toggle diff (46 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 502a62fcd6..e9f3bcd778 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2505,6 +2505,39 @@ (define-public rust-wayland-client-0.28
 the wayland protocol, client side.")
     (license license:expat)))
 
+(define-public rust-wayland-client-0.29
+  (package
+    (inherit rust-wayland-client-0.28)
+    (name "rust-wayland-client")
+    (version "0.29.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-client" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "13s5sj9344izk2g48yizk81kcg8jg4940gg2v6bzcmrjwxh388li"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1) ("rust-downcast-rs" ,rust-downcast-rs-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-nix" ,rust-nix-0.22)
+        ("rust-scoped-tls" ,rust-scoped-tls-1)
+        ("rust-wayland-commons" ,rust-wayland-commons-0.29)
+        ("rust-wayland-scanner" ,rust-wayland-scanner-0.29)
+        ("rust-wayland-sys" ,rust-wayland-sys-0.29))
+       #:cargo-development-inputs
+       (("rust-tempfile" ,rust-tempfile-3))))
+    (inputs (list rust-bitflags-1
+                  rust-downcast-rs-1
+                  rust-libc-0.2
+                  rust-nix-0.22
+                  rust-scoped-tls-1
+                  rust-wayland-commons-0.29
+                  rust-wayland-scanner-0.29
+                  rust-wayland-sys-0.29))))
+
 (define-public rust-wayland-client-0.23
   (package
     (inherit rust-wayland-client-0.28)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 20/27] added rust-wayland-commons@0.29

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-19-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 18 ++++++++++++++++++

1 file changed, 18 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index e9f3bcd778..824d96b795 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2625,6 +2625,24 @@ (define-public rust-wayland-commons-0.28
 and wayland-server.")
     (license license:expat)))
 
+(define-public rust-wayland-commons-0.29
+  (package
+    (inherit rust-wayland-commons-0.28)
+    (name "rust-wayland-commons")
+    (version "0.29.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-commons" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0gnk4a771i3g1k4fbzx54xnganpc9j68jrx8xj839hfp83iybxll"))))
+    (arguments
+     `(#:cargo-inputs (("rust-nix" ,rust-nix-0.22) ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-smallvec" ,rust-smallvec-1))))
+    (inputs (list rust-nix-0.18 rust-once-cell-1 rust-smallvec-1
+                  rust-wayland-sys-0.29))))
+
 (define-public rust-wayland-commons-0.23
   (package
     (inherit rust-wayland-commons-0.28)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 21/27] added rust-wayland-cursor@0.29

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-20-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 17 +++++++++++++++++

1 file changed, 17 insertions(+)

Toggle diff (30 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 824d96b795..e58b9d4406 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2709,6 +2709,23 @@ (define-public rust-wayland-cursor-0.28
 properly display animated cursors.")
     (license license:expat)))
 
+(define-public rust-wayland-cursor-0.29
+  (package
+    (inherit rust-wayland-cursor-0.28)
+    (name "rust-wayland-cursor")
+    (version "0.29.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-cursor" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1gd6aswkrdz556n54pjpd4rchw7jkgcx6hnrhgy62y2y7pqmh9y5"))))
+    (arguments
+     `(#:cargo-inputs (("rust-nix" ,rust-nix-0.22) ("wayland-client" ,rust-wayland-client-0.29)
+                       ("rust-xcursor" ,rust-xcursor-0.3))))
+    (inputs (list rust-nix-0.22 rust-wayland-client-0.29 rust-xcursor-0.3))))
+
 (define-public rust-wayland-egl-0.28
   (package
     (name "rust-wayland-egl")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 22/27] added rust-wayland-egl@0.29

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-21-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 14 ++++++++++++++

1 file changed, 14 insertions(+)

Toggle diff (27 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index e58b9d4406..2074211f94 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2752,6 +2752,20 @@ (define-public rust-wayland-egl-0.28
 initializing an OpenGL or Vulkan context.")
     (license license:expat)))
 
+(define-public rust-wayland-egl-0.29
+  (package
+    (inherit rust-wayland-egl-0.28)
+    (name "rust-wayland-egl")
+    (version "0.29.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-egl" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0flslbp8q4nv3hcw941vapn3jh6y7glqaqv63h1mjaqnxrlisa43"))))
+    (inputs (list rust-wayland-client-0.29 rust-wayland-sys-0.29))))
+
 (define-public rust-wayland-protocols-0.28
   (package
     (name "rust-wayland-protocols")
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 23/27] added rust-wayland-protocols@0.29

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-22-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 18 ++++++++++++++++++

1 file changed, 18 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 2074211f94..91ea39c212 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2792,6 +2792,24 @@ (define-public rust-wayland-protocols-0.28
 extensions.")
     (license license:expat)))
 
+(define-public rust-wayland-protocols-0.29
+  (package
+    (inherit rust-wayland-protocols-0.28)
+    (name "rust-wayland-protocols")
+    (version "0.29.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-protocols" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hap8vky2fwsq05c98c8xs00gb9m5kxp8kq3zr0jwh036gi7l530"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1))))
+    (inputs (list rust-bitflags-1 rust-wayland-client-0.29
+                  rust-wayland-commons-0.29 rust-wayland-scanner-0.29
+                  rust-wayland-server-0.29))))
+
 (define-public rust-wayland-protocols-0.23
   (package
     (inherit rust-wayland-protocols-0.28)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 24/27] added rust-wayland-scanner@0.29

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-23-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 14 ++++++++++++++

1 file changed, 14 insertions(+)

Toggle diff (27 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 91ea39c212..ef843affb3 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2880,6 +2880,20 @@ (define-public rust-wayland-scanner-0.28
 wayland-client crate for usable bindings.")
     (license license:expat)))
 
+(define-public rust-wayland-scanner-0.29
+  (package
+    (inherit rust-wayland-scanner-0.28)
+    (name "rust-wayland-scanner")
+    (version "0.29.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-scanner" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1q7r764z8k922xf51fj56b1xm29ffi9ap8jnf4c478gp8cqyv89r"))))))
+
+
 (define-public rust-wayland-scanner-0.23
   (package
     (inherit rust-wayland-scanner-0.28)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 25/27] added rust-wayland-server@0.29

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-24-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 30 ++++++++++++++++++++++++++++++

1 file changed, 30 insertions(+)

Toggle diff (43 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index ef843affb3..48abc64d62 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2970,6 +2970,36 @@ (define-public rust-wayland-server-0.28
 the wayland protocol, server side.")
     (license license:expat)))
 
+(define-public rust-wayland-server-0.29
+  (package
+    (inherit rust-wayland-server-0.28)
+    (name "rust-wayland-server")
+    (version "0.29.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-server" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1wj8gf28dbjwb824i29wf3wr5r6wp6ssknjm9b5dnb1fah47mk66"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-downcast-rs" ,rust-downcast-rs-1)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-nix" ,rust-nix-0.22)
+                       ("rust-parking-lot" ,rust-parking-lot-0.11)
+                       ("rust-scoped-tls" ,rust-scoped-tls-1))))
+    (inputs (list rust-bitflags-1
+                  rust-downcast-rs-1
+                  rust-lazy-static-1
+                  rust-libc-0.2
+                  rust-nix-0.22
+                  rust-parking-lot-0.11
+                  rust-scoped-tls-1
+                  rust-wayland-commons-0.29
+                  rust-wayland-scanner-0.29
+                  rust-wayland-sys-0.29))))
+
 (define-public rust-wayland-server-0.23
   (package
     (inherit rust-wayland-server-0.28)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 26/27] added rust-wayland-sys@0.29

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-25-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 31 +++++++++++++++++++++++++++++++

1 file changed, 31 insertions(+)

Toggle diff (44 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 48abc64d62..875435fca9 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3095,6 +3095,37 @@ (define-public rust-wayland-sys-0.28
 crate @code{rust-wayland-client} for usable bindings.")
     (license license:expat)))
 
+(define-public rust-wayland-sys-0.29
+  (package
+    (inherit rust-wayland-sys-0.28)
+    (name "rust-wayland-sys")
+    (version "0.29.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wayland-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1m2jwk5q36jidwbdmdicmi27r9dzi4wanzg3i28nfxc9kbvisd6r"))))
+    (arguments
+     `(#:cargo-inputs (("rust-dlib" ,rust-dlib-0.5) ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-memoffset" ,rust-memoffset-0.6)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-libraries
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((libwayland (assoc-ref inputs "wayland")))
+               (substitute* (find-files "src" "\\.rs$")
+                 (("libwayland.*\\.so" shared-lib) (string-append libwayland
+                                                                  "/lib/"
+                                                                  shared-lib)))
+               #t))))))
+    (inputs (list rust-dlib-0.5 rust-lazy-static-1 rust-libc-0.2
+                  rust-pkg-config-0.3 rust-memoffset-0.6))
+    (propagated-inputs (list wayland))))
+
 (define-public rust-wayland-sys-0.23
   (package
     (inherit rust-wayland-sys-0.28)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 27/27] added rust-winit@0.26

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-26-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-graphics.scm | 44 ++++++++++++++++++++++++++++++++

1 file changed, 44 insertions(+)

Toggle diff (57 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 875435fca9..6ea87d57c2 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3220,6 +3220,50 @@ (define-public rust-winit-0.24
 the platform-specific getters provided by winit, or another library.")
     (license license:asl2.0)))
 
+(define-public rust-winit-0.26
+  (package
+    (inherit rust-winit-0.24)
+    (name "rust-winit")
+    (version "0.26.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "winit" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0fp7cdh7llbqmm6ga8f6bzk9785jmkbyy1w631hr9faq3n9wqhwv"))))
+    (name "rust-winit")
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1) ("rust-cocoa" ,rust-cocoa-0.24)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-core-graphics" ,rust-core-graphics-0.22)
+        ("rust-core-video-sys" ,rust-core-video-sys-0.1)
+        ("rust-dispatch" ,rust-dispatch-0.2)
+        ("rust-instant" ,rust-instant-0.1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mint" ,rust-mint-0.5)
+        ("rust-mio" ,rust-mio-0.8)
+        ("rust-mio-extras" ,rust-mio-extras-2)
+        ("rust-ndk" ,rust-ndk-0.5)
+        ("rust-ndk-glue" ,rust-ndk-glue-0.5)
+        ("rust-ndk-sys" ,rust-ndk-sys-0.2)
+        ("rust-objc" ,rust-objc-0.2)
+        ("rust-parking-lot" ,rust-parking-lot-0.11)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-raw-window-handle" ,rust-raw-window-handle-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.15)
+        ("rust-stdweb" ,rust-stdweb-0.4)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-web-sys" ,rust-web-sys-0.3)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-x11-dl" ,rust-x11-dl-2))))
+    (inputs (list rust-wayland-client-0.28))))
+
 (define-public rust-winit-0.20
   (package
     (inherit rust-winit-0.24)
-- 
2.34.0

Till Robin Zickel wrote on 8 Mar 2022 18:31

[PATCH 12/27] added development inputs, reformatted rust-nix@0.22

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:20220308173127.21218-11-trzickel@illegalaliensfrom.space

---

gnu/packages/crates-io.scm | 26 ++++++++++++++++----------

1 file changed, 16 insertions(+), 10 deletions(-)

Toggle diff (44 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1b99a5a90c..cac17e17d5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37055,21 +37055,27 @@ (define-public rust-nix-0.22
     (inherit rust-nix-0.23)
     (name "rust-nix")
     (version "0.22.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "nix" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0cahgzxhdwsaa8491n6cn8gadgfsxk5razyfw4xr3k34f5n5smg7"))))
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "nix" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cahgzxhdwsaa8491n6cn8gadgfsxk5razyfw4xr3k34f5n5smg7"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1.2)
-        ("rust-cc" ,rust-cc-1)
+       (("rust-bitflags" ,rust-bitflags-1.2) ("rust-cc" ,rust-cc-1)
         ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-memoffset" ,rust-memoffset-0.6))))))
+        ("rust-memoffset" ,rust-memoffset-0.6))
+       #:cargo-development-inputs
+       (("rust-assert-impl" ,rust-assert-impl-0.1) ("rust-caps" ,rust-caps-0.5)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-semver" ,rust-semver-1)
+        ("rust-sysctl" ,rust-sysctl-0.1)
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-nix-0.21
   (package
-- 
2.34.0

Maxime Devos wrote on 8 Mar 2022 18:46

Re: [bug#54299] [PATCH 08/27] added rust-ndk-glue@0.5

Recipients:

Message-ID:60db51edb985fde78296067925b07566725d8b03.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� `(#:skip-build? #t ;XXX: Android only

If it's Android-only, why is it packaged in Guix?  Guix doesn't really
support Android at the moment -- well, Android is based on the Linux
kernel, so Guix can theoretically be installed on Android (there's a
blog post about that!), but otherwise not.

Greetings,
Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieWXxccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7m7UAP4uMjjtDWvNGw/zZ3MPAw8mVvJh

lBNv7nsKQafLRj6wvAEA6EX9fbYAdFYSGjPmCUJ9/Qw4aY1zN7jY8c74Kud/KgI=

=+bgi

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:47

Re: [bug#54299] [PATCH 26/27] added rust-wayland-sys@0.29

Recipients:

Message-ID:c58907ffa63bbdb040227101c9f4651c2d87ae11.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (4 lines)

> +�� (let ((libwayland (assoc-ref inputs "wayland")))

> +�� (substitute* (find-files "src" "\\.rs$")

> +�� (("libwayland.*\\.so" shared-lib) (string-append libwayland

Input labels are being phased-out, I recommend using search-input-file

here instead.

Greetings,

Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieWzBccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7iDmAP0TbqptvidVgTLJY3fidgTSFpjt

xEQXNncs2g6+YeJYXwEAmLqNnEXtulQML1RMt+TJLozXUUbmdDZmN7tOi6GKYgA=

=Ugjj

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:48

Recipients:

Message-ID:60e0101b9857f95dbe3ac3b1922bed110004329d.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� #t))))))

No need for trailing #t anymore.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieW4BccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7kPlAP0YajfI6shk+xBGJ5anaE+6quWF

bRStwRdQQodCCvaA1wEA+olu3kEBxJOpeytwwNzDVEPgDNHorD2HoHG41q0S3wo=

=Glir

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:49

Recipients:

Message-ID:dac92ac66206ce85ccc13558c09ca114b9e13eeb.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� rust-pkg-config-0.3 rust-memoffset-0.6))

Why are these both in #:cargo-inputs and 'inputs'?

Also, what's the 'rust-pkg-config' input for?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieXKxccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7nzEAP4zAgWJueTYLw3XgMC5giOoVdng

8oRkuEBzek4CWLKnOQD/aXcItFYfbwmnpTjo9jEhyUdYYn1YWTJ0rezV/omtyAA=

=lqpv

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:51

Recipients:

Message-ID:f5552c6eee6f422fd7daee8ea0fc156ac6c3efc0.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� ("rust-pkg-config" ,rust-pkg-config-0.3))

If it's anything like 'pkg-config', this looks more something for

'native-inputs' or '#:cargo-development-inputs' to me.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieXmxccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tpOAP9cZv774+vo5qzyu+ifb2E8fc7l

8BhKKs9nLMimCAl1wAEAkj/aJh7IhCZjdaCVcEbEMo/mW7XTLBNm0tZrjr3CqAo=

=eYg5

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:52

Re: [bug#54299] [PATCH 24/27] added rust-wayland-scanner@0.29

Recipients:

Message-ID:4a0ae7a56eedb58dbf6c935d80822a7948cb5460.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (13 lines)> +(define-public rust-wayland-scanner-0.29
> +� (package
> +��� (inherit rust-wayland-scanner-0.28)
> +��� (name "rust-wayland-scanner")
> +��� (version "0.29.4")
> +��� (source (origin
> +������������� (method url-fetch)
> +������������� (uri (crate-uri "wayland-scanner" version))
> +������������� (file-name (string-append name "-" version ".tar.gz"))
> +������������� (sha256
> +�������������� (base32
> +��������������� "1q7r764z8k922xf51fj56b1xm29ffi9ap8jnf4c478gp8cqyv89r"))))))

Is 0.29 backwards compatible with 0.28?  If so, perhaps we could just
update rust-wayland-scanner and point rust packages to the new rust-
wayland-scanner?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieX3BccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jisAQC6AnFztWHYm5kXATdDIMq/zP+N

wkltrbGGJim/Jq6yaAD+KALq/ngq89ojm+ibkIZnpri+4CdykGI6cAjnJvNVrQA=

=I1ic

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:53

Re: [bug#54299] [PATCH 23/27] added rust-wayland-protocols@0.29

Recipients:

Message-ID:8f6066e5826d527dc0a396d95246b26b42068553.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (6 lines)

> +�� (arguments

> +�� `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1))))

> +�� (inputs (list rust-bitflags-1 rust-wayland-client-0.29

> +�� rust-wayland-commons-0.29 rust-wayland-scanner-0.29

> +�� rust-wayland-server-0.29))))

What's the point of being both in #:cargo-inputs and inputs? Would

simply being in 'inputs' suffice?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieYJRccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lwZAQCBBOVFoL75T/+DwEY6/SFoMxBF

6gnHXF7RplfpOaVlLwD/SewXn2gGHgmOwUbQenhHJGiU5zO8jx4DHx6mZJygVww=

=8Q/P

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:56

Re: [bug#54299] [PATCH 19/27] added rust-wayland-client@0.29

Recipients:

Message-ID:f970158c9ff5188952d0dca9f8d4f4aa48d0daf1.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� `(#:skip-build? #t

Why? From (guix)Rust Crates:

Care should be taken to ensure the correct version of dependencies

are used; to this end we try to refrain from skipping the tests or using

‘#:skip-build?’ when possible. Of course this is not always possible,

as the package may be developed for a different Operating System, depend

on features from the Nightly Rust compiler, or the test suite may have

atrophied since it was released.

An additional reason is that we want to eventually always re-use pre-compiled

inputs, though AFAICT this is currently not (not always?) possible.

Greetings,

Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieYuxccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7ntcAP0T2e338UNs+sS1fu99Gcx8fAeH

vW4eAZFRjpcYRSbFqgD/Zva/k611iJLtG+UFT+ZOVL1281+19z41XySHIm5gnwY=

=ZuC4

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:56

Re: [bug#54299] [PATCH 16/27] added rust-raw-window-handle@0.4

Recipients:

Message-ID:79425b923bec4c28f3a8e9da36e9d65f1da4d7b1.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (3 lines)

> +�� (arguments

> +�� `(#:skip-build? #t

Why? (see some of my other replies on other patches)

Toggle quote (3 lines)

> +�� #:cargo-inputs

> +�� (("rust-cty" ,rust-cty-0.2))))))

Would regular inputs suffice, instead of the cargo-specific hack?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieY4xccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tyqAQCwOLEZuvTqAjEdXG8Xm4yMH+gc

SrWu6h8hEkTPP4baPAD9Had9CEj9NV/vyV1yQ/adTGj1ZIXsl7BmLsOUZ8kw6Qw=

=1fOB

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:57

Re: [bug#54299] [PATCH 14/27] added rust-glutin@0.28

Recipients:

Message-ID:dadeadc1cd493a15c9837c66cb1d59661be2a41b.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (1 lines)

> +�� `(#:skip-build? #t

Why?

Toggle quote (3 lines)

> +�� #:cargo-inputs

> +�� (("rust-android-glue" ,rust-android-glue-0.2) ("rust-cgl" ,rust-cgl-0.3)

Would regular inputs suffice?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieY+BccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7nfHAP9gNvqXdoiS0RkDfr+n60tKtFvT

7KjmoDcv3yzzVKB/TgEA3fxClR9OwOoStHpdMJtwP1RUTSu1+eIPNnBmBisuBwM=

=x+5Y

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:58

Recipients:

Message-ID:ed8c9a5a76227cbab1c49401bb8a242ed78b7c7c.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (3 lines)

> +�� ("rust-winapi" ,rust-winapi-0.3)

> +�� ("rust-winit" ,rust-winit-0.26))))

Microsoft Windows is currently not supported in Guix (except
for some mingw cross-compilation, but that probably doesn't cover Rust
yet).  Please remove them.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieZNhccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jXKAQCzttbdbkhFq4oXLSqCXDIjI/yV

SoDAW18tqDCnhptnrAEA60ksJXryCsrOjHpCuwDjU9XY9IRKpCwuQJyr3Jrf7Qw=

=kGTV

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:58

Recipients:

Message-ID:4efcf764e22eac0f9cd5da4315a0059cc49171e4.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (4 lines)

> +�� (("rust-android-glue" ,rust-android-glue-0.2) ("rust-cgl" ,rust-cgl-0.3)

> +�� ("rust-cocoa" ,rust-cocoa-0.24)

> +�� ("rust-core-foundation" ,rust-core-foundation-0.9)

Android and whatever the name is for Apple's OS are currently

unsupported in Guix, so these inputs seem pointless to me.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieZYBccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7onMAQDNVv0NElJ5NHngr9EN9PPcg6MG

6EtRTS38/5mAhiIQuQD/SL3HWDonoSz/n01l5/vRYFIZEQtst3lloC5tfeZLEAs=

=VFmT

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:59

Re: [bug#54299] [PATCH 13/27] added rust-num-enum@0.5

Recipients:

Message-ID:2011135b19f75cb86881c159277d9e3da0242cf2.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� `(#:tests? #f ;missing files

If they are missing, why not add them?

What files are missing?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieZexccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7qYzAP93ZXZtECGMnRjTzoyzG+1UOJ8F

JlO9pE+ZWhvqTzw90gEAppP8AtgPFuxuGyRZ9jFbhHsbjH8SgPzrbyriHn9KqgI=

=/8qW

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 18:59

Recipients:

Message-ID:b21abdaa79c4e4cfb08c8f30b84a4c89aafcc30b.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (8 lines)

> +�� #:cargo-inputs

> +�� (("rust-derivative" ,rust-derivative-2) ("rust-num-enum" ,rust-num-enum-0.5)

> +�� ("rust-num-enum-derive" ,rust-num-enum-derive-0.5))

> +�� #:cargo-development-inputs

> +�� (("rust-anyhow" ,rust-anyhow-1) ("rust-trybuild" ,rust-trybuild-1)

> +�� ("rust-walkdir" ,rust-walkdir-2)

> +�� ("rust-rustversion" ,rust-rustversion-1))))))

Would regular 'inputs' and 'native-inputs' suffice?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieZnRccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7sjTAQDjqZQ1D/bVgGZX0+FIEF/bNZAW

cu+9m/6pUlD/aVujQQEA5uLdJye/Lm4nSfRA5mWhCinu1LdglgBlK6BsPwj01QI=

=kBOk

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:00

Recipients:

Message-ID:7aafc69ade6352762c8771e9d8e73c47854bdec8.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (4 lines)

> +(define-public rust-num-enum-0.5

> [...]

> +(define-public rust-num-enum-derive-0.5

Only one package per patch please, that makes reviewing, reverting

and looking at the git history easier.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieZ1RccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tURAQC4cBiNUBZalnAIOk/RwcpljDwe

mksHStEyPwGlVTsQHAEA9nGv22K1ohw0teWMYAOAVHXUjlo5F3qXFa+MoLVaGAQ=

=U5aV

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:01

Recipients:

Message-ID:d21bcb033abd2bc1ee73ec4995267ffe7e4d7629.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� `(#:tests? #f�� ;FIXME: some doc tests fail

Have these test failures been reported upstream?
What tests are failing, how are they failing, and could the test
failures be addressed?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieaFhccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jn7AQCbde4aiOsB8Es6zhsZ9xQVBz71

BybqZU26jkBXZl4nDAD+JXKvWWl5I0hDh+n4syEYoo4qE3KyNGjMYYuYqxRvogE=

=2L+s

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:04

Re: [bug#54299] [PATCH 12/27] added development inputs, reformatted rust-nix@0.22

Recipients:

Message-ID:d799fe1857a1c5bd5025805cc47babd9e0f38b5f.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (4 lines)

> -�� (("rust-bitflags" ,rust-bitflags-1.2)

> -�� ("rust-cc" ,rust-cc-1)

> +�� (("rust-bitflags" ,rust-bitflags-1.2) ("rust-cc" ,rust-cc-1)

That doesn't look better formatting to me.

Toggle quote (14 lines)

> �� ("rust-cfg-if" ,rust-cfg-if-1)

> �� ("rust-libc" ,rust-libc-0.2)

> -�� ("rust-memoffset" ,rust-memoffset-0.6))))))

> +�� ("rust-memoffset" ,rust-memoffset-0.6))

> +�� #:cargo-development-inputs

> +�� (("rust-assert-impl" ,rust-assert-impl-0.1) ("rust-caps" ,rust-caps-0.5)

> +�� ("rust-lazy-static" ,rust-lazy-static-1)

> +�� ("rust-rand" ,rust-rand-0.8)

> +�� ("rust-semver" ,rust-semver-1)

> +�� ("rust-sysctl" ,rust-sysctl-0.1)

> +�� ("rust-tempfile" ,rust-tempfile-3))))))

Why do these need to be added? Did "guix build rust-nix@0.22" fail

before these changes?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieathccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7v8xAP4nJbxoYk+e2nStk/Fcap/WZ4d0

BBI9BSrEmqSXtS+KOgD/QrO7hsm2tDz4bf75wNhSUJBPKbudpPlmzrkQMO0u1wo=

=RSZl

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:05

Re: [bug#54299] [PATCH 11/27] updated rust-ndk-sys@0.2 to 0.2.2

Recipients:

Message-ID:4abe4eb34f6170421ee5df7cb6d60d1963e338d2.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (4 lines)

> -�� (arguments `(#:skip-build? #t))

> +�� (arguments

> +�� `(#:skip-build? #t))

The formatting change seems like an independent change to me,

for a separate patch if at all.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYiea/RccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7hDnAQDthBqv5jDOkJatK+VgsTPPMIbE

zHnXiL5goPE238lkUgEA3PSqrdnnrF1qo7OlpYT1szG0gARJ0itZlmCkGV/M8g8=

=0HZA

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:06

Re: [bug#54299] [PATCH 10/27] added rust-ndk-macro@0.3

Recipients:

Message-ID:73c442b3adf6da8db01aa3bb860ce7fa724e48d9.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (6 lines)

> +�� (arguments

> +�� `(#:cargo-inputs (("rust-darling" ,rust-darling-0.13) ("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1)

> +�� ("rust-proc-macro2" ,rust-proc-macro2-1)

> +�� ("rust-quote" ,rust-quote-1)

> +�� ("rust-syn" ,rust-syn-1))))))

Would regular inputs (or propagated-inputs maybe) suffice?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYiebHBccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7nBCAQCuIGMQKyss8HZjnbvQECEHxZ3/

lmlVWjR5s0WLsF6J5QEA/wrUuRSRp7s3DhVTVEaumY7i+pVVIUvamQEO/ydTHQs=

=A+g+

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:07

Re: [bug#54299] [PATCH 09/27] added rust-ndk-context@0.1

Recipients:

Message-ID:0c72b7169a5a08f100000e58be4038a2e32d9b56.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� (arguments

> +�� `(#:skip-build? #t))

Why?

Toggle quote (3 lines)

> +�� (home-page "https://github.com/rust-windowing/android-ndk-rs")

> +�� (synopsis "Rust on Android")

Guix currently doesn't really support non-Linux Android features at all
currently, so this package seems currently pointless, what is the
reason for packaging it?

Greetings,
Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYiebVRccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jqGAP49uUwQB92soht/On4n/0GCeULF

E1e/QNSg2Yeidz6BjQEAy6e8wiKbcrSoSHG4nVhoN99ML14zr4u3hEIZqkqiIwA=

=YKb2

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:08

Re: [bug#54299] [PATCH 06/27] updated rust-memmap2@0.3 to version 0.3.1

Recipients:

Message-ID:0bd861993784087fa666ae04db224ea145140037.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (8 lines)

> +�� (source (origin

> +�� (method url-fetch)

> +�� (uri (crate-uri "memmap2" version))

> +�� (file-name (string-append name "-" version ".tar.gz"))

> +�� (sha256

> +�� (base32

> +�� "0mz3fdcq443m3a1phrhp2yvd1h9vrvbhinzmi23ik031zzmw5dh0"))))

Running "guix style" on rust-memmap2 seems reasonable, but for clarity

I would keep this for a separate patch (YMMV)

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYieblhccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7mhKAP9uCpmkSIdnefgDrzSRNkNDss3c

UWHcrEAL36chnPt2zQD/UR/uQMEOYt6B5REul/+Z6SCz9aNnDMenDef2DBPcRQI=

=SYaj

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:08

Re: [bug#54299] [PATCH 05/27] added rust-dlib@0.5

Recipients:

Message-ID:c42edb5dc516f5cb98393c7461c06aaacfda52d4.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (2 lines)

> +�� `(#:tests? #f

Why?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYiebqRccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7g7nAQCskvHrshnyGEJB2n0hmxF8Z1jN

P+uDFNl2ivxopwclcwD9EX/7T85V8PY6qW2jlXeVk+Uiz/zyNyG1ABbcNYuhQQU=

=oirb

-----END PGP SIGNATURE-----

Maxime Devos wrote on 8 Mar 2022 19:09

Recipients:

Message-ID:91c5cb86d33e027b48b8582744d1a9c34110de63.camel@telenet.be

Till Robin Zickel schreef op di 08-03-2022 om 18:31 [+0100]:

Toggle quote (4 lines)

> +�� #:cargo-inputs

> +�� (("rust-libloading" ,rust-libloading-0.7))))

> +�� (inputs (list rust-libloading-0.7))))

Why both #:cargo-inputs and 'inputs'?

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYiebwBccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7oH7AQD4KiEIbEHV0Jm+KVn1w9QUbdro

X+NZf9B0bYi4UWLJWgD6A4yU8F5Qiolv2UYb/Y38gIQPjZ4qZNbD+Ypn3n5oXAE=

=L/h8

-----END PGP SIGNATURE-----

Maxime Devos wrote on 21 Mar 2022 19:50

Recipients:(name . Till Robin Zickel)(address . trzickel@mailbox.org)(address . 54299@debbugs.gnu.org)

Message-ID:211c141a91ded21b71818318b2e8254d06cab74e.camel@telenet.be

Till Robin Zickel schreef op zo 20-03-2022 om 22:07 [+0100]:

Toggle quote (4 lines)

> The crate presumably needs a directory which isn't present in the

> downloaded source archive, thus the tests will fail. This was the case

> with other packages, so I copied the strategy of not running the tests.

Then those packages should be fixed (not a requirement for this patch

series though).

In any case, presumably you can find the missing directory in the git

repository, so maybe a git-reference can be used to resolve the issue?

Greetings,

Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYjjI4BccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7nxAAQCoXgzvVN+BZ1qpVVzxtjbvVLDQ

+97JIu9ewuTdYy+52gD/a77NjZ0GnsA5TKbXUQvM4LyzWMA1GpAD5v+30Oyrvwc=

=x4al

-----END PGP SIGNATURE-----

Maxime Devos wrote on 21 Mar 2022 19:55

Re: [bug#54299] [PATCH 09/27] added rust-ndk-context@0.1

Recipients:

Message-ID:ac5e21386213f35b23ca421d8a5484d407fefa28.camel@telenet.be

Till Robin Zickel schreef op zo 20-03-2022 om 22:11 [+0100]:

Toggle quote (2 lines)

> This is a library crate, so there is no need to build it, right?

By building it, syntax errors, API mismatches, etc. are detected

earlier, making updating the crate and its dependents less error-prone.

And from (guix)Rust Crates:

Care should be taken to ensure the correct version of

dependencies are used; to this end we try to refrain from skipping

the tests or using ‘#:skip-build?’ when possible.

Additionally, compiling libraries earlier can save compile time later

(*). Imagine having to rebuild glibc and gtk every time a new graphical

application using gtk is packaged ...

(*) There might currently be technical problems with rust and shared

libraries preventing this from working though. Or maybe they have been

resolved, I dunno.

Greetings,

Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYjjKOBccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7u4pAQDkPwzqDZHmLeKJJDmHVYfAZdI3

CoPuJdm5dk5FO6AlQAEAyb/WeWihEuSuO9c15HKcjAqbWWf+oInEVya+nKbzuwE=

=Ulu2

-----END PGP SIGNATURE-----

Maxime Devos wrote on 21 Mar 2022 19:56

Recipients:

Message-ID:92c718c7232a98df8c539c23d9b047d493fc2f98.camel@telenet.be

Till Robin Zickel schreef op zo 20-03-2022 om 22:11 [+0100]:

Toggle quote (3 lines)

> Android is not supported on guix, but the dependency is needed by an

> upstream crate and it's not optional afaik.

Which upstream crate? If you remove the dependency from the upstream

crate, does it fail to build? If so, with what error messages?

Greetings,

Maxime.

phodina wrote on 24 Apr 2022 14:55

[PATCH v2 01/25] gnu: rust-structopt-derive-0.4: Update to 0.4.18.

Recipients:(name . 54299@debbugs.gnu.org)(address . 54299@debbugs.gnu.org)(name . Maxime Devos)(address . maximedevos@telenet.be)

Message-ID:e6Wd6fbbqiWLx2cHSVfViNJ7CMlyUDkKjDpj-qmYO-BJ8o0whvsa3UwAtw0ndvlvJFeFveiQQflDtcClaXAslxZtB7lVlH95JpGGkxWc_q8=@protonmail.com

Hi,

here are patches that almost build alacritty. In alacritty package there is still phase (add-absolute-library-references) which fails.

There are patches for Cargo.toml to remove support for Android, IOS and Windows.

The downside of replacing rust-wayland-.*-0.28 with 0.29 is that there are some other packages that need to be updated or fix requirements in Cargo.toml.

I'll check what which regular inputs (or propagated-inputs maybe) might suffice instead of cargo-inputs.

Could someone please check what's wrong with the failing phase in the meantime?

----

Petr

Attachment: file

From c82b9b8ae4b92121639151a009dcf9a7f357c64a Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-structopt-derive-0.4): Update to 0.4.18.

Toggle diff (32 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bebc1fce8d..4b7f05f91d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59144,7 +59144,7 @@ (define-public rust-structopt-0.2
 (define-public rust-structopt-derive-0.4
   (package
    (name "rust-structopt-derive")
-   (version "0.4.14")
+   (version "0.4.18")
    (source
     (origin
      (method url-fetch)
@@ -59153,7 +59153,7 @@ (define-public rust-structopt-derive-0.4
       (string-append name "-" version ".tar.gz"))
      (sha256
       (base32
-       "143gjwvz3s86hwp070km83y25n8kqp5f01kb1dr19f4ilkywvaav"))))
+       "1q5gcigmvw0cinjxzpyrkflliq5r1ivljmrvfrl3phcwgwraxdfw"))))
    (build-system cargo-build-system)
    (arguments
     `(#:skip-build? #t

base-commit: 59b91fdbcd7e1a88d1d54d392ce5d5fddd9d96d1
prerequisite-patch-id: da2145422d4d1f8bf2657acf5d9a7c13276f8c49
prerequisite-patch-id: 53bbcbff793ef539437881d896c0310891a436de
prerequisite-patch-id: a8095f7fa7171a2caf5df01779513c8b024e5858
prerequisite-patch-id: 75fe4b597b1bcdae76f9444e98f5aedad71872f1
prerequisite-patch-id: 6c90cee23643ad8a51dfd363d4ac45f43eaa3687
prerequisite-patch-id: 2fcd3f6658f66f7fb031a3c238ea918ed98c7878
-- 
2.35.1

From 8ef0904d87c3f43015ad9654910dafcb3bf8cbd8 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-structopt): Update to 0.3.26.

[arguments]: Add rust-paw-1 to cargo-inputs. Add cargo development inputs.

Add phases to fix rust-clap-2 version and remove lints feature.

Toggle diff (45 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4b7f05f91d..25292d54a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59093,7 +59093,7 @@ (define-public rust-strsim-0.5
 (define-public rust-structopt-0.3
   (package
     (name "rust-structopt")
-    (version "0.3.21")
+    (version "0.3.26")
     (source
      (origin
        (method url-fetch)
@@ -59102,14 +59102,27 @@ (define-public rust-structopt-0.3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "136j0lvjmpv5syi751vxg8vb30gfyv4k81x8d18kxrj6xvbsqxsj"))))
+         "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-structopt-derive" ,rust-structopt-derive-0.4)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-clap" ,rust-clap-2))))
+        ("rust-paw" ,rust-paw-1)
+        ("rust-clap" ,rust-clap-2))
+       #:cargo-development-inputs
+       (("rust-strum" ,rust-strum-0.21)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-rustversion" ,rust-rustversion-1))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fixup-cargo-toml
+           (lambda _
+             (substitute* "Cargo.toml"
+               ;; feature does not exist
+               (("lints.*") "")
+               (("2.33") ,(package-version rust-clap-2))))))))
     (home-page "https://github.com/TeXitoi/structopt")
     (synopsis "Parse command line argument by defining a struct")
     (description
-- 
2.35.1

From e1dbe1ade18fac3cecaab52a11432b56c73f7520 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-calloop-0.9): New variable.

(rust-calloop-0.4): Inherit from above.

(rust-calloop-0.6): Remove variable.

Toggle diff (46 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 25292d54a6..a756da0b2c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9434,23 +9434,25 @@ (define-public rust-calamine-0.16
         ("rust-serde" ,rust-serde-1)
         ("rust-zip" ,rust-zip-0.5))))))
 
-(define-public rust-calloop-0.6
+(define-public rust-calloop-0.9
   (package
     (name "rust-calloop")
-    (version "0.6.5")
+    (version "0.9.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "calloop" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0z3jlsv3g28097dhsmi2l8nzkd3p937jhb4pg52njhb0wxkn20qb"))))
+        (base32 "10mbcsd7fj3cg0a463h3003wycv955cnj4pm2gla2sp5xxhyqbmz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-log" ,rust-log-0.4)
-        ("rust-nix" ,rust-nix-0.18))))
+       (("rust-futures-io" ,rust-futures-io-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-nix" ,rust-nix-0.22))))
     (home-page "https://github.com/Smithay/calloop")
     (synopsis "Callback-based event loop")
     (description "This package provides a callback-based event loop.")
@@ -9458,7 +9460,7 @@ (define-public rust-calloop-0.6
 
 (define-public rust-calloop-0.4
   (package
-    (inherit rust-calloop-0.6)
+    (inherit rust-calloop-0.9)
     (name "rust-calloop")
     (version "0.4.4")
     (source
-- 
2.35.1

From 674879aca7722cbb557e0d4b2dea94170d44dcfb Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-num-enum-derive-0.5): New variable.

(rust-num-enum-derive-0.4): Remove variable.

Toggle diff (38 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a756da0b2c..5f7de601b9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38315,17 +38315,17 @@ (define-public rust-num-enum-0.4
 primitives and enums easier.")
     (license license:bsd-3)))
 
-(define-public rust-num-enum-derive-0.4
+(define-public rust-num-enum-derive-0.5
   (package
     (name "rust-num-enum-derive")
-    (version "0.4.3")
+    (version "0.5.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "num_enum_derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17fvb7xpxq2dsqp5nsz98w1qhkk3gnc56xis53009vnzvlys79gz"))))
+        (base32 "1kj6b8f2fx8prlcl6y1k97668s5aiia4f9gjlk0nmpak3rj9h11v"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ;FIXME: some doc tests fail
@@ -38333,7 +38333,9 @@ (define-public rust-num-enum-derive-0.4
        (("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-proc-macro-crate" ,rust-proc-macro-crate-1))))
     (home-page "https://github.com/illicitonion/num_enum")
     (synopsis "Procedural macros to ease operation between primitives and enums")
     (description
-- 
2.35.1

From 3abc13cd811bdc9eebed604f1ebdabf81e83ba92 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-console-log-0.2): New variable.

(rust-console-log-0.1): Inherit from above.

Toggle diff (55 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7984daf84f..a2aef256c2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12726,8 +12726,33 @@ (define-public rust-console-error-panic-hook-0.1
 that logs panics to @code{console.error}.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-console-log-0.2
+  (package
+    (name "rust-console-log")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "console-log" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "150li8pznpfpn4q0f7g9jwq2hnd5wik0w8378zaa1wffc5ckf6jh"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-log" ,rust-log-0.4)
+         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+         ("rust-web-sys" ,rust-web-sys-0.3))))
+    (home-page "https://github.com/iamcodemaker/console_log")
+    (synopsis "Route Rust log messages to the browser's console")
+    (description
+     "This package provides a logging facility that routes Rust log messages to
+the browser's console.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-console-log-0.1
   (package
+    (inherit rust-console-log-0.2)
     (name "rust-console-log")
     (version "0.1.2")
     (source
@@ -12743,13 +12768,7 @@ (define-public rust-console-log-0.1
     (arguments
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4)
-        ("rust-web-sys" ,rust-web-sys-0.3))))
-    (home-page "https://github.com/iamcodemaker/console_log")
-    (synopsis "Route Rust log messages to the browser's console")
-    (description
-     "This package provides a logging facility that routes Rust log messages to
-the browser's console.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-web-sys" ,rust-web-sys-0.3))))))
 
 (define-public rust-const-fn-0.4
   (package
-- 
2.35.1

From b5d55a1dae97369211853fa66deb6c12f6780c40 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-glutin-egl-sys-0.1): Update to

0.1.5.

Toggle diff (30 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index cc5df11d70..e22a16f184 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1080,7 +1080,7 @@ (define-public rust-glutin-0.21
 (define-public rust-glutin-egl-sys-0.1
   (package
     (name "rust-glutin-egl-sys")
-    (version "0.1.4")
+    (version "0.1.5")
     (source
      (origin
        (method url-fetch)
@@ -1089,12 +1089,12 @@ (define-public rust-glutin-egl-sys-0.1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0k1x1frdp4wp47qkai8zzmgqxzpfcn7780m29qgd92lbnbrxwbkp"))))
+         "04f2ci9kb8q4dv4kviigvgfy54lr4jmbnmjsvi50qj13anjnmfra"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-winapi" ,rust-winapi-0.3)
-        ("rust-gl-generator" ,rust-gl-generator-0.13))))
+        ("rust-gl-generator" ,rust-gl-generator-0.14))))
     (home-page "https://github.com/rust-windowing/glutin")
     (synopsis "Egl bindings for glutin")
     (description "The egl bindings for glutin.")
-- 
2.35.1

Attachment: v2-0019-gnu-Add-rust-winit-0.26.patch

From ebae145162cd5d082cfe2d55c8bbdd14a902a6b6 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-num-enum-0.5): New variable.

(rust-num-enum-0.4): Remove variable.

Toggle diff (41 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5f7de601b9..b9175b7c98 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38290,24 +38290,28 @@ (define-public rust-num-derive-0.2
     (description "Numeric syntax extensions in Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-num-enum-0.4
+(define-public rust-num-enum-0.5
   (package
     (name "rust-num-enum")
-    (version "0.4.3")
+    (version "0.5.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "num_enum" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1r1nisdzm9m7xm0389nwyi85jhx1bnh5pwllai44ngbgy1ymlmna"))))
+        (base32 "1j8rq7i4xnbzy72z82k41469xlj1bmn4ixagd9wlbvv2ark9alyg"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #false                  ;missing files
        #:cargo-inputs
-       (("rust-derivative" ,rust-derivative-2)
-        ("rust-num-enum" ,rust-num-enum-0.4)
-        ("rust-num-enum-derive" ,rust-num-enum-derive-0.4))))
+       (("rust-num-enum-derive" ,rust-num-enum-derive-0.5))
+       #:cargo-development-inputs
+       (("rust-rustversion" ,rust-rustversion-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-walkdir" ,rust-walkdir-2)
+        ("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+        ("rust-anyhow" ,rust-anyhow-1))))
     (home-page "https://github.com/illicitonion/num_enum")
     (synopsis "Macros easing inter-operation between primitives and enums")
     (description
-- 
2.35.1

From f5aaa824b22193115ffd77196df8cbc7ef2be370 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-wayland-commons-0.29): New variable.

(rust-wayland-commons-0.29): Inherit from above.

(rust-wayland-commons-0.28): Remove variable.

Toggle diff (48 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 414245f7a7..06851ceee6 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2488,26 +2488,26 @@ (define-public rust-wayland-client-0.21
        (("rust-byteorder" ,rust-byteorder-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-wayland-commons-0.28
+(define-public rust-wayland-commons-0.29
   (package
     (name "rust-wayland-commons")
-    (version "0.28.3")
+    (version "0.29.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-commons" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0mid1sgy3bmiywnrhsr31b8w6zvk1ll2ci2as15ddv8pczvm0128"))))
+        (base32 "0gnk4a771i3g1k4fbzx54xnganpc9j68jrx8xj839hfp83iybxll"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-nix" ,rust-nix-0.18)
+       (("rust-nix" ,rust-nix-0.22)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-smallvec" ,rust-smallvec-1))))
     (inputs
-     (list rust-nix-0.18 rust-once-cell-1 rust-smallvec-1
-           rust-wayland-sys-0.28))
+     (list rust-nix-0.22 rust-once-cell-1 rust-smallvec-1
+           rust-wayland-sys-0.29))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis "Types and structures used by wayland-client and wayland-server")
     (description
@@ -2517,7 +2517,7 @@ (define-public rust-wayland-commons-0.28
 
 (define-public rust-wayland-commons-0.23
   (package
-    (inherit rust-wayland-commons-0.28)
+    (inherit rust-wayland-commons-0.29)
     (name "rust-wayland-commons")
     (version "0.23.6")
     (source
-- 
2.35.1

From f7a781d0e8bd591a4efad3dcca965a7ac5d8da3e Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-wayland-protocols-0.29): New variable.

(rust-wayland-protocols-0.23): Inherit from above.

(rust-wayland-protocols-0.28): Remove variable.

* gnu/packages/crates-io.scm: Update comment.

Toggle diff (71 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index f2eaedf624..8fdd64bb1a 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2608,25 +2608,30 @@ (define-public rust-wayland-egl-0.28
 initializing an OpenGL or Vulkan context.")
     (license license:expat)))
 
-(define-public rust-wayland-protocols-0.28
+(define-public rust-wayland-protocols-0.29
   (package
     (name "rust-wayland-protocols")
-    (version "0.28.3")
+    (version "0.29.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-protocols" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0c0sw13qssrvf3jgygwqpiimpaagz3haxn9jridd4k85sfs856ii"))))
+        (base32 "0hap8vky2fwsq05c98c8xs00gb9m5kxp8kq3zr0jwh036gi7l530"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1))))
+       (("rust-bitflags" ,rust-bitflags-1))
+       #:cargo-development-inputs
+       (("rust-autocfg" ,rust-autocfg-1)
+        ("rust-cfg-if" ,rust-cfg-if-1))))
     (inputs
-     (list rust-bitflags-1 rust-wayland-client-0.28
-           rust-wayland-commons-0.28 rust-wayland-scanner-0.28
-           rust-wayland-server-0.28))
+     (list rust-bitflags-1.2
+           rust-wayland-client-0.29
+           rust-wayland-commons-0.29
+           rust-wayland-scanner-0.29
+           rust-wayland-server-0.29))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis "Generated API for the officials Wayland protocol extensions")
     (description
@@ -2636,7 +2641,7 @@ (define-public rust-wayland-protocols-0.28
 
 (define-public rust-wayland-protocols-0.23
   (package
-    (inherit rust-wayland-protocols-0.28)
+    (inherit rust-wayland-protocols-0.29)
     (name "rust-wayland-protocols")
     (version "0.23.6")
     (source
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 957f30329f..7984daf84f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7128,9 +7128,10 @@ (define-public rust-bitflags-1
     (license (list license:asl2.0
                    license:expat))))
 
-;; XXX: The package below is meant to fix rust-nix-0.22, which has the
-;; following requirements for bitflags version: ">=1.1.0 <1.3.0", and every
-;; package using the latter as a dependency (e.g., nushell 0.43).
+;; XXX: The package below is meant to fix rust-nix-0.22 and
+;; rust-wayland-protocols, which has the  following requirements for bitflags
+;; version: ">=1.1.0 <1.3.0", and every package using the latter as a dependency
+;; (e.g., nushell 0.43).
 (define-public rust-bitflags-1.2
   (package
     (inherit rust-bitflags-1)
-- 
2.35.1

From 04f6a1c7a4bbc95b729c49238d7378d0e1128faf Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-mint-0.5): Update to 0.5.9.

[arguments]: Add cargo-development-inputs.

Toggle diff (28 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b9175b7c98..0bfa961b81 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34821,7 +34821,7 @@ (define-public rust-miniz-sys-0.1
 (define-public rust-mint-0.5
   (package
     (name "rust-mint")
-    (version "0.5.4")
+    (version "0.5.9")
     (source
      (origin
        (method url-fetch)
@@ -34830,8 +34830,11 @@ (define-public rust-mint-0.5
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0c4190gr348fkfijij7vm19iagwl36mssj1irc9f6m448hbhgn68"))))
+         "1zw5glv8z2d99c82jy2za97hh9p6377xmf4rbwz7jynsdfxfngg5"))))
     (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs (("rust-serde" ,rust-serde-1))))
     (home-page "https://github.com/kvark/mint")
     (synopsis "Math interoperability standard types")
     (description
-- 
2.35.1

Attachment: v2-0022-gnu-Add-rust-glutin-0.28.patch

From f8b0860697464a631d4d20bd6b82d6ee0ca2fdd7 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-dlib-0.5): New variable.

(rust-dlib-0.4): Remove variable.

Toggle diff (38 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0bfa961b81..957f30329f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18389,10 +18389,10 @@ (define-public rust-dissimilar-1
 Google's diff-match-patch.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-dlib-0.4
+(define-public rust-dlib-0.5
   (package
     (name "rust-dlib")
-    (version "0.4.2")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
@@ -18401,13 +18401,14 @@ (define-public rust-dlib-0.4
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0xlsf3lrz9hd7q3ff6lp5mw4kn3nbryn746kd07i93r6wg8ia7xi"))))
+         "1547hy7nrhkrb2i09va244c0h8mr845ccbs2d2mc414c68bpa6xc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-libloading" ,rust-libloading-0.6))))
+     `(#:tests? #f ; failing doc-tests
+       #:cargo-inputs
+       (("rust-libloading" ,rust-libloading-0.7))))
     (inputs
-     (list rust-libloading-0.6))
+     (list rust-libloading-0.7))
     (home-page "https://github.com/vberger/dlib")
     (synopsis "Helper macros for manually loading optional system libraries")
     (description
-- 
2.35.1

From e652e312b075ea8b5740a07a0fce85e1b7dc467e Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-wayland-cursor-0.29): New variable.

(rust-wayland-cursor-0.28): Remove variable.

Toggle diff (36 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 8012678999..ffe8f9e52d 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2556,24 +2556,24 @@ (define-public rust-wayland-commons-0.21
        (("rust-nix" ,rust-nix-0.14)
         ("rust-wayland-sys" ,rust-wayland-sys-0.21))))))
 
-(define-public rust-wayland-cursor-0.28
+(define-public rust-wayland-cursor-0.29
   (package
     (name "rust-wayland-cursor")
-    (version "0.28.3")
+    (version "0.29.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-cursor" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0pvf96a9hg7b40vyvamcg491sa0006fr9bzf1xkaf8q22qn15syn"))))
+        (base32 "1gd6aswkrdz556n54pjpd4rchw7jkgcx6hnrhgy62y2y7pqmh9y5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-nix" ,rust-nix-0.18)
+       (("rust-nix" ,rust-nix-0.22)
         ("rust-xcursor" ,rust-xcursor-0.3))))
     (inputs
-     (list rust-nix-0.18 rust-wayland-client-0.28 rust-xcursor-0.3))
+     (list rust-nix-0.22 rust-wayland-client-0.29 rust-xcursor-0.3))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis "Bindings to libwayland-cursor")
     (description
-- 
2.35.1

From f215a3936c5e37ba172618ff190a876e12329e64 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-wayland-commons-0.29): New variable.

(rust-wayland-client-0.23): Inherit from above.

(rust-wayland-client-0.28): Remove variable.

Toggle diff (64 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 06851ceee6..8012678999 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2390,36 +2390,37 @@ (define-public rust-tiff-0.2
         ("rust-num-derive" ,rust-num-derive-0.2)
         ("rust-num-traits" ,rust-num-traits-0.2))))))
 
-(define-public rust-wayland-client-0.28
+(define-public rust-wayland-client-0.29
   (package
     (name "rust-wayland-client")
-    (version "0.28.3")
+    (version "0.29.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-client" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1mxnflzv9s3qpcp0z7kqvrzki5bknfar9n9yky06f8ivs00vxgdx"))))
+        (base32 "13s5sj9344izk2g48yizk81kcg8jg4940gg2v6bzcmrjwxh388li"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1.2)
         ("rust-downcast-rs" ,rust-downcast-rs-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-nix" ,rust-nix-0.18)
+        ("rust-nix" ,rust-nix-0.22)
         ("rust-scoped-tls" ,rust-scoped-tls-1))
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))
     (inputs
-     (list rust-bitflags-1
+     (list rust-bitflags-1.2
            rust-downcast-rs-1
            rust-libc-0.2
-           rust-nix-0.18
+           rust-nix-0.22
            rust-scoped-tls-1
-           rust-wayland-commons-0.28
-           rust-wayland-scanner-0.28
-           rust-wayland-sys-0.28))
+           rust-wayland-commons-0.29
+           rust-wayland-scanner-0.29
+           rust-wayland-sys-0.29))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis
      "Rust bindings to the standard C implementation of the wayland protocol")
@@ -2430,7 +2431,7 @@ (define-public rust-wayland-client-0.28
 
 (define-public rust-wayland-client-0.23
   (package
-    (inherit rust-wayland-client-0.28)
+    (inherit rust-wayland-client-0.29)
     (name "rust-wayland-client")
     (version "0.23.6")
     (source
-- 
2.35.1

Attachment: v2-0024-gnu-alacritty-Update-to-0.10.1.patch

From 31785a92c3f9764c2e9de09d4213d4013e172496 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-smithay-clipboard): Update to 0.6.5.

[arguments]: Update to rust-smithay-client-toolkit-0.15 and

rust-wayland-client-0.29.

Toggle diff (31 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index f7cb0c0bb6..c8d0b56612 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2259,20 +2259,20 @@ (define-public rust-smithay-client-toolkit-0.4
 (define-public rust-smithay-clipboard-0.6
   (package
     (name "rust-smithay-clipboard")
-    (version "0.6.2")
+    (version "0.6.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "smithay-clipboard" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14dwisd56cbr80zf719l3fh0n8pm1fjmvry9lsbhdbccf8cv525b"))))
+        (base32 "0mfx96cqws3h1yp4f354yvrfh9ylhfyzr877p39byy2ks8dma2v1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.12)
-        ("rust-wayland-client" ,rust-wayland-client-0.28))))
+       (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.15)
+        ("rust-wayland-client" ,rust-wayland-client-0.29))))
     (home-page "https://github.com/smithay/smithay-clipboard")
     (synopsis "Access to the Wayland clipboard for client applications")
     (description
-- 
2.35.1

From b7b3692014a770660ebfaa9f456c04955c7b418d Mon Sep 17 00:00:00 2001

* gnu/local.mk: Remove patch.

* gnu/packages/crates-io.scm (wl-clipboard-rs-0.6): Add new variable.

(wl-clipboard-rs-0.4): Remove variable.

* gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch: Remove file.

Toggle diff (100 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index c8efbe4516..79042c65ff 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1783,7 +1783,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/rust-openssl-sys-no-vendor.patch	\
   %D%/packages/patches/rust-shell2batch-lint-fix.patch		\
   %D%/packages/patches/rust-winit-remove-windows-and-ios.patch \
-  %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch      \
   %D%/packages/patches/sbc-fix-build-non-x86.patch		\
   %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch	\
   %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch	\
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b6c2bdd003..7d623b0e8d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69876,38 +69876,34 @@ (define-public rust-watchexec-1
 modifications.")
     (license license:asl2.0)))
 
-(define-public rust-wl-clipboard-rs-0.4
+(define-public rust-wl-clipboard-rs-0.6
   (package
     (name "rust-wl-clipboard-rs")
-    (version "0.4.1")
+    (version "0.6.0")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "wl-clipboard-rs" version))
         (file-name (string-append name "-" version ".tar.gz"))
-        (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch"))
         (sha256
-          (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13"))))
+          (base32 "12ydiayklrls2ys8ig2rljl86z21ixg672zhdsprnaiqpz8s6p5y"))))
     (build-system cargo-build-system)
     (arguments
       `(#:skip-build? #t
         #:cargo-inputs
         (("rust-derive-new" ,rust-derive-new-0.5)
          ("rust-derive-more" ,rust-derive-more-0.99)
-         ("rust-exitfailure" ,rust-exitfailure-0.5)
-         ("rust-failure" ,rust-failure-0.1)
          ("rust-libc" ,rust-libc-0.2)
          ("rust-log" ,rust-log-0.4)
-         ("rust-mime-guess" ,rust-mime-guess-2)
-         ("rust-nix" ,rust-nix-0.18)
-         ("rust-os-pipe" ,rust-os-pipe-0.9)
-         ("rust-stderrlog" ,rust-stderrlog-0.4)
-         ("rust-structopt" ,rust-structopt-0.3)
+         ("rust-nix" ,rust-nix-0.23)
+         ("rust-os-pipe" ,rust-os-pipe-1)
          ("rust-tempfile" ,rust-tempfile-3)
-         ("rust-tree-magic" ,rust-tree-magic-0.2)
-         ("rust-wayland-client" ,rust-wayland-client-0.28)
-         ("rust-wayland-commons" ,rust-wayland-commons-0.28)
-         ("rust-wayland-protocols" ,rust-wayland-protocols-0.28))))
+         ("rust-tree-magic-mini" ,rust-tree-magic-mini-3)
+         ("rust-wayland-client" ,rust-wayland-client-0.29)
+         ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))
+       #:cargo-development-inputs
+       (("rust-wayland-protocols" ,rust-wayland-protocols-0.29)
+	    ("rust-wayland-server" ,rust-wayland-server-0.29))))
     (home-page "https://github.com/YaLTeR/wl-clipboard-rs")
     (synopsis "Access to the Wayland clipboard")
     (description "This package provides access to the Wayland clipboard
diff --git a/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch b/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch
deleted file mode 100644
index 9fb692e9a6..0000000000
--- a/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 7b975e0..313cb63 100644
---- a/Cargo.toml
-+++ b/Cargo.toml.new
-@@ -75,17 +75,17 @@ version = "3"
- version = "0.2"
- 
- [dependencies.wayland-client]
--version = "0.27"
-+version = "0.28"
- 
- [dependencies.wayland-protocols]
--version = "0.27"
-+version = "0.28"
- features = ["client", "unstable_protocols"]
- [dev-dependencies.wayland-protocols]
--version = "0.27"
-+version = "0.28"
- features = ["server", "unstable_protocols"]
- 
- [dev-dependencies.wayland-server]
--version = "0.27"
-+version = "0.28"
- 
- [features]
- dlopen = ["native_lib", "wayland-client/dlopen", "wayland-server/dlopen"]
-- 
2.35.1

From a1941f1d65170f973892539c078821d0d07e9f0a Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-wayland-scanner-0.29): New variable.

(rust-wayland-scanner-0.28): Remove variable.

Toggle diff (44 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index dfb12dff69..44a050a25e 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2679,17 +2680,17 @@ (define-public rust-wayland-protocols-0.21
         ("rust-wayland-sys" ,rust-wayland-sys-0.21)
         ("rust-wayland-scanner" ,rust-wayland-scanner-0.21))))))
 
-(define-public rust-wayland-scanner-0.28
+(define-public rust-wayland-scanner-0.29
   (package
     (name "rust-wayland-scanner")
-    (version "0.28.3")
+    (version "0.29.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-scanner" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0g8ky63qk27in7zajycj3fyydsxlj19hanfcvr8d7z5kcxbvl43h"))))
+        (base32 "1q7r764z8k922xf51fj56b1xm29ffi9ap8jnf4c478gp8cqyv89r"))))
     (build-system cargo-build-system)
     (inputs
      (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8))
@@ -2704,7 +2705,7 @@ (define-public rust-wayland-scanner-0.28
 
 (define-public rust-wayland-scanner-0.23
   (package
-    (inherit rust-wayland-scanner-0.28)
+    (inherit rust-wayland-scanner-0.29)
     (name "rust-wayland-scanner")
     (version "0.23.6")
     (source
-- 
2.35.1

From 3528519cbc193feaa6f63c6d56b802add05a5def Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-wayland-0.29): New variable.

(rust-wayland-sys-0.23): Inherit from above.

Toggle diff (56 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 44a050a25e..414245f7a7 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2833,23 +2833,24 @@ (define-public rust-wayland-server-0.21
         ("rust-wayland-sys" ,rust-wayland-sys-0.21)
         ("rust-wayland-scanner" ,rust-wayland-scanner-0.21))))))
 
-(define-public rust-wayland-sys-0.28
+(define-public rust-wayland-sys-0.29
   (package
     (name "rust-wayland-sys")
-    (version "0.28.3")
+    (version "0.29.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16f03jsy7q6p2wpaazc4w4kycyyk0fz7lacpdbcizl9m1i7874v7"))))
+        (base32 "1m2jwk5q36jidwbdmdicmi27r9dzi4wanzg3i28nfxc9kbvisd6r"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-dlib" ,rust-dlib-0.4)
+       (("rust-dlib" ,rust-dlib-0.5)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.6)
         ("rust-pkg-config" ,rust-pkg-config-0.3))
        #:phases
        (modify-phases %standard-phases
@@ -2861,7 +2862,10 @@ (define-public rust-wayland-sys-0.28
                   (string-append libwayland "/lib/" shared-lib)))
                #t))))))
     (inputs
-     (list rust-dlib-0.4 rust-lazy-static-1 rust-libc-0.2
+     (list rust-dlib-0.5
+           rust-lazy-static-1
+           rust-libc-0.2
+           rust-memoffset-0.6
            rust-pkg-config-0.3))
     (propagated-inputs
      (list wayland))
@@ -2876,7 +2880,7 @@ (define-public rust-wayland-sys-0.28
 
 (define-public rust-wayland-sys-0.23
   (package
-    (inherit rust-wayland-sys-0.28)
+    (inherit rust-wayland-sys-0.29)
     (name "rust-wayland-sys")
     (version "0.23.6")
     (source
-- 
2.35.1

From 85807cf5c41a2d6afc1597bc05516cdc9bac919c Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-alacritty-terminal-0.16): New variable.

(rust-alacritty-terminal-0.15): Remove variable.

Toggle diff (51 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a2aef256c2..b6c2bdd003 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2511,17 +2511,17 @@ (define-public rust-alacritty-config-derive-0.1
      "This package provides a failure resistant deserialization derive.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-alacritty-terminal-0.15
+(define-public rust-alacritty-terminal-0.16
   (package
     (name "rust-alacritty-terminal")
-    (version "0.15.0")
+    (version "0.16.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "alacritty_terminal" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1qv8zv20qgn407v8m196p68yddvhalcppc21702698cj99b45ckc"))))
+        (base32 "0bvffvjmkran068p9bz0p9nrkj1k4bggd7q39mszjfafz155vyq2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -2529,19 +2529,20 @@ (define-public rust-alacritty-terminal-0.15
        (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1)
         ("rust-base64" ,rust-base64-0.13)
         ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-dirs" ,rust-dirs-2)
+        ("rust-dirs" ,rust-dirs-3)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
         ("rust-mio" ,rust-mio-0.6)
         ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.2)
         ("rust-mio-extras" ,rust-mio-extras-2)
         ("rust-miow" ,rust-miow-0.3)
-        ("rust-nix" ,rust-nix-0.23)
+        ("rust-nix" ,rust-nix-0.22)
         ("rust-parking-lot" ,rust-parking-lot-0.11)
         ("rust-regex-automata" ,rust-regex-automata-0.1)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-yaml" ,rust-serde-yaml-0.8)
-        ("rust-signal-hook" ,rust-signal-hook-0.1)
+        ("rust-signal-hook" ,rust-signal-hook-0.3)
+        ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2)
         ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-vte" ,rust-vte-0.10)
         ("rust-winapi" ,rust-winapi-0.3))))
-- 
2.35.1

From e86ba3447c9af6fb5676257dc3a2d2f4c5c3f33d Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-smithay-client-toolkit-0.15): New variable.

(rust-smithay-client-toolkit-0.6): Inherit from above.

(rust-smithay-client-toolkit-0.12): Remove variable.

Toggle diff (63 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 8fdd64bb1a..f7cb0c0bb6 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2162,32 +2162,35 @@ (define-public rust-rgb-0.8
 first-class Rust objects.")
     (license license:expat)))
 
-(define-public rust-smithay-client-toolkit-0.12
+(define-public rust-smithay-client-toolkit-0.15
   (package
     (name "rust-smithay-client-toolkit")
-    (version "0.12.2")
+    (version "0.15.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "smithay-client-toolkit" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1rjdszpf8pns99gyy8f5axf01ckc33f30dddfazyfg45xfii6vii"))))
+        (base32 "18wxla80y6m4l3dwawi7bl1d9m9dfcg4sxxjcgjqq3psjxmg2a4a"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-andrew" ,rust-andrew-0.3)
-        ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-calloop" ,rust-calloop-0.6)
-        ("rust-dlib" ,rust-dlib-0.4)
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-calloop" ,rust-calloop-0.9)
+        ("rust-dlib" ,rust-dlib-0.5)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
-        ("rust-memmap2" ,rust-memmap2-0.1)
-        ("rust-nix" ,rust-nix-0.18)
-        ("rust-wayland-client" ,rust-wayland-client-0.28)
-        ("rust-wayland-cursor" ,rust-wayland-cursor-0.28)
-        ("rust-wayland-protocols" ,rust-wayland-protocols-0.28))))
+        ("rust-memmap2" ,rust-memmap2-0.3)
+        ("rust-nix" ,rust-nix-0.22)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-wayland-client" ,rust-wayland-client-0.29)
+        ("rust-wayland-cursor" ,rust-wayland-cursor-0.29)
+        ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))
+       #:cargo-development-inputs
+       (("rust-image" ,rust-image-0.23))))
+    (inputs (list rust-wayland-commons-0.29 rust-wayland-scanner-0.29))
     (home-page "https://github.com/smithay/client-toolkit")
     (synopsis "Toolkit for making client Wayland applications")
     (description
@@ -2196,7 +2199,7 @@ (define-public rust-smithay-client-toolkit-0.12
 
 (define-public rust-smithay-client-toolkit-0.6
   (package
-    (inherit rust-smithay-client-toolkit-0.12)
+    (inherit rust-smithay-client-toolkit-0.15)
     (name "rust-smithay-client-toolkit")
     (version "0.6.4")
     (source
-- 
2.35.1

From 580d35638c85c2eeeaba3aa25421738d42ab7860 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-wayland-egl-0.29): New variable.

(rust-wayland-egl-0.28): Remove variable.

Toggle diff (36 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 9c31b0d415..cc5df11d70 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2585,20 +2585,25 @@ (define-public rust-wayland-cursor-0.29
 properly display animated cursors.")
     (license license:expat)))
 
-(define-public rust-wayland-egl-0.28
+(define-public rust-wayland-egl-0.29
   (package
     (name "rust-wayland-egl")
-    (version "0.28.3")
+    (version "0.29.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-egl" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1xd7iap0x4sidmy9dv02cdnxjhnbk9li7r7f39x9cg0i8xs50ly6"))))
+        (base32 "0flslbp8q4nv3hcw941vapn3jh6y7glqaqv63h1mjaqnxrlisa43"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-autocfg" ,rust-autocfg-1)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-cfg-if" ,rust-cfg-if-1))))
     (inputs
-     (list rust-wayland-client-0.28 rust-wayland-sys-0.28))
+     (list rust-wayland-client-0.29 rust-wayland-sys-0.29))
     ;; For the PKG_CONFIG_PATH environment variable.
     (native-inputs
      (list pkg-config))
-- 
2.35.1

From a143c7371d274e44783cd215f80c085a564ac9a3 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-raw-window-handle-0.4): New variable.

(rust-raw-window-handle-0.3): Remove variable.

Toggle diff (32 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index d1a9c4dd6d..dfb12dff69 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2087,10 +2087,10 @@ (define-public rust-ravif-0.6
 images in AVIF format.")
     (license license:bsd-3)))
 
-(define-public rust-raw-window-handle-0.3
+(define-public rust-raw-window-handle-0.4
   (package
     (name "rust-raw-window-handle")
-    (version "0.3.3")
+    (version "0.4.3")
     (source
      (origin
        (method url-fetch)
@@ -2099,10 +2099,10 @@ (define-public rust-raw-window-handle-0.3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "04c2wir7qq3g2b143yav52a1g5ack8ffqx2bpmrn9bc0dix1li0a"))))
+         "0hgvrqbr2b62zhq4ryv08h92mwis9v8f7j9pwcgxzlp7nswvw05q"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+     `(#:cargo-inputs (("rust-cty" ,rust-cty-0.2))))
     (home-page "https://github.com/rust-windowing/raw-window-handle")
     (synopsis "Interoperability library for Rust Windowing applications")
     (description
-- 
2.35.1

From d927e95c1f6da1a7af3310725a4bd04a0797ed25 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-wayland-server-0.29): New variable.

(rust-wayland-server-0.23): Inherit from above.

(rust-wayland-server-0.28): Remove variable.

Toggle diff (62 lines)diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index ffe8f9e52d..f2eaedf624 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2740,17 +2740,17 @@ (define-public rust-wayland-scanner-0.21
         (base32
          "17mp49v7w0p0x5ry628lj2llljnwkr9aj9g4bqqhfibid32jhf5z"))))))
 
-(define-public rust-wayland-server-0.28
+(define-public rust-wayland-server-0.29
   (package
     (name "rust-wayland-server")
-    (version "0.28.3")
+    (version "0.29.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-server" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "09jfdjfqhjfcpiz4csgh60ymfkmz1cl3jmxyzq9hzcp0kyyxix93"))))
+        (base32 "1wj8gf28dbjwb824i29wf3wr5r6wp6ssknjm9b5dnb1fah47mk66"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -2758,7 +2758,7 @@ (define-public rust-wayland-server-0.28
         ("rust-downcast-rs" ,rust-downcast-rs-1)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-nix" ,rust-nix-0.18)
+        ("rust-nix" ,rust-nix-0.22)
         ("rust-parking-lot" ,rust-parking-lot-0.11)
         ("rust-scoped-tls" ,rust-scoped-tls-1))))
     (inputs
@@ -2766,12 +2766,12 @@ (define-public rust-wayland-server-0.28
            rust-downcast-rs-1
            rust-lazy-static-1
            rust-libc-0.2
-           rust-nix-0.18
+           rust-nix-0.22
            rust-parking-lot-0.11
            rust-scoped-tls-1
-           rust-wayland-commons-0.28
-           rust-wayland-scanner-0.28
-           rust-wayland-sys-0.28))
+           rust-wayland-commons-0.29
+           rust-wayland-scanner-0.29
+           rust-wayland-sys-0.29))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis
      "Bindings to the standard C implementation of the wayland protocol")
@@ -2782,7 +2782,7 @@ (define-public rust-wayland-server-0.28
 
 (define-public rust-wayland-server-0.23
   (package
-    (inherit rust-wayland-server-0.28)
+    (inherit rust-wayland-server-0.29)
     (name "rust-wayland-server")
     (version "0.23.6")
     (source
-- 
2.35.1

Maxime Devos wrote on 26 Jun 2022 15:01

Re: [PATCH 01/27] added alacritty 0.10.1

Recipients:(address . 54299@debbugs.gnu.org)

Message-ID:730dc7d77b1aa505832e6cdd594e8975387f7ac7.camel@telenet.be

Hi,

I integrated the rust-alacritty-terminal patch in antioxidant to fix

some build failures (hopefully antioxidant will make Rust packaging

simpler when it's done ...). Maybe later some of the other changes too

if necessary ...

Greetings,

Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYrhYjxccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7gOHAQD5FcFZllA8fEUi9EszYFN7kn/6

esvHZbh2281vrRjLNwD9Gk2ghnzX8Lke5qKWdL42IVac1eU4MKqV21jDlKYoeAM=

=zN9N

-----END PGP SIGNATURE-----

phodina wrote on 5 Aug 2022 19:11

Re: [PATCH v2 01/25] gnu: rust-structopt-derive-0.4: Update to 0.4.18.

Recipients:(name . 54299@debbugs.gnu.org)(address . 54299@debbugs.gnu.org)(name . Maxime Devos)(address . maximedevos@telenet.be)

Message-ID:sNbmNI6nz4A_I27-f6npQ7C9h8rts5gt1XkfXLaFYyyK-MsoS6svMN563SZCD0Dd-KH4bjA4-ROvw6x_NYa8JVNHUgoiEEWoJH8zpo7M-9M=@protonmail.com

Hi Maxime,

thanks for the patch. I've rebased the patches on master and there are only few to apply now as many of the previous have already been merged.

---

Petr

Attachment: file

From 23f27076a628f9d2490acd42832fcae86e29b8d6 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-alacritty-terminal-0.16): New variable.

(rust-alacritty-terminal-0.15): Remove variable.

Toggle diff (51 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 108e8258f8..0bb35333bb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2528,17 +2528,17 @@ (define-public rust-alacritty-config-derive-0.1
      "This package provides a failure resistant deserialization derive.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-alacritty-terminal-0.15
+(define-public rust-alacritty-terminal-0.16
   (package
     (name "rust-alacritty-terminal")
-    (version "0.15.0")
+    (version "0.16.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "alacritty_terminal" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1qv8zv20qgn407v8m196p68yddvhalcppc21702698cj99b45ckc"))))
+        (base32 "0bvffvjmkran068p9bz0p9nrkj1k4bggd7q39mszjfafz155vyq2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -2546,19 +2546,20 @@ (define-public rust-alacritty-terminal-0.15
        (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1)
         ("rust-base64" ,rust-base64-0.13)
         ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-dirs" ,rust-dirs-2)
+        ("rust-dirs" ,rust-dirs-3)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
         ("rust-mio" ,rust-mio-0.6)
         ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.2)
         ("rust-mio-extras" ,rust-mio-extras-2)
         ("rust-miow" ,rust-miow-0.3)
-        ("rust-nix" ,rust-nix-0.23)
+        ("rust-nix" ,rust-nix-0.22)
         ("rust-parking-lot" ,rust-parking-lot-0.11)
         ("rust-regex-automata" ,rust-regex-automata-0.1)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-yaml" ,rust-serde-yaml-0.8)
-        ("rust-signal-hook" ,rust-signal-hook-0.1)
+        ("rust-signal-hook" ,rust-signal-hook-0.3)
+        ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2)
         ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-vte" ,rust-vte-0.10)
         ("rust-winapi" ,rust-winapi-0.3))))
-- 
2.37.0

From cbee57b7f38f26cb44994b2022b5174c68fec2ab Mon Sep 17 00:00:00 2001

* gnu/packages/terminals.scm (alacritty)[inputs]: Remove labels.

Toggle diff (56 lines)diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 3c5f58a539..fa85024507 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1498,30 +1498,25 @@ (define-public alacritty
                (install-file "extra/completions/alacritty.fish"
                              (string-append share "/fish/vendor_completions.d"))
                #t))))))
-    (native-inputs
-     `(("cmake" ,cmake)
-       ("ncurses" ,ncurses)
-       ("pkg-config" ,pkg-config)
-       ("python3" ,python)))
-    (inputs
-     `(("expat" ,expat)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("libx11" ,libx11)
-       ("libxcb" ,libxcb)
-       ("libxcursor" ,libxcursor)
-       ("libxi" ,libxi)
-       ("libxkbcommon" ,libxkbcommon)
-       ("libxrandr" ,libxrandr)
-       ("libxxf86vm" ,libxxf86vm)
-       ("mesa" ,mesa)
-       ("rust-bitflags" ,rust-bitflags-1)
-       ("rust-dirs" ,rust-dirs-3)
-       ("rust-libc" ,rust-libc-0.2)
-       ("rust-unicode-width" ,rust-unicode-width-0.1)
-       ("rust-wayland-client" ,rust-wayland-client-0.28)
-       ("rust-winapi" ,rust-winapi-0.3)
-       ("wayland" ,wayland)))
+    (native-inputs (list cmake ncurses pkg-config python))
+    (inputs (list expat
+                  fontconfig
+                  freetype
+                  libx11
+                  libxcb
+                  libxcursor
+                  libxi
+                  libxkbcommon
+                  libxrandr
+                  libxxf86vm
+                  mesa
+                  rust-bitflags-1
+                  rust-dirs-3
+                  rust-libc-0.2
+                  rust-unicode-width-0.1
+                  rust-wayland-client-0.28
+                  rust-winapi-0.3
+                  wayland))
     (native-search-paths
      ;; FIXME: This should only be located in 'ncurses'.  Nonetheless it is
      ;; provided for usability reasons.  See <https://bugs.gnu.org/22138>.
-- 
2.37.0

From 5b8b77f087c59502c9344eea169d87b121bc4e15 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-structopt-derive-0.4): Update to 0.4.18.

Toggle diff (24 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 910b2e68df..ac9cf297f2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60033,7 +60033,7 @@ (define-public rust-structopt-0.2
 (define-public rust-structopt-derive-0.4
   (package
    (name "rust-structopt-derive")
-   (version "0.4.14")
+   (version "0.4.18")
    (source
     (origin
      (method url-fetch)
@@ -60042,7 +60042,7 @@ (define-public rust-structopt-derive-0.4
       (string-append name "-" version ".tar.gz"))
      (sha256
       (base32
-       "143gjwvz3s86hwp070km83y25n8kqp5f01kb1dr19f4ilkywvaav"))))
+       "1q5gcigmvw0cinjxzpyrkflliq5r1ivljmrvfrl3phcwgwraxdfw"))))
    (build-system cargo-build-system)
    (arguments
     `(#:skip-build? #t
-- 
2.37.0

From dc9ea34042780ba23aef374f26ce2e35fb378962 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 24 Apr 2022 11:06:41 +0200
Subject: [PATCH v3 4/5] gnu: alacritty: Update to 0.10.1.

* gnu/packages/terminals.scm (alacritty): Update to 0.10.1.
  [arguments]: Update to rust-alacritty-terminal-0.16, rust-glutin-0.28,
  rust-raw-window-handle-0.4 and rust-wayland-client-0.29. Add rust-dirs-3,
  rust-structopt-0.3 and rust-unicode-width-0.1. Remove rust-clap-2,
  rust-time-0.1, rust-urlocator-0.1 in cargo-inputs.
 Update version of packages in 'add-absolute-library-references phase.

Toggle diff (89 lines)diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 7e5016f08f..3c5f58a539 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -29,7 +29,7 @@
 ;;; Copyright © 2021 ikasero <ahmed@ikasero.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
-;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1381,7 +1381,7 @@ (define-public tio
 (define-public alacritty
   (package
     (name "alacritty")
-    (version "0.9.0")
+    (version "0.10.1")
     (source
      (origin
        ;; XXX: The crate at "crates.io" has limited contents.  In particular,
@@ -1392,53 +1392,49 @@ (define-public alacritty
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "068y0b1a0m33r7a3j2xf6k602sc8062gm4d5568ynfx6w5n481lj"))))
+        (base32 "1s38gyx0ifcf1vcr6n8gzbk7rg1apxrz7js8cp8x5k1s0m3abys3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f     ; virtual manifest
        #:cargo-test-flags '("--release" "--" "--skip=config_read_eof")
        #:cargo-inputs
        (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1)
-        ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.15)
-        ("rust-clap" ,rust-clap-2)
+        ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.16)
         ("rust-cocoa" ,rust-cocoa-0.24)
         ("rust-copypasta" ,rust-copypasta-0.7)
         ("rust-crossfont" ,rust-crossfont-0.3)
+        ("rust-dirs" ,rust-dirs-3)
         ("rust-embed-resource" ,rust-embed-resource-1)
         ("rust-fnv" ,rust-fnv-1)
         ("rust-gl-generator" ,rust-gl-generator-0.14)
         ;; XXX: Adjust `add-absolute-library-references' phase when updating
         ;; glutin input.
-        ("rust-glutin" ,rust-glutin-0.26)
+        ("rust-glutin" ,rust-glutin-0.28)
         ("rust-log" ,rust-log-0.4)
         ("rust-notify" ,rust-notify-4)
         ("rust-objc" ,rust-objc-0.2)
         ("rust-parking-lot" ,rust-parking-lot-0.11)
         ("rust-png" ,rust-png-0.16)
-        ("rust-raw-window-handle" ,rust-raw-window-handle-0.3)
+        ("rust-raw-window-handle" ,rust-raw-window-handle-0.4)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-yaml" ,rust-serde-yaml-0.8)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-urlocator" ,rust-urlocator-0.1)
+        ("rust-structopt" ,rust-structopt-0.3)
+        ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-x11-dl" ,rust-x11-dl-2)
         ("rust-xdg" ,rust-xdg-2))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'use-new-nix
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (substitute* "alacritty_terminal/Cargo.toml"
-               (("0.22.0") "^0.23.0"))))
          (add-after 'configure 'add-absolute-library-references
            (lambda* (#:key inputs cargo-inputs vendor-dir #:allow-other-keys)
-             (let* ((glutin-name ,(package-name rust-glutin-0.26))
-                    (glutin-version ,(package-version rust-glutin-0.26))
+             (let* ((glutin-name ,(package-name rust-glutin-0.28))
+                    (glutin-version ,(package-version rust-glutin-0.28))
                     (glutin-api (string-append glutin-name "-" glutin-version
                                                ".tar.gz/src/api/"))
                     (smithay-client-toolkit-name
-                     ,(package-name rust-smithay-client-toolkit-0.12))
+                     ,(package-name rust-smithay-client-toolkit-0.15))
                     (smithay-client-toolkit-version
-                     ,(package-version rust-smithay-client-toolkit-0.12))
+                     ,(package-version rust-smithay-client-toolkit-0.15))
                     (smithay-client-toolkit-src
                      (string-append smithay-client-toolkit-name "-"
                                     smithay-client-toolkit-version ".tar.gz/src"))
-- 
2.37.0

From 84bcbe957f848fc231fb9b9ec16b5bfeb836b438 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-structopt): Update to 0.3.26.

[arguments]: Add rust-paw-1 to cargo-inputs. Add cargo development inputs.

Add phases to fix rust-clap-2 version and remove lints feature.

Toggle diff (45 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ac9cf297f2..108e8258f8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59982,7 +59982,7 @@ (define-public rust-strsim-0.5
 (define-public rust-structopt-0.3
   (package
     (name "rust-structopt")
-    (version "0.3.21")
+    (version "0.3.26")
     (source
      (origin
        (method url-fetch)
@@ -59991,14 +59991,27 @@ (define-public rust-structopt-0.3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "136j0lvjmpv5syi751vxg8vb30gfyv4k81x8d18kxrj6xvbsqxsj"))))
+         "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-structopt-derive" ,rust-structopt-derive-0.4)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-clap" ,rust-clap-2))))
+        ("rust-paw" ,rust-paw-1)
+        ("rust-clap" ,rust-clap-2))
+       #:cargo-development-inputs
+       (("rust-strum" ,rust-strum-0.21)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-rustversion" ,rust-rustversion-1))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fixup-cargo-toml
+           (lambda _
+             (substitute* "Cargo.toml"
+               ;; feature does not exist
+               (("lints.*") "")
+               (("2.33") ,(package-version rust-clap-2))))))))
     (home-page "https://github.com/TeXitoi/structopt")
     (synopsis "Parse command line argument by defining a struct")
     (description
-- 
2.37.0

phodina wrote on 15 Oct 2022 09:17

[PATCH v3] Build on Aarch64

Recipients:

Message-ID:K5yVilpipFX449PFoZ-gptDo4cHqNcZz6ltGaKIajdc359CCO5QmG55jF8qqQK-FJ4EP7aBhusXp1Qf0yYIBgrwyJeOv2RVP3II-Hx2jtDE=@protonmail.com

Hi Maxime,

could you please review the 2 patches for Alacritty?

First one is to build it on Aarch64 (disables one failing test).

The other enables HW support on devices like PineBook Pro - I remeber you use one Efraim. [1]

The rest is just for newer version.

I have to check the antioxidant system! It's been on my list for too long.

1 https://github.com/alacritty/alacritty/issues/128#issuecomment-880270507

Thanks!

----

Petr

Attachment: file

From 40545268e803fa52727645e95c83705d2ed09e3a Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-structopt-derive-0.4): Update to 0.4.18.

Toggle diff (24 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 538267c560..7a095701ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61636,7 +61636,7 @@ (define-public rust-structopt-0.2
 (define-public rust-structopt-derive-0.4
   (package
    (name "rust-structopt-derive")
-   (version "0.4.14")
+   (version "0.4.18")
    (source
     (origin
      (method url-fetch)
@@ -61645,7 +61645,7 @@ (define-public rust-structopt-derive-0.4
       (string-append name "-" version ".tar.gz"))
      (sha256
       (base32
-       "143gjwvz3s86hwp070km83y25n8kqp5f01kb1dr19f4ilkywvaav"))))
+       "1q5gcigmvw0cinjxzpyrkflliq5r1ivljmrvfrl3phcwgwraxdfw"))))
    (build-system cargo-build-system)
    (arguments
     `(#:skip-build? #t
-- 
2.37.2

From 7cea824edfc410bcccbebd0c31ecd7f392648781 Mon Sep 17 00:00:00 2001

* gnu/packages/terminals.scm (alacritty)[inputs]: Remove labels.

Toggle diff (56 lines)diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 665d8e073e..d0513c17cb 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1459,30 +1459,25 @@ (define-public alacritty
                (install-file "extra/completions/alacritty.fish"
                              (string-append share "/fish/vendor_completions.d"))
                #t))))))
-    (native-inputs
-     `(("cmake" ,cmake)
-       ("ncurses" ,ncurses)
-       ("pkg-config" ,pkg-config)
-       ("python3" ,python)))
-    (inputs
-     `(("expat" ,expat)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("libx11" ,libx11)
-       ("libxcb" ,libxcb)
-       ("libxcursor" ,libxcursor)
-       ("libxi" ,libxi)
-       ("libxkbcommon" ,libxkbcommon)
-       ("libxrandr" ,libxrandr)
-       ("libxxf86vm" ,libxxf86vm)
-       ("mesa" ,mesa)
-       ("rust-bitflags" ,rust-bitflags-1)
-       ("rust-dirs" ,rust-dirs-3)
-       ("rust-libc" ,rust-libc-0.2)
-       ("rust-unicode-width" ,rust-unicode-width-0.1)
-       ("rust-wayland-client" ,rust-wayland-client-0.28)
-       ("rust-winapi" ,rust-winapi-0.3)
-       ("wayland" ,wayland)))
+    (native-inputs (list cmake ncurses pkg-config python))
+    (inputs (list expat
+                  fontconfig
+                  freetype
+                  libx11
+                  libxcb
+                  libxcursor
+                  libxi
+                  libxkbcommon
+                  libxrandr
+                  libxxf86vm
+                  mesa
+                  rust-bitflags-1
+                  rust-dirs-3
+                  rust-libc-0.2
+                  rust-unicode-width-0.1
+                  rust-wayland-client-0.28
+                  rust-winapi-0.3
+                  wayland))
     (native-search-paths
      ;; FIXME: This should only be located in 'ncurses'.  Nonetheless it is
      ;; provided for usability reasons.  See <https://bugs.gnu.org/22138>.
-- 
2.37.2

From fd2101715dd10f021db8ee5989036c1024d9f03d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 24 Apr 2022 11:06:41 +0200
Subject: [PATCH v3 6/7] gnu: alacritty: Update to 0.10.1.

* gnu/packages/terminals.scm (alacritty): Update to 0.10.1.
  [arguments]: Update to rust-alacritty-terminal-0.16, rust-glutin-0.28,
  rust-raw-window-handle-0.4 and rust-wayland-client-0.29. Add rust-dirs-3,
  rust-structopt-0.3 and rust-unicode-width-0.1. Remove rust-clap-2,
  rust-time-0.1, rust-urlocator-0.1 in cargo-inputs.
 Update version of packages in 'add-absolute-library-references phase.

Toggle diff (90 lines)diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index ce096b1bc2..665d8e073e 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -29,7 +29,7 @@
 ;;; Copyright © 2021 ikasero <ahmed@ikasero.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
-;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;;
@@ -1331,7 +1331,7 @@ (define-public tio
 (define-public alacritty
   (package
     (name "alacritty")
-    (version "0.9.0")
+    (version "0.10.1")
     (source
      (origin
        ;; XXX: The crate at "crates.io" has limited contents.  In particular,
@@ -1350,7 +1350,7 @@ (define-public alacritty
           "alacritty-use-OpenGL-3.1-with-extensions-instead-of-OpenGL-3.3.patch")
           '()))
        (sha256
-        (base32 "068y0b1a0m33r7a3j2xf6k602sc8062gm4d5568ynfx6w5n481lj"))))
+        (base32 "1s38gyx0ifcf1vcr6n8gzbk7rg1apxrz7js8cp8x5k1s0m3abys3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f     ; virtual manifest
@@ -1360,46 +1360,42 @@ (define-public alacritty
                             '("--skip=mock_term") '()))
        #:cargo-inputs
        (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1)
-        ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.15)
-        ("rust-clap" ,rust-clap-2)
+        ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.16)
         ("rust-cocoa" ,rust-cocoa-0.24)
         ("rust-copypasta" ,rust-copypasta-0.7)
         ("rust-crossfont" ,rust-crossfont-0.3)
+        ("rust-dirs" ,rust-dirs-3)
         ("rust-embed-resource" ,rust-embed-resource-1)
         ("rust-fnv" ,rust-fnv-1)
         ("rust-gl-generator" ,rust-gl-generator-0.14)
         ;; XXX: Adjust `add-absolute-library-references' phase when updating
         ;; glutin input.
-        ("rust-glutin" ,rust-glutin-0.26)
+        ("rust-glutin" ,rust-glutin-0.28)
         ("rust-log" ,rust-log-0.4)
         ("rust-notify" ,rust-notify-4)
         ("rust-objc" ,rust-objc-0.2)
         ("rust-parking-lot" ,rust-parking-lot-0.11)
         ("rust-png" ,rust-png-0.16)
-        ("rust-raw-window-handle" ,rust-raw-window-handle-0.3)
+        ("rust-raw-window-handle" ,rust-raw-window-handle-0.4)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-yaml" ,rust-serde-yaml-0.8)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-urlocator" ,rust-urlocator-0.1)
+        ("rust-structopt" ,rust-structopt-0.3)
+        ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-x11-dl" ,rust-x11-dl-2)
         ("rust-xdg" ,rust-xdg-2))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'use-new-nix
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (substitute* "alacritty_terminal/Cargo.toml"
-               (("0.22.0") "^0.23.0"))))
          (add-after 'configure 'add-absolute-library-references
            (lambda* (#:key inputs cargo-inputs vendor-dir #:allow-other-keys)
-             (let* ((glutin-name ,(package-name rust-glutin-0.26))
-                    (glutin-version ,(package-version rust-glutin-0.26))
+             (let* ((glutin-name ,(package-name rust-glutin-0.28))
+                    (glutin-version ,(package-version rust-glutin-0.28))
                     (glutin-api (string-append glutin-name "-" glutin-version
                                                ".tar.gz/src/api/"))
                     (smithay-client-toolkit-name
-                     ,(package-name rust-smithay-client-toolkit-0.12))
+                     ,(package-name rust-smithay-client-toolkit-0.15))
                     (smithay-client-toolkit-version
-                     ,(package-version rust-smithay-client-toolkit-0.12))
+                     ,(package-version rust-smithay-client-toolkit-0.15))
                     (smithay-client-toolkit-src
                      (string-append smithay-client-toolkit-name "-"
                                     smithay-client-toolkit-version ".tar.gz/src"))
-- 
2.37.2

Attachment: v3-0002-gnu-alacritty-Patch-to-run-on-OpenGL-3.1-on-aarch.patch

From 1d0d0477fa095de4a8762007dcb7b18761903a0d Mon Sep 17 00:00:00 2001

* /gnu/packages/terminals.scm (alacritty)[arguments]: Disable failing test on

aarch64 target.

Toggle diff (18 lines)diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 9ece3043e0..1084cd2d7d 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1346,7 +1346,10 @@ (define-public alacritty
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f     ; virtual manifest
-       #:cargo-test-flags '("--release" "--" "--skip=config_read_eof")
+       #:cargo-test-flags '("--release" "--" "--skip=config_read_eof"
+         ,@(if (string-prefix? "aarch64" (or (%current-system)
+                                  (%current-target-system)))
+                            '("--skip=mock_term") '()))
        #:cargo-inputs
        (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1)
         ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.15)
-- 
2.37.2

From 9abdeebac1889461ca4625359952d735f811d046 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-graphics.scm (rust-alacritty-terminal-0.16): New variable.

(rust-alacritty-terminal-0.15): Remove variable.

Toggle diff (51 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9d2d5a86f9..ad650e6c3e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2571,17 +2571,17 @@ (define-public rust-alacritty-config-derive-0.1
      "This package provides a failure resistant deserialization derive.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-alacritty-terminal-0.15
+(define-public rust-alacritty-terminal-0.16
   (package
     (name "rust-alacritty-terminal")
-    (version "0.15.0")
+    (version "0.16.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "alacritty_terminal" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1qv8zv20qgn407v8m196p68yddvhalcppc21702698cj99b45ckc"))))
+        (base32 "0bvffvjmkran068p9bz0p9nrkj1k4bggd7q39mszjfafz155vyq2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -2589,19 +2589,20 @@ (define-public rust-alacritty-terminal-0.15
        (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1)
         ("rust-base64" ,rust-base64-0.13)
         ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-dirs" ,rust-dirs-2)
+        ("rust-dirs" ,rust-dirs-3)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
         ("rust-mio" ,rust-mio-0.6)
         ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.2)
         ("rust-mio-extras" ,rust-mio-extras-2)
         ("rust-miow" ,rust-miow-0.3)
-        ("rust-nix" ,rust-nix-0.23)
+        ("rust-nix" ,rust-nix-0.22)
         ("rust-parking-lot" ,rust-parking-lot-0.11)
         ("rust-regex-automata" ,rust-regex-automata-0.1)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-yaml" ,rust-serde-yaml-0.8)
-        ("rust-signal-hook" ,rust-signal-hook-0.1)
+        ("rust-signal-hook" ,rust-signal-hook-0.3)
+        ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2)
         ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-vte" ,rust-vte-0.10)
         ("rust-winapi" ,rust-winapi-0.3))))
-- 
2.37.2

From 86f63a6a845e10c569fab3cdf102b1bc01c2f598 Mon Sep 17 00:00:00 2001

* gnu/packages/crates-io.scm (rust-structopt): Update to 0.3.26.

[arguments]: Add rust-paw-1 to cargo-inputs. Add cargo development inputs.

Add phases to fix rust-clap-2 version and remove lints feature.

Toggle diff (45 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7a095701ba..9d2d5a86f9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61585,7 +61585,7 @@ (define-public rust-strsim-0.5
 (define-public rust-structopt-0.3
   (package
     (name "rust-structopt")
-    (version "0.3.21")
+    (version "0.3.26")
     (source
      (origin
        (method url-fetch)
@@ -61594,14 +61594,27 @@ (define-public rust-structopt-0.3
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "136j0lvjmpv5syi751vxg8vb30gfyv4k81x8d18kxrj6xvbsqxsj"))))
+         "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-structopt-derive" ,rust-structopt-derive-0.4)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-clap" ,rust-clap-2))))
+        ("rust-paw" ,rust-paw-1)
+        ("rust-clap" ,rust-clap-2))
+       #:cargo-development-inputs
+       (("rust-strum" ,rust-strum-0.21)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-rustversion" ,rust-rustversion-1))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fixup-cargo-toml
+           (lambda _
+             (substitute* "Cargo.toml"
+               ;; feature does not exist
+               (("lints.*") "")
+               (("2.33") ,(package-version rust-clap-2))))))))
     (home-page "https://github.com/TeXitoi/structopt")
     (synopsis "Parse command line argument by defining a struct")
     (description
-- 
2.37.2

phodina wrote on 16 Oct 2022 07:44

Recipients:

Message-ID:kxxOHG3TiJOjIQ-fZAtbejKVpD6b2mb-71ZEwl91L1byuZismwMNUYdYxrgX_1tpIichYDiEfOfbZRlVT1F7gagqnjhyM39Ea5gevvtgFfg=@protonmail.com

Sorry, incorrect target ("arch64" instead of "aarch64") got into second patch :-)

----

Petr

------- Original Message -------

On Saturday, October 15th, 2022 at 9:17 AM, phodina <phodina@protonmail.com> wrote:

Toggle quote (18 lines)> Hi Maxime,
>
> could you please review the 2 patches for Alacritty?
>
> First one is to build it on Aarch64 (disables one failing test).
>
> The other enables HW support on devices like PineBook Pro - I remeber you use one Efraim. [1]
>
> The rest is just for newer version.
>
> I have to check the antioxidant system! It's been on my list for too long.
>
> 1 https://github.com/alacritty/alacritty/issues/128#issuecomment-880270507
>
> Thanks!
>
> ----
> Petr

Attachment: file

Attachment: v4-0002-gnu-alacritty-Patch-to-run-on-OpenGL-3.1-on-aarch.patch

phodina wrote on 25 Dec 2022 18:50

Recipients:

Message-ID:FmLEtFFE1mm1eS3GcOs7eGi-QEB_tbJJhXqtQS4P8dQD322S99ngYirAVoIwxSrFdbwzl8HvUCE2I634RKtl4zC6dVFjCOM2djIN1I0_QC0=@protonmail.com

Hi,

any progress on this issue?

----

Petr

------- Original Message -------

On Sunday, October 16th, 2022 at 7:44 AM, phodina <phodina@protonmail.com> wrote:

Toggle quote (25 lines)> Sorry, incorrect target ("arch64" instead of "aarch64") got into second patch :-)
>
> ----
> Petr
> ------- Original Message -------
> On Saturday, October 15th, 2022 at 9:17 AM, phodina <phodina@protonmail.com> wrote:
>
>> Hi Maxime,
>>
>> could you please review the 2 patches for Alacritty?
>>
>> First one is to build it on Aarch64 (disables one failing test).
>>
>> The other enables HW support on devices like PineBook Pro - I remeber you use one Efraim. [1]
>>
>> The rest is just for newer version.
>>
>> I have to check the antioxidant system! It's been on my list for too long.
>>
>> 1 https://github.com/alacritty/alacritty/issues/128#issuecomment-880270507
>>
>> Thanks!
>>
>> ----
>> Petr

Attachment: file

Maxime Devos wrote on 26 Dec 2022 13:10

Re: Test patches on Prusa i3 MK3S

Recipients:

Message-ID:8ad6dbfc-9fbc-a481-92fe-2bc67acdd04d@telenet.be

On 25-12-2022 18:57, phodina wrote:

Toggle quote (8 lines)> Hi Maxime,
> 
> any thoughts on the failing tests and the rebased patches?
> 
> Also is possible that the tests on core-updates can be broken or is some 
> sort of issue on my local machine?
> 
> Running: |guix shell --pure --check -D guix|?

Hi,

I'm currently taking a break from Guix.

Greetings,
Maxime.

Attachment: OpenPGP_0x49E3EE22191725EE.asc

Attachment: OpenPGP_signature

Efraim Flashner wrote on 15 Feb 2023 11:43

Re: [PATCH v3] Build on Aarch64

Recipients:(name . phodina)(address . phodina@protonmail.com)

Message-ID:Y+y3aI1EMA0F67WS@3900XT

On Sun, Dec 25, 2022 at 05:50:19PM +0000, phodina wrote:

Toggle quote (7 lines)

> Hi,

> any progress on this issue?

> ----

> Petr

I haven't been able to get the patch to apply when building for aarch64
so that's a problem. I tried adding it as an input and applying it as a
phase but then the 'configure script chokes on the patch not being a tar
archive.

I saw that alacritty 0.11.0 adds fallback support for gles 2.0. I was
able to build (using cargo, not packaged) and run that on my pinebook
pro. Can you send another version of the patchset to upgrade to 0.11.0?
With that everything should just be working nicely.

-- 
Efraim Flashner   <efraim@flashner.co.il>   ????? ?????
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Sharlatan Hellseher wrote on 29 Mar 21:42 +0100

[PATCH 01/27] added alacritty 0.10.1

Recipients:(address . 54299-done@debbugs.gnu.org)

Message-ID:87frw8n522.fsf@gmail.com

Hi,

Alacritty in Guix is already on 0.13.1

Toggle snippet (8 lines)

~$: guix describe

Generation 5 Mar 29 2024 19:22:49 (current)

guix 423ca23

repository URL: https://git.savannah.gnu.org/git/guix.git

branch: master

commit: 423ca234cbd7b4902fd2a3fbc089a6fd57ed5583

Closing as no longer actual.

Oleg

Closed

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 54299@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date