guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: reprotest: Improve package style


From: guix-commits
Subject: 02/02: gnu: reprotest: Improve package style
Date: Wed, 27 Nov 2024 16:26:27 -0500 (EST)

sharlatan pushed a commit to branch python-team
in repository guix.

commit cf6a849f1b6bb38dc2fa9904f8c213cb7ddfff3e
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Wed Nov 27 20:42:09 2024 +0000

    gnu: reprotest: Improve package style
    
    * gnu/packages/diffoscope.scm (reprotest): Improve package style, adjust
    fields order.
    [build-system]: Swap to pyproject-build-system.
    [inputs]: Remove python-debian, python-distro, python-libarchive-c, and
    python-rstr.
    [propagated-inputs]: Add python-debian, python-distro,
    python-libarchive-c, and python-rstr.
    [native-inputs]: Remove python-coverage and python-tox, add
    python-setuptools and python-wheel.
    
    Change-Id: Ia99f4a512c543bde2d9e4caba7dfecee2c05701e
---
 gnu/packages/diffoscope.scm | 49 +++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 04e4ca2dc4..f2cb37f4e9 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -53,6 +53,7 @@
   #:use-module (gnu packages patchutils)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
@@ -65,6 +66,7 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages web)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -263,36 +265,43 @@ install.")
        (file-name (git-file-name name version))
        (sha256
         (base32 "06jm82w05qsx3wskch3fm5mpkpj5jmq7r4yram4ixprxc5j8flg8"))))
-    (inputs
-     (list python-debian python-distro python-libarchive-c python-rstr))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      ;; TODO: all tests failed during creation: PermissionError: [Errno 13]
+      ;; Permission denied.
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-doc
+            (lambda _
+              (let* ((mandir1 (string-append
+                               #$output "/share/man/man1"))
+                     (docdir (string-append
+                              #$output "/share/doc/" #$name "-" #$version)))
+                (invoke "make" "-C" "doc")
+                (mkdir-p mandir1)
+                (install-file "doc/reprotest.1" mandir1)
+                (mkdir-p docdir)
+                (install-file "./README.rst" docdir)
+                (install-file "./README-dev.rst" docdir)))))))
     (native-inputs
      (list diffoscope
            help2man
            libfaketime
-           python-coverage
            python-docutils
            python-magic
            python-pytest
+           python-setuptools
            python-tlsh
-           python-tox
+           python-wheel
            unzip
            xxd))
-    (build-system python-build-system)
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'install 'install-doc
-                 (lambda _
-                   (let* ((mandir1 (string-append
-                                    #$output "/share/man/man1"))
-                          (docdir (string-append
-                                   #$output "/share/doc/" #$name "-" 
#$version)))
-                     (invoke "make" "-C" "doc")
-                     (mkdir-p mandir1)
-                     (install-file "doc/reprotest.1" mandir1)
-                     (mkdir-p docdir)
-                     (install-file "./README.rst" docdir)
-                     (install-file "./README-dev.rst" docdir)))))))
+    (propagated-inputs
+     (list python-debian
+           python-distro
+           python-libarchive-c
+           python-rstr))
     (home-page "https://salsa.debian.org/reproducible-builds/reprotest";)
     (synopsis "Build software and check it for reproducibility")
     (description "Reprotest builds the same source code twice in different



reply via email to

[Prev in Thread] Current Thread [Next in Thread]