[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: |
Wed, 13 Oct 2021 18:06:23 -0400 (EDT) |
mbakke pushed a commit to branch core-updates-frozen
in repository guix.
commit 0f77e50139b023cb1a5a82ac3a0b9b7fa990c45b
Merge: 641b31d 1961b28
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Oct 14 00:01:12 2021 +0200
Merge branch 'master' into core-updates-frozen
gnu/local.mk | 5 +-
gnu/packages/admin.scm | 28 +++
gnu/packages/c.scm | 5 +-
gnu/packages/code.scm | 30 +++
gnu/packages/compression.scm | 25 +--
gnu/packages/databases.scm | 2 +-
gnu/packages/django.scm | 2 +-
gnu/packages/dns.scm | 53 +++++
gnu/packages/file-systems.scm | 2 +-
gnu/packages/finance.scm | 41 ++--
gnu/packages/fonts.scm | 2 +-
gnu/packages/fontutils.scm | 2 +-
gnu/packages/games.scm | 5 +-
gnu/packages/gnome.scm | 33 +--
gnu/packages/gnucash.scm | 6 +-
gnu/packages/golang.scm | 35 ++++
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/image.scm | 9 +-
gnu/packages/linux.scm | 110 ++++++----
gnu/packages/lisp-xyz.scm | 231 +++++++++++++++++++++
gnu/packages/mail.scm | 19 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/node.scm | 8 +-
gnu/packages/openstack.scm | 6 +-
gnu/packages/package-management.scm | 6 +-
.../patches/cpufrequtils-fix-aclocal.patch | 46 ----
gnu/packages/patches/ganeti-sphinx-compat.patch | 24 +++
.../patches/libhx-fix-double-free-bug.patch | 80 +++++++
gnu/packages/patches/qemu-meson-compat.patch | 27 ---
gnu/packages/patches/qemu-sphinx-compat.patch | 18 --
gnu/packages/python-compression.scm | 20 --
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 12 +-
gnu/packages/serialization.scm | 50 +++++
gnu/packages/shellutils.scm | 53 +++++
gnu/packages/suckless.scm | 31 +++
gnu/packages/tcl.scm | 4 +-
gnu/packages/vim.scm | 29 +++
gnu/packages/virtualization.scm | 37 ++--
gnu/packages/web.scm | 4 +-
gnu/system/linux-initrd.scm | 3 +
guix/self.scm | 22 +-
42 files changed, 864 insertions(+), 268 deletions(-)
diff --cc gnu/local.mk
index a2201a5,8c30eaa..c1f2399
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -958,9 -953,7 +958,8 @@@ dist_patch_DATA =
%D%/packages/patches/collectd-5.11.0-noinstallvar.patch \
%D%/packages/patches/combinatorial-blas-awpm.patch \
%D%/packages/patches/combinatorial-blas-io-fix.patch \
+ %D%/packages/patches/coreutils-gnulib-tests.patch \
%D%/packages/patches/coreutils-ls.patch \
- %D%/packages/patches/cpufrequtils-fix-aclocal.patch \
%D%/packages/patches/cpuinfo-system-libraries.patch \
%D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crda-optional-gcrypt.patch \
@@@ -1071,8 -1065,10 +1070,9 @@@
%D%/packages/patches/ganeti-disable-version-symlinks.patch \
%D%/packages/patches/ganeti-haskell-compat.patch \
%D%/packages/patches/ganeti-haskell-pythondir.patch \
- %D%/packages/patches/ganeti-preserve-PYTHONPATH.patch \
%D%/packages/patches/ganeti-shepherd-master-failover.patch \
%D%/packages/patches/ganeti-shepherd-support.patch \
+ %D%/packages/patches/ganeti-sphinx-compat.patch \
%D%/packages/patches/gash-utils-ls-test.patch \
%D%/packages/patches/gawk-shell.patch \
%D%/packages/patches/gcc-arm-bug-71399.patch \
diff --cc gnu/packages/virtualization.scm
index 5ab95e5,0dd05a6..77b2997
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@@ -523,9 -519,11 +518,10 @@@ firmware blobs. You ca
(file-name (git-file-name name version))
(patches (search-patches "ganeti-shepherd-support.patch"
"ganeti-shepherd-master-failover.patch"
+ "ganeti-sphinx-compat.patch"
"ganeti-haskell-compat.patch"
"ganeti-haskell-pythondir.patch"
- "ganeti-disable-version-symlinks.patch"
- "ganeti-preserve-PYTHONPATH.patch"))))
+
"ganeti-disable-version-symlinks.patch"))))
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
@@@ -533,6 -531,10 +529,9 @@@
(guix build python-build-system))
#:modules (,@%gnu-build-system-modules
((guix build haskell-build-system) #:prefix haskell:)
- ((guix build python-build-system) #:select (python-version))
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (ice-9 match)
(ice-9 rdelim))
;; The default test target includes a lot of checks that are only
really
@@@ -735,18 -754,23 +734,18 @@@
;; Note that 'burnin' is listed with the
;; absolute file name, which is why we
;; run everything through 'basename'.
- (cons (basename (car (reverse
(string-split
- line #\
))))
- progs))
+ (match (string-split line #\ )
+ ((commands ... prog)
+ (cons (basename prog) progs))))
(loop (read-line port) progs)))))))))))
- ;; Wrap all executables with PYTHONPATH. We can't borrow the phase
- ;; from python-build-system because we also need to wrap the scripts
- ;; in $out/lib/ganeti such as "node-daemon-setup".
+ ;; Wrap all executables with GUIX_PYTHONPATH. We can't borrow
+ ;; the phase from python-build-system because we also need to wrap
+ ;; the scripts in $out/lib/ganeti such as "node-daemon-setup".
(add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(sbin (string-append out "/sbin"))
- (lib (string-append out "/lib"))
- (python (assoc-ref inputs "python"))
- (major+minor (python-version python))
- (PYTHONPATH (string-append lib "/python" major+minor
- "/site-packages:"
- (getenv "PYTHONPATH"))))
+ (lib (string-append out "/lib")))
(define (shell-script? file)
(call-with-ascii-input-file file
(lambda (port)
@@@ -767,11 -791,10 +766,11 @@@
(for-each (lambda (file)
(wrap-program file
- `("PYTHONPATH" ":" prefix (,PYTHONPATH))))
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))))
- (filter wrap?
- (append (find-files (string-append lib
"/ganeti"))
- (find-files sbin))))))))))
+ (append-map (cut find-files <> wrap?)
+ (list (string-append lib "/ganeti")
+ sbin)))))))))
(native-inputs
`(("haskell" ,ghc)
("cabal" ,cabal-install)