machine « gnu - guix - Wojtek's customized Guix

Mode	Name	Size
-rw-r--r--	digital-ocean.scm	17794	log plain about
-rw-r--r--	ssh.scm	21170	log plain about

x.patch"))))))) (define-public rust-1.79 (let ((base-rust (rust-bootstrapped-package rust-1.78 "1.79.0" @@ -1030,7 +1037,7 @@ safety and thread safety guarantees.") ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.77)) + (let ((base-rust rust-1.78)) (package (inherit base-rust) (properties (append @@ -1050,11 +1057,10 @@ safety and thread safety guarantees.") ;; These are referenced by the cargo output ;; so we unbundle them. "vendor/curl-sys/curl" - "vendor/curl-sys-0.4.63+curl-8.1.2/curl" "vendor/libffi-sys/libffi" "vendor/libnghttp2-sys/nghttp2" "vendor/libz-sys/src/zlib" - "vendor/libz-sys-1.1.9/src/zlib")) + "vendor/libz-sys-1.1.12/src/zlib")) ;; Use the packaged nghttp2 (delete-file "vendor/libnghttp2-sys/build.rs") (with-output-to-file "vendor/libnghttp2-sys/build.rs" @@ -1170,6 +1176,11 @@ safety and thread safety guarantees.") (substitute* "features2.rs" ,@(make-ignore-test-list '("fn dep_with_optional_host_deps_activated")))))) + (add-after 'unpack 'disable-tests-requiring-crates.io + (lambda _ + (substitute* "src/tools/cargo/tests/testsuite/install.rs" + ,@(make-ignore-test-list + '("fn install_global_cargo_config"))))) (add-after 'unpack 'patch-command-exec-tests ;; This test suite includes some tests that the stdlib's ;; `Command` execution properly handles in situations where @@ -1228,7 +1239,7 @@ safety and thread safety guarantees.") ((" = rpath.*" all) (string-append all " " - "rustflags.arg(\"-Clink-args=-Wl,-rpath=" + "self.rustflags.arg(\"-Clink-args=-Wl,-rpath=" out "/lib\");\n")))))) (add-after 'unpack 'unpack-profiler-rt ;; Copy compiler-rt sources to where libprofiler_builtins looks -- cgit v1.2.3 From 40d3ae11324a304603e7d9ad026c43e51613eb76 Mon Sep 17 00:00:00 2001 From: Brennan Vincent Date: Mon, 26 Aug 2024 13:40:55 -0400 Subject: gnu: rust: Update to 1.79. * gnu/packages/rust.scm (rust): Update to 1.79. [source]: Adjust snippet of removed bundled sources. Change-Id: Ic43b4c540413a0e1a08d46cca5a092badc221753 Signed-off-by: Efraim Flashner --- gnu/packages/rust.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index bfc941abb8..c3b06063f7 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1037,7 +1037,7 @@ safety and thread safety guarantees.") ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.78)) + (let ((base-rust rust-1.79)) (package (inherit base-rust) (properties (append @@ -1051,19 +1051,18 @@ safety and thread safety guarantees.") '(begin (for-each delete-file-recursively '("src/llvm-project" - "vendor/jemalloc-sys/jemalloc" - "vendor/openssl-src/openssl" - "vendor/tikv-jemalloc-sys/jemalloc" + "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" + "vendor/openssl-src-111.28.1+1.1.1w/openssl" + "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" ;; These are referenced by the cargo output ;; so we unbundle them. - "vendor/curl-sys/curl" - "vendor/libffi-sys/libffi" - "vendor/libnghttp2-sys/nghttp2" - "vendor/libz-sys/src/zlib" - "vendor/libz-sys-1.1.12/src/zlib")) + "vendor/curl-sys-0.4.72+curl-8.6.0/curl" + "vendor/libffi-sys-2.3.0/libffi" + "vendor/libnghttp2-sys-0.1.9+1.58.0/nghttp2" + "vendor/libz-sys-1.1.16/src/zlib")) ;; Use the packaged nghttp2 - (delete-file "vendor/libnghttp2-sys/build.rs") - (with-output-to-file "vendor/libnghttp2-sys/build.rs" + (delete-file "vendor/libnghttp2-sys-0.1.9+1.58.0/build.rs") + (with-output-to-file "vendor/libnghttp2-sys-0.1.9+1.58.0/build.rs" (lambda _ (format #t "fn main() {~@ println!(\"cargo:rustc-link-lib=nghttp2\");~@ @@ -1101,7 +1100,10 @@ safety and thread safety guarantees.") (lambda _ (substitute* "src/tools/cargo/tests/testsuite/git.rs" ,@(make-ignore-test-list - '("fn fetch_downloads_with_git2_first_"))))) + '("fn fetch_downloads_with_git2_first_"))) + (substitute* "src/tools/cargo/tests/testsuite/build.rs" + ,@(make-ignore-test-list + '("fn build_with_symlink_to_path_dependency_with_build_script_in_git"))))) (add-after 'unpack 'disable-tests-requiring-mercurial (lambda _ (with-directory-excursion "src/tools/cargo/tests/testsuite/cargo_init" -- cgit v1.2.3 From 31fafd227036cf76f861c5582d828842826af097 Mon Sep 17 00:00:00 2001 From: Brennan Vincent Date: Mon, 26 Aug 2024 13:40:56 -0400 Subject: gnu: Add rust-1.80. gnu/packages/rust.scm (rust-1.80): New variable. Change-Id: Ie7dd276f7b4d606660557f3da42064b04dda1435 Signed-off-by: Efraim Flashner --- gnu/packages/rust.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c3b06063f7..e0def663b9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1023,6 +1023,33 @@ safety and thread safety guarantees.") (("features = \\[\"fs\"" all) (string-append all ", \"use-libc\"")))))))))) +(define-public rust-1.80 + (let ((base-rust (rust-bootstrapped-package rust-1.79 "1.80.1" + "1i1dbpwnv6ak244lapsxvd26w6sbas9g4l6crc8bip2275j8y2rc"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/jemalloc-sys-0.5.3+5.3.0-patched/jemalloc" + "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" + "vendor/openssl-src-111.28.2+1.1.1w/openssl" + "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc")) + ;; Remove vendored dynamically linked libraries. + ;; find . -not -type d -executable -exec file {} \+ | grep ELF + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" "\\.(a|dll|exe|lib)$")) + ;; Adjust vendored dependency to explicitly use rustix with libc backend. + (substitute* '("vendor/tempfile-3.7.1/Cargo.toml" + "vendor/tempfile-3.10.1/Cargo.toml") + (("features = \\[\"fs\"" all) + (string-append all ", \"use-libc\"")))))))))) + (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." (map (lambda (str) -- cgit v1.2.3 From 89d6561de9ffff2b24c74418564c1983c187508a Mon Sep 17 00:00:00 2001 From: Brennan Vincent Date: Mon, 26 Aug 2024 13:40:57 -0400 Subject: gnu: rust: Update to 1.80. gnu/packages/rust.scm (rust): Update to 1.80. Change-Id: Ife65cb52362a30df8aabd4255a3fdc3c3d60e7bb Signed-off-by: Efraim Flashner --- gnu/packages/rust.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e0def663b9..016ffced53 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1064,7 +1064,7 @@ safety and thread safety guarantees.") ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.79)) + (let ((base-rust rust-1.80)) (package (inherit base-rust) (properties (append @@ -1079,7 +1079,7 @@ safety and thread safety guarantees.") (for-each delete-file-recursively '("src/llvm-project" "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" - "vendor/openssl-src-111.28.1+1.1.1w/openssl" + "vendor/openssl-src-111.28.2+1.1.1w/openssl" "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" ;; These are referenced by the cargo output ;; so we unbundle them. @@ -1100,7 +1100,8 @@ safety and thread safety guarantees.") (for-each delete-file (find-files "vendor" "\\.(a|dll|exe|lib)$")) ;; Adjust vendored dependency to explicitly use rustix with libc backend. - (substitute* "vendor/tempfile/Cargo.toml" + (substitute* '("vendor/tempfile-3.7.1/Cargo.toml" + "vendor/tempfile-3.10.1/Cargo.toml") (("features = \\[\"fs\"" all) (string-append all ", \"use-libc\""))))))) (arguments @@ -1210,6 +1211,15 @@ safety and thread safety guarantees.") (substitute* "src/tools/cargo/tests/testsuite/install.rs" ,@(make-ignore-test-list '("fn install_global_cargo_config"))))) + (add-after 'unpack 'disable-miscellaneous-broken-tests + (lambda _ + (substitute* "src/tools/cargo/tests/testsuite/check_cfg.rs" + ;; These apparently get confused by the fact that + ;; we're building in a directory containing the + ;; string "rustc" + ,@(make-ignore-test-list + '("fn config_fingerprint" + "fn features_fingerprint"))))) (add-after 'unpack 'patch-command-exec-tests ;; This test suite includes some tests that the stdlib's ;; `Command` execution properly handles in situations where -- cgit v1.2.3 From b78c6991e4da355c50517b8012d0719d2fc15cc0 Mon Sep 17 00:00:00 2001 From: Brennan Vincent Date: Mon, 9 Sep 2024 14:23:56 -0400 Subject: gnu: rust: Update to 1.81. gnu/packages/rust.scm (rust-1.81): New variable. gnu/packages/rust.scm (rust): Update to 1.81. Change-Id: Idb1958364225bebb9aa415419083b6ab97d7c4c7 Signed-off-by: Efraim Flashner --- gnu/packages/rust.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 016ffced53..d0a62e8905 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1050,6 +1050,10 @@ safety and thread safety guarantees.") (("features = \\[\"fs\"" all) (string-append all ", \"use-libc\"")))))))))) +(define-public rust-1.81 + (rust-bootstrapped-package rust-1.80 "1.81.0" + "19yggj1qivdhf68gx2652cfi7nxjkdgy39wh7h6facpzppz4h947")) + (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." (map (lambda (str) @@ -1064,7 +1068,7 @@ safety and thread safety guarantees.") ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.80)) + (let ((base-rust rust-1.81)) (package (inherit base-rust) (properties (append @@ -1131,7 +1135,10 @@ safety and thread safety guarantees.") '("fn fetch_downloads_with_git2_first_"))) (substitute* "src/tools/cargo/tests/testsuite/build.rs" ,@(make-ignore-test-list - '("fn build_with_symlink_to_path_dependency_with_build_script_in_git"))))) + '("fn build_with_symlink_to_path_dependency_with_build_script_in_git"))) + (substitute* "src/tools/cargo/tests/testsuite/publish_lockfile.rs" + ,@(make-ignore-test-list + '("fn note_resolve_changes"))))) (add-after 'unpack 'disable-tests-requiring-mercurial (lambda _ (with-directory-excursion "src/tools/cargo/tests/testsuite/cargo_init" @@ -1219,7 +1226,12 @@ safety and thread safety guarantees.") ;; string "rustc" ,@(make-ignore-test-list '("fn config_fingerprint" - "fn features_fingerprint"))))) + "fn features_fingerprint"))) + (substitute* "src/tools/cargo/tests/testsuite/git_auth.rs" + ;; This checks for a specific networking error message + ;; that's different from the one we see in the builder + ,@(make-ignore-test-list + '("fn net_err_suggests_fetch_with_cli"))))) (add-after 'unpack 'patch-command-exec-tests ;; This test suite includes some tests that the stdlib's ;; `Command` execution properly handles in situations where -- cgit v1.2.3 From b8ad77fa1d5f92778d9f2151d3759ec40418e019 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Sep 2024 17:26:19 +0300 Subject: gnu: rust: Build with clang sources for version 17. * gnu/packages/rust.scm (rust)[native-inputs]: Update clang-source to 17. Change-Id: I2b63b0c311eca9d66ea91deead26cf815018e977 --- gnu/packages/rust.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d0a62e8905..e60c209eaf 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1389,7 +1389,7 @@ exec -a \"$0\" \"~a\" \"$@\"" (prepend curl libffi `(,nghttp2 "lib") zlib))) (native-inputs (cons* ;; Keep in sync with the llvm used to build rust. - `("clang-source" ,(package-source clang-runtime-15)) + `("clang-source" ,(package-source clang-runtime-17)) ;; Add test inputs. `("gdb" ,gdb/pinned) `("procps" ,procps) -- cgit v1.2.3 From dcd75bb0595c419b6a210d584fad9ad5029e0f11 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Sep 2024 21:00:14 +0300 Subject: gnu: rust-time-macros-0.2: Update to 0.2.18. * gnu/packages/crates-io.scm (rust-time-macros-0.2): Update to 0.2.18. Change-Id: I44f9debe5813bf08df76645010b83b1c5f8ea27c --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 16f7a0a389..41a08408f8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -81055,14 +81055,14 @@ should not be relied upon directly.") (define-public rust-time-macros-0.2 (package (name "rust-time-macros") - (version "0.2.17") + (version "0.2.18") (source (origin (method url-fetch) (uri (crate-uri "time-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0x3pahhk2751c6kqqq9dk6lz0gydbnxr44q01wpjlrz687ps78vv")))) + (base32 "1kqwxvfh2jkpg38fy673d6danh1bhcmmbsmffww3mphgail2l99z")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-num-conv" ,rust-num-conv-0.1) -- cgit v1.2.3 From 1b4106549f1145001774847c5507757e25f937d1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Sep 2024 21:00:37 +0300 Subject: gnu: rust-time-0.3: Update to 0.3.36. * gnu/packages/crates-io.scm (rust-time-0.3): Update to 0.3.36. Change-Id: I59bbfbc250bfa1c35d14fed6ea8f13961b79f46b --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 41a08408f8..f7d5f05850 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -80896,14 +80896,14 @@ introspection APIs.") (define-public rust-time-0.3 (package (name "rust-time") - (version "0.3.34") + (version "0.3.36") (source (origin (method url-fetch) (uri (crate-uri "time" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0jc7wgprzqjhzd0nqkbmdlnjwyddnswmjw86ni2vq55v45jqn968")))) + (base32 "11g8hdpahgrf1wwl2rpsg5nxq3aj7ri6xr672v4qcij6cgjqizax")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included -- cgit v1.2.3 From defbf22797d1ce99b8693d77ca7b6fd61370c23e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Sep 2024 08:20:02 +0300 Subject: gnu: make-rust-sysroot: Adjust for newer rust version. * gnu/packages/rust.scm (make-rust-sysroot)[arguments]: Adjust 'unbundle-xz phase for changes in vendored libraries. Delete inherited 'enable-profiling phase. Change-Id: I27a5fc2e2a3f9ad3a32b71d1d28d984fb5bcc37e --- gnu/packages/rust.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e60c209eaf..7f85402242 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1418,10 +1418,10 @@ exec -a \"$0\" \"~a\" \"$@\"" #~(modify-phases #$phases (add-after 'unpack 'unbundle-xz (lambda _ - (delete-file-recursively "vendor/lzma-sys/xz-5.2") + (delete-file-recursively "vendor/lzma-sys-0.1.20/xz-5.2") ;; Remove the option of using the static library. ;; This is necessary for building the sysroot. - (substitute* "vendor/lzma-sys/build.rs" + (substitute* "vendor/lzma-sys-0.1.20/build.rs" (("!want_static && ") "")))) #$@(if (target-mingw? target) `((add-after 'set-env 'patch-for-mingw @@ -1446,7 +1446,9 @@ exec -a \"$0\" \"~a\" \"$@\"" ":")) ;; When building a rust-sysroot this crate is only used for ;; the rust-installer. - (substitute* "vendor/num_cpus/src/linux.rs" + (substitute* '("vendor/num_cpus-1.13.0/src/linux.rs" + "vendor/num_cpus-1.13.1/src/linux.rs" + "vendor/num_cpus-1.16.0/src/linux.rs") (("\\.ceil\$\$") "")) ;; gcc doesn't recognize this flag. (substitute* @@ -1536,6 +1538,7 @@ ar = \"" (search-input-file inputs (string-append "/bin/" #$(ar-for-target targe (replace 'install (lambda _ (invoke "./x.py" "install" "library/std"))) + (delete 'enable-profiling) (delete 'install-rust-src) (delete 'wrap-rust-analyzer) (delete 'wrap-rustc))))) -- cgit v1.2.3 From aabcbadf61dcb18143495b85119e5aab04667d26 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Sep 2024 09:02:06 +0300 Subject: gnu: tokei: Don't install source. * gnu/packages/rust-apps.scm (tokei)[arguments]: Don't install the sources. Change-Id: Id51416c014f0225a7daccd0464b451a89a6260bf --- gnu/packages/rust-apps.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e6cce4d372..8cf28463aa 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2421,7 +2421,8 @@ colorized view to stdout.") (base32 "000w549v1bpw7r57xw656p40ywf1gimvxxx5cjnri2js0xg927x4")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:install-source? #f + #:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-clap" ,rust-clap-2) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) -- cgit v1.2.3 From 9a23c8a0660ca5c87b0a3b1f9a56822b41c61be4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 5 Mar 2024 12:53:44 +0200 Subject: gnu: rav1e: Add shell completions. * gnu/packages/video.scm (rav1e)[arguments]: Add a phase to generate and install shell completions. Change-Id: Iaf90be902593f085b3aafb780cd72a75c26b2c58 --- gnu/packages/video.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2da458ed01..7df4b427ed 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6479,7 +6479,40 @@ result in several formats: (invoke "cargo" "cinstall" "--release" ;; Only build the dynamic library. "--library-type" "cdylib" - (string-append "--prefix=" out)))))))) + (string-append "--prefix=" out))))) + (add-after 'install 'install-completions + (lambda* (#:key native-inputs outputs #:allow-other-keys) + (unless ,(%current-target-system) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (bash-completions-dir + (string-append out "/etc/bash_completion.d")) + (zsh-completions-dir + (string-append share "/zsh/site-functions")) + (fish-completions-dir + (string-append share "/fish/vendor_completions.d")) + (elvish-completions-dir + (string-append share "/elvish/lib")) + (rav1e (string-append out "/bin/rav1e")) + (common-flags '("-" "-o" "-" "advanced" "--completion"))) + (mkdir-p bash-completions-dir) + (with-output-to-file + (string-append bash-completions-dir "/rav1e") + (lambda _ (apply invoke rav1e (append common-flags '("bash"))))) + (mkdir-p zsh-completions-dir) + ;; This one currently fails to build. + ;(with-output-to-file + ; (string-append zsh-completions-dir "/_rav1e") + ; (lambda _ (apply invoke rav1e (append common-flags '("zsh"))))) + (mkdir-p fish-completions-dir) + (with-output-to-file + (string-append fish-completions-dir "/rav1e.fish") + (lambda _ (apply invoke rav1e (append common-flags '("fish"))))) + (mkdir-p elvish-completions-dir) + (with-output-to-file + (string-append elvish-completions-dir "/rav1e") + (lambda _ + (apply invoke rav1e (append common-flags '("elvish")))))))))))) (native-inputs (append (if (target-x86?) (list nasm) -- cgit v1.2.3 From dfd1ccfbe63ffe708bb98a85b920de349dd3807e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:07:49 +0300 Subject: gnu: Add rust-cairo-rs-0.19. * gnu/packages/crates-gtk.scm (rust-cairo-rs-0.19): New variable. (rust-cairo-rs-0.18): Inherit from rust-cairo-rs-0.19. Change-Id: I6e75bfe4d1d1b3194152a0fbf2782456f2b1b1af --- gnu/packages/crates-gtk.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 9c01ce3142..4447a4e848 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -172,8 +172,37 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-cairo-rs-0.19 + (package + (name "rust-cairo-rs") + (version "0.19.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qp5rixgipdj9d8yd5458hzfxam1rgpzcxi90vq6q0v91r6jmb5j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19) + ("rust-freetype-rs" ,rust-freetype-rs-0.35) + ("rust-glib" ,rust-glib-0.19) + ("rust-libc" ,rust-libc-0.2) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-float-eq" ,rust-float-eq-1) + ("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 "This package provides Rust bindings for the Cairo library.") + (license license:expat))) + (define-public rust-cairo-rs-0.18 (package + (inherit rust-cairo-rs-0.19) (name "rust-cairo-rs") (version "0.18.5") (source @@ -183,7 +212,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1qjfkcq3mrh3p01nnn71dy3kn99g21xx3j8xcdvzn8ll2pq6x8lc")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18) @@ -194,13 +222,7 @@ ("rust-once-cell" ,rust-once-cell-1) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-float-eq" ,rust-float-eq-1) - ("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))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-cairo-rs-0.17 (package -- cgit v1.2.3 From a8c752e02edf0afe53eb57adbb25cd37c3970666 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:08:24 +0300 Subject: gnu: Add rust-cairo-sys-rs-0.19. * gnu/packages/crates-gtk.scm (rust-cairo-sys-rs-0.19): New variable. (rust-cairo-sys-rs-0.18): Inherit from rust-cairo-sys-rs-0.19. Change-Id: Ida85dd2167a1bd24de73283078b6032d18ae3095 --- gnu/packages/crates-gtk.scm | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 4447a4e848..39d7797ac5 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -350,23 +350,23 @@ (("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-cairo-sys-rs-0.18 +(define-public rust-cairo-sys-rs-0.19 (package (name "rust-cairo-sys-rs") - (version "0.18.2") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "cairo-sys-rs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0lfsxl7ylw3phbnwmz3k58j1gnqi6kc2hdc7g3bb7f4hwnl9yp38")))) + (base32 "0r0yp0lph77lm4blrn6fvdmz2i3r8ibkkjg6nmwbvvv4jq8v6fzx")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18) + `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-6) - ("rust-winapi" ,rust-winapi-0.3) + ("rust-windows-sys" ,rust-windows-sys-0.52) ("rust-x11" ,rust-x11-2)))) (native-inputs (list pkg-config)) (inputs (list cairo)) @@ -375,6 +375,25 @@ (description "This package provides FFI bindings to libcairo.") (license license:expat))) +(define-public rust-cairo-sys-rs-0.18 + (package + (inherit rust-cairo-sys-rs-0.19) + (name "rust-cairo-sys-rs") + (version "0.18.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-sys-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lfsxl7ylw3phbnwmz3k58j1gnqi6kc2hdc7g3bb7f4hwnl9yp38")))) + (arguments + `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11" ,rust-x11-2)))))) + (define-public rust-cairo-sys-rs-0.17 (package (inherit rust-cairo-sys-rs-0.18) -- cgit v1.2.3 From 0989c54938312b47c55b27e006b13a2d55d0aac4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:08:54 +0300 Subject: gnu: Add rust-gdk-pixbuf-0.19. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-0.19): New variable. (rust-gdk-pixbuf-0.18): Inherit from rust-gdk-pixbuf-0.19. Change-Id: I26f7b5667c31d0c22b144408046a41fe41672e88 --- gnu/packages/crates-gtk.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 39d7797ac5..c6d5e8ac06 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -592,8 +592,36 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-gdk-pixbuf-0.19 + (package + (name "rust-gdk-pixbuf") + (version "0.19.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16c6kznkh3vi82843ays8awdm37fwjd1fblv6g3h64824shsnkk2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.19) + ("rust-gio" ,rust-gio-0.19) + ("rust-glib" ,rust-glib-0.19) + ("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 glib gdk-pixbuf)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GdkPixbuf library") + (description + "This package provides Rust bindings for the @code{GdkPixbuf} library.") + (license license:expat))) + (define-public rust-gdk-pixbuf-0.18 (package + (inherit rust-gdk-pixbuf-0.19) (name "rust-gdk-pixbuf") (version "0.18.5") (source @@ -603,7 +631,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1v7svvl0g7zybndmis5inaqqgi1mvcc6s1n8rkb31f5zn3qzbqah")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.18) @@ -612,13 +639,7 @@ ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) - (native-inputs (list pkg-config)) - (inputs (list glib gdk-pixbuf)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the GdkPixbuf library") - (description "Rust bindings for the @code{GdkPixbuf} library.") - (license license:expat))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) (define-public rust-gdk-pixbuf-0.17 (package -- cgit v1.2.3 From f0b613316828c763bafd9c8928d43ad56e11fb3e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:09:23 +0300 Subject: gnu: Add rust-gdk-pixbuf-sys-0.19. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-sys-0.19): New variable. (rust-gdk-pixbuf-sys-0.18): Inherit from rust-gdk-pixbuf-sys-0.19. Change-Id: I7c1aac7883ad0c1fef523fcd8f34ae804e4c1d36 --- gnu/packages/crates-gtk.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index c6d5e8ac06..480dacfd83 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -765,8 +765,37 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-gdk-pixbuf-sys-0.19 + (package + (name "rust-gdk-pixbuf-sys") + (version "0.19.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y93g24mdgskvyhva46xv3qyb1cvj5xpi0yqnh7cb31wz2j0byjf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-gio-sys" ,rust-gio-sys-0.19) + ("rust-glib-sys" ,rust-glib-sys-0.19) + ("rust-gobject-sys" ,rust-gobject-sys-0.19) + ("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 gtk+)) + (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.18 (package + (inherit rust-gdk-pixbuf-sys-0.19) (name "rust-gdk-pixbuf-sys") (version "0.18.0") (source @@ -776,7 +805,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1xya543c4ffd2n7aiwwrdxsyc9casdbasafi6ixcknafckm3k61z")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-gio-sys" ,rust-gio-sys-0.18) @@ -786,13 +814,7 @@ ("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 gtk+)) - (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.17 (package -- cgit v1.2.3 From 9ee72220bbcb50c89852e044751cd44eec08d501 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:09:49 +0300 Subject: gnu: Add rust-gio-0.19. * gnu/packages/crates-gtk.scm (rust-gio-0.19): New variable. (rust-gio-0.18): Inherit from rust-gio-0.19. Change-Id: Ia78e2a74deef816d67494e668679590da155c13f --- gnu/packages/crates-gtk.scm | 49 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 480dacfd83..c30d4185df 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1092,8 +1092,48 @@ (description "This package provides FFI bindings of GDK 4.") (license license:expat))) +(define-public rust-gio-0.19 + (package + (name "rust-gio") + (version "0.19.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1znz5ngfvv3gbndf6lzz3hs27hlb8ysls4axlfccrzvkscbz2jac")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=settings::test::bool_set_get" + "--skip=settings::test::string_get") + #:cargo-inputs (("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.19) + ("rust-glib" ,rust-glib-0.19) + ("rust-libc" ,rust-libc-0.2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-serial-test" ,rust-serial-test-3)))) + (native-inputs (list pkg-config)) + (inputs (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Gio library") + (description "This package provides Rust bindings for the Gio library.") + (license license:expat))) + (define-public rust-gio-0.18 (package + (inherit rust-gio-0.19) (name "rust-gio") (version "0.18.4") (source @@ -1103,7 +1143,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0wsc6mnx057s4ailacg99dwgna38dbqli5x7a6y9rdw75x9qzz6l")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -1125,13 +1164,7 @@ (("rust-futures" ,rust-futures-0.3) ("rust-futures-util" ,rust-futures-util-0.3) ("rust-gir-format-check" ,rust-gir-format-check-0.1) - ("rust-serial-test" ,rust-serial-test-2)))) - (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))) + ("rust-serial-test" ,rust-serial-test-2)))))) (define-public rust-gio-0.17 (package -- cgit v1.2.3 From 2018a977d8a1cbda5133b8af5ceca50e926c1928 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:10:16 +0300 Subject: gnu: Add rust-gio-sys-0.19. * gnu/packages/crates-gtk.scm (rust-gio-sys-0.19): New variable. (rust-gio-sys-0.18): Inherit from rust-gio-sys-0.19. Change-Id: I8bd85203856d5d66aeca5087f59659e1b3529485 --- gnu/packages/crates-gtk.scm | 49 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index c30d4185df..d2425f68bc 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1325,8 +1325,48 @@ ("rust-serial-test" ,rust-serial-test-0.1) ("rust-serial-test-derive" ,rust-serial-test-derive-0.1)))))) +(define-public rust-gio-sys-0.19 + (package + (name "rust-gio-sys") + (version "0.19.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vylsskpipfwl7mvffp1s0227d0k5amyhd32dfnp3mhl8yx47mrc")))) + (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-glib-sys" ,rust-glib-sys-0.19) + ("rust-gobject-sys" ,rust-gobject-sys-0.19) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-windows-sys" ,rust-windows-sys-0.52)) + #: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.18 (package + (inherit rust-gio-sys-0.19) (name "rust-gio-sys") (version "0.18.1") (source @@ -1336,7 +1376,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1lip8z35iy9d184x2qwjxlbxi64q9cpayy7v1p5y9xdsa3w6smip")))) - (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. @@ -1359,13 +1398,7 @@ ;; 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))) + (getenv "C_INCLUDE_PATH"))))))))))) (define-public rust-gio-sys-0.17 (package -- cgit v1.2.3 From bc65634d52f94e2922376dcaf40310db9f850a62 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:11:18 +0300 Subject: gnu: Add rust-glib-0.19. * gnu/packages/crates-gtk.scm (rust-glib-0.19): New variable. (rust-glib-0.18): Inherit from rust-glib-0.19. Change-Id: I8259e12adfa592792da8215ad46c38e753ae3d66 --- gnu/packages/crates-gtk.scm | 53 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index d2425f68bc..a649975cab 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1553,8 +1553,52 @@ (description "File format checker in Rust.") (license license:expat))) +(define-public rust-glib-0.19 + (package + (name "rust-glib") + (version "0.19.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i2ak1scmzfmfxbm2dr146jl4y9mafxf1ald05jr8iimy5wh4r9r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=structured_log") + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("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-futures-util" ,rust-futures-util-0.3) + ("rust-gio-sys" ,rust-gio-sys-0.19) + ("rust-glib-macros" ,rust-glib-macros-0.19) + ("rust-glib-sys" ,rust-glib-sys-0.19) + ("rust-gobject-sys" ,rust-gobject-sys-0.19) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.5) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-trybuild2" ,rust-trybuild2-1)))) + (native-inputs (list pkg-config)) + (inputs (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GLib library") + (description "This package provides Rust bindings for the GLib library.") + (license license:expat))) + (define-public rust-glib-0.18 (package + (inherit rust-glib-0.19) (name "rust-glib") (version "0.18.5") (source @@ -1564,7 +1608,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1r8fw0627nmn19bgk3xpmcfngx3wkn7mcpq5a8ma3risx3valg93")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -1590,13 +1633,7 @@ (("rust-criterion" ,rust-criterion-0.5) ("rust-gir-format-check" ,rust-gir-format-check-0.1) ("rust-tempfile" ,rust-tempfile-3) - ("rust-trybuild2" ,rust-trybuild2-1)))) - (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))) + ("rust-trybuild2" ,rust-trybuild2-1)))))) (define-public rust-glib-0.17 (package -- cgit v1.2.3 From f53b94bb0e7ca1be08cc62ad8c4fdb914912a0ed Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:11:46 +0300 Subject: gnu: Add rust-glib-macros-0.19. * gnu/packages/crates-gtk.scm (rust-glib-macros-0.19): New variable. (rust-glib-macros-0.18): Inherit from rust-glib-macros-0.19. Change-Id: I8dcf545632581ac11550b69a0f169f3fb34a4572 --- gnu/packages/crates-gtk.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index a649975cab..f0ec651882 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1796,8 +1796,37 @@ #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-glib-macros-0.19 + (package + (name "rust-glib-macros") + (version "0.19.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mzsh8jkg8vldvgvr9gsaidvn2myn5cbdn8a6m8rgbhlg8kv0aa4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-heck" ,rust-heck-0.5) + ("rust-proc-macro-crate" ,rust-proc-macro-crate-3) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-glib" ,rust-glib-0.19) + ("rust-trybuild2" ,rust-trybuild2-1)))) + (native-inputs (list pkg-config)) + (inputs (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GLib library, proc macros crate") + (description + "This package provides Rust bindings for the GLib library, proc macros crate.") + (license license:expat))) + (define-public rust-glib-macros-0.18 (package + (inherit rust-glib-macros-0.19) (name "rust-glib-macros") (version "0.18.5") (source @@ -1807,7 +1836,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1p5cla53fcp195zp0hkqpmnn7iwmkdswhy7xh34002bw8y7j5c0b")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4) @@ -1819,13 +1847,7 @@ #:cargo-development-inputs (("rust-glib" ,rust-glib-0.18) ("rust-once-cell" ,rust-once-cell-1) - ("rust-trybuild2" ,rust-trybuild2-1)))) - (native-inputs (list pkg-config)) - (inputs (list glib)) - (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-trybuild2" ,rust-trybuild2-1)))))) (define-public rust-glib-macros-0.17 (package -- cgit v1.2.3 From 1ae35ea08cd8a4c7b88bb086bd4c731560b5dded Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:12:15 +0300 Subject: gnu: Add rust-glib-sys-0.19. * gnu/packages/crates-gtk.scm (rust-glib-sys-0.19): New variable. (rust-glib-sys-0.18): Inherit from rust-glib-sys-0.19. Change-Id: Ia3a63311b85e98459a5c528a8578cc0cd5e41ecc --- gnu/packages/crates-gtk.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index f0ec651882..552b13d785 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1948,8 +1948,36 @@ ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-glib-sys-0.19 + (package + (name "rust-glib-sys") + (version "0.19.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19f4q8x77vd7c1d9ikw492yskq5kpd7k04qb8xnh1c427a6w2baw")))) + (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.18 (package + (inherit rust-glib-sys-0.19) (name "rust-glib-sys") (version "0.18.1") (source @@ -1959,7 +1987,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "164qhsfmlzd5mhyxs8123jzbdfldwxbikfpq5cysj3lddbmy4g06")))) - (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. @@ -1969,13 +1996,7 @@ ("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))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-glib-sys-0.17 (package -- cgit v1.2.3 From 3f51f27360cf75708962854031d05d7eefd198f7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:12:43 +0300 Subject: gnu: Add rust-gobject-sys-0.19. * gnu/packages/crates-gtk.scm (rust-gobject-sys-0.19): New variable. (rust-gobject-sys-0.18): Inherit from rust-gobject-sys-0.19. Change-Id: I3808d54539fc7910d6c867d71d917c3248b2ac44 --- gnu/packages/crates-gtk.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 552b13d785..e87f377ce5 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -2101,8 +2101,34 @@ (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-gobject-sys-0.19 + (package + (name "rust-gobject-sys") + (version "0.19.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "gobject-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17lb7dfbpcg8zchwlfbc08kckwf0a7d9n5ly3pyic13f5ljpws9f")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19) + ("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 libgobject-2.0") + (description "This package provides FFI bindings to libgobject-2.0.") + (license license:expat))) + (define-public rust-gobject-sys-0.18 (package + (inherit rust-gobject-sys-0.19) (name "rust-gobject-sys") (version "0.18.0") (source @@ -2112,7 +2138,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0i6fhp3m6vs3wkzyc22rk2cqj68qvgddxmpaai34l72da5xi4l08")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; `G_TYPE_FUNDAMENTAL_MAX` constant mismatch with gcc #:cargo-inputs @@ -2121,13 +2146,7 @@ ("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 libgobject-2.0") - (description "This package provides FFI bindings to libgobject-2.0.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-gobject-sys-0.17 (package -- cgit v1.2.3 From 75d4f9b42d63b38832d4b9b3b4650eee1fd1ea18 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:13:11 +0300 Subject: gnu: Add rust-pango-0.19. * gnu/packages/crates-gtk.scm (rust-pango-0.19): New variable. (rust-pango-0.18): Inherit from rust-pango-0.19. Change-Id: I7b40efe5cba2cd11e810a55b3a8be3fc41182d13 --- gnu/packages/crates-gtk.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index e87f377ce5..44e86ecc90 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -3015,24 +3015,23 @@ library.") (description "FFI bindings for libadwaita.") (license license:expat))) -(define-public rust-pango-0.18 +(define-public rust-pango-0.19 (package (name "rust-pango") - (version "0.18.3") + (version "0.19.8") (source (origin (method url-fetch) (uri (crate-uri "pango" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1r5ygq7036sv7w32kp8yxr6vgggd54iaavh3yckanmq4xg0px8kw")))) + (base32 "1kffxkk7730csly86fkgja50k1184zj9lz49sv7qb0059233439z")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-gio" ,rust-gio-0.18) - ("rust-glib" ,rust-glib-0.18) + `(#:cargo-inputs (("rust-gio" ,rust-gio-0.19) + ("rust-glib" ,rust-glib-0.19) ("rust-libc" ,rust-libc-0.2) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-pango-sys" ,rust-pango-sys-0.18)) + ("rust-pango-sys" ,rust-pango-sys-0.19)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (native-inputs (list pkg-config)) @@ -3042,6 +3041,27 @@ library.") (description "This package provides Rust bindings for the Pango library.") (license license:expat))) +(define-public rust-pango-0.18 + (package + (inherit rust-pango-0.19) + (name "rust-pango") + (version "0.18.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1r5ygq7036sv7w32kp8yxr6vgggd54iaavh3yckanmq4xg0px8kw")))) + (arguments + `(#:cargo-inputs (("rust-gio" ,rust-gio-0.18) + ("rust-glib" ,rust-glib-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pango-sys" ,rust-pango-sys-0.18)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-pango-0.17 (package (inherit rust-pango-0.18) -- cgit v1.2.3 From 613f19a7965701c7c841480e1e4ab3a80c698739 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:13:39 +0300 Subject: gnu: Add rust-pango-sys-0.19. * gnu/packages/crates-gtk.scm (rust-pango-sys-0.19): New variable. (rust-pango-sys-0.18): Inherit from rust-pango-sys-0.19. Change-Id: Iaef61eb803c869aa0283b5157d0f140ebcfa86a6 --- gnu/packages/crates-gtk.scm | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 44e86ecc90..9e41ffc774 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -3189,21 +3189,21 @@ library.") #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-pango-sys-0.18 +(define-public rust-pango-sys-0.19 (package (name "rust-pango-sys") - (version "0.18.0") + (version "0.19.8") (source (origin (method url-fetch) (uri (crate-uri "pango-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1iaxalcaaj59cl9n10svh4g50v8jrc1a36kd7n9yahx8j7ikfrs3")))) + (base32 "182bcd6255v5yvnskbhxnb6kwak240z7sn54si2b5h46l17xl0zz")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18) - ("rust-gobject-sys" ,rust-gobject-sys-0.18) + `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.19) + ("rust-gobject-sys" ,rust-gobject-sys-0.19) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) @@ -3215,6 +3215,26 @@ library.") (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) +(define-public rust-pango-sys-0.18 + (package + (inherit rust-pango-sys-0.19) + (name "rust-pango-sys") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1iaxalcaaj59cl9n10svh4g50v8jrc1a36kd7n9yahx8j7ikfrs3")))) + (arguments + `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.18) + ("rust-gobject-sys" ,rust-gobject-sys-0.18) + ("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)))))) + (define-public rust-pango-sys-0.17 (package (inherit rust-pango-sys-0.18) -- cgit v1.2.3 From 8ba0757a0aa6c46a8ecf25487af410399844d4ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:14:07 +0300 Subject: gnu: Add rust-pangocairo-0.19. * gnu/packages/crates-gtk.scm (rust-pangocairo-0.19): New variable. (rust-pangocairo-0.18): Inherit from rust-pangocairo-0.19. Change-Id: I267254c56333c682063508c0f123563cc1aab537 --- gnu/packages/crates-gtk.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 9e41ffc774..9a1b407ff0 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -3343,24 +3343,24 @@ library.") (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-pangocairo-0.18 +(define-public rust-pangocairo-0.19 (package (name "rust-pangocairo") - (version "0.18.0") + (version "0.19.8") (source (origin (method url-fetch) (uri (crate-uri "pangocairo" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "199qdgw5mf1vbqmslscy1qzz0szw2dcd21p6z61wzjngm64na0sp")))) + (base32 "1n8wrqy260zpfiifb2n10mbsv3kbrvxm1z7pv8b4w77c08yb9j74")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18) - ("rust-glib" ,rust-glib-0.18) + `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.19) + ("rust-glib" ,rust-glib-0.19) ("rust-libc" ,rust-libc-0.2) - ("rust-pango" ,rust-pango-0.18) - ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.18)) + ("rust-pango" ,rust-pango-0.19) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.19)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (native-inputs (list pkg-config)) @@ -3371,6 +3371,27 @@ library.") "This package provides Rust bindings for the @code{PangoCairo} library.") (license license:expat))) +(define-public rust-pangocairo-0.18 + (package + (inherit rust-pangocairo-0.19) + (name "rust-pangocairo") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "199qdgw5mf1vbqmslscy1qzz0szw2dcd21p6z61wzjngm64na0sp")))) + (arguments + `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18) + ("rust-glib" ,rust-glib-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.18) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.18)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-pangocairo-0.17 (package (inherit rust-pangocairo-0.18) -- cgit v1.2.3 From 4bc7a397079ccc83601797f84a33870991688456 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:14:34 +0300 Subject: gnu: Add rust-pangocairo-sys-0.19. * gnu/packages/crates-gtk.scm (rust-pangocairo-sys-0.19): New variable. (rust-pangocairo-sys-0.18): Inherit from rust-pangocairo-sys-0.19. Change-Id: I7fba4929c677a4b3b35e7404a25e6d097d844679 --- gnu/packages/crates-gtk.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 9a1b407ff0..b46b0945b0 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -3443,23 +3443,23 @@ library.") #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-pangocairo-sys-0.18 +(define-public rust-pangocairo-sys-0.19 (package (name "rust-pangocairo-sys") - (version "0.18.0") + (version "0.19.8") (source (origin (method url-fetch) (uri (crate-uri "pangocairo-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0cw82261ixgr9xw549rx11w74h0wz4lw0pqxxir7lzm3fvv8yg7w")))) + (base32 "1myq3p8qrd63nlacd4sba66c17lfqgvzv8mpyn2rg1rqhi4h86ar")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18) - ("rust-glib-sys" ,rust-glib-sys-0.18) + `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.19) + ("rust-glib-sys" ,rust-glib-sys-0.19) ("rust-libc" ,rust-libc-0.2) - ("rust-pango-sys" ,rust-pango-sys-0.18) + ("rust-pango-sys" ,rust-pango-sys-0.19) ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) ("rust-tempfile" ,rust-tempfile-3)))) @@ -3468,10 +3468,31 @@ library.") ;; 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") + (synopsis "FFI bindings to PangoCairo") (description "This package provides FFI bindings to @code{PangoCairo}.") (license license:expat))) +(define-public rust-pangocairo-sys-0.18 + (package + (inherit rust-pangocairo-sys-0.19) + (name "rust-pangocairo-sys") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cw82261ixgr9xw549rx11w74h0wz4lw0pqxxir7lzm3fvv8yg7w")))) + (arguments + `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18) + ("rust-glib-sys" ,rust-glib-sys-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.18) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-pangocairo-sys-0.17 (package (inherit rust-pangocairo-sys-0.18) -- cgit v1.2.3 From a691ba25fbe4d0b668ae35c72ea26a416d200b67 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:35:50 +0300 Subject: gnu: Add rust-freetype-rs-0.35. * gnu/packages/crates-io.scm (rust-freetype-rs-0.35): New variable. (rust-freetype-rs-0.32): Inherit from rust-freetype-rs-0.35. Change-Id: I43d96b8daa51bf837f7b26ed4a895a12a6b5ae3e --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f7d5f05850..44d90488f4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27776,23 +27776,22 @@ values to other threads.") (description "This package provides bindings for Freetype used by Servo.") (license (list license:asl2.0 license:expat)))) -(define-public rust-freetype-rs-0.32 +(define-public rust-freetype-rs-0.35 (package (name "rust-freetype-rs") - (version "0.32.0") + (version "0.35.0") (source (origin (method url-fetch) (uri (crate-uri "freetype-rs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1q54jimjgzwdb3xsp7rsvdmp6w54cak7bvc379mdabc2ciz3776m")))) + (base32 "1gzfb9fax3d3s691ys99nfihpzwl7hacvxnwvlxg4sph1fzd5ymi")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-freetype-sys" ,rust-freetype-sys-0.17) - ("rust-libc" ,rust-libc-0.2)) + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-freetype-sys" ,rust-freetype-sys-0.20) + ("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs (("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) (inputs @@ -27802,6 +27801,26 @@ values to other threads.") (description "This package provides bindings for FreeType font library.") (license license:expat))) +(define-public rust-freetype-rs-0.32 + (package + (inherit rust-freetype-rs-0.35) + (name "rust-freetype-rs") + (version "0.32.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1q54jimjgzwdb3xsp7rsvdmp6w54cak7bvc379mdabc2ciz3776m")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-freetype-sys" ,rust-freetype-sys-0.17) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))))) + (define-public rust-freetype-rs-0.26 (package (inherit rust-freetype-rs-0.32) -- cgit v1.2.3 From 4dea75afc7ec6d29165dcb80de89dae48a4b36ab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:36:32 +0300 Subject: gnu: Add rust-freetype-sys-0.20. * gnu/packages/crates-io.scm (rust-freetype-sys-0.20): New variable. (rust-freetype-sys-0.17): Inherit from rust-freetype-sys-0.20. Change-Id: Ia028c4e411a2d1c09bb59f9429cd97b98c96eb6b --- gnu/packages/crates-io.scm | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 44d90488f4..c2f81ea760 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27840,25 +27840,22 @@ values to other threads.") ("rust-freetype-sys" ,rust-freetype-sys-0.13) ("rust-libc" ,rust-libc-0.2)))))) -(define-public rust-freetype-sys-0.17 +(define-public rust-freetype-sys-0.20 (package (name "rust-freetype-sys") - (version "0.17.0") + (version "0.20.1") (source (origin (method url-fetch) (uri (crate-uri "freetype-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "127z6hbsfhsw0fg110zy9s65fzald0cvwbxmhk1vxmmsdk54hcb4")) + (base32 "0d5iiv95ap3lwy7b0hxbc8caa9ng1fg3wlwrvb7rld39jrdxqzhf")) (snippet #~(begin (use-modules (guix build utils)) (delete-file-recursively "freetype2") ;; Inspired by Debian's patch for bzip2-sys. - (substitute* "Cargo.toml.orig" - (("cc = .*") "pkg-config = \"0.3\"\n")) - (copy-file "Cargo.toml.orig" "Cargo.toml") (delete-file "build.rs") (with-output-to-file "build.rs" (lambda _ @@ -27867,9 +27864,9 @@ values to other threads.") }~%"))))))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-pkg-config" ,rust-pkg-config-0.3)))) + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) (inputs (list freetype)) (home-page "https://github.com/PistonDevelopers/freetype-sys") @@ -27878,6 +27875,37 @@ values to other threads.") "This package provides low level binding for FreeType font library.") (license license:expat))) +(define-public rust-freetype-sys-0.17 + (package + (inherit rust-freetype-sys-0.20) + (name "rust-freetype-sys") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "127z6hbsfhsw0fg110zy9s65fzald0cvwbxmhk1vxmmsdk54hcb4")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "freetype2") + ;; Inspired by Debian's patch for bzip2-sys. + (substitute* "Cargo.toml.orig" + (("cc = .*") "pkg-config = \"0.3\"\n")) + (copy-file "Cargo.toml.orig" "Cargo.toml") + (delete-file "build.rs") + (with-output-to-file "build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=freetype\");~@ + }~%"))))))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) + (define-public rust-freetype-sys-0.13 (package (inherit rust-freetype-sys-0.17) -- cgit v1.2.3 From dc5ebbd291bff260cbed010d3d748e3692cba648 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Sep 2024 14:37:07 +0300 Subject: gnu: Add rust-lopdf-0.32. * gnu/packages/crates-io.scm (rust-lopdf-0.32): New variable. (rust-lopdf-0.31): Inherit from rust-lopdf-0.32. Change-Id: I3968ce7183369575153fc500650f0d43fa34e643 --- gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c2f81ea760..e09f3b2c13 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40417,17 +40417,17 @@ explosion.") image together with its neighboring pixels.") (license license:expat))) -(define-public rust-lopdf-0.31 +(define-public rust-lopdf-0.32 (package (name "rust-lopdf") - (version "0.31.0") + (version "0.32.0") (source (origin (method url-fetch) (uri (crate-uri "lopdf" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0npqs454hz7z8ycldyi154fxmra0vkmp5xbjbzm346sb32vf3j07")))) + (base32 "0aw7diz39z3mk22k0mp7jk7qiaaagfvggzly1baqg2jf4vpf8xg7")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) @@ -40455,6 +40455,39 @@ image together with its neighboring pixels.") "This package provides a Rust library for PDF document manipulation.") (license license:expat))) +(define-public rust-lopdf-0.31 + (package + (inherit rust-lopdf-0.32) + (name "rust-lopdf") + (version "0.31.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lopdf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0npqs454hz7z8ycldyi154fxmra0vkmp5xbjbzm346sb32vf3j07")))) + (arguments + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-flate2