[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into core-updates-fr
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into core-updates-frozen |
|
Date: |
Mon, 8 Nov 2021 02:18:09 -0500 (EST) |
efraim pushed a commit to branch core-updates-frozen
in repository guix.
commit 1c94392a13cbdf87e03a644633eb775bf45694a1
Merge: dd87bbb 9d25ee3
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Nov 8 09:06:14 2021 +0200
Merge remote-tracking branch 'origin/master' into core-updates-frozen
.mailmap | 3 +-
doc/guix.texi | 72 +-
doc/local.mk | 3 +-
etc/guix-install.sh | 20 +-
gnu/home/services/shells.scm | 122 +-
gnu/local.mk | 1 -
gnu/packages/admin.scm | 5 +-
gnu/packages/audio.scm | 32 +-
gnu/packages/benchmark.scm | 61 +-
gnu/packages/bioconductor.scm | 1552 +-
gnu/packages/bioinformatics.scm | 16 +-
gnu/packages/cdrom.scm | 22 +-
gnu/packages/cran.scm | 511 +-
gnu/packages/crates-io.scm | 2132 +-
gnu/packages/cups.scm | 12 +-
gnu/packages/databases.scm | 22 +-
gnu/packages/diffoscope.scm | 4 +-
gnu/packages/disk.scm | 5 +-
gnu/packages/dns.scm | 11 +-
gnu/packages/emacs-xyz.scm | 248 +-
gnu/packages/file-systems.scm | 6 +-
gnu/packages/games.scm | 202 +-
gnu/packages/geo.scm | 8 +-
gnu/packages/gnome.scm | 16 +-
gnu/packages/graphics.scm | 26 -
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/haskell-xyz.scm | 3 +-
gnu/packages/linux.scm | 28 +-
gnu/packages/mail.scm | 6 +-
gnu/packages/markup.scm | 53 +-
gnu/packages/messaging.scm | 119 +-
gnu/packages/music.scm | 11 +-
gnu/packages/ocaml.scm | 4 +-
.../i3status-rust-enable-unstable-features.patch | 20 +
gnu/packages/patches/libblockdev-glib-compat.patch | 61 -
gnu/packages/protobuf.scm | 5 +-
gnu/packages/python-web.scm | 77 +
gnu/packages/python-xyz.scm | 43 +-
gnu/packages/rust-apps.scm | 77 +
gnu/packages/statistics.scm | 98 +-
gnu/packages/vim.scm | 29 +
gnu/packages/web.scm | 14 +-
gnu/packages/webkit.scm | 16 +-
gnu/packages/zig.scm | 2 +-
gnu/system/file-systems.scm | 47 +-
guix/build-system/r.scm | 2 +-
guix/import/cran.scm | 4 +-
guix/import/egg.scm | 37 +-
guix/import/elpa.scm | 7 +-
guix/profiles.scm | 110 +-
guix/scripts/environment.scm | 48 +-
guix/scripts/home/import.scm | 24 +
guix/scripts/import/egg.scm | 34 +-
guix/scripts/shell.scm | 16 +-
guix/ui.scm | 3 +-
po/doc/guix-cookbook.es.po | 4493 ++
po/doc/guix-manual.de.po | 23877 ++++----
po/doc/guix-manual.es.po | 23566 ++++----
po/doc/guix-manual.fa.po | 23312 ++++----
po/doc/guix-manual.fr.po | 23498 ++++----
po/doc/guix-manual.it.po | 23315 ++++----
po/doc/guix-manual.ko.po | 23386 ++++----
po/doc/guix-manual.pt_BR.po | 23388 ++++----
po/doc/guix-manual.ru.po | 54993 ++++++-------------
po/doc/guix-manual.sk.po | 23322 ++++----
po/doc/guix-manual.zh_CN.po | 23387 ++++----
po/doc/local.mk | 1 +
po/guix/cs.po | 820 +-
po/guix/da.po | 852 +-
po/guix/de.po | 1313 +-
po/guix/eo.po | 848 +-
po/guix/es.po | 1011 +-
po/guix/fr.po | 888 +-
po/guix/hu.po | 849 +-
po/guix/it.po | 806 +-
po/guix/ko.po | 806 +-
po/guix/nl.po | 877 +-
po/guix/oc.po | 803 +-
po/guix/pl.po | 821 +-
po/guix/pt_BR.po | 883 +-
po/guix/si.po | 803 +-
po/guix/sk.po | 877 +-
po/guix/sr.po | 846 +-
po/guix/sv.po | 846 +-
po/guix/ta.po | 852 +-
po/guix/vi.po | 846 +-
po/guix/zh_CN.po | 823 +-
po/packages/da.po | 1601 +-
po/packages/de.po | 1601 +-
po/packages/eo.po | 1601 +-
po/packages/es.po | 1601 +-
po/packages/fr.po | 1663 +-
po/packages/hu.po | 1601 +-
po/packages/it.po | 1601 +-
po/packages/ko.po | 1601 +-
po/packages/nl.po | 1601 +-
po/packages/oc.po | 1601 +-
po/packages/pl.po | 1601 +-
po/packages/pt_BR.po | 1601 +-
po/packages/sk.po | 1601 +-
po/packages/sr.po | 1601 +-
po/packages/zh_CN.po | 1601 +-
tests/guix-build.sh | 10 +
tests/lint.scm | 4 +-
104 files changed, 157540 insertions(+), 160673 deletions(-)
diff --cc gnu/local.mk
index 26197c4,05258ac..872fb01
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1323,10 -1332,9 +1323,9 @@@ dist_patch_DATA =
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/julia-tracker-16-compat.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
- %D%/packages/patches/libblockdev-glib-compat.patch \
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
%D%/packages/patches/libffi-float128-powerpc64le.patch \
+ %D%/packages/patches/librime-fix-build-with-gcc10.patch \
%D%/packages/patches/libvirt-add-install-prefix.patch \
%D%/packages/patches/libziparchive-add-includes.patch \
%D%/packages/patches/localed-xorg-keyboard.patch \
diff --cc gnu/packages/emacs-xyz.scm
index 935a1f6,17638cc..096ba06
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@@ -304,10 -305,9 +305,9 @@@ e.g. emacs-geiser-guile for Guile."
;; loaded, so let's defer that until it is.
(("\\(geiser-activate-implementation .*\\)" all)
(string-append
- "(eval-after-load 'geiser-impl '" all ")")))
- #t)))))
+ "(eval-after-load 'geiser-impl '" all ")"))))))))
(inputs
- `(("guile" ,guile-2.2)))
+ `(("guile" ,guile-3.0)))
(propagated-inputs
`(("geiser" ,emacs-geiser)))
(home-page "https://nongnu.org/geiser/";)
diff --cc gnu/packages/games.scm
index 521bfcc,a474933..dd2444e
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@@ -6678,7 -6691,9 +6674,8 @@@ fight against their plot and save his f
(use-modules (guix build utils))
(let ((out (assoc-ref %outputs "out"))
(source (assoc-ref %build-inputs "source"))
- (tar (string-append (assoc-ref %build-inputs "tar")
"/bin/tar"))
- (unzip (string-append (assoc-ref %build-inputs "unzip")
- "/bin/unzip"))
+ (tar (search-input-file %build-inputs "/bin/tar"))
++ (unzip (search-input-file %build-inputs "/bin/unzip"))
(xz-path (string-append (assoc-ref %build-inputs "xz")
"/bin")))
(setenv "PATH" xz-path)
(mkdir out)
diff --cc gnu/packages/statistics.scm
index 87cb7de,50e014e..9a4cdd2
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@@ -216,12 -215,12 +216,11 @@@ This package also provides @command{xls
;; This ensures that Guix can detect embedded store references;
;; see bug #28157 for details.
(substitute* "src/library/base/makebasedb.R"
- (("compress = TRUE") "compress = FALSE"))
- #t))
+ (("compress = TRUE") "compress = FALSE"))))
(add-before 'configure 'patch-coreutils-paths
(lambda* (#:key inputs #:allow-other-keys)
- (let* ((coreutils (assoc-ref inputs "coreutils"))
- (uname-bin (string-append coreutils "/bin/uname"))
- (rm-bin (string-append coreutils "/bin/rm")))
+ (let ((uname-bin (search-input-file inputs "/bin/uname"))
+ (rm-bin (search-input-file inputs "/bin/rm")))
(substitute* "src/scripts/R.sh.in"
(("uname") uname-bin))
(substitute* "src/unix/sys-std.c"