[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/10: gnu: python-debian: Patch using snippet. Drop workaround.
From: |
guix-commits |
Subject: |
05/10: gnu: python-debian: Patch using snippet. Drop workaround. |
Date: |
Mon, 3 Apr 2023 12:56:58 -0400 (EDT) |
ngz pushed a commit to branch master
in repository guix.
commit b302794f17e7c142f87bbcfec03cafa54bee5096
Author: Bruno Victal <mirai@makinata.eu>
AuthorDate: Tue Mar 14 18:27:06 2023 +0000
gnu: python-debian: Patch using snippet. Drop workaround.
* gnu/packages/python-xyz.scm (python-debian)
[source]: Prefer patching using snippet to modify-phases.
[arguments]: Remove, logic was moved into source.
[description]: Drop obsolete workaround.
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
---
gnu/packages/python-xyz.scm | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 659d8ea3ff..f034dc03f8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13880,34 +13880,29 @@ Python.")
(file-name (git-file-name name version))
(sha256
(base32
- "0qy6x28bj6yfikhjww932v5xq4mf5bm1iczl7acy4c7zm6mwhqfa"))))
+ "0qy6x28bj6yfikhjww932v5xq4mf5bm1iczl7acy4c7zm6mwhqfa"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; python-apt, apt and dpkg are not yet available in guix,
+ ;; and these tests heavily depend on them.
+ (for-each delete-file
+ '("lib/debian/tests/test_deb822.py"
+ "lib/debian/tests/test_debfile.py"))
+
+ ;; for reproducible builds, otherwise python-debian
+ ;; generates a _version.py including the date
+ (copy-file "lib/debian/_version.py.in" "lib/debian/_version.py")
+ (substitute* "lib/debian/_version.py"
+ (("__CHANGELOG_VERSION__") #$version))))))
(build-system python-build-system)
- (arguments
- `(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'set-version
- ;; for reproducible builds, otherwise python-debian
- ;; generates a _version.py including the date
- (lambda _
- (copy-file "lib/debian/_version.py.in"
"lib/debian/_version.py")
- (substitute* "lib/debian/_version.py"
- (("__CHANGELOG_VERSION__") ,version))))
- (add-after 'unpack 'remove-debian-specific-tests
- ;; python-apt, apt and dpkg are not yet available in guix,
- ;; and these tests heavily depend on them.
- (lambda _
- (delete-file "lib/debian/tests/test_deb822.py")
- (delete-file "lib/debian/tests/test_debfile.py")
- #t)))))
(propagated-inputs
(list python-six python-chardet))
(synopsis "Debian package related modules")
(description
- ;; XXX: Use @enumerate instead of @itemize to work around
- ;; <http://bugs.gnu.org/21772>.
"This package provides Python modules that abstract many formats of
Debian-related files, such as:
-
-@enumerate
+@itemize
@item Debtags information;
@item @file{debian/changelog} files;
@item packages files, pdiffs;
@@ -13915,8 +13910,7 @@ Debian-related files, such as:
@file{debian/control}, @file{.changes}, @file{.dsc};
@item Raw @file{.deb} and @file{.ar} files, with (read-only) access to
contained files and meta-information.
-@end enumerate\n")
-
+@end itemize")
;; Modules are either GPLv2+ or GPLv3+.
(license license:gpl3+)))
- branch master updated (86d580c82f -> f3424ada31), guix-commits, 2023/04/03
- 02/10: gnu: emacs-org: Update to 9.6.3., guix-commits, 2023/04/03
- 01/10: gnu: emacs-eldoc: Update to 1.14.0., guix-commits, 2023/04/03
- 03/10: gnu: emacs-eshell-syntax-highlighting: Update to 0.4., guix-commits, 2023/04/03
- 05/10: gnu: python-debian: Patch using snippet. Drop workaround.,
guix-commits <=
- 07/10: gnu: python-boolean.py: Update to 4.0., guix-commits, 2023/04/03
- 08/10: gnu: python-license-expression: Update to 30.1.0., guix-commits, 2023/04/03
- 04/10: gnu: emacs-julia-snail: Update to 1.2.0., guix-commits, 2023/04/03
- 10/10: gnu: emacs-eat: Update to 0.7., guix-commits, 2023/04/03
- 09/10: gnu: reuse: Update to 1.1.2., guix-commits, 2023/04/03
- 06/10: gnu: python-debian: Update to 0.1.49., guix-commits, 2023/04/03