[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'staging' into core-updates |
|
Date: |
Tue, 30 Aug 2022 14:38:12 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 59c136ef611b7a00683af1d1bb406dbd1af1a2bd
Merge: a6f4295362 d62fc2cc83
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Aug 30 20:18:55 2022 +0200
Merge branch 'staging' into core-updates
Makefile.am | 1 +
doc/contributing.texi | 18 +-
doc/guix.texi | 465 ++++++++++++++
etc/snippets/tempel/scheme-mode | 89 +++
etc/snippets/tempel/text-mode | 101 +++
.../{ => yas}/scheme-mode/guix-bzr-reference | 0
.../{ => yas}/scheme-mode/guix-cvs-reference | 0
.../{ => yas}/scheme-mode/guix-git-reference | 0
.../{ => yas}/scheme-mode/guix-hg-reference | 0
etc/snippets/{ => yas}/scheme-mode/guix-origin | 0
etc/snippets/{ => yas}/scheme-mode/guix-package | 4 +
.../{ => yas}/scheme-mode/guix-svn-reference | 0
.../text-mode/guix-commit-message-add-cl-package | 0
.../text-mode/guix-commit-message-add-package | 0
.../text-mode/guix-commit-message-remove-package | 0
.../text-mode/guix-commit-message-rename-package | 0
.../text-mode/guix-commit-message-update-package | 0
.../guix-commit-message-use-https-home-page | 0
gnu/bootloader.scm | 79 ++-
gnu/bootloader/extlinux.scm | 12 +-
gnu/build/marionette.scm | 79 ++-
gnu/local.mk | 15 +-
gnu/packages/admin.scm | 12 +-
gnu/packages/animation.scm | 99 +++
gnu/packages/bioconductor.scm | 14 +-
gnu/packages/build-tools.scm | 101 +++
gnu/packages/code.scm | 5 +-
gnu/packages/crates-io.scm | 8 +-
gnu/packages/databases.scm | 2 +-
gnu/packages/debug.scm | 10 +-
gnu/packages/direct-connect.scm | 2 +-
gnu/packages/disk.scm | 1 +
gnu/packages/display-managers.scm | 96 ++-
gnu/packages/django.scm | 51 ++
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 189 ++++--
gnu/packages/freedesktop.scm | 103 +--
gnu/packages/game-development.scm | 1 +
gnu/packages/games.scm | 142 -----
gnu/packages/geo.scm | 6 +-
gnu/packages/gimp.scm | 4 +-
gnu/packages/gnome.scm | 81 ++-
gnu/packages/gnupg.scm | 2 +-
gnu/packages/gps.scm | 1 +
gnu/packages/graphics.scm | 103 +++
gnu/packages/gtk.scm | 1 -
gnu/packages/haskell-xyz.scm | 3 -
gnu/packages/image-processing.scm | 4 +
gnu/packages/image-viewers.scm | 136 ++++
gnu/packages/image.scm | 5 +-
gnu/packages/installers.scm | 2 +-
gnu/packages/julia-xyz.scm | 12 +-
gnu/packages/julia.scm | 4 +
gnu/packages/libffi.scm | 20 +-
gnu/packages/linux.scm | 6 +-
gnu/packages/lisp-xyz.scm | 31 +
gnu/packages/llvm.scm | 2 +
gnu/packages/lua.scm | 75 ++-
gnu/packages/music.scm | 4 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/node.scm | 6 +-
gnu/packages/ocr.scm | 4 +-
.../patches/accountsservice-extensions.patch | 25 +
.../patches/gnome-shell-polkit-autocleanup.patch | 50 ++
.../patches/lightdm-arguments-ordering.patch | 54 ++
gnu/packages/patches/lightdm-vnc-color-depth.patch | 81 +++
gnu/packages/patches/lightdm-vncserver-check.patch | 66 ++
.../patches/mercurial-openssl-compat.patch | 89 +++
gnu/packages/patches/scons-test-environment.patch | 57 ++
gnu/packages/pdf.scm | 103 +--
gnu/packages/python-check.scm | 22 +
gnu/packages/python-crypto.scm | 2 +-
gnu/packages/python-web.scm | 36 +-
gnu/packages/python-xyz.scm | 135 ++--
gnu/packages/python.scm | 5 +-
gnu/packages/qt.scm | 2 +-
gnu/packages/ruby.scm | 59 +-
gnu/packages/rust.scm | 4 +-
gnu/packages/samba.scm | 3 +
gnu/packages/tls.scm | 8 +-
gnu/packages/toys.scm | 99 ++-
gnu/packages/version-control.scm | 34 +-
gnu/packages/video.scm | 2 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/virtualization.scm | 9 +-
gnu/packages/web.scm | 4 +-
gnu/packages/webkit.scm | 7 +-
gnu/packages/wm.scm | 11 +-
gnu/packages/xdisorg.scm | 1 +
gnu/services.scm | 5 +-
gnu/services/lightdm.scm | 687 +++++++++++++++++++++
gnu/services/security.scm | 415 +++++++++++++
gnu/services/version-control.scm | 8 +
gnu/tests/base.scm | 4 +-
gnu/tests/install.scm | 8 +-
gnu/tests/lightdm.scm | 160 +++++
gnu/tests/security.scm | 221 +++++++
gnu/tests/virtualization.scm | 21 +
guix/build-system/scons.scm | 4 +-
guix/gexp.scm | 4 +-
guix/scripts/system.scm | 16 +-
tests/boot-parameters.scm | 23 +
tests/services/lightdm.scm | 52 ++
103 files changed, 4171 insertions(+), 648 deletions(-)
diff --cc gnu/local.mk
index 6ee756c37e,bb410b97af..de6a65b0f5
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1206,9 -1215,11 +1211,10 @@@ dist_patch_DATA =
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-screenshot-meson-0.60.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
- %D%/packages/patches/gnome-session-support-elogind.patch \
+ %D%/packages/patches/gnome-session-support-elogind.patch \
+ %D%/packages/patches/gnome-shell-polkit-autocleanup.patch \
%D%/packages/patches/gnome-todo-libportal.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
- %D%/packages/patches/gnupg-CVE-2022-34903.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
@@@ -1489,8 -1508,10 +1498,9 @@@
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.patch \
%D%/packages/patches/libsigrokdecode-python3.9-fix.patch \
- %D%/packages/patches/mercurial-hg-extension-path.patch \
+ %D%/packages/patches/mercurial-hg-extension-path.patch \
+ %D%/packages/patches/mercurial-openssl-compat.patch \
%D%/packages/patches/mesa-opencl-all-targets.patch \
- %D%/packages/patches/mesa-skip-tests.patch \
%D%/packages/patches/meson-allow-dirs-outside-of-prefix.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mia-fix-boost-headers.patch \
diff --cc gnu/packages/gnupg.scm
index 349cd58bcb,f9f39d6116..21bdee57aa
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -292,10 -282,13 +292,10 @@@ compatible to GNU Pth."
(name "gnupg")
;; Note: The 2.2.X releases are Long Term Support (LTS), so stick to it
;; for our stable 'gnupg'.
- ;; Note2: 2.2.33 currently suffers from regressions, so do not update to
it
- ;; (see: https://dev.gnupg.org/T5742).
- (version "2.2.32")
- (replacement gnupg/fixed)
+ (version "2.2.36")
(source (origin
(method url-fetch)
- (uri (string-append "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-";
version
+ (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(patches (search-patches "gnupg-default-pinentry.patch"))
(sha256
diff --cc gnu/packages/node.scm
index 782d109b24,4e9daa522d..99e56e8360
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@@ -289,8 -289,8 +289,8 @@@
http-parser
icu4c
libuv
- `(,nghttp2 "lib")
+ `(,nghttp2-for-node "lib")
- openssl
+ openssl-1.1
zlib
;; Regular build-time dependencies.
perl
@@@ -864,10 -864,10 +864,10 @@@ source files."
(list ;; Runtime dependencies for binaries used as a bootstrap.
c-ares-for-node
brotli
- icu4c-71
+ icu4c
libuv-for-node
- `(,nghttp2 "lib")
+ `(,nghttp2-for-node "lib")
- openssl
+ openssl-1.1
zlib
;; Regular build-time dependencies.
perl
@@@ -883,8 -883,8 +883,8 @@@
libuv-for-node
llhttp-bootstrap
brotli
- `(,nghttp2 "lib")
+ `(,nghttp2-for-node "lib")
- openssl
+ openssl-1.1
python-wrapper ;; for node-gyp (supports python3)
zlib))))
diff --cc gnu/packages/pdf.scm
index 2a24751f55,14f75d9ef9..f3353d8b97
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -82,7 -82,7 +82,8 @@@
#:use-module (gnu packages lua)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
+ #:use-module (gnu packages nss)
+ #:use-module (gnu packages ocr)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
diff --cc gnu/packages/samba.scm
index 9434455c19,360c06d216..3247b3c25a
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@@ -185,14 -186,16 +186,16 @@@ external dependencies."
(define-public samba
(package
(name "samba")
- (version "4.16.4")
+ (version "4.17.0rc3") ;4.16.4 doesn't build with mit-krb5 1.20
(source
+ ;; For updaters: the current PGP fingerprint is
+ ;; 81F5E2832BD2545A1897B713AA99442FB680B620.
(origin
(method url-fetch)
- (uri (string-append "https://download.samba.org/pub/samba/stable/";
+ (uri (string-append "https://download.samba.org/pub/samba/rc/";
"samba-" version ".tar.gz"))
(sha256
- (base32 "0bvhqinxwpbwp4ayhd9q8ga0w89gnkl1m3nrwpj1fnhjzd4ghclm"))))
+ (base32 "1vi5vxv9cmy00wyrrr01xsdf4yc0fa96vj7980l51lnn90fgvj60"))))
(build-system gnu-build-system)
(arguments
(list
diff --cc gnu/packages/tls.scm
index e2842cfa08,7f61bd790b..5ae7cb0f2c
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -381,10 -415,11 +381,10 @@@ OpenSSL for TARGET.
(error "unsupported openssl target architecture")))))
(string-append kernel "-" arch))))
- (define-public openssl
+ (define-public openssl-1.1
(package
(name "openssl")
- (version "1.1.1l")
- (replacement openssl/fixed)
+ (version "1.1.1q")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-";
@@@ -513,9 -543,28 +513,9 @@@
(license license:openssl)
(home-page "https://www.openssl.org/";)))
-(define openssl/fixed
- (package
- (inherit openssl-1.1)
- (name "openssl")
- (version "1.1.1q")
- (source (origin
- (method url-fetch)
- (uri (list (string-append
"https://www.openssl.org/source/openssl-";
- version ".tar.gz")
- (string-append "ftp://ftp.openssl.org/source/";
- "openssl-" version ".tar.gz")
- (string-append "ftp://ftp.openssl.org/source/old/";
- (string-trim-right version
char-set:letter)
- "/openssl-" version ".tar.gz")))
- (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
- (sha256
- (base32
- "1jhhzp4gh6ymidxm1ckjk948l583awp0w3y2nvqdz7022kk9r4yp"))))))
-
(define-public openssl-3.0
(package
- (inherit openssl)
+ (inherit openssl-1.1)
(version "3.0.5")
(source (origin
(method url-fetch)