guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into staging


From: guix-commits
Subject: 01/01: Merge branch 'master' into staging
Date: Thu, 29 Sep 2022 01:31:25 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit f66067febc111d03929c95c067f0b88a8f8abb7b
Merge: 5dc5d6fa81 45eac6cdf5
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Sep 29 07:26:37 2022 +0200

    Merge branch 'master' into staging

 NEWS                                               |   2 +-
 doc/guix.texi                                      |  61 +++-
 etc/news.scm                                       |  23 +-
 etc/teams.scm.in                                   |  77 ++++-
 gnu/local.mk                                       |   3 +
 gnu/packages/admin.scm                             |  34 ++-
 gnu/packages/c.scm                                 |  36 +++
 gnu/packages/chromium.scm                          |  62 ++--
 gnu/packages/cpp.scm                               |  47 ++++
 gnu/packages/cran.scm                              | 169 +++++++++++
 gnu/packages/crates-io.scm                         |  96 +++++--
 gnu/packages/elm.scm                               |  18 ++
 gnu/packages/fonts.scm                             |   8 +-
 gnu/packages/gnome-xyz.scm                         |  41 ++-
 gnu/packages/gnome.scm                             | 172 ++++++------
 gnu/packages/gnuzilla.scm                          | 312 ++-------------------
 gnu/packages/haskell-apps.scm                      |  13 +-
 gnu/packages/image-processing.scm                  |   4 +-
 gnu/packages/javascript.scm                        |  23 ++
 gnu/packages/kde-frameworks.scm                    |  27 +-
 gnu/packages/linux.scm                             |  42 ++-
 gnu/packages/music.scm                             |   4 +-
 gnu/packages/parallel.scm                          |   4 +-
 .../patches/crc32c-unbundle-googletest.patch       |  21 ++
 .../telegram-desktop-allow-disable-libtgvoip.patch | 125 +++++++++
 ...tc-for-telegram-desktop-fix-gcc12-cstdint.patch |  21 ++
 gnu/packages/python-science.scm                    |  20 ++
 gnu/packages/python-xyz.scm                        |   4 +-
 gnu/packages/qt.scm                                |  19 ++
 gnu/packages/radio.scm                             |  80 ++++++
 gnu/packages/rust-apps.scm                         |  89 +++---
 gnu/packages/telegram.scm                          | 289 +++++++------------
 gnu/packages/tex.scm                               |  27 ++
 gnu/packages/video.scm                             |   4 +-
 gnu/packages/vim.scm                               |   5 +-
 gnu/packages/wm.scm                                |  47 ++--
 gnu/packages/xml.scm                               |   4 +-
 gnu/services/base.scm                              |  37 ++-
 gnu/services/samba.scm                             |  12 -
 gnu/system.scm                                     |  33 ++-
 guix/import/cran.scm                               | 101 +++++--
 guix/import/utils.scm                              |  18 +-
 guix/scripts/substitute.scm                        | 157 ++++++++---
 tests/substitute.scm                               | 113 ++++++++
 44 files changed, 1660 insertions(+), 844 deletions(-)

diff --cc gnu/packages/kde-frameworks.scm
index bec8ff1c51,61cbf19bc4..87c9884284
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@@ -578,11 -583,12 +578,11 @@@ propagate their changes to their respec
                      name "-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1n5mzj02si8allg907l6vn77c2i95qdgfvn48gsqgalwlyd4q6nj"))))
+                 "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52"))))
      (build-system cmake-build-system)
      (native-inputs
 -     (list extra-cmake-modules qttools-5 shared-mime-info
 +     (list extra-cmake-modules qttools-5 shared-mime-info))
             ;; TODO: FAM: File alteration notification 
http://oss.sgi.com/projects/fam
 -           xorg-server-for-tests)) ; for the tests
      (inputs
       (list qtbase-5))
      (arguments



reply via email to

[Prev in Thread] Current Thread [Next in Thread]