diff mbox series

[bug#56057,gnu:,Add,dua-cli.,25/27] gnu: Add rust-windows-sys-0.36 & per-target varitations.

Message ID 20220618195656.10108-26-antlers@luris.net
State New
Headers show
Series gnu: Add dua-cli. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

antlers June 18, 2022, 7:56 p.m. UTC
* gnu/packages/crates-io.scm

(rust-windows-x86-64-gnu-0.36
 rust-windows-x86-64-mscv-0.36
 rust-windows-i686-gnu-0.36
 rust-windows-i686-mscv-0.36
 rust-windows-aarch64-mscv-0.36
 rust-windows-sys-0.36): New variables.

(rust-windows-x86-64-gnu-0.28
 rust-windows-x86-64-mscv-0.28
 rust-windows-i686-gnu-0.28
 rust-windows-i686-mscv-0.28
 rust-windows-aarch64-mscv-0.28
 rust-windows-0.28): Inherit from rust-windows-*-0.36.
---
:100644 100644 13e312a077 cb3b85ee68 M	gnu/packages/crates-io.scm
 gnu/packages/crates-io.scm | 122 +++++++++++++++++++++++++++++++------
 1 file changed, 104 insertions(+), 18 deletions(-)

Comments

Maxime Devos June 20, 2022, 11:15 a.m. UTC | #1
antlers schreef op za 18-06-2022 om 12:56 [-0700]:
> varitations

nitpick: varitations -> variations
Maxime Devos June 20, 2022, 11:15 a.m. UTC | #2
antlers schreef op za 18-06-2022 om 12:56 [-0700]:
> varitations

(unless that was already fixed in the v2)
Maxime Devos June 20, 2022, 11:17 a.m. UTC | #3
antlers schreef op za 18-06-2022 om 12:56 [-0700]:
> * gnu/packages/crates-io.scm
> 
> (rust-windows-x86-64-gnu-0.36
>  rust-windows-x86-64-mscv-0.36
>  rust-windows-i686-gnu-0.36
>  rust-windows-i686-mscv-0.36
>  rust-windows-aarch64-mscv-0.36
>  rust-windows-sys-0.36): New variables.
> 
> (rust-windows-x86-64-gnu-0.28
>  rust-windows-x86-64-mscv-0.28
>  rust-windows-i686-gnu-0.28
>  rust-windows-i686-mscv-0.28
>  rust-windows-aarch64-mscv-0.28
>  rust-windows-0.28): Inherit from rust-windows-*-0.36.

Nevermind my comments about rust-windows-..., looks like those are
already automatically removed in antioxidant.
antlers June 21, 2022, 4:56 p.m. UTC | #4
> Nevermind [...] rust-windows-...
Alright, I dropped that patch back in and (after a hash update for
`rust-sysctl-0.4`) everything does seem to build. I'll still be taking another
look at package descriptions, will sort v3 such that each patch /actually/
builds (ie. sequentially), and maybe cherry-pick `guix style`'s opinions.
Otherwise just keeping an eye on #56037 (I like what they did with the
`-beta` packages) and antioxidant (good luck!).

> > varitations
One learns through many small lessons! I'll be more careful.
Thanks again for your time and attention.
```
$> echo << EOF >> ~/.emacs.d/init.el
(eval-after-load "git-commit-mode"
 '(add-hook 'git-commit-mode-hook #'flyspell-mode))
EOF
```

On Mon, Jun 20, 2022 at 4:17 AM Maxime Devos <maximedevos@telenet.be> wrote:
>
> antlers schreef op za 18-06-2022 om 12:56 [-0700]:
> > * gnu/packages/crates-io.scm
> >
> > (rust-windows-x86-64-gnu-0.36
> >  rust-windows-x86-64-mscv-0.36
> >  rust-windows-i686-gnu-0.36
> >  rust-windows-i686-mscv-0.36
> >  rust-windows-aarch64-mscv-0.36
> >  rust-windows-sys-0.36): New variables.
> >
> > (rust-windows-x86-64-gnu-0.28
> >  rust-windows-x86-64-mscv-0.28
> >  rust-windows-i686-gnu-0.28
> >  rust-windows-i686-mscv-0.28
> >  rust-windows-aarch64-mscv-0.28
> >  rust-windows-0.28): Inherit from rust-windows-*-0.36.
>
> Nevermind my comments about rust-windows-..., looks like those are
> already automatically removed in antioxidant.
diff mbox series

Patch

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 13e312a077..cb3b85ee68 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72702,8 +72702,28 @@  (define-public rust-windows-0.9
     (description "Rust for Windows")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-x86-64-msvc-0.36
+  (package
+    (name "rust-windows-x86-64-msvc")
+    (version "0.36.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_x86_64_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "103n3xijm5vr7qxr1dps202ckfnv7njjnnfqmchg8gl5ii5cl4f8"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description "This package provides code gen support for the windows
+crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-x86-64-msvc-0.28
   (package
+    (inherit rust-windows-x86-64-msvc-0.36)
     (name "rust-windows-x86-64-msvc")
     (version "0.28.0")
     (source
@@ -72712,7 +72732,19 @@  (define-public rust-windows-x86-64-msvc-0.28
        (uri (crate-uri "windows_x86_64_msvc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17z8q25pd3dp6b84qm9nlayd3ym78sbryxlqmgcxvz9vpmy8qarz"))))
+        (base32 "17z8q25pd3dp6b84qm9nlayd3ym78sbryxlqmgcxvz9vpmy8qarz"))))))
+
+(define-public rust-windows-x86-64-gnu-0.36
+  (package
+    (name "rust-windows-x86-64-gnu")
+    (version "0.36.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_x86_64_gnu" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qfrck3jnihymfrd01s8260d4snql8ks2p8yaabipi3nhwdigkad"))))
     (build-system cargo-build-system)
     (arguments `(#:skip-build? #t))
     (home-page "https://github.com/microsoft/windows-rs")
@@ -72723,6 +72755,7 @@  (define-public rust-windows-x86-64-msvc-0.28
 
 (define-public rust-windows-x86-64-gnu-0.28
   (package
+    (inherit rust-windows-x86-64-gnu-0.36)
     (name "rust-windows-x86-64-gnu")
     (version "0.28.0")
     (source
@@ -72731,7 +72764,19 @@  (define-public rust-windows-x86-64-gnu-0.28
        (uri (crate-uri "windows_x86_64_gnu" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0m79bhdr54g4h4wh2q8wkjlkypb5wvl7xzhc2csiaqb5yl4z8cdw"))))
+        (base32 "0m79bhdr54g4h4wh2q8wkjlkypb5wvl7xzhc2csiaqb5yl4z8cdw"))))))
+
+(define-public rust-windows-i686-msvc-0.36
+  (package
+    (name "rust-windows-i686-msvc")
+    (version "0.36.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_i686_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "097h2a7wig04wbmpi3rz1akdy4s8gslj5szsx8g2v0dj91qr3rz2"))))
     (build-system cargo-build-system)
     (arguments `(#:skip-build? #t))
     (home-page "https://github.com/microsoft/windows-rs")
@@ -72742,6 +72787,7 @@  (define-public rust-windows-x86-64-gnu-0.28
 
 (define-public rust-windows-i686-msvc-0.28
   (package
+    (inherit rust-windows-i686-msvc-0.36)
     (name "rust-windows-i686-msvc")
     (version "0.28.0")
     (source
@@ -72750,7 +72796,19 @@  (define-public rust-windows-i686-msvc-0.28
        (uri (crate-uri "windows_i686_msvc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0r0z8s1wcdwd20azsdfilf2a6bz68xkavl990wy64hyc8f51bmai"))))
+        (base32 "0r0z8s1wcdwd20azsdfilf2a6bz68xkavl990wy64hyc8f51bmai"))))))
+
+(define-public rust-windows-i686-gnu-0.36
+  (package
+    (name "rust-windows-i686-gnu")
+    (version "0.36.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_i686_gnu" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dm3svxfzamrv6kklyda9c3qylgwn5nwdps6p0kc9x6s077nq3hq"))))
     (build-system cargo-build-system)
     (arguments `(#:skip-build? #t))
     (home-page "https://github.com/microsoft/windows-rs")
@@ -72761,6 +72819,7 @@  (define-public rust-windows-i686-msvc-0.28
 
 (define-public rust-windows-i686-gnu-0.28
   (package
+    (inherit rust-windows-i686-gnu-0.36)
     (name "rust-windows-i686-gnu")
     (version "0.28.0")
     (source
@@ -72769,7 +72828,19 @@  (define-public rust-windows-i686-gnu-0.28
        (uri (crate-uri "windows_i686_gnu" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12hx7qpsjg9p7jggfcplqa3mf1mzr7k7s5ybzqwg1zmg4fn2aizm"))))
+        (base32 "12hx7qpsjg9p7jggfcplqa3mf1mzr7k7s5ybzqwg1zmg4fn2aizm"))))))
+
+(define-public rust-windows-aarch64-msvc-0.36
+  (package
+    (name "rust-windows-aarch64-msvc")
+    (version "0.36.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows_aarch64_msvc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ixaxs2c37ll2smprzh0xq5p238zn8ylzb3lk1zddqmd77yw7f4v"))))
     (build-system cargo-build-system)
     (arguments `(#:skip-build? #t))
     (home-page "https://github.com/microsoft/windows-rs")
@@ -72780,6 +72851,7 @@  (define-public rust-windows-i686-gnu-0.28
 
 (define-public rust-windows-aarch64-msvc-0.28
   (package
+    (inherit rust-windows-aarch64-msvc-0.36)
     (name "rust-windows-aarch64-msvc")
     (version "0.28.0")
     (source
@@ -72788,17 +72860,39 @@  (define-public rust-windows-aarch64-msvc-0.28
        (uri (crate-uri "windows_aarch64_msvc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1hpk0n2z0jzzvwlvs98b75sa4q920953nqfc119rv19nwm0mlsaj"))))
+        (base32 "1hpk0n2z0jzzvwlvs98b75sa4q920953nqfc119rv19nwm0mlsaj"))))))
+
+(define-public rust-windows-sys-0.36
+  (package
+    (name "rust-windows-sys")
+    (version "0.36.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lmqangv0zg1l46xiq7rfnqwsx8f8m52mqbgg2mrx7x52rd1a17a"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.36)
+        ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.36)
+        ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.36)
+        ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.36)
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.36))))
     (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description "This package provides code gen support for the windows
-crate.")
+    (synopsis "Rust for Windows")
+    (description "The windows crate lets you call any Windows API past,
+present, and future using code generated on the fly directly from the metadata
+describing the API and right into your Rust package where you can call them as
+if they were just another Rust module.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-windows-sys-0.28
   (package
+    (inherit rust-windows-sys-0.36)
     (name "rust-windows-sys")
     (version "0.28.0")
     (source
@@ -72808,7 +72902,6 @@  (define-public rust-windows-sys-0.28
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xkghf343nll9i1yvha1a4spf53mnb5knzmnqj9adgsw5mh3kjl2"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -72816,14 +72909,7 @@  (define-public rust-windows-sys-0.28
         ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.28)
         ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.28)
         ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.28)
-        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.28))))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Rust for Windows")
-    (description "The windows crate lets you call any Windows API past,
-present, and future using code generated on the fly directly from the metadata
-describing the API and right into your Rust package where you can call them as
-if they were just another Rust module.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.28))))))
 
 (define-public rust-windows-gen-0.9
   (package