From afba93efd43ef58d1c9920f119250c58c5505b87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Jun 2020 18:55:20 +0200 Subject: gnu: diffoscope: Install the man page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/diffoscope.scm (diffoscope)[arguments]: Add ‘build-man-page’ and ‘install-man-page’ phases. [native-inputs]: Add help2man. --- gnu/packages/diffoscope.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f5387f8501..6ccb4fd169 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -132,17 +132,25 @@ (define-public diffoscope (("\\['getfacl',") (string-append "['" (which "getfacl") "',"))) #t)) + (add-after 'build 'build-man-page + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "-C" "doc" make-flags))) (add-before 'check 'writable-test-data (lambda _ - ;; tests may need needs write access to tests - ;; directory + ;; Tests may need write access to tests directory. (for-each make-file-writable (find-files "tests")) #t)) (add-before 'check 'delete-failing-test (lambda _ - ;; this requires /sbin to be on the path + ;; This requires /sbin to be in $PATH. (delete-file "tests/test_tools.py") - #t))))) + #t)) + (add-after 'install 'install-man-page + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man/man1"))) + (install-file "doc/diffoscope.1" man) + #t)))))) (inputs `(("rpm" ,rpm) ;for rpm-python ("python-file" ,python-file) ("python-debian" ,python-debian) @@ -151,14 +159,15 @@ (define-public diffoscope ("acl" ,acl) ;for getfacl ("colordiff" ,colordiff) ("xxd" ,xxd))) - ;; Below are modules used for tests. - (native-inputs `(("python-pytest" ,python-pytest) + (native-inputs `(("help2man" ,help2man) + ;; Below are modules used for tests. + ("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet) ("python-binwalk" ,python-binwalk) ("python-h5py" ,python-h5py) ("python-pypdf2" ,python-pypdf2) ("python-progressbar33" ,python-progressbar33) - ;; test suite skips tests when tool is missing + ;; The test suite skips tests when these are missing. ,@(match (%current-system) ;; ghc is only available on x86 currently. ((or "x86_64-linux" "i686-linux") -- cgit v1.2.3 From ffecb2396fb19f2dd27ac5850dbb8294eb637e55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Jun 2020 19:01:03 +0200 Subject: gnu: diffoscope: Console widowed brackets. * gnu/packages/diffoscope.scm (diffoscope)[native-inputs]: Move closing brackets to the previous line. --- gnu/packages/diffoscope.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 6ccb4fd169..49d0f32bbf 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -180,8 +180,7 @@ (define-public diffoscope ((or "x86_64-linux") `(("enjarify" ,enjarify) ;; no unversioned openjdk available - ("openjdk:jdk" ,openjdk12 "jdk") - )) + ("openjdk:jdk" ,openjdk12 "jdk"))) (_ `())) ("abootimg" ,abootimg) -- cgit v1.2.3 From 394ec7158a20dd96490934076e6e7f6534f4fb49 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 3 Jul 2020 21:47:35 +0000 Subject: gnu: diffoscope: Update to 150. * gnu/packages/diffoscope (diffoscope): Update to 150. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 49d0f32bbf..6c649e1a0e 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") - (version "148") + (version "150") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "0siv5z8iqgkzl51dmv69ifqids6hqmiir00yyl1aaqbginrwyhyv")))) + "0a3hycbbbpadwcck8zc9q3xsjclb36h2nkn95ff39q37966mm5rz")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 607a136a25359b395869c19e3fb78176cb789f6b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 17 Jul 2020 21:12:01 +0000 Subject: gnu: diffoscope: Update to 151. * gnu/packages/diffoscope (diffoscope): Update to 151. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 6c649e1a0e..9480f1f226 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") - (version "150") + (version "151") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "0a3hycbbbpadwcck8zc9q3xsjclb36h2nkn95ff39q37966mm5rz")))) + "1lv44ngqij9dp3xk9jj95w7an7h03iac6b2ifpq33j5fffswa1sm")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3