Merge remote-tracking branch 'origin/master' into core-updates

Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
This commit is contained in:
Efraim Flashner 2023-01-30 11:33:18 +02:00
commit 4cf1acc7f3
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
740 changed files with 619028 additions and 314277 deletions

View file

@ -187,7 +187,7 @@ a server that supports the SSH-2 protocol.")
(define-public openssh
(package
(name "openssh")
(version "8.9p1")
(version "9.1p1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://openbsd/OpenSSH/portable/"
@ -196,7 +196,7 @@ a server that supports the SSH-2 protocol.")
"openssh-trust-guix-store-directory.patch"))
(sha256
(base32
"1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx"))))
"126jzn5pxkf1dgzcb3lzpzab8airg0avnvr3y23kgqp3qw4m1y0r"))))
(build-system gnu-build-system)
(native-inputs (list groff pkg-config))
(inputs `(("libedit" ,libedit)
@ -307,7 +307,7 @@ Additionally, various channel-specific options can be negotiated.")
'((release-monitoring-url . "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/")))
(home-page "https://www.openssh.com/")))
;; OpenSSH without X support. This allows to use OpenSSH without dragging X
;; OpenSSH without X support. This allows using OpenSSH without dragging X
;; libraries to the closure.
(define-public openssh-sans-x
(package
@ -319,7 +319,7 @@ Additionally, various channel-specific options can be negotiated.")
(define-public guile-ssh
(package
(name "guile-ssh")
(version "0.15.1")
(version "0.16.2")
(home-page "https://github.com/artyom-poptsov/guile-ssh")
(source (origin
(method git-fetch)
@ -329,7 +329,7 @@ Additionally, various channel-specific options can be negotiated.")
(file-name (git-file-name name version))
(sha256
(base32
"0zzn5hsf97b35gixyg4z14sspl15qwnp52y4h89wra4y31l7467q"))))
"1rp5y1xjmsxplrzl0yf23g6rdjsw7ryh5pxs4pydpsryjjdwnf84"))))
(build-system gnu-build-system)
(outputs '("out" "debug"))
(arguments
@ -462,13 +462,13 @@ with optional @acronym{TLS, Transport-Level Security} to protect credentials.")
(define-public mosh
(package
(name "mosh")
(version "1.3.2")
(version "1.4.0")
(source (origin
(method url-fetch)
(uri (string-append "https://mosh.org/mosh-" version ".tar.gz"))
(sha256
(base32
"05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"))))
"1pax8sqlvcc7ammsxd9r53yx4m2hg1827wfz6f4rrwjx9q9lnbl7"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -509,7 +509,7 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.")
(define-public dropbear
(package
(name "dropbear")
(version "2022.82")
(version "2022.83")
(source
(origin
(method url-fetch)
@ -517,7 +517,7 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.")
"https://matt.ucc.asn.au/dropbear/releases/"
"dropbear-" version ".tar.bz2"))
(sha256
(base32 "1lbmmmm8f56p24c6jq74rg2kw6kl3w4i5h10vnxjigq2phmqs0rs"))
(base32 "0fs495ks354qcfj4k5bwg6m50vbl8az03gjymmqm2jy9zcgi4nmw"))
(modules '((guix build utils)))
(snippet
'(begin
@ -535,12 +535,6 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.")
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'enable-x11-forwarding
(lambda _
;; The following patch was retrieved from:
;; https://github.com/mkj/dropbear/commit/
;; 0292aacdf0aa57d03f2a3ab7e53cf650e6f29389.
(substitute* "svr-x11fwd.c"
(("DROPBEAR_CHANNEL_PRIO_INTERACTIVE")
"DROPBEAR_PRIO_LOWDELAY"))
(substitute* "default_options.h"
(("#define DROPBEAR_X11FWD 0")
"#define DROPBEAR_X11FWD 1")))))))