* [bug#53169] [PATCH 1/8] gnu: Add rust-svgtypes-0.5.
@ 2022-01-11 0:31 phodina via Guix-patches via
2022-01-21 0:21 ` Nicolas Goaziou
0 siblings, 1 reply; 3+ messages in thread
From: phodina via Guix-patches via @ 2022-01-11 0:31 UTC (permalink / raw)
To: 53169
[-- Attachment #1.1: Type: text/plain, Size: 71 bytes --]
Hi,
this patch set updates and adds additional Lyon crates.
----
Petr
[-- Attachment #1.2: Type: text/html, Size: 328 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-rust-lyon-geom-0.17-Update-to-0.17.6.patch --]
[-- Type: text/x-patch; name=0003-gnu-rust-lyon-geom-0.17-Update-to-0.17.6.patch, Size: 1734 bytes --]
From ba03a29ef98d1ca9d12b44742d6fc0f238906be1 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 11 Jan 2022 01:07:54 +0100
Subject: [PATCH 3/8] gnu: rust-lyon-geom-0.17: Update to 0.17.6.
* gnu/packages/crates-graphics.scm (rust-lyon-geom-0.17): Update to 0.17.6.
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 8225309bc8..e8c0d51de0 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1460,10 +1460,10 @@ (define-public rust-line-drawing-0.7
graphics and video games.")
(license license:expat)))
-(define-public rust-lyon-geom-0.14
+(define-public rust-lyon-geom-0.17
(package
(name "rust-lyon-geom")
- (version "0.14.1")
+ (version "0.17.6")
(source
(origin
(method url-fetch)
@@ -1472,15 +1472,15 @@ (define-public rust-lyon-geom-0.14
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "178z4cqqmyw0rsabbgx9phkjxjzcnq0604062lqjlq87k063216a"))))
+ "12al92qsh0f8ci3qf3533r4y5hxzzyfp972vm4wqzz9bq9vwx6ff"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-num-traits" ,rust-num-traits-0.2)
- ("rust-euclid" ,rust-euclid-0.20)
- ("rust-arrayvec" ,rust-arrayvec-0.4)
- ("rust-serde" ,rust-serde-1))))
+ (("rust-arrayvec" ,rust-arrayvec-0.5)
+ ("rust-euclid" ,rust-euclid-0.22)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-serde" ,rust-serde-1))))
(home-page "https://github.com/nical/lyon")
(synopsis "2D graphics rendering on the GPU using tessellation")
(description
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-rust-euclid-0.22-Update-to-0.22.6.patch --]
[-- Type: text/x-patch; name=0002-gnu-rust-euclid-0.22-Update-to-0.22.6.patch, Size: 1614 bytes --]
From 3c5d9263b463828f84a3c91c196df7652c91c050 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 11 Jan 2022 01:06:12 +0100
Subject: [PATCH 2/8] gnu: rust-euclid-0.22: Update to 0.22.6.
* gnu/packages/crates-graphics.scm (rust-euclid-0.22): Update to 0.22.6.
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index b3319e4ac1..8225309bc8 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -639,10 +639,10 @@ (define-public rust-dcv-color-primitives-0.1
conversion.")
(license license:expat)))
-(define-public rust-euclid-0.20
+(define-public rust-euclid-0.22
(package
(name "rust-euclid")
- (version "0.20.10")
+ (version "0.22.6")
(source
(origin
(method url-fetch)
@@ -651,13 +651,14 @@ (define-public rust-euclid-0.20
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0c3hbl0kvc53k6nws0v9d46hi0giza1j079sqx2bgl4wfw65nshc"))))
+ "102blw7ljphi7i2xg435z0bb0a4npmwwbgyfinqxg1m0af2q55ns"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-mint" ,rust-mint-0.5)
- ("rust-num-traits" ,rust-num-traits-0.2)
- ("rust-serde" ,rust-serde-1))
+ (("rust-arbitrary" ,rust-arbitrary-1)
+ ("rust-mint" ,rust-mint-0.5)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-serde-test" ,rust-serde-test-1))))
(home-page "https://github.com/servo/euclid")
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0004-gnu-rust-lyon-path-0.17-Update-to-0.17.7.patch --]
[-- Type: text/x-patch; name=0004-gnu-rust-lyon-path-0.17-Update-to-0.17.7.patch, Size: 1576 bytes --]
From c8411d43b2da55458bad615642612d450fd2fab3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 11 Jan 2022 01:10:54 +0100
Subject: [PATCH 4/8] gnu: rust-lyon-path-0.17: Update to 0.17.7.
* gnu/packages/crates-graphics.scm (rust-lyon-path-0.17): Update to 0.17.7.
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index e8c0d51de0..8f957dbbcd 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1487,10 +1487,10 @@ (define-public rust-lyon-geom-0.17
"This package provides 2D graphics rendering on the GPU using tessellation.")
(license (list license:expat license:asl2.0))))
-(define-public rust-lyon-path-0.14
+(define-public rust-lyon-path-0.17
(package
(name "rust-lyon-path")
- (version "0.14.0")
+ (version "0.17.7")
(source
(origin
(method url-fetch)
@@ -1499,12 +1499,12 @@ (define-public rust-lyon-path-0.14
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0qk8x46w0sf6j04l6gvhgn9kr4ymcqkmkh67w8wqahm54jn5gjqb"))))
+ "1h7vbfaanf3x7xch6md4q4ja3xmvsi41n7d6ga40vjk7yzymj2jv"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-lyon-geom" ,rust-lyon-geom-0.14)
+ (("rust-lyon-geom" ,rust-lyon-geom-0.17)
("rust-serde" ,rust-serde-1))))
(home-page "https://github.com/nical/lyon")
(synopsis "Types and utilities to store, build and iterate over 2D paths")
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0007-gnu-Add-rust-lyon-extra-0.17.patch --]
[-- Type: text/x-patch; name=0007-gnu-Add-rust-lyon-extra-0.17.patch, Size: 1508 bytes --]
From 71197f1d59bb4c99eb2aa12bef6ff2ca6fb6adf0 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 11 Jan 2022 01:09:56 +0100
Subject: [PATCH 7/8] gnu: Add rust-lyon-extra-0.17.
* gnu/packages/crates-graphics.scm (rust-lyon-extra-0.17): New variable.
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index c8d1cb89bc..69b3a27df9 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1460,6 +1460,29 @@ (define-public rust-line-drawing-0.7
graphics and video games.")
(license license:expat)))
+(define-public rust-lyon-extra-0.17
+ (package
+ (name "rust-lyon-extra")
+ (version "0.17.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "lyon_extra" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "10n8h48a363qa66byqfkg164542p97v5rrnb33gqhggah739nwm0"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build?
+ #t
+ #:cargo-inputs
+ (("rust-lyon-path" ,rust-lyon-path-0.17)
+ ("rust-lyon-svg" ,rust-lyon-svg-0.17))))
+ (home-page "https://github.com/nical/lyon")
+ (synopsis "Optional utilities for the lyon crate")
+ (description "This package provides optional utilities for the lyon crate.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-lyon-geom-0.17
(package
(name "rust-lyon-geom")
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: 0005-gnu-Add-rust-lyon-svg-0.17.patch --]
[-- Type: text/x-patch; name=0005-gnu-Add-rust-lyon-svg-0.17.patch, Size: 1549 bytes --]
From de40cd388020ba55188743ac73683d36f10290f2 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 11 Jan 2022 01:12:57 +0100
Subject: [PATCH 5/8] gnu: Add rust-lyon-svg-0.17.
* gnu/packages/crates-graphics.scm (rust-lyon-svg-0.17): New variable.
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 8f957dbbcd..c8d1cb89bc 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1512,6 +1512,29 @@ (define-public rust-lyon-path-0.17
"Types and utilities to store, build and iterate over 2D paths.")
(license (list license:expat license:asl2.0))))
+(define-public rust-lyon-svg-0.17
+ (package
+ (name "rust-lyon-svg")
+ (version "0.17.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "lyon_svg" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0fin6h9vwgz7gi2a1b0j9bp8a1aval2lvha1kzy7iijm4kgdcj3d"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build?
+ #t
+ #:cargo-inputs
+ (("rust-lyon-path" ,rust-lyon-path-0.17)
+ ("rust-svgtypes" ,rust-svgtypes-0.5))))
+ (home-page "https://github.com/nical/lyon")
+ (synopsis "SVG helpers for the lyon crates")
+ (description "This package provides SVG helpers for the lyon crates.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-osmesa-sys-0.1
(package
(name "rust-osmesa-sys")
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0006-gnu-Add-rust-float-next-after-0.1.patch --]
[-- Type: text/x-patch; name=0006-gnu-Add-rust-float-next-after-0.1.patch, Size: 1473 bytes --]
From dc429c65df00307b1594df685bcfa71f3ae5523c Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 11 Jan 2022 01:14:05 +0100
Subject: [PATCH 6/8] gnu: Add rust-float-next-after-0.1.
* gnu/packages/crates-io.scm (rust-float-next-after-0.1): New variable.
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5f019e8192..1e08eb582c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19468,6 +19468,29 @@ (define-public rust-float-cmp-0.3
(arguments
`(#:cargo-inputs (("rust-num" ,rust-num-0.1))))))
+(define-public rust-float-next-after-0.1
+ (package
+ (name "rust-float-next-after")
+ (version "0.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "float_next_after" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0cnn60pslh0gilpy2jr7qpqk22a6lmsdz847988bg1krhg2i5ijg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build?
+ #t
+ #:cargo-inputs
+ (("rust-num-traits" ,rust-num-traits-0.2))))
+ (home-page "https://gitlab.com/bronsonbdevost/next_afterf")
+ (synopsis "Trait for native rust f64/f32 nextafter")
+ (description
+ "This package provides a trait for native rust f64/f32 nextafter")
+ (license license:expat)))
+
(define-public rust-float-ord-0.3
(package
(name "rust-float-ord")
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0008-gnu-Add-rust-lyon-tessellation-0.17.patch --]
[-- Type: text/x-patch; name=0008-gnu-Add-rust-lyon-tessellation-0.17.patch, Size: 1724 bytes --]
From 2698af7b49b33cc2329b7f17a27fc6fde531ff2b Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 11 Jan 2022 01:13:32 +0100
Subject: [PATCH 8/8] gnu: Add rust-lyon-tessellation-0.17.
* gnu/packages/crates-graphics.scm (rust-lyon-tessellation-0.17): New variable.
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 69b3a27df9..243b0ac830 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1558,6 +1558,31 @@ (define-public rust-lyon-svg-0.17
(description "This package provides SVG helpers for the lyon crates.")
(license (list license:expat license:asl2.0))))
+(define-public rust-lyon-tessellation-0.17
+ (package
+ (name "rust-lyon-tessellation")
+ (version "0.17.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "lyon-tessellation" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0q2pccjszda26asylnvhwsil8wvsprfjazrqdzj4i033s26y0c3j"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-float-next-after" ,rust-float-next-after-0.1)
+ ("rust-lyon-path" ,rust-lyon-path-0.17)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-lyon-extra" ,rust-lyon-extra-0.17))))
+ (home-page "https://github.com/nical/lyon")
+ (synopsis "Low level path tessellation library")
+ (description
+ "This package provides a low level path tessellation library.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-osmesa-sys-0.1
(package
(name "rust-osmesa-sys")
--
2.34.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #9: 0001-gnu-Add-rust-svgtypes-0.5.patch --]
[-- Type: text/x-patch; name=0001-gnu-Add-rust-svgtypes-0.5.patch, Size: 1485 bytes --]
From 00d64f67ff5a3e507f3f18c2e465134d0ebccb52 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 11 Jan 2022 00:51:22 +0100
Subject: [PATCH 1/8] gnu: Add rust-svgtypes-0.5.
* gnu/packages/crates-io.scm (rust-svgtypes-0.5): New variable.
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 15e67d5561..5f019e8192 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65587,6 +65587,29 @@ (define-public rust-svd-parser-0.9
"This package provides a CMSIS-SVD file parser")
(license (list license:expat license:asl2.0))))
+(define-public rust-svgtypes-0.5
+ (package
+ (name "rust-svgtypes")
+ (version "0.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "svgtypes" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1zv0yb4nfyz78y8k7fmyjqgdh9vf7xc44c9pzry8640szym6ylww"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build?
+ #t
+ #:cargo-inputs
+ (("rust-float-cmp" ,rust-float-cmp-0.5)
+ ("rust-siphasher" ,rust-siphasher-0.2))))
+ (home-page "https://github.com/RazrFalcon/svgtypes")
+ (synopsis "SVG types parser")
+ (description "This package provides SVG types parser.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-sxd-document-0.3
(package
(name "rust-sxd-document")
--
2.34.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#53169] [PATCH 1/8] gnu: Add rust-svgtypes-0.5.
2022-01-11 0:31 [bug#53169] [PATCH 1/8] gnu: Add rust-svgtypes-0.5 phodina via Guix-patches via
@ 2022-01-21 0:21 ` Nicolas Goaziou
2022-01-21 5:08 ` phodina via Guix-patches via
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Goaziou @ 2022-01-21 0:21 UTC (permalink / raw)
To: 53169; +Cc: phodina, 53169-done
Hello,
phodina via Guix-patches via <guix-patches@gnu.org> writes:
> this patch set updates and adds additional Lyon crates.
Thank you.
Note that some of your commit messages were misleading. E.g., when you
write "gnu: rust-euclid-0.22: Update to 0.22.6.", you actually create
a new variable `rust-euclid-0.22' and remove `rust-euclid-0.20'. As
a consequence it broke old revisions of `plotters' and `font-kit'
crates, which I had to remove.
Also, indentation from imported packages is a bit off. You may want to
re-indent packages.
In any case, all applied!
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#53169] [PATCH 1/8] gnu: Add rust-svgtypes-0.5.
2022-01-21 0:21 ` Nicolas Goaziou
@ 2022-01-21 5:08 ` phodina via Guix-patches via
0 siblings, 0 replies; 3+ messages in thread
From: phodina via Guix-patches via @ 2022-01-21 5:08 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: 53169, 53169-done
Hi Nicolas,
> Note that some of your commit messages were misleading. E.g., when you
>
> write "gnu: rust-euclid-0.22: Update to 0.22.6.", you actually create
>
> a new variable `rust-euclid-0.22' and remove` rust-euclid-0.20'. As
>
> a consequence it broke old revisions of `plotters' and` font-kit'
>
> crates, which I had to remove.
>
> Also, indentation from imported packages is a bit off. You may want to
>
> re-indent packages.
>
> In any case, all applied!
Thanks for the note. You're right that in case "gnu: rust-euclid-0.22" it's new variable as there are dependencies on the old one.
I'll keep that in mind next time :-)
----
Petr
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-21 5:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-11 0:31 [bug#53169] [PATCH 1/8] gnu: Add rust-svgtypes-0.5 phodina via Guix-patches via
2022-01-21 0:21 ` Nicolas Goaziou
2022-01-21 5:08 ` phodina via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).