From e31cc7f0c9f66372cf5bb5f04a903ffc7b697b56 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 14:44:36 +0200 Subject: gnu: rust-glib-sys: Add 0.15. * gnu/packages/crates-gtk.scm (rust-glib-sys-0.15): New variable. (rust-glib-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index e392220a01..bfde93560c 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1109,8 +1109,40 @@ (define-public rust-glib-macros-0.10 ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-glib-sys-0.15 + (package + (name "rust-glib-sys") + (version "0.15.10") + (source (origin + (method url-fetch) + (uri (crate-uri "glib-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m5sqm69fdk8vaw6hggyizhs1r1vivx73splrdvczsb5iqpijjzg")))) + (build-system cargo-build-system) + (arguments + `(;; XXX: Tests are sensitive to the version of glib, even though + ;; the library supports a wide range. Skip for now. + #:tests? #f + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libglib-2.0") + (description "This package provides FFI bindings to libglib-2.0.") + (license license:expat))) + (define-public rust-glib-sys-0.14 (package + (inherit rust-glib-sys-0.15) (name "rust-glib-sys") (version "0.14.0") (source @@ -1120,7 +1152,6 @@ (define-public rust-glib-sys-0.14 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1bjlymn3fw4g8slij6iiggaipknf9072mr2qm3i4a91199an078w")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1130,12 +1161,7 @@ (define-public rust-glib-sys-0.14 #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list glib)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libglib-2.0") - (description "This package provides FFI bindings to libglib-2.0.") - (license license:expat))) + (native-inputs '()))) (define-public rust-glib-sys-0.10 (package -- cgit v1.2.3 From 21e5e408bfb310d6d285cedad68551684473afca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 14:45:33 +0200 Subject: gnu: rust-cairo-sys: Add 0.15.1. * gnu/packages/crates-gtk.scm (rust-cairo-sys-rs-0.15): New variable. (rust-cairo-sys-rs-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index bfde93560c..f389c707d6 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -277,8 +277,37 @@ (define-public rust-cairo-rs-0.7 #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-cairo-sys-rs-0.15 + (package + (name "rust-cairo-sys-rs") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-sys-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j6k4pps3dv6g0vlpmxc2xyk0s40vj2wpzi55lbwjspmpqlx8m9w")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11" ,rust-x11-2)))) + (native-inputs + (list pkg-config)) + (inputs + (list cairo)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libcairo") + (description "This package provides FFI bindings to libcairo.") + (license license:expat))) + (define-public rust-cairo-sys-rs-0.14 (package + (inherit rust-cairo-sys-rs-0.15) (name "rust-cairo-sys-rs") (version "0.14.9") (source @@ -288,7 +317,6 @@ (define-public rust-cairo-sys-rs-0.14 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0w3md4xk87ign30wb3rqfmmj0q6pvg5arbm35flgsd08jxvbhj5l")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -298,12 +326,7 @@ (define-public rust-cairo-sys-rs-0.14 ("rust-system-deps" ,rust-system-deps-3) ("rust-winapi" ,rust-winapi-0.3) ("rust-x11" ,rust-x11-2)))) - (inputs - (list cairo)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libcairo") - (description "This package provides FFI bindings to libcairo.") - (license license:expat))) + (native-inputs '()))) (define-public rust-cairo-sys-rs-0.10 (package -- cgit v1.2.3 From 633c4ca4074698a2c950ddb82bf1daf77c2949a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 14:52:23 +0200 Subject: gnu: rust-gobject-sys: Add 0.15.10. * gnu/packages/crates-gtk.scm (rust-gobject-sys-0.15): New variable. (rust-gobject-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index f389c707d6..99b8c08a4f 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1230,28 +1230,32 @@ (define-public rust-glib-sys-0.9 (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-gobject-sys-0.14 +(define-public rust-gobject-sys-0.15 (package (name "rust-gobject-sys") - (version "0.14.0") + (version "0.15.10") (source (origin (method url-fetch) (uri (crate-uri "gobject-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xf3jiwzrjingq8jr15bjkbv6m5dypzp67cjnm5f7njrjzicm4ma")))) + (base32 "02hyilvpi4hw4gr03z2plsbf1zicsfs5l0xxadqx3v3b4i2cwmqd")))) (build-system cargo-build-system) (arguments - `(#:skip-build? - #t + `(;; FIXME: Constant value mismatch for G_TYPE_FUNDAMENTAL_MAX + ;; Rust: "255" + ;; C: "1020" + #:tests? #f #:cargo-inputs - (("rust-glib-sys" ,rust-glib-sys-0.14) + (("rust-glib-sys" ,rust-glib-sys-0.15) ("rust-libc" ,rust-libc-0.2) - ("rust-system-deps" ,rust-system-deps-3)) + ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs - (("rust-shell-words" ,rust-shell-words-0.1) + (("rust-shell-words" ,rust-shell-words-1) ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) (inputs (list glib)) (home-page "https://gtk-rs.org/") @@ -1259,6 +1263,28 @@ (define-public rust-gobject-sys-0.14 (description "This package provides FFI bindings to libgobject-2.0.") (license license:expat))) +(define-public rust-gobject-sys-0.14 + (package + (inherit rust-gobject-sys-0.15) + (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")) + (sha256 + (base32 "1xf3jiwzrjingq8jr15bjkbv6m5dypzp67cjnm5f7njrjzicm4ma")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.14) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs '()))) + (define-public rust-gobject-sys-0.10 (package (inherit rust-gobject-sys-0.14) -- cgit v1.2.3 From ac393134e5d2bd59f90557f25db017040843913c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 14:59:33 +0200 Subject: gnu: rust-glib-macros: Add 0.15. * gnu/packages/crates-gtk.scm (rust-glib-macros-0.15): New variable. (rust-glib-macros-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 99b8c08a4f..63a3b3db78 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1080,8 +1080,37 @@ (define-public rust-glib-0.8 #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-glib-macros-0.15 + (package + (name "rust-glib-macros") + (version "0.15.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0r3cr0c79rs91z0sps089nsf8ppnm8agp48qwwqlkc32lqqq39i5")))) + (build-system cargo-build-system) + (arguments + `(;; XXX: Circular dependency on rust-glib?? + #:tests? #f + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-heck" ,rust-heck-0.4) + ("rust-proc-macro-crate" ,rust-proc-macro-crate-1) + ("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GLib library, proc macros crate") + (description "Rust bindings for the GLib library, proc macros crate.") + (license license:expat))) + (define-public rust-glib-macros-0.14 (package + (inherit rust-glib-macros-0.15) (name "rust-glib-macros") (version "0.14.1") (source @@ -1102,11 +1131,7 @@ (define-public rust-glib-macros-0.14 ("rust-proc-macro-error" ,rust-proc-macro-error-1) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the GLib library, proc macros crate") - (description "Rust bindings for the GLib library, proc macros crate.") - (license license:expat))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-glib-macros-0.10 (package -- cgit v1.2.3 From bc9ea4f6e84f806f8b0294dafbeb31d98865e76c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:05:01 +0200 Subject: gnu: rust-glib: Add 0.15.12. * gnu/packages/crates-gtk.scm (rust-glib-0.15): New variable. (rust-glib-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 51 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 63a3b3db78..f132303970 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -962,8 +962,51 @@ (define-public rust-gir-format-check-0.1 (description "File format checker in Rust.") (license license:expat))) +(define-public rust-glib-0.15 + (package + (name "rust-glib") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pahikbwxr3vafdrr5l2hnlhkf9xi4illryan0l59ayhp9pk1c7d")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-futures-task" ,rust-futures-task-0.3) + ("rust-glib-macros" ,rust-glib-macros-0.15) + ("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GLib library") + (description "Rust bindings for the GLib library") + (license license:expat))) + (define-public rust-glib-0.14 (package + (inherit rust-glib-0.15) (name "rust-glib") (version "0.14.8") (source @@ -989,13 +1032,7 @@ (define-public rust-glib-0.14 ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-once-cell" ,rust-once-cell-1) - ("rust-smallvec" ,rust-smallvec-1)))) - (inputs - (list glib)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the GLib library") - (description "Rust bindings for the GLib library") - (license license:expat))) + ("rust-smallvec" ,rust-smallvec-1)))))) (define-public rust-glib-0.10 (package -- cgit v1.2.3 From 01c410a440d6e444648ff1e979cf5f5097d4790d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:08:54 +0200 Subject: gnu: rust-cairo-rs: Add 0.15.12. * gnu/packages/crates-gtk.scm (rust-cairo-rs-0.15): New variable. (rust-cairo-rs-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index f132303970..860ec68fda 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -168,8 +168,40 @@ (define-public rust-atk-0.8 #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-cairo-rs-0.15 + (package + (name "rust-cairo-rs") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1g396fdz8crf74dmmjarcsdbsm8qgxy3a5x9kw6m2d9xn28y6vn7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) + ("rust-freetype" ,rust-freetype-0.7) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list cairo)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Cairo library") + (description "Rust bindings for the Cairo library") + (license license:expat))) + (define-public rust-cairo-rs-0.14 (package + (inherit rust-cairo-rs-0.15) (name "rust-cairo-rs") (version "0.14.9") (source @@ -191,13 +223,7 @@ (define-public rust-cairo-rs-0.14 ("rust-libc" ,rust-libc-0.2) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list cairo)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the Cairo library") - (description "Rust bindings for the Cairo library") - (license license:expat))) + (("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-cairo-rs-0.9 (package -- cgit v1.2.3 From def0acd5e5c0e8c5e32ac69d9e9a18a536be7962 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:17:47 +0200 Subject: gnu: rust-pango-sys: Add 0.15. * gnu/packages/crates-gtk.scm (rust-pango-sys-0.15): New variable. (rust-pango-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 860ec68fda..074206cd8e 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1755,8 +1755,39 @@ (define-public rust-pango-0.7 #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-pango-sys-0.15 + (package + (name "rust-pango-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1an3c931kbkr08n9d9d1dapsq3n26zs0xn4ixn11jrp4rn0h186j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list pango)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libpango-1.0") + (description "This package provides FFI bindings to @code{libpango-1.0}.") + (license license:expat))) + (define-public rust-pango-sys-0.14 (package + (inherit rust-pango-sys-0.15) (name "rust-pango-sys") (version "0.14.0") (source @@ -1766,7 +1797,6 @@ (define-public rust-pango-sys-0.14 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1zj236n9kjldf47wwlxvhshwm5zhg589a0fml5mm8qg7lnf0jrr3")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1774,13 +1804,7 @@ (define-public rust-pango-sys-0.14 (("rust-glib-sys" ,rust-glib-sys-0.14) ("rust-gobject-sys" ,rust-gobject-sys-0.14) ("rust-libc" ,rust-libc-0.2) - ("rust-system-deps" ,rust-system-deps-3)))) - (inputs - (list pango)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libpango-1.0") - (description "This package provides FFI bindings to @code{libpango-1.0}.") - (license license:expat))) + ("rust-system-deps" ,rust-system-deps-3)))))) (define-public rust-pango-sys-0.10 (package -- cgit v1.2.3 From 713b289ff0037981de91ec844cfa835d7e7c8049 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:19:15 +0200 Subject: gnu: rust-pango: Add 0.15.10. * gnu/packages/crates-gtk.scm (rust-pango-0.15): New variable. (rust-pango-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 074206cd8e..4056290e9c 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1645,29 +1645,31 @@ (define-public rust-gtk3-macros-0.14 library.") (license license:expat))) -(define-public rust-pango-0.14 +(define-public rust-pango-0.15 (package (name "rust-pango") - (version "0.14.8") + (version "0.15.10") (source (origin (method url-fetch) (uri (crate-uri "pango" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "10c5q8wl9gkjh323whq6pg9yfvr2vmz00f98z1d77jp506cdavsl")))) + (base32 "0ksf85fqkw4y5pf21p84g5xn4fnqn21cbrmx2d9yx6k591ah9r12")))) (build-system cargo-build-system) (arguments - `(#:skip-build? - #t + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-glib" ,rust-glib-0.14) + ("rust-glib" ,rust-glib-0.15) ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pango-sys" ,rust-pango-sys-0.14)) + ("rust-pango-sys" ,rust-pango-sys-0.15)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs + (list pkg-config)) (inputs (list pango)) (home-page "https://gtk-rs.org/") @@ -1675,6 +1677,31 @@ (define-public rust-pango-0.14 (description "Rust bindings for the Pango library") (license license:expat))) +(define-public rust-pango-0.14 + (package + (inherit rust-pango-0.15) + (name "rust-pango") + (version "0.14.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10c5q8wl9gkjh323whq6pg9yfvr2vmz00f98z1d77jp506cdavsl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? + #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-glib" ,rust-glib-0.14) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pango-sys" ,rust-pango-sys-0.14)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-pango-0.9 (package (inherit rust-pango-0.14) -- cgit v1.2.3 From c5d4f2e8f077c783475cc6b1c103cd0a7ea570eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:27:24 +0200 Subject: gnu: rust-pangocairo-sys: Add 0.15. * gnu/packages/crates-gtk.scm (rust-pangocairo-sys-0.15): New variable. (rust-pangocairo-sys-0.10): Inherit from it. --- gnu/packages/crates-gtk.scm | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 4056290e9c..28297f95cf 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1943,8 +1943,43 @@ (define-public rust-pangocairo-0.8 #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-pangocairo-sys-0.15 + (package + (name "rust-pangocairo-sys") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "154llaawy60zh8fkw2yq0r31ynpmqlsr7brryzaq2v4ijijp9kvq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) + ("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.15) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + ;; XXX: Should these be propagated from their respective crates? + (list cairo glib pango)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgtk-3") + (description "This package provides FFI bindings to libgtk-3.") + (license license:expat))) + (define-public rust-pangocairo-sys-0.10 (package + (inherit rust-pangocairo-sys-0.15) (name "rust-pangocairo-sys") (version "0.10.1") (source @@ -1966,13 +2001,7 @@ (define-public rust-pangocairo-sys-0.10 ("rust-pkg-config" ,rust-pkg-config-0.3)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-0.1) - ("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list gtk+)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgtk-3") - (description "This package provides FFI bindings to libgtk-3.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-soup-sys-0.10 (package -- cgit v1.2.3 From 2f9aa892c633d8263c3e97a93024d6638fd4a6c6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:33:21 +0200 Subject: gnu: rust-pangocairo: Add 0.15.1. * gnu/packages/crates-gtk.scm (rust-pangocairo-0.15): New variable. (rust-pangocairo-0.9): Inherit from it. --- gnu/packages/crates-gtk.scm | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 28297f95cf..552b1f41f4 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1876,8 +1876,44 @@ (define-public rust-pango-sys-0.9 (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-pangocairo-0.15 + (package + (name "rust-pangocairo") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rjk0clrjxah4kc0kybn7l7bxa5m5kpxkihxc2i7a6hx3xfa8xkq")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.15) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.15)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs + (list pkg-config)) + (inputs + (list pango)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the PangoCairo library") + (description + "Rust bindings for the PangoCairo library.") + (license license:expat))) + (define-public rust-pangocairo-0.9 (package + (inherit rust-pangocairo-0.15) (name "rust-pangocairo") (version "0.9.0") (source @@ -1904,14 +1940,7 @@ (define-public rust-pangocairo-0.9 ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.10) ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) - (inputs - (list gtk+)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the PangoCairo library") - (description - "Rust bindings for the PangoCairo library.") - (license license:expat))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) (define-public rust-pangocairo-0.8 (package -- cgit v1.2.3 From b4678e44886f712288b2e7c53cc2828292df8a2b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:51:34 +0200 Subject: gnu: rust-gio-sys: Add 0.15.10. * gnu/packages/crates-gtk.scm (rust-gio-sys-0.15): New variable. (rust-gio-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 51 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 552b1f41f4..34979fed30 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -897,8 +897,51 @@ (define-public rust-gio-0.7 #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-gio-sys-0.15 + (package + (name "rust-gio-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13fgmc2xdzg9qk9l3nlp1bilwn6466mrqbiq4fhc9qkia93pl59j")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: some GLib macros are not found + #:tests? #f + #:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases (modify-phases %standard-phases + (add-before 'check 'extend-include-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gio-headers (search-input-directory + inputs "include/gio-unix-2.0"))) + ;; Tests rely on these headers. + (setenv "C_INCLUDE_PATH" + (string-append gio-headers ":" + (getenv "C_INCLUDE_PATH"))))))))) + (native-inputs + (list pkg-config)) + (inputs + (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgio-2.0") + (description "This package provides FFI bindings to libgio-2.0.") + (license license:expat))) + (define-public rust-gio-sys-0.14 (package + (inherit rust-gio-sys-0.15) (name "rust-gio-sys") (version "0.14.0") (source @@ -917,13 +960,7 @@ (define-public rust-gio-sys-0.14 ("rust-gobject-sys" ,rust-gobject-sys-0.14) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-3) - ("rust-winapi" ,rust-winapi-0.3)))) - (inputs - (list glib)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgio-2.0") - (description "This package provides FFI bindings to libgio-2.0.") - (license license:expat))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-gio-sys-0.10 (package -- cgit v1.2.3 From bdd55817edeac77964fd8f9d642b30cb44b1ccb4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:52:22 +0200 Subject: gnu: rust-gdk-pixbuf-sys: Add 0.15. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-sys-0.15): New variable. (rust-gdk-pixbuf-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 34979fed30..92ade296ec 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -598,8 +598,42 @@ (define-public rust-gdk-pixbuf-0.7 #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-gdk-pixbuf-sys-0.15 + (package + (name "rust-gdk-pixbuf-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19q2qjrzmmgc7bbs59sk6k0sv3xhpmnk9a2h0cajfr95g19jy2ql")))) + (build-system cargo-build-system) + (arguments + `(;#:skip-build? + ;#t + #:cargo-inputs + (("rust-gio-sys" ,rust-gio-sys-0.15) + ("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list gdk-pixbuf)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgdk_pixbuf-2.0") + (description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.") + (license license:expat))) + (define-public rust-gdk-pixbuf-sys-0.14 (package + (inherit rust-gdk-pixbuf-sys-0.15) (name "rust-gdk-pixbuf-sys") (version "0.14.0") (source @@ -621,13 +655,7 @@ (define-public rust-gdk-pixbuf-sys-0.14 ("rust-system-deps" ,rust-system-deps-3)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-0.1) - ("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list gdk-pixbuf)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgdk_pixbuf-2.0") - (description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-gdk-pixbuf-sys-0.10 (package -- cgit v1.2.3 From 79ee7d783acb0a11c0a527d268ca8f70e4465080 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 16:17:36 +0200 Subject: gnu: rust-gio: Add 0.15.12. * gnu/packages/crates-gtk.scm (rust-gio-0.15): New variable. (rust-gio-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 48 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 92ade296ec..d7318f080c 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -796,8 +796,48 @@ (define-public rust-gdk-sys-0.9 (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-gio-0.15 + (package + (name "rust-gio") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fr8qiqjf9yzl8867kgqdsxpkcx2jrns3xwmlf0jfiid668brzb8")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gio-sys" ,rust-gio-sys-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-serial-test" ,rust-serial-test-0.6)))) + (native-inputs + (list pkg-config)) + (inputs + (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Gio library") + (description "Rust bindings for the Gio library") + (license license:expat))) + (define-public rust-gio-0.14 (package + (inherit rust-gio-0.15) (name "rust-gio") (version "0.14.8") (source @@ -823,13 +863,7 @@ (define-public rust-gio-0.14 ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1) - ("rust-serial-test" ,rust-serial-test-0.4)))) - (inputs - (list glib)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the Gio library") - (description "Rust bindings for the Gio library") - (license license:expat))) + ("rust-serial-test" ,rust-serial-test-0.4)))))) (define-public rust-gio-0.9 (package -- cgit v1.2.3 From c7bbf937ff9d59823a91069e547bb3fdc804d084 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 16:20:22 +0200 Subject: gnu: rust-gdk-pixbuf: Add 0.15.11. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-0.15): New variable. (rust-gdk-pixbuf-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) (limited to 'gnu/packages/crates-gtk.scm') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index d7318f080c..316e427522 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -489,8 +489,41 @@ (define-public rust-gdk-0.12 #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-gdk-pixbuf-0.15 + (package + (name "rust-gdk-pixbuf") + (version "0.15.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16k1z21r76m620z61kfmgid1n6s8dnxpa4zlrppcr6dhr2fdsf5d")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.15) + ("rust-gio" ,rust-gio-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs + (list pkg-config)) + (inputs + (list gdk-pixbuf)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GdkPixbuf library") + (description "Rust bindings for the GdkPixbuf library") + (license license:expat))) + (define-public rust-gdk-pixbuf-0.14 (package + (inherit rust-gdk-pixbuf-0.15) (name "rust-gdk-pixbuf") (version "0.14.0") (source @@ -510,13 +543,7 @@ (define-public rust-gdk-pixbuf-0.14 ("rust-glib" ,rust-glib-0.14) ("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) - (inputs - (list gdk-pixbuf)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the GdkPixbuf library") - (description "Rust bindings for the GdkPixbuf library") - (license license:expat))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) (define-public rust-gdk-pixbuf-0.9 (package -- cgit v1.2.3