[bug#75089] [PATCH rust-team 00/27] Refactor (gnu packages crates-io).

[bug#75089] [PATCH rust-team 00/27] Refactor (gnu packages crates-io).

[Herman Rimm via Guix-patches via]

Hello,

The packages in patches 18 to 21 build, but I have not tried their
dependents.  The package in the last patch does not build.

Cheers,
Herman

Herman Rimm (27):
  gnu: rust-arbitrary-0.4: Use inherit syntax.
  gnu: rust-rustc-version-0.3: Use inherit syntax.
  gnu: rust-rustfix-0.4: Use inherit syntax.
  gnu: rust-nettle-5: Use package name in source URI.
  gnu: rust-gobject-sys-0.14: Use package name in source URI.
  gnu: rust-indoc-1: Use package name in source URI.
  gnu: rust-indoc-impl-0.3: Use package name in source URI.
  gnu: rust-nalgebra-0.29: Remove modules.
  gnu: rust-rust-hawktracer-normal-macro-0.4: Unindent source URI.
  gnu: rust-twoway-0.1: Fix indentation.
  gnu: rust-gix-revision-0.22: Fix whitespace.
  gnu: rust-syn-0.15: Remove properties.
  gnu: rust-time-0.1: Remove whitespace.
  gnu: rust-dirs-sys-next-0.1: Do not inherit rust-dirs-sys-0.3.
  gnu: rust-winapi-0.3: Use unlabeled cargo-inputs.
  gnu: rust-nitrokey-test-0.5: Use unlabeled cargo-inputs.
  gnu: rust-progressing-3: Use unlabeled cargo-inputs.
  gnu: rust-dirs-2: Remove inputs.
  gnu: rust-libloading-0.6: Remove inputs.
  gnu: rust-nix-0.18: Remove inputs.
  gnu: rust-pcap-0.7: Remove native-inputs.
  gnu: rust-mio-named-pipes-0.1: Use list of licenses.
  gnu: rust-bindgen-0.55: Inherit inputs.
  gnu: rust-libsqlite3-sys-0.22: Inherit inputs.
  gnu: rust-libsqlite3-sys-0.20: Inherit inputs.
  gnu: rust-hyper-tls-0.4: Inherit (native-)inputs.
  gnu: rust-trust-dns-rustls-0.6: Inherit (native-)inputs.

 gnu/packages/crates-crypto.scm  |  3 +-
 gnu/packages/crates-gtk.scm     |  3 +-
 gnu/packages/crates-io.scm      | 66 ++++++++++++++-------------------
 gnu/packages/crates-vcs.scm     |  5 +--
 gnu/packages/crates-web.scm     |  8 ----
 gnu/packages/crates-windows.scm |  4 +-
 6 files changed, 35 insertions(+), 54 deletions(-)


base-commit: 5603df8e34b66bb82eb8adf502bb48ef41a90369
-- 
2.45.2

[bug#75089] [PATCH rust-team 01/27] gnu: rust-arbitrary-0.4: Use inherit syntax.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-arbitrary-0.4): Use inherit.

Change-Id: I69e3c66a16b81e8514169f5554438756776519ea
---
 gnu/packages/crates-io.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6548ebd3d0..57a4a1869e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2660,7 +2660,8 @@ (define-public rust-arbitrary-1
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-arbitrary-0.4
-  (package/inherit rust-arbitrary-1
+  (package
+    (inherit rust-arbitrary-1)
     (name "rust-arbitrary")
     (version "0.4.7")
     (source
-- 
2.45.2

[bug#75089] [PATCH rust-team 02/27] gnu: rust-rustc-version-0.3: Use inherit syntax.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rustc-version-0.3): Use inherit.

Change-Id: I6eef20a80ba3890a6c2e8b260dcd20296d1968b0
---
 gnu/packages/crates-io.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 57a4a1869e..0c271b6552 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72146,7 +72146,8 @@ (define-public rust-rustc-version-0.4
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-rustc-version-0.3
-  (package/inherit rust-rustc-version-0.4
+  (package
+    (inherit rust-rustc-version-0.4)
     (name "rust-rustc-version")
     (version "0.3.3")
     (source
-- 
2.45.2

[bug#75089] [PATCH rust-team 03/27] gnu: rust-rustfix-0.4: Use inherit syntax.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rustfix-0.4): Use inherit.

Change-Id: I5c49e7b9209c92d26f32bb122063bc2ec448b982
---
 gnu/packages/crates-io.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0c271b6552..00080c7934 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72372,7 +72372,8 @@ (define-public rust-rustfix-0.5
         ("rust-tempdir" ,rust-tempdir-0.3))))))
 
 (define-public rust-rustfix-0.4
-  (package/inherit rust-rustfix-0.5
+  (package
+    (inherit rust-rustfix-0.5)
     (name "rust-rustfix")
     (version "0.4.6")
     (source
-- 
2.45.2

[bug#75089] [PATCH rust-team 04/27] gnu: rust-nettle-5: Use package name in source URI.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nettle-5): Set name.
[source]: Use name.

Change-Id: I95ab63c4bf90e48df5836d49d4fc4bca45f3484d
---
 gnu/packages/crates-crypto.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index fef6ba8d44..1fe701ca11 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -3253,13 +3253,14 @@ (define-public rust-nettle-7
 (define-public rust-nettle-5
   (package
     (inherit rust-nettle-7)
+    (name "rust-nettle")
     (version "5.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "nettle" version))
        (file-name
-        (string-append (package-name rust-nettle-7) "-" version ".tar.gz"))
+        (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0zfplqdf3mag8r7lc124hl24vri8yg711jmm8gl1mpwnlhass2n4"))
        (patches (search-patches "rust-nettle-disable-vendor.patch"))))
-- 
2.45.2

[bug#75089] [PATCH rust-team 05/27] gnu: rust-gobject-sys-0.14: Use package name in source URI.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-gobject-sys-0.14): Add name.
[source]: Use name.

Change-Id: I4a02093714bdf4ec8b062186f1aa9562063a9b0f
---
 gnu/packages/crates-gtk.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 29469cd0ae..7234c47c7e 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -2745,12 +2745,13 @@ (define-public rust-gobject-sys-0.15
 (define-public rust-gobject-sys-0.14
   (package
     (inherit rust-gobject-sys-0.15)
+    (name "rust-gobject-sys")
     (version "0.14.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "gobject-sys" version))
-       (file-name (string-append "rust-gobject-sys-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xf3jiwzrjingq8jr15bjkbv6m5dypzp67cjnm5f7njrjzicm4ma"))))
     (arguments
-- 
2.45.2

[bug#75089] [PATCH rust-team 06/27] gnu: rust-indoc-1: Use package name in source URI.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-indoc-1): Add name.
[source]: Use name.

Change-Id: I8256626cb7b7b0980f4048aa82b103dfabc96363
---
 gnu/packages/crates-io.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 00080c7934..ccc89d0fb8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37187,12 +37187,13 @@ (define-public rust-indoc-1
 (define-public rust-indoc-0.3
   (package
     (inherit rust-indoc-1)
+    (name "rust-indoc")
     (version "0.3.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "indoc" version))
-       (file-name (string-append "rust-indoc-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1n2fd2wm1h005hd7pjgx4gv5ymyq4sxqn8z0ssw6xchgqs5ilx27"))))
     (arguments
-- 
2.45.2

[bug#75089] [PATCH rust-team 07/27] gnu: rust-indoc-impl-0.3: Use package name in source URI.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-indoc-impl-0.3)[source]: Use name.

Change-Id: Ic834e85360d5ed65d43e362f9d80fedb494ec132
---
 gnu/packages/crates-io.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ccc89d0fb8..2535535b8a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37211,7 +37211,7 @@ (define-public rust-indoc-impl-0.3
      (origin
        (method url-fetch)
        (uri (crate-uri "indoc-impl" version))
-       (file-name (string-append "rust-indoc-impl-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1w58yg249kmzsn75kcj34qaxqh839l1hsaj3bzggy3q03wb6s16f"))))
     (build-system cargo-build-system)
-- 
2.45.2

[bug#75089] [PATCH rust-team 08/27] gnu: rust-nalgebra-0.29: Remove modules.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nalgebra-0.29)[source]: Remove
modules.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2535535b8a..b4087b4513 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48632,8 +48632,8 @@ (define-public rust-nalgebra-0.29
         (uri (crate-uri "nalgebra" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "1zri11vkrbk3ayvy8xqcdvvyjvfcbl5a18x8z82racnn11zfn1nm"))
-       (modules '((guix build utils)))))
+         (base32
+           "1zri11vkrbk3ayvy8xqcdvvyjvfcbl5a18x8z82racnn11zfn1nm"))))
     (arguments
       `(#:tests? #f       ;TODO: how to enable required features?
         #:cargo-inputs
-- 
2.45.2

[bug#75089] [PATCH rust-team 09/27] gnu: rust-rust-hawktracer-normal-macro-0.4: Unindent source URI.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm
(rust-rust-hawktracer-normal-macro-0.4)[source]: Unindent.

Change-Id: I8ae94214af4d85fd93b8a8ba5c4d1becd90fd83b
---
 gnu/packages/crates-io.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b4087b4513..bde5b4a599 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -71483,9 +71483,7 @@ (define-public rust-rust-hawktracer-normal-macro-0.4
     (source
       (origin
         (method url-fetch)
-        (uri (crate-uri
-               "rust_hawktracer_normal_macro"
-               version))
+        (uri (crate-uri "rust_hawktracer_normal_macro" version))
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-- 
2.45.2

[bug#75089] [PATCH rust-team 10/27] gnu: rust-twoway-0.1: Fix indentation.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-twoway-0.1)[source]: Use space
instead of tabs as indentation.

Change-Id: Ice754188995503c9f50593e78f85811ace846f47
---
 gnu/packages/crates-io.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bde5b4a599..e2fe4c3d99 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -93350,7 +93350,7 @@ (define-public rust-twoway-0.1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-		"1lbf64snscr3vz71jbl6i2c8zr2ndsiqbk6316z39fj1a8mipcar"))))))
+          "1lbf64snscr3vz71jbl6i2c8zr2ndsiqbk6316z39fj1a8mipcar"))))))
 
 (define-public rust-twox-hash-1
   (package
-- 
2.45.2

[bug#75089] [PATCH rust-team 11/27] gnu: rust-gix-revision-0.22: Fix whitespace.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-vcs.scm (rust-gix-revision-0.22)[source]: Fix
whitespace.

Change-Id: I55f90a76d397462e3086116bc074fdbcff1408d8
---
 gnu/packages/crates-vcs.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-vcs.scm b/gnu/packages/crates-vcs.scm
index 4e1e0d1bad..aed06aa598 100644
--- a/gnu/packages/crates-vcs.scm
+++ b/gnu/packages/crates-vcs.scm
@@ -6099,11 +6099,10 @@ (define-public rust-gix-revision-0.22
      (origin
        (method url-fetch)
        (uri (crate-uri "gix-revision" version))
-       (file-name (string-append name "-" version
-                        ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-        "128fi6mblg4ic6h1q5vy2zq6vly8hxhi9vxkpkskaymby9fb3i68"))))
+          "128fi6mblg4ic6h1q5vy2zq6vly8hxhi9vxkpkskaymby9fb3i68"))))
     (arguments
      `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)
                        ("rust-document-features" ,rust-document-features-0.2)
-- 
2.45.2

[bug#75089] [PATCH rust-team 12/27] gnu: rust-syn-0.15: Remove properties.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-syn-0.15): Remove properties.

Change-Id: I9170dc85f656b86d26f3ce744cdd95d003e7c0b1
---
 gnu/packages/crates-io.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e2fe4c3d99..c45c6e9793 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -83983,8 +83983,7 @@ (define-public rust-syn-0.15
         ("rust-ref-cast" ,rust-ref-cast-0.2)
         ("rust-regex" ,rust-regex-1)
         ("rust-termcolor" ,rust-termcolor-1)
-        ("rust-walkdir" ,rust-walkdir-2))))
-    (properties '())))
+        ("rust-walkdir" ,rust-walkdir-2))))))
 
 (define-public rust-syn-0.14
   (package
-- 
2.45.2

[bug#75089] [PATCH rust-team 13/27] gnu: rust-time-0.1: Remove whitespace.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-time-0.1): Remove whitespace.

Change-Id: I7f75a75b4d627199252d5ebfbee77df9e84c5a3d
---
 gnu/packages/crates-io.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c45c6e9793..076013fc60 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -88507,7 +88507,6 @@ (define-public rust-time-0.1
                   (substitute* "Cargo.toml"
                     (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
                      (string-append "\"^" version)))))))
-
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
-- 
2.45.2

[bug#75089] [PATCH rust-team 14/27] gnu: rust-dirs-sys-next-0.1: Do not inherit rust-dirs-sys-0.3.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-dirs-sys-next-0.1): Do not inherit.
[build-system, synopsis, description, license]: Add.

Change-Id: I5f92e608962dfee4eca6a6f4d3cc6506ac4c9c6f
---
 gnu/packages/crates-io.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 076013fc60..a0dce8cc5c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24015,7 +24015,6 @@ (define-public rust-dirs-sys-0.3
 
 (define-public rust-dirs-sys-next-0.1
   (package
-    (inherit rust-dirs-sys-0.3)
     (name "rust-dirs-sys-next")
     (version "0.1.2")
     (source
@@ -24026,12 +24025,18 @@ (define-public rust-dirs-sys-next-0.1
        (sha256
         (base32
          "0kavhavdxv4phzj4l0psvh55hszwnr0rcz8sxbvx20pyqi2a3gaf"))))
+    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
         ("rust-redox-users" ,rust-redox-users-0.4)
         ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/xdg-rs/dirs/tree/master/dirs-sys")))
+    (home-page "https://github.com/xdg-rs/dirs/tree/master/dirs-sys")
+    (synopsis "Shared code for dirs-next and directories-next")
+    (description
+     "This package only exists to facilitate code sharing between
+dirs-next and directories-next.")
+    (license (list license:expat license:asl2.0))))
 
 (define-public rust-discard-1
   (package
-- 
2.45.2

[bug#75089] [PATCH rust-team 15/27] gnu: rust-winapi-0.3: Use unlabeled cargo-inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-windows.scm (rust-winapi-0.3)[cargo-inputs]:
Remove labels.

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

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index aca8069a40..5986398e4e 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -987,8 +987,8 @@ (define-public rust-winapi-0.3
     ;; This package depends unconditionally on these two crates.
     (arguments
      `(#:cargo-inputs
-       (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4)
-        ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4))))
+       ,(list rust-winapi-i686-pc-windows-gnu-0.4
+              rust-winapi-x86-64-pc-windows-gnu-0.4)))
     (inputs
      (list rust-winapi-i686-pc-windows-gnu-0.4
            rust-winapi-x86-64-pc-windows-gnu-0.4))
-- 
2.45.2

[bug#75089] [PATCH rust-team 16/27] gnu: rust-nitrokey-test-0.5: Use unlabeled cargo-inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nitrokey-test-0.5)[cargo-inputs]
Remove labels.

Change-Id: Iddfdfff44d728763e55da60ed5c7c8de4c790b37
---
 gnu/packages/crates-io.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a0dce8cc5c..47228379bd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50490,9 +50490,7 @@ (define-public rust-nitrokey-test-0.5
     (arguments
      `(#:skip-build? #t     ; Wants an older version of rust-nitrokey.
        #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("quote" ,rust-quote-1)
-        ("syn" ,rust-syn-1))))
+       ,(list rust-proc-macro2-1 rust-quote-1 rust-syn-1)))
     (home-page "https://github.com/d-e-s-o/nitrokey-test")
     (synopsis "Supporting test infrastructure for the nitrokey crate")
     (description
-- 
2.45.2

[bug#75089] [PATCH rust-team 17/27] gnu: rust-progressing-3: Use unlabeled cargo-inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-progressing-3)[cargo-inputs]: Remove
labels.

Change-Id: Ia3004caca651032ac6bf1ae980f0a7307e329882
---
 gnu/packages/crates-io.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 47228379bd..42c5133709 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62463,9 +62463,7 @@ (define-public rust-progressing-3
         (base32
          "06sb1cxpkc8lx56s76c95cfljs0513nsnn35wd6w79sblwcxpdwp"))))
     (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("log" ,rust-log-0.4))))
+    (arguments (list #:cargo-inputs (list rust-log-0.4)))
     (home-page "https://github.com/dominicparga/progressing")
     (synopsis "Counting progress-bar for Rust")
     (description
-- 
2.45.2

[bug#75089] [PATCH rust-team 18/27] gnu: rust-dirs-2: Remove inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-dirs-2): Remove inputs.

Change-Id: I10960e6100480d74835556eeac470ea350780500
---
 gnu/packages/crates-io.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 42c5133709..235969e96d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23898,9 +23898,7 @@ (define-public rust-dirs-2
     (arguments
      `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-dirs-sys" ,rust-dirs-sys-0.3))))
-    (inputs
-     (list rust-cfg-if-0.1 rust-dirs-sys-0.3))))
+        ("rust-dirs-sys" ,rust-dirs-sys-0.3))))))
 
 (define-public rust-dirs-1
   (package
-- 
2.45.2

[bug#75089] [PATCH rust-team 19/27] gnu: rust-libloading-0.6: Remove inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libloading-0.6): Remove inputs.

Change-Id: I39237a8eb2d14bd5ff5736dca1256df0ab9035d7
---
 gnu/packages/crates-io.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 235969e96d..8a6ca6af03 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41794,9 +41794,7 @@ (define-public rust-libloading-0.6
         ("rust-winapi" ,rust-winapi-0.3))
        #:cargo-development-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-static-assertions" ,rust-static-assertions-1))))
-    (inputs
-     (list rust-cfg-if-1 rust-winapi-0.3))))
+        ("rust-static-assertions" ,rust-static-assertions-1))))))
 
 (define-public rust-libloading-0.5
   (package
-- 
2.45.2

[bug#75089] [PATCH rust-team 20/27] gnu: rust-nix-0.18: Remove inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nix-0.18): Remove inputs.

Change-Id: I1bbbd621fcb4a0159d04d7090311177044fd57d2
---
 gnu/packages/crates-io.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8a6ca6af03..760a382994 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51017,9 +51017,7 @@ (define-public rust-nix-0.18
         ("rust-rand" ,rust-rand-0.6)
         ("rust-semver" ,rust-semver-0.9)
         ("rust-sysctl" ,rust-sysctl-0.1)
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (inputs
-     (list rust-bitflags-1 rust-cc-1 rust-cfg-if-0.1 rust-libc-0.2))))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-nix-0.15
   (package
-- 
2.45.2

[bug#75089] [PATCH rust-team 21/27] gnu: rust-pcap-0.7: Remove native-inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pcap-0.7)[native-inputs]: Remove.

Change-Id: Ibb8c7fb60153bf939bbb09ab7aad5bab48086dc4
---
 gnu/packages/crates-io.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 760a382994..76f1823e61 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57073,7 +57073,6 @@ (define-public rust-pcap-0.7
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "14blflnbj87z3ajlj1hszsl6k7rwa338y4aw2yjm2j0xdpjvj4pr"))))
-    (native-inputs (list libpcap))
     (arguments
      `(#:tests? #f  ; can't find crate for `futures`
        #:cargo-inputs
-- 
2.45.2

[bug#75089] [PATCH rust-team 22/27] gnu: rust-mio-named-pipes-0.1: Use list of licenses.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-mio-named-pipes-0.1)[license]: Use
list.

Change-Id: I18172736a558e5e14a7b6dfd099895622fbb1e34
---
 gnu/packages/crates-io.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 76f1823e61..52c400a29c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47837,7 +47837,7 @@ (define-public rust-mio-named-pipes-0.1
     (synopsis "Windows named pipe bindings for mio")
     (description
      "A library for integrating Windows Named Pipes with mio.")
-    (license `(,license:asl2.0 ,license:expat))))
+    (license (list license:asl2.0 license:expat))))
 
 (define-public rust-mio-uds-0.6
   (package
-- 
2.45.2

[bug#75089] [PATCH rust-team 23/27] gnu: rust-bindgen-0.55: Inherit inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-bindgen-0.55)[inputs]: Remove.

Change-Id: I1d98bbe336681d876dbedefc176efe897e05b3c6
---
 gnu/packages/crates-io.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 52c400a29c..44a8c4f302 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8204,8 +8204,6 @@ (define-public rust-bindgen-0.55
        (sha256
         (base32
          "0hxlvy9q9984rr3rqaxwmgxjrd9wh11mcc161hv3shz6b7jkrcbm"))))
-    (inputs
-     (list clang))
     (arguments
      `(#:cargo-test-flags
        (list "--release" "--"
-- 
2.45.2

[bug#75089] [PATCH rust-team 24/27] gnu: rust-libsqlite3-sys-0.22: Inherit inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libsqlite3-sys-0.22)[inputs]: Remove.

Change-Id: I7bb2e2cdf5f014e725d3cfbb877b2865ada6d65d
---
 gnu/packages/crates-io.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 44a8c4f302..c35904cc1a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42763,8 +42763,6 @@ (define-public rust-libsqlite3-sys-0.22
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "17gqc2mwih81j3ds479gl5zmsxqzzrcrj3yyv62vh34bgy8n82r9"))))
-    (inputs
-     (list sqlite))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-- 
2.45.2

[bug#75089] [PATCH rust-team 25/27] gnu: rust-libsqlite3-sys-0.20: Inherit inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-libsqlite3-sys-0.20)[inputs]: Remove.

Change-Id: Ie85472316a6c9dfeea5f114c593ea64e599fe8cd
---
 gnu/packages/crates-io.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c35904cc1a..ca9bf04961 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42784,8 +42784,6 @@ (define-public rust-libsqlite3-sys-0.20
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1g9gbjjpm9phhs991abkzmacszibp94m5nrh331ycd99y9ci1lv4"))))
-    (inputs
-     (list sqlite))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-- 
2.45.2

[bug#75089] [PATCH rust-team 26/27] gnu: rust-hyper-tls-0.4: Inherit (native-)inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-hyper-tls-0.4)[inputs,
native-inputs]: Remove.

Change-Id: I979cbf0bdd895db4c5a15df3db5063b002e46016
---
 gnu/packages/crates-web.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 6a10b0d9f0..251edb5917 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -4485,10 +4485,6 @@ (define-public rust-hyper-tls-0.4
        (sha256
         (base32
          "1vcfyz7dxavf4brns15afmj5fxz88lbn05rrpbfqsnybdp2sqyfr"))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list openssl))
     (arguments
      `(#:cargo-inputs
        (("rust-bytes" ,rust-bytes-0.5)
-- 
2.45.2

[bug#75089] [PATCH rust-team 27/27] gnu: rust-trust-dns-rustls-0.6: Inherit (native-)inputs.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-web.scm (rust-trust-dns-rustls-0.6)[inputs,
native-inputs]: Remove.

Change-Id: I7c099933a383829d629ca1dc82a981179771e31e
---
 gnu/packages/crates-web.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 251edb5917..0287777545 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -7655,10 +7655,6 @@ (define-public rust-trust-dns-rustls-0.6
        (sha256
         (base32
          "0vbh2y7w2s5gcw33fn4hb5f927kgjm6603vw63slg9riikmsiq43"))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list openssl))
     (arguments
      `(#:cargo-test-flags
        '("--release" "--" "--skip=tests::test_tls_client_stream_ipv4")
-- 
2.45.2

[bug#75089] [PATCH rust-team 00/27] Refactor (gnu packages crates-io).

[Efraim Flashner]

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

I think we should hold off on removing the input labels until the
importer is updated to not use labels anymore.  Then we should probably
just do them all at once in a massive per-file commit.

On Wed, Dec 25, 2024 at 05:00:14PM +0100, Herman Rimm wrote:
> Hello,
> 
> The packages in patches 18 to 21 build, but I have not tried their
> dependents.  The package in the last patch does not build.
> 
> Cheers,
> Herman
> 
> Herman Rimm (27):
>   gnu: rust-arbitrary-0.4: Use inherit syntax.
>   gnu: rust-rustc-version-0.3: Use inherit syntax.
>   gnu: rust-rustfix-0.4: Use inherit syntax.
>   gnu: rust-nettle-5: Use package name in source URI.
>   gnu: rust-gobject-sys-0.14: Use package name in source URI.
>   gnu: rust-indoc-1: Use package name in source URI.
>   gnu: rust-indoc-impl-0.3: Use package name in source URI.
>   gnu: rust-nalgebra-0.29: Remove modules.
>   gnu: rust-rust-hawktracer-normal-macro-0.4: Unindent source URI.
>   gnu: rust-twoway-0.1: Fix indentation.
>   gnu: rust-gix-revision-0.22: Fix whitespace.
>   gnu: rust-syn-0.15: Remove properties.
>   gnu: rust-time-0.1: Remove whitespace.
>   gnu: rust-dirs-sys-next-0.1: Do not inherit rust-dirs-sys-0.3.
>   gnu: rust-winapi-0.3: Use unlabeled cargo-inputs.
>   gnu: rust-nitrokey-test-0.5: Use unlabeled cargo-inputs.
>   gnu: rust-progressing-3: Use unlabeled cargo-inputs.
>   gnu: rust-dirs-2: Remove inputs.
>   gnu: rust-libloading-0.6: Remove inputs.
>   gnu: rust-nix-0.18: Remove inputs.
>   gnu: rust-pcap-0.7: Remove native-inputs.
>   gnu: rust-mio-named-pipes-0.1: Use list of licenses.
>   gnu: rust-bindgen-0.55: Inherit inputs.
>   gnu: rust-libsqlite3-sys-0.22: Inherit inputs.
>   gnu: rust-libsqlite3-sys-0.20: Inherit inputs.
>   gnu: rust-hyper-tls-0.4: Inherit (native-)inputs.
>   gnu: rust-trust-dns-rustls-0.6: Inherit (native-)inputs.
> 
>  gnu/packages/crates-crypto.scm  |  3 +-
>  gnu/packages/crates-gtk.scm     |  3 +-
>  gnu/packages/crates-io.scm      | 66 ++++++++++++++-------------------
>  gnu/packages/crates-vcs.scm     |  5 +--
>  gnu/packages/crates-web.scm     |  8 ----
>  gnu/packages/crates-windows.scm |  4 +-
>  6 files changed, 35 insertions(+), 54 deletions(-)
> 
> 
> base-commit: 5603df8e34b66bb82eb8adf502bb48ef41a90369
> -- 
> 2.45.2
> 
> 
> 

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

bug#75089: [PATCH rust-team 00/27] Refactor (gnu packages crates-io).

[Efraim Flashner]

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

Thanks for the patches. I've pushed them to the rust-team branch with a
few exceptions.

On Wed, Dec 25, 2024 at 05:00:14PM +0100, Herman Rimm wrote:
> Hello,
> 
> The packages in patches 18 to 21 build, but I have not tried their
> dependents.  The package in the last patch does not build.
> 
> Cheers,
> Herman
> 
> Herman Rimm (27):
>   gnu: rust-arbitrary-0.4: Use inherit syntax.
>   gnu: rust-rustc-version-0.3: Use inherit syntax.
>   gnu: rust-rustfix-0.4: Use inherit syntax.
>   gnu: rust-nettle-5: Use package name in source URI.
>   gnu: rust-gobject-sys-0.14: Use package name in source URI.
>   gnu: rust-indoc-1: Use package name in source URI.
>   gnu: rust-indoc-impl-0.3: Use package name in source URI.
>   gnu: rust-nalgebra-0.29: Remove modules.
>   gnu: rust-rust-hawktracer-normal-macro-0.4: Unindent source URI.
>   gnu: rust-twoway-0.1: Fix indentation.
>   gnu: rust-gix-revision-0.22: Fix whitespace.
>   gnu: rust-syn-0.15: Remove properties.
>   gnu: rust-time-0.1: Remove whitespace.
I dropped this one, I think we can skip it
>   gnu: rust-dirs-sys-next-0.1: Do not inherit rust-dirs-sys-0.3.
>   gnu: rust-winapi-0.3: Use unlabeled cargo-inputs.
>   gnu: rust-nitrokey-test-0.5: Use unlabeled cargo-inputs.
>   gnu: rust-progressing-3: Use unlabeled cargo-inputs.
I dropped these 3, I'd like to wait until the importer is updated to
import unlabeled crates
>   gnu: rust-dirs-2: Remove inputs.
>   gnu: rust-libloading-0.6: Remove inputs.
>   gnu: rust-nix-0.18: Remove inputs.
>   gnu: rust-pcap-0.7: Remove native-inputs.
>   gnu: rust-mio-named-pipes-0.1: Use list of licenses.
>   gnu: rust-bindgen-0.55: Inherit inputs.
>   gnu: rust-libsqlite3-sys-0.22: Inherit inputs.
>   gnu: rust-libsqlite3-sys-0.20: Inherit inputs.
>   gnu: rust-hyper-tls-0.4: Inherit (native-)inputs.
>   gnu: rust-trust-dns-rustls-0.6: Inherit (native-)inputs.
> 
>  gnu/packages/crates-crypto.scm  |  3 +-
>  gnu/packages/crates-gtk.scm     |  3 +-
>  gnu/packages/crates-io.scm      | 66 ++++++++++++++-------------------
>  gnu/packages/crates-vcs.scm     |  5 +--
>  gnu/packages/crates-web.scm     |  8 ----
>  gnu/packages/crates-windows.scm |  4 +-
>  6 files changed, 35 insertions(+), 54 deletions(-)
> 
> 
> base-commit: 5603df8e34b66bb82eb8adf502bb48ef41a90369
> -- 
> 2.45.2
> 
> 
> 

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