diff options
| author | Efraim Flashner <[email protected]> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/parallel.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/parallel.scm')
| -rw-r--r-- | gnu/packages/parallel.scm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 9503b1df83..853fdaaa5f 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages check) + #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages freeipmi) #:use-module (gnu packages linux) @@ -63,20 +64,25 @@ (define-public parallel (package (name "parallel") - (version "20220822") + (version "20221222") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "05mh3bbl7c9c945jqhlfspjqji79zq8ml27k6ihaqi8bqibl83cx")) + (base32 "0zsrz25yyhkvrkvlblmgrqhcyr9zavflknz3nhql9a8qxixhraad")) (snippet '(begin (use-modules (guix build utils)) ;; Delete pre-generated manpages and documents. - ;; TODO: Add pod2pdf for pdfs, generate rst files. - (for-each delete-file (find-files "src" "\\.(1|7|html)$")))))) + ;; TODO: generate rst files. + ;; parallel_cheat_bw.pdf uses libreoffice to be generated. + (rename-file "src/parallel_cheat_bw.pdf" + "src/parallel_cheat_bw.pdf-keep") + (for-each delete-file (find-files "src" "\\.(1|7|html|pdf)$")) + (rename-file "src/parallel_cheat_bw.pdf-keep" + "src/parallel_cheat_bw.pdf"))))) (build-system gnu-build-system) (arguments `(#:phases @@ -111,7 +117,7 @@ "echo" ":::" "1" "2" "3")))))) (native-inputs - (list perl)) + (list perl pod2pdf)) (inputs (list bash-minimal perl procps)) (home-page "https://www.gnu.org/software/parallel/") |