diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-07-24 22:17:20 +0100 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-07-24 22:57:09 +0100 |
| commit | 1fd7e91fc0becb9eb2a148ac650e49a139602542 (patch) | |
| tree | 7e4d147600f40a611b4c37519eea2d024eae4afb /gnu | |
| parent | 8bb31723b92c530c3edcbb9f83169957c9ce8bbf (diff) | |
gnu: breezy: Update to 3.3.22, fix build.
* gnu/packages/version-control.scm (breezy): Update to 3.3.22.
[phases]{check}: Skip 3 more tests requiring networking.
[native-inputs]: Remove python-wheel.
[inputs]: Remove python-tzlocal; add python-subunit.
* gnu/packages/rust-crates.scm: (rust-quote-1.0.47,
rust-proc-macro2-1.0.107, rust-portable-atomic-1.14.0,
rust-libc-0.2.189): New variables.
(lookup-cargo-inputs): Refresh inputs for breezy.
Relates-to: guix/guix#10098
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/rust-crates.scm | 34 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 32 |
2 files changed, 45 insertions, 21 deletions
diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm index 86acab3ece0..d83832e1215 100644 --- a/gnu/packages/rust-crates.scm +++ b/gnu/packages/rust-crates.scm | |||
| @@ -16902,6 +16902,10 @@ fn main() { | |||
| 16902 | (crate-source "libc" "0.2.186" | 16902 | (crate-source "libc" "0.2.186" |
| 16903 | "0rnyhzjyqq9x56skkllbjzzzwym3r61lq3l4hqj64v71gw0r3av8")) | 16903 | "0rnyhzjyqq9x56skkllbjzzzwym3r61lq3l4hqj64v71gw0r3av8")) |
| 16904 | 16904 | ||
| 16905 | (define rust-libc-0.2.189 | ||
| 16906 | (crate-source "libc" "0.2.189" | ||
| 16907 | "1whjfs375vlng2q6yrbzs73cvp5lm3w1n2gfqajb2vgf7zg3xbry")) | ||
| 16908 | |||
| 16905 | (define rust-libc-stdhandle-0.1.0 | 16909 | (define rust-libc-stdhandle-0.1.0 |
| 16906 | (crate-source "libc-stdhandle" "0.1.0" | 16910 | (crate-source "libc-stdhandle" "0.1.0" |
| 16907 | "0lbmg42kncl3yjgzx48d2sa3p78w4fmhs9c21dg4r4r8virj9b3d")) | 16911 | "0lbmg42kncl3yjgzx48d2sa3p78w4fmhs9c21dg4r4r8virj9b3d")) |
| @@ -23057,6 +23061,10 @@ fn main() { | |||
| 23057 | (crate-source "portable-atomic" "1.13.1" | 23061 | (crate-source "portable-atomic" "1.13.1" |
| 23058 | "0j8vlar3n5acyigq8q6f4wjx3k3s5yz0rlpqrv76j73gi5qr8fn3")) | 23062 | "0j8vlar3n5acyigq8q6f4wjx3k3s5yz0rlpqrv76j73gi5qr8fn3")) |
| 23059 | 23063 | ||
| 23064 | (define rust-portable-atomic-1.14.0 | ||
| 23065 | (crate-source "portable-atomic" "1.14.0" | ||
| 23066 | "1hyfma9n2cs2ibazpfwrbv61zwg7cv86g0pr5yjkg07qgr4xa81x")) | ||
| 23067 | |||
| 23060 | (define rust-portable-atomic-1.6.0 | 23068 | (define rust-portable-atomic-1.6.0 |
| 23061 | (crate-source "portable-atomic" "1.6.0" | 23069 | (crate-source "portable-atomic" "1.6.0" |
| 23062 | "1h77x9qx7pns0d66vdrmdbmwpi7586h7ysnkdnhrn5mwi2cyyw3i")) | 23070 | "1h77x9qx7pns0d66vdrmdbmwpi7586h7ysnkdnhrn5mwi2cyyw3i")) |
| @@ -23377,6 +23385,10 @@ fn main() { | |||
| 23377 | (crate-source "proc-macro2" "1.0.106" | 23385 | (crate-source "proc-macro2" "1.0.106" |
| 23378 | "0d09nczyaj67x4ihqr5p7gxbkz38gxhk4asc0k8q23g9n85hzl4g")) | 23386 | "0d09nczyaj67x4ihqr5p7gxbkz38gxhk4asc0k8q23g9n85hzl4g")) |
| 23379 | 23387 | ||
| 23388 | (define rust-proc-macro2-1.0.107 | ||
| 23389 | (crate-source "proc-macro2" "1.0.107" | ||
| 23390 | "1nb6ly8kp65f724kj73ippc7lvydss24sm2vagk6qpklpg4pwplq")) | ||
| 23391 | |||
| 23380 | (define rust-proc-macro2-1.0.32 | 23392 | (define rust-proc-macro2-1.0.32 |
| 23381 | (crate-source "proc-macro2" "1.0.32" | 23393 | (crate-source "proc-macro2" "1.0.32" |
| 23382 | "0hqbxlvhiaybakl1gai3mgps1dxsmxricxsr2rfdrh222z0qql5s")) | 23394 | "0hqbxlvhiaybakl1gai3mgps1dxsmxricxsr2rfdrh222z0qql5s")) |
| @@ -24490,6 +24502,10 @@ fn main() { | |||
| 24490 | (crate-source "quote" "1.0.46" | 24502 | (crate-source "quote" "1.0.46" |
| 24491 | "0s034glrlav8nzqy2yskqzv52ncy82k126sm2jk5j1vs1iylbg6z")) | 24503 | "0s034glrlav8nzqy2yskqzv52ncy82k126sm2jk5j1vs1iylbg6z")) |
| 24492 | 24504 | ||
| 24505 | (define rust-quote-1.0.47 | ||
| 24506 | (crate-source "quote" "1.0.47" | ||
| 24507 | "00ch0yyzvv6s671ik0kcsbw8nigdaj2g3fr61kcahwx48aqlvgqz")) | ||
| 24508 | |||
| 24493 | (define rust-quote-use-0.8.4 | 24509 | (define rust-quote-use-0.8.4 |
| 24494 | (crate-source "quote-use" "0.8.4" | 24510 | (crate-source "quote-use" "0.8.4" |
| 24495 | "07ijs29pwsj39hsg3yvmi28zwwdjjvf3diygg1hs75xljw8xn6cn")) | 24511 | "07ijs29pwsj39hsg3yvmi28zwwdjjvf3diygg1hs75xljw8xn6cn")) |
| @@ -43695,21 +43711,21 @@ fn main() { | |||
| 43695 | (list rust-aho-corasick-1.1.4 | 43711 | (list rust-aho-corasick-1.1.4 |
| 43696 | rust-heck-0.5.0 | 43712 | rust-heck-0.5.0 |
| 43697 | rust-lazy-static-1.5.0 | 43713 | rust-lazy-static-1.5.0 |
| 43698 | rust-libc-0.2.186 | 43714 | rust-libc-0.2.189 |
| 43699 | rust-memchr-2.8.0 | 43715 | rust-memchr-2.8.3 |
| 43700 | rust-once-cell-1.21.4 | 43716 | rust-once-cell-1.21.4 |
| 43701 | rust-portable-atomic-1.13.1 | 43717 | rust-portable-atomic-1.14.0 |
| 43702 | rust-proc-macro2-1.0.106 | 43718 | rust-proc-macro2-1.0.107 |
| 43703 | rust-pyo3-0.28.3 | 43719 | rust-pyo3-0.28.3 |
| 43704 | rust-pyo3-build-config-0.28.3 | 43720 | rust-pyo3-build-config-0.28.3 |
| 43705 | rust-pyo3-ffi-0.28.3 | 43721 | rust-pyo3-ffi-0.28.3 |
| 43706 | rust-pyo3-macros-0.28.3 | 43722 | rust-pyo3-macros-0.28.3 |
| 43707 | rust-pyo3-macros-backend-0.28.3 | 43723 | rust-pyo3-macros-backend-0.28.3 |
| 43708 | rust-quote-1.0.45 | 43724 | rust-quote-1.0.47 |
| 43709 | rust-regex-1.12.3 | 43725 | rust-regex-1.13.1 |
| 43710 | rust-regex-automata-0.4.14 | 43726 | rust-regex-automata-0.4.16 |
| 43711 | rust-regex-syntax-0.8.10 | 43727 | rust-regex-syntax-0.8.11 |
| 43712 | rust-syn-2.0.117 | 43728 | rust-syn-2.0.119 |
| 43713 | rust-target-lexicon-0.13.5 | 43729 | rust-target-lexicon-0.13.5 |
| 43714 | rust-unicode-ident-1.0.24)) | 43730 | rust-unicode-ident-1.0.24)) |
| 43715 | (bzmenu => | 43731 | (bzmenu => |
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index f406971c89c..cc5ca68e1e8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | ;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se> | 61 | ;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se> |
| 62 | ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu> | 62 | ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu> |
| 63 | ;;; Copyright © 2024 Herman Rimm <herman@rimm.ee> | 63 | ;;; Copyright © 2024 Herman Rimm <herman@rimm.ee> |
| 64 | ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> | 64 | ;;; Copyright © 2024, 2026 Sharlatan Hellseher <sharlatanus@gmail.com> |
| 65 | ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> | 65 | ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> |
| 66 | ;;; Copyright © 2025 Dariqq <dariqq@posteo.net> | 66 | ;;; Copyright © 2025 Dariqq <dariqq@posteo.net> |
| 67 | ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> | 67 | ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> |
| @@ -193,7 +193,7 @@ | |||
| 193 | (define-public breezy | 193 | (define-public breezy |
| 194 | (package | 194 | (package |
| 195 | (name "breezy") | 195 | (name "breezy") |
| 196 | (version "3.3.21") | 196 | (version "3.3.22") |
| 197 | (source | 197 | (source |
| 198 | (origin | 198 | (origin |
| 199 | (method git-fetch) | 199 | (method git-fetch) |
| @@ -202,7 +202,7 @@ | |||
| 202 | (commit (string-append "brz-" version)))) | 202 | (commit (string-append "brz-" version)))) |
| 203 | (file-name (git-file-name name version)) | 203 | (file-name (git-file-name name version)) |
| 204 | (sha256 | 204 | (sha256 |
| 205 | (base32 "136fnvda27pm3y123x8mg955kxbjhk5qrygf2h0pjjm28la0gijb")))) | 205 | (base32 "05xrwn8i8djrd2n9bwcas0y3sy51im8klw1w8ykvg3qhcnl4qlcg")))) |
| 206 | (build-system pyproject-build-system) | 206 | (build-system pyproject-build-system) |
| 207 | (arguments | 207 | (arguments |
| 208 | (list | 208 | (list |
| @@ -255,6 +255,7 @@ | |||
| 255 | (call-with-output-file (string-append man1 "/bzr.1") | 255 | (call-with-output-file (string-append man1 "/bzr.1") |
| 256 | (lambda (port) | 256 | (lambda (port) |
| 257 | (format port ".so man1/brz.1")))))) | 257 | (format port ".so man1/brz.1")))))) |
| 258 | ;; tests: passed 33237 tests, 4393 tests skipped | ||
| 258 | (replace 'check | 259 | (replace 'check |
| 259 | (lambda* (#:key tests? #:allow-other-keys) | 260 | (lambda* (#:key tests? #:allow-other-keys) |
| 260 | (when tests? | 261 | (when tests? |
| @@ -275,7 +276,11 @@ | |||
| 275 | "-x" "breezy.tests.test_plugins.TestPlugins.test_plugin_get_path_pyc_only" | 276 | "-x" "breezy.tests.test_plugins.TestPlugins.test_plugin_get_path_pyc_only" |
| 276 | "-x" "breezy.tests.test_selftest.TestActuallyStartBzrSubprocess.test_start_and_stop_bzr_subprocess_send_signal" | 277 | "-x" "breezy.tests.test_selftest.TestActuallyStartBzrSubprocess.test_start_and_stop_bzr_subprocess_send_signal" |
| 277 | ;; AttributeError: module 'paramiko' has no attribute 'DSSKey' | 278 | ;; AttributeError: module 'paramiko' has no attribute 'DSSKey' |
| 278 | "-x" "breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh"))))))) | 279 | "-x" "breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh" |
| 280 | ;; Network access is required | ||
| 281 | "-x" "breezy.git.tests.test_server.TestPlainFetch.test_fetch_from_native_git" | ||
| 282 | "-x" "breezy.git.tests.test_server.TestPlainFetch.test_fetch_from_non_git" | ||
| 283 | "-x" "breezy.git.tests.test_server.TestPlainFetch.test_fetch_nothin"))))))) | ||
| 279 | (native-inputs | 284 | (native-inputs |
| 280 | (append | 285 | (append |
| 281 | (list gettext-minimal | 286 | (list gettext-minimal |
| @@ -284,7 +289,6 @@ | |||
| 284 | python-setuptools-gettext | 289 | python-setuptools-gettext |
| 285 | python-setuptools-rust | 290 | python-setuptools-rust |
| 286 | python-tomli | 291 | python-tomli |
| 287 | python-wheel | ||
| 288 | rust | 292 | rust |
| 289 | `(,rust "cargo") | 293 | `(,rust "cargo") |
| 290 | ;; tests | 294 | ;; tests |
| @@ -295,19 +299,23 @@ | |||
| 295 | (or (and=> (%current-target-system) | 299 | (or (and=> (%current-target-system) |
| 296 | (compose list make-rust-sysroot)) | 300 | (compose list make-rust-sysroot)) |
| 297 | '()))) | 301 | '()))) |
| 298 | (inputs (cons* python-configobj | 302 | (inputs (cons* python-catalogus |
| 303 | python-configobj | ||
| 299 | python-dulwich | 304 | python-dulwich |
| 300 | python-fastbencode | 305 | python-fastbencode |
| 301 | python-fastimport | ||
| 302 | python-launchpadlib | ||
| 303 | python-merge3 | 306 | python-merge3 |
| 304 | python-paramiko | ||
| 305 | python-gpg | ||
| 306 | python-patiencediff | 307 | python-patiencediff |
| 307 | python-pygithub | ||
| 308 | python-pyyaml | 308 | python-pyyaml |
| 309 | python-tzlocal | ||
| 310 | python-urllib3 | 309 | python-urllib3 |
| 310 | python-vcsgraph | ||
| 311 | ;; [optional] | ||
| 312 | python-fastimport | ||
| 313 | python-gpg | ||
| 314 | python-launchpadlib | ||
| 315 | python-paramiko | ||
| 316 | python-pygithub | ||
| 317 | python-subunit | ||
| 318 | |||
| 311 | (cargo-inputs 'breezy))) | 319 | (cargo-inputs 'breezy))) |
| 312 | (home-page "https://www.breezy-vcs.org/") | 320 | (home-page "https://www.breezy-vcs.org/") |
| 313 | (synopsis "Decentralized revision control system") | 321 | (synopsis "Decentralized revision control system") |
