From 78f2b7e63365e7800b4a8b5cb8bdb04556c3fe1d Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sun, 16 Nov 2025 18:11:13 +0100 Subject: [PATCH] gnu: breezy: Switch to pyproject. * gnu/packages/version-control.scm (breezy): [build-system]: Switch to pyproject-build-system. [arguments]<#:phases>: Remove phase 'adjust-for-python-3.10. [native-inputs]: Add python-setuptools. [description]: Fix typo. Fixes: guix/guix#4325 Change-Id: I801065b345892b14451dd445c88d991d622170a0 Signed-off-by: Sharlatan Hellseher --- gnu/packages/version-control.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a00fb3800a403400e4a73002a17bef77df5cf9b4..b8f6de7bf0362cd1a056787ac123beea274f3388 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -200,16 +200,16 @@ (sha256 (base32 "0fxv7ca6qbrj6bvrbfgjrd9ldppa8zq8hc461rikh85c5xg9rjqi")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:modules '(((guix build cargo-build-system) #:prefix cargo:) - (guix build python-build-system) + (guix build pyproject-build-system) (guix build utils)) #:imported-modules `(,@%cargo-build-system-modules - ,@%python-build-system-modules) + ,@%pyproject-build-system-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'prepare-cargo-build-system @@ -234,13 +234,6 @@ (lambda _ (setenv "CFLAGS" (string-append "-g -O2 -Wno-error=implicit-function-declaration")))) - (add-before 'build 'adjust-for-python-3.10 - (lambda _ - (substitute* '("breezy/doc_generate/__init__.py" - "breezy/tests/test_selftest.py") - ;; AttributeError: module 'datetime' has no attribute 'UTC' - ;; This only works for python >= 3.11 - (("datetime.UTC") "datetime.timezone.utc")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -301,7 +294,7 @@ "Breezy (@command{brz}) is a decentralized revision control system. By default, Breezy provides support for both the @uref{https://bazaar.canonical.com/, Bazaar} and @uref{https://www.git-scm.com, -Git} file formats. Breezy is backwabrds compatible with Bazaar's disk format +Git} file formats. Breezy is backwards compatible with Bazaar's disk format and protocols. One of the key differences with Bazaar is that Breezy runs on Python 3.3 and later, rather than on Python 2.") (license license:gpl2+)))