[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/08: Merge branch 'staging' into core-updates |
|
Date: |
Wed, 27 Jul 2022 12:23:59 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6a3ed96af73939df69167b5736d03abf1d7ecebd
Merge: f7815e76b0 4059158e6a
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Jul 27 17:53:05 2022 +0200
Merge branch 'staging' into core-updates
doc/guix.texi | 63 +-
gnu/local.mk | 7 +-
gnu/packages/algebra.scm | 19 +-
gnu/packages/astronomy.scm | 4 +-
gnu/packages/audio.scm | 14 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/clojure.scm | 187 ++-
gnu/packages/cpp.scm | 8 +-
gnu/packages/crates-graphics.scm | 567 ++++++++--
gnu/packages/crates-gtk.scm | 596 ++++++++--
gnu/packages/crates-io.scm | 1195 ++++++++++++++++----
gnu/packages/datamash.scm | 6 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/emacs-xyz.scm | 4 +-
gnu/packages/engineering.scm | 4 +-
gnu/packages/file-systems.scm | 8 +-
gnu/packages/finance.scm | 4 +-
gnu/packages/fontutils.scm | 15 +-
gnu/packages/freedesktop.scm | 46 +-
gnu/packages/gnome.scm | 6 +-
gnu/packages/gnuzilla.scm | 12 +-
gnu/packages/image.scm | 13 +-
gnu/packages/libusb.scm | 15 +-
gnu/packages/linux.scm | 32 +-
gnu/packages/lisp-xyz.scm | 89 ++
gnu/packages/messaging.scm | 46 +-
gnu/packages/music.scm | 35 +-
gnu/packages/networking.scm | 12 +-
gnu/packages/nss.scm | 4 +-
gnu/packages/patches/dbxfs-remove-sentry-sdk.patch | 63 +-
.../patches/eigen-fix-strict-aliasing-bug.patch | 73 ++
.../eigen-remove-openmp-error-counting.patch | 64 --
.../patches/eigen-stabilise-sparseqr-test.patch | 74 --
gnu/packages/patches/php-curl-compat.patch | 17 +
.../php-openssl_x509_checkpurpose_basic.patch | 108 --
gnu/packages/pdf.scm | 23 +-
gnu/packages/perl.scm | 8 +-
gnu/packages/php.scm | 9 +-
gnu/packages/protobuf.scm | 17 +-
gnu/packages/python-xyz.scm | 4 +-
gnu/packages/shells.scm | 15 +-
gnu/packages/toolkits.scm | 6 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 14 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/vpn.scm | 9 +-
gnu/packages/web.scm | 2 +-
gnu/packages/xdisorg.scm | 42 +
guix/build/clojure-build-system.scm | 58 +-
guix/download.scm | 84 +-
guix/scripts/deploy.scm | 32 +-
tests/texlive.scm | 3 +-
53 files changed, 2735 insertions(+), 1023 deletions(-)
diff --cc gnu/packages/version-control.scm
index d18a355187,6652ac717f..0e3f01ede9
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -220,141 -220,140 +220,141 @@@ Python 3.3 and later, rather than on Py
(define-public git
(package
- (name "git")
- (version "2.37.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://kernel.org/software/scm/git/git-"
- version ".tar.xz"))
- (sha256
- (base32
- "001m3gnal902hv22gp1m44c6247357pb80db0svms74gidmjq5n8"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("native-perl" ,perl)
- ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests,
- ;; see <https://bugs.gnu.org/39513>.
- ("bash" ,bash-minimal)
- ("bash-for-tests" ,bash)
- ("gettext" ,gettext-minimal)
- ;; To build the man pages from the git sources, we would need a
dependency
- ;; on a full XML tool chain, and building it actually takes ages. So we
- ;; use this lazy approach and use released tarball.
- ("git-manpages"
- ,(origin
- (method url-fetch)
- (uri (string-append
- "mirror://kernel.org/software/scm/git/git-manpages-"
- version ".tar.xz"))
- (sha256
- (base32
- "098yz8kzvzmmrkyiv8j79s5nryws302pnq6jcbrqbidrziwcxkjd"))))
- ;; For subtree documentation.
- ("asciidoc" ,asciidoc)
- ("docbook-xsl" ,docbook-xsl)
- ("xmlto" ,xmlto)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("curl" ,curl)
- ("expat" ,expat)
- ("openssl" ,openssl)
- ("perl" ,perl)
- ("python" ,python) ; for git-p4
- ("zlib" ,zlib)
-
- ;; For PCRE support in git grep (USE_LIBPCRE2).
- ("pcre" ,pcre2)
-
- ;; For 'gitweb.cgi'.
- ("perl-cgi" ,perl-cgi)
-
- ;; For 'git-svn'.
- ("subversion" ,subversion)
- ("perl-term-readkey" ,perl-term-readkey)
-
- ;; For 'git-send-email'.
- ("perl-authen-sasl" ,perl-authen-sasl)
- ("perl-net-smtp-ssl" ,perl-net-smtp-ssl)
- ("perl-io-socket-ssl" ,perl-io-socket-ssl)
-
- ;; For 'git gui', 'gitk', and 'git citool'.
- ("tcl" ,tcl)
- ("tk" ,tk)
-
- ;; For 'git-credential-libsecret'
- ("glib" ,glib)
- ("libsecret" ,libsecret)))
- (outputs '("out" ; the core
- "send-email" ; for git-send-email
- "svn" ; git-svn
- "credential-netrc" ; git-credential-netrc
- "credential-libsecret" ; git-credential-libsecret
- "subtree" ; git-subtree
- "gui")) ; gitk, git gui
- (arguments
- `(#:make-flags `("V=1" ;more verbose compilation
-
- ,(string-append "SHELL_PATH="
- (assoc-ref %build-inputs "bash")
- "/bin/sh")
-
- ;; Tests require a bash with completion support.
- ,(string-append "TEST_SHELL_PATH="
- (assoc-ref %build-inputs
"bash-for-tests")
- "/bin/bash")
-
- "USE_LIBPCRE2=yes"
-
- ;; By default 'make install' creates hard links for
- ;; things in 'libexec/git-core', which leads to huge
- ;; nars; see <https://bugs.gnu.org/21949>.
- "NO_INSTALL_HARDLINKS=indeed")
-
- ;; Make sure the full bash does not end up in the final closure.
- #:disallowed-references (,bash)
-
- #:test-target "test"
-
- ;; The explicit --with-tcltk forces the build system to hardcode the
- ;; absolute file name to 'wish'.
- #:configure-flags (list (string-append "--with-tcltk="
- (assoc-ref %build-inputs "tk")
- "/bin/wish8.6") ; XXX
- ,@(if (%current-target-system)
- git-cross-configure-flags
- '()))
-
- #:modules ((srfi srfi-1)
- (srfi srfi-26)
- ((guix build gnu-build-system) #:prefix gnu:)
- ,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- ,@(if (%current-target-system)
- ;; The git build system assumes build == host
- `((add-after 'unpack 'use-host-uname_S
- (lambda _
- (substitute* "config.mak.uname"
- (("uname_S := .*" all)
- (if (equal? ,(%current-target-system) "i586-pc-gnu")
- "uname_S := GNU\n"
- all)))
- #t)))
- ;; We do not have bash-for-tests when cross-compiling.
- `((add-after 'unpack 'modify-PATH
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((path (string-split (getenv "PATH") #\:))
- (bash-full (assoc-ref inputs "bash-for-tests")))
- ;; Drop the test bash from PATH so that (which "sh") and
- ;; similar does the right thing.
- (setenv "PATH" (string-join
- (remove (cut string-prefix? bash-full
<>) path)
- ":"))
- #t)))))
- ;; Add cross curl-config script to PATH when cross-compiling.
- ,@(if (%current-target-system)
- '((add-before 'configure 'add-cross-curl-config
+ (name "git")
- (version "2.37.0")
++ (version "2.37.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kernel.org/software/scm/git/git-"
+ version ".tar.xz"))
+ (sha256
+ (base32
- "07s1jmsc1d4dlmr3qpibfzj14gy1gm049zp2vp1lw36h3dqs2zwz"))))
++ "001m3gnal902hv22gp1m44c6247357pb80db0svms74gidmjq5n8"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("native-perl" ,perl)
+ ;; Add bash-minimal explicitly to ensure it comes before
bash-for-tests,
+ ;; see <https://bugs.gnu.org/39513>.
+ ("bash" ,bash-minimal)
+ ("bash-for-tests" ,bash)
+ ("gettext" ,gettext-minimal)
+ ;; To build the man pages from the git sources, we would need a
dependency
+ ;; on a full XML tool chain, and building it actually takes ages. So
we
+ ;; use this lazy approach and use released tarball.
+ ("git-manpages"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kernel.org/software/scm/git/git-manpages-"
+ version ".tar.xz"))
+ (sha256
+ (base32
- "1q68mnbpznapxxyjpysjx5lz8m6y25frxl5yshgx139c0xcr64c0"))))
++ "098yz8kzvzmmrkyiv8j79s5nryws302pnq6jcbrqbidrziwcxkjd"))))
+ ;; For subtree documentation.
+ ("asciidoc" ,asciidoc)
+ ("docbook2x" ,docbook2x)
+ ("docbook-xsl" ,docbook-xsl)
+ ("libxslt" ,libxslt)
+ ("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)
+ ("xmlto" ,xmlto)))
+ (inputs
+ `(("curl" ,curl)
+ ("expat" ,expat)
+ ("openssl" ,openssl)
+ ("perl" ,perl)
+ ("python" ,python) ; for git-p4
+ ("zlib" ,zlib)
+
+ ;; For PCRE support in git grep (USE_LIBPCRE2).
+ ("pcre" ,pcre2)
+
+ ;; For 'gitweb.cgi'.
+ ("perl-cgi" ,perl-cgi)
+
+ ;; For 'git-svn'.
+ ("subversion" ,subversion)
+ ("perl-term-readkey" ,perl-term-readkey)
+
+ ;; For 'git-send-email'.
+ ("perl-authen-sasl" ,perl-authen-sasl)
+ ("perl-net-smtp-ssl" ,perl-net-smtp-ssl)
+ ("perl-io-socket-ssl" ,perl-io-socket-ssl)
+
+ ;; For 'git gui', 'gitk', and 'git citool'.
+ ("tcl" ,tcl)
+ ("tk" ,tk)
+
+ ;; For 'git-credential-libsecret'
+ ("glib" ,glib)
+ ("libsecret" ,libsecret)))
+ (outputs '("out" ; the core
+ "send-email" ; for git-send-email
+ "svn" ; git-svn
+ "credential-netrc" ; git-credential-netrc
+ "credential-libsecret" ; git-credential-libsecret
+ "subtree" ; git-subtree
+ "gui")) ; gitk, git gui
+ (arguments
+ `(#:make-flags `("V=1" ;more verbose compilation
+
+ ,(string-append "SHELL_PATH="
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh")
+
+ ;; Tests require a bash with completion support.
+ ,(string-append "TEST_SHELL_PATH="
+ (assoc-ref %build-inputs
"bash-for-tests")
+ "/bin/bash")
+
+ "USE_LIBPCRE2=yes"
+
+ ;; By default 'make install' creates hard links for
+ ;; things in 'libexec/git-core', which leads to huge
+ ;; nars; see <https://bugs.gnu.org/21949>.
+ "NO_INSTALL_HARDLINKS=indeed")
+
+ ;; Make sure the full bash does not end up in the final closure.
+ #:disallowed-references (,bash)
+
+ #:test-target "test"
+
+ ;; The explicit --with-tcltk forces the build system to hardcode the
+ ;; absolute file name to 'wish'.
+ #:configure-flags (list (string-append "--with-tcltk="
+ (assoc-ref %build-inputs "tk")
+ "/bin/wish8.6") ; XXX
+ ,@(if (%current-target-system)
+ git-cross-configure-flags
+ '()))
+
+ #:modules ((srfi srfi-1)
+ (srfi srfi-26)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (%current-target-system)
+ ;; The git build system assumes build == host
+ `((add-after 'unpack 'use-host-uname_S
+ (lambda _
+ (substitute* "config.mak.uname"
+ (("uname_S := .*" all)
+ (if (equal? ,(%current-target-system) "i586-pc-gnu")
+ "uname_S := GNU\n"
+ all))))))
+ ;; We do not have bash-for-tests when cross-compiling.
+ `((add-after 'unpack 'modify-PATH
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((path (string-split (getenv "PATH") #\:))
+ (bash-full (assoc-ref inputs "bash-for-tests")))
+ ;; Drop the test bash from PATH so that (which "sh")
and
+ ;; similar does the right thing.
+ (setenv "PATH" (string-join
+ (remove (cut string-prefix? bash-full
<>) path)
+ ":")))))))
+ ;; Add cross curl-config script to PATH when cross-compiling.
+ ,@(if (%current-target-system)
+ '((add-before 'configure 'add-cross-curl-config
(lambda* (#:key inputs #:allow-other-keys)
(setenv "PATH"
(string-append (assoc-ref inputs "curl") "/bin:"
- branch core-updates updated (f7815e76b0 -> 8a2b5f3f58), guix-commits, 2022/07/27
- 04/08: gnu: gdk-pixbuf: Propagate private dependencies., guix-commits, 2022/07/27
- 05/08: gnu: gdk-pixbuf: Use search path instead of patching docbook schema location., guix-commits, 2022/07/27
- 03/08: gnu: Remove harfbuzz@4., guix-commits, 2022/07/27
- 08/08: gnu: GCC: Fix union optimization issue., guix-commits, 2022/07/27
- 07/08: gnu: OpenLDAP: Update to 2.6.3., guix-commits, 2022/07/27
- 01/08: Merge branch 'staging' into core-updates,
guix-commits <=
- 06/08: gnu: gdk-pixbuf: Remove input labels., guix-commits, 2022/07/27
- 02/08: gnu: harfbuzz: Update to 5.0.1., guix-commits, 2022/07/27