diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-13 16:11:14 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-13 16:11:14 +0100 |
| commit | 622df12ef389c9e91f68ae10c54c043f34828c83 (patch) | |
| tree | 888542636c0717727d52a4cd56d42338601e661a /gnu/packages/patool.scm | |
| parent | 952c691b51f8f5d56df69686c2785414709c7949 (diff) | |
| parent | 8a0910e042ad1670435613e06458a6fb2c4131c4 (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/patool.scm')
| -rw-r--r-- | gnu/packages/patool.scm | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/gnu/packages/patool.scm b/gnu/packages/patool.scm index 31dfd994b16..6d71c3c4727 100644 --- a/gnu/packages/patool.scm +++ b/gnu/packages/patool.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +21,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages cdrom) @@ -35,7 +36,7 @@ (define-public patool (package (name "patool") - (version "1.12") + (version "2.1.1") (source (origin (method git-fetch) ;no test data in PyPI archive @@ -45,14 +46,20 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0zgvgx9549rvb57rgkpjalydz46k71gibfs6ab3b3sy439s0ay4h")))) - (build-system python-build-system) + "09il0gq1xxlism30hx1aa06alz1xhrnhhwcjzx1znical0bp3q1r")))) + (build-system pyproject-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest"))))))) + (list + #:test-flags + '(list "-k" (string-append + ;; Disable failing tests. + "not test_mime_file_compress" + " and not test_mime_file_gzip" + " and not test_mime_file_lzip" + " and not test_bsdtar_gz_file" + " and not test_py_tarfile_gz_file" + " and not test_tar_gz_file" + " and not test_tar_lzip_file")))) (native-inputs (list bzip2 cabextract |