[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into ungrafting
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into ungrafting |
|
Date: |
Sat, 12 Dec 2020 19:22:16 -0500 (EST) |
mbakke pushed a commit to branch ungrafting
in repository guix.
commit a7737f0ead2293536b9d0ba253de4673378a0ffa
Merge: ba47c83 1adeb74
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Dec 13 01:10:06 2020 +0100
Merge branch 'master' into ungrafting
Makefile.am | 1 +
config-daemon.ac | 3 +-
configure.ac | 12 +-
doc/guix.texi | 30 +
etc/guix-daemon.cil.in | 4 +-
etc/news.scm | 26 +-
gnu/installer.scm | 7 +
gnu/installer/newt.scm | 5 +
gnu/installer/newt/substitutes.scm | 43 +
gnu/installer/proxy.scm | 6 +-
gnu/installer/record.scm | 3 +
gnu/installer/services.scm | 8 +-
gnu/installer/{proxy.scm => substitutes.scm} | 20 +-
gnu/installer/utils.scm | 11 +-
gnu/local.mk | 8 +-
gnu/packages/admin.scm | 4 +-
gnu/packages/autotools.scm | 35 +-
gnu/packages/aux-files/guile-launcher.c | 46 +-
gnu/packages/backup.scm | 44 -
gnu/packages/bioconductor.scm | 1383 +++++++++++++-------
gnu/packages/bioinformatics.scm | 478 ++++---
gnu/packages/busybox.scm | 16 +-
gnu/packages/ci.scm | 8 +-
gnu/packages/cran.scm | 939 ++++++++++---
gnu/packages/crates-io.scm | 446 ++++++-
gnu/packages/curl.scm | 14 +
gnu/packages/databases.scm | 12 +
gnu/packages/dns.scm | 7 +-
gnu/packages/ebook.scm | 28 +
gnu/packages/emacs-xyz.scm | 211 ++-
gnu/packages/engineering.scm | 7 +-
gnu/packages/fcitx5.scm | 450 +++++++
gnu/packages/finance.scm | 8 +-
gnu/packages/game-development.scm | 35 +-
gnu/packages/gimp.scm | 4 +-
gnu/packages/gnome.scm | 4 +-
gnu/packages/gnucash.scm | 18 +-
gnu/packages/golang.scm | 82 ++
gnu/packages/guile-xyz.scm | 76 +-
gnu/packages/image.scm | 63 +
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kde-internet.scm | 4 +-
gnu/packages/kde-multimedia.scm | 4 +-
gnu/packages/kde-pim.scm | 30 +-
gnu/packages/kde-plasma.scm | 4 +-
gnu/packages/kde.scm | 51 +-
gnu/packages/linux.scm | 44 +-
gnu/packages/lisp-xyz.scm | 136 +-
gnu/packages/machine-learning.scm | 4 +-
gnu/packages/mail.scm | 11 +-
gnu/packages/maths.scm | 12 +-
gnu/packages/matrix.scm | 4 +-
gnu/packages/nfs.scm | 5 +-
gnu/packages/ntp.scm | 4 +-
gnu/packages/ocaml.scm | 16 +-
gnu/packages/package-management.scm | 6 +-
.../busybox-1.31.1-fix-build-with-glibc-2.31.patch | 68 -
.../knot-resolver-fix-map-command-on-32-bit.patch | 146 ---
gnu/packages/patches/pciutils-hurd-fix.patch | 23 +
.../patches/renpy-use-system-fribidi.patch | 52 +
.../patches/sbcl-geco-fix-organism-class.patch | 13 -
gnu/packages/pciutils.scm | 15 +-
gnu/packages/python-web.scm | 4 +-
gnu/packages/python-xyz.scm | 38 +-
gnu/packages/ruby.scm | 4 +-
gnu/packages/statistics.scm | 92 +-
gnu/packages/text-editors.scm | 41 +
gnu/packages/video.scm | 4 +-
gnu/packages/visidata.scm | 4 +-
gnu/packages/vpn.scm | 29 +
gnu/packages/web.scm | 157 ++-
gnu/packages/wm.scm | 71 +
gnu/packages/xdisorg.scm | 41 +
gnu/services/avahi.scm | 4 +-
gnu/services/base.scm | 4 +-
gnu/services/cuirass.scm | 4 +
gnu/services/science.scm | 18 +
gnu/services/security-token.scm | 3 +-
gnu/services/ssh.scm | 18 +-
gnu/system/install.scm | 6 +
guix/avahi.scm | 9 +-
guix/build-system/r.scm | 2 +-
guix/download.scm | 21 +-
guix/glob.scm | 15 +
guix/http-client.scm | 12 +-
guix/import/cran.scm | 10 +-
guix/import/opam.scm | 58 +-
guix/import/utils.scm | 4 +-
guix/progress.scm | 8 +-
guix/scripts/import/cran.scm | 9 +-
guix/scripts/import/opam.scm | 10 +-
guix/scripts/substitute.scm | 253 ++--
guix/self.scm | 26 +-
guix/store/database.scm | 2 -
m4/guix.m4 | 4 +-
nix/libstore/build.cc | 173 +--
nix/libstore/local-store.cc | 170 +--
nix/libstore/local-store.hh | 25 +-
nix/libutil/util.cc | 6 +-
nix/libutil/util.hh | 7 +-
po/guix/POTFILES.in | 1 +
scripts/guix.in | 2 +-
tests/glob.scm | 8 +-
tests/opam.scm | 67 +-
tests/substitute.scm | 98 +-
105 files changed, 4868 insertions(+), 1933 deletions(-)
diff --cc gnu/packages/curl.scm
index a03888c,33a2188..98fc6b3
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -53,14 -53,16 +53,15 @@@
(define-public curl
(package
(name "curl")
- (version "7.69.1")
+ (version "7.73.0")
+ (replacement curl-7.74.0)
(source (origin
- (method url-fetch)
- (uri (string-append "https://curl.haxx.se/download/curl-";
- version ".tar.xz"))
- (sha256
- (base32
- "0kwxh76iq9fblk7iyv4f75bmcmasarp2bcm1mm07wyvzd7kdbiq3"))
- (patches (search-patches "curl-use-ssl-cert-env.patch"))))
+ (method url-fetch)
+ (uri (string-append "https://curl.haxx.se/download/curl-";
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "12j0qaij1ppgspray8xvs2qk3h3m23wdqh27x87y1aw8xaj7qk3w"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.2 MiB of man3 pages
@@@ -150,6 -171,31 +151,19 @@@ tunneling, and so on."
(name "curl-minimal")
(inputs (alist-delete "openldap" (package-inputs curl))))))
+ ;; Replacement package to fix multiple security vulnerabilities.
+ (define curl-7.74.0
+ (package
+ (inherit curl)
+ (version "7.74.0")
+ (source (origin
+ (inherit (package-source curl))
+ (uri (string-append "https://curl.haxx.se/download/curl-";
+ version ".tar.xz"))
+ (sha256
+ (base32
- "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr"))))
- (arguments
- (substitute-keyword-arguments (package-arguments curl)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'check
- (lambda _
- ;; Test 1510 is now disabled upstream, and the test runner
- ;; complains that it can not disable a non-existing test.
- ;; Thus, override the phase to not delete the test.
- (substitute* "tests/runtests.pl"
- (("/bin/sh") (which "sh")))
- (invoke "make" "-C" "tests" "test")))))))))
++ "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr"))))))
+
(define-public kurly
(package
(name "kurly")