[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into gnome-team
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'master' into gnome-team |
|
Date: |
Sat, 3 Jun 2023 05:51:02 -0400 (EDT) |
lilyp pushed a commit to branch gnome-team
in repository guix.
commit 742d5c3d68c8b83ef594a5aeb870e27255c3726a
Merge: 52b4ce275f c11b92a8aa
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sat Jun 3 08:18:54 2023 +0200
Merge branch 'master' into gnome-team
Makefile.am | 4 -
doc/guix-cookbook.texi | 8 +-
doc/guix.texi | 451 +-
gnu/home/services/mail.scm | 222 +
gnu/local.mk | 10 +-
gnu/packages/admin.scm | 13 +-
gnu/packages/aux-files/linux-libre/6.2-arm.conf | 10724 ------
gnu/packages/aux-files/linux-libre/6.2-arm64.conf | 11276 ------
gnu/packages/aux-files/linux-libre/6.2-i686.conf | 11602 ------
gnu/packages/aux-files/linux-libre/6.2-x86_64.conf | 11764 ------
gnu/packages/avahi.scm | 15 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 155 +-
gnu/packages/bioinformatics.scm | 274 +
gnu/packages/build-tools.scm | 6 +-
gnu/packages/busybox.scm | 4 +-
gnu/packages/ci.scm | 6 +-
gnu/packages/commencement.scm | 12 +-
gnu/packages/cpp.scm | 58 +-
gnu/packages/cran.scm | 339 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/documentation.scm | 3 +-
gnu/packages/emacs.scm | 34 +-
gnu/packages/engineering.scm | 12 +-
gnu/packages/file-systems.scm | 26 +-
gnu/packages/finance.scm | 4 +-
gnu/packages/fonts.scm | 20 +-
gnu/packages/freedesktop.scm | 44 +-
gnu/packages/game-development.scm | 159 +-
gnu/packages/games.scm | 52 +-
gnu/packages/glib.scm | 15 +
gnu/packages/gnome.scm | 6 +-
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnuzilla.scm | 8 +-
gnu/packages/golang.scm | 4 +-
gnu/packages/guile-xyz.scm | 14 +-
gnu/packages/image-processing.scm | 103 +-
gnu/packages/language.scm | 157 +
gnu/packages/libunistring.scm | 8 +-
gnu/packages/linux.scm | 181 +-
gnu/packages/lisp-xyz.scm | 8 +-
gnu/packages/machine-learning.scm | 28 +
gnu/packages/maths.scm | 55 +-
gnu/packages/mpi.scm | 4 +-
gnu/packages/multiprecision.scm | 12 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/node-xyz.scm | 25 +
gnu/packages/ocaml.scm | 117 +
gnu/packages/package-management.scm | 22 +-
gnu/packages/parallel.scm | 4 +-
.../patches/c++-gsl-find-system-gtest.patch | 96 -
.../patches/c++-gsl-move-array-bounds-tests.patch | 126 -
.../patches/libtommath-integer-overflow.patch | 140 +
.../patches/python-docrepr-fix-tests.patch | 16 +
.../python-ipython-documentation-chars.patch | 18 -
.../python-ipython-documentation-repro.patch | 25 -
.../telegram-desktop-allow-disable-libtgvoip.patch | 28 +-
...tc-for-telegram-desktop-fix-gcc12-cstdint.patch | 21 -
gnu/packages/patchutils.scm | 56 +
gnu/packages/python-xyz.scm | 76 +-
gnu/packages/security-token.scm | 30 +
gnu/packages/shells.scm | 4 +-
gnu/packages/shellutils.scm | 4 +-
gnu/packages/statistics.scm | 343 +-
gnu/packages/telegram.scm | 98 +-
gnu/packages/tmux.scm | 28 +
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 8 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 4 +-
gnu/services.scm | 48 +-
gnu/services/herd.scm | 13 +-
guix/ci.scm | 13 +-
guix/diagnostics.scm | 20 +-
guix/import/cpan.scm | 103 +-
guix/import/cran.scm | 197 +-
guix/import/elpa.scm | 30 +-
guix/import/gem.scm | 27 +-
guix/import/hackage.scm | 90 +-
guix/import/json.scm | 5 +-
guix/import/pypi.scm | 216 +-
guix/import/stackage.scm | 9 +-
guix/import/test.scm | 13 +-
guix/import/utils.scm | 33 +-
guix/narinfo.scm | 21 +-
guix/read-print.scm | 1 +
guix/scripts/environment.scm | 5 +
guix/scripts/gc.scm | 9 +-
guix/scripts/refresh.scm | 38 +-
guix/scripts/style.scm | 17 -
guix/scripts/substitute.scm | 35 +-
guix/tests/http.scm | 46 +-
guix/transformations.scm | 2 +
guix/upstream.scm | 218 +-
po/doc/guix-cookbook.de.po | 1658 +-
po/doc/guix-cookbook.fr.po | 1657 +-
po/doc/guix-cookbook.ko.po | 1616 +-
po/doc/guix-cookbook.sk.po | 1659 +-
po/doc/guix-manual.de.po | 36038 ++++++++++---------
po/doc/guix-manual.es.po | 34510 ++++++++++--------
po/doc/guix-manual.fr.po | 34782 ++++++++++--------
po/doc/guix-manual.pt_BR.po | 33187 +++++++++--------
po/doc/guix-manual.ru.po | 34035 +++++++++--------
po/doc/guix-manual.zh_CN.po | 33432 +++++++++--------
po/guix/bn.po | 2727 +-
po/guix/cs.po | 3358 +-
po/guix/da.po | 2801 +-
po/guix/de.po | 2806 +-
po/guix/eo.po | 2766 +-
po/guix/es.po | 2878 +-
po/guix/fa.po | 2726 +-
po/guix/fi.po | 2892 +-
po/guix/fr.po | 2847 +-
po/guix/hu.po | 2823 +-
po/guix/it.po | 2824 +-
po/guix/ja.po | 3059 +-
po/guix/ka.po | 2729 +-
po/guix/ko.po | 2739 +-
po/guix/lt.po | 2741 +-
po/guix/nl.po | 2852 +-
po/guix/oc.po | 2734 +-
po/guix/pl.po | 2765 +-
po/guix/pt_BR.po | 2957 +-
po/guix/ru.po | 2755 +-
po/guix/si.po | 2725 +-
po/guix/sk.po | 2879 +-
po/guix/sr.po | 2769 +-
po/guix/sv.po | 2791 +-
po/guix/ta.po | 2793 +-
po/guix/tr.po | 2744 +-
po/guix/uk.po | 2754 +-
po/guix/vi.po | 2770 +-
po/guix/zh_CN.po | 2784 +-
po/packages/da.po | 9629 ++---
po/packages/de.po | 9616 ++---
po/packages/eo.po | 9618 ++---
po/packages/es.po | 9663 ++---
po/packages/fa.po | 9607 ++---
po/packages/fi.po | 9624 ++---
po/packages/fr.po | 9776 ++---
po/packages/hu.po | 9806 ++---
po/packages/it.po | 9613 ++---
po/packages/ko.po | 9609 ++---
po/packages/nl.po | 9609 ++---
po/packages/oc.po | 9613 ++---
po/packages/pl.po | 9613 ++---
po/packages/pt_BR.po | 9607 ++---
po/packages/sk.po | 9609 ++---
po/packages/sr.po | 9607 ++---
po/packages/tr.po | 9609 ++---
po/packages/uk.po | 9607 ++---
po/packages/vi.po | 9607 ++---
po/packages/zh_CN.po | 9615 ++---
tests/cpan.scm | 63 +-
tests/elpa.scm | 76 +-
tests/gem.scm | 245 +-
tests/guix-refresh.sh | 8 +-
tests/hexpm.scm | 126 +-
tests/opam.scm | 33 +-
tests/pypi.scm | 469 +-
tests/services.scm | 83 +
tests/substitute.scm | 36 +-
tests/texlive.scm | 38 +-
tests/upstream.scm | 199 +-
165 files changed, 261446 insertions(+), 277375 deletions(-)
diff --cc gnu/packages/glib.scm
index 4cf9da3027,dcc45e3310..a799098614
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -878,6 -914,23 +879,20 @@@ libraries."
useful for C++.")
(license license:lgpl2.1+)))
+ (define-public glibmm-next
+ (package
+ (inherit glibmm)
+ (version "2.76.0")
+ (name "glibmm")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/glibmm/"
+ (version-major+minor version)
+ "/glibmm-" version ".tar.xz"))
+ (sha256
+ (base32
- "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6"))))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs glibmm)
- (replace "glib" glib-next)))))
++ "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6"))))))
+
(define-public glibmm-2.64
(package
(inherit glibmm)
diff --cc gnu/packages/telegram.scm
index c6ab5d312c,aa01c2f692..d2403b00ee
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@@ -320,8 -317,10 +317,10 @@@
(native-inputs (list pkg-config python-wrapper yasm))
(inputs
(list abseil-cpp-cxxstd17
+ crc32c
ffmpeg
- glib-next
+ glib
+ glibmm-next
libdrm
libglvnd
libjpeg-turbo
@@@ -478,8 -491,8 +491,8 @@@ Telegram project, for its use in telegr
fcitx-qt5
fcitx5-qt
ffmpeg
- glib-next
+ glib
- glibmm-2.64
+ glibmm-next
gtk+
hime
hunspell