[bug#66839] [PATCH 00/19] Series to add spotifyd

[bug#66839] [PATCH 00/19] Series to add spotifyd

[Steve George]

Final set of patches to complete Librespot (0.4.2) and Spotifyd.

Steve George (19):
  gnu: Add rust-librespot-connect-0.4.
  gnu: Add rust-daemonize-0.5.
  gnu: rust-gethostname-0.4.
  gnu: rust-libdbus-sys-0.2: Update to 0.2.5.
  gnu: rust-dbus-0.9: Update to 0.9.7.
  gnu: Add rust-dbus-crossroads-0.5.
  gnu: Add rust-dbus-tokio-0.7.
  gnu: rust-heapless-0.5: Update to 0.5.6.
  gnu: Add rust-ansi-parser-0.8.
  gnu: Add rust-tracing-error-0.2.
  gnu: Add rust-color-spantrace-0.2.
  gnu: Add rust-color-eyre-0.6.
  gnu: Add rust-syslog-6.
  gnu: Add rust-simple-logging-2.
  gnu: Add rust-reopen-1.
  gnu: Update rust-reopen-0.3.
  gnu: rust-fern-0.6: Update to 0.6.2, add rust-syslog-6 dependency.
  gnu: rust-sha-1-0.10: Downgrade to 0.10.1
  gnu: Add rust-spotifyd-0.3.

 gnu/packages/crates-io.scm | 416 +++++++++++++++++++++++++++++++------
 gnu/packages/rust-apps.scm |  57 +++++
 2 files changed, 404 insertions(+), 69 deletions(-)


base-commit: 7e9783b2ab8c747ef340daa749bdeba9e924ec57
-- 
2.41.0

[bug#66839] [PATCH 01/19] gnu: Add rust-librespot-connect-0.4.

[Steve George]

* gnu/packages/crates-io.scm (rust-librespot-connect-0.4): New variable.
---
 gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fc26147157..7306c0d4d2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37823,6 +37823,39 @@ (define-public rust-librespot-audio-0.4
 package contains the audio fetching logic.")
     (license license:expat)))
 
+(define-public rust-librespot-connect-0.4
+  (package
+    (name "rust-librespot-connect")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "librespot-connect" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1v6k20173hx27g34d24vkb4a67av7dbr3mfmng64b51y8imgpyjg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-form-urlencoded" ,rust-form-urlencoded-1)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-librespot-core" ,rust-librespot-core-0.4)
+                       ("rust-librespot-discovery" ,rust-librespot-discovery-0.4)
+                       ("rust-librespot-playback" ,rust-librespot-playback-0.4)
+                       ("rust-librespot-protocol" ,rust-librespot-protocol-0.4)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-protobuf" ,rust-protobuf-2)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.1))))
+    (home-page "https://github.com/librespot-org/librespot")
+    (synopsis "The discovery and Spotify Connect logic for Librespot")
+    (description
+     "Librespot is an open source client library for Spotify.  This package
+contains the discovery and Spotify Connect logic.")
+    (license license:expat)))
+
 (define-public rust-librespot-core-0.4
   (package
     (name "rust-librespot-core")

base-commit: 7e9783b2ab8c747ef340daa749bdeba9e924ec57
-- 
2.41.0

[bug#66839] [PATCH 02/19] gnu: Add rust-daemonize-0.5.

[Steve George]

* gnu/packages/crates-io.scm (rust-daemonize-0.5): New variable.
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7306c0d4d2..9983f9ccb2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19093,8 +19093,30 @@ (define-public rust-cxxbridge-macro-0.5
        #:cargo-development-inputs
        (("rust-cxx" ,rust-cxx-0.5))))))
 
+(define-public rust-daemonize-0.5
+  (package
+    (name "rust-daemonize")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "daemonize" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vhikx85f85r46xghsb4avsv6ww8mz9lipqvsia7m21wrfmgv2xb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/knsd/daemonize")
+    (synopsis
+     "Library to enable code to run as a daemon process on Unix-like systems")
+    (description
+     "Daemoize is a Rust Library for writing system daemonis on Unix-like systems.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-daemonize-0.4
   (package
+    (inherit rust-daemonize-0.5)
     (name "rust-daemonize")
     (version "0.4.1")
     (source
@@ -19104,18 +19126,13 @@ (define-public rust-daemonize-0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "05cqr2zjxrxyg23snykd03sgqwxn0pvwj2lzh50bclsgwc9lbhkh"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-boxfnonce" ,rust-boxfnonce-0.1)
         ("rust-libc" ,rust-libc-0.2))
        #:cargo-development-inputs
-       (("rust-tempdir" ,rust-tempdir-0.3))))
-    (home-page "https://github.com/knsd/daemonize")
-    (synopsis "Library for writing system daemons")
-    (description "Daemonize is a Rust library for writing system deaemons.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-tempdir" ,rust-tempdir-0.3))))))
 
 (define-public rust-darling-0.20
   (package
-- 
2.41.0

[bug#66839] [PATCH 03/19] gnu: rust-gethostname-0.4.

[Steve George]

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

Change-Id: I113a2ed209cf6285df02df60178310f0cda80741
---
 gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9983f9ccb2..687a583f20 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28636,8 +28636,32 @@ (define-public rust-get-if-addrs-sys-0.1
 interfaces on the system.")
     (license (list license:expat license:bsd-3))))
 
+(define-public rust-gethostname-0.4
+  (package
+    (name "rust-gethostname")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gethostname" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "063qqhznyckwx9n4z4xrmdv10s0fi6kbr17r6bi1yjifki2y0xh1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags (list "--release" "--"
+                                "--skip=gethostname_matches_system_hostname")
+       #:cargo-inputs (("rust-libc" ,rust-libc-0.2)
+                       ("rust-windows-targets" ,rust-windows-targets-0.48))))
+    (home-page "https://github.com/swsnr/gethostname.rs")
+    (synopsis "Rust implementation of gethostname for all platforms")
+    (description "A Rust library that provides @code{gethostname()} for all
+platforms.")
+    (license license:asl2.0)))
+
 (define-public rust-gethostname-0.3
   (package
+    (inherit rust-gethostname-0.4)
     (name "rust-gethostname")
     (version "0.3.0")
     (source
@@ -28647,7 +28671,6 @@ (define-public rust-gethostname-0.3
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0xy1wbx5k2bzi4cbaqj9wqgqsbn4f8pm6nsm1d86mibk66xd8rdv"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
        '("--release" "--"
@@ -28655,12 +28678,7 @@ (define-public rust-gethostname-0.3
          "--skip=gethostname_matches_system_hostname")
        #:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/swsnr/gethostname.rs")
-    (synopsis "Gethostname for all platforms")
-    (description "This library provides @code{gethostname()} for all
-platforms.")
-    (license license:asl2.0)))
+        ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-gethostname-0.2
   (package
-- 
2.41.0

[bug#66839] [PATCH 04/19] gnu: rust-libdbus-sys-0.2: Update to 0.2.5.

[Steve George]

* gnu/packages/crates-io.scm (rust-libdbus-sys-0.2): Update to 0.2.5.
---
 gnu/packages/crates-io.scm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 687a583f20..3d184a928f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36961,23 +36961,20 @@ (define-public rust-libc-print-0.1
 (define-public rust-libdbus-sys-0.2
   (package
     (name "rust-libdbus-sys")
-    (version "0.2.1")
+    (version "0.2.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libdbus-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1w06ycq2mw8zfp9j73macgdl8d2881bnxbzdyyxys90ljyya64nw"))))
+        (base32 "0wjw93q6ckrn8qdrxzdi02f0ma9g7nnlpgkrkcll1mjhnw95a206"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-pkg-config" ,rust-pkg-config-0.3))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list dbus))
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (native-inputs (list pkg-config))
+    (inputs (list dbus))
     (home-page "https://github.com/diwic/dbus-rs")
     (synopsis "FFI bindings to libdbus")
     (description "This package provides FFI bindings to libdbus.")
-- 
2.41.0

[bug#66839] [PATCH 05/19] gnu: rust-dbus-0.9: Update to 0.9.7.

[Steve George]

* gnu/packages/crates-io.scm (rust-dbus-0.9): Update to 0.9.7.
---
 gnu/packages/crates-io.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d184a928f..27ebe2a080 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19742,14 +19742,15 @@ (define-public rust-dbl-0.3
 (define-public rust-dbus-0.9
   (package
     (name "rust-dbus")
-    (version "0.9.2")
+    (version "0.9.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "dbus" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ny01n0gzfdmcy5ydn4q78pamidj4c5q9ixz7gr97dbrza6y15zm"))))
+        (base32
+          "06vdv4aarjs4w6byg9nqajr67c8qvlhk3153ic2i65pvp63ikchv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ;it needs display and sockets and launches daemons
-- 
2.41.0

[bug#66839] [PATCH 06/19] gnu: Add rust-dbus-crossroads-0.5.

[Steve George]

* gnu/packages/crates-io.scm (rust-dbus-crossroads-0.5): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 27ebe2a080..d3e5a78cc5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19771,6 +19771,29 @@ (define-public rust-dbus-0.9
     (description "This package provides Rust bindings to D-Bus.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-dbus-crossroads-0.5
+  (package
+    (name "rust-dbus-crossroads")
+    (version "0.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dbus-crossroads" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1q3dyywazr3hppm052fa8q2366q66ml789r42jjlnm47f51q6k1s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-dbus" ,rust-dbus-0.9))
+       #:cargo-development-inputs (("rust-tokio", rust-tokio-1))))
+    (native-inputs (list pkg-config))
+    (inputs (list dbus-glib))
+    (home-page "https://github.com/diwic/dbus-rs/")
+    (synopsis "Framework for writing D-Bus method handlers")
+    (description "Framework for writing D-Bus method handlers in Rust.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-dbus-tree-0.9
   (package
     (name "rust-dbus-tree")
-- 
2.41.0

[bug#66839] [PATCH 07/19] gnu: Add rust-dbus-tokio-0.7.

[Steve George]

* gnu/packages/crates-io.scm (rust-dbus-tokio-0.7): New variable.

Change-Id: Ic473ae3b693cf3715f3c924c2cbae70c312215d8
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d3e5a78cc5..6ff410c685 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19794,6 +19794,36 @@ (define-public rust-dbus-crossroads-0.5
     (description "Framework for writing D-Bus method handlers in Rust.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-dbus-tokio-0.7
+    (package
+      (name "rust-dbus-tokio")
+      (version "0.7.5")
+      (source
+        (origin
+          (method url-fetch)
+          (uri (crate-uri "dbus-tokio" version))
+          (file-name (string-append name "-" version ".tar.gz"))
+          (sha256
+            (base32 "10112g227iasjiid7y9wrvnmxypfrczcymj2k5yjvcjk1i5ag88j"))))
+      (build-system cargo-build-system)
+      (arguments
+        `(#:tests? #f ;; tests require X11 $DISPLAY
+          #:cargo-inputs
+          (("rust-dbus" ,rust-dbus-0.9)
+           ("rust-libc" ,rust-libc-0.2)
+           ("rust-tokio" ,rust-tokio-1)
+           ("dbus-crossroads" ,rust-dbus-crossroads-0.5))
+          #:cargo-development-inputs
+          (("dbus-tree" ,rust-dbus-tree-0.9)
+           ("futures" ,rust-futures-0.3))))
+      (native-inputs (list pkg-config))
+      (inputs (list dbus))
+      (home-page "https://github.com/diwic/dbus-rs")
+      (synopsis "Access to D-Bus when using Rust's @code{Tokio} async framework")
+      (description
+        "Access to D-Bus when using Rust's @code{Tokio} async framework.")
+      (license license:expat)))
+
 (define-public rust-dbus-tree-0.9
   (package
     (name "rust-dbus-tree")
-- 
2.41.0

[bug#66839] [PATCH 08/19] gnu: rust-heapless-0.5: Update to 0.5.6.

[Steve George]

* gnu/packages/crates-io.scm (rust-heapless-0.5): Update to 0.5.6.
---
 gnu/packages/crates-io.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6ff410c685..e344975d6f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31349,7 +31349,7 @@ (define-public rust-heapless-0.5
   (package
     (inherit rust-heapless-0.6)
     (name "rust-heapless")
-    (version "0.5.5")
+    (version "0.5.6")
     (source
      (origin
        (method url-fetch)
@@ -31357,9 +31357,10 @@ (define-public rust-heapless-0.5
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1h1d6s1f9zn0rz2vkdn0b42kcnkmlpd90yhfyqqhpirv38ws5a3k"))))
+          "1wc444z7w5ahxs1phbwcdy86wfvfafywy35wc7xzr335l5l1m4bl"))))
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f
+       #:cargo-inputs
        (("rust-as-slice" ,rust-as-slice-0.1)
         ("rust-generic-array" ,rust-generic-array-0.13)
         ("rust-hash32" ,rust-hash32-0.1)
-- 
2.41.0

[bug#66839] [PATCH 09/19] gnu: Add rust-ansi-parser-0.8.

[Steve George]

* gnu/packages/crates-io.scm (rust-ansi-parser-0.8): New variable.
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e344975d6f..0cdd69fbd7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3425,8 +3425,30 @@ (define-public rust-anes-0.1
     ;; The user can choose either license.
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ansi-parser-0.8
+  (package
+    (version "0.8.0")
+    (name "rust-ansi-parser")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ansi-parser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09vi51kdnbwj6c4vdiiydpqxiiwyppn7kbynf22ij9xzg4h3kcmw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-heapless" ,rust-heapless-0.5)
+                       ("rust-nom" ,rust-nom-4))))
+    (home-page "https://gitlab.com/DavidBittner/ansi-parser")
+    (synopsis "Library using nom for parsing ANSI escape codes")
+    (description "This package provides a library using nom for parsing ANSI
+escape codes.")
+    (license license:mpl2.0)))
+
 (define-public rust-ansi-parser-0.6
   (package
+    (inherit rust-ansi-parser-0.8)
     (name "rust-ansi-parser")
     (version "0.6.5")
     (source
@@ -3437,17 +3459,10 @@ (define-public rust-ansi-parser-0.6
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "152idb8a6gwdxzj6m099h3xgx8vw0sjc6skgw94nm2k3y5swc6kn"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-heapless" ,rust-heapless-0.5)
-        ("rust-nom" ,rust-nom-4))))
-    (home-page "https://gitlab.com/DavidBittner/ansi-parser")
-    (synopsis "Library using nom for parsing ANSI escape codes")
-    (description
-     "This package provides a library using nom for parsing ANSI
-escape codes.")
-    (license license:mpl2.0)))
+        ("rust-nom" ,rust-nom-4))))))
 
 (define-public rust-anstream-0.3
   (package
-- 
2.41.0

[bug#66839] [PATCH 10/19] gnu: Add rust-tracing-error-0.2.

[Steve George]

* gnu/packages/crates-io.scm (rust-tracing-error-0.2): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0cdd69fbd7..8f267a8dd8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77145,6 +77145,30 @@ (define-public rust-tracing-core-0.1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-tracing-error-0.2
+  (package
+    (name "rust-tracing-error")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tracing-error" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vi0rns7r8iny2milg0kikz1mhgcl9wz5clpy1vi4jrq1wffr1nn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f
+       #:cargo-inputs (("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://github.com/tokio-rs/tracing")
+    (synopsis "Enriched error handling for Rust's @code{Tracing} framework")
+    (description
+     "An enriched error type with diagnostic information for
+Rust's @code{Tracing} framework.  Provides additional formatting for errors
+and automatically generates tracing events when errors occur.")
+    (license license:expat)))
+
 (define-public rust-tracing-futures-0.2
   (package
     (name "rust-tracing-futures")
-- 
2.41.0

[bug#66839] [PATCH 11/19] gnu: Add rust-color-spantrace-0.2.

[Steve George]

* gnu/packages/crates-io.scm (rust-color-spantrace-0.2): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8f267a8dd8..05f47df54b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14018,6 +14018,29 @@ (define-public rust-color-quant-1
 colors.")
     (license license:expat)))
 
+(define-public rust-color-spantrace-0.2
+  (package
+    (name "rust-color-spantrace")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "color-spantrace" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kldrjm5j3mzz6c84brxshnzm1qbvjglgg7c4z5xrv29jhymp9qv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-owo-colors" ,rust-owo-colors-3)
+                       ("rust-tracing-core" ,rust-tracing-core-0.1)
+                       ("rust-tracing-error" ,rust-tracing-error-0.2)
+                       ("rust-ansi-parser" ,rust-ansi-parser-0.8))))
+    (home-page "https://github.com/eyre-rs/color-spantrace")
+    (synopsis "Library that adds colour to @code{Tracing} errors")
+    (description "A Rust library that extends @code{Tracing} to add colours.")
+    (license license:expat)))
+
 (define-public rust-colorchoice-1
   (package
     (name "rust-colorchoice")
-- 
2.41.0

[bug#66839] [PATCH 12/19] gnu: Add rust-color-eyre-0.6.

[Steve George]

* gnu/packages/crates-io.scm (rust-color-eyre-0.6) New variable.
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 05f47df54b..9e95e8b485 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13951,6 +13951,35 @@ (define-public rust-coitrees-0.2
 sets of intervals.")
     (license license:expat)))
 
+(define-public rust-color-eyre-0.6
+  (package
+    (name "rust-color-eyre")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "color-eyre" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "014j49slcblg6cnsh974k9yjmi1khbm4dpmqdm1zii58rj1parjs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags (list "--release" "--"
+                                "--skip=test_error_backwards_compatibility")
+       #:cargo-inputs (("rust-eyre" ,rust-eyre-0.6)
+                       ("rust-indenter" ,rust-indenter-0.3)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-owo-colors" ,rust-owo-colors-3)
+                       ("rust-color-spantrace" ,rust-color-spantrace-0.2))
+       #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/eyre-rs/color-eyre")
+    (synopsis
+     "Error handler for Rust that creates colorful and consistent reports")
+    (description
+     "Rust error handling for panics and the @code{eyre} crate, that produces
+colorful, consistent, and well formatted error reports.")
+    (license license:expat)))
+
 (define-public rust-color-print-0.3
   (package
     (name "rust-color-print")
-- 
2.41.0

[bug#66839] [PATCH 13/19] gnu: Add rust-syslog-6.

[Steve George]

* gnu/packages/crates-io.scm (rust-syslog-6): New variable.
---
 gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9e95e8b485..46ae2e0f30 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71566,8 +71566,32 @@ (define-public rust-sysinfo-0.23
 processors, disks, components and networks.")
     (license license:expat)))
 
+(define-public rust-syslog-6
+  (package
+    (name "rust-syslog")
+    (version "6.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "syslog" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0vzrwwv3v9bwfinp7yz4kcdxxs00ikz89gzl61fj3qfcridyjd3l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-error-chain" ,rust-error-chain-0.12)
+                       ("rust-hostname" ,rust-hostname-0.3)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-time" ,rust-time-0.3))))
+    (home-page "https://github.com/Geal/rust-syslog")
+    (synopsis "Send log messages to syslog")
+    (description "Rust crate to send messages to Syslog.")
+    (license license:expat)))
+
 (define-public rust-syslog-4
   (package
+    (inherit rust-syslog-6)
     (name "rust-syslog")
     (version "4.0.1")
     (source
@@ -71579,21 +71603,17 @@ (define-public rust-syslog-4
         (sha256
          (base32
           "09ykcbvwx8icvf303mqyz76ji8j6fgyyx97zpr23s788ni112r50"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-time" ,rust-time-0.1)
         ("rust-error-chain" ,rust-error-chain-0.11)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-log" ,rust-log-0.4))))
-    (home-page "https://github.com/Geal/rust-syslog")
-    (synopsis "Send log messages to syslog")
-    (description "Send log messages to syslog.")
-    (license license:expat)))
+        ("rust-log" ,rust-log-0.4))))))
 
 (define-public rust-syslog-3
   (package
+    (inherit rust-syslog-6)
     (name "rust-syslog")
     (version "3.3.0")
     (source
@@ -71605,18 +71625,13 @@ (define-public rust-syslog-3
         (sha256
          (base32
           "0hpdnk2zm6xawpz6fv6qbn0ncfm5p0wm5c6gq7yhaz2gvsnb1jdv"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-time" ,rust-time-0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.3)
-        ("rust-unix-socket" ,rust-unix-socket-0.5))))
-    (home-page "https://github.com/Geal/rust-syslog")
-    (synopsis "Send log messages to syslog")
-    (description "Send log messages to syslog.")
-    (license license:expat)))
+        ("rust-unix-socket" ,rust-unix-socket-0.5))))))
 
 (define-public rust-system-deps-6
   (package
-- 
2.41.0

[bug#66839] [PATCH 14/19] gnu: Add rust-simple-logging-2.

[Steve George]

* gnu/packages/crates-io.scm (rust-simple-logging-2): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 46ae2e0f30..89308835e0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66647,6 +66647,28 @@ (define-public rust-simple-logger-1
          ("rust-log" ,rust-log-0.4)
          ("rust-winapi" ,rust-winapi-0.3))))))
 
+(define-public rust-simple-logging-2
+  (package
+    (name "rust-simple-logging")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "simple-logging" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hmm523f0ax76yljf3z178rn9cm0q6knwa52haqnnckmavl4h3dh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-thread-id" ,rust-thread-id-3))))
+    (home-page "https://github.com/Ereski/simple-logging")
+    (synopsis "Simple logger for the log facade")
+    (description "This package provides a simple logger for the log facade.")
+    (license license:bsd-3)))
+
 (define-public rust-simple-mutex-1
   (package
     (name "rust-simple-mutex")
-- 
2.41.0

[bug#66839] [PATCH 15/19] gnu: Add rust-reopen-1.

[Steve George]

* gnu/packages/crates-io.scm (rust-reopen-1): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 89308835e0..f5dc4a5c80 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57927,6 +57927,31 @@ (define-public rust-rental-impl-0.5
 Should not be used directly.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-reopen-1
+  (package
+    (name "rust-reopen")
+    (version "1.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "reopen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14w2v7a4dav23jzfrxj9lgacp731xizvng4bn7slan7qmk1wwhpz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-signal-hook" ,rust-signal-hook-0.3))
+       #:cargo-development-inputs (("rust-log" ,rust-log-0.4)
+                                   ("rust-partial-io" ,rust-partial-io-0.3)
+                                   ("rust-simple-logging" ,rust-simple-logging-2)
+                                   ("rust-version-sync" ,rust-version-sync-0.9))))
+    (home-page "https://github.com/vorner/reopen")
+    (synopsis "File reopening utility")
+    (description "File reopening utility")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-reopen-0.3
   (package
     (name "rust-reopen")
-- 
2.41.0

[bug#66839] [PATCH 16/19] gnu: Update rust-reopen-0.3.

[Steve George]

* gnu/packages/crates-io.scm (rust-reopen-0.3):
[source]: Add snippet to loosen signal-hook dependency.
---
 gnu/packages/crates-io.scm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f5dc4a5c80..36888020ea 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57957,20 +57957,23 @@ (define-public rust-reopen-0.3
     (name "rust-reopen")
     (version "0.3.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "reopen" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "12b3mfxkwb8akdfa701nzvqr6lsc6n84vrq088gmjy8lxlmr4an6"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "reopen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12b3mfxkwb8akdfa701nzvqr6lsc6n84vrq088gmjy8lxlmr4an6"))
+       (snippet #~(begin
+                    (use-modules (guix build utils))
+                    (substitute* "Cargo.toml.orig"
+                      (("signal-hook.*")
+                       "signal-hook = \"^0.3\"\n"))
+                    (copy-file "Cargo.toml.orig" "Cargo.toml")))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-signal-hook" ,rust-signal-hook-0.1)
-         ("rust-libc" ,rust-libc-0.2))))
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-signal-hook" ,rust-signal-hook-0.1)
+                       ("rust-libc" ,rust-libc-0.2))))
     (home-page "https://github.com/vorner/reopen")
     (synopsis "File reopening utility")
     (description "File reopening utility.")
-- 
2.41.0

[bug#66839] [PATCH 17/19] gnu: rust-fern-0.6: Update to 0.6.2, add rust-syslog-6 dependency.

[Steve George]

* gnu/packages/crates-io.scm (rust-fern-0.6): Update to 0.6.2.
* gnu/packages/crates-io.scm (rust-fern-0.6): Add rust-syslog-6 as a dependency.
---
 gnu/packages/crates-io.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 36888020ea..c9829a7bb9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25730,7 +25730,7 @@ (define-public rust-femme-1
 (define-public rust-fern-0.6
   (package
     (name "rust-fern")
-    (version "0.6.0")
+    (version "0.6.2")
     (source
       (origin
         (method url-fetch)
@@ -25739,7 +25739,7 @@ (define-public rust-fern-0.6
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0rghkbmpm7ckchd2fr2ifahprc7ll3qs0fbwsspsgj6cy0h4i6lc"))))
+           "1vpinainw32498p0zydmxc24yd3r6479pmhdfb429mfbji3c3w6r"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -25748,12 +25748,14 @@ (define-public rust-fern-0.6
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
         ("rust-reopen" ,rust-reopen-0.3)
+        ("rust-reopen" ,rust-reopen-1)
         ("rust-syslog" ,rust-syslog-3)
-        ("rust-syslog" ,rust-syslog-4))
+        ("rust-syslog" ,rust-syslog-4)
+        ("rust-syslog" ,rust-syslog-6))
        #:cargo-development-inputs
-       (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-tempdir" ,rust-tempdir-0.3))))
+       (("rust-clap" ,rust-clap-2)
+        ("rust-humantime" ,rust-humantime-2)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/daboross/fern")
     (synopsis "Simple, efficient logging")
     (description
-- 
2.41.0

[bug#66839] [PATCH 18/19] gnu: rust-sha-1-0.10: Downgrade to 0.10.1

[Steve George]

Later versions of this crate are yanked upstream.
* gnu/packages/crates-io.scm (rust-sha-1): Downgrade to 0.10.1

-- >8 --
* rebuild rust-sequoia-openpgp-1 which depends on this crate
* rebuilt & quick test of sequoia-sq application
* rebuilt rust-hkdf-0.12 crate
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c9829a7bb9..fe3f375bd6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65378,7 +65378,7 @@ (define-public rust-servo-fontconfig-sys-5
 (define-public rust-sha-1-0.10
   (package
     (name "rust-sha-1")
-    (version "0.10.5")
+    (version "0.10.1")
     (source
      (origin
        (method url-fetch)
@@ -65387,10 +65387,10 @@ (define-public rust-sha-1-0.10
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1jr2a7pi67s8nxm4m09df9nnzsdlpif5hnk29hl8xk55fx975y2y"))))
+          "1700fs5aiiailpd5h0ax4sgs2ngys0mqf3p4j0ry6j2p2zd8l1gm"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f      ; use of undeclared crate or module `sha1`
+     `(#:tests? #t      ; use of undeclared crate or module `sha1`
        #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-cpufeatures" ,rust-cpufeatures-0.2)
-- 
2.41.0

[bug#66839] [PATCH 19/19] gnu: Add rust-spotifyd-0.3.

[Steve George]

* gnu/packages/crates-io.scm (rust-spotifyd-0.3): New variable.
---
 gnu/packages/rust-apps.scm | 57 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index a06447143a..3eddf99afe 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -2283,6 +2283,63 @@ (define-public skim-0.7
 (define-public rust-skim-0.7
   (deprecated-package "rust-skim-0.7" skim-0.7))
 
+(define-public rust-spotifyd-0.3
+  (package
+    (name "spotifyd")
+    (version "0.3.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "spotifyd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g6k8xmx8xvc2dpak14y8cc2221djhdflzsjczygvqa9gk5jiadd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-alsa" ,rust-alsa-0.7)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-color-eyre" ,rust-color-eyre-0.6)
+                       ("rust-daemonize" ,rust-daemonize-0.5)
+                       ("rust-dbus" ,rust-dbus-0.9)
+                       ("rust-dbus-crossroads" ,rust-dbus-crossroads-0.5)
+                       ("rust-dbus-tokio" ,rust-dbus-tokio-0.7)
+                       ("rust-fern" ,rust-fern-0.6)
+                       ("rust-futures" ,rust-futures-0.3)
+                       ("rust-gethostname" ,rust-gethostname-0.4)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-keyring" ,rust-keyring-2)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-librespot-audio" ,rust-librespot-audio-0.4)
+                       ("rust-librespot-connect" ,rust-librespot-connect-0.4)
+                       ("rust-librespot-core" ,rust-librespot-core-0.4)
+                       ("rust-librespot-discovery" ,rust-librespot-discovery-0.4)
+                       ("rust-librespot-playback" ,rust-librespot-playback-0.4)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-rspotify" ,rust-rspotify-0.11)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha-1" ,rust-sha-1-0.10)
+                       ("rust-structopt" ,rust-structopt-0.3)
+                       ("rust-syslog" ,rust-syslog-6)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+                       ("rust-toml" ,rust-toml-0.7)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-whoami" ,rust-whoami-1)
+                       ("rust-xdg" ,rust-xdg-2))
+       #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10))
+       ;; problem in the dependency tree (possibly) rust-chrono if dbus_mpris is enabled
+       #:features (list "alsa_backend" "pulseaudio_backend" "rodio_backend"
+                        "dbus_keyring")))
+    (native-inputs (list pkg-config alsa-lib pulseaudio))
+    (inputs (list dbus))
+    (home-page "https://github.com/Spotifyd/spotifyd")
+    (synopsis "Spotify streaming daemon with Spotify Connect support")
+    (description
+     "A light-weight daemon that connects to the Spotify music service.  A
+Spotifyd instance can be controlled by clients that use the Spotify Connect
+protocol, which includes the official Spotify mobile apps.")
+    (license license:gpl3)))
+
 (define-public svd2rust
   (package
     (name "svd2rust")
-- 
2.41.0

bug#66839: [PATCH 00/19] Series to add spotifyd

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]

Thanks. I've applied the series to the rust-team branch.

On Mon, Oct 30, 2023 at 08:16:58PM +0000, Steve George wrote:
> Final set of patches to complete Librespot (0.4.2) and Spotifyd.
> 
> Steve George (19):
>   gnu: Add rust-librespot-connect-0.4.
>   gnu: Add rust-daemonize-0.5.
>   gnu: rust-gethostname-0.4.
>   gnu: rust-libdbus-sys-0.2: Update to 0.2.5.
>   gnu: rust-dbus-0.9: Update to 0.9.7.
>   gnu: Add rust-dbus-crossroads-0.5.
>   gnu: Add rust-dbus-tokio-0.7.
>   gnu: rust-heapless-0.5: Update to 0.5.6.
>   gnu: Add rust-ansi-parser-0.8.
>   gnu: Add rust-tracing-error-0.2.
>   gnu: Add rust-color-spantrace-0.2.
>   gnu: Add rust-color-eyre-0.6.
>   gnu: Add rust-syslog-6.
>   gnu: Add rust-simple-logging-2.
>   gnu: Add rust-reopen-1.
>   gnu: Update rust-reopen-0.3.
>   gnu: rust-fern-0.6: Update to 0.6.2, add rust-syslog-6 dependency.
>   gnu: rust-sha-1-0.10: Downgrade to 0.10.1
>   gnu: Add rust-spotifyd-0.3.
> 
>  gnu/packages/crates-io.scm | 416 +++++++++++++++++++++++++++++++------
>  gnu/packages/rust-apps.scm |  57 +++++
>  2 files changed, 404 insertions(+), 69 deletions(-)
> 
> 
> base-commit: 7e9783b2ab8c747ef340daa749bdeba9e924ec57
> -- 
> 2.41.0
> 
> 
> 

-- 
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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]