[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into staging |
|
Date: |
Wed, 1 Jun 2022 06:07:41 -0400 (EDT) |
efraim pushed a commit to branch staging
in repository guix.
commit 64c043e63a4be97f59fd1906c47973a74eedda67
Merge: b1f763de54 75af73e1b7
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Jun 1 12:31:09 2022 +0300
Merge remote-tracking branch 'origin/master' into staging
doc/guix.texi | 14 -
etc/committer.scm.in | 197 +-
etc/completion/bash/guix | 61 +-
gnu/build/image.scm | 24 +-
gnu/local.mk | 32 +-
gnu/packages/ada.scm | 29 -
gnu/packages/admin.scm | 58 +-
gnu/packages/assembly.scm | 19 +-
gnu/packages/astronomy.scm | 53 +-
gnu/packages/audio.scm | 168 +-
gnu/packages/base.scm | 67 +-
gnu/packages/bioconductor.scm | 1966 ++++++------
gnu/packages/bioinformatics.scm | 957 +-----
gnu/packages/bittorrent.scm | 43 -
gnu/packages/boost.scm | 7 -
gnu/packages/check.scm | 315 +-
gnu/packages/chemistry.scm | 92 -
gnu/packages/chromium.scm | 4 +-
gnu/packages/compression.scm | 12 +-
gnu/packages/cpp.scm | 4 +-
gnu/packages/cran.scm | 850 +++---
gnu/packages/crates-io.scm | 142 +-
gnu/packages/cross-base.scm | 3 +
gnu/packages/cups.scm | 3 +-
gnu/packages/databases.scm | 224 +-
gnu/packages/debian.scm | 151 +-
gnu/packages/dico.scm | 36 +-
gnu/packages/diffoscope.scm | 11 +-
gnu/packages/display-managers.scm | 143 +-
gnu/packages/djvu.scm | 369 +--
gnu/packages/education.scm | 203 --
gnu/packages/emacs-xyz.scm | 231 +-
gnu/packages/embedded.scm | 30 -
gnu/packages/engineering.scm | 3 -
gnu/packages/enlightenment.scm | 31 -
gnu/packages/esolangs.scm | 50 +-
gnu/packages/finance.scm | 17 +-
gnu/packages/fontutils.scm | 70 +-
gnu/packages/freedesktop.scm | 170 +-
gnu/packages/freeipmi.scm | 6 +-
gnu/packages/game-development.scm | 211 +-
gnu/packages/games.scm | 39 +-
gnu/packages/gcc.scm | 4 +-
gnu/packages/gimp.scm | 208 +-
gnu/packages/gl.scm | 44 +-
gnu/packages/glib.scm | 70 +-
gnu/packages/gnome.scm | 173 +-
gnu/packages/gnupg.scm | 71 +-
gnu/packages/gnuzilla.scm | 1459 ++++-----
gnu/packages/graph.scm | 12 +-
gnu/packages/graphics.scm | 70 -
gnu/packages/graphviz.scm | 36 +-
gnu/packages/gtk.scm | 228 +-
gnu/packages/guile-wm.scm | 51 +-
gnu/packages/guile-xyz.scm | 91 +-
gnu/packages/hardware.scm | 36 -
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/image-processing.scm | 139 +-
gnu/packages/image.scm | 19 -
gnu/packages/iso-codes.scm | 6 -
gnu/packages/java.scm | 4 +-
gnu/packages/key-mon.scm | 25 -
gnu/packages/language.scm | 437 ---
gnu/packages/libffi.scm | 3 -
gnu/packages/libusb.scm | 6 -
gnu/packages/linux.scm | 32 +-
gnu/packages/lirc.scm | 15 +-
gnu/packages/llvm.scm | 19 +-
gnu/packages/machine-learning.scm | 82 -
gnu/packages/mail.scm | 78 +-
gnu/packages/maths.scm | 47 +-
gnu/packages/music.scm | 570 ++--
gnu/packages/networking.scm | 6 +-
gnu/packages/nss.scm | 10 +-
gnu/packages/nutrition.scm | 160 +-
gnu/packages/ocaml.scm | 16 +-
gnu/packages/ocr.scm | 17 -
gnu/packages/openbox.scm | 20 +-
gnu/packages/password-utils.scm | 45 +-
gnu/packages/patches/4store-fix-buildsystem.patch | 56 -
.../4store-unset-preprocessor-directive.patch | 16 -
gnu/packages/patches/breezy-fix-gio.patch | 338 +++
.../patches/casync-renameat2-declaration.patch | 27 -
.../emacs-deferred-fix-number-of-arguments.patch | 58 +
.../patches/emacs-helpful-fix-docstring-test.patch | 18 +
.../gcc-12-cross-environment-variables.patch | 54 +
.../patches/gourmet-sqlalchemy-compat.patch | 18 +
.../patches/guile-ac-d-bus-fix-tests.patch | 28 +
.../patches/itk-snap-alt-glibc-compat.patch | 22 +
gnu/packages/patches/mia-fix-boost-headers.patch | 479 +++
gnu/packages/patches/mozjs17-aarch64-support.patch | 60 -
gnu/packages/patches/mozjs24-aarch64-support.patch | 21 -
.../patches/mozjs38-pkg-config-version.patch | 24 -
gnu/packages/patches/mozjs38-shell-version.patch | 67 -
gnu/packages/patches/mozjs38-tracelogger.patch | 608 ----
.../patches/mozjs38-version-detection.patch | 180 --
gnu/packages/patches/mozjs60-riscv64-support.patch | 122 -
gnu/packages/patches/openbox-python3.patch | 165 +
.../python2-parameterized-docstring-test.patch | 18 -
.../patches/python2-pygobject-2-deprecation.patch | 39 -
.../python2-subprocess32-disable-input-test.patch | 18 -
gnu/packages/patches/rapicorn-isnan.patch | 87 -
.../virtuoso-ose-remove-pre-built-jar-files.patch | 117 +
gnu/packages/patches/vtk-7-gcc-10-compat.patch | 14 +
gnu/packages/patches/vtk-7-hdf5-compat.patch | 38 +
gnu/packages/patches/vtk-7-python-compat.patch | 16 +
gnu/packages/patches/wicd-bitrate-none-fix.patch | 24 -
.../patches/wicd-get-selected-profile-fix.patch | 16 -
gnu/packages/patches/wicd-urwid-1.3.patch | 18 -
gnu/packages/patches/wicd-wpa2-ttls.patch | 38 -
gnu/packages/patchutils.scm | 29 -
gnu/packages/pdf.scm | 83 +-
gnu/packages/polkit.scm | 2 +-
gnu/packages/protobuf.scm | 8 +-
gnu/packages/pulseaudio.scm | 52 -
gnu/packages/python-build.scm | 33 +-
gnu/packages/python-check.scm | 82 +
gnu/packages/python-compression.scm | 32 -
gnu/packages/python-crypto.scm | 119 +-
gnu/packages/python-science.scm | 387 +--
gnu/packages/python-web.scm | 348 ++-
gnu/packages/python-xyz.scm | 3157 +++-----------------
gnu/packages/python.scm | 280 +-
gnu/packages/qt.scm | 144 +-
gnu/packages/radio.scm | 24 -
gnu/packages/rdf.scm | 40 +-
gnu/packages/rsync.scm | 4 +-
gnu/packages/sagemath.scm | 6 -
gnu/packages/security-token.scm | 3 -
gnu/packages/sphinx.scm | 78 +-
gnu/packages/statistics.scm | 241 +-
gnu/packages/sync.scm | 67 +-
gnu/packages/syncthing.scm | 2 -
gnu/packages/syndication.scm | 25 -
gnu/packages/terminals.scm | 6 -
gnu/packages/text-editors.scm | 36 -
gnu/packages/time.scm | 75 -
gnu/packages/tor.scm | 11 +
gnu/packages/version-control.scm | 109 +-
gnu/packages/video.scm | 124 +-
gnu/packages/vim.scm | 7 +-
gnu/packages/virtualization.scm | 67 +-
gnu/packages/web-browsers.scm | 17 +-
gnu/packages/web.scm | 54 +-
gnu/packages/wget.scm | 95 +-
gnu/packages/wicd.scm | 197 --
gnu/packages/wm.scm | 37 +-
gnu/packages/wxwidgets.scm | 73 -
gnu/packages/xdisorg.scm | 7 +-
gnu/packages/xml.scm | 25 +-
gnu/services.scm | 2 +-
gnu/services/desktop.scm | 58 +-
gnu/services/herd.scm | 36 +-
gnu/services/networking.scm | 62 -
gnu/system/image.scm | 8 +-
gnu/system/linux-container.scm | 3 +-
guix/build-system/r.scm | 2 +-
guix/build/bzr.scm | 8 +-
guix/bzr-download.scm | 6 +-
guix/diagnostics.scm | 2 +-
guix/import/cran.scm | 4 +-
guix/import/minetest.scm | 4 +-
guix/lint.scm | 24 +-
guix/packages.scm | 2 +-
guix/scripts/import.scm | 39 +-
guix/scripts/substitute.scm | 12 +-
guix/store.scm | 21 +-
guix/utils.scm | 37 +-
tests/crate.scm | 4 +-
tests/profiles.scm | 2 +-
170 files changed, 7392 insertions(+), 13362 deletions(-)
diff --cc gnu/packages/gl.scm
index 656eb02fe0,d3ee7aed93..c740c087dd
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@@ -288,34 -288,26 +288,28 @@@ also known as DXTn or DXTC) for Mesa."
libxxf86vm
xorgproto))
(inputs
- `(("expat" ,expat)
- ("libelf" ,elfutils) ;required for r600 when using llvm
- ("libva" ,(force libva-without-mesa))
- ("libxml2" ,libxml2)
- ("libxrandr" ,libxrandr)
- ("libxvmc" ,libxvmc)
- ;; Note: update the 'clang' input of mesa-opencl when bumping this.
- ("llvm" ,llvm-11)
- ("wayland" ,wayland)
- ("wayland-protocols" ,wayland-protocols)))
+ (append (list expat
+ elfutils ;libelf required for r600 when
using llvm
+ (force libva-without-mesa)
+ libxml2
+ libxrandr
+ libxvmc
+ wayland
+ wayland-protocols)
- (if (member (%current-system)
- '("x86_64-linux" "i686-linux" "powerpc64le-linux"
- "aarch64-linux" "powerpc-linux" "riscv64-linux"))
- ;; Note: update the 'clang' input of mesa-opencl when
bumping this.
- (list llvm-11)
- '())))
++ ;; TODO: Resort alphabetically.
++ ;; Note: update the 'clang' input of mesa-opencl when bumping
this.
++ (list llvm-11)))
(native-inputs
- `(("bison" ,bison)
- ("flex" ,flex)
- ("gettext" ,gettext-minimal)
- ("glslang" ,glslang)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("python-libxml2", python-libxml2) ;for OpenGL ES 1.1 and 2.0 support
- ("python-mako" ,python-mako)
- ("which" ,(@ (gnu packages base) which))))
+ (append (list bison
+ flex
+ gettext-minimal
+ pkg-config
+ python-wrapper
+ python-libxml2 ;for OpenGL ES 1.1 and 2.0
support
+ python-mako
+ (@ (gnu packages base) which))
- (if (member (%current-system)
- '("x86_64-linux" "i686-linux" "powerpc64le-linux"
- "aarch64-linux" "powerpc-linux" "riscv64-linux"))
- (list glslang)
- '())))
++ ;; TODO: Resort alphabetically.
++ (list glslang)))
(outputs '("out" "bin"))
(arguments
`(#:configure-flags
diff --cc gnu/packages/python-crypto.scm
index 6427dc7868,753f6bb503..84e9102bee
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@@ -449,13 -437,10 +437,10 @@@ for example, for recording or replayin
is used by the Requests library to verify HTTPS requests.")
(license license:asl2.0)))
- (define-public python2-certifi
- (package-with-python2 python-certifi))
-
-(define-public python-cryptography-vectors
+(define-public python-cryptography-vectors-next
(package
(name "python-cryptography-vectors")
- (version "3.3.1")
+ (version "36.0.1")
(source
(origin
(method url-fetch)
@@@ -588,88 -607,9 +573,44 @@@
python-pytest
python-pytest-subtests
python-setuptools-rust
- rust `(,rust "cargo")))
- (properties '())))
+ rust
+ `(,rust "cargo")))
+ (home-page "https://github.com/pyca/cryptography";)
+ (synopsis "Cryptographic recipes and primitives for Python")
+ (description
+ "cryptography is a package which provides cryptographic recipes and
+primitives to Python developers. It aims to be the “cryptographic standard
+library” for Python. The package includes both high level recipes, and low
+level interfaces to common cryptographic algorithms such as symmetric ciphers,
+message digests and key derivation functions.")
+ ;; Distributed under either BSD-3 or ASL2.0
- (license (list license:bsd-3 license:asl2.0))
- (properties `((python2-variant . ,(delay python2-cryptography))))))
++ (license (list license:bsd-3 license:asl2.0))))
+
+(define-public python-cryptography
+ (package
+ (inherit python-cryptography-next)
+ (version "3.4.8")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "cryptography" version))
+ (sha256
+ (base32
"072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"))))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'set-no-rust
+ (lambda _
+ (setenv "CRYPTOGRAPHY_DONT_BUILD_RUST" "1"))))))
+ (inputs (list openssl))
+ (native-inputs
+ (list python-cryptography-vectors
+ python-hypothesis
+ python-pretend
+ python-pytz
+ python-pytest
+ python-setuptools-rust))))
- (define-public python2-cryptography-vectors
- (package
- (inherit python-cryptography-vectors)
- (name "python2-cryptography-vectors")
- (version "3.3.2")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "cryptography_vectors" version))
- (sha256
- (base32
- "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc"))))
- (arguments
- (list #:python python-2))))
-
- (define-public python2-cryptography
- (let ((crypto (package-with-python2
- (strip-python2-variant python-cryptography))))
- (package
- (inherit crypto)
- (version "3.3.2")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "cryptography" version))
- (sha256
- (base32
- "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s"))))
- (arguments
- `(#:python ,python-2
- #:phases
- (modify-phases %standard-phases
- ;; The sanity-check attempts attempts to import the non-existent
- ;; modules "_openssl" and "_padding".
- (delete 'sanity-check))))
- (native-inputs
- (list python2-cryptography-vectors python2-hypothesis python2-pretend
- python2-pytz python2-pytest))
- (inputs (list openssl))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs crypto)
- (prepend python2-ipaddress
- python2-backport-ssl-match-hostname
- python2-enum34))))))
-
+;; This is the last version which is compatable with python-cryptography < 35.
(define-public python-pyopenssl
(package
(name "python-pyopenssl")