[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
47/244: gnu: python-debian: Patch using snippet. Drop workaround.
From: |
guix-commits |
Subject: |
47/244: gnu: python-debian: Patch using snippet. Drop workaround. |
Date: |
Wed, 12 Apr 2023 08:47:17 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 95e3386c4f9dae7f676804cb4d63757f562d31e6
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 3418af714e..e99273e884 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+)))
- 39/244: gnu: drawing: Update to 1.0.2., (continued)
- 39/244: gnu: drawing: Update to 1.0.2., guix-commits, 2023/04/12
- 42/244: gnu: genie: Update to 1170., guix-commits, 2023/04/12
- 45/244: gnu: emacs-eshell-syntax-highlighting: Update to 0.4., guix-commits, 2023/04/12
- 25/244: gnu: Add pdpmake., guix-commits, 2023/04/12
- 27/244: gnu: emacs-jit-spell: Update to 0.3., guix-commits, 2023/04/12
- 28/244: gnu: strawberry: Update to 1.0.17., guix-commits, 2023/04/12
- 29/244: gnu: strawberry: Use gexps and remove input labels., guix-commits, 2023/04/12
- 35/244: gnu: wvkbd: Update to 0.13., guix-commits, 2023/04/12
- 43/244: gnu: emacs-eldoc: Update to 1.14.0., guix-commits, 2023/04/12
- 46/244: gnu: emacs-julia-snail: Update to 1.2.0., guix-commits, 2023/04/12
- 47/244: gnu: python-debian: Patch using snippet. Drop workaround.,
guix-commits <=
- 50/244: gnu: python-license-expression: Update to 30.1.0., guix-commits, 2023/04/12
- 51/244: gnu: reuse: Update to 1.1.2., guix-commits, 2023/04/12
- 54/244: gnu: python-scikit-rf: Update to 0.26.0., guix-commits, 2023/04/12
- 55/244: gnu: libngspice: Update to 40., guix-commits, 2023/04/12
- 58/244: gnu: mlt: Update to 7.14.0., guix-commits, 2023/04/12
- 59/244: gnu: symengine: Update to 0.10.1., guix-commits, 2023/04/12
- 60/244: gnu: python-symengine: Update to 0.10.0., guix-commits, 2023/04/12
- 61/244: gnu: qelectrotech: Update to 0.9.0., guix-commits, 2023/04/12
- 62/244: gnu: gsequencer: Update to 4.5.0., guix-commits, 2023/04/12
- 64/244: gnu: cl-log4cl: Update to 1.1.4-2.fe3da51., guix-commits, 2023/04/12