[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into staging |
|
Date: |
Tue, 28 Mar 2023 23:06:15 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 438a0de332fc09d9ba14d7c989af9c17ca9c6be2
Merge: e5ae499f4c d00f107507
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Mar 28 22:40:32 2023 -0400
Merge remote-tracking branch 'origin/master' into staging
.guix-authorizations | 12 -
doc/contributing.texi | 5 +-
doc/guix.texi | 11 +-
etc/teams.scm.in | 23 +-
gnu/home/services/desktop.scm | 6 +-
gnu/local.mk | 4 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/chez.scm | 10 +-
gnu/packages/cran.scm | 125 +
gnu/packages/crypto.scm | 2 +
gnu/packages/databases.scm | 62 +-
gnu/packages/emacs-xyz.scm | 268 +-
gnu/packages/file-systems.scm | 74 +
gnu/packages/finance.scm | 7 +-
gnu/packages/fonts.scm | 12 +-
gnu/packages/freedesktop.scm | 2 +-
gnu/packages/gnome.scm | 5 +-
gnu/packages/golang.scm | 282 +-
gnu/packages/guile-xyz.scm | 37 +
gnu/packages/guile.scm | 4 +-
gnu/packages/high-availability.scm | 53 +-
gnu/packages/image-processing.scm | 5 +-
gnu/packages/image-viewers.scm | 58 +-
gnu/packages/linux.scm | 33 +-
gnu/packages/lisp-check.scm | 2 +-
gnu/packages/lisp-xyz.scm | 227 +
gnu/packages/mail.scm | 19 +-
gnu/packages/maths.scm | 79 +-
gnu/packages/messaging.scm | 11 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/networking.scm | 80 +-
gnu/packages/ocaml.scm | 4 +-
gnu/packages/package-management.scm | 94 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/patches/fpm-newer-clamp-fix.patch | 33 +
gnu/packages/patches/geeqie-clutter.patch | 35 -
.../guile-fix-invalid-unicode-handling.patch | 83 +
.../patches/ruby-hiredis-use-system-hiredis.patch | 52 +
gnu/packages/patchutils.scm | 4 +-
gnu/packages/perl.scm | 21 +
gnu/packages/protobuf.scm | 55 +-
gnu/packages/python-science.scm | 121 +-
gnu/packages/python-xyz.scm | 154 +
gnu/packages/rails.scm | 1438 ++++--
gnu/packages/ruby.scm | 4891 +++++++++++++++-----
gnu/packages/search.scm | 4 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/shellutils.scm | 4 +-
gnu/packages/syncthing.scm | 4 +-
gnu/packages/tex.scm | 25 +
gnu/packages/texinfo.scm | 4 +-
gnu/packages/time.scm | 4 +-
gnu/packages/version-control.scm | 124 +-
gnu/packages/video.scm | 4 +-
gnu/packages/w3m.scm | 23 +-
gnu/packages/wm.scm | 10 +-
gnu/packages/xdisorg.scm | 41 +
gnu/services/audio.scm | 32 +-
gnu/services/base.scm | 7 +-
gnu/services/herd.scm | 24 +-
gnu/services/linux.scm | 2 +-
gnu/services/networking.scm | 4 +-
gnu/services/xorg.scm | 23 +-
gnu/system/linux-container.scm | 10 +-
guix/build/syscalls.scm | 5 +-
guix/lint.scm | 5 +-
guix/substitutes.scm | 10 +-
tests/guix-home.sh | 2 +-
69 files changed, 6984 insertions(+), 1910 deletions(-)
diff --cc gnu/packages/freedesktop.scm
index c941a76297,043d1ec92b..b6cf45b728
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -474,82 -474,112 +474,82 @@@ display servers. It supports many diff
(name "xdg-utils")
(version "1.1.3")
(source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://portland.freedesktop.org/download/xdg-utils-";
- version ".tar.gz"))
- (sha256
- (base32
- "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"))))
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://portland.freedesktop.org/download/xdg-utils-";
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"))))
(build-system gnu-build-system)
(native-inputs
- (list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto))
+ (list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto))
(inputs
- `(("awk" ,gawk)
- ;; TODO(staging): Make this unconditional, to avoid canonical packages,
- ;; see
<https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00148.html>.
- ,@(if (%current-target-system)
- `(("bash-minimal" ,bash-minimal)) ; for 'wrap-program'
- '())
- ("coreutils" ,coreutils)
- ,@(if (%current-target-system)
- `(("file" ,file))
- '())
- ("grep" ,grep)
- ("inetutils" ,inetutils) ; xdg-screensaver uses `hostname'
- ("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
- ("sed" ,sed)
- ("xprop" ,xprop) ; for Xfce detecting
- ("xset" ,xset))) ; for xdg-screensaver
+ (list bash-minimal ;for 'wrap-program'
+ coreutils
+ file
+ gawk
+ grep
+ inetutils ;xdg-screensaver uses `hostname'
+ perl-file-mimeinfo ;for mimeopen fallback
+ sed
+ xprop ;for Xfce detecting
+ xset)) ;for xdg-screensaver
(arguments
- `(#:tests? #f ; no check target
- #:modules ((srfi srfi-26)
+ (list
+ #:tests? #f ;no check target
+ #:modules `((srfi srfi-26)
,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-hardcoded-paths
- ;; TODO(staging): make unconditional
- (,@(if (%current-target-system)
- '(lambda* (#:key inputs #:allow-other-keys))
- '(lambda _))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-hardcoded-paths
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "scripts/xdg-mime.in"
(("/usr/bin/file")
- (,@(if (%current-target-system)
- '(search-input-file inputs "bin/file")
- '(which "file")))))
+ (search-input-file inputs "bin/file")))
(substitute* "scripts/xdg-open.in"
(("/usr/bin/printf")
- (,@(if (%current-target-system)
- '(search-input-file inputs "bin/printf")
- '(which "printf")))))
- #t))
- (add-before 'build 'locate-catalog-files
- ;; TODO(staging): Make unconditional for simplicity.
- (lambda* (#:key inputs ,@(if (%current-target-system)
- '(native-inputs)
- '()) #:allow-other-keys)
- ;; TODO(staging): Make unconditional for simplicity and
- ;; to avoid depending on input labels.
- (let ,(if (%current-target-system)
- `((native-inputs (or native-inputs inputs))
- (xmldoc (search-input-directory native-inputs
- "xml/dtd/docbook"))
- (xsldoc
- (search-input-directory
- native-inputs
- (string-append "xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)))))
- `((xmldoc
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook"))
- (xsldoc
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)))))
- (for-each (lambda (file)
- (substitute* file
- (("http://.*/docbookx\\.dtd";)
- (string-append xmldoc "/docbookx.dtd"))))
- (find-files "scripts/desc" "\\.xml$"))
- (substitute* "scripts/Makefile"
- ;; Apparently `xmlto' does not bother to looks up the
stylesheets
- ;; specified in the XML, unlike the above substitition.
Instead it
- ;; uses a hard-coded URL. Work around it here, but if this is
- ;; common perhaps we should hardcode this path in xmlto
itself.
- (("\\$\\(XMLTO\\) man")
- (string-append "$(XMLTO) -x " xsldoc
- "/manpages/docbook.xsl man")))
- (setenv "STYLESHEET"
- (string-append xsldoc "/html/docbook.xsl"))
- ;; TODO(staging): Might as well remove the #t while we are at
- ;; it.
- #t)))
- (add-after 'install 'wrap-executables
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (with-directory-excursion (string-append out "/bin")
- (let ((path-ext
- (map (cute string-append <> "/bin")
- (cons out
- (map (cute assoc-ref inputs <>)
- '("awk" "coreutils" "grep" "inetutils"
- "perl-file-mimeinfo" "sed" "xprop"
- "xset"))))))
- (for-each (cute wrap-program <>
- `("PATH" ":" prefix ,path-ext))
- (find-files "."))))
- #t))))))
+ (search-input-file inputs "bin/printf")))))
+ (add-before 'build 'locate-catalog-files
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (let* ((native (or native-inputs inputs))
+ (xmldoc (search-input-directory native
+ "xml/dtd/docbook"))
+ (xsldoc (search-input-directory
+ native
+ (string-append "xml/xsl/docbook-xsl-"
+ #$(package-version
+ (this-package-native-input
+ "docbook-xsl"))))))
+ (for-each (lambda (file)
+ (substitute* file
+ (("http://.*/docbookx\\.dtd";)
+ (string-append xmldoc "/docbookx.dtd"))))
+ (find-files "scripts/desc" "\\.xml$"))
+ (substitute* "scripts/Makefile"
+ ;; Apparently `xmlto' does not bother to looks up the
stylesheets
+ ;; specified in the XML, unlike the above substitition.
Instead it
+ ;; uses a hard-coded URL. Work around it here, but if this is
+ ;; common perhaps we should hardcode this path in xmlto
itself.
+ (("\\$\\(XMLTO\\) man")
+ (string-append "$(XMLTO) -x " xsldoc
+ "/manpages/docbook.xsl man")))
+ (setenv "STYLESHEET"
+ (string-append xsldoc "/html/docbook.xsl")))))
+ (add-after 'install 'wrap-executables
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen"
+ "sed" "xprop" "xset"))
+ (pkgs (map (lambda (cmd)
+ (search-input-file inputs
+ (string-append "bin/"
cmd)))
+ dependencies))
+ (bindirs (map dirname pkgs)))
+ (with-directory-excursion (string-append #$output "/bin")
+ (for-each (cute wrap-program <>
+ `("PATH" ":" prefix ,bindirs))
+ (find-files ".")))))))))
(home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/";)
(synopsis "Freedesktop.org scripts for desktop integration")
(description "The xdg-utils package is a set of simple scripts that