guix-commits
[Top][All Lists]
Advanced

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

01/02: Merge branch 'master' into staging.


From: guix-commits
Subject: 01/02: Merge branch 'master' into staging.
Date: Tue, 22 Mar 2022 09:09:46 -0400 (EDT)

apteryx pushed a commit to branch core-updates
in repository guix.

commit 49b350fafc2c3ea1db66461b73d4e304cd13ec92
Merge: 03b5668a03 e584a093f9
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Mar 21 21:38:19 2022 -0400

    Merge branch 'master' into staging.

 .dir-locals.el                                     |     3 +
 CODE-OF-CONDUCT                                    |   155 +-
 Makefile.am                                        |     7 +-
 doc/build.scm                                      |     2 +-
 doc/contributing.texi                              |    45 +-
 doc/guix-cookbook.texi                             |     9 +-
 doc/guix.texi                                      |   954 +-
 doc/local.mk                                       |     3 +-
 etc/news.scm                                       |    75 +
 gnu/build/activation.scm                           |     4 +-
 gnu/build/hurd-boot.scm                            |    12 +-
 gnu/build/linux-boot.scm                           |    85 +-
 gnu/home/services.scm                              |    45 +-
 gnu/home/services/fontutils.scm                    |     4 +-
 gnu/home/services/shells.scm                       |   126 +-
 gnu/home/services/shepherd.scm                     |    21 +-
 gnu/home/services/symlink-manager.scm              |   387 +-
 gnu/home/services/xdg.scm                          |    33 +-
 gnu/installer/connman.scm                          |     2 +-
 gnu/installer/parted.scm                           |     2 +-
 gnu/local.mk                                       |    66 +-
 gnu/machine/ssh.scm                                |     5 +-
 gnu/packages/accessibility.scm                     |     2 -
 gnu/packages/admin.scm                             |    89 +-
 gnu/packages/algebra.scm                           |    87 +-
 gnu/packages/astronomy.scm                         |    35 +-
 gnu/packages/audio.scm                             |     8 +-
 gnu/packages/aux-files/guix.vim                    |     8 +-
 gnu/packages/aux-files/linux-libre/5.10-arm.conf   |     3 +-
 gnu/packages/aux-files/linux-libre/5.10-arm64.conf |     3 +-
 gnu/packages/aux-files/linux-libre/5.10-i686.conf  |     3 +-
 .../aux-files/linux-libre/5.10-x86_64.conf         |     3 +-
 gnu/packages/aux-files/linux-libre/5.15-arm.conf   |     3 +-
 gnu/packages/aux-files/linux-libre/5.15-arm64.conf |     3 +-
 gnu/packages/aux-files/linux-libre/5.15-i686.conf  |     3 +-
 .../aux-files/linux-libre/5.15-x86_64.conf         |     3 +-
 gnu/packages/aux-files/linux-libre/5.16-arm.conf   |     3 +-
 gnu/packages/aux-files/linux-libre/5.16-arm64.conf |     3 +-
 gnu/packages/aux-files/linux-libre/5.16-i686.conf  |     3 +-
 .../aux-files/linux-libre/5.16-x86_64.conf         |     3 +-
 gnu/packages/aux-files/linux-libre/5.4-arm.conf    |     3 +-
 gnu/packages/aux-files/linux-libre/5.4-arm64.conf  |     3 +-
 gnu/packages/aux-files/linux-libre/5.4-i686.conf   |     3 +-
 gnu/packages/aux-files/linux-libre/5.4-x86_64.conf |     3 +-
 gnu/packages/barrier.scm                           |    68 +
 gnu/packages/base.scm                              |   106 +-
 gnu/packages/benchmark.scm                         |   188 +-
 gnu/packages/bioconductor.scm                      |   113 +
 gnu/packages/bioinformatics.scm                    |   161 +-
 gnu/packages/bittorrent.scm                        |     5 +-
 gnu/packages/bootloaders.scm                       |    26 +-
 gnu/packages/browser-extensions.scm                |     4 +-
 gnu/packages/c.scm                                 |    78 +
 gnu/packages/cdrom.scm                             |    54 +-
 gnu/packages/check.scm                             |    72 +-
 gnu/packages/chez.scm                              |  1264 +-
 gnu/packages/chromium.scm                          |     6 +-
 gnu/packages/commencement.scm                      |    79 +-
 gnu/packages/compression.scm                       |    13 +-
 gnu/packages/compton.scm                           |     4 +-
 gnu/packages/cpp.scm                               |   165 +-
 gnu/packages/cran.scm                              |  1221 +-
 gnu/packages/crates-graphics.scm                   |    28 +-
 gnu/packages/crates-io.scm                         |  1192 +-
 gnu/packages/cross-base.scm                        |    32 +-
 gnu/packages/crypto.scm                            |    68 +-
 gnu/packages/curl.scm                              |     5 +-
 gnu/packages/databases.scm                         |    61 +-
 gnu/packages/debian.scm                            |     4 +-
 gnu/packages/debug.scm                             |    23 +-
 gnu/packages/diffoscope.scm                        |     4 +-
 gnu/packages/disk.scm                              |    60 +
 gnu/packages/dns.scm                               |     8 +-
 gnu/packages/docbook.scm                           |     6 +-
 gnu/packages/dunst.scm                             |     6 +-
 gnu/packages/ebook.scm                             |   384 +-
 gnu/packages/education.scm                         |     4 +-
 gnu/packages/electronics.scm                       |    27 +-
 gnu/packages/elixir.scm                            |    12 +-
 gnu/packages/emacs-xyz.scm                         |  1191 +-
 gnu/packages/embedded.scm                          |    59 +-
 gnu/packages/emulators.scm                         |    45 +-
 gnu/packages/engineering.scm                       |   259 +-
 gnu/packages/fcitx5.scm                            |   110 +-
 gnu/packages/file-systems.scm                      |     6 +-
 gnu/packages/finance.scm                           |    38 +-
 gnu/packages/fonts.scm                             |   103 +-
 gnu/packages/fontutils.scm                         |     6 +-
 gnu/packages/freedesktop.scm                       |    58 +-
 gnu/packages/ftp.scm                               |     9 +-
 gnu/packages/game-development.scm                  |     5 +-
 gnu/packages/games.scm                             |   154 +-
 gnu/packages/gcc.scm                               |   174 +-
 gnu/packages/geo.scm                               |    49 +-
 gnu/packages/gnome-xyz.scm                         |    16 +-
 gnu/packages/gnome.scm                             |   297 +-
 gnu/packages/gnuzilla.scm                          |    20 +-
 gnu/packages/golang.scm                            |   148 +-
 gnu/packages/graphics.scm                          |   216 +-
 gnu/packages/gtk.scm                               |    58 +-
 gnu/packages/guile-xyz.scm                         |     4 +-
 gnu/packages/guile.scm                             |    34 +-
 gnu/packages/hardware.scm                          |    59 +
 gnu/packages/haskell-apps.scm                      |     6 +-
 gnu/packages/haskell-web.scm                       |     5 +-
 gnu/packages/haskell-xyz.scm                       |    21 +
 gnu/packages/haskell.scm                           |   122 +-
 gnu/packages/hurd.scm                              |    11 +-
 gnu/packages/i2p.scm                               |     6 +-
 gnu/packages/image-viewers.scm                     |    65 +-
 gnu/packages/image.scm                             |    13 +-
 gnu/packages/irc.scm                               |     9 +-
 gnu/packages/javascript.scm                        |   110 +-
 gnu/packages/julia-xyz.scm                         |  1173 +-
 gnu/packages/kde-frameworks.scm                    |     3 +-
 gnu/packages/kde-multimedia.scm                    |     2 -
 gnu/packages/kde.scm                               |   154 +-
 gnu/packages/lean.scm                              |    65 +-
 gnu/packages/less.scm                              |    66 +-
 gnu/packages/linphone.scm                          |    51 +-
 gnu/packages/linux.scm                             |   432 +-
 gnu/packages/lisp-check.scm                        |    45 +-
 gnu/packages/lisp-xyz.scm                          |   845 +-
 gnu/packages/lisp.scm                              |    32 +-
 gnu/packages/llvm.scm                              |    54 +-
 gnu/packages/loko.scm                              |     2 +-
 gnu/packages/machine-learning.scm                  |    51 +-
 gnu/packages/mail.scm                              |   117 +-
 gnu/packages/markup.scm                            |     9 +-
 gnu/packages/maths.scm                             |   448 +-
 gnu/packages/maven-parent-pom.scm                  |    16 +-
 gnu/packages/maven.scm                             |    95 +-
 gnu/packages/mes.scm                               |     5 +
 gnu/packages/messaging.scm                         |   168 +-
 gnu/packages/monitoring.scm                        |    15 +-
 gnu/packages/mpd.scm                               |     4 +-
 gnu/packages/music.scm                             |    81 +-
 gnu/packages/nano.scm                              |     5 +-
 gnu/packages/ncdu.scm                              |    42 +-
 gnu/packages/networking.scm                        |   177 +-
 gnu/packages/nicotine.scm                          |    31 +-
 gnu/packages/ocaml.scm                             |    94 +-
 gnu/packages/opencl.scm                            |     4 +-
 gnu/packages/package-management.scm                |    28 +-
 gnu/packages/parallel.scm                          |   173 +-
 gnu/packages/password-utils.scm                    |    38 +-
 .../bash-reproducible-linux-pgrp-pipe.patch        |    34 -
 gnu/packages/patches/calibre-fix-zeroconf.patch    |    38 -
 gnu/packages/patches/dunst-1.7.3-fix-crash.patch   |    21 -
 gnu/packages/patches/efivar-gcc-compat.patch       |   177 -
 gnu/packages/patches/evilwm-lost-focus-bug.patch   |    18 -
 .../patches/freecad-boost-serialization.patch      |    27 -
 gnu/packages/patches/freecad-vtk9.patch            |   827 -
 gnu/packages/patches/ghc-monad-par-fix-tests.patch |    45 -
 gnu/packages/patches/glibc-CVE-2018-11236.patch    |   149 -
 gnu/packages/patches/glibc-CVE-2018-11237.patch    |    55 -
 gnu/packages/patches/glibc-hurd-magic-pid.patch    |   190 -
 .../patches/grocsvs-dont-use-admiral.patch         |    69 -
 gnu/packages/patches/guile-cross-compilation.patch |    55 +
 .../patches/guile-ssh-fix-test-suite.patch         |   217 -
 gnu/packages/patches/guile-ssh-read-error.patch    |    18 -
 .../patches/hydra-disable-darcs-test.patch         |    25 -
 gnu/packages/patches/inkscape-poppler-0.76.patch   |    36 -
 .../patches/libvirt-create-machine-cgroup.patch    |    48 -
 .../linux-libre-arm64-generic-pinebook-lcd.patch   |    40 -
 .../patches/marble-qt-add-qt-headers.patch         |   189 -
 gnu/packages/patches/mariadb-link-libatomic.patch  |    83 +
 .../maven-enforcer-api-fix-old-dependencies.patch  |   177 -
 gnu/packages/patches/mescc-tools-boot.patch        |   222 -
 .../patches/nettle-3.5-CVE-2021-3580-pt1.patch     |   276 -
 .../patches/nettle-3.5-CVE-2021-3580-pt2.patch     |   163 -
 ...ttle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch |    78 -
 gnu/packages/patches/nhc98-c-update.patch          |    42 +
 .../patches/ocaml-Add-a-.file-directive.patch      |    96 -
 gnu/packages/patches/ocaml-CVE-2015-8869.patch     |    72 -
 .../patches/ocaml-bitstring-fix-configure.patch    |    53 -
 .../ocaml-enable-ocamldoc-reproducibility.patch    |   149 -
 .../openbabel-fix-crash-on-nwchem-output.patch     |    34 -
 .../patches/openboardview-use-system-imgui.patch   |   170 +
 gnu/packages/patches/openjdk-14-builtins.patch     |    11 -
 gnu/packages/patches/openssl-c-rehash-in.patch     |    17 -
 gnu/packages/patches/openssl-runpath.patch         |    15 -
 .../passwordsafe-meson-remove-extra-argument.patch |    20 -
 gnu/packages/patches/patchutils-test-perms.patch   |    14 -
 .../patches/postgresql-riscv-spinlocks.patch       |    41 +
 gnu/packages/patches/python-CVE-2018-14647.patch   |    61 -
 gnu/packages/patches/python-CVE-2020-26116.patch   |    47 -
 gnu/packages/patches/python-axolotl-AES-fix.patch  |    24 -
 .../python-babel-fix-parse-future-test.patch       |    68 -
 .../python-matplotlib-run-under-wayland-gtk3.patch |    31 -
 gnu/packages/patches/python-mypy-12332.patch       |    68 +
 .../patches/python-pytest-asyncio-python-3.8.patch |   238 -
 .../python-robotframework-source-date-epoch.patch  |   104 +-
 ...thon-robotframework-sshlibrary-rf5-compat.patch |    19 +
 .../patches/python-robotframework-ug2html.patch    |    57 +
 ...ython2-larch-coverage-4.0a6-compatibility.patch |    29 -
 gnu/packages/patches/qt4-ldflags.patch             |    18 -
 .../patches/racket-enable-scheme-backport.patch    |   465 +
 .../racket-gui-tethered-launcher-backport.patch    |    26 +
 gnu/packages/patches/rust-coresimd-doctest.patch   |    21 -
 gnu/packages/patches/screen-CVE-2021-26937.patch   |    66 -
 .../patches/sdcc-disable-non-free-code.patch       |   363 +-
 gnu/packages/patches/streamlink-update-test.patch  |    70 -
 gnu/packages/patches/tcc-boot-0.9.27.patch         |    26 -
 .../patches/transfig-gcc10-fno-common.patch        |    33 +
 gnu/packages/patches/upower-builddir.patch         |    34 -
 .../vtk-8-fix-freetypetools-build-failure.patch    |    36 -
 .../webkitgtk-adjust-bubblewrap-paths.patch        |    38 +
 .../patches/webkitgtk-bind-all-fonts.patch         |    17 +-
 .../patches/webkitgtk-canonicalize-paths.patch     |    66 +
 gnu/packages/patches/webkitgtk-share-store.patch   |    19 -
 gnu/packages/pciutils.scm                          |    43 +
 gnu/packages/pdf.scm                               |    58 +-
 gnu/packages/pep.scm                               |    13 +-
 gnu/packages/perl.scm                              |     3 +-
 gnu/packages/photo.scm                             |     4 +-
 gnu/packages/plotutils.scm                         |   130 +-
 gnu/packages/prolog.scm                            |    76 +-
 gnu/packages/purescript.scm                        |    21 -
 gnu/packages/python-check.scm                      |     4 +-
 gnu/packages/python-crypto.scm                     |     8 +-
 gnu/packages/python-science.scm                    |   131 +-
 gnu/packages/python-web.scm                        |   143 +-
 gnu/packages/python-xyz.scm                        |   536 +-
 gnu/packages/qt.scm                                |    91 +-
 gnu/packages/racket.scm                            |  1404 +-
 gnu/packages/radio.scm                             |   155 +-
 gnu/packages/ruby.scm                              |    38 +-
 gnu/packages/rust-apps.scm                         |    61 +-
 gnu/packages/scheme.scm                            |    13 +-
 gnu/packages/screen.scm                            |    12 +-
 gnu/packages/scsi.scm                              |    36 +-
 gnu/packages/search.scm                            |     5 +-
 gnu/packages/security-token.scm                    |    79 +
 gnu/packages/shells.scm                            |    16 +-
 gnu/packages/shellutils.scm                        |     9 +-
 gnu/packages/sphinx.scm                            |    23 +-
 gnu/packages/ssh.scm                               |    48 +-
 gnu/packages/statistics.scm                        |   302 +-
 gnu/packages/stenography.scm                       |     8 +-
 gnu/packages/suckless.scm                          |     5 +-
 gnu/packages/syncthing.scm                         |     4 +-
 gnu/packages/syndication.scm                       |    56 +-
 gnu/packages/telegram.scm                          |     2 -
 gnu/packages/telephony.scm                         |   155 +-
 gnu/packages/terminals.scm                         |    11 +-
 gnu/packages/tex.scm                               |   224 +-
 gnu/packages/text-editors.scm                      |    41 +-
 gnu/packages/tls.scm                               |     8 +-
 gnu/packages/toolkits.scm                          |   131 +-
 gnu/packages/tor.scm                               |     4 +-
 gnu/packages/valgrind.scm                          |     4 +-
 gnu/packages/version-control.scm                   |     9 +-
 gnu/packages/video.scm                             |   123 +-
 gnu/packages/vim.scm                               |     8 +-
 gnu/packages/virtualization.scm                    |    47 +-
 gnu/packages/vpn.scm                               |    43 +
 gnu/packages/weather.scm                           |    55 +
 gnu/packages/web-browsers.scm                      |   136 +-
 gnu/packages/web.scm                               |    95 +-
 gnu/packages/webkit.scm                            |     9 +-
 gnu/packages/wget.scm                              |    18 +-
 gnu/packages/wm.scm                                |    94 +-
 gnu/packages/xdisorg.scm                           |    51 +-
 gnu/packages/xfce.scm                              |     4 +-
 gnu/packages/xfig.scm                              |    14 +-
 gnu/packages/xml.scm                               |     7 +-
 gnu/packages/xorg.scm                              |    22 +-
 gnu/packages/zig.scm                               |     4 +-
 gnu/services.scm                                   |     6 +-
 gnu/services/base.scm                              |   233 +-
 gnu/services/cuirass.scm                           |     3 +-
 gnu/services/dbus.scm                              |     4 +-
 gnu/services/desktop.scm                           |   376 +-
 gnu/services/monitoring.scm                        |     2 +
 gnu/services/pm.scm                                |     5 +
 gnu/services/sound.scm                             |    87 +-
 gnu/services/ssh.scm                               |    22 +-
 gnu/services/virtualization.scm                    |    56 +-
 gnu/services/vpn.scm                               |     4 +-
 gnu/services/web.scm                               |    22 +-
 gnu/system.scm                                     |   111 +-
 gnu/system/file-systems.scm                        |     7 +
 gnu/system/hurd.scm                                |     9 +-
 gnu/system/images/novena.scm                       |     4 +-
 gnu/system/linux-container.scm                     |    15 +-
 gnu/system/linux-initrd.scm                        |     4 +-
 gnu/tests/base.scm                                 |     6 +-
 gnu/tests/install.scm                              |   400 +-
 gnu/tests/package-management.scm                   |    23 +-
 guix/build-system/gnu.scm                          |     4 +-
 guix/build-system/julia.scm                        |     7 +-
 guix/build-system/meson.scm                        |     4 +
 guix/build-system/ocaml.scm                        |    12 +-
 guix/build/download.scm                            |    49 +-
 guix/build/julia-build-system.scm                  |    22 +-
 guix/colors.scm                                    |     4 +-
 guix/derivations.scm                               |    14 +-
 guix/gexp.scm                                      |    69 +-
 guix/git-authenticate.scm                          |    17 +-
 guix/git.scm                                       |    24 +-
 guix/graph.scm                                     |    14 +-
 guix/http-client.scm                               |    48 +-
 guix/import/cran.scm                               |     5 +-
 guix/import/elpa.scm                               |     7 +-
 guix/import/github.scm                             |   122 +-
 guix/import/hackage.scm                            |    54 +-
 guix/import/pypi.scm                               |    53 +-
 guix/lint.scm                                      |    11 +
 guix/man-db.scm                                    |     7 +-
 guix/packages.scm                                  |    21 +-
 guix/profiles.scm                                  |    44 +-
 guix/scripts/build.scm                             |    22 +-
 guix/scripts/graph.scm                             |     9 +-
 guix/scripts/home.scm                              |   359 +-
 guix/scripts/home/import.scm                       |    33 +-
 guix/scripts/import/gem.scm                        |    33 +-
 guix/scripts/publish.scm                           |    29 +-
 guix/scripts/pull.scm                              |   158 +-
 guix/scripts/shell.scm                             |     4 +
 guix/scripts/system.scm                            |    28 +-
 guix/status.scm                                    |    19 +-
 guix/tests.scm                                     |    11 +-
 guix/transformations.scm                           |    28 +-
 guix/ui.scm                                        |   122 +-
 guix/utils.scm                                     |    12 +
 po/doc/guix-cookbook.sk.po                         |     4 +-
 .../{guix-cookbook.sk.po => guix-cookbook.uk.po}   |  1104 +-
 po/doc/guix-manual.de.po                           | 25361 ++++++++++---------
 po/doc/guix-manual.es.po                           | 24985 +++++++++---------
 po/doc/guix-manual.fa.po                           | 24509 +++++++++---------
 po/doc/guix-manual.fi.po                           | 24516 +++++++++---------
 po/doc/guix-manual.fr.po                           | 25070 +++++++++---------
 po/doc/guix-manual.it.po                           | 24512 +++++++++---------
 po/doc/guix-manual.ko.po                           | 24540 +++++++++---------
 po/doc/guix-manual.pt_BR.po                        | 24649 +++++++++---------
 po/doc/guix-manual.ru.po                           | 24759 +++++++++---------
 po/doc/guix-manual.sk.po                           | 24525 +++++++++---------
 po/doc/guix-manual.zh_CN.po                        | 24611 +++++++++---------
 po/doc/local.mk                                    |     1 +
 po/guix/LINGUAS                                    |     2 +
 po/guix/POTFILES.in                                |     1 +
 po/guix/cs.po                                      |   448 +-
 po/guix/da.po                                      |   455 +-
 po/guix/de.po                                      |   543 +-
 po/guix/eo.po                                      |   453 +-
 po/guix/es.po                                      |   546 +-
 po/guix/{si.po => fa.po}                           |   465 +-
 po/guix/fi.po                                      |   451 +-
 po/guix/fr.po                                      |   543 +-
 po/guix/hu.po                                      |   453 +-
 po/guix/it.po                                      |   447 +-
 po/guix/ko.po                                      |   467 +-
 po/guix/nl.po                                      |   596 +-
 po/guix/oc.po                                      |   445 +-
 po/guix/pl.po                                      |   448 +-
 po/guix/pt_BR.po                                   |   460 +-
 po/guix/ru.po                                      |   447 +-
 po/guix/si.po                                      |   445 +-
 po/guix/sk.po                                      |   552 +-
 po/guix/sr.po                                      |   452 +-
 po/guix/sv.po                                      |  2827 ++-
 po/guix/ta.po                                      |   459 +-
 po/guix/{si.po => uk.po}                           |   473 +-
 po/guix/vi.po                                      |   453 +-
 po/guix/zh_CN.po                                   |   446 +-
 po/packages/da.po                                  |  4729 ++--
 po/packages/de.po                                  |  4727 ++--
 po/packages/eo.po                                  |  4727 ++--
 po/packages/es.po                                  |  4729 ++--
 po/packages/fr.po                                  |  4728 ++--
 po/packages/hu.po                                  |  4729 ++--
 po/packages/it.po                                  |  4732 ++--
 po/packages/ko.po                                  |  4728 ++--
 po/packages/nl.po                                  |  4772 ++--
 po/packages/oc.po                                  |  4732 ++--
 po/packages/pl.po                                  |  4726 ++--
 po/packages/pt_BR.po                               |  4726 ++--
 po/packages/sk.po                                  |  4732 ++--
 po/packages/sr.po                                  |  4726 ++--
 po/packages/zh_CN.po                               |  4732 ++--
 tests/boot-parameters.scm                          |    23 +-
 tests/channels.scm                                 |    60 +-
 tests/derivations.scm                              |    50 +-
 tests/gexp.scm                                     |    69 +-
 tests/git-authenticate.scm                         |   150 +-
 tests/git.scm                                      |    52 +-
 tests/guix-build.sh                                |    12 +-
 tests/guix-git-authenticate.sh                     |    17 +-
 tests/guix-home.sh                                 |    97 +-
 tests/guix-pack.sh                                 |     5 +-
 tests/guix-package.sh                              |    13 +-
 tests/guix-shell.sh                                |     5 +-
 tests/guix-system.sh                               |    12 +-
 tests/home-import.scm                              |    31 +
 tests/http-client.scm                              |    84 +
 tests/import-github.scm                            |    43 +-
 tests/lint.scm                                     |    21 +
 tests/packages.scm                                 |    51 +
 tests/publish.scm                                  |    61 +-
 tests/substitute.scm                               |    25 +-
 401 files changed, 200574 insertions(+), 187876 deletions(-)

diff --cc gnu/packages/databases.scm
index 408dcb2582,4472677ab3..56d838dd58
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -1285,7 -1292,29 +1299,8 @@@ pictures, sounds, or video."
                                    version "/postgresql-" version ".tar.bz2"))
                (sha256
                 (base32
-                 "1z37ix80hb2bqa2smh1hbj9r507ypnl3pil43gkqznnlv6ipzz5s"))))))
 -                "1kf0gcsrl5n25rjlvkh87aywmn28kbwvakm5c7j1qpr4j01y34za"))))
 -    (arguments
 -     (if (target-riscv64?)
 -       `(,@(substitute-keyword-arguments (package-arguments postgresql-14)
 -             ((#:phases phases)
 -              #~(modify-phases #$phases
 -                  (add-after 'unpack 'apply-riscv-spinlock-patch
 -                    ;; The patch is applied in this custom phase and not via 
the
 -                    ;; "origin" object above to avoid rebuilding a large 
number
 -                    ;; of packages on other platforms.
 -                    (lambda* (#:key inputs #:allow-other-keys)
 -                      (let ((patch-file
 -                              #$(local-file
 -                                  (search-patch
 -                                    "postgresql-riscv-spinlocks.patch"))))
 -                        (invoke "patch" "-p1" "-i" patch-file))))))))
 -       `(,@(package-arguments postgresql-14))))
 -    (native-inputs
 -     (if (target-riscv64?)
 -       (list
 -         (local-file (search-patch "postgresql-riscv-spinlocks.patch"))
 -         patch)
 -       '()))))
++                "1z37ix80hb2bqa2smh1hbj9r507ypnl3pil43gkqznnlv6ipzz5s"))
++              (patches (search-patches 
"postgresql-riscv-spinlocks.patch"))))))
  
  (define-public postgresql-11
    (package
diff --cc gnu/packages/web-browsers.scm
index f3ef5bcc04,8105ffcaf8..60d042fb66
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@@ -15,8 -15,7 +15,8 @@@
  ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
  ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
  ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 +;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
- ;;; Copyright © 2021 Cage <cage-dev@twistfold.it>
+ ;;; Copyright © 2021, 2022 Cage <cage-dev@twistfold.it>
  ;;; Copyright © 2021 Benoit Joly <benoit@benoitj.ca>
  ;;; Copyright © 2021 Alexander Krotov <krotov@iitp.ru>
  ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>



reply via email to

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