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

1 files changed, 37 insertions, 25 deletions

diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm
index aaa787c1d9..d219c78d4f 100644
--- a/gnu/packages/moreutils.scm
+++ b/gnu/packages/moreutils.scm
@@ -1,7 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016–2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2022 ( <paren@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,42 +20,40 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages moreutils)
-  #:use-module (guix gexp)
-  #:use-module ((guix licenses) #:prefix l:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix utils)
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages docbook))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
 
 (define-public moreutils
   (package
     (name "moreutils")
     (version "0.67")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://git.joeyh.name/index.cgi/moreutils.git/snapshot/"
-             name "-" version ".tar.gz"))
-       (sha256
-        (base32 "045d2dfvsd4sxxr2i2qvkpgvi912qj9vc4gpc8fb4hr9q912z1q3"))))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://git.joeyh.name/index.cgi/moreutils.git/snapshot/"
+                    name "-" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "045d2dfvsd4sxxr2i2qvkpgvi912qj9vc4gpc8fb4hr9q912z1q3"))))
     (build-system gnu-build-system)
-    ;; For building the manual pages.
-    (native-inputs
-     (list docbook-xml-4.4 docbook-xsl libxml2 libxslt))
-    (inputs
-     (list perl perl-timedate perl-time-duration))
     (arguments
      (list #:phases
            #~(modify-phases %standard-phases
                (add-after 'install 'wrap-program
                  (lambda _
-                   (wrap-program
-                       (string-append #$output "/bin/ts")
-                     `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))
+                   (for-each
+                     (lambda (script)
+                       (wrap-program script
+                         `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))
+                     (find-files (string-append #$output "/bin")))))
                (delete 'configure))     ; no configure script
            #:make-flags
            #~(list (string-append "PREFIX=" #$output)
@@ -64,9 +63,22 @@
                                   #$(package-version (this-package-native-input
                                                       "docbook-xsl")))
                    (string-append "CC=" #$(cc-for-target)))))
+    (inputs
+     (list perl
+           perl-ipc-run
+           perl-timedate
+           perl-time-duration))
+    ;; For building the manual pages.
+    (native-inputs
+     (list docbook-xml-4.4
+           docbook-xsl     ;without -next, man pages are corrupted
+           libxml2
+           libxslt))
     (home-page "https://joeyh.name/code/moreutils/")
     (synopsis "Miscellaneous general-purpose command-line tools")
     (description
      "Moreutils is a collection of general-purpose command-line tools to
 augment the traditional Unix toolbox.")
-    (license l:gpl2+)))
+    (properties
+     '((release-monitoring-url . "https://git.joeyh.name/index.cgi/moreutils.git/")))
+    (license license:gpl2+)))