[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates-frozen
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates-frozen |
|
Date: |
Tue, 23 Nov 2021 05:31:28 -0500 (EST) |
civodul pushed a commit to branch core-updates-frozen
in repository guix.
commit b15e543d303ea58fdc0f0541c708389f9d513e3d
Merge: 4efc08d daf7b5e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Nov 23 11:22:30 2021 +0100
Merge branch 'master' into core-updates-frozen
NEWS | 11 +
configure.ac | 2 +-
doc/contributing.texi | 12 +-
doc/guix.texi | 223 +++++---
gnu/bootloader.scm | 16 +-
gnu/build/file-systems.scm | 36 +-
gnu/home/services.scm | 2 +-
gnu/local.mk | 5 +-
gnu/packages/algebra.scm | 12 +-
gnu/packages/bioconductor.scm | 83 +--
gnu/packages/bioinformatics.scm | 6 +-
gnu/packages/bittorrent.scm | 44 +-
gnu/packages/calendar.scm | 30 +
gnu/packages/chromium.scm | 8 +-
gnu/packages/compression.scm | 12 +
gnu/packages/coq.scm | 235 ++++----
gnu/packages/crates-io.scm | 27 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 63 ++-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 223 +++++---
gnu/packages/embedded.scm | 33 ++
gnu/packages/emulators.scm | 4 +-
gnu/packages/fonts.scm | 8 +-
gnu/packages/game-development.scm | 54 ++
gnu/packages/games.scm | 12 +-
gnu/packages/geo.scm | 43 +-
gnu/packages/gnome-xyz.scm | 34 ++
gnu/packages/gnome.scm | 11 +-
gnu/packages/gnuzilla.scm | 39 ++
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/ibus.scm | 31 ++
gnu/packages/linux.scm | 81 ++-
gnu/packages/lisp-xyz.scm | 562 ++++++++++++++++++-
gnu/packages/messaging.scm | 42 ++
gnu/packages/networking.scm | 4 +-
gnu/packages/ocaml.scm | 615 +++++++++++++--------
gnu/packages/openldap.scm | 9 +-
gnu/packages/package-management.scm | 6 +-
.../ocaml-ppx-variants-ppxlib-api-change.patch | 42 --
.../patches/ocaml-qcheck-fix-test-whitespace.patch | 24 +
.../patches/rust-shell2batch-lint-fix.patch | 25 +
gnu/packages/perl-check.scm | 4 +-
gnu/packages/perl.scm | 21 +-
gnu/packages/python-xyz.scm | 106 +++-
gnu/packages/scsi.scm | 7 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/spreadsheet.scm | 121 ++++
gnu/packages/statistics.scm | 202 ++++++-
gnu/packages/version-control.scm | 30 +
gnu/packages/video.scm | 42 +-
gnu/packages/visidata.scm | 64 ---
gnu/packages/web-browsers.scm | 12 +-
gnu/packages/web.scm | 4 +-
gnu/packages/wm.scm | 90 +++
gnu/packages/xdisorg.scm | 4 +-
gnu/packages/xfce.scm | 12 +-
gnu/packages/xfig.scm | 9 +-
gnu/services/base.scm | 105 ++--
gnu/services/docker.scm | 6 +
gnu/system.scm | 51 +-
gnu/system/examples/desktop.tmpl | 7 +-
gnu/system/file-systems.scm | 24 +-
guix/build-system/asdf.scm | 3 +-
guix/build/syscalls.scm | 12 +
guix/diagnostics.scm | 38 +-
guix/docker.scm | 9 +-
guix/gnupg.scm | 31 +-
guix/import/opam.scm | 5 +-
guix/import/texlive.scm | 264 +++++----
guix/scripts/graph.scm | 2 +-
guix/scripts/home.scm | 10 +-
guix/scripts/import/texlive.scm | 16 +-
guix/svn-download.scm | 31 +-
nix/libutil/util.cc | 9 +-
tests/texlive.scm | 221 +++++---
76 files changed, 3265 insertions(+), 1052 deletions(-)
diff --cc gnu/local.mk
index cf69842,3227fc3..351c81b
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1514,9 -1533,7 +1514,9 @@@ dist_patch_DATA =
%D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
%D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
%D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
+ %D%/packages/patches/ocaml-multiple-definitions.patch \
+ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \
- %D%/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch \
+ %D%/packages/patches/ocaml-qcheck-fix-test-whitespace.patch \
%D%/packages/patches/omake-fix-non-determinism.patch \
%D%/packages/patches/oneko-remove-nonfree-characters.patch \
%D%/packages/patches/onnx-optimizer-system-library.patch \
@@@ -1734,7 -1742,9 +1734,8 @@@
%D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
- %D%/packages/patches/rust-reproducible-builds.patch \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
+ %D%/packages/patches/rust-shell2batch-lint-fix.patch \
%D%/packages/patches/sbc-fix-build-non-x86.patch \
%D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \
%D%/packages/patches/sbcl-clml-fix-types.patch \
diff --cc gnu/packages/algebra.scm
index cc7cc81,b704d98..1beb739
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@@ -245,11 -245,11 +245,11 @@@ the real span of the lattice."
version ".tar.gz"))
(sha256
(base32
- "095s7vdlsxmxa0n0l1a082m6gjaypqfqkaj99z8j7dx0ji89hy8n"))))
+ "1jm1cz1687cz8pl8lgvmyk3l33cms1xbayv38ca4z1f60qb7zfnc"))))
(build-system gnu-build-system)
(native-inputs
- `(("texlive" ,(texlive-union
- (list texlive-amsfonts/patched)))))
+ `(("texlive" ,(texlive-updmap.cfg
+ (list texlive-amsfonts)))))
(inputs `(("gmp" ,gmp)
("libx11" ,libx11)
("perl" ,perl)
diff --cc gnu/packages/gnome-xyz.scm
index 087dd97,9d8ec1b..a638624
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@@ -11,7 -11,7 +11,8 @@@
;;; Copyright © 2020 Ellis Kenyo <me@elken.dev>
;;; Copyright © 2020 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+ ;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gnuzilla.scm
index 41beaf4,df344a1..579103b
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -16,8 -16,7 +16,9 @@@
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2021 Baptiste Strazzul <bstrazzull@hotmail.fr>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/ibus.scm
index 297d490,ab4b822..4cf6762
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@@ -7,7 -7,7 +7,8 @@@
;;; Copyright © 2018, 2019, 2020, 2021 Peng Mei Yu <pengmeiyu@riseup.net>
;;; Copyright © 2020 kanichos <kanichos@yandex.ru>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
+ ;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -51,10 -51,9 +53,11 @@@
#:use-module (gnu packages gtk)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages logging)
+ #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages textutils)
diff --cc gnu/packages/ocaml.scm
index f4ff04b,123f05d..1101227
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@@ -1519,6 -1510,46 +1505,45 @@@ It provides support for ANSI C syntax,
GNU CC attributes. It provides also a C pretty printer as an example of
use.")
(license license:lgpl2.1)))
+ (define-public ocaml4.07-frontc
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-frontc)
+ (version "3.4.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mirage/ocaml-base64";)
+ (commit (string-append
+ "V_" (string-join (string-split version #\.)
"_")))))
+ (file-name (git-file-name "ocaml-frontc" version))
+ (sha256
+ (base32
+ "0k7jk9hkglnkk27s62xl493jyqc017gyvwqb1lyc0ywbb001s102"))))
+ (build-system ocaml-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'install 'install-meta
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (with-output-to-file
+ (string-append out "/lib/ocaml/frontc/META")
+ (lambda _
+ (display
+ (string-append
+ "description = \"Parser for the C language\"
+ version = \"" ,version "\"
+ requires = \"unix\"
+ archive(byte) = \"frontc.cma\"
+ archive(native) = \"frontc.cmxa\""))))
+ (symlink (string-append out "/lib/ocaml/frontc")
+ (string-append out "/lib/ocaml/FrontC"))))))
- #:make-flags (list (string-append "PREFIX="
- (assoc-ref %outputs "out"))
- "OCAML_SITE=$(LIB_DIR)/ocaml/")))
++ #:make-flags ,#~(list (string-append "PREFIX=" #$output)
++ "OCAML_SITE=$(LIB_DIR)/ocaml/")))
+ (properties '()))))
+
(define-public ocaml-qcheck
(package
(name "ocaml-qcheck")
diff --cc gnu/packages/python-xyz.scm
index a738f2e,fdbca24..822555a
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -8894,10 -8962,33 +8902,35 @@@ implementation of D-Bus."
(inputs `(("python" ,python-2)
,@(alist-delete "python"
(package-inputs python-dbus)
- equal?)))))
+ equal?)))
+ (arguments
+ `(#:configure-flags '("PYTHON_VERSION=2")))))
+ (define-public python-dbus-next
+ (package
+ (name "python-dbus-next")
+ (version "0.2.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/altdesktop/python-dbus-next";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ahaz52kny1p9xxv6phvk4iq56rg8li390wywlxf2yslaij1188h"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-pytest" ,python-pytest)))
+ (home-page "https://github.com/altdesktop/python-dbus-next";)
+ (synopsis "Zero-dependency DBus library for Python with asyncio support")
+ (description
+ "This DBus library for Python aims to be a fully-featured high-level
+ library primarily geared towards integration of applications into desktop and
+ mobile environments.")
+ (license license:expat)))
+
(define-public python-notify2
(package
(name "python-notify2")
@@@ -27958,3 -28039,46 +28031,22 @@@ simple mock/record and a complete captu
interfaces.")
(license license:bsd-3)))
-(define-public python-sgmllib3k
- (package
- (name "python-sgmllib3k")
- (version "1.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "sgmllib3k" version))
- (sha256
- (base32 "1s8jm3dgqabgf8x96931scji679qkhvczlv3qld4qxpsicfgns3q"))))
- (build-system python-build-system)
- ;; Requires a test.html input that is not supplied
- (arguments
- `(#:tests? #f))
- (home-page "https://pypi.org/project/sgmllib3k/";)
- ;; Actual homepage seems to be down
- ;; (home-page "https://hg.hardcoded.net/sgmllib";)
- (synopsis "Python 3 port of sgmllib")
- (description
- "This package provides an unmaintained port of sgmllib to Python 3.
-It is used to parse text files formatted in @acronym{SGML,Standard Generalized
-Mark-up Language}.")
- (license license:bsd-3)))
-
+ (define-public python-iwlib
+ (package
+ (name "python-iwlib")
+ (version "1.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "iwlib" version))
+ (sha256
+ (base32 "18bd35wn7zclalpqbry42pf7bjrdggxkkw58mc0k1vkhg9czc1d8"))))
+ (build-system python-build-system)
+ (inputs
+ `(("wireless-tools" ,wireless-tools)))
+ (propagated-inputs `(("python-cffi" ,python-cffi)))
+ (home-page "https://github.com/nhoad/python-iwlib";)
+ (synopsis "Python module to interface with iwlib")
+ (description
+ "This package provides a Python interface to iw wireless tools.")
+ (license license:gpl2)))
diff --cc gnu/packages/statistics.scm
index 9a4cdd2,f60b299..b090761
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@@ -12,9 -12,9 +12,10 @@@
;;; Copyright © 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2020 Tim Howes <timhowes@lavabit.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
+ ;;; Copyright © 2021 Frank Pursel <frank.pursel@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/version-control.scm
index 9d1c84b,10487c6..d80f7c5
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -40,8 -40,8 +40,9 @@@
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 François J. <francois-oss@avalenn.eu>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 jgart <jgart@dismail.de>
+ ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/wm.scm
index 176c1bf,4740d26..0d9ad91
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@@ -81,8 -81,9 +81,9 @@@
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
- #:use-module (gnu packages build-tools) ;for meson-0.55
+ #:use-module (gnu packages build-tools)
#:use-module (gnu packages calendar)
+ #:use-module (gnu packages check)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
diff --cc guix/import/opam.scm
index f8402ff,eb384ba..d9fdf45
--- a/guix/import/opam.scm
+++ b/guix/import/opam.scm
@@@ -317,11 -319,11 +318,11 @@@ path to the repository.
(_ others)))
#f
(filter-map get-opam-repository repositories-specs))
- (leave (G_ "package '~a' not found~%") name)))
+ (warning (G_ "opam: package '~a' not found~%") name)))
-(define* (opam->guix-package name #:key (repo '()) version)
- "Import OPAM package NAME from REPOSITORIES (a list of names, URLs or local
-paths, always including OPAM's official repository). Return a 'package' sexp
+(define* (opam->guix-package name #:key (repo 'opam) version)
+ "Import OPAM package NAME from REPOSITORY (a directory name) or, if
+REPOSITORY is #f, from the official OPAM repository. Return a 'package' sexp
or #f on failure."
(and-let* ((with-opam (if (member "opam" repo) repo (cons "opam" repo)))
(opam-file (opam-fetch name with-opam))
diff --cc guix/svn-download.scm
index 28ad499,e5fe8f1..55ce0d7
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@@ -1,7 -1,7 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
- ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
+ ;;; Copyright © 2017, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;