[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'staging' into core-updates |
|
Date: |
Tue, 27 Sep 2022 16:01:27 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 990a4822f1cb45c1470fe38cbf17fd7bb54d0088
Merge: 91db77c955 3c6e220d81
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Sep 27 15:59:30 2022 -0400
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cran.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/icu4c.scm
gnu/packages/java.scm
gnu/packages/machine-learning.scm
gnu/packages/tex.scm
NEWS | 21 +-
doc/contributing.texi | 41 +
doc/guix.texi | 755 +++++++++++++++++-
etc/news.scm | 58 ++
etc/snippets/tempel/text-mode | 17 +
etc/teams.scm.in | 251 +++++-
gnu/build/jami-service.scm | 9 +-
gnu/build/linux-container.scm | 8 +-
gnu/ci.scm | 3 +-
gnu/compression.scm | 69 ++
gnu/image.scm | 5 +-
gnu/installer/newt/partition.scm | 8 +-
gnu/installer/newt/services.scm | 6 +-
gnu/installer/parted.scm | 20 +-
gnu/installer/tests.scm | 4 +
gnu/installer/user.scm | 18 +-
gnu/installer/utils.scm | 19 +-
gnu/local.mk | 24 +-
gnu/machine/ssh.scm | 96 ++-
gnu/packages/accessibility.scm | 33 +
gnu/packages/admin.scm | 14 +-
gnu/packages/algebra.scm | 13 +-
gnu/packages/astronomy.scm | 45 ++
gnu/packages/bioconductor.scm | 16 +-
gnu/packages/bioinformatics.scm | 371 ++++++++-
gnu/packages/busybox.scm | 117 +--
gnu/packages/calendar.scm | 13 +-
gnu/packages/clojure.scm | 4 +-
gnu/packages/connman.scm | 5 +-
gnu/packages/containers.scm | 4 +-
gnu/packages/coq.scm | 124 ++-
gnu/packages/cran.scm | 877 +++++++++++----------
gnu/packages/crates-graphics.scm | 10 +-
gnu/packages/crates-io.scm | 801 ++++++++++++++++++-
gnu/packages/cross-base.scm | 2 +-
gnu/packages/crypto.scm | 40 +
gnu/packages/databases.scm | 52 +-
gnu/packages/docbook.scm | 171 +++-
gnu/packages/emacs-xyz.scm | 688 +++++++++++++---
gnu/packages/emacs.scm | 4 +-
gnu/packages/enlightenment.scm | 8 +-
gnu/packages/finance.scm | 8 +-
gnu/packages/fonts.scm | 22 +-
gnu/packages/games.scm | 187 +++--
gnu/packages/geo.scm | 2 +
gnu/packages/gnome-xyz.scm | 76 +-
gnu/packages/gnome.scm | 126 ++-
gnu/packages/gnuzilla.scm | 711 ++++++++++++++---
gnu/packages/graphics.scm | 4 +-
gnu/packages/gstreamer.scm | 3 +-
gnu/packages/guile-xyz.scm | 30 +-
gnu/packages/icu4c.scm | 16 -
gnu/packages/instrumentation.scm | 78 +-
gnu/packages/ipfs.scm | 108 ++-
gnu/packages/jami.scm | 44 +-
gnu/packages/java.scm | 862 +++++++++-----------
gnu/packages/libusb.scm | 70 ++
gnu/packages/linux.scm | 60 +-
gnu/packages/lisp-check.scm | 4 +-
gnu/packages/lisp-xyz.scm | 32 +
gnu/packages/lisp.scm | 8 +-
gnu/packages/lua.scm | 8 +-
gnu/packages/machine-learning.scm | 204 +++--
gnu/packages/maths.scm | 1 +
gnu/packages/maven.scm | 97 ++-
gnu/packages/messaging.scm | 4 +-
gnu/packages/monitoring.scm | 46 ++
gnu/packages/networking.scm | 54 +-
gnu/packages/ocaml.scm | 169 ++--
gnu/packages/patches/connman-CVE-2022-32292.patch | 34 +
.../patches/connman-CVE-2022-32293-pt1.patch | 140 ++++
.../patches/connman-CVE-2022-32293-pt2.patch | 173 ++++
.../patches/firebird-riscv64-support-pt1.patch | 42 +
.../patches/firebird-riscv64-support-pt2.patch | 108 +++
gnu/packages/patches/gnome-todo-libportal.patch | 54 --
.../patches/jami-fix-crash-on-block-contact.patch | 32 +
gnu/packages/patches/jami-fix-esc-bug.patch | 24 -
.../patches/pjproject-install-libpjsua2.patch | 19 -
...lasma-framework-fix-KF5PlasmaMacros.cmake.patch | 25 +
.../qemu-disable-aarch64-migration-test.patch | 13 +
...v.patch => r-httpuv-1.6.6-unvendor-libuv.patch} | 13 +-
gnu/packages/pdf.scm | 33 +-
gnu/packages/python-build.scm | 23 +
gnu/packages/python-crypto.scm | 81 ++
gnu/packages/python-science.scm | 58 ++
gnu/packages/python-web.scm | 6 +
gnu/packages/python-xyz.scm | 64 ++
gnu/packages/rust-apps.scm | 26 +
gnu/packages/samba.scm | 30 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/statistics.scm | 145 ++--
gnu/packages/telegram.scm | 763 +++++++++---------
gnu/packages/telephony.scm | 185 ++---
gnu/packages/tex.scm | 84 ++
gnu/packages/video.scm | 3 +-
gnu/packages/vim.scm | 68 +-
gnu/packages/virtualization.scm | 1 +
gnu/packages/wm.scm | 39 +-
gnu/packages/xfce.scm | 25 +-
gnu/services/configuration.scm | 3 +-
gnu/services/samba.scm | 286 +++++++
gnu/services/telephony.scm | 12 +-
gnu/services/web.scm | 9 +-
gnu/system/file-systems.scm | 2 +-
gnu/system/image.scm | 131 ++-
gnu/system/images/hurd.scm | 8 +-
gnu/system/images/wsl2.scm | 170 ++++
gnu/tests/samba.scm | 215 +++++
gnu/tests/telephony.scm | 3 +-
guix/build-system/go.scm | 67 +-
guix/build/debug-link.scm | 8 +-
guix/download.scm | 17 +-
guix/gnu-maintenance.scm | 72 +-
guix/import/cran.scm | 66 +-
guix/lint.scm | 26 +-
guix/narinfo.scm | 5 +-
guix/platforms/x86.scm | 4 +-
guix/read-print.scm | 10 +-
guix/scripts/home/import.scm | 21 +-
guix/scripts/pack.scm | 46 +-
guix/scripts/weather.scm | 10 +-
po/guix/POTFILES.in | 1 +
tests/gnu-maintenance.scm | 62 ++
tests/home-import.scm | 11 +-
tests/read-print.scm | 5 +
tests/substitute.scm | 46 ++
126 files changed, 8663 insertions(+), 2846 deletions(-)
diff --cc gnu/local.mk
index ae5f2b1461,78bdc113ac..c7f0e436b5
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1209,8 -1225,8 +1219,7 @@@ dist_patch_DATA =
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-session-support-elogind.patch \
- %D%/packages/patches/gnome-todo-libportal.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
- %D%/packages/patches/gnupg-CVE-2022-34903.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
@@@ -1338,6 -1351,9 +1345,8 @@@
%D%/packages/patches/jfsutils-add-sysmacros.patch \
%D%/packages/patches/jfsutils-gcc-compat.patch \
%D%/packages/patches/jfsutils-include-systypes.patch \
- %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
- %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
- %D%/packages/patches/jsoncpp-pkg-config-version.patch \
++ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
++ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/julia-tracker-16-compat.patch \
%D%/packages/patches/julia-allow-parallel-build.patch \
@@@ -1590,7 -1604,9 +1599,7 @@@
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/password-store-tree-compat.patch \
- %D%/packages/patches/pjproject-install-libpjsua2.patch \
- %D%/packages/patches/pciutils-hurd-configure.patch \
- %D%/packages/patches/pciutils-hurd-fix.patch \
+ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
%D%/packages/patches/pokerth-boost.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/pthreadpool-system-libraries.patch \
diff --cc gnu/packages/gnuzilla.scm
index e05970f98c,be923de72f..dd91f9da1a
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -366,8 -348,171 +368,171 @@@ from collections.abc import MutableSequ
rust
`(,rust "cargo")))
(inputs
- (list icu4c readline zlib))))
+ (list icu4c-69 readline zlib))))
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; Temporary packaging of rust-1.59, pending inclusion in (gnu packages rust)
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ (define rust-1.58-promise
+ (delay
+ (let ((rust-bootstrapped-package
+ (@@ (gnu packages rust)
+ rust-bootstrapped-package)))
+ (rust-bootstrapped-package
+ rust "1.58.1"
"1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))))
+
+ (define rust-1.59-promise
+ (delay
+ (let ((rust-bootstrapped-package
+ (@@ (gnu packages rust)
+ rust-bootstrapped-package)))
+ (rust-bootstrapped-package
+ (force rust-1.58-promise)
+ "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57"))))
+
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; Temporary packaging of rust-cbindgen-0.23 and its dependencies
+ ;; follow, pending their inclusion into (gnu packages rust-apps)
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ (define rust-textwrap-0.15-promise
+ (delay
+ (package
+ (inherit rust-textwrap-0.12)
+ (name "rust-textwrap")
+ (version "0.15.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "textwrap" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-hyphenation" ,rust-hyphenation-0.8)
+ ("rust-smawk" ,rust-smawk-0.3)
+ ("rust-terminal-size" ,rust-terminal-size-0.1)
+ ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1)))))))
+
+ (define rust-clap-lex-0.2
+ (package
+ (name "rust-clap-lex")
+ (version "0.2.4")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "clap_lex" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
+ (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex";)
+ (synopsis "Minimal, flexible command line parser")
+ (description "Minimal, flexible command line parser")
+ (license (list license:expat license:asl2.0))))
+
+ (define rust-clap-derive-3.2.15-promise
+ (delay
+ (package
+ (inherit rust-clap-derive-3)
+ (name "rust-clap-derive")
+ (version "3.2.15")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "clap_derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1d2c4vs345fwihkd8cc7m6acbiydcwramkd5mnp36p0a7g6jm9cv"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-heck" ,rust-heck-0.4)
+ ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1)))))))
+
+ (define rust-clap-3.2.16-promise
+ (delay
+ (package
+ (inherit rust-clap-3)
+ (name "rust-clap")
+ (version "3.2.16")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "clap" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1af06z8z7m3327yz1xvzxfjanclgpvvy3lssb745rig7adkbpnx3"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-atty" ,rust-atty-0.2)
+ ("rust-backtrace" ,rust-backtrace-0.3)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-clap-derive" ,(force
rust-clap-derive-3.2.15-promise))
+ ("rust-clap-lex" ,rust-clap-lex-0.2)
+ ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-strsim" ,rust-strsim-0.10)
+ ("rust-termcolor" ,rust-termcolor-1)
+ ("rust-terminal-size" ,rust-terminal-size-0.1)
+ ("rust-textwrap" ,(force rust-textwrap-0.15-promise))
+ ("rust-unicase" ,rust-unicase-2)
+ ("rust-yaml-rust" ,rust-yaml-rust-0.4)))))))
+
+ (define rust-cbindgen-0.24-promise
+ (delay
+ (package
+ (inherit rust-cbindgen-0.19)
+ (name "rust-cbindgen")
+ (version "0.24.3")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "cbindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6"))))
+ (arguments
+ `(#:cargo-inputs (("rust-clap" ,(force rust-clap-3.2.16-promise))
+ ("rust-heck" ,rust-heck-0.4)
+ ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-syn" ,rust-syn-1)
+ ("rust-tempfile" ,rust-tempfile-3)
+ ("rust-toml" ,rust-toml-0.5))
+ #:cargo-development-inputs (("rust-serial-test"
,rust-serial-test-0.5)))))))
+
+ ;; Bug with IceCat 102 with cbindgen-0.24, see
+ ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1773259#c5 for
+ ;; possible patch (untested)
+ (define rust-cbindgen-0.23-promise
+ (delay
+ (package
+ (inherit (force rust-cbindgen-0.24-promise))
+ (name "rust-cbindgen")
+ (version "0.23.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "cbindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav")))))))
+
+
(define mozilla-compare-locales
(origin
(method hg-fetch)
diff --cc gnu/packages/icu4c.scm
index 2e00b6ba26,1e4f66d956..87986952f0
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@@ -135,38 -152,6 +135,22 @@@ C/C++ part."
(string-append "//" all))))))))
(package-arguments icu4c)))))
+(define-public icu4c-69
+ (package
+ (inherit icu4c)
+ (version "69.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+
"https://github.com/unicode-org/icu/releases/download/release-";
+ (string-map (lambda (x) (if (char=? x #\.) #\- x))
version)
+ "/icu4c-"
+ (string-map (lambda (x) (if (char=? x #\.) #\_ x))
version)
+ "-src.tgz"))
+ (sha256
+ (base32
+ "0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc"))))))
+
- (define-public icu4c-67
- (package
- (inherit icu4c)
- (version "67.1")
- (source (origin
- (method url-fetch)
- (uri (string-append
-
"https://github.com/unicode-org/icu/releases/download/release-";
- (string-map (lambda (x) (if (char=? x #\.) #\- x))
version)
- "/icu4c-"
- (string-map (lambda (x) (if (char=? x #\.) #\_ x))
version)
- "-src.tgz"))
- (sha256
- (base32
- "1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l"))))))
-
(define-public icu4c-68
(package
(inherit icu4c)
diff --cc gnu/packages/java.scm
index f467c473d7,3ab324cce9..165de8da63
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -2051,257 -2045,134 +2057,136 @@@ new Date();")
"This package provides the Java development kit OpenJDK.")
(license license:gpl2+)))
+ (define-syntax make-openjdk
+ ;; Return an OpenJDK package at VERSION with checksum HASH, using BOOTSTRAP,
+ ;; the bootstrap package. One or more FIELD can be provided to further
+ ;; refine the package definition; for convenience, the BASE, NAME and
+ ;; VERSION are defined in their scope.
+ (lambda (x)
+ (syntax-case x ()
+ ((_ bootstrap version* hash field ...)
+ (with-syntax ((base (datum->syntax x 'base))
+ (name (datum->syntax x 'name))
+ (version (datum->syntax x 'version)))
+ #'(let ((base (package
+ (inherit bootstrap)
+ (name "openjdk")
+ (version version*)
+ (source
+ (origin
+ (inherit (package-source bootstrap))
+ (method git-fetch)
+ (uri (git-reference
+ (url (format
+ #f "https://github.com/openjdk/jdk~au";
+ (version-major version*)))
+ (commit (string-append "jdk-" version*
+ "-ga"))))
+ (file-name (git-file-name name version))
+ (sha256 (base32 hash))))
+ (native-inputs
+ (modify-inputs (package-native-inputs bootstrap)
+ (replace "openjdk" bootstrap)))
+ (home-page (string-append
+ "https://openjdk.java.net/projects/jdk/";
+ (version-major version)))))
+ (name "openjdk")
+ (version version*))
+ (package
+ (inherit base)
+ field
+ ...)))))))
+
(define-public openjdk12
- (package
- (inherit openjdk11)
- (name "openjdk")
- (version "12.33")
- (source (origin
- (method url-fetch)
- (uri
"http://hg.openjdk.java.net/jdk/jdk/archive/0276cba45aac.tar.bz2";)
- (file-name (string-append name "-" version ".tar.bz2"))
- (sha256
- (base32
- "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2"))
- (patches (search-patches "openjdk-10-hotspot-stack-size.patch"))
- (modules '((guix build utils)))
- (snippet
- `(begin
- (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
- #t))))
- (arguments
- (substitute-keyword-arguments (package-arguments openjdk11)
- ((#:phases phases)
- `(modify-phases ,phases
+ (make-openjdk
+ openjdk11 "12.33" "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2"
+ (source
+ (origin
+ (method url-fetch)
+ (uri "http://hg.openjdk.java.net/jdk/jdk/archive/0276cba45aac.tar.bz2";)
+ (file-name (string-append name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2"))
+ (modules '((guix build utils)))
+ (snippet
- '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))))
++ '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))
++ (patches (search-patches "openjdk-10-hotspot-stack-size.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments openjdk11)
+ ((#:phases phases)
+ #~(modify-phases #$phases
(replace 'fix-java-shebangs
(lambda _
- ;; This file was "fixed" by patch-source-shebangs, but it
requires
- ;; this exact first line.
- (substitute*
"make/data/blacklistedcertsconverter/blacklisted.certs.pem"
- (("^#!.*") "#! java BlacklistedCertsConverter
SHA-256\n"))))))))
- (inputs
- `(("alsa-lib" ,alsa-lib)
- ("cups" ,cups)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("giflib" ,giflib)
- ("lcms" ,lcms)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libx11" ,libx11)
- ("libxext" ,libxext)
- ("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("libxt" ,libxt)
- ("libxtst" ,libxtst)))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("openjdk11" ,openjdk11)
- ("openjdk11:jdk" ,openjdk11 "jdk")
- ("make@4.2" ,gnu-make-4.2)
- ("pkg-config" ,pkg-config)
- ("unzip" ,unzip)
- ("which" ,which)
- ("zip" ,zip)))
- (home-page "https://openjdk.java.net/projects/jdk/12";)))
+ ;; 'blocked' was renamed to 'blacklisted' in this version for
+ ;; some reason.
+ (substitute* "make/data/blacklistedcertsconverter/\
+ blacklisted.certs.pem"
+ (("^#!.*")
+ "#! java BlacklistedCertsConverter SHA-256\n"))))))))))
(define-public openjdk13
- (package
- (inherit openjdk12)
- (name "openjdk")
- (version "13.0.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/openjdk/jdk13u";)
- (commit (string-append "jdk-" version "-ga"))))
- (file-name (git-file-name name version))
- (patches (search-patches "openjdk-10-hotspot-stack-size.patch"))
- (sha256
- (base32
+ (make-openjdk openjdk12 "13.0.7"
"0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp"))
- (modules '((guix build utils)))
- (snippet
- `(begin
- (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
- #t))))
- (inputs
- `(("alsa-lib" ,alsa-lib)
- ("cups" ,cups)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("giflib" ,giflib)
- ("lcms" ,lcms)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libx11" ,libx11)
- ("libxext" ,libxext)
- ("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("libxt" ,libxt)
- ("libxtst" ,libxtst)))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("openjdk12:jdk" ,openjdk12 "jdk")
- ("make@4.2" ,gnu-make-4.2)
- ("pkg-config" ,pkg-config)
- ("unzip" ,unzip)
- ("which" ,which)
- ("zip" ,zip)))
- (home-page "https://openjdk.java.net/projects/jdk/13";)))
(define-public openjdk14
- (package
- (inherit openjdk13)
- (name "openjdk")
- (version "14.0.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/openjdk/jdk14u";)
- (commit (string-append "jdk-" version "-ga"))))
- (file-name (git-file-name name version))
- (patches (search-patches "openjdk-10-hotspot-stack-size.patch"))
- (sha256
- (base32
- "07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"))
- (modules '((guix build utils)))
- (snippet
- `(begin
- ;; The m4 macro uses 'help' to search for builtins, which is
- ;; not available in bash-minimal
- (substitute* "make/autoconf/basics.m4"
- (("if help") "if command -v"))
- (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
- #t))))
- (inputs
- `(("alsa-lib" ,alsa-lib)
- ("cups" ,cups)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("giflib" ,giflib)
- ("lcms" ,lcms)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libx11" ,libx11)
- ("libxext" ,libxext)
- ("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("libxt" ,libxt)
- ("libxtst" ,libxtst)))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("make@4.2" ,gnu-make-4.2)
- ("openjdk13:jdk" ,openjdk13 "jdk")
- ("pkg-config" ,pkg-config)
- ("unzip" ,unzip)
- ("which" ,which)
- ("zip" ,zip)))
- (home-page "https://openjdk.java.net/projects/jdk/14";)))
+ (make-openjdk
+ openjdk13 "14.0.2"
+ "07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"
+ (source (origin
+ (inherit (package-source base))
+ (snippet ;override snippet
+ '(begin
+ ;; The m4 macro uses 'help' to search for builtins, which is
+ ;; not available in bash-minimal
+ (substitute* "make/autoconf/basics.m4"
+ (("if help") "if command -v"))
+ (for-each delete-file (find-files "."
"\\.(bin|exe|jar)$"))))))))
(define-public openjdk15
- (package
- (inherit openjdk14)
- (name "openjdk")
- (version "15.0.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/openjdk/jdk15u";)
- (commit (string-append "jdk-" version "-ga"))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i"))
- (patches
- (search-patches "openjdk-15-xcursor-no-dynamic.patch"
- "openjdk-10-hotspot-stack-size.patch"))))
- (inputs
- (cons `("libxcursor" ,libxcursor) ; for our patch to work
- (package-inputs openjdk14)))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("openjdk14:jdk" ,openjdk14 "jdk")
- ("pkg-config" ,pkg-config)
- ("unzip" ,unzip)
- ("which" ,which)
- ("zip" ,zip)))
- (home-page "https://openjdk.java.net/projects/jdk/15";)))
+ (make-openjdk
+ openjdk14 "15.0.3"
+ "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i"
+ (source (origin
+ (inherit (package-source base))
+ (modules '())
+ (snippet #f)
+ (patches
- (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
++ (append (search-patches "openjdk-15-xcursor-no-dynamic.patch")
++ (origin-patches (package-source base))))))
+ (inputs
+ (modify-inputs (package-inputs base)
+ (append libxcursor))) ;for our patch to work
+ (native-inputs
+ (modify-inputs (package-native-inputs base)
+ (delete "make" ;remove old gnu-make-4.2
+ "openjdk") ;to remove non-jdk output
+ (append `(,openjdk14 "jdk"))))))
(define-public openjdk16
- (package
- (inherit openjdk15)
- (name "openjdk")
- (version "16.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/openjdk/jdk16u";)
- (commit (string-append "jdk-" version "-ga"))))
- (file-name (git-file-name name version))
- (sha256
- (base32
+ (make-openjdk openjdk15 "16.0.1"
"1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f"))
- (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch"
-
"openjdk-10-hotspot-stack-size.patch"))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("openjdk15:jdk" ,openjdk15 "jdk")
- ("pkg-config" ,pkg-config)
- ("unzip" ,unzip)
- ("which" ,which)
- ("zip" ,zip)))
- (arguments
- (substitute-keyword-arguments (package-arguments openjdk15)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'make-templates-writable
- (lambda _
- ;; The build system copies a few .template files from the
- ;; source directory into the build directory and then modifies
- ;; them in-place. So these files have to be writable.
- (for-each make-file-writable
- (find-files "src/java.base/share/classes/jdk/internal/misc/"
- "\\.template$"))))))))
- (home-page "https://openjdk.java.net/projects/jdk/16";)))
(define-public openjdk17
- (package
- (inherit openjdk16)
- (name "openjdk")
- (version "17.0.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/openjdk/jdk17u";)
- (commit (string-append "jdk-" version "-ga"))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0slmd6ww947gxpp4yr2wmr5z975bg86qh7zqfp2radf2q77ql65b"))
- (patches
- (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("openjdk16:jdk" ,openjdk16 "jdk")
- ("pkg-config" ,pkg-config)
- ("unzip" ,unzip)
- ("which" ,which)
- ("zip" ,zip)))
- (arguments
- (substitute-keyword-arguments (package-arguments openjdk16)
- ((#:phases phases)
- `(modify-phases ,phases
+ (make-openjdk
+ openjdk16 "17.0.3"
+ "0slmd6ww947gxpp4yr2wmr5z975bg86qh7zqfp2radf2q77ql65b"
+ (arguments
+ (substitute-keyword-arguments (package-arguments openjdk16)
+ ((#:phases phases)
+ #~(modify-phases #$phases
(replace 'fix-java-shebangs
(lambda _
- ;; This file was "fixed" by patch-source-shebangs, but it
requires
- ;; this exact first line.
+ ;; 'blacklisted' was renamed back to 'blocked'.
(substitute*
"make/data/blockedcertsconverter/blocked.certs.pem"
- (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))
- (home-page "https://openjdk.java.net/projects/jdk/17";)))
+ (("^#!.*") "#! java BlockedCertsConverter
SHA-256\n"))))))))))
+
+ (define-public openjdk18
+ (make-openjdk openjdk17 "18"
+ "1bv6bdhkmwvn10l0xy8yi9xibds640hs5zsvx0jp7wrxa3qw4qy8"))
;;; Convenience alias to point to the latest version of OpenJDK.
- (define-public openjdk openjdk17)
+ (define-public openjdk openjdk18)
(define-public icedtea icedtea-8)
diff --cc gnu/packages/tex.scm
index 93625b0fe9,1fa3178a24..1279673852
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -6500,83 -6209,84 +6500,122 @@@ the same place. The package also has
footnotes with symbols rather than numbers.")
(license license:lppl1.3+)))
+(define-public texlive-letltxmacro
+ (let ((template (simple-texlive-package
+ "texlive-letltxmacro"
+ (list "doc/latex/letltxmacro/"
+ "source/latex/letltxmacro/"
+ "tex/latex/letltxmacro/")
+ (base32
+ "16bmwsng9p80jf78sdmib24apwnw3raw306cs1ms50z5s9dsfdby"))))
+ (package
+ (inherit template)
+ (outputs '("out" "doc"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:tex-directory _ '())
+ "latex/letltxmacro")
+ ((#:build-targets _ '())
+ #~(list "letltxmacro.dtx"))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "source/latex/letltxmacro")))
+ (replace 'copy-files
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((origin (assoc-ref inputs "source"))
+ (source (string-append #$output
+ "/share/texmf-dist/source"))
+ (doc (string-append #$output:doc
+ "/share/texmf-dist/doc")))
+ (copy-recursively (string-append origin "/source") source)
+ (copy-recursively (string-append origin "/doc")
doc))))))))
+ (home-page "https://www.ctan.org/pkg/letltxmacro";)
+ (synopsis "Let assignment for macros")
+ (description
+ "TeX’s @code{\\let} assignment does not work for LaTeX macros with
+optional arguments, or for macros that are defined as robust macros by
+@code{\\DeclareRobustCommand}. This package defines @code{\\LetLtxMacro}
+that also takes care of the involved internal macros.")
+ (license license:lppl1.3c+))))
+
+(define-deprecated-package texlive-latex-letltxmacro texlive-letltxmacro)
+
+ (define-public texlive-latex-frankenstein
+ (package
+ (name "texlive-latex-frankenstein")
+ (version (number->string %texlive-revision))
+ (source (origin
+ (method svn-fetch)
+ (uri (svn-reference (url (string-append
+ "svn://www.tug.org/texlive/tags/"
+ %texlive-tag "/Master/texmf-dist/"
+ "/tex/latex/frankenstein"))
+ (revision %texlive-revision)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "1zhdvn3zgdarlzfcyq8nzilvw0v0bqgl4m0y7j233cbqw8wiil4z"))))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder (begin
+ (use-modules (guix build utils))
+ (let ((target (string-append (assoc-ref %outputs "out")
+
"/share/texmf-dist/tex/latex/frankenstein")))
+ (mkdir-p target)
+ (copy-recursively (assoc-ref %build-inputs "source")
+ target) #t))))
+ (home-page "https://ctan.org/pkg/frankenstein";)
+ (synopsis "Collection of unrelated LaTeX packages")
+ (description
+ "Frankenstein is a bundle of LaTeX packages serving various purposes and
a
+ BibTeX bibliography style. The individual packages are: @code{abbrevs},
+ @code{achicago}, @code{achicago} bibstyle, @code{attrib}, @code{blkcntrl},
+ @code{compsci}, @code{dialogue}, @code{lips}, @code{moredefs},
@code{newclude},
+ @code{slemph} and @code{titles}. Note: The installation follows the
suboptimal
+ ``Quick and dirty'' recipe, rendering some features unavailable.")
+ ;; README mentions an unspecified version of GNU GPL and points to
COPYING,
+ ;; which is missing. However, the individual files mention LPPL 1.2 or
+ ;; later.
+ (license license:lppl1.2+)))
+
-(define-public texlive-latex-letltxmacro
- (package
- (inherit (simple-texlive-package
- "texlive-latex-letltxmacro"
- (list "/doc/latex/letltxmacro/"
- "/tex/latex/letltxmacro/")
- (base32
- "0yy1m1jiyxq2pssp0pidaa2swx6lyxw3zwpm2r8m0v2r3lvsyyxx")
- #:trivial? #t))
- (home-page "https://www.ctan.org/pkg/letltxmacro";)
- (synopsis "Let assignment for macros")
- (description
- "TeX’s @code{\\let} assignment does not work for LaTeX macros with
-optional arguments, or for macros that are defined as robust macros by
-@code{\\DeclareRobustCommand}. This package defines @code{\\LetLtxMacro}
-that also takes care of the involved internal macros.")
- (license license:lppl1.3c+)))
-
(define-public texlive-listings
- (package
- (name "texlive-listings")
- (version (number->string %texlive-revision))
- (source (origin
- (method svn-fetch)
- (uri (texlive-ref "latex" "listings"))
- (file-name
- ;; TODO: Drop "latex-" on next rebuild cycle.
- (string-append "texlive-latex-listings-" version "-checkout"))
- (sha256
- (base32
- "082zri3gp8s6p2difhk1pbix2vzmvsf6fmld2z78v35xwk3fiya0"))))
- (build-system texlive-build-system)
- (arguments
- '(#:tex-directory "latex/listings"
- #:build-targets '("listings.ins")))
- (home-page "https://www.ctan.org/pkg/listings";)
- (synopsis "Typeset source code listings using LaTeX")
- (description
- "The package enables the user to typeset programs (programming code)
+ (let ((template
+ (simple-texlive-package
+ "texlive-listings"
+ (list "doc/latex/listings/"
+ "source/latex/listings/"
+ "tex/latex/listings/")
+ (base32 "15dnm0j86305x84ss3ymhhcczcw45b2liq01vrab6fj204wzsahk"))))
+ (package
+ (inherit template)
+ (outputs '("out" "doc"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:tex-directory _ '())
+ "latex/listings")
+ ((#:build-targets _ '())
+ #~(list "listings.ins"))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "source/latex/listings")))
+ (replace 'copy-files
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((origin (assoc-ref inputs "source"))
+ (source (string-append #$output
+ "/share/texmf-dist/source"))
+ (doc (string-append #$output:doc
+ "/share/texmf-dist/doc")))
+ (copy-recursively (string-append origin "/source") source)
+ (copy-recursively (string-append origin "/doc")
doc))))))))
+ (home-page "https://www.ctan.org/pkg/listings";)
+ (synopsis "Typeset source code listings using LaTeX")
+ (description
+ "The package enables the user to typeset programs (programming code)
within LaTeX; the source code is read directly by TeX---no front-end processor
is needed. Keywords, comments and strings can be typeset using different
styles. Support for @code{hyperref} is provided.")