me
/
guix
Archived
1
0
Fork 0

Merge branch 'master' into staging

master
Marius Bakke 2022-11-26 15:39:18 +01:00
commit fe99fe84f0
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
98 changed files with 9581 additions and 2426 deletions

3
NEWS
View File

@ -74,10 +74,11 @@ Please send Guix bug reports to bug-guix@gnu.org.
*** The installer now has a crash dump upload mechanism *** The installer now has a crash dump upload mechanism
*** Emacs now supports native compilation *** Emacs now supports native compilation
*** GRUB bootloader now supports chain-loading *** GRUB bootloader now supports chain-loading
*** The GNU Shepherd was upgraded to 0.9.2 *** The GNU Shepherd was upgraded to 0.9.3
*** The init RAM disk honors more arguments—e.g. root and rootflags *** The init RAM disk honors more arguments—e.g. root and rootflags
*** guix system image can now generate WSL images *** guix system image can now generate WSL images
*** The mcron task scheduler logs now contain the jobs exit statuses *** The mcron task scheduler logs now contain the jobs exit statuses
** Programming interfaces ** Programming interfaces
*** Package input fields can now plain package lists *** Package input fields can now plain package lists
*** G-expressions can now be used in build phases *** G-expressions can now be used in build phases

View File

@ -21,6 +21,7 @@ Copyright @copyright{} 2020 Brice Waegeneire@*
Copyright @copyright{} 2020 André Batista@* Copyright @copyright{} 2020 André Batista@*
Copyright @copyright{} 2020 Christine Lemmer-Webber@* Copyright @copyright{} 2020 Christine Lemmer-Webber@*
Copyright @copyright{} 2021 Joshua Branson@* Copyright @copyright{} 2021 Joshua Branson@*
Copyright @copyright{} 2022 Maxim Cournoyer*
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or under the terms of the GNU Free Documentation License, Version 1.3 or
@ -95,6 +96,7 @@ System Configuration
* Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY * Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System. * Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Guix System Image API:: Customizing images to target specific platforms. * Guix System Image API:: Customizing images to target specific platforms.
* Using security keys:: How to use security keys with Guix System.
* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Connecting to Wireguard VPN:: Connecting to a Wireguard VPN.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
* Running Guix on a Linode Server:: Running Guix on a Linode Server. Running Guix on a Linode Server * Running Guix on a Linode Server:: Running Guix on a Linode Server. Running Guix on a Linode Server
@ -1380,6 +1382,7 @@ reference.
* Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY * Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System. * Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Guix System Image API:: Customizing images to target specific platforms. * Guix System Image API:: Customizing images to target specific platforms.
* Using security keys:: How to use security keys with Guix System.
* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Connecting to Wireguard VPN:: Connecting to a Wireguard VPN.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
* Running Guix on a Linode Server:: Running Guix on a Linode Server * Running Guix on a Linode Server:: Running Guix on a Linode Server
@ -1883,6 +1886,65 @@ guix system image --image-type=hurd-qcow2 my-hurd-os.scm
will instead produce a Hurd QEMU image. will instead produce a Hurd QEMU image.
@node Using security keys
@section Using security keys
@cindex 2FA, two-factor authentication
@cindex U2F, Universal 2nd Factor
@cindex security key, configuration
The use of security keys can improve your security by providing a second
authentication source that cannot be easily stolen or copied, at least
for a remote adversary (something that you have), to the main secret (a
passphrase -- something that you know), reducing the risk of
impersonation.
The example configuration detailed below showcases what minimal
configuration needs to be made on your Guix System to allow the use of a
Yubico security key. It is hoped the configuration can be useful for
other security keys as well, with minor adjustments.
@subsection Configuration for use as a two-factor authenticator (2FA)
To be usable, the udev rules of the system should be extended with
key-specific rules. The following shows how to extend your udev rules
with the @file{lib/udev/rules.d/70-u2f.rules} udev rule file provided by
the @code{libfido2} package from the @code{(gnu packages
security-token)} module and add your user to the @samp{"plugdev"} group
it uses:
@lisp
(use-package-modules ... security-token ...)
...
(operating-system
...
(users (cons* (user-account
(name "your-user")
(group "users")
(supplementary-groups
'("wheel" "netdev" "audio" "video"
"plugdev")) ;<- added system group
(home-directory "/home/your-user"))
%base-user-accounts))
...
(services
(cons*
...
(udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))))
@end lisp
After re-configuring your system and re-logging in your graphical
session so that the new group is in effect for your user, you can verify
that your key is usable by launching:
@example
guix shell ungoogled-chromium -- chromium chrome://settings/securityKeys
@end example
and validating that the security key can be reset via the ``Reset your
security key'' menu. If it works, congratulations, your security key is
ready to be used with applications supporting two-factor authentication
(2FA).
@node Connecting to Wireguard VPN @node Connecting to Wireguard VPN
@section Connecting to Wireguard VPN @section Connecting to Wireguard VPN

View File

@ -60,7 +60,7 @@ Copyright @copyright{} 2018, 2021 Oleg Pykhalov@*
Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Mike Gerwitz@*
Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@*
Copyright @copyright{} 2018, 2019 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Gábor Boskovits@*
Copyright @copyright{} 2018, 2019, 2020 Florian Pelz@* Copyright @copyright{} 2018, 2019, 2020, 2022 Florian Pelz@*
Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Laura Lazzati@*
Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2018 Alex Vong@*
Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Josh Holland@*
@ -1409,7 +1409,7 @@ when transferring files to and from build machines.
File name of the Unix-domain socket @command{guix-daemon} is listening File name of the Unix-domain socket @command{guix-daemon} is listening
to on that machine. to on that machine.
@item @code{overload-threshold} (default: @code{0.6}) @item @code{overload-threshold} (default: @code{0.8})
The load threshold above which a potential offload machine is The load threshold above which a potential offload machine is
disregarded by the offload scheduler. The value roughly translates to disregarded by the offload scheduler. The value roughly translates to
the total processor usage of the build machine, ranging from 0.0 (0%) to the total processor usage of the build machine, ranging from 0.0 (0%) to
@ -3423,19 +3423,25 @@ The @var{options} can be among the following:
@itemx -i @var{package} @dots{} @itemx -i @var{package} @dots{}
Install the specified @var{package}s. Install the specified @var{package}s.
Each @var{package} may specify either a simple package name, such as Each @var{package} may specify a simple package name, such as
@code{guile}, or a package name followed by an at-sign and version number, @code{guile}, optionally followed by an at-sign and version number,
such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter such as @code{guile@@3.0.7} or simply @code{guile@@3.0}. In the latter
case, the newest version prefixed by @code{1.8} is selected). case, the newest version prefixed by @code{3.0} is selected.
If no version number is specified, the If no version number is specified, the newest available version will be
newest available version will be selected. In addition, @var{package} selected. In addition, such a @var{package} specification
may contain a colon, followed by the name of one of the outputs of the may contain a colon, followed by the name of one of the outputs of the
package, as in @code{gcc:doc} or @code{binutils@@2.22:lib} package, as in @code{gcc:doc} or @code{binutils@@2.22:lib}
(@pxref{Packages with Multiple Outputs}). Packages with a corresponding (@pxref{Packages with Multiple Outputs}).
Packages with a corresponding
name (and optionally version) are searched for among the GNU name (and optionally version) are searched for among the GNU
distribution modules (@pxref{Package Modules}). distribution modules (@pxref{Package Modules}).
Alternatively, a @var{package} can directly specify a store file name
such as @file{/gnu/store/...-guile-3.0.7}, as produced by, e.g.,
@code{guix build}.
@cindex propagated inputs @cindex propagated inputs
Sometimes packages have @dfn{propagated inputs}: these are dependencies Sometimes packages have @dfn{propagated inputs}: these are dependencies
that automatically get installed along with the required package that automatically get installed along with the required package
@ -4834,6 +4840,15 @@ invocation can be expensive: it may have to download or even build a
large number of packages; the result is cached though and subsequent large number of packages; the result is cached though and subsequent
commands targeting the same commit are almost instantaneous. commands targeting the same commit are almost instantaneous.
@quotation Note
The history of Guix is immutable and @command{guix time-machine}
provides the exact same software as they are in a specific Guix
revision. Naturally, no security fixes are provided for old versions
of Guix or its channels. A careless use of @command{guix time-machine}
opens the door to security vulnerabilities. @xref{Invoking guix pull,
@option{--allow-downgrades}}.
@end quotation
The general syntax is: The general syntax is:
@example @example
@ -8080,20 +8095,20 @@ following forms:
@item (delete @var{name}@dots{}) @item (delete @var{name}@dots{})
Delete from the inputs packages with the given @var{name}s (strings). Delete from the inputs packages with the given @var{name}s (strings).
@item (append @var{package}@dots{})
Add @var{package}s to the end of the input list.
@item (prepend @var{package}@dots{}) @item (prepend @var{package}@dots{})
Add @var{package}s to the front of the input list. Add @var{package}s to the front of the input list.
@item (append @var{package}@dots{})
Add @var{package}s to the end of the input list.
@end table @end table
The example below removes the GMP and ACL inputs of Coreutils and adds The example below removes the GMP and ACL inputs of Coreutils and adds
libcap to the back of the input list: libcap to the front of the input list:
@lisp @lisp
(modify-inputs (package-inputs coreutils) (modify-inputs (package-inputs coreutils)
(delete "gmp" "acl") (delete "gmp" "acl")
(append libcap)) (prepend libcap))
@end lisp @end lisp
The example below replaces the @code{guile} package from the inputs of The example below replaces the @code{guile} package from the inputs of
@ -8104,7 +8119,7 @@ The example below replaces the @code{guile} package from the inputs of
(replace "guile" guile-2.2)) (replace "guile" guile-2.2))
@end lisp @end lisp
The last type of clause is @code{prepend}, to add inputs to the front of The last type of clause is @code{append}, to add inputs at the back of
the list. the list.
@end deffn @end deffn

View File

@ -1127,7 +1127,7 @@ corresponds to the symbols listed in FLAGS."
(('read-only rest ...) (('read-only rest ...)
(logior MS_RDONLY (loop rest))) (logior MS_RDONLY (loop rest)))
(('bind-mount rest ...) (('bind-mount rest ...)
(logior MS_BIND (loop rest))) (logior MS_REC (logior MS_BIND (loop rest))))
(('no-suid rest ...) (('no-suid rest ...)
(logior MS_NOSUID (loop rest))) (logior MS_NOSUID (loop rest)))
(('no-dev rest ...) (('no-dev rest ...)

View File

@ -159,25 +159,32 @@
(base (if desktop? (base (if desktop?
'%desktop-services '%desktop-services
'%base-services)) '%base-services))
(heading (list (vertical-space 1) (service-heading (list (vertical-space 1)
(comment (G_ "\ (comment (G_ "\
;; Below is the list of system services. To search for available ;; Below is the list of system services. To search for available
;; services, run 'guix system search KEYWORD' in a terminal.\n"))))) ;; services, run 'guix system search KEYWORD' in a terminal.\n"))))
(package-heading (list (vertical-space 1)
(comment (G_ "\
;; Packages installed system-wide. Users can also install packages
;; under their own account: use 'guix search KEYWORD' to search
;; for packages and 'guix install PACKAGE' to install a package.\n")))))
(if (null? snippets) (if (null? snippets)
`(,@(if (null? packages) `(,@(if (null? packages)
'() '()
`((packages (append (list ,@packages) `(,@package-heading
(packages (append (list ,@packages)
%base-packages)))) %base-packages))))
,@heading ,@service-heading
(services ,base)) (services ,base))
`(,@(if (null? packages) `(,@(if (null? packages)
'() '()
`((packages (append (list ,@packages) `(,@package-heading
(packages (append (list ,@packages)
%base-packages)))) %base-packages))))
,@heading ,@service-heading
(services (append (list ,@snippets (services (append (list ,@snippets
,@(if desktop? ,@(if desktop?

View File

@ -1044,9 +1044,6 @@ dist_patch_DATA = \
%D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \
%D%/packages/patches/dynaconf-unvendor-deps.patch \ %D%/packages/patches/dynaconf-unvendor-deps.patch \
%D%/packages/patches/ecl-16-format-directive-limit.patch \
%D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \
%D%/packages/patches/ecl-16-libffi.patch \
%D%/packages/patches/efibootmgr-remove-extra-decl.patch \ %D%/packages/patches/efibootmgr-remove-extra-decl.patch \
%D%/packages/patches/efivar-211.patch \ %D%/packages/patches/efivar-211.patch \
%D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \ %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \
@ -1387,6 +1384,8 @@ dist_patch_DATA = \
%D%/packages/patches/lightdm-vncserver-check.patch \ %D%/packages/patches/lightdm-vncserver-check.patch \
%D%/packages/patches/lightdm-vnc-color-depth.patch \ %D%/packages/patches/lightdm-vnc-color-depth.patch \
%D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \
%D%/packages/patches/kcontacts-incorrect-country-name.patch \
%D%/packages/patches/kde-cli-tools-delay-mime-db.patch \
%D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \
%D%/packages/patches/kiki-level-selection-crash.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \
%D%/packages/patches/kiki-makefile.patch \ %D%/packages/patches/kiki-makefile.patch \
@ -1440,6 +1439,7 @@ dist_patch_DATA = \
%D%/packages/patches/libofa-ftbfs-2.diff \ %D%/packages/patches/libofa-ftbfs-2.diff \
%D%/packages/patches/libotr-test-auth-fix.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \
%D%/packages/patches/libksieve-Fix-missing-link-libraries.patch \ %D%/packages/patches/libksieve-Fix-missing-link-libraries.patch \
%D%/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch \
%D%/packages/patches/libmad-armv7-thumb-pt1.patch \ %D%/packages/patches/libmad-armv7-thumb-pt1.patch \
%D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \
%D%/packages/patches/libmad-length-check.patch \ %D%/packages/patches/libmad-length-check.patch \
@ -1483,7 +1483,8 @@ dist_patch_DATA = \
%D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \
%D%/packages/patches/libcdio-glibc-compat.patch \ %D%/packages/patches/libcdio-glibc-compat.patch \
%D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linbox-fix-pkgconfig.patch \
%D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linphone-desktop-without-sdk.patch \
%D%/packages/patches/linux-libre-infodocs-target.patch \
%D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \ %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
%D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \
%D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \
@ -1561,6 +1562,7 @@ dist_patch_DATA = \
%D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/m4-gnulib-libio.patch \
%D%/packages/patches/nautilus-extension-search-path.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/ncftp-reproducible.patch \ %D%/packages/patches/ncftp-reproducible.patch \
%D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-date-time.patch \
@ -1988,6 +1990,8 @@ dist_patch_DATA = \
%D%/packages/patches/vtk-7-gcc-10-compat.patch \ %D%/packages/patches/vtk-7-gcc-10-compat.patch \
%D%/packages/patches/vtk-7-hdf5-compat.patch \ %D%/packages/patches/vtk-7-hdf5-compat.patch \
%D%/packages/patches/vtk-7-python-compat.patch \ %D%/packages/patches/vtk-7-python-compat.patch \
%D%/packages/patches/wacomtablet-add-missing-includes.patch \
%D%/packages/patches/wacomtablet-qt5.15.patch \
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \

View File

@ -36,6 +36,7 @@
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
@ -58,6 +59,7 @@
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build) #:use-module (gnu packages python-build)
#:use-module (gnu packages python-check) #:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science) #:use-module (gnu packages python-science)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
@ -78,6 +80,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -1099,7 +1102,7 @@ to access online Astronomical data. Each web service has its own sub-package.")
(define-public python-cdflib (define-public python-cdflib
(package (package
(name "python-cdflib") (name "python-cdflib")
(version "0.4.4") (version "0.4.9")
(source (source
(origin (origin
(method git-fetch) ; no tests in pypi archive (method git-fetch) ; no tests in pypi archive
@ -1108,16 +1111,14 @@ to access online Astronomical data. Each web service has its own sub-package.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1h7750xvr6qbhnl2w3bhccs3pwp3hci3624pvvxym0yjinmskjlz")))) (base32 "1k557najk7ln293zwyghnhw48ays3nqf9s94kibsc7r70c2q7p08"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list #:phases (list #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'check (add-before 'check 'set-home-env
(lambda* (#:key tests? #:allow-other-keys) (lambda _
(when tests? (setenv "HOME" (getcwd)))))))
(setenv "HOME" (getcwd))
(invoke "pytest" "-vv" "tests")))))))
(propagated-inputs (propagated-inputs
(list python-attrs python-numpy)) (list python-attrs python-numpy))
(native-inputs (native-inputs
@ -1129,7 +1130,8 @@ to access online Astronomical data. Each web service has its own sub-package.")
python-xarray)) python-xarray))
(home-page "https://github.com/MAVENSDC/cdflib") (home-page "https://github.com/MAVENSDC/cdflib")
(synopsis "Python library to deal with NASA's CDF astronmical data format") (synopsis "Python library to deal with NASA's CDF astronmical data format")
(description "This package provides a Python CDF reader toolkit (description "This package provides a Python @acronym{CDF, Computable
Document Format} reader toolkit.
It provides the following functionality: It provides the following functionality:
@itemize @itemize
@item Ability to read variables and attributes from CDF files @item Ability to read variables and attributes from CDF files
@ -1138,9 +1140,46 @@ It provides the following functionality:
time formats time formats
@item Can convert CDF files into XArray Dataset objects and vice versa, @item Can convert CDF files into XArray Dataset objects and vice versa,
attempting to maintain ISTP compliance attempting to maintain ISTP compliance
@end itemize\n") @end itemize")
(license license:expat))) (license license:expat)))
(define-public python-drms
(package
(name "python-drms")
(version "0.6.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "drms" version))
(sha256
(base32 "1b0w350y4wbgyy19zcf28xbb85mqq6gnhb6ppibbc4hbn2ixbcvj"))))
(build-system python-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests?
#:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(setenv "JSOC_EMAIL" "jsoc@sunpy.org")
(invoke "python" "-m" "pytest" "-vv")))))))
(native-inputs
(list python-astropy
python-pytest-astropy
python-pytest
python-setuptools-scm))
(propagated-inputs (list python-numpy python-pandas))
(home-page "https://sunpy.org")
(synopsis "Access astronomical HMI, AIA and MDI data with Python")
(description
"DRMS module provides an easy-to-use interface for accessing HMI, AIA and
MDI data with Python. It uses the publicly accessible
JSOC (@url{http://jsoc.stanford.edu/}) DRMS server by default, but can also be
used with local NetDRMS sites.")
(license license:bsd-2)))
(define-public python-ephem (define-public python-ephem
(package (package
(name "python-ephem") (name "python-ephem")
@ -1164,6 +1203,53 @@ for a table giving the position of a planet, asteroid, or comet for a series
of dates.") of dates.")
(license license:expat))) (license license:expat)))
(define-public python-hvpy
(package
(name "python-hvpy")
(version "1.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "hvpy" version))
(sha256
(base32 "0r0asyflz2sw9zn5vgs138nh81m0rbwbakmrncbc1ghdr3g6jahv"))))
(build-system pyproject-build-system)
(arguments
(list #:tests? #f)) ; Requires HTTP(S) access to api.beta.helioviewer.org
(propagated-inputs (list python-pydantic python-requests))
(native-inputs (list python-pytest python-pytest-astropy))
(home-page "https://helioviewer.org/")
(synopsis "Helioviewer Python API Wrapper")
(description "@code{hvpy} is a Python API wrapper around the formal
@url{Helioviewer API, https://api.helioviewer.org/docs/v2/}.")
(license license:bsd-2)))
(define-public python-mpl-animators
(package
(name "python-mpl-animators")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mpl_animators" version))
(sha256
(base32 "12kjmj7rn3pk9ly82h5s5hn0kl3kxkr7bgkz9zr9k59pir8z1r8b"))))
(build-system pyproject-build-system)
(native-inputs
(list python-pytest
python-pytest-mpl
python-setuptools-scm))
(propagated-inputs
(list python-astropy
python-matplotlib
python-numpy))
(home-page "https://sunpy.org")
(synopsis "Interactive animations with matplotlib")
(description
"The @code{mpl_animators} package provides a set of classes which allow
the easy construction of interactive matplotlib widget based animations.")
(license license:bsd-3)))
(define-public python-photutils (define-public python-photutils
(package (package
(name "python-photutils") (name "python-photutils")
@ -1270,6 +1356,146 @@ Virtual observatory (VO) using Python.")
(description "Regions is an Astropy package for region handling.") (description "Regions is an Astropy package for region handling.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-reproject
(package
(name "python-reproject")
(version "0.9.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "reproject" version))
(sha256
(base32 "1msysqbhkfi3bmw29wipk250a008bnng7din56md9ipbwiar8x55"))))
(build-system pyproject-build-system)
(arguments
(list
;; FIXME: Failing tests
;;
;; reproject/adaptive/core.py:7: in <module>
;; from .deforest import map_coordinates
;; E ModuleNotFoundError: No module named 'reproject.adaptive.deforest'
;;
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-before 'install 'writable-compiler
(lambda _
(make-file-writable "reproject/_compiler.c")))
(add-before 'check 'writable-compiler
(lambda _
(make-file-writable "reproject/_compiler.c")))
(add-before 'check 'writable-home
(lambda _
(setenv "HOME" (getcwd)))))))
(propagated-inputs
(list python-astropy
python-astropy-healpix
python-numpy
python-scipy))
(native-inputs
(list python-asdf
python-cython
python-extension-helpers
python-gwcs
python-pytest-astropy
python-pyvo
python-semantic-version
python-pytest
python-setuptools-scm
python-shapely))
(home-page "https://reproject.readthedocs.io")
(synopsis "Astronomical image reprojection in Python")
(description
"This package provides a functionality to reproject astronomical images using
various techniques via a uniform interface, where reprojection is the
re-gridding of images from one world coordinate system to another e.g.
changing the pixel resolution, orientation, coordinate system.")
(license license:bsd-3)))
(define-public python-sunpy
(package
(name "python-sunpy")
(version "4.0.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sunpy" version))
(sha256
(base32 "0aiirb6l8zshdrpsvh6d5ki759ah9zfm9gbl0in985hprwwxyrq1"))))
(build-system pyproject-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'install 'writable-compiler
(lambda _
(make-file-writable "sunpy/_compiler.c")))
(add-before 'check 'prepare-test-environment
(lambda _
(setenv "HOME" "/tmp")
(make-file-writable "sunpy/_compiler.c")
;; TODO: (Sharlatan-20221106T115800+0000): Review failing tests
(substitute* "sunpy/image/tests/test_transform.py"
(("def test_clipping") "def __off_test_clipping")
(("def test_nans") "def __off_test_nans")
(("def test_endian") "def __off_test_endian"))
(substitute* "sunpy/map/tests/test_mapbase.py"
(("def test_derotating_nonpurerotation_pcij")
"def __off_test_derotating_nonpurerotation_pcij"))
(substitute* "sunpy/map/sources/tests/test_mdi_source.py"
(("def test_synoptic_source")
"def __off_test_synoptic_source"))
(substitute* "sunpy/tests/tests/test_self_test.py"
(("def test_main_nonexisting_module")
"def __off_test_main_nonexisting_module")
(("def test_main_stdlib_module")
"def __off_test_main_stdlib_module")))))))
(native-inputs
(list python-aiohttp
python-extension-helpers
python-hvpy
python-packaging
python-pytest
python-pytest-astropy
python-pytest-doctestplus
python-pytest-mock
python-pytest-mpl
python-pytest-xdist
python-setuptools-scm))
(propagated-inputs
(list parfive
python-asdf
python-asdf-astropy
python-astropy
python-beautifulsoup4
python-cdflib
python-dask
python-dateutil
python-drms
python-glymur
python-h5netcdf
python-h5py
python-hypothesis
python-jplephem
python-matplotlib
python-mpl-animators
python-numpy
;; python-opencv-python ; not packed yet
python-pandas
python-reproject
python-scikit-image
python-scipy
python-semantic-version
python-sqlalchemy
python-tqdm
python-zeep))
(home-page "https://sunpy.org")
(synopsis "Python library for Solar Physics")
(description
"SunPy is package for solar physics and is meant to be a free alternative to the
SolarSoft data analysis environment.")
(license license:bsd-2)))
(define-public python-astral (define-public python-astral
(package (package
(name "python-astral") (name "python-astral")
@ -1957,26 +2183,40 @@ datetime object.")
(define-public python-asdf (define-public python-asdf
(package (package
(name "python-asdf") (name "python-asdf")
(version "2.8.3") (version "2.13.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "asdf" version)) (uri (pypi-uri "asdf" version))
(sha256 (sha256
(base32 "0i4vq1hsympjgb1yvn4ql0gm8j1mki9ggmj03533kmg0nbzp03yy")))) (base32 "1zixzv4n2fryaszsfchqh2nvp0gzvarhz03fc721yw6iafdadqij"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
;; NOTE: (Sharlatan-20211229T201059+0000): Tests depend on astropy and ;; FIXME: Tests fail a lot with
;; gwcs, astropy gwcs depend on asdf. Disable circular dependence. ;;
;; ERROR - _pytest.pathlib.ImportPathMismatchError:
;; ('asdf.conftest', '/gnu/sto...
;;
`(#:tests? #f)) `(#:tests? #f))
(native-inputs (native-inputs
(list python-setuptools-scm (list python-astropy
python-packaging
python-psutil
python-pytest
python-pytest-doctestplus
python-pytest-openfiles
python-pytest-remotedata
python-semantic-version python-semantic-version
python-packaging)) python-setuptools-scm))
(propagated-inputs (propagated-inputs
(list python-importlib-resources (list python-asdf-standard
python-jsonschema python-asdf-transform-schemas
python-asdf-unit-schemas
python-importlib-metadata
python-importlib-resources
python-jmespath python-jmespath
python-jsonschema-next
python-lz4
python-numpy python-numpy
python-pyyaml)) python-pyyaml))
(home-page "https://github.com/asdf-format/asdf") (home-page "https://github.com/asdf-format/asdf")
@ -1987,31 +2227,63 @@ interchange format for scientific data. This package contains the Python
implementation of the ASDF Standard.") implementation of the ASDF Standard.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-asdf-standard
(package
(name "python-asdf-standard")
(version "1.0.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "asdf_standard" version))
(sha256
(base32
"0i7xdjwn5prg2hcnf1zhw57mszc68jjr5sv4rimpzcg7f2dgzn5g"))))
(build-system pyproject-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-before 'check 'remove-blocking-tests
(lambda _
;; Remove tests require python-asdf where
;; python-asdf require python-asdf-standard,
;; break circular dependencies.
(for-each delete-file
(list "tests/test_manifests.py"
"tests/test_integration.py")))))))
(native-inputs (list python-astropy
python-jsonschema-next
python-pypa-build
python-pytest-7.1
python-packaging
python-setuptools-scm))
(propagated-inputs (list python-importlib-resources))
(home-page "https://asdf-standard.readthedocs.io/")
(synopsis "ASDF standard schemas")
(description
"This package provides Python implementation of @acronym{ASDF, Advanced
Scientific Data Format} - a proposed next generation interchange format for
scientific data. ASDF aims to exist in the same middle ground that made FITS
so successful, by being a hybrid text and binary format: containing human
editable metadata for interchange, and raw binary data that is fast to load
and use. Unlike FITS, the metadata is highly structured and is designed
up-front for extensibility.")
(license license:bsd-3)))
(define python-asdf-transform-schemas (define python-asdf-transform-schemas
(package (package
(name "python-asdf-transform-schemas") (name "python-asdf-transform-schemas")
(version "0.2.0") (version "0.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "asdf_transform_schemas" version)) (uri (pypi-uri "asdf_transform_schemas" version))
(sha256 (sha256
(base32 "1gmzd81hw4ppsvzrc91wcbjpcw9hhv9gavllv7nyi7qjb54c837g")))) (base32 "1midgn575970p5cnsh9y6bz77fjr392b5nfxb3z0id6c49xzzwhc"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:phases ;; Dependency cycle with python-asdf
(modify-phases %standard-phases (list #:tests? #f))
(replace 'check (native-inputs (list python-setuptools-scm))
(lambda* (#:key inputs outputs tests? #:allow-other-keys) (propagated-inputs (list python-asdf-standard python-importlib-resources))
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest")))))))
(native-inputs
(list python-pytest
python-semantic-version
python-setuptools-scm))
(propagated-inputs
(list python-asdf))
(home-page "https://github.com/asdf-format/asdf-transform-schemas") (home-page "https://github.com/asdf-format/asdf-transform-schemas")
(synopsis "ASDF schemas for transforms") (synopsis "ASDF schemas for transforms")
(description (description
@ -2052,25 +2324,111 @@ coordinates tags. Users should not need to install this directly; instead,
install an implementation package such as asdf-astropy.") install an implementation package such as asdf-astropy.")
(license license:bsd-3))) (license license:bsd-3)))
(define python-asdf-fits-schemas
;; TODO: No release, change to tag when it's ready.
(let ((commit "572bb370d777f3a325b25c1af9d76e1b7d27dcea")
(revision "0"))
(package
(name "python-asdf-fits-schemas")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/asdf-format/asdf-fits-schemas")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1yqnzd0gcrdfl0jqm8m8kz5fd36i8lgh7xkglmp1chsi1cc6mkz2"))))
(build-system pyproject-build-system)
(arguments
(list
;; Dependency cycle with python-asdf
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'set-version
(lambda _
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" "0.0.1"))))))
(native-inputs (list python-setuptools-scm))
(propagated-inputs (list python-asdf-standard python-importlib-resources))
(home-page "https://github.com/asdf-format/asdf-fits-schemas")
(synopsis "ASDF schemas to support the FITS format")
(description
"This package provides ASDF schemas for validating FITS tags.")
(license license:bsd-3))))
(define python-asdf-time-schemas
;; TODO: No release, change to tag when it's ready.
(let ((commit "e9174083d9cfd3c6f7ded9eeb360d99ccb8d9d18")
(revision "2"))
(package
(name "python-asdf-time-schemas")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/asdf-format/asdf-time-schemas")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1i40hcxp8sds2zq939fwczjlshfqb9r9pnzy3a44c3wqdbwhcbdb"))))
(build-system pyproject-build-system)
(arguments
(list
;; Dependency cycle with python-asdf
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'set-version
(lambda _
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" "0.0.1"))))))
(native-inputs (list python-setuptools-scm))
(propagated-inputs (list python-asdf-standard
python-asdf-unit-schemas
python-importlib-resources))
(home-page "https://github.com/asdf-format/asdf-fits-schemas")
(synopsis "Schemas for storing time in ASDF")
(description
"This package provides ASDF schemas for validating time tags.")
(license license:bsd-3))))
(define python-asdf-unit-schemas
(package
(name "python-asdf-unit-schemas")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "asdf_unit_schemas" version))
(sha256
(base32
"16grpx3a9h0v1wirp0zqrfsxm867v5c0xyr98pylzziy45kqvds2"))))
(build-system pyproject-build-system)
(arguments
;; Dependency cycle with python-asdf
(list #:tests? #f))
(native-inputs (list python-setuptools-scm))
(propagated-inputs (list python-asdf-standard python-importlib-resources))
(home-page "https://asdf-unit-schemas.readthedocs.io/")
(synopsis "ASDF serialization schemas for the units defined by @code{astropy.units}")
(description "This package provides ASDF schemas for validating unit tags.")
(license license:bsd-3)))
(define-public python-asdf-astropy (define-public python-asdf-astropy
(package (package
(name "python-asdf-astropy") (name "python-asdf-astropy")
(version "0.1.2") (version "0.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "asdf_astropy" version)) (uri (pypi-uri "asdf_astropy" version))
(sha256 (sha256
(base32 "0bzgah7gskvnz6jcrzipvzixv8k2jzjkskqwxngzwp4nxgjbcvi4")))) (base32 "1b0v4cl7xvly3x1k5k2rvc2l32jqgqp0iyf1j20fkvj450sx74f2"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest")))))))
(native-inputs (native-inputs
(list python-coverage (list python-coverage
python-h5py python-h5py
@ -2130,24 +2488,16 @@ install an implementation package such as gwcs.")
(define-public python-gwcs (define-public python-gwcs
(package (package
(name "python-gwcs") (name "python-gwcs")
(version "0.18.0") (version "0.18.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "gwcs" version)) (uri (pypi-uri "gwcs" version))
(sha256 (sha256
(base32 "194j49m8xjjzv9pp8cnj06igz8sdxb0nphyybcc7mhigw0f0kr30")))) (base32 "0v9qcq6zl74d6s882s6xmas144jfalvll6va8rvrxmvpx4vqjzhg"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest")))))))
(native-inputs (native-inputs
(list python-jsonschema (list python-jsonschema-next
python-jmespath python-jmespath
python-pytest python-pytest
python-pytest-doctestplus python-pytest-doctestplus

View File

@ -3707,7 +3707,8 @@ analysis plugins or audio feature extraction plugins.")
(symlink (symlink
(search-input-file inputs (search-input-file inputs
(string-append "/share/automake-" (string-append "/share/automake-"
,(package-version automake) ,(version-major+minor
(package-version automake))
"/ar-lib")) "/ar-lib"))
"ar-lib") "ar-lib")
#t))))) #t)))))

View File

@ -1036,7 +1036,7 @@ precious backup space.
(arguments (arguments
`(#:tests? #f)) ;no test `(#:tests? #f)) ;no test
(inputs (inputs
(list lzo libressl protobuf xz zlib)) (list lzo libressl protobuf-3.6 xz zlib))
(home-page "http://zbackup.org") (home-page "http://zbackup.org")
(synopsis "Versatile deduplicating backup tool") (synopsis "Versatile deduplicating backup tool")
(description (description

View File

@ -130,7 +130,19 @@ command-line arguments, multiple languages, and so on.")
(substitute* (list (string-append bin "/egrep") (substitute* (list (string-append bin "/egrep")
(string-append bin "/fgrep")) (string-append bin "/fgrep"))
(("^exec grep") (("^exec grep")
(string-append "exec " bin "/grep"))))))) (string-append "exec " bin "/grep"))))))
,@(if (hurd-target?)
'((add-before 'check 'skip-triple-backref-test
(lambda _
;; This test is marked as malfunctioning on glibc systems
;; due to
;; <https://sourceware.org/bugzilla/show_bug.cgi?id=11053>
;; and it triggers a segfault with glibc 2.33 on GNU/Hurd.
;; Skip it.
(substitute* "tests/triple-backref"
(("^warn_" all)
(string-append "exit 77\n" all))))))
'()))
#:make-flags ,(if (hurd-target?) #:make-flags ,(if (hurd-target?)
''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX ''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX
''()))) ''())))

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,7 @@
;;; Copyright © 2021 Hong Li <hli@mdc-berlin.de> ;;; Copyright © 2021 Hong Li <hli@mdc-berlin.de>
;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Navid Afkhami <navid.afkhami@mdc-berlin.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -535,6 +536,42 @@ BED, GFF/GTF, VCF.")
and utilities for PacBio C++ applications.") and utilities for PacBio C++ applications.")
(license license:bsd-3)))) (license license:bsd-3))))
(define-public r-btools
(let ((commit "fa21d4ca01d37ea4d98b45582453f3bf95cbc2b5")
(revision "1"))
(package
(name "r-btools")
(version (git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/twbattaglia/btools")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0bca593dnxz6xdywpdi0ipli0paln2b3bfxxj0csnmj55ryrz428"))))
(properties `((upstream-name . "btools")))
(build-system r-build-system)
(propagated-inputs
(list r-biomformat
r-coin
r-deseq2
r-dplyr
r-genefilter
r-phyloseq
r-picante
r-plotly
r-reshape2
r-stringr
r-vegan))
(home-page "https://github.com/twbattaglia/btools")
(synopsis "R functions for microbial diversity analyses")
(description
"This package provides an assortment of R functions that is suitable
for all types of microbial diversity analyses.")
(license license:expat))))
(define-public pbbam (define-public pbbam
(package (package
(name "pbbam") (name "pbbam")

View File

@ -113,7 +113,7 @@ the same author.")
;; Aside from dbqn above, the main bqn repository is used by other ;; Aside from dbqn above, the main bqn repository is used by other
;; implementations as a "known good" set of sources. CBQN uses dbqn to ;; implementations as a "known good" set of sources. CBQN uses dbqn to
;; generate an intermediate bytecode for its own compilation. ;; generate an intermediate bytecode for its own compilation.
(let ((commit "e219af48401473a7bac49bdd8b89d69082cf5dd8")) (let ((commit "71ce36141aaacfa714edca2e408ca522a3bc5554"))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -121,11 +121,11 @@ the same author.")
(commit commit))) (commit commit)))
(file-name (git-file-name "bqn-sources" commit)) (file-name (git-file-name "bqn-sources" commit))
(sha256 (sha256
(base32 "0r6pa9lscl2395g4xlvmg90vpdsjzhin4f1r0s7brymmpvmns2yc"))))) (base32 "060a3r5m7hynzxj4iz1av2kj5jf8w3j8yswzzx9wkx31rdrsiv2c")))))
(define cbqn-bootstrap (define cbqn-bootstrap
(let* ((revision "1") (let* ((revision "2")
(commit "9c1cbdc99863b1da0116df61cd832137b196dc5c")) (commit "66584ce1491d300746963b8ed17170348b2a03e6"))
(package (package
(name "cbqn-bootstrap") (name "cbqn-bootstrap")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -137,7 +137,7 @@ the same author.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0w38fhwf20drkyijy6nfnhmc5g5gw0zmzgmy1q605x57znlj85a2")))) "13gg96aa56b8k08bjvv8i0f5nxrah2sij7g6pg7i21fdv08rd9iv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list

View File

@ -34,6 +34,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
@ -45,6 +46,7 @@
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -426,3 +428,38 @@ written in C++ using GTK. Launched once, it pops up a small calendar applet,
launched again it closes the running instance. It can additionally be launched again it closes the running instance. It can additionally be
configured to show the current time in different timezones.") configured to show the current time in different timezones.")
(license license:bsd-3)))) (license license:bsd-3))))
(define-public hebcal
(let ((commit "2384bb88dc1a41a4a5ae57a29fb58b2dd49a475d")
(revision "0"))
(package
(name "hebcal")
(version (git-version "5.3.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hebcal/hebcal")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"12rv3b51jb7wcjwmmizz9jkw7gh37yklys4xncvpzgxdkkfgmmjx"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/hebcal/hebcal"))
(inputs
(list go-github-com-hebcal-hebcal-go
go-github-com-pborman-getopt))
(synopsis "Perpetual Jewish Calendar program")
(description
"Hebcal is a program for converting between Hebrew and Gregorian
dates, and generating lists of Jewish holidays for a given year.
Shabbat, holiday candle lighting, and havdalah times are approximated
using your location.
It can also show daily prayer times, the weekly Torah reading, and
the daily leaf of Talmud. The program can help with counting of the
Omer or with calculation of Hebrew yahrzeits, birthdays, or
anniversaries.")
(home-page "https://github.com/hebcal/hebcal")
(license license:gpl2+))))

View File

@ -58,8 +58,8 @@
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
(define-public cuirass (define-public cuirass
(let ((commit "1fb4b0ac1297e9bd680d0f4a356ce3050b27f913") (let ((commit "1341725f2cbb886e0960c6fad13444e3cfe36c13")
(revision "12")) (revision "13"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "1.1.0" revision commit)) (version (git-version "1.1.0" revision commit))
@ -72,7 +72,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0134klqiykjgyc6lwl165hpil6hgd8xhm62mpxabr6wrvclk8bhm")))) "0l928hd84ky9l4d1nfdkzc4jvghvxia4j6gflliydvfiyfiw87b3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)

View File

@ -132,7 +132,7 @@
;; For the documentation. ;; For the documentation.
docbook-xml docbook-xml
docbook-xml-4.4 ;used by documentation/ra2refentry.xsl docbook-xml-4.4 ;used by documentation/ra2refentry.xsl
docbook-xsl docbook-xsl-next
libxml2 ;for XML_CATALOG_FILES libxml2 ;for XML_CATALOG_FILES
libxslt ;for xsltproc libxslt ;for xsltproc
ruby-asciidoctor)) ruby-asciidoctor))

View File

@ -599,6 +599,27 @@ Google. @code{googleVis} makes use of the internal R HTTP server to display
the output locally.") the output locally.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-gson
(package
(name "r-gson")
(version "0.0.9")
(source (origin
(method url-fetch)
(uri (cran-uri "gson" version))
(sha256
(base32
"065ify3i7zqwi7h5jzr7kdgr358kwgw6xrkvvmrznbl7s9f7d57n"))))
(properties `((upstream-name . "gson")))
(build-system r-build-system)
(propagated-inputs (list r-jsonlite r-rlang r-tidyr))
(home-page "https://cran.r-project.org/package=gson")
(synopsis "Base Class and Methods for 'gson' Format")
(description
"This packages proposes a new file format named @code{gson} for storing
gene set and related information, and provides read, write and other utilities
to process this file format.")
(license license:artistic2.0)))
(define-public r-guix-install (define-public r-guix-install
(package (package
(name "r-guix-install") (name "r-guix-install")
@ -709,6 +730,33 @@ allows transformation of geographic coordinates from one projection and/or
datum to another.") datum to another.")
(license license:gpl2))) (license license:gpl2)))
(define-public r-rorcid
(package
(name "r-rorcid")
(version "0.7.0")
(source (origin
(method url-fetch)
(uri (cran-uri "rorcid" version))
(sha256
(base32
"1d0s5w48ksyj152nc4xq5w0nsimab8jc5fgspdwnbas2g8a52igr"))))
(properties `((upstream-name . "rorcid")))
(build-system r-build-system)
(propagated-inputs (list r-crul
r-data-table
r-fauxpas
r-httr
r-jsonlite
r-tibble
r-xml2))
(home-page "https://github.com/ropensci/rorcid")
(synopsis "Interface to the @url{Orcid.org, https://orcid.org} API")
(description
"This package provides an API for @url{Orcid.org, https://orcid.org}.
Functions include searching for people, searching by DOI, or searching by
Orcid ID.")
(license license:expat)))
(define-public r-waldo (define-public r-waldo
(package (package
(name "r-waldo") (name "r-waldo")
@ -1273,13 +1321,13 @@ variables.")
(define-public r-ggprism (define-public r-ggprism
(package (package
(name "r-ggprism") (name "r-ggprism")
(version "1.0.3") (version "1.0.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggprism" version)) (uri (cran-uri "ggprism" version))
(sha256 (sha256
(base32 (base32
"09dh0r8r5s61i5dbk6rswajc2vm7k8wvlqyvzq8wr160676lycjp")))) "0ycklp7764cw65hqh9r61im8vqfd7sjayyw1gvprxzg7k217gnl3"))))
(properties `((upstream-name . "ggprism"))) (properties `((upstream-name . "ggprism")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -1874,6 +1922,30 @@ excellent candidate for labeling of a polygon.")
@code{dplyr} and the wider @code{tidyverse} using only @code{base}.") @code{dplyr} and the wider @code{tidyverse} using only @code{base}.")
(license license:expat))) (license license:expat)))
(define-public r-ecosolver
(package
(name "r-ecosolver")
(version "0.5.4")
(source (origin
(method url-fetch)
(uri (cran-uri "ECOSolveR" version))
(sha256
(base32
"0973m346vakgddp92dzqlky0wa196hj341r9y7rz67bc2zl8jx2x"))))
(properties `((upstream-name . "ECOSolveR")))
(build-system r-build-system)
(native-inputs (list r-knitr))
(home-page "https://bnaras.github.io/ECOSolveR/")
(synopsis "Embedded conic solver in R")
(description
"This package provides an R interface to the @dfn{Embedded COnic
Solver} (ECOS), an efficient and robust C library for convex problems.
Conic and equality constraints can be specified in addition to integer
and boolean variable constraints for mixed-integer problems. This R
interface is inspired by the Python interface and has similar calling
conventions.")
(license license:gpl3+)))
(define-public r-ecp (define-public r-ecp
(package (package
(name "r-ecp") (name "r-ecp")
@ -3603,13 +3675,13 @@ annotation data to keep updated.")
(define-public r-ggtern (define-public r-ggtern
(package (package
(name "r-ggtern") (name "r-ggtern")
(version "3.3.5") (version "3.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggtern" version)) (uri (cran-uri "ggtern" version))
(sha256 (sha256
(base32 "15hhn8msy0l8zbq8ms0zvg1iajn1c28gd77v3hp6dvwwsla8zzbd")))) (base32 "01j1rvff3vz72vwqsy3bh81aav7gfymg4sbvc267vg0r3a16ywcg"))))
(properties `((upstream-name . "ggtern"))) (properties `((upstream-name . "ggtern")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -5639,6 +5711,43 @@ testing framework of Wald are generic and can therefore also be used in other
contexts.") contexts.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-cvxr
(package
(name "r-cvxr")
(version "1.0-11")
(source (origin
(method url-fetch)
(uri (cran-uri "CVXR" version))
(sha256
(base32
"0alp1g4bszxqcrjbn54bz1zswg8y10372fwwlbi0jjazycw9cap9"))))
(properties `((upstream-name . "CVXR")))
(build-system r-build-system)
(propagated-inputs
(list r-bit64
r-ecosolver
r-gmp
r-matrix
r-osqp
r-r6
r-rcpp
r-rcppeigen
r-rmpfr
r-scs))
(native-inputs (list r-knitr))
(home-page "https://cvxr.rbind.io")
(synopsis "Disciplined convex optimization")
(description
"This package provides an object-oriented modeling language for
@dfn{disciplined convex programming} (DCP) as described in Fu,
Narasimhan, and Boyd (2020, <doi:10.18637/jss.v094.i14>). It allows
the user to formulate convex optimization problems in a natural way
following mathematical convention and DCP rules. The system analyzes
the problem, verifies its convexity, converts it into a canonical
form, and hands it off to an appropriate solver to obtain the
solution. Interfaces to solvers on CRAN and elsewhere are provided.")
(license license:asl2.0)))
(define-public r-squarem (define-public r-squarem
(package (package
(name "r-squarem") (name "r-squarem")
@ -19203,6 +19312,28 @@ authoring books and technical documents with R Markdown.")
that accept short and long options.") that accept short and long options.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-osqp
(package
(name "r-osqp")
(version "0.6.0.7")
(source (origin
(method url-fetch)
(uri (cran-uri "osqp" version))
(sha256
(base32
"00w2hr0pagnvpsk84z99c7alhv7xvs9wpcmkzbcg3qs14g888rgf"))))
(properties `((upstream-name . "osqp")))
(build-system r-build-system)
(propagated-inputs (list r-matrix r-r6 r-rcpp))
(home-page "https://osqp.org")
(synopsis "Quadratic Programming Solver using the OSQP Library")
(description
"This package provides bindings to the OSQP solver. The OSQP
solver is a numerical optimization package or solving convex quadratic
programs written in C and based on the alternating direction method of
multipliers. See <arXiv:1711.08013> for details.")
(license (list license:asl2.0))))
(define-public r-kernlab (define-public r-kernlab
(package (package
(name "r-kernlab") (name "r-kernlab")
@ -20947,6 +21078,30 @@ errors and possible semantic issues. It supports on the fly checking of R
code edited with @code{RStudio IDE}, @code{Emacs} and @code{Vim}.") code edited with @code{RStudio IDE}, @code{Emacs} and @code{Vim}.")
(license license:expat))) (license license:expat)))
(define-public r-scs
(package
(name "r-scs")
(version "3.0-1")
(source (origin
(method url-fetch)
(uri (cran-uri "scs" version))
(sha256
(base32
"04srf33zw4dxv22b1h5qwjch5yg7hrvk4iq8yvxqnbr8qzp1x26n"))))
(properties `((upstream-name . "scs")))
(build-system r-build-system)
(home-page "https://github.com/FlorianSchwendinger/scs")
(synopsis "Splitting conic solver")
(description
"This package solves convex cone programs via operator splitting.
It can solve: linear programs, second-order cone programs,
semidefinite programs, exponential cone programs, and power cone
programs, or problems with any combination of those cones. SCS uses
AMD (a set of routines for permuting sparse matrices prior to
factorization) and LDL (a sparse LDL factorization and solve package)
from SuiteSparse.")
(license license:gpl3)))
(define-public r-sctransform (define-public r-sctransform
(package (package
(name "r-sctransform") (name "r-sctransform")

View File

@ -1580,17 +1580,24 @@ types are supported, as is encryption.")
(sha256 (sha256
(base32 (base32
"1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x")) "1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x"))
(snippet '(begin (delete-file "rec-mode.info"))))) (snippet #~(begin (delete-file "rec-mode.info")))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
'(#:phases (list
(modify-phases %standard-phases #:phases
(add-before 'install 'make-info #~(modify-phases %standard-phases
(lambda _ (add-after 'unpack 'patch-program-paths
(invoke "makeinfo" "--no-split" (lambda* (#:key inputs #:allow-other-keys)
"-o" "rec-mode.info" "rec-mode.texi")))))) (emacs-substitute-variables "rec-mode.el"
(native-inputs ("rec-recfix" (search-input-file inputs "bin/recfix"))
(list texinfo)) ("rec-recinf" (search-input-file inputs "bin/recinf"))
("rec-recsel" (search-input-file inputs "bin/recsel")))))
(add-before 'install 'make-info
(lambda _
(invoke "makeinfo" "--no-split"
"-o" "rec-mode.info" "rec-mode.texi"))))))
(inputs (list recutils))
(native-inputs (list texinfo))
(home-page "https://www.gnu.org/software/recutils/") (home-page "https://www.gnu.org/software/recutils/")
(synopsis "Emacs mode for working with recutils database files") (synopsis "Emacs mode for working with recutils database files")
(description "This package provides an Emacs major mode @code{rec-mode} (description "This package provides an Emacs major mode @code{rec-mode}

View File

@ -597,7 +597,7 @@ the position of the variable and allows you to modify its value.")
(define-public remake (define-public remake
(package (inherit gnu-make) (package (inherit gnu-make)
(name "remake") (name "remake")
(version "4.3-1.5") (version "4.3-1.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((upstream-version (uri (let ((upstream-version
@ -609,7 +609,7 @@ the position of the variable and allows you to modify its value.")
(file-name (string-append "remake-" version ".tar.gz")) (file-name (string-append "remake-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0xlx2485y0israv2pfghmv74lxcv9i5y65agy69mif76yc4vfvif")) "11vvch8bi0yhjfz7gn92b3xmmm0cgi3qfiyhbnnj89frkhbwd87n"))
(patches (search-patches "remake-impure-dirs.patch")))) (patches (search-patches "remake-impure-dirs.patch"))))
(inputs (inputs
(modify-inputs (package-inputs gnu-make) (modify-inputs (package-inputs gnu-make)

View File

@ -24,6 +24,7 @@
;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li> ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Disseminate Dissent <disseminatedissent@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -835,6 +836,46 @@ hierarchy. It ships with @code{rifle}, a file launcher that is good at
automatically finding out which program to use for what file type.") automatically finding out which program to use for what file type.")
(license license:gpl3))) (license license:gpl3)))
(define-public fff
(package
(name "fff")
(version "2.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dylanaraps/fff")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"))))
(build-system gnu-build-system)
(inputs
(list bash
file))
(arguments
(list
#:tests? #f ; no tests
#:make-flags
#~(list
(string-append "PREFIX=" #$output))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'refer-to-inputs
(lambda* (#:key inputs #:allow-other-keys)
(let ((file (assoc-ref inputs "file")))
(substitute* "fff"
(("\\bfile [-\"]" match)
(string-append file "/bin/" match))))))
(delete 'configure)))) ; no configure script
(home-page "https://github.com/dylanaraps/fff")
(synopsis "Simple file manager written in bash")
(description
"@command{fff} (fast file-manager) is a simple, blazing fast and minimal
file manager for Linux, written in bash. It only requires bash and coreutils,
and its highly optimized now for efficient performance.")
(license license:expat)))
(define-public volume-key (define-public volume-key
(package (package
(name "volume-key") (name "volume-key")

View File

@ -1013,14 +1013,14 @@ synthesis, and on-the-fly re-configuration.")
(define-public knot-resolver (define-public knot-resolver
(package (package
(name "knot-resolver") (name "knot-resolver")
(version "5.4.4") (version "5.5.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-resolver/" (uri (string-append "https://secure.nic.cz/files/knot-resolver/"
"knot-resolver-" version ".tar.xz")) "knot-resolver-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1sic5ccbbqml4c01dbikkg6qx1gg81nqi76cj79pjdllkqqn92aq")))) "0bgdbx66dsfik3sdqi4g2imddalqc1p41n444xk7s8vxig35g3x3"))))
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments

View File

@ -580,7 +580,7 @@ runcexecutor/executor.go"
util-linux util-linux
lvm2 lvm2
tini tini
xfsprogs xfsprogs-5.9
xz)) xz))
(native-inputs (native-inputs
(list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc) (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc)

View File

@ -667,7 +667,6 @@ language and very flexible regarding to new or unknown keyboard layouts.")
ki18n ki18n
kiconthemes kiconthemes
kitemviews kitemviews
kqtquickcharts
ktextwidgets ktextwidgets
kwidgetsaddons kwidgetsaddons
kwindowsystem kwindowsystem

View File

@ -554,6 +554,52 @@ optional baked-in Evil support, antialiased separators, and an easy
configuration language which makes it trivial to write your own themes.") configuration language which makes it trivial to write your own themes.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-inspector
(let ((commit "0e89d28558f57db4519f154bb72ce617a8c6265d")
(revision "0"))
(package
(name "emacs-inspector")
(version (git-version "0.8" revision commit))
(source
(origin
(uri (git-reference
(url "https://github.com/mmontone/emacs-inspector")
(commit commit)))
(method git-fetch)
(sha256
(base32 "0n72sqn29b5sya686cicgp40mkk5x5821b7bw4zs6dcl82cyij5n"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
(list
#:tests? #t
#:test-command #~(list "emacs" "-Q" "--batch"
"-L" "."
"-l" "inspector-tests.el"
"-l" "tree-inspector-tests.el"
"-f" "ert-run-tests-batch-and-exit")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'preserve-emacs-28-compatibility
;; XXX: `cl-constantly' function is defined in "cl-lib" starting
;; from Emacs 29+. For now, replace it with its definition.
(lambda _
(substitute* "tree-inspector.el"
(("cl-constantly") "lambda (_)"))))
(add-before 'check 'skip-failing-test
(lambda _
(substitute* "tree-inspector-tests.el"
(("\\(ert-deftest inspector-tests--inspect-struct-test.*" all)
(string-append all " (skip-unless nil)"))))))))
(native-inputs (list emacs-ert-runner))
(propagated-inputs (list emacs-treeview))
(home-page "https://github.com/mmontone/emacs-inspector")
(synopsis "Inspection tool for Emacs Lisp objects")
(description
"This package provides an introspection tool similar to those found in
Common Lisp or Smalltalk, but for Emacs Lisp.")
(license license:gpl3+))))
(define-public emacs-terminal-here (define-public emacs-terminal-here
(package (package
(name "emacs-terminal-here") (name "emacs-terminal-here")
@ -576,6 +622,28 @@ Emacs, whose initial working directories are determined in relation to the
current buffer.") current buffer.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-treeview
(let ((commit "d9c10feddf3b959e7b33ce83103e1f0a61162723")
(revision "0"))
(package
(name "emacs-treeview")
(version (git-version "1.1.1" revision commit))
(source
(origin
(uri (git-reference
(url "https://github.com/tilmanrassy/emacs-treeview")
(commit commit)))
(method git-fetch)
(sha256
(base32 "14s0b6zbapsvgyxki59lglwb3s8wjsjwkgj5r66af9nj2bgz5ms9"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(home-page "https://github.com/tilmanrassy/emacs-treeview/")
(synopsis "Emacs Lisp framework for tree navigation")
(description
"Abstract Emacs Lisp framework for tree navigation.")
(license license:gpl3+))))
(define-public emacs-hgignore-mode (define-public emacs-hgignore-mode
;; From 2021-03-14. ;; From 2021-03-14.
;; No releases available. ;; No releases available.
@ -741,36 +809,31 @@ Emacs package archive}.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-paredit (define-public emacs-paredit
;; The last tagged release is from 2014; use the latest commit, which (package
;; includes many fixes such as honoring the 'fill-paragraph-function' (name "emacs-paredit")
;; variable. (version "25")
(let ((commit "d0b1a2f42fb47efc8392763d6487fd027e3a2955") (source (origin
(revision "1")) (method git-fetch)
(package (uri (git-reference
(name "emacs-paredit") (url "https://mumble.net/~campbell/git/paredit.git")
(version (git-version "24" revision commit)) (commit (string-append "v" version))))
(source (origin (file-name (git-file-name name version))
(method git-fetch) (sha256
(uri (git-reference (base32
(url "https://mumble.net/~campbell/git/paredit.git") "1gc6lnk5xqxzl9s2m99hfi07wp4zfhh1k64c1bdrjfalv55nl998"))))
(commit commit))) (build-system emacs-build-system)
(file-name (git-file-name name version)) (home-page "http://mumble.net/~campbell/emacs/paredit/")
(sha256 (synopsis "Emacs minor mode for editing parentheses")
(base32 (description
"1x91xxvwb3r3h61ff1kknlaakxm1a40r7zg2lck9j52yiza4f191")))) "ParEdit (paredit.el) is a minor mode for performing structured editing
(build-system emacs-build-system)
(home-page "http://mumble.net/~campbell/emacs/paredit/")
(synopsis "Emacs minor mode for editing parentheses")
(description
"ParEdit (paredit.el) is a minor mode for performing structured editing
of S-expression data. The typical example of this would be Lisp or Scheme of S-expression data. The typical example of this would be Lisp or Scheme
source code. source code.
ParEdit helps **keep parentheses balanced** and adds many keys for moving ParEdit helps keep parentheses balanced and adds many keys for moving
S-expressions and moving around in S-expressions. Its behavior can be jarring S-expressions and moving around in S-expressions. Its behavior can be jarring
for those who may want transient periods of unbalanced parentheses, such as for those who may want transient periods of unbalanced parentheses, such as
when typing parentheses directly or commenting out code line by line.") when typing parentheses directly or commenting out code line by line.")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public emacs-puni (define-public emacs-puni
;; No tagged release upstream ;; No tagged release upstream
@ -2841,6 +2904,34 @@ like. It can be linked with various Emacs mail clients (Message and Mail
mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-bbdb-vcard
;; No release since Dec 1, 2013.
(let ((version "0.4.1") ;3d79fdb4200a64a043e203a3baac95c936095b52, not tagged
(revision "88")
(commit "113c66115ce68316e209f51ebce56de8dded3606"))
(package
(name "emacs-bbdb-vcard")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tohojo/bbdb-vcard")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1sr5kd2gvw1b4hl147yb60cgx6j730vdnpyr09p7vmpw65hzwlwm"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-bbdb))
(home-page "https://github.com/tohojo/bbdb-vcard")
(synopsis
"vCard Import and Export for The Insidious Big Brother Database (BBDB)")
(description
"@code{bbdb-vcard.el} imports and exports vCards (version 3.0) as
defined in RFC 2425 and RFC 2426 to/from The Insidious Big Brother Database
(BBDB). Version 2.1 vCards are converted into version 3.0 on import.")
(license license:gpl2+))))
(define-public emacs-beacon (define-public emacs-beacon
(package (package
(name "emacs-beacon") (name "emacs-beacon")
@ -3439,7 +3530,7 @@ of bibliographic references.")
(define-public emacs-corfu (define-public emacs-corfu
(package (package
(name "emacs-corfu") (name "emacs-corfu")
(version "0.28") (version "0.33")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3448,7 +3539,7 @@ of bibliographic references.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0lmjmaijanhhimkd006y5g1pvpllqgm30wj2y3wf3h4sl7h23rcz")))) (base32 "0c353k6f4i96gajfw1zvidhlwr2brnhhdr39503hpa5wnp69wak7"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -3496,7 +3587,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.")
(define-public emacs-cape (define-public emacs-cape
(package (package
(name "emacs-cape") (name "emacs-cape")
(version "0.10") (version "0.11")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3505,7 +3596,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0kcnyzksj8yglk67g1130wxzscgipm7cz2hs8mvdqpcbz4i38jny")))) (base32 "0z6ixw7gsx1g7x2xpj5ilslrjrlp6x2ynzh731hs3yf3n281715b"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/minad/cape") (home-page "https://github.com/minad/cape")
(synopsis "Completion at point extensions for Emacs") (synopsis "Completion at point extensions for Emacs")
@ -4626,7 +4717,6 @@ which is restored where possible when the file is loaded again.")
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:tests? #t `(#:tests? #t
#:emacs ,emacs ; FIXME: tests fail with emacs-minimal
#:test-command '("./run-tests.sh"))) #:test-command '("./run-tests.sh")))
(home-page "https://github.com/magnars/s.el") (home-page "https://github.com/magnars/s.el")
(synopsis "Emacs string manipulation library") (synopsis "Emacs string manipulation library")
@ -6105,10 +6195,10 @@ blocks with @code{org-babel} in @code{org-mode}.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-ob-restclient (define-public emacs-ob-restclient
(let ((commit "f7449b2068498fe9d8ab9589e0a638148861533f")) (let ((commit "1b021ce1c67c97fa1aa4d2c0816edb7add129e48"))
(package (package
(name "emacs-ob-restclient") (name "emacs-ob-restclient")
(version (git-version "0.02" "2" commit)) (version (git-version "0.02" "3" commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6117,7 +6207,7 @@ blocks with @code{org-babel} in @code{org-mode}.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0s3931w9ab3yfml2pmq71rw21yf6hpg7m3vihxyy3vs6zli1cvmq")))) (base32 "1bcjj01q5n9w2cch6brbz8pzwnwsmdlgaa4sf5s97b9frmqb2ffg"))))
(propagated-inputs (propagated-inputs
(list emacs-restclient)) (list emacs-restclient))
(build-system emacs-build-system) (build-system emacs-build-system)
@ -6930,7 +7020,7 @@ files which are intended to be packages.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://git.sr.ht/~manuel-uberti/flycheck-proselint") (url "https://git.sr.ht/~manuel-uberti/flymake-proselint")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -6947,11 +7037,9 @@ files which are intended to be packages.")
(("\"proselint\"") (("\"proselint\"")
(string-append (string-append
"\"" (search-input-file inputs "/bin/proselint") "\"")))))))) "\"" (search-input-file inputs "/bin/proselint") "\""))))))))
(propagated-inputs
(list emacs-flycheck))
(inputs (inputs
(list python-proselint)) (list python-proselint))
(home-page "https://git.sr.ht/~manuel-uberti/flycheck-proselint") (home-page "https://git.sr.ht/~manuel-uberti/flymake-proselint")
(synopsis "Flymake backend for @code{proselint}") (synopsis "Flymake backend for @code{proselint}")
(description "This package adds support for @code{proselint} in Flymake.") (description "This package adds support for @code{proselint} in Flymake.")
(license license:gpl3+)))) (license license:gpl3+))))
@ -11763,26 +11851,40 @@ like @code{org-edit-src-code} but for arbitrary regions.")
(define-public emacs-projectile (define-public emacs-projectile
(package (package
(name "emacs-projectile") (name "emacs-projectile")
(version "2.6.0") (version "2.7.0")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://raw.githubusercontent.com/bbatsov" (method git-fetch)
"/projectile/v" version "/projectile.el")) (uri (git-reference
(file-name (string-append "projectile-" version ".el")) (url "https://github.com/bbatsov/projectile")
(sha256 (commit (string-append "v" version))))
(base32 (file-name (git-file-name name version))
"12crymgri4sg7fvnh692f96cm0krmmcnz6x3ypxgq8da84rl34p4")))) (sha256
(base32
"0ybd41iss8vd56qv6czpxqq7a99s4h7i3a2r4khy4rf5blj5zdqi"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
(list
#:tests? #t
#:test-command #~(list "buttercup" "-L" ".")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'fix-failing-test
(lambda _
(substitute* "test/projectile-test.el"
(("user-emacs-directory") "\".\"")))))))
(native-inputs
(list emacs-buttercup))
(propagated-inputs (propagated-inputs
(list emacs-dash emacs-pkg-info)) (list emacs-dash emacs-pkg-info))
(home-page "https://github.com/bbatsov/projectile") (home-page "https://github.com/bbatsov/projectile")
(synopsis "Manage and navigate projects in Emacs easily") (synopsis "Manage and navigate projects in Emacs easily")
(description (description
"This library provides easy project management and navigation. The "This library provides easy project management and navigation. The
concept of a project is pretty basic - just a folder containing special file. concept of a project is pretty basic: just a folder containing special file.
Currently git, mercurial and bazaar repos are considered projects by default. Currently Git, Mercurial and Bazaar repositories are considered projects by
If you want to mark a folder manually as a project just create an empty default. If you want to mark a folder manually as a project just create an
.projectile file in it.") empty @file{.projectile} file in it.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-skeletor (define-public emacs-skeletor
@ -13325,6 +13427,30 @@ Lua programming language}.")
news items, openrc and runscripts.") news items, openrc and runscripts.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-ebuku
;; Upstream has no tagged release.
(let ((revision "1")
(commit "0c6cf404a49bd68800221446df186fffa0139325"))
(package
(name "emacs-ebuku")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/flexibeast/ebuku")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"09fkzmcvzdbdjaa167wiybj0kir7y12pcq2varjywshvq2l7niz4"))))
(build-system emacs-build-system)
(home-page "https://github.com/flexibeast/ebuku")
(synopsis "Emacs interface to the buku Web bookmark manager")
(description
"Ebuku provides a basic interface to the @code{buku} Web bookmark
manager.")
(license license:gpl3+))))
(define-public emacs-evil (define-public emacs-evil
;; Commit message claims this is 1.15.0, but there's no tag for it, so we ;; Commit message claims this is 1.15.0, but there's no tag for it, so we
;; use full git-version instead ;; use full git-version instead
@ -16623,6 +16749,26 @@ for the current file, using the major mode as a hint. It prompts you to enter
one if it fails.") one if it fails.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-jarchive
(package
(name "emacs-jarchive")
(version "0.8.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~dannyfreeman/jarchive")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1fi3y5kmy7ginyqg12q797bma638xmam7lrk74x6yhx84xgzb4fq"))))
(build-system emacs-build-system)
(home-page "https://sr.ht/~dannyfreeman/jarchive")
(synopsis "Jarchive teaches Emacs how to navigate to files inside JARs")
(description "Jarchive makes Emacs handle Java and LSP URIs pointing to
source inside JARs.")
(license license:gpl3+)))
(define-public emacs-eldoc (define-public emacs-eldoc
(package (package
(name "emacs-eldoc") (name "emacs-eldoc")
@ -16929,9 +17075,9 @@ formatting, and utility methods for jsonnet files.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-restclient (define-public emacs-restclient
(let ((commit "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3") (let ((commit "1fb570643b08ba66eb70831b6f874f52546917f1")
(version "0") (version "0")
(revision "3")) ;Guix package revision, (revision "4")) ;Guix package revision,
;upstream doesn't have official releases ;upstream doesn't have official releases
(package (package
(name "emacs-restclient") (name "emacs-restclient")
@ -16943,7 +17089,7 @@ formatting, and utility methods for jsonnet files.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk")) "0npij1p1yw4p1f1yrx6bl8q18nav5p2xvbp7qhzhn7lb2fdn5jqv"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
@ -17103,6 +17249,42 @@ additions:
or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") or @code{treemacs}, but leveraging @code{Dired} to do the job of display.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-dirvish
(package
(name "emacs-dirvish")
(version "2.0.53")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alexluigit/dirvish")
(commit "c535e2147171be5506f4ff34e862bacbfb3de768")))
(sha256
(base32
"1nmp5ci4dvcpih6phfhk66s98lf8b49qd35ymy29kqkf5v4cnwga"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-transient))
(arguments
(list
#:phases
#~(modify-phases %standard-phases
;; Move the extensions source files to the top level, which
;; is included in the EMACSLOADPATH.
(add-after 'unpack 'move-source-files
(lambda _
(let ((el-files (find-files "./extensions" ".*\\.el$")))
(for-each (lambda (f)
(rename-file f (basename f)))
el-files)))))))
(home-page "https://github.com/alexluigit/dirvish")
(synopsis "Improved version of the Emacs package Dired")
(description
"Dirvish is an improved version of the Emacs inbuilt package Dired. It
not only gives Dired an appealing and highly customizable user interface, but
also comes together with almost all possible parts required for full usability
as a modern file manager.")
(license license:gpl3+)))
(define-public emacs-which-key (define-public emacs-which-key
(package (package
(name "emacs-which-key") (name "emacs-which-key")
@ -19300,7 +19482,7 @@ match and total match information in the mode-line in various search modes.")
(define-public emacs-pg (define-public emacs-pg
(package (package
(name "emacs-pg") (name "emacs-pg")
(version "0.16") (version "0.19")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url "https://github.com/emarsden/pg-el") (uri (git-reference (url "https://github.com/emarsden/pg-el")
@ -19308,7 +19490,7 @@ match and total match information in the mode-line in various search modes.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1jdnslpgdm16klaga02p33g7c8bjzg164kxz3jd7gs5v9gqa6ppz")))) "13fkkpimhxh91hmsp551wzrdcic5ws7wj7vjwnh8l83hsrxmxz0y"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/emarsden/pg-el") (home-page "https://github.com/emarsden/pg-el")
(synopsis "Emacs Lisp interface for PostgreSQL") (synopsis "Emacs Lisp interface for PostgreSQL")
@ -19904,7 +20086,7 @@ according to a parsing expression grammar.")
(define-public emacs-eldev (define-public emacs-eldev
(package (package
(name "emacs-eldev") (name "emacs-eldev")
(version "1.2.2") (version "1.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -19913,7 +20095,7 @@ according to a parsing expression grammar.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0d6wbfim0q81sm5m45fjc6n0v6nk32qrgas5nzrs0vslym4bfxna")))) (base32 "112jv9rz6brglffwsablnhafhhnfnq89k9vh8xzbbi6i4xz2l1ak"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -20755,8 +20937,8 @@ never confused by comments or @code{foo-bar} matching @code{foo}.")
(define-public emacs-crdt (define-public emacs-crdt
;; XXX: Upstream does not always tag new releases. The commit below ;; XXX: Upstream does not always tag new releases. The commit below
;; corresponds exactly to latest version bump. ;; corresponds exactly to latest version bump.
(let ((commit "92a7c93a3b4cb4b40f133acd22c89a5fda5cdd30") (let ((commit "e6d42f42c5dedb73560048f4bf6263c63ffa21bb")
(version "0.3.4")) (version "0.3.5"))
(package (package
(name "emacs-crdt") (name "emacs-crdt")
(version version) (version version)
@ -20768,7 +20950,7 @@ never confused by comments or @code{foo-bar} matching @code{foo}.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1vh4d15g62crm4vimc7lgr11ws68g25ylipnvqlrrkvl6qrz3fhj")))) (base32 "16dpg0d8p4fqjl2nir290iim9bb7f87rwnxs16lx67dasvbfawph"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://code.librehq.com/qhong/crdt.el") (home-page "https://code.librehq.com/qhong/crdt.el")
(synopsis "Real-time collaborative editing environment") (synopsis "Real-time collaborative editing environment")
@ -20985,22 +21167,22 @@ or expressions with SVG rounded box labels that are fully customizable.")
(define-public emacs-kind-icon (define-public emacs-kind-icon
(package (package
(name "emacs-kind-icon") (name "emacs-kind-icon")
(version "0.1.7") (version "0.1.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/kind-icon-" (uri (string-append "https://elpa.gnu.org/packages/kind-icon-"
version ".tar")) version ".tar"))
(sha256 (sha256
(base32 "02imi2qj329yrqvs23d4z7fv8bbaz0fvya6zdswb38blpdri4cn1")))) (base32 "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (list emacs-svg-lib)) (propagated-inputs (list emacs-svg-lib))
(home-page "https://github.com/jdtsmith/kind-icon") (home-page "https://github.com/jdtsmith/kind-icon")
(synopsis "Completion kind icons in Emacs") (synopsis "Completion kind icons in Emacs")
(description "Kind-icon mode adds a colorful icon or text prefix based (description "Kind-icon mode adds a colorful icon or text prefix based on
on :company-kind for compatible completion UIs. The \"kind\" prefix is @code{:company-kind} for compatible completion UIs. The ``kind'' prefix is
typically used for differentiating completion candidates such as variables, typically used for differentiating completion candidates such as variables or
functions, etc.") functions.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-svg-icon (define-public emacs-svg-icon
@ -22553,6 +22735,29 @@ It replaces the standard completions buffer with Ido prompt.")
using user-provided rules.") using user-provided rules.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-on
(let ((commit "83baed07a105c135190d49d7ec77f95e8f38fa54")
(revision "0"))
(package
(name "emacs-on")
(version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ajgrf/on.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"14ly3w89hf4jgd8wacirxgd8vrgj7vc0hpfn911w5wa4k2a6nzpp"))))
(build-system emacs-build-system)
(home-page "https://github.com/ajgrf/on.el")
(synopsis "Hooks for faster Emacs startup")
(description
"This package exposes a number of utility hooks and functions ported
from Doom Emacs.")
(license license:expat))))
(define-public emacs-on-screen (define-public emacs-on-screen
(package (package
(name "emacs-on-screen") (name "emacs-on-screen")
@ -26087,7 +26292,7 @@ according to their use.")
(define-public emacs-detached (define-public emacs-detached
(package (package
(name "emacs-detached") (name "emacs-detached")
(version "0.9.2") (version "0.10.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -26096,7 +26301,7 @@ according to their use.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0bcrqqim6is75d4zadswxp162m9gd34xmb2wxsx9rhvkwq0ln35k")))) "0dvvyqc0nw9has54vps10f5iv831cb29vqvbvx0m2djv9pacqp17"))))
(arguments (arguments
(list (list
#:tests? #t #:tests? #t
@ -28571,8 +28776,7 @@ between \"frame-width\" and \"frame-height\", between \"public\",
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://elpa.gnu.org/packages/ediprolog-" "https://elpa.gnu.org/packages/ediprolog-"
version version ".tar"))
".el"))
(sha256 (sha256
(base32 "021jm5zdxrjg7xcja18vgc2v52rk17xi1k7xxw8q802nmixhy0js")))) (base32 "021jm5zdxrjg7xcja18vgc2v52rk17xi1k7xxw8q802nmixhy0js"))))
(build-system emacs-build-system) (build-system emacs-build-system)
@ -31908,6 +32112,31 @@ ASCII UML sequence diagrams in Emacs, which can be embedded in source code,
comments or emails.") comments or emails.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-ukrainian-holidays
;; There is no proper release.
;; The base version is extracted from the source code.
(let ((revision "0")
(commit "e52b0c92843e9f4d0415a7ba3b8559785497d23d"))
(package
(name "emacs-ukrainian-holidays")
(version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/abo-abo/ukrainian-holidays")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz"))))
(build-system emacs-build-system)
(home-page "https://github.com/abo-abo/ukrainian-holidays")
(synopsis "Ukrainian holidays for Emacs calendar")
(description
"This package provides Ukrainian holidays for Emacs calendar.")
(license license:gpl3+))))
(define-public emacs-trashed (define-public emacs-trashed
(package (package
(name "emacs-trashed") (name "emacs-trashed")
@ -32687,14 +32916,14 @@ work on alists, hash-table and arrays. All functions are prefixed with
(define-public emacs-xref (define-public emacs-xref
(package (package
(name "emacs-xref") (name "emacs-xref")
(version "1.5.1") (version "1.6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xref-" (uri (string-append "https://elpa.gnu.org/packages/xref-"
version ".tar")) version ".tar"))
(sha256 (sha256
(base32 "131jxsc1sl8q3r9drhylwyfig9qjjkj3hilv3npidp868pr7xdna")))) (base32 "0vqs2l4gypdx475yi0yic0mnsg1f9nm698gi90kh7xfcpmkfcgb4"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/xref.html") (home-page "http://elpa.gnu.org/packages/xref.html")
(synopsis "Cross-referencing commands") (synopsis "Cross-referencing commands")
@ -32874,7 +33103,7 @@ and preferred services can easily be configured.")
(define-public emacs-vertico (define-public emacs-vertico
(package (package
(name "emacs-vertico") (name "emacs-vertico")
(version "0.28") (version "0.29")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -32883,7 +33112,7 @@ and preferred services can easily be configured.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0yybwj32k74c5c4rzlpmkq540b8ax0ihn5v7krnri83wn50hr272")))) (base32 "0gqfq7yni470yys9blarmsinjgf1025azlr09g1842w20hwrs7hc"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -33378,7 +33607,7 @@ Fennel code within Emacs.")
(define-public emacs-org-modern (define-public emacs-org-modern
(package (package
(name "emacs-org-modern") (name "emacs-org-modern")
(version "0.5") (version "0.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -33386,7 +33615,7 @@ Fennel code within Emacs.")
(url "https://github.com/minad/org-modern") (url "https://github.com/minad/org-modern")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "1gny2p3w6ck5sarv6vap2y1lj6h9qaxbh7r7bzszb9qj8rhapk6q")) (base32 "03zpwb475rpbhq1s6101clj0j9mcxdg033clvvybp0p7hm4inwaz"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/minad/org-modern") (home-page "https://github.com/minad/org-modern")
@ -33435,8 +33664,8 @@ headlines, keywords, tables and source blocks.")
(license license:gpl3+)))) ; License is in pyimport.el (license license:gpl3+)))) ; License is in pyimport.el
(define-public emacs-straight-el (define-public emacs-straight-el
(let ((commit "fed215348076ba9182f634e0770a175220474b5a") (let ((commit "f21103d97d180fba0b6e2e86ebb0b6269219ef2c")
(revision "0")) (revision "1"))
(package (package
(name "emacs-straight-el") (name "emacs-straight-el")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -33449,7 +33678,7 @@ headlines, keywords, tables and source blocks.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0z0j670s18mp1bhrsnng0mybcbnlywarhlz7zmrf9399rr513z1x")))) (base32 "1dqhb7kx4hr3cm4gj6qdk9aav05vc016y4nks2dj1sy88wia6wsv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
(list (list
@ -33586,7 +33815,7 @@ with popups, which also work in the terminal.")
(define-public emacs-popon (define-public emacs-popon
(package (package
(name "emacs-popon") (name "emacs-popon")
(version "0.11") (version "0.12")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -33596,7 +33825,7 @@ with popups, which also work in the terminal.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "14hf1n9d7rqfzr58kjsvjq63v3iamk3szvcn6zms7ry8x70v3lmv")))) (base32 "0wkydg326ql8cvvmibq1nf6y40d1b0ax0p892pwncmi7awnf20gr"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://codeberg.org/akib/emacs-popon/") (home-page "https://codeberg.org/akib/emacs-popon/")
(synopsis "Pop floating text on a window") (synopsis "Pop floating text on a window")
@ -33792,16 +34021,16 @@ into the current buffer.")
(revision "0")) (revision "0"))
(package (package
(name "emacs-flymake-mypy") (name "emacs-flymake-mypy")
(version (git-version "0.2.0" revision commit)) (version "0.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/com4/flymake-mypy") (url "https://github.com/com4/flymake-mypy")
(commit commit))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"124pfa1kwrapwylbrvkzg3jwcmlsvfklg33ms9ki32khvglmff5h")))) "1zaa2kljsmm13layqmb7dwd7l2x3a5ymzzmzjjhykc67kbyjvvkk"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/com4/flymake-mypy") (home-page "https://github.com/com4/flymake-mypy")
(synopsis "Flymake checker for mypy") (synopsis "Flymake checker for mypy")
@ -33845,6 +34074,187 @@ using mypy.")
process via its IPC interface.") process via its IPC interface.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-apel-lb
;; No release since Jun 15, 2010.
(let ((version "10.8") ;tag chise-base-0_25
(revision "81")
(commit "82eb2325bd149dc57b43a9ce9402c6c6183e4052"))
(package
(name "emacs-apel-lb")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wanderlust/apel")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0qiw19pn1cs8y571irw7bjdygkvwan9ch2i1dg139dri4b6q1il6"))))
(build-system emacs-build-system)
(home-page "https://www.emacswiki.org/emacs/WanderLust")
(synopsis "Library for making portable Emacs Lisp programs")
(description
"A Portable Emacs Library (APEL) is a library for making portable Emacs
Lisp programs. APEL-LB is a variant of APEL, which features supports to
latest Emacs.")
(license license:gpl2+))))
(define-public emacs-flim-lb
;; No release since Nov 28, 2007.
(let ((version "1.14.9")
(revision "133")
(commit "57c6b868aa314717f40a520daed7249665e8d992"))
(package
(name "emacs-flim-lb")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wanderlust/flim")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1mf8r5mf3bd0719fnhifb6lfvl7n4m552crcdhkbkkif8srrl6df"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-apel-lb emacs-oauth2))
(home-page "https://www.emacswiki.org/emacs/WanderLust")
(synopsis
"Library for basic features about message representation or encoding")
(description
"FLIM is a library to provide basic features about message representation
or encoding. FLIM-LB is a variant of FLIM, which features supports to latest
Emacs.")
(license license:gpl2+))))
(define-public emacs-semi-epg
;; No release since Dec 24, 2003.
(let ((version "1.14.6")
(revision "241")
(commit "ac3e726ca94ed245c25881ec8d7177d0d834ea6a"))
(package
(name "emacs-semi-epg")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wanderlust/semi")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1bg07y6svvg1mmlr455x3j1anjp3wbv27s6b2inp294rbwprm41n"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-bbdb-vcard emacs-flim-lb))
(home-page "https://www.emacswiki.org/emacs/WanderLust")
(synopsis "Library to provide MIME feature for GNU Emacs")
(description
"SEMI is a package for GNU Emacs to provide features related with MIME
user interface. SEMI-EPG is a variant of SEMI, which features supports to
EasyPG and latest Emacs.")
(license license:gpl2+))))
(define-public emacs-wanderlust
;; No release since Jan 15, 2010.
;; FIXME: Building with emacs-next-pgtk would yield a void variable related
;; macro-expansion failure at runtime, so don't rewrite emacs input of this
;; package.
(let ((version "2.15.9")
(revision "779")
(commit "f5cb2f0cf5e2c893acf2e669fd549836828dfdfc"))
(package
(name "emacs-wanderlust")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wanderlust/wanderlust")
(commit commit)))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
'(begin (substitute* "WL-CFG"
((".*WL_PREFIX.*")
(string-append "(setq wl-install-utils t)" "\n"
"(setq WL_PREFIX \"\")" "\n"
"(setq ELMO_PREFIX \"\")" "\n")))
(substitute* "Makefile"
(("package-user-dir") "NONE"))))
(sha256
(base32
"1ijs57wv1vrh33vn311hgkp42vlmjyi998nc4qdrqi7yy9j8hl1h"))))
(build-system emacs-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'expand-load-path 'chdir-elmo
(lambda _
(chdir "elmo")))
(add-after 'chdir-elmo 'expand-load-path-elmo
(assoc-ref %standard-phases 'expand-load-path))
(add-after 'expand-load-path-elmo 'chdir-utils
(lambda _
(chdir "../utils")))
(add-after 'chdir-utils 'expand-load-path-utils
(assoc-ref %standard-phases 'expand-load-path))
(add-after 'expand-load-path-utils 'chdir-wl
(lambda _
(chdir "../wl")))
(add-after 'chdir-wl 'expand-load-path-wl
(assoc-ref %standard-phases 'expand-load-path))
(add-after 'expand-load-path-wl 'change-directory
(lambda _
(chdir "..")))
(add-after 'install 'install-via-makefile
(lambda* (#:key inputs #:allow-other-keys)
(let ((emacs (search-input-file inputs "/bin/emacs"))
(lispdir (elpa-directory #$output))
(infodir (string-append #$output "/share/info")))
(for-each mkdir-p (list lispdir infodir))
(substitute* "Makefile"
(("(EMACS\t= )emacs" all m)
(string-append m emacs))
(("(LISPDIR = )NONE" all m)
(string-append m lispdir))
(("(PIXMAPDIR = )NONE" all m)
(string-append m lispdir "/icons"))
(("(INFODIR = )NONE" all m)
(string-append m infodir))))
(invoke "make" "install")
(invoke "make" "install-info"))))))
(propagated-inputs (list emacs-semi-epg))
(home-page "https://www.emacswiki.org/emacs/WanderLust")
(synopsis "Yet Another Message Interface on Emacsen")
(description
"Wanderlust is an mail/news management system on Emacsen. It supports
IMAP4rev1(RFC2060), NNTP, POP and local message files.
The main features of Wanderlust:
@itemize
@item Pure elisp implementation.
@item Supports IMAP4rev1, NNTP, POP(POP3/APOP), MH and Maildir format.
@item Unified access method to messages based on Mew-like Folder Specification.
@item Mew-like Key-bind and mark handling.
@item Manages unread messages.
@item Interactive thread display.
@item Folder Mode shows the list of subscribed folders.
@item Message Cache, Disconnected Operation.
@item MH-like FCC (Fcc: %Backup and Fcc: $Backup is allowed).
@item MIME compliant (by SEMI).
@item Transmission of news and mail are unified by Message transmitting draft.
@item Graphical list of folders.
@item View a part of message without retrieving the whole message (IMAP4).
@item Server-side message look up (IMAP4), multi-byte characters are allowed.
@item Virtual Folders.
@item Supports compressed folder using common archiving utilities.
@item Old articles in folders are automatically removed/archived (Expiration).
@item Automatic re-file.
@item Template function makes it convenient to send fixed form messages.
@end itemize\n")
(license license:gpl2+))))
(define-public emacs-waveform (define-public emacs-waveform
;; XXX: Upstream provides no Version keyword. Using 0 as base version. ;; XXX: Upstream provides no Version keyword. Using 0 as base version.
(let ((commit "ee52c6a72b3e9890743e3a6e2fc1f3195f5687b2") (let ((commit "ee52c6a72b3e9890743e3a6e2fc1f3195f5687b2")

View File

@ -3310,7 +3310,7 @@ visualization, matrix manipulation.")
(define-public prusa-slicer (define-public prusa-slicer
(package (package
(name "prusa-slicer") (name "prusa-slicer")
(version "2.4.2") (version "2.5.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3319,7 +3319,7 @@ visualization, matrix manipulation.")
(url "https://github.com/prusa3d/PrusaSlicer") (url "https://github.com/prusa3d/PrusaSlicer")
(commit (string-append "version_" version)))) (commit (string-append "version_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af")) (sha256 (base32 "17ic92ww2ny0frxyv7ajwdwa0fq70ygq562ik8sh94jx67jvxdy0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -3368,10 +3368,12 @@ visualization, matrix manipulation.")
hidapi hidapi
ilmbase ilmbase
libigl libigl
libjpeg-turbo
libpng libpng
mesa mesa
mpfr mpfr
nlopt nlopt
opencascade-occt
openvdb openvdb
pango pango
tbb tbb

View File

@ -129,10 +129,10 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages gnuzilla)) #:use-module (gnu packages gnuzilla))
(define-public bitcoin-core-0.21 (define-public bitcoin-core-23.0
(package (package
(name "bitcoin-core") (name "bitcoin-core")
(version "0.21.2") (version "23.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -140,7 +140,7 @@
version "/bitcoin-" version ".tar.gz")) version "/bitcoin-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17nvir1yc6mf4wr1fn4xsabw49cd5p9vig8wj77vv4anzi8zfij1")))) "01fcb90pqip3v77kljykx51cmg7jdg2cmp7ys0a40svdkps8nx16"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list autoconf (list autoconf
@ -207,23 +207,10 @@ of the bitcoin protocol. This package provides the Bitcoin Core command
line client and a client based on Qt.") line client and a client based on Qt.")
(license license:expat))) (license license:expat)))
(define-public bitcoin-core-0.20
(package
(inherit bitcoin-core-0.21)
(version "0.20.2")
(source (origin
(method url-fetch)
(uri
(string-append "https://bitcoincore.org/bin/bitcoin-core-"
version "/bitcoin-" version ".tar.gz"))
(sha256
(base32
"14smp5vmh7baabl856wlg7w7y5910jhx6c02mlkm4hkywf3yylky"))))))
;; The support lifetimes for bitcoin-core versions can be found in ;; The support lifetimes for bitcoin-core versions can be found in
;; <https://bitcoincore.org/en/lifecycle/#schedule>. ;; <https://bitcoincore.org/en/lifecycle/#schedule>.
(define-public bitcoin-core bitcoin-core-0.21) (define-public bitcoin-core bitcoin-core-23.0)
(define-public hledger (define-public hledger
(package (package
@ -553,7 +540,7 @@ do so.")
(define-public electrum (define-public electrum
(package (package
(name "electrum") (name "electrum")
(version "4.2.1") (version "4.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -561,7 +548,7 @@ do so.")
version "/Electrum-" version "/Electrum-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0w41411zq07kx0351wxkmpn0wr42wd2nx0m6v0iwvpsggx654b6r")) (base32 "1kbyinm9fnxpx9chkyd11yr9rxvcxvw3ml7kzvxcfa8v7jnl0dmx"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -628,7 +615,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(define-public electron-cash (define-public electron-cash
(package (package
(name "electron-cash") (name "electron-cash")
(version "4.2.11") (version "4.2.12")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -637,7 +624,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1g0xnb63c52l379zrqkfhxlkg1d2hf2dgjs2swspa0vah845r282")))) (base32 "1bfnfpdyi3q5zq0zj07dq82aj3cihnr7j82gy4ch97182lsl6nms"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list
@ -2134,7 +2121,7 @@ and manipulation.")
(define-public xmrig (define-public xmrig
(package (package
(name "xmrig") (name "xmrig")
(version "6.18.0") (version "6.18.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2142,7 +2129,7 @@ and manipulation.")
(url "https://github.com/xmrig/xmrig") (url "https://github.com/xmrig/xmrig")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "1ncnfjpjwjdv29plyiam2nh01bfni49sgfi3qkijygi1450w71dx")) (sha256 (base32 "0f0kly374pkgnpnx60hac0bg9297a5zhycss6p37iavayn28jg39"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; TODO: Try to use system libraries instead of bundled ones in ;; TODO: Try to use system libraries instead of bundled ones in
@ -2190,7 +2177,7 @@ mining.")
(define-public p2pool (define-public p2pool
(package (package
(name "p2pool") (name "p2pool")
(version "2.2.1") (version "2.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2199,7 +2186,7 @@ mining.")
(commit (string-append "v" version)) (commit (string-append "v" version))
(recursive? #t))) (recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "19pn7axj96yvza2x7678rs79c2vgmhl8d7f9ki72v2n6l2630fw8")) (sha256 (base32 "1kdsxh6f24zp7h7bwkrin2mc81ysfny5wprzgy41h2bc6dpq067w"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(for-each delete-file-recursively #~(for-each delete-file-recursively

View File

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 David Craven <david@craven.ch> ;;; Copyright © 2017 David Craven <david@craven.ch>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -259,19 +259,11 @@ driver.")
help2man help2man
gettext-minimal)) gettext-minimal))
(inputs (list bash-completion (inputs (list bash-completion
glib
libgudev libgudev
libxmlb libxmlb
gusb
sqlite sqlite
libarchive
libjcat
json-glib
curl
polkit polkit
eudev eudev
gcab
gnutls
libelf libelf
tpm2-tss tpm2-tss
cairo cairo
@ -281,6 +273,15 @@ driver.")
mingw-w64-tools mingw-w64-tools
libsmbios libsmbios
gnu-efi)) gnu-efi))
;; In Requires of fwupd*.pc.
(propagated-inputs (list curl
gcab
glib
gnutls
gusb
json-glib
libarchive
libjcat))
(home-page "https://fwupd.org/") (home-page "https://fwupd.org/")
(synopsis "Daemon to allow session software to update firmware") (synopsis "Daemon to allow session software to update firmware")
(description "This package aims to make updating firmware on GNU/Linux (description "This package aims to make updating firmware on GNU/Linux
@ -644,7 +645,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(define* (make-arm-trusted-firmware platform #:optional (arch "aarch64")) (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64"))
(package (package
(name (string-append "arm-trusted-firmware-" platform)) (name (string-append "arm-trusted-firmware-" platform))
(version "2.6") (version "2.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -655,27 +656,27 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(file-name (git-file-name "arm-trusted-firmware" version)) (file-name (git-file-name "arm-trusted-firmware" version))
(sha256 (sha256
(base32 (base32
"1j0rn33pwgmksqliwf2npm2px84qmbyma9iq8zpllwfc7dsl6gx9")))) "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3"))
(snippet
#~(begin
(use-modules (guix build utils))
;; Remove binary blobs which do not contain source or proper license.
(for-each (lambda (file)
(delete-file file))
(find-files "." "\\.bin$"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
;; Remove binary blobs which do not contain source or proper license.
(add-after 'unpack 'remove-binary-blobs
(lambda _
(for-each (lambda (file)
(delete-file file))
(find-files "." ".*\\.bin$"))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(bin (find-files "." ".*\\.(bin|elf)$"))) (bin (find-files "." "\\.(bin|elf)$")))
(for-each (for-each
(lambda (file) (lambda (file)
(install-file file out)) (install-file file out))
bin)) bin)))))
#t)))
#:make-flags (list (string-append "PLAT=" ,platform) #:make-flags (list (string-append "PLAT=" ,platform)
,@(if (and (not (string-prefix? "aarch64" ,@(if (and (not (string-prefix? "aarch64"
(%current-system))) (%current-system)))

View File

@ -35,7 +35,7 @@
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020, 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020, 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2020, 2021 Simen Endsjø <simendsjo@gmail.com> ;;; Copyright © 2020, 2021, 2022 Simen Endsjø <simendsjo@gmail.com>
;;; Copyright © 2020 Tim Van den Langenbergh <tmt_vdl@gmx.com> ;;; Copyright © 2020 Tim Van den Langenbergh <tmt_vdl@gmx.com>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net> ;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
@ -1498,7 +1498,7 @@ guix repl <<EOF
(ice-9 string-fun) (ice-9 string-fun)
(gnu packages fonts)) (gnu packages fonts))
(let ((new-version "15.2.0") (let ((new-version "16.4.0")
(iosevka-hashes #nil) (iosevka-hashes #nil)
(iosevka-fails #nil)) (iosevka-fails #nil))
(for-each (lambda (font) (for-each (lambda (font)
@ -1532,7 +1532,7 @@ EOF
(define-public font-iosevka (define-public font-iosevka
(package (package
(name "font-iosevka") (name "font-iosevka")
(version "15.2.0") (version "16.4.0")
(source (source
(origin (origin
(method url-fetch/zipbomb) (method url-fetch/zipbomb)
@ -1540,7 +1540,7 @@ EOF
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-" version ".zip")) "/ttc-iosevka-" version ".zip"))
(sha256 (sha256
(base32 "0yyz8vmpi8pww0p9na564lvbkwhdhpk4bcyrli91dn5gq0pc1pvv")))) (base32 "07v98pr0anqbxn1yc55245k5ixxzfk2wmfq67zhz84aa18viqhbc"))))
(build-system font-build-system) (build-system font-build-system)
(home-page "https://be5invis.github.io/Iosevka/") (home-page "https://be5invis.github.io/Iosevka/")
(synopsis "Coders' typeface, built from code") (synopsis "Coders' typeface, built from code")
@ -1563,7 +1563,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-slab-" version ".zip")) "/ttc-iosevka-slab-" version ".zip"))
(sha256 (sha256
(base32 "1qy86kdl6lgq5k1qb97adibpfjm4vg1wdnxbqizhqka5bc7avyzb")))))) (base32 "063qk1d75l1jq7gdwzqxd7j8j56g7da0aagsqm0lvwl217l7x48b"))))))
(define-public font-iosevka-term (define-public font-iosevka-term
(package (package
@ -1577,7 +1577,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/ttf-iosevka-term-" version ".zip")) "/ttf-iosevka-term-" version ".zip"))
(sha256 (sha256
(base32 "15znvvkhldgbl9k04pwrrnvmjnanw2fr92c0zspg7bbw7id2v510")))) (base32 "17465bvg6fap53xfqwrg2g4fasv01w86wh658n1rf6djs3yzn1gx"))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -1598,7 +1598,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/" "releases/download/v" version "/"
"ttf-iosevka-term-slab-" version ".zip")) "ttf-iosevka-term-slab-" version ".zip"))
(sha256 (sha256
(base32 "1rla7kcb94c7daklp4av27gix86cmwsrqg6884zmv5zfnhz0r700")))) (base32 "00pc4d8awdiziyzncah3fnh0ppvcdvi9cd7vyknl68f6fj283fvm"))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -1619,7 +1619,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-aile-" version ".zip")) "/ttc-iosevka-aile-" version ".zip"))
(sha256 (sha256
(base32 "1lciycahvxgvmcniq4h3m1v3rc42nmv8ydb0fpbl9g4sc0qp81hq")))))) (base32 "03y0xijb7c0kampm3gjb69mv8hikhsgqhlw1w3zfcjhr2vc62g6q"))))))
(define-public font-iosevka-curly (define-public font-iosevka-curly
(package (package
@ -1633,7 +1633,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/" "releases/download/v" version "/"
"ttc-iosevka-curly-" version ".zip")) "ttc-iosevka-curly-" version ".zip"))
(sha256 (sha256
(base32 "02jvrj7kzd4bx3maj1bq2p9j746b8c5713d8lqkxx4fn9fm0zppq")))))) (base32 "1i31zj0j8npgx7wn2qibih48s76qjxakz14sa2hgx908p8xyfwq5"))))))
(define-public font-iosevka-curly-slab (define-public font-iosevka-curly-slab
(package (package
@ -1647,7 +1647,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/" "releases/download/v" version "/"
"ttc-iosevka-curly-slab-" version ".zip")) "ttc-iosevka-curly-slab-" version ".zip"))
(sha256 (sha256
(base32 "1bhvf95xs74wm8srsvl4yxwvl36llk93mpl1y9acc5z9rdcpzjqq")))))) (base32 "1xijhk5vbgs3c89a7g9cfjqjqv801gimjja4wqpvaficab692jh2"))))))
(define-public font-iosevka-etoile (define-public font-iosevka-etoile
(package (package
@ -1661,12 +1661,12 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/ttc-iosevka-etoile-" version ".zip")) "/ttc-iosevka-etoile-" version ".zip"))
(sha256 (sha256
(base32 "1zmgfxfsbxv1k4fwnc7g2jlfhmlzp5kap8m3f10fqanpnkd0yf08")))))) (base32 "1rqagk6gyja15fa4m107ylbjwbhn811gbl9lbr9yzashw4drjpp9"))))))
(define-public font-sarasa-gothic (define-public font-sarasa-gothic
(package (package
(name "font-sarasa-gothic") (name "font-sarasa-gothic")
(version "0.36.8") (version "0.37.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1674,7 +1674,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version "/releases/download/v" version
"/sarasa-gothic-ttc-" version ".7z")) "/sarasa-gothic-ttc-" version ".7z"))
(sha256 (sha256
(base32 "01fn5mzr1rcz0c8nbhabwbv1pq1c3ylf2msxldc9adks1pi45fmh")))) (base32 "12i8lccl4ysinhz40s2fz6249r9n35in4rqmk3a0fgcjfaby3kfm"))))
(build-system font-build-system) (build-system font-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

View File

@ -61,6 +61,7 @@
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system qt)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages acl) #:use-module (gnu packages acl)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
@ -73,11 +74,13 @@
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages cups)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages disk) #:use-module (gnu packages disk)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages fcitx)
#:use-module (gnu packages file) #:use-module (gnu packages file)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
@ -91,9 +94,12 @@
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages ibus)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages language) #:use-module (gnu packages language)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages libreoffice)
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -386,6 +392,81 @@ inappropriate content.")
license:gpl2+ license:gpl2+
license:lgpl2.1+)))) license:lgpl2.1+))))
(define-public maliit-framework
(package
(name "maliit-framework")
(version "2.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/maliit/framework")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1dkjxvfxg56hfy70j6ibfklfyv57jiha4vgc3ggl60r5kjx65s5b"))))
(build-system cmake-build-system)
(native-inputs (list extra-cmake-modules
wayland-protocols
pkg-config
doxygen
graphviz
`(,glib "bin"))) ;for gdbus-codegen))
(inputs (list qtbase-5
qtdeclarative-5
qtwayland-5
wayland
libxkbcommon
dbus
eudev
glib))
(home-page "https://github.com/maliit/framework")
(synopsis "Core libraries of Maliit")
(description "This package provides Maliit provides a flexible input
method framework.")
(license license:lgpl2.1+)))
(define-public maliit-keyboard
(package
(name "maliit-keyboard")
(version "2.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/maliit/keyboard")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0g89lckl4wzwamc89hs8871fbiyrsjwzk5b6ic4vhc4d1clyqzaw"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f
#:phases #~(modify-phases %standard-phases
(add-after 'install 'install-schemas
(lambda* (#:key source outputs #:allow-other-keys)
(with-directory-excursion (string-append #$output
"/share/glib-2.0/schemas")
(invoke "glib-compile-schemas" ".")))))))
(native-inputs (list extra-cmake-modules pkg-config gettext-minimal
`(,glib "bin")))
(inputs (list hunspell
glib
libchewing
libpinyin
maliit-framework
presage
qtbase-5
qtdeclarative-5
qtmultimedia-5
qtquickcontrols2-5))
(home-page "https://github.com/maliit/keyboard")
(synopsis "Maliit Keyboard")
(description
"This package provides virtual keyboard for Wayland and X11
display servers. It supports many different languages and emoji.")
(license license:gpl3+)))
(define-public xdg-utils (define-public xdg-utils
(package (package
(name "xdg-utils") (name "xdg-utils")
@ -874,32 +955,37 @@ with localed. This package is extracted from the broader systemd package.")
(define-public packagekit (define-public packagekit
(package (package
(name "packagekit") (name "packagekit")
(version "1.1.13") (version "1.2.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://www.freedesktop.org/software/"
"https://www.freedesktop.org/software/" "PackageKit/releases/" "PackageKit-" version
"PackageKit/releases/" ".tar.xz"))
"PackageKit-" version ".tar.xz")) (sha256
(sha256 (base32
(base32 "09md23m4fw87x264mls1f5isrswk6iw7y9g4hr1nib008wbbk370"))))
"1dr1laic65ld95abp2yxbwvijnngh0dwyb1x49x4wjm5rhq43dl8")))) (build-system meson-build-system)
(build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f (list #:tests? #f
#:make-flags (list (string-append "BASH_COMPLETIONS_DIR=" #:configure-flags #~'("-Dsystemd=false" "-Doffline_update=false")))
%output "/etc/bash_completion.d"))
#:configure-flags
'("--disable-systemd")))
(native-inputs (native-inputs
`(("intltool" ,intltool) (list bash-completion
("pkg-config" ,pkg-config) docbook-xsl
("python" ,python-wrapper) gettext-minimal
("glib:bin" ,glib "bin"))) `(,glib "bin")
gobject-introspection
libxml2 ;for XML_CATALOG_FILES
libxslt
pkg-config
python-wrapper
vala))
(inputs (inputs
(list glib bash-completion polkit)) (list glib
(propagated-inputs gstreamer
(list sqlite)) gst-plugins-base
gtk+
polkit))
(propagated-inputs (list sqlite))
(home-page "https://www.freedesktop.org/software/PackageKit/") (home-page "https://www.freedesktop.org/software/PackageKit/")
(synopsis "API for package management, through D-Bus") (synopsis "API for package management, through D-Bus")
(description (description
@ -1105,6 +1191,29 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.")
(base32 (base32
"04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5")))))) "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"))))))
(define-public wayland-utils
(package
(name "wayland-utils")
(version "1.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.freedesktop.org/wayland/wayland-utils")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"04k1yhyh7h4xawbhpz9pf6cpfmmp1l862fdgsvvnyp4hg9n3j9aj"))))
(build-system meson-build-system)
(native-inputs (list pkg-config))
(inputs (list libdrm wayland wayland-protocols-next))
(home-page "https://wayland.freedesktop.org/")
(synopsis "Display information about the Wayland protocols")
(description "This package provides @code{wayland-info} tool that can be
used to check which Wayland protocols and versions are advertised by the Wayland
compositor.")
(license license:expat)))
(define-public waylandpp (define-public waylandpp
(package (package
(name "waylandpp") (name "waylandpp")
@ -2551,6 +2660,42 @@ which uses GTK+ and various pieces of GNOME infrastructure, such as the
interfaces.") interfaces.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public xdg-desktop-portal-kde
(package
(name "xdg-desktop-portal-kde")
(version "5.25.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0l3lmwihxyl65y0mkyg3afk1k6gc0ldjw2vg92g7yydbgmn39q7k"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules pkg-config))
(inputs (list cups
kcoreaddons
kconfig
ki18n
kdeclarative
kio
kirigami
knotifications
plasma-framework
plasma-wayland-protocols
kwayland
kwidgetsaddons
kwindowsystem
kiconthemes
qtdeclarative-5
qtwayland-5
wayland))
(synopsis "Backend implementation for xdg-desktop-portal using Qt/KF5")
(description "This package provides a backend implementation
for xdg-desktop-portal that is using Qt/KF5.")
(home-page "https://invent.kde.org/plasma/xdg-desktop-portal-kde")
(license license:lgpl2.0+)))
(define-public xdg-desktop-portal-wlr (define-public xdg-desktop-portal-wlr
(package (package
(name "xdg-desktop-portal-wlr") (name "xdg-desktop-portal-wlr")

View File

@ -880,14 +880,14 @@ Quizzes: arithmetic and quiz.")
(define-public bzflag (define-public bzflag
(package (package
(name "bzflag") (name "bzflag")
(version "2.4.24") (version "2.4.26")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.bzflag.org/bzflag/source/" (uri (string-append "https://download.bzflag.org/bzflag/source/"
version "/bzflag-" version ".tar.bz2")) version "/bzflag-" version ".tar.bz2"))
(sha256 (sha256
(base32 "1i73ijlnxsz52fhqgkj2qcvibfgav3byq1is68gab2zwnyz330az")))) (base32 "050h933lmcdf4bw9z3c6g3k8c9sch9f6kq57jp2ivb96zw2h90q1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -6239,7 +6239,7 @@ emerges from a sewer hole and pulls her below ground.")
(define-public cdogs-sdl (define-public cdogs-sdl
(package (package
(name "cdogs-sdl") (name "cdogs-sdl")
(version "0.8.0") (version "1.4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6248,7 +6248,7 @@ emerges from a sewer hole and pulls her below ground.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0vx37zb2iw7sfw5a2bs97ydlmb301nvy485ybdm8g46c5hn9s13c")))) (base32 "1505z8rli59i1ych4rzwbf4dvhv72icdj22n1xarb8xfyz0wyp3b"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -10451,14 +10451,14 @@ get high scores.")
(define-public burgerspace (define-public burgerspace
(package (package
(name "burgerspace") (name "burgerspace")
(version "1.9.4") (version "1.9.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://perso.b2b2c.ca/~sarrazip/dev/" (uri (string-append "http://perso.b2b2c.ca/~sarrazip/dev/"
"burgerspace-" version ".tar.gz")) "burgerspace-" version ".tar.gz"))
(sha256 (sha256
(base32 "1xb4immzmd419aa08lgkzf7ibxa6ax238zb2l5iw9nkgvzlh1v6l")))) (base32 "1r2albqv2ygs58rwcldsx1mp2vy96j7k4yw5jjmvwgnxjmddq7wr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))

View File

@ -120,13 +120,19 @@
"coreutils-gnulib-tests.patch"))))) "coreutils-gnulib-tests.patch")))))
'()) '())
#$@(if (hurd-target?)
#~((substitute*
"gettext-tools/gnulib-tests/Makefile.in"
;; See 'coreutils' for the rationale.
((" test-tls\\$\\(EXEEXT\\) ") " ")))
'())
#t))))) #t)))))
;; When tests fail, we want to know the details. ;; When tests fail, we want to know the details.
#:make-flags #~'("VERBOSE=yes" #:make-flags #~'("VERBOSE=yes"
#$@(if (hurd-target?) #$@(if (hurd-target?)
;; Linking to libgettextlib.so makes test-raise fail '("XFAIL_TESTS=test-perror2")
'("XFAIL_TESTS=test-raise")
'())))) '()))))
(home-page "https://www.gnu.org/software/gettext/") (home-page "https://www.gnu.org/software/gettext/")
(synopsis (synopsis

View File

@ -587,30 +587,29 @@ from software emulation to complete hardware acceleration for modern GPUs.")
(source (mesa-demos-source version)) (source (mesa-demos-source version))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("mesa" ,mesa) (list mesa freeglut glew))
("glut" ,freeglut)
("glew" ,glew)))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(arguments (arguments
'(#:phases (list
(modify-phases %standard-phases #:phases
(replace #~(modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out #$output))
(mkdir-p (string-append out "/bin")) (mkdir-p (string-append out "/bin"))
(for-each (for-each (lambda (file)
(lambda (file) (copy-file file
(copy-file file (string-append out "/bin/" (basename file)))) (string-append out "/bin/"
'("src/xdemos/glxdemo" "src/xdemos/glxgears" (basename file))))
"src/xdemos/glxinfo" "src/xdemos/glxheads")) '("src/xdemos/glxdemo" "src/xdemos/glxgears"
#t)))))) "src/egl/opengl/eglinfo"
"src/xdemos/glxinfo" "src/xdemos/glxheads"))))))))
(home-page "https://mesa3d.org/") (home-page "https://mesa3d.org/")
(synopsis "Utility tools for Mesa") (synopsis "Utility tools for Mesa")
(description (description
"The mesa-utils package contains several utility tools for Mesa: glxdemo, "The mesa-utils package contains several utility tools for Mesa: eglinfo,
glxgears, glxheads, and glxinfo.") glxdemo, glxgears, glxheads, and glxinfo.")
;; glxdemo is public domain; others expat. ;; glxdemo is public domain; others expat.
(license (list license:expat license:public-domain)))) (license (list license:expat license:public-domain))))

View File

@ -17,6 +17,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Arthur Margerit <ruhtra.mar@gmail.com> ;;; Copyright © 2020 Arthur Margerit <ruhtra.mar@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -67,6 +68,7 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
@ -76,6 +78,7 @@
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
@ -758,6 +761,59 @@ translated.")
by GDBus included in Glib.") by GDBus included in Glib.")
(license license:gpl2))) ; or Academic Free License 2.1 (license license:gpl2))) ; or Academic Free License 2.1
(define-public libaccounts-glib
(package
(name "libaccounts-glib")
(version "1.25")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/accounts-sso/libaccounts-glib")
(commit (string-append "VERSION_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"19rhk9f97m736d5ia26vfcbjp5kgi454558yhf9mrwm4iw5d9pk4"))))
(build-system meson-build-system)
(native-inputs (list dbus
`(,glib "bin")
gobject-introspection
gtk-doc
pkg-config
vala))
(inputs (list check python python-pygobject))
(propagated-inputs (list glib libxml2 sqlite))
(arguments
(list #:tests? #f ;one test fails.
#:imported-modules `((guix build python-build-system)
,@%meson-build-system-modules)
#:modules '(((guix build python-build-system)
#:select (python-version))
(guix build meson-build-system)
(guix build utils))
;; don't try installing to python store path.
#:configure-flags
#~(list (string-append "-Dpy-overrides-dir="
#$output "/lib/python"
(python-version #$(this-package-input
"python"))
"/site-packages/gi/overrides"))
#:phases #~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "dbus-run-session" "--" "meson" "test"
"--print-errorlogs")))))))
(home-page "https://accounts-sso.gitlab.io/")
(synopsis "Accounts SSO (Single Sign-On) management library for GLib
applications")
(description
"Accounts SSO is a framework for application developers who
wish to acquire, use and store web account details and credentials. It
handles the authentication process of an account and securely stores the
credentials and service-specific settings.")
(license license:lgpl2.1+)))
(define libsigc++ (define libsigc++
(package (package
(name "libsigc++") (name "libsigc++")

View File

@ -55,6 +55,7 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages build-tools) #:use-module (gnu packages build-tools)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -304,6 +305,59 @@ and products. Plots is designed to integrate well with the GNOME desktop and
takes advantage of modern hardware using OpenGL.") takes advantage of modern hardware using OpenGL.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public portfolio
(package
(name "portfolio")
(version "0.9.14")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tchx84/Portfolio")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0h09v8lhz3kv6qmwjhx3gr7rp6ccfhrzm54gjnaixl4dcg9zddls"))))
(arguments
(list #:glib-or-gtk? #t
#:imported-modules `(,@%meson-build-system-modules
(guix build python-build-system))
#:modules '((guix build meson-build-system)
((guix build python-build-system)
#:prefix python:)
(guix build utils))
#:phases #~(modify-phases %standard-phases
(add-after 'install 'rename-executable
(lambda _
(with-directory-excursion (string-append #$output
"/bin")
(symlink "dev.tchx84.Portfolio" "portfolio"))))
(add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs
"bin/dev.tchx84.Portfolio")
`("GUIX_PYTHONPATH" =
(,(getenv "GUIX_PYTHONPATH") ,(python:site-packages
inputs
outputs)))
`("GI_TYPELIB_PATH" =
(,(getenv "GI_TYPELIB_PATH")))))))))
(build-system meson-build-system)
(inputs (list bash-minimal python-pygobject gtk+ libhandy))
(native-inputs
(list desktop-file-utils
gettext-minimal
`(,glib "bin")
`(,gtk+ "bin")
python))
(home-page "https://github.com/tchx84/Portfolio")
(synopsis "Minimalist file manager for Linux mobile devices")
(description
"Portfolio is a minimalist file manager for those who want to use Linux
mobile devices. Tap to activate and long press to select, to browse, open,
copy, move, delete, or edit your files.")
(license license:gpl3+)))
(define-public gnome-shell-extension-unite-shell (define-public gnome-shell-extension-unite-shell
(package (package
(name "gnome-shell-extension-unite-shell") (name "gnome-shell-extension-unite-shell")

View File

@ -2594,6 +2594,11 @@ GNOME Desktop.")
python-wrapper)) ;for tests python-wrapper)) ;for tests
(propagated-inputs (propagated-inputs
(list gcr)) (list gcr))
;; XXX: There are concerning test failures on i686-linux and other 32-bit
;; platforms: <https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/124>.
(supported-systems %64bit-supported-systems)
(home-page "https://www.gnome.org") (home-page "https://www.gnome.org")
(synopsis "Daemon to store passwords and encryption keys") (synopsis "Daemon to store passwords and encryption keys")
(description (description
@ -4956,6 +4961,57 @@ GLibproxyResolver, and a GNOME GProxyResolver that uses the proxy information
from the GSettings schemas in gsettings-desktop-schemas.") from the GSettings schemas in gsettings-desktop-schemas.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public raider
(package
(name "raider")
(version "1.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ADBeveridge/raider/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ll9220d6qf9m7wdi5xhq69p8h8whs7l5h5nzdhlbn99qh5388bz"))))
(build-system meson-build-system)
(arguments
(list #:meson meson-0.63
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "data/com.github.ADBeveridge.Raider.gschema.xml"
(("/usr/bin/shred")
(which "shred")))))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/raider")
`("GSETTINGS_SCHEMA_DIR" =
(,(string-append (assoc-ref outputs "out")
"/share/glib-2.0/schemas")))))))))
(native-inputs
(list gettext-minimal
pkg-config
cmake
`(,glib "bin")
desktop-file-utils
itstool
gobject-introspection
blueprint-compiler
`(,gtk "bin")))
(inputs
(list libadwaita
gtk))
(home-page "https://github.com/ADBeveridge/raider")
(synopsis "Securely delete your files")
(description
"Raider is a simple shredding program built for GNOME. Also known as
File Shredder, it uses the GNU Core Utility called shred to securely delete
files.")
(license license:gpl3+)))
(define-public rest (define-public rest
(package (package
(name "rest") (name "rest")
@ -9671,7 +9727,9 @@ shared object databases, search tools and indexing.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr")))) "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr"))
(patches
(search-patches "nautilus-extension-search-path.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
@ -9685,27 +9743,6 @@ shared object databases, search tools and indexing.")
(substitute* "test/automated/displayless/meson.build" (substitute* "test/automated/displayless/meson.build"
(("^foreach t: tracker_tests" all) (("^foreach t: tracker_tests" all)
(string-append "tracker_tests = []\n" all))))) (string-append "tracker_tests = []\n" all)))))
(add-after 'unpack 'make-extensible
(lambda _
(substitute* "src/nautilus-module.c"
(("static gboolean initialized = FALSE;" all)
(string-append all "
const char *extension_path;
char **extension_dirs, **d;
")
)
(("load_module_dir \\(NAUTILUS_EXTENSIONDIR\\);" all)
(string-append all
"
extension_path = g_getenv (\"NAUTILUS_EXTENSION_PATH\");
if (extension_path)
{
extension_dirs = g_strsplit (extension_path, \":\", -1);
for (d = extension_dirs; d != NULL && *d != NULL; d++)
load_module_dir(*d);
g_strfreev(extension_dirs);
}
")))))
(add-after 'unpack 'skip-gtk-update-icon-cache (add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'. ;; Don't create 'icon-theme.cache'.
(lambda _ (lambda _

View File

@ -431,6 +431,19 @@ and every application benefits from this.")
(properties '((ftp-server . "ftp.gnupg.org") (properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/gpgme"))))) (ftp-directory . "/gcrypt/gpgme")))))
;; TODO: Merge with gpgme in the next rebuild cycle.
(define-public gpgme-1.18
(package
(inherit gpgme)
(version "1.18.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gpgme/gpgme-"
version ".tar.bz2"))
(sha256
(base32
"17hfigfnq6xz45b5xrp299f68b5mwx0aysd51sx5v4nf8yp4w79n"))))))
(define-public qgpgme (define-public qgpgme
(package (package
(inherit gpgme) (inherit gpgme)
@ -459,6 +472,16 @@ QGpgME was originally developed as part of libkleo and incorporated into
gpgpme starting with version 1.7.") gpgpme starting with version 1.7.")
(license license:gpl2+))) ;; Note: this differs from gpgme (license license:gpl2+))) ;; Note: this differs from gpgme
;; TODO: Merge with qgpgme in the next rebuild cycle.
(define-public qgpgme-1.18
(package
(inherit qgpgme)
(version (package-version gpgme-1.18))
(source (package-source gpgme-1.18))
(inputs
(modify-inputs (package-inputs qgpgme)
(replace "gpgme" gpgme-1.18)))))
(define-public guile-gcrypt (define-public guile-gcrypt
(package (package
(name "guile-gcrypt") (name "guile-gcrypt")

View File

@ -2485,6 +2485,101 @@ web framework
@end itemize") @end itemize")
(license license:expat))) (license license:expat)))
(define-public go-github-com-nathan-osman-go-sunrise
(let ((commit "c8f9f1eb869135f07378e7e3c5ec7a005f806c73")
(revision "0"))
(package
(name "go-github-com-nathan-osman-go-sunrise")
(version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nathan-osman/go-sunrise")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"017zwzx05r5spxcs07dp6bnh7waknzsd819k7aqd8kr819v3x9in"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/nathan-osman/go-sunrise"))
(home-page "https://github.com/nathan-osman/go-sunrise")
(synopsis "Calculate sunrise and sunset times in Go")
(description
"This package provides a Go library for calculating sunrise and
sunset times from geographical coordinates and a date.")
(license license:expat))))
(define-public go-github-com-hebcal-gematriya
(let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
(revision "0"))
(package
(name "go-github-com-hebcal-gematriya")
(version (git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hebcal/gematriya")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0xmnb2i80dy380yv8c4pd04bbyqgbc7c40p8hz1vqj2lhbm6jabf"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/hebcal/gematriya"))
(home-page "https://github.com/hebcal/gematriya")
(synopsis "Print numbers as Hebrew letters in Go")
(description
"This package provides a Go library for printing numbers as
Hebrew letters.")
(license license:bsd-2))))
(define-public go-github-com-hebcal-hebcal-go
(let ((commit "d42e881860cfc9e8249fc79f268091c3c4d36b0d")
(revision "0"))
(package
(name "go-github-com-hebcal-hebcal-go")
(version (git-version "0.9.11" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hebcal/hebcal-go")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1m9akb8pwxchpaci05gambshrzw626gsrfhl25f36vjl7mq5292n"))))
(build-system go-build-system)
(arguments
(list #:import-path "github.com/hebcal/hebcal-go"
;; Source-only package
#:tests? #f
#:phases
#~(modify-phases %standard-phases
;; Source-only package
(delete 'build))))
(native-inputs
(list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-hebcal-gematriya
go-github-com-nathan-osman-go-sunrise))
(home-page "https://github.com/hebcal/hebcal-go")
(synopsis "Go library for the Hebcal perpetual Jewish calendar")
(description
"This package provides a library for conversion between Hebrew
and Gregorian dates, and generation of lists of Jewish holidays for
a given year. Shabbat and holiday candle lighting and havdalah times
are approximated based on location.
Torah readings, Daf Yomi, and counting of the Omer can also be
specified. Algorithms are included to calculate yahrzeits, birthdays,
and anniversaries.")
(license license:gpl2+))))
(define-public go-github-com-aws-sdk (define-public go-github-com-aws-sdk
(package (package
(name "go-github-com-aws-sdk") (name "go-github-com-aws-sdk")

View File

@ -791,6 +791,14 @@ model to base your own plug-in on, here it is.")
;; FIXME: Why is this failing. ;; FIXME: Why is this failing.
((".*elements/dash_mpd\\.c.*") "") ((".*elements/dash_mpd\\.c.*") "")
;; This test is flaky on at least some architectures.
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
#$@(if (member (%current-system)
'("i686-linux" "aarch64-linux"))
`((("'elements/camerabin\\.c'\\]\\],")
"'elements/camerabin.c'], true, ],"))
'())
;; These tests are flaky and occasionally time out: ;; These tests are flaky and occasionally time out:
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932 ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932
((".*elements/curlhttpsrc\\.c.*") "") ((".*elements/curlhttpsrc\\.c.*") "")

View File

@ -32,6 +32,7 @@
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022 Benjamin Slade <slade@lambda-y.net> ;;; Copyright © 2022 Benjamin Slade <slade@lambda-y.net>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -117,6 +118,43 @@
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public appmenu-gtk-module
(package
(name "appmenu-gtk-module")
(version "0.7.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/vala-panel-project/vala-panel-appmenu")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1ywpygjwlbli65203ja2f8wwxh5gbavnfwcxwg25v061pcljaqmm"))))
(build-system meson-build-system)
(arguments
(list
#:glib-or-gtk? #t
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-install-gtk-module
(lambda* _
(substitute*
"subprojects/appmenu-gtk-module/src/gtk-3.0/meson.build"
(("gtk3.get_pkgconfig_variable\\('libdir'\\)")
#$output)))))))
(native-inputs
(list `(,glib "bin") vala pkg-config))
(inputs
(list gtk+ libwnck))
(synopsis "Application Menu applet")
(description
"This package provides a global menu applet for use with desktop panels
such as mate-panel and xfce4-panel.")
(home-page "https://gitlab.com/vala-panel-project/vala-panel-appmenu")
(license (list license:lgpl3))))
(define-public atk (define-public atk
(package (package
(name "atk") (name "atk")

View File

@ -4189,7 +4189,7 @@ models and also supports a rich set of boolean query operators.")
perl perl
pkg-config)) pkg-config))
(propagated-inputs (propagated-inputs
(list guile-gcrypt)) (list guile2.2-gcrypt))
(home-page "https://github.com/o-nly/torrent") (home-page "https://github.com/o-nly/torrent")
(synopsis "Torrent library for GNU Guile") (synopsis "Torrent library for GNU Guile")
(description "This package provides facilities for working with (description "This package provides facilities for working with

View File

@ -172,6 +172,7 @@ done
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)
(guix build syscalls)
(guix cpio)) (guix cpio))
#:builder (begin #:builder (begin
(use-modules (guix build utils) (use-modules (guix build utils)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -22,22 +22,31 @@
(define-module (gnu packages kde-utils) (define-module (gnu packages kde-utils)
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages backup) #:use-module (gnu packages backup)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages cups)
#:use-module (gnu packages glib) ; dbus for tests
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages imagemagick) #:use-module (gnu packages imagemagick)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages kde) #:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages kde-plasma) #:use-module (gnu packages kde-plasma)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages samba) #:use-module (gnu packages samba)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public ark (define-public ark
@ -114,6 +123,216 @@ with support for multiple formats, including tar, gzip, bzip2, rar and zip, as
well as CD-ROM images.") well as CD-ROM images.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public atelier
(let ((commit "93d7d440c42f1e49a4933cbbce9f68d5e4ca725a") ; no releases
(revision "1"))
(package
(name "atelier")
(version (git-version "0.1-pre" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://invent.kde.org/utilities/atelier")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"00jccpwvksyp2vr3fjxajs8d9d30rspg4zj6rnj8dai96alp303k"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules pkg-config))
(inputs (list ki18n
kxmlgui
kconfigwidgets
ktexteditor
libatcore
qt3d-5
qtbase-5
qtcharts
qtdeclarative-5
qtmultimedia-5
qtserialport))
(home-page "https://atelier.kde.org")
(synopsis "Desktop interface to control 3D printers powered by AtCore")
(description "Atelier provides interface to control and manage your printer.
@itemize
@item Load and see your GCode File
@item Real time graphic to monitor your bed and hotend temperatures
@item You can log everything that comes and go from your printer
@item Edit gcode file
@end itemize")
(license license:gpl3+))))
(define-public basket
(let ((commit "e23a8b3b1198d51f770523c7fb4652750810359a")
(revision "1"))
(package
(name "basket")
(version (git-version "2.49" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://invent.kde.org/utilities/basket")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1i7hrrlwyzzh7mm9xc8hjix24rvy1b2cvvbkhxh9mmdbmphwdhhd"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list breeze-icons
karchive
kcompletion
kconfig
kconfigwidgets
kcoreaddons
kcrash
kdbusaddons
kdoctools
kfilemetadata
kglobalaccel
kguiaddons
ki18n
kiconthemes
kcmutils
kio
knotifications
kparts
kservice
ktextwidgets
kwidgetsaddons
kwindowsystem
kxmlgui
phonon))
(home-page "https://invent.kde.org/utilities/basket")
(synopsis "Notes and to-dos organizer")
(description "This package provides simple note taking and to-do app.")
(license license:gpl2+))))
(define-public fielding
(let ((commit "6b3c5d67b308e9e7e2043dc6072bfd265ec9f3e1")
;; no releases yet
(revision "1"))
(package
(name "fielding")
(version (git-version "0.1-pre" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://invent.kde.org/utilities/fielding")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1l16am7il7kprmy8irpzj04rb8wbfr84y49wp4i74hspp9xkfick"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kirigami
kcoreaddons
kconfig
ki18n
kdbusaddons
ksyntaxhighlighting
qtdeclarative-5
qtquickcontrols2-5
qtsvg-5))
(home-page "https://invent.kde.org/utilities/fielding")
(synopsis "REST API testing tool")
(description
"This package provides a tool for testing REST APIs.")
(license license:lgpl2.1+))))
(define-public filelight
(package
(name "filelight")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/filelight-" version ".tar.xz"))
(sha256
(base32
"1fqgmpq5dznbn5lalx1j6dyynhylijrcqw3x9hrwxcqwr275h9iw"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kirigami
kquickcharts
kxmlgui
kio
ki18n
kdeclarative
qqc2-desktop-style
qtgraphicaleffects
qtquickcontrols2-5
qtsvg-5))
(home-page "https://apps.kde.org/filelight/")
(synopsis "Visualize the disk usage")
(description "Filelight is an application to visualize the disk usage on
your computer.")
(license license:lgpl2.1+)))
(define-public francis
(let ((commit "d2c762ad94170430a667ee57f81ec9dbe498642c") ; no release yet
(revision "1"))
(package
(name "francis")
(version (git-version "0.1-pre" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://invent.kde.org/utilities/francis")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"15bk5iq127mp34n9fzq4d5r3qss3ihk93lqy86z2q3lgwid26s0h"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kirigami
kcoreaddons
kconfig
ki18n
kdbusaddons
knotifications
qtdeclarative-5
qtgraphicaleffects
qtquickcontrols2-5
qtsvg-5))
(home-page "https://invent.kde.org/utilities/francis")
(synopsis "Track your time")
(description "This package provides time tracking.")
(license license:lgpl2.1+))))
(define-public isoimagewriter
(let ((commit "bd1ef4f0ce179fa874b102689022ebda3e7b4c16")
(revision "1"))
(package
(name "isoimagewriter")
(version (git-version "0.8" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://invent.kde.org/utilities/isoimagewriter")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0dha2y4kmyppi6c0g0hclp53fjj963vq27q7azznpl0bz6zb4042"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kauth
karchive
kcoreaddons
ki18n
kiconthemes
kcrash
solid
kwidgetsaddons))
(home-page "https://invent.kde.org/utilities/isoimagewriter")
(synopsis "Write hybrid ISO files onto USB disks")
(description
"This package provides a tool to write ISO files to USB disks.")
(license license:gpl3+))))
(define-public kate (define-public kate
(package (package
(name "kate") (name "kate")
@ -180,6 +399,380 @@ Kate's features include:
(license ;; GPL for programs, LGPL for libraries (license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0)))) (list license:gpl2+ license:lgpl2.0))))
(define-public kdebugsettings
(package
(name "kdebugsettings")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kdebugsettings-" version
".tar.xz"))
(sha256
(base32
"0l9q7cmzc93zz2zc5ncq3q7q6jil6ai36n2vh70s2wsi8b0gsms8"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kcoreaddons
kconfig
kdbusaddons
ki18n
kwidgetsaddons
kitemviews
kcompletion))
(home-page "https://invent.kde.org/utilities/kdebugsettings")
(synopsis "Choose which QLoggingCategory are displayed")
(description
"This package allows to select which QLoggingCategory are displayed.")
(license license:lgpl2.0+)))
(define-public kbackup
(package
(name "kbackup")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kbackup-" version ".tar.xz"))
(sha256
(base32
"0c0zdk00j9qssjdb5dg5hwc5mx7h5kvriyszia2xizqjq2m53c3k"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kguiaddons
knotifications
ki18n
kio
kxmlgui
kiconthemes
karchive
kwidgetsaddons
shared-mime-info))
(home-page "https://apps.kde.org/kbackup/")
(synopsis "Backup program with an easy-to-use interface")
(description
"This package provides tool to backup your data.
@itemize
@item profile for directories and files to be included or excluded from the
backup
@item The backup target can be either a locally mounted device like a ZIP
drive, USB stick, etc
@item Running automated backups without using a graphical user interface
@end itemize")
(license license:gpl2+)))
(define-public kcalc
(package
(name "kcalc")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kcalc-" version ".tar.xz"))
(sha256
(base32
"01rn6qy40q4b90i5mysrygkqh5fzq885dgcd11l6r8s59ijjcjlk"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules kdoctools))
(inputs (list gmp
kcoreaddons
kcrash
kconfig
kconfigwidgets
kguiaddons
ki18n
knotifications
kxmlgui
mpfr))
(home-page "https://apps.kde.org/kcalc/")
(synopsis "Scientific calculator")
(description
"This package provides a scientific calculator.")
(license license:gpl2+)))
(define-public kcharselect
(package
(name "kcharselect")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kcharselect-" version
".tar.xz"))
(sha256
(base32
"1gs9jkq76dkhjgjqpl5dcsx0l2qi6i0pk122y1qmwgyd6f8af35b"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kbookmarks kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui))
(home-page "https://apps.kde.org/kcharselect/")
(synopsis "Select and copy special characters from installed fonts")
(description
"This package provides a tool to display various information
about the selected character. This includes not only the Unicode character
name, but also aliases, general notes and cross references to similar
characters.")
(license license:gpl2+)))
(define-public kdialog
(package
(name "kdialog")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kdialog-" version ".tar.xz"))
(sha256
(base32
"1lqzhfn5g16qr6ada9i0i3kshna1zxp1y20ylwmmsa82bgmyblhx"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules kdoctools))
(inputs (list ktextwidgets
knotifications
kguiaddons
kiconthemes
kwindowsystem
kio
kdbusaddons))
(home-page "https://invent.kde.org/utilities/kdialog")
(synopsis "Show dialog boxes from shell scripts")
(description "This package provides tool to show nice dialog boxes from
shell scripts.")
(license license:gpl2+)))
(define-public keurocalc
(let ((commit "a760d8a7e58b36eb72d15e847f96599c93785194") ; just one release
(revision "1"))
(package
(name "keurocalc")
(version (git-version "1.3.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://invent.kde.org/utilities/keurocalc")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0gh5vwl38hwf1405c980j1fj06g5c52am140lf4mxhrjvnmry7kd"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules kdoctools))
(inputs (list kconfig
kconfigwidgets
kcoreaddons
ki18n
kio
kwidgetsaddons
kxmlgui))
(home-page "https://invent.kde.org/utilities/keurocalc")
(synopsis "Currency conversion tool")
(description "This package provides a utility to handle currency
conversions between European currencies.")
(license license:gpl2+))))
(define-public keysmith
(package
(name "keysmith")
(version "22.09")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma-mobile/"
(version-major+minor version) "/keysmith-"
version ".tar.xz"))
(sha256
(base32
"0w3vvmp9rn6ahly2fm9n6f4glfr7d84bfvj33mrs5pn7n99h7jgy"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules pkg-config))
(inputs (list kdbusaddons
kirigami
ki18n
kwindowsystem
libsodium
qtdeclarative-5
qtgraphicaleffects
qtquickcontrols2-5
qtsvg-5))
(home-page "https://invent.kde.org/utilities/keysmith")
(synopsis "OTP client for Plasma Mobile and Desktop")
(description
"This package provides OTP client for Plasma Mobile and Desktop
with support for QR scanning.")
(license license:gpl3+)))
(define-public kfind
(package
(name "kfind")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kfind-" version ".tar.xz"))
(sha256
(base32
"0py6ygnj7qxbwrldf2a3hqc1cqd5yvyfi1l0nji0hwn8lvidnjhc"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules kdoctools))
(inputs (list karchive
kcoreaddons
kfilemetadata
ki18n
kio
kwidgetsaddons))
(home-page "https://apps.kde.org/kfind/")
(synopsis "File search utility")
(description
"This package provides a file search utility for KDE.")
(license license:gpl2+)))
(define-public kirogi
(let ((commit "73b009f1fc5ac159c2faba720b302c704f89a806") ; no releases yet
(revision "1"))
(package
(name "kirogi")
(version (git-version "0.1-pre" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://invent.kde.org/utilities/kirogi")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1gncfnwadh11ipynfcrsh1vnk2g02c7scd5wanphi8i95jzak9jd"))))
(build-system qt-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-gstreamer
(lambda* _
(substitute* "CMakeLists.txt"
(("gstreamer-video-1.0")
"")))))))
(native-inputs (list extra-cmake-modules pkg-config))
(inputs (list kconfigwidgets
kcoreaddons
ki18n
kirigami
kcrash
kdnssd
qtquickcontrols2-5
qtgraphicaleffects
qtdeclarative-5
qtgamepad
qtlocation))
(propagated-inputs (list gstreamer))
(home-page "https://apps.kde.org/kirogi/")
(synopsis "Ground control application for drones")
(description "Kirogi is a ground control application for drones.
@itemize
@item Direct flight controls
@item Fly by touch on a Navigation Map
@item Trigger vehicle actions (e.g. flips, trim)
@item Gamepad/joypad support
@item Live video
@item Take photo and record video
@item Configure flight parameters (speed, altitude limits)
@item Support for Parrot (Anafi, Bebop 2) and Ryze Tello drones
@end itemize")
(license ;GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0)))))
(define-public kontrast
(package
(name "kontrast")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kontrast-" version ".tar.xz"))
(sha256
(base32
"03y3y5p29zx4nmqi7hp3abxq2n2bgwbz2knhn9vhl3im3ghp7lmp"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list kirigami
ki18n
kcoreaddons
qtdeclarative-5
qtgraphicaleffects
qtquickcontrols2-5
qtsvg-5))
(home-page "https://apps.kde.org/kontrast/")
(synopsis "Color contrast checker")
(description
"Kontrast is a color contrast checker and tells you if your color
combinations are distinct enough to be readable and accessible.")
(license license:gpl3+)))
(define-public libatcore
(let ((commit "0de6393ed3e721537dec50b0ad174d83f1207eb6")
(revision "1"))
(package
(name "libatcore")
(version (git-version "1.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://invent.kde.org/libraries/atcore")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1830r6ylpn3l7y2frl8cih5cpjgbkfrib9jq7jklf8aszhlsihf2"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list qtcharts qtdeclarative-5 qtserialport))
(home-page "https://invent.kde.org/libraries/atcore")
(synopsis "Library for connection and management of 3D printers")
(description
"This package provides a API to manage the serial connection between
the computer and 3D Printers.")
(license (list license:lgpl2.1 license:lgpl3)))))
(define-public wacomtablet
(package
(name "wacomtablet")
(version "3.2.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/"
name "/" version "/"
name "-" version ".tar.xz"))
(patches (search-patches
"wacomtablet-add-missing-includes.patch"
"wacomtablet-qt5.15.patch"))
(sha256
(base32
"197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368"))))
(build-system qt-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "dbus-launch" "ctest" "-E"
"(Test.KDED.DBusTabletService|Test.KDED.TabletHandler|Test.KDED.XInputAdaptor|Test.KDED.XsetWacomAdaptor)")))))))
(native-inputs (list dbus extra-cmake-modules kdoctools pkg-config))
(inputs (list kcoreaddons
ki18n
kglobalaccel
kconfig
kxmlgui
kwidgetsaddons
kwindowsystem
knotifications
kdbusaddons
qtx11extras
qtdeclarative-5
libwacom
xf86-input-wacom
libxi))
(propagated-inputs (list plasma-framework))
(home-page "https://invent.kde.org/system/wacomtablet")
(synopsis "KDE GUI for the Wacom Linux Drivers")
(description "Provides KDE GUI for the Wacom Linux Drivers.")
(license license:gpl2+)))
(define-public kmag (define-public kmag
(package (package
(name "kmag") (name "kmag")
@ -456,6 +1049,41 @@ redone.")
(license ;; GPL for programs, LGPL for libraries, FDL for documentation (license ;; GPL for programs, LGPL for libraries, FDL for documentation
(list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
(define-public print-manager
(package
(name "print-manager")
(version "22.08.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/print-manager-" version ".tar.xz"))
(sha256
(base32 "1abwj1ccm70adzx07ykqjlb4f6y55k2rv1j861dl0822187vl799"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules))
(inputs
(list cups
kcmutils
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
kiconthemes
ki18n
kio
knotifications
kwidgetsaddons
kwindowsystem
plasma-framework
qtdeclarative-5))
(home-page "https://invent.kde.org/utilities/print-manager")
(synopsis "Manage print jobs and printers")
(description
"This package provides printing management for KDE.")
(license license:gpl2+)))
(define-public rsibreak (define-public rsibreak
(package (package
(name "rsibreak") (name "rsibreak")

View File

@ -68,6 +68,7 @@
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gimp) #:use-module (gnu packages gimp)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gps) #:use-module (gnu packages gps)
#:use-module (gnu packages graphics) #:use-module (gnu packages graphics)
@ -99,14 +100,14 @@
(define-public baloo-widgets (define-public baloo-widgets
(package (package
(name "baloo-widgets") (name "baloo-widgets")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/baloo-widgets-" version ".tar.xz")) "/src/baloo-widgets-" version ".tar.xz"))
(sha256 (sha256
(base32 "0084bnrlbdypdwzxi9gfxcywhyjd1z2cmh7p6gv0zhc9f7h6ffnp")))) (base32 "02p4v8g4syk908mg7f0l5fpqn7ddsxqji1n8jqghsdkkdsvry7mn"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))
@ -123,14 +124,14 @@ This package contains GUI widgets for baloo.")
(define-public grantleetheme (define-public grantleetheme
(package (package
(name "grantleetheme") (name "grantleetheme")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/grantleetheme-" version ".tar.xz")) "/src/grantleetheme-" version ".tar.xz"))
(sha256 (sha256
(base32 "50c6s1g3vp5sdhpiciz1j6rsryld7hcc6lvmxdlsvms2bbcmnj7l")))) (base32 "01ls16x6ngi43lcwffav9qig3afakrs04v4wvyfb8lm7sd65hgf9"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments `(#:tests? #f)) ; unexpected error in the test suite. (arguments `(#:tests? #f)) ; unexpected error in the test suite.
(native-inputs (native-inputs
@ -151,14 +152,14 @@ This package contains GUI widgets for baloo.")
(define-public akregator (define-public akregator
(package (package
(name "akregator") (name "akregator")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/akregator-" version ".tar.xz")) "/src/akregator-" version ".tar.xz"))
(sha256 (sha256
(base32 "08n713271i7ifnbrgwrqmxvcpvj45wfqjiidw8zf9rpwxg2m2m9g")))) (base32 "01rgyl2hwjprq4z5yjc99j6jk9vrhjy608ha72j470pw6g47ac5s"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -195,7 +196,7 @@ This package contains GUI widgets for baloo.")
kontactinterface kontactinterface
kpimcommon kpimcommon
kpimtextedit kpimtextedit
kqtquickcharts kquickcharts
ktexteditor ktexteditor
kuserfeedback kuserfeedback
libkdepim libkdepim
@ -220,7 +221,7 @@ browser for easy news reading.")
(define-public kdenlive (define-public kdenlive
(package (package
(name "kdenlive") (name "kdenlive")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -229,7 +230,7 @@ browser for easy news reading.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0v545kd5rm5isy4cx21fp3pi49mvsv1r1ahp0jhim8s6b7ghrh64")))) (base32 "0xnasi8s8zxh2s4vnn51pc8ni58q8pk70bwh9dfxp1wdmpv3zsrx"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
;; XXX: there is a single test that spawns other tests and ;; XXX: there is a single test that spawns other tests and
@ -304,14 +305,14 @@ projects.")
(define-public kdevelop (define-public kdevelop
(package (package
(name "kdevelop") (name "kdevelop")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/kdevelop-" version ".tar.xz")) "/src/kdevelop-" version ".tar.xz"))
(sha256 (sha256
(base32 "03dwllxy96sy20kdsc3sll0n6bhh6gdmpjl821flsxv0jb5naplv")))) (base32 "14a80z4sahxyzssrz605zp7ah5xdjbc22ccv0vwcnhr5lzr76v31"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config shared-mime-info qttools-5)) (list extra-cmake-modules pkg-config shared-mime-info qttools-5))
@ -443,6 +444,102 @@ a module for implementing ODF Gantt charts, which are bar charts that
illustrate project schedules.") illustrate project schedules.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public kio-extras
(package
(name "kio-extras")
(version "22.08.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/" name "-"
version ".tar.xz"))
(sha256
(base32
"0gzna2ps2qd2js28c97kjpcbah7zz8n4s4932faggc2nz5z5wnyn"))))
(build-system cmake-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "HOME" (getcwd))
(setenv "TMPDIR" (getcwd))
(invoke "ctest" "-E" "testkioarchive")))))))
(native-inputs (list extra-cmake-modules dbus kdoctools qttools-5))
(inputs (list karchive
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
ki18n
kdnssd
kio
solid
kbookmarks
kguiaddons
ksyntaxhighlighting
qtbase-5
qtsvg-5))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Additional components to increase the functionality of KIO")
(description
"This package provides additional components to increase
the functionality of the KDE resource and network access abstractions.")
(license license:lgpl2.0+)))
(define-public kio-fuse
(package
(name "kio-fuse")
(version "5.0.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/" name "/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1pb62h45c06dq3rml91xbf8j5y2c1l8z8j8lycchxrlgys5rlrv6"))))
(build-system cmake-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "HOME" (getcwd))
(setenv "XDG_RUNTIME_DIR" (getcwd))
(setenv "QT_QPA_PLATFORM" "offscreen")
(invoke "dbus-launch" "ctest" "-E"
"(fileopstest-cache|fileopstest-filejob)")))))))
(native-inputs (list dbus extra-cmake-modules pkg-config))
(inputs (list fuse-3 kio kcoreaddons qtbase-5))
(home-page "https://community.kde.org/Frameworks")
(synopsis "FUSE Interface for KIO")
(description "This package provides FUSE Interface for KIO.")
(license license:lgpl2.1+)))
(define-public kirigami-addons
(package
(name "kirigami-addons")
(version "0.3")
(source (origin
(method url-fetch)
(uri (string-append
"https://invent.kde.org/libraries/kirigami-addons/-/archive/v"
version "/kirigami-addons-v" version ".tar.gz"))
(sha256
(base32
"1zr8dpc7bzw6g3y0jaxsr2lqlxqwlcphchpk8iah6g1f3n9fq73r"))))
(build-system qt-build-system)
(arguments
(list #:tests? #f)) ; failing test
(native-inputs (list extra-cmake-modules))
(inputs (list kirigami ki18n qtdeclarative-5 qtquickcontrols2-5))
(home-page "https://invent.kde.org/libraries/kirigami-addons")
(synopsis "Add-ons for the Kirigami framework")
(description
"This package provides Kirigami components usable by both touch
and desktop experiences.")
(license license:lgpl2.0+)))
(define-public kseexpr (define-public kseexpr
(package (package
(name "kseexpr") (name "kseexpr")
@ -581,17 +678,52 @@ the generated @file{massif.out.%pid} in the visualizer. Gzip or Bzip2
compressed massif files can also be opened transparently.") compressed massif files can also be opened transparently.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public libqaccessibilityclient
(package
(name "libqaccessibilityclient")
(version "0.4.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/" name
"/libqaccessibilityclient-" version
".tar.xz"))
(sha256
(base32
"0a9lv2jb5gyqxvrkl5xl09gjnlp05b5yfzfb0wmaxz0l8d7qnxhw"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;TODO: Failing tests
#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
;; For missing '/etc/machine-id'
(setenv "DBUS_FATAL_WARNINGS" "0")
(setenv "HOME"
(getcwd))
(invoke "dbus-launch" "ctest")))))))
(native-inputs (list dbus extra-cmake-modules))
(inputs (list qtbase-5))
(home-page "https://invent.kde.org/libraries/libqaccessibilityclient")
(synopsis "Helper library to make writing accessibility tools easier")
(description "This package provides library that is used when writing
accessibility clients such as screen readers.")
(license license:lgpl2.1+)))
(define-public libkomparediff2 (define-public libkomparediff2
(package (package
(name "libkomparediff2") (name "libkomparediff2")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/libkomparediff2-" version ".tar.xz")) "/src/libkomparediff2-" version ".tar.xz"))
(sha256 (sha256
(base32 "1vaxbx7c6r7skh3452blxyrngfcsdyjmmvcg6j2wcsn04m01mw8k")))) (base32 "0hjxxhfv0ds05l821avq787sfdy0afr595xx266c20x8fxgm6kv9"))))
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config)) (list extra-cmake-modules pkg-config))
(inputs (inputs
@ -636,10 +768,70 @@ including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart
cards.") cards.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public kopeninghours
(package
(name "kopeninghours")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/" name "-" version ".tar.xz"))
(sha256
(base32
"03hslgx4zgg7gsnz2xhx4wnchvqfc5n8c6ihgwz3972fkxsjfdvq"))))
(build-system cmake-build-system)
(arguments
(list #:phases '(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "QT_QPA_PLATFORM" "offscreen")
(invoke "ctest" "-E"
"(evaluatetest|iterationtest)")))))))
(native-inputs (list bison extra-cmake-modules flex))
(inputs (list boost
kholidays
ki18n
osmctools
qtbase-5
qtdeclarative-5))
(home-page "https://invent.kde.org/libraries/kopeninghours")
(synopsis "Get opening hours from OpenStreetMap")
(description
"This package provides a library for parsing and evaluating OpenStreetMap
opening hours expressions.")
(license license:lgpl2.0+)))
(define-public kosmindoormap
(package
(name "kosmindoormap")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/" name "-" version ".tar.xz"))
(sha256
(base32
"042axwxa1497snr8f0m6a61gl9ypdkvllnhnlw4h5ffah7yl5n3s"))))
(build-system cmake-build-system)
(native-inputs (list bison extra-cmake-modules flex))
(inputs (list ki18n
kopeninghours
kpublictransport
qtbase-5
qtdeclarative-5
zlib))
(home-page "https://invent.kde.org/libraries/kosmindoormap")
(synopsis "Indoor map renderer")
(description
"This package provides facilities for rendering OpenStreetMap
multi-floor indoor maps.")
(license license:lgpl2.0+)))
(define-public kpmcore (define-public kpmcore
(package (package
(name "kpmcore") (name "kpmcore")
(version "22.04.3") (version "22.08.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -647,7 +839,7 @@ cards.")
"/src/" name "-" version ".tar.xz")) "/src/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"04qslli4vnbnl329zynbinlwaigxr9xpswra5n0v710p92as0qif")))) "1y28dnmbnkkjar4kl033fkmcnazgczc3pgdac2q1ry2hjzkcbnpa"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules pkg-config)) (list extra-cmake-modules pkg-config))
@ -674,6 +866,37 @@ cards.")
(description "Library for managing partitions.") (description "Library for managing partitions.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public kpublictransport
(package
(name "kpublictransport")
(version "22.08.1")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kde/stable/release-service/" version
"/src/kpublictransport-" version ".tar.xz"))
(sha256
(base32
"0z7zyyiq4815m74s6p841k1c4pxbrss7hnkag8kr5qa3q4264kg9"))))
(build-system qt-build-system)
(arguments
(list #:phases '(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "QT_QPA_PLATFORM" "offscreen")
(invoke "ctest" "-E"
"(mergeutiltest|departuretest|journeytest|networkconfigtest|locationhistorymodeltest|navitiaparsertest|otpparsertest|ivvassparsertest|cachetest)")))))))
(native-inputs (list extra-cmake-modules pkg-config))
;; TODO: clipper and osmctools are not detected
(inputs (list clipper osmctools protobuf qtdeclarative-5 zlib))
(home-page "https://api.kde.org/kdepim/kpublictransport/html/index.html")
(synopsis "Library for accessing realtime public transport data")
(description
"This package provides a library for accessing realtime public
transport data and for performing public transport journey queries.")
(license (list license:lgpl2.0+))))
(define-public snorenotify (define-public snorenotify
(package (package
(name "snorenotify") (name "snorenotify")
@ -703,7 +926,7 @@ different notification systems.")
(define-public kdeconnect (define-public kdeconnect
(package (package
(name "kdeconnect") (name "kdeconnect")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -712,7 +935,7 @@ different notification systems.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"015gxglclds2vmjr4bv51yfv840bafzgrl71cnwgnwwy8rrh9x4x")))) "1yzx49gcm7x2wdk53iznyjz09y2a6mrrhh68xilbcsafyiw3l3zr"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:configure-flags '("-DBUILD_TESTING=ON" `(#:configure-flags '("-DBUILD_TESTING=ON"
@ -741,6 +964,7 @@ different notification systems.")
kpeoplevcard kpeoplevcard
kwayland kwayland
libfakekey libfakekey
plasma-wayland-protocols
pulseaudio-qt pulseaudio-qt
qca qca
qqc2-desktop-style qqc2-desktop-style
@ -847,41 +1071,17 @@ to perform data analysis.")
(license (list license:gpl2+ ;labplot (license (list license:gpl2+ ;labplot
license:gpl3+)))) ;liborigin license:gpl3+)))) ;liborigin
(define-public kqtquickcharts
(package
(name "kqtquickcharts")
(version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kqtquickcharts-" version ".tar.xz"))
(sha256
(base32
"0bm7rdysvlfnfnvy87ii3kxl238q83vw0ia58zsnwjmkxmlgf6mp"))))
(build-system cmake-build-system)
(native-inputs
(list extra-cmake-modules))
(inputs
(list qtbase-5 qtdeclarative-5))
(home-page "https://phabricator.kde.org/source/kqtquickcharts/")
(synopsis "Interactive charts for Qt Quick")
(description
"Kqtquickcharts is a QtQuick plugin to render beautiful and interactive
charts.")
(license license:lgpl2.1+)))
(define-public kdf (define-public kdf
(package (package
(name "kdf") (name "kdf")
(version "22.04.3") (version "22.08.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" (uri (string-append "mirror://kde/stable/release-service/"
version "/src/kdf-" version ".tar.xz")) version "/src/kdf-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1m0dwk3inqzk9kjjzgsaam15lnpbhzjfmwrzv8sazfk44scnr2v1")))) "0p7iqld2phc74pmhyb8bqqg9clnc7l2rh6hd0i6jcsp266cgg205"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules kdoctools)) (list extra-cmake-modules kdoctools))
@ -934,14 +1134,14 @@ timers for each task can be started, stopped, changed, or looped.")
(define-public kcachegrind (define-public kcachegrind
(package (package
(name "kcachegrind") (name "kcachegrind")
(version "22.04.3") (version "22.08.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/kcachegrind-" version ".tar.xz")) "/src/kcachegrind-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"12ckn90hqm2c5c58xqkzgcih64jk4kwkgz4q0f5ns1rxv3pidz5n")))) "05wcnfqs0fdfhfpagn0pqky0l7014nblv8r9fv1khy4g5mdlm4hs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules perl python qttools-5 kdoctools)) (list extra-cmake-modules perl python qttools-5 kdoctools))
@ -968,14 +1168,14 @@ Python, PHP, and Perl.")
(define-public libkdegames (define-public libkdegames
(package (package
(name "libkdegames") (name "libkdegames")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/libkdegames-" version ".tar.xz")) "/src/libkdegames-" version ".tar.xz"))
(sha256 (sha256
(base32 "0igq87anam9x2mclb0lkvwhrxk62y1f4xl14a4dhd97mqsc5pbzn")))) (base32 "1aihbha073fw2bxmdk4l768716kvrlyjd72x2nfx0vvr0ngc5wx9"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))
@ -1014,7 +1214,7 @@ Python, PHP, and Perl.")
(define-public marble-qt (define-public marble-qt
(package (package
(name "marble-qt") (name "marble-qt")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1024,7 +1224,7 @@ Python, PHP, and Perl.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1saacnrl0hkl32nq96l1bgn9yrsz455q96jdxzp7ax8iaa5nmdiz")))) "0pn0mjh5cg7mgjj82bsj8zikzdyq2fmzckdcav2y0msxwi859crl"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
;; FIXME: libmarblewidget-qt5.so.28 not found. Also enable the ;; FIXME: libmarblewidget-qt5.so.28 not found. Also enable the
@ -1071,14 +1271,14 @@ creating routes by drag and drop and more.")
(define-public okular (define-public okular
(package (package
(name "okular") (name "okular")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/" name "-" version ".tar.xz")) "/src/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "03jpwgrhjgyx14g1h3lxhnyib88ck0qkqcxh4fpc398xwdr3amkw")))) (base32 "0f98kfsb6sirpym27j2wwz4qr4p5vl4pbnckxd3gmgyfpz8mszln"))))
(build-system qt-build-system) (build-system qt-build-system)
;; The tests fail because they can't find the proper mimetype plugins: ;; The tests fail because they can't find the proper mimetype plugins:
;; "org.kde.okular.core: No plugin for mimetype '"image/jpeg"'." ;; "org.kde.okular.core: No plugin for mimetype '"image/jpeg"'."
@ -1136,7 +1336,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
(define-public poxml (define-public poxml
(package (package
(name "poxml") (name "poxml")
(version "22.04.3") (version "22.08.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1144,7 +1344,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
"/src/poxml-" version ".tar.xz")) "/src/poxml-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1nrp0i3a39pw4pzcanpmjyks3pl1lyfj3zq61ii8xx402xw1ip2w")))) "13jp5g5la3kq9i3qybdvwfl4vgqz3hxf64qzmh7kl71ykas7s5vi"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules kdoctools)) (list extra-cmake-modules kdoctools))
@ -1161,14 +1361,14 @@ PO template files.")
(define-public kdegraphics-mobipocket (define-public kdegraphics-mobipocket
(package (package
(name "kdegraphics-mobipocket") (name "kdegraphics-mobipocket")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/" name "-" version ".tar.xz")) "/src/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "12yrwa22c4qxsf10fv76fzaaj5xlv5lmrwcqvf6qhgr6f9qsw7sj")))) (base32 "1kxvzgmq83hml10pc4j66r59dsar7h92w2i0cs1nhar781mz666n"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))
@ -1183,14 +1383,14 @@ Mobipocket e-books in Dolphin and other KDE apps.")
(define-public libkexiv2 (define-public libkexiv2
(package (package
(name "libkexiv2") (name "libkexiv2")
(version "22.04.3") (version "22.08.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version (uri (string-append "mirror://kde/stable/release-service/" version
"/src/" name "-" version ".tar.xz")) "/src/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0p43z69yh5jk8m1hn3xynjpgzxpkc89h0dafj5964qx4xp4vxl19")))) (base32 "0iwpy79ppv4bbsqrszp9kmghgjvkl13gdpnafsbikh4wy1ch4cv9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list extra-cmake-modules)) (list extra-cmake-modules))

View File

@ -33,7 +33,7 @@
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com> ;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com>
;;; Copyright © 2019-2022 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2019-2022 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
@ -108,8 +108,9 @@
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages flex)
#:use-module (gnu packages file) #:use-module (gnu packages file)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
@ -119,6 +120,7 @@
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages haskell-apps) #:use-module (gnu packages haskell-apps)
@ -418,7 +420,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.4))) deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.265") (define-public linux-libre-4.19-version "4.19.266")
(define-public linux-libre-4.19-gnu-revision "gnu1") (define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19 (define deblob-scripts-4.19
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -428,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
(define-public linux-libre-4.19-pristine-source (define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version) (let ((version linux-libre-4.19-version)
(hash (base32 "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p"))) (hash (base32 "0qfgvdzf8mwx0vhz6v6vkdch3hilh6qrl24gmy5z1vpwbxjvc4kv")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.19))) deblob-scripts-4.19)))
@ -494,17 +496,20 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(define-public linux-libre-6.0-source (define-public linux-libre-6.0-source
(source-with-patches linux-libre-6.0-pristine-source (source-with-patches linux-libre-6.0-pristine-source
(list %boot-logo-patch (list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch))) %linux-libre-arm-export-__sync_icache_dcache-patch
(search-patch "linux-libre-infodocs-target.patch"))))
(define-public linux-libre-5.15-source (define-public linux-libre-5.15-source
(source-with-patches linux-libre-5.15-pristine-source (source-with-patches linux-libre-5.15-pristine-source
(list %boot-logo-patch (list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch))) %linux-libre-arm-export-__sync_icache_dcache-patch
(search-patch "linux-libre-infodocs-target.patch"))))
(define-public linux-libre-5.10-source (define-public linux-libre-5.10-source
(source-with-patches linux-libre-5.10-pristine-source (source-with-patches linux-libre-5.10-pristine-source
(list %boot-logo-patch (list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch))) %linux-libre-arm-export-__sync_icache_dcache-patch
(search-patch "linux-libre-infodocs-target.patch"))))
(define-public linux-libre-5.4-source (define-public linux-libre-5.4-source
(source-with-patches linux-libre-5.4-pristine-source (source-with-patches linux-libre-5.4-pristine-source
@ -759,6 +764,11 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
;;; Kernel package utilities. ;;; Kernel package utilities.
;;; ;;;
(define (doc-supported? version)
;; Versions older than 5.10 have different enough build scripts that the
;; infodocs patch doesn't apply.
(version>=? version "5.10"))
(define* (make-linux-libre version gnu-revision hash-string supported-systems (define* (make-linux-libre version gnu-revision hash-string supported-systems
#:key #:key
(extra-version #f) (extra-version #f)
@ -767,7 +777,13 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(configuration-file #f) (configuration-file #f)
(defconfig "defconfig") (defconfig "defconfig")
(extra-options %default-extra-linux-options) (extra-options %default-extra-linux-options)
(patches (list %boot-logo-patch))) (build-doc? (doc-supported? version))
(patches
`(,%boot-logo-patch
,@(if build-doc?
(list (search-patch
"linux-libre-infodocs-target.patch"))
'()))))
(make-linux-libre* version gnu-revision (make-linux-libre* version gnu-revision
(origin (origin
(method url-fetch) (method url-fetch)
@ -778,7 +794,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
#:extra-version extra-version #:extra-version extra-version
#:configuration-file configuration-file #:configuration-file configuration-file
#:defconfig defconfig #:defconfig defconfig
#:extra-options extra-options)) #:extra-options extra-options
#:build-doc? build-doc?))
(define* (make-linux-libre* version gnu-revision source supported-systems (define* (make-linux-libre* version gnu-revision source supported-systems
#:key #:key
@ -787,7 +804,10 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
;; See kernel-config for an example. ;; See kernel-config for an example.
(configuration-file #f) (configuration-file #f)
(defconfig "defconfig") (defconfig "defconfig")
(extra-options %default-extra-linux-options)) (extra-options %default-extra-linux-options)
(build-doc? (doc-supported? version)))
(when (and build-doc? (not (doc-supported? version)))
(error "unsupported 'build-doc?' for kernels <5.10"))
(package (package
(name (if extra-version (name (if extra-version
(string-append "linux-libre-" extra-version) (string-append "linux-libre-" extra-version)
@ -796,11 +816,127 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(source source) (source source)
(supported-systems supported-systems) (supported-systems supported-systems)
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
(list
#:modules '((guix build gnu-build-system)
(guix build utils)
(srfi srfi-1)
(srfi srfi-26)
(ice-9 ftw)
(ice-9 match))
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-/bin/pwd
(lambda _
(substitute* (find-files
"." "^Makefile(\\.include)?$")
(("/bin/pwd") "pwd"))))
#$@(if build-doc?
#~((add-before 'configure 'build-doc
(lambda _
(substitute* "Documentation/Makefile"
;; Remove problematic environment check script.
((".*scripts/sphinx-pre-install.*") ""))
(invoke "make" "infodocs")))
(add-after 'build-doc 'install-doc
(lambda _
(with-directory-excursion "Documentation/output"
(invoke "make" "-C" "texinfo" "install-info"
(string-append "infodir=" #$output
"/share/info"))))))
#~())
(replace 'configure
(lambda* (#:key inputs target #:allow-other-keys)
;; Avoid introducing timestamps.
(setenv "KCONFIG_NOTIMESTAMP" "1")
(setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH"))
;; Other variables useful for reproducibility.
(setenv "KBUILD_BUILD_USER" "guix")
(setenv "KBUILD_BUILD_HOST" "guix")
;; Set ARCH and CROSS_COMPILE.
(let ((arch #$(platform-linux-architecture
(lookup-platform-by-target-or-system
(or (%current-target-system)
(%current-system))))))
(setenv "ARCH" arch)
(format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))
(when target
(setenv "CROSS_COMPILE" (string-append target "-"))
(format #t "`CROSS_COMPILE' set to `~a'~%"
(getenv "CROSS_COMPILE"))))
(setenv "EXTRAVERSION"
#$(and extra-version
(string-append "-" extra-version)))
(let ((config (assoc-ref inputs "kconfig")))
;; Use a custom kernel configuration file or a default
;; configuration file.
(if config
(begin
(copy-file config ".config")
(chmod ".config" #o666))
(invoke "make" #$defconfig))
;; Appending works even when the option wasn't in the
;; file. The last one prevails if duplicated.
(let ((port (open-file ".config" "a"))
(extra-configuration #$(config->string extra-options)))
(display extra-configuration port)
(close-port port))
(invoke "make" "oldconfig"))))
(replace 'install
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(let ((moddir (string-append #$output "/lib/modules"))
(dtbdir (string-append #$output "/lib/dtbs")))
;; Install kernel image, kernel configuration and link map.
(for-each (lambda (file) (install-file file #$output))
(find-files "." "^(\\.config|bzImage|zImage|Image\
|vmlinuz|System\\.map|Module\\.symvers)$"))
;; Install device tree files
(unless (null? (find-files "." "\\.dtb$"))
(mkdir-p dtbdir)
(invoke "make" (string-append "INSTALL_DTBS_PATH=" dtbdir)
"dtbs_install"))
;; Install kernel modules
(mkdir-p moddir)
(invoke "make"
;; Disable depmod because the Guix system's
;; module directory is an union of potentially
;; multiple packages. It is not possible to use
;; depmod to usefully calculate a dependency
;; graph while building only one of them.
"DEPMOD=true"
(string-append "MODULE_DIR=" moddir)
(string-append "INSTALL_PATH=" #$output)
(string-append "INSTALL_MOD_PATH=" #$output)
"INSTALL_MOD_STRIP=1"
"modules_install")
(let* ((versions (filter (lambda (name)
(not (string-prefix? "." name)))
(scandir moddir)))
(version (match versions
((x) x))))
;; There are symlinks to the build and source directory.
;; Both will point to target /tmp/guix-build* and thus
;; not be useful in a profile. Delete the symlinks.
(false-if-file-not-found
(delete-file
(string-append moddir "/" version "/build")))
(false-if-file-not-found
(delete-file
(string-append moddir "/" version "/source"))))))))))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("bc" ,bc) ("bc" ,bc)
("openssl" ,openssl) ("openssl" ,openssl)
("elfutils" ,elfutils) ; Needed to enable CONFIG_STACK_VALIDATION ("elfutils" ,elfutils) ;needed to enable CONFIG_STACK_VALIDATION
("flex" ,flex) ("flex" ,flex)
("bison" ,bison) ("bison" ,bison)
@ -809,6 +945,18 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
("mpfr" ,mpfr) ("mpfr" ,mpfr)
("mpc" ,mpc) ("mpc" ,mpc)
;; For generating the documentation.
,@(if build-doc?
;; TODO: remove fontconfig after the 5.10 kernel is dropped.
;; Also replace python-wrapper by python at that time.
`(("fontconfig" ,fontconfig)
("graphviz" ,graphviz)
("python" ,python-wrapper)
("python-sphinx" ,python-sphinx)
("texinfo" ,texinfo)
("which" ,which))
'())
,@(match (let ((arch (platform-linux-architecture ,@(match (let ((arch (platform-linux-architecture
(lookup-platform-by-target-or-system (lookup-platform-by-target-or-system
(or (%current-target-system) (or (%current-target-system)
@ -817,115 +965,14 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(configuration-file (configuration-file
arch arch
#:variant (version-major+minor version)))) #:variant (version-major+minor version))))
(#f ;no config for this platform (#f ;no config for this platform
'()) '())
((? string? config) ((? string? config)
`(("kconfig" ,config)))))) `(("kconfig" ,config))))))
(arguments
(list #:modules '((guix build gnu-build-system)
(guix build utils)
(srfi srfi-1)
(srfi srfi-26)
(ice-9 ftw)
(ice-9 match))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-/bin/pwd
(lambda _
(substitute* (find-files "." "^Makefile(\\.include)?$")
(("/bin/pwd") "pwd"))))
(replace 'configure
(lambda* (#:key inputs target #:allow-other-keys)
;; Avoid introducing timestamps.
(setenv "KCONFIG_NOTIMESTAMP" "1")
(setenv "KBUILD_BUILD_TIMESTAMP"
(getenv "SOURCE_DATE_EPOCH"))
;; Other variables useful for reproducibility.
(setenv "KBUILD_BUILD_USER" "guix")
(setenv "KBUILD_BUILD_HOST" "guix")
;; Set ARCH and CROSS_COMPILE.
(let ((arch #$(platform-linux-architecture
(lookup-platform-by-target-or-system
(or (%current-target-system)
(%current-system))))))
(setenv "ARCH" arch)
(format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))
(when target
(setenv "CROSS_COMPILE" (string-append target "-"))
(format #t "`CROSS_COMPILE' set to `~a'~%"
(getenv "CROSS_COMPILE"))))
(setenv "EXTRAVERSION"
#$(and extra-version
(string-append "-" extra-version)))
(let ((config (assoc-ref inputs "kconfig")))
;; Use a custom kernel configuration file or a default
;; configuration file.
(if config
(begin
(copy-file config ".config")
(chmod ".config" #o666))
(invoke "make" #$defconfig))
;; Appending works even when the option wasn't in the
;; file. The last one prevails if duplicated.
(let ((port (open-file ".config" "a"))
(extra-configuration #$(config->string extra-options)))
(display extra-configuration port)
(close-port port))
(invoke "make" "oldconfig"))))
(replace 'install
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(let ((moddir (string-append #$output "/lib/modules"))
(dtbdir (string-append #$output "/lib/dtbs")))
;; Install kernel image, kernel configuration and link map.
(for-each (lambda (file) (install-file file #$output))
(find-files "." "^(\\.config|bzImage|zImage|Image|vmlinuz|System\\.map|Module\\.symvers)$"))
;; Install device tree files
(unless (null? (find-files "." "\\.dtb$"))
(mkdir-p dtbdir)
(invoke "make" (string-append "INSTALL_DTBS_PATH=" dtbdir)
"dtbs_install"))
;; Install kernel modules
(mkdir-p moddir)
(invoke "make"
;; Disable depmod because the Guix system's
;; module directory is an union of potentially
;; multiple packages. It is not possible to use
;; depmod to usefully calculate a dependency
;; graph while building only one of them.
"DEPMOD=true"
(string-append "MODULE_DIR=" moddir)
(string-append "INSTALL_PATH=" #$output)
(string-append "INSTALL_MOD_PATH=" #$output)
"INSTALL_MOD_STRIP=1"
"modules_install")
(let* ((versions (filter (lambda (name)
(not (string-prefix? "." name)))
(scandir moddir)))
(version (match versions
((x) x))))
;; There are symlinks to the build and source directory.
;; Both will point to target /tmp/guix-build* and thus
;; not be useful in a profile. Delete the symlinks.
(false-if-file-not-found
(delete-file
(string-append moddir "/" version "/build")))
(false-if-file-not-found
(delete-file
(string-append moddir "/" version "/source"))))))))
#:tests? #f))
(home-page "https://www.gnu.org/software/linux-libre/") (home-page "https://www.gnu.org/software/linux-libre/")
(synopsis "100% free redistribution of a cleaned Linux kernel") (synopsis "100% free redistribution of a cleaned Linux kernel")
(description (description "GNU Linux-Libre is a free (as in freedom) variant of the
"GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. Linux kernel. It has been modified to remove all non-free binary blobs.")
It has been modified to remove all non-free binary blobs.")
(license license:gpl2) (license license:gpl2)
(properties '((max-silent-time . 3600))))) ;don't timeout on blob scan. (properties '((max-silent-time . 3600))))) ;don't timeout on blob scan.
@ -5555,7 +5602,7 @@ and copy/paste text in the console and in xterm.")
(define-public btrfs-progs (define-public btrfs-progs
(package (package
(name "btrfs-progs") (name "btrfs-progs")
(version "5.18.1") (version "6.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/kernel/" (uri (string-append "mirror://kernel.org/linux/kernel/"
@ -5563,7 +5610,7 @@ and copy/paste text in the console and in xterm.")
"btrfs-progs-v" version ".tar.xz")) "btrfs-progs-v" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0mbj3j2fpjds9i9gm8kk8a20yjacc562ibd1v9a96bpmrxfag63f")))) "0j0w400fg0lbzljmcwq553cv0awixc4k35v7l39jl7l13pznycdm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"static")) ; static versions of the binaries in "out" "static")) ; static versions of the binaries in "out"
@ -8456,7 +8503,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC
(define-public xfsprogs (define-public xfsprogs
(package (package
(name "xfsprogs") (name "xfsprogs")
(version "5.14.2") (version "6.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -8464,7 +8511,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC
"xfsprogs-" version ".tar.gz")) "xfsprogs-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0368dacdjq55ip38yizs9spdyl7b0b1c0vz3gr1gvcb9rw3a6dnp")))) "14hc61nfc73nqwhyasc4haj5g7046im1dwz61bx338f86mjj5n5y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs (list "out" "python")) (outputs (list "out" "python"))
(arguments (arguments
@ -8503,6 +8550,20 @@ file systems.")
;; licensed under lgpl2.1. the other stuff is licensed under gpl2. ;; licensed under lgpl2.1. the other stuff is licensed under gpl2.
(license (list license:gpl2 license:lgpl2.1)))) (license (list license:gpl2 license:lgpl2.1))))
(define-public xfsprogs-5.9
(package
(inherit xfsprogs)
(name "xfsprogs")
(version "5.9.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kernel.org/linux/utils/fs/xfs/xfsprogs/"
"xfsprogs-" version ".tar.gz"))
(sha256
(base32
"13xkn9jpmwp4fm9r68vhgznkmxhnv83n2b39mhy2qdaph90w2a1l"))))))
(define-public xfsprogs/static (define-public xfsprogs/static
(package (package
(inherit xfsprogs) (inherit xfsprogs)

View File

@ -94,6 +94,90 @@ consists of: @code{test}, @code{is}, @code{signals}, @code{finishes},
(define-public ecl-2am (define-public ecl-2am
(sbcl-package->ecl-package sbcl-2am)) (sbcl-package->ecl-package sbcl-2am))
(define-public sbcl-assertion-error
(let ((commit "8eab692a990d4caa193a46bae99af3e13e717b86")
(revision "1"))
(package
(name "sbcl-assertion-error")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/noloop/assertion-error")
(commit commit)))
(file-name (git-file-name "assertion-error" version))
(sha256
(base32 "0ix23kkakmf4nwx852zsssb831jvajr3qyppqfyks7y1ls617svn"))))
(build-system asdf-build-system/sbcl)
(inputs (list sbcl-dissect))
(home-page "https://github.com/noloop/assertion-error")
(synopsis "Error pattern for assertion libraries in Common Lisp")
(description "This package provides a Common Lisp assertion system with
minimal dependencies on DISSECT.")
(license license:gpl3))))
(define-public ecl-assertion-error
(sbcl-package->ecl-package sbcl-assertion-error))
(define-public cl-assertion-error
(sbcl-package->cl-source-package sbcl-assertion-error))
(define-public sbcl-assert-p
(package
(name "sbcl-assert-p")
(version "1.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/noloop/assert-p")
(commit (string-append "v" version))))
(file-name (git-file-name "assert-p" version))
(sha256
(base32 "1x24rkqkqiw8zd26swi9rmhfplkmr5scz3bhjwccah9d2s36b1xs"))))
(build-system asdf-build-system/sbcl)
(inputs (list sbcl-assertion-error sbcl-simplet))
(home-page "https://github.com/noloop/assert-p")
(synopsis "Common Lisp assertion library")
(description "This package provides a Common Lisp collection of assertions.")
(license license:gpl3)))
(define-public ecl-assert-p
(sbcl-package->ecl-package sbcl-assert-p))
(define-public cl-assert-p
(sbcl-package->cl-source-package sbcl-assert-p))
(define-public sbcl-cacau
(package
(name "sbcl-cacau")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/noloop/cacau")
(commit (string-append "v" version))))
(file-name (git-file-name "cacau" version))
(sha256
(base32 "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"))))
(build-system asdf-build-system/sbcl)
(native-inputs (list sbcl-assert-p))
(inputs (list sbcl-assertion-error sbcl-eventbus))
(home-page "https://github.com/noloop/cacau")
(synopsis "Comon Lisp test runner")
(description
"This package provides a Common Lisp testing framework system CACAU which was
built to be independent of assertions systems.")
(license license:gpl3)))
(define-public ecl-cacau
(sbcl-package->ecl-package sbcl-cacau))
(define-public cl-cacau
(sbcl-package->cl-source-package sbcl-cacau))
(define-public sbcl-check-it (define-public sbcl-check-it
(let ((commit "b79c9103665be3976915b56b570038f03486e62f")) (let ((commit "b79c9103665be3976915b56b570038f03486e62f"))
(package (package
@ -634,11 +718,11 @@ by Chris Riesbeck.")
(sbcl-package->cl-source-package sbcl-nst)) (sbcl-package->cl-source-package sbcl-nst))
(define-public sbcl-parachute (define-public sbcl-parachute
(let ((commit "86563473dc23fb1277d35a3ad2c911a6c8e5b0da") (let ((commit "8bc3e1b5a1808341967aeb89516f9fab23cd1d9e")
(revision "1")) (revision "0"))
(package (package
(name "sbcl-parachute") (name "sbcl-parachute")
(version (git-version "1.1.1" revision commit)) (version (git-version "1.5.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -646,13 +730,14 @@ by Chris Riesbeck.")
(git-reference (git-reference
(url "https://github.com/Shinmera/parachute") (url "https://github.com/Shinmera/parachute")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name "cl-parachute" version))
(sha256 (sha256
(base32 (base32 "0cppp1sp9xqkgxgkwidhqzlsj03ywnar7z9mzwcliww8y0kv5555"))))
"026crl465xqh3fnskfd4c1sxa9c33dfy702cf3l5apbjyj1dg20n"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
(list sbcl-documentation-utils sbcl-form-fiddle)) (list sbcl-documentation-utils
sbcl-form-fiddle
sbcl-trivial-custom-debugger))
(synopsis "Extensible and cross-compatible testing framework for Common Lisp") (synopsis "Extensible and cross-compatible testing framework for Common Lisp")
(description (description
"Parachute is a simple-to-use and extensible testing framework. "Parachute is a simple-to-use and extensible testing framework.
@ -840,6 +925,32 @@ take.")
(define-public ecl-should-test (define-public ecl-should-test
(sbcl-package->ecl-package sbcl-should-test)) (sbcl-package->ecl-package sbcl-should-test))
(define-public sbcl-simplet
(package
(name "sbcl-simplet")
(version "1.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/noloop/simplet")
(commit (string-append "v" version))))
(file-name (git-file-name "simplet" version))
(sha256
(base32 "1iwp3a43mns885k2arr7gbmyv5rsrjfvgarxickj7r2bfgwp1cnn"))))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/noloop/simplet")
(synopsis "Simple test runner in Common Lisp")
(description "This package provides a Common Lisp test runner system
SIMPLET.")
(license license:gpl3)))
(define-public ecl-simplet
(sbcl-package->ecl-package sbcl-simplet))
(define-public cl-simplet
(sbcl-package->cl-source-package sbcl-simplet))
(define-public sbcl-stefil (define-public sbcl-stefil
(let ((commit "0398548ec95dceb50fc2c2c03e5fb0ce49b86c7a") (let ((commit "0398548ec95dceb50fc2c2c03e5fb0ce49b86c7a")
(revision "0")) (revision "0"))

View File

@ -490,6 +490,39 @@ interface to the Linux inotify API.")
(define-public ecl-cl-inotify (define-public ecl-cl-inotify
(sbcl-package->ecl-package sbcl-cl-inotify)) (sbcl-package->ecl-package sbcl-cl-inotify))
(define-public sbcl-file-notify
(let ((commit "f12dc2f2aae5fee13355cd93a8cae0c4c412b76d")
(revision "0"))
(package
(name "sbcl-file-notify")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/file-notify")
(commit commit)))
(file-name (git-file-name "cl-file-notify" version))
(sha256
(base32 "0788d98rqm1krl8nbfh8qshvyf6g336i9bqrdhkx06cfvbh0wcny"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-cffi
sbcl-documentation-utils
sbcl-trivial-features))
(home-page "https://github.com/Shinmera/file-notify")
(synopsis "Get notifications for file accesses and changes")
(description
"File-Notify is a Common Lisp library for getting notifications for file
accesses and changes.")
(license license:zlib))))
(define-public cl-file-notify
(sbcl-package->cl-source-package sbcl-file-notify))
(define-public ecl-file-notify
(sbcl-package->ecl-package sbcl-file-notify))
(define-public sbcl-bodge-queue (define-public sbcl-bodge-queue
(let ((commit "948c9a501dcd412689952d09eb7453ec2722336a") (let ((commit "948c9a501dcd412689952d09eb7453ec2722336a")
(revision "0")) (revision "0"))
@ -708,6 +741,36 @@ or cl-launch for portable processing of command-line arguments.")
(define-public cl-command-line-arguments (define-public cl-command-line-arguments
(sbcl-package->cl-source-package sbcl-command-line-arguments)) (sbcl-package->cl-source-package sbcl-command-line-arguments))
(define-public sbcl-adopt
(package
(name "sbcl-adopt")
(version "1.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sjl/adopt")
(commit (string-append "v" version))))
(file-name (git-file-name "cl-adopt" version))
(sha256
(base32 "16kzkai96qk7vmclp8wxc9aghhnisw8gg9s7hra68300bgj86wzr"))))
(build-system asdf-build-system/sbcl)
(native-inputs (list sbcl-1am))
(inputs (list sbcl-bobbin sbcl-split-sequence))
(home-page "https://hg.stevelosh.com/adopt")
(synopsis "Common Lisp option parsing library")
(description
"@acronym{ADOPT, A Damn OPTion} is a simple UNIX-style option parser in
Common Lisp, heavily influenced by Python's @code{optparse} and
@code{argparse}.")
(license license:expat)))
(define-public ecl-adopt
(sbcl-package->ecl-package sbcl-adopt))
(define-public cl-adopt
(sbcl-package->cl-source-package sbcl-adopt))
(define-public sbcl-cl-irc (define-public sbcl-cl-irc
(let ((commit "963823537c7bfcda2edd4c44d172192da6722175") (let ((commit "963823537c7bfcda2edd4c44d172192da6722175")
(revision "0")) (revision "0"))
@ -1049,6 +1112,59 @@ compatible with ANSI-compliant Common Lisp implementations.")
(define-public ecl-cl-ppcre (define-public ecl-cl-ppcre
(sbcl-package->ecl-package sbcl-cl-ppcre)) (sbcl-package->ecl-package sbcl-cl-ppcre))
(define-public sbcl-one-more-re-nightmare
(let ((commit "09c33feed35797512bf123ccca053cf8ba42bfbd")
(revision "0"))
(package
(name "sbcl-one-more-re-nightmare")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/telekons/one-more-re-nightmare")
(commit commit)))
(file-name (git-file-name "cl-one-more-re-nightmare" version))
(sha256
(base32 "0vc0lxvn3anjb63hr26r1l18aw5nbj80w9ja3a32fip6nbwfsrfv"))))
(build-system asdf-build-system/sbcl)
(arguments
'(#:asd-test-systems '("one-more-re-nightmare-tests")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda _
(substitute* "Tests/one-more-re-nightmare-tests.asd"
((":depends-on")
(string-append
":perform (test-op (o c) (symbol-call :one-more-re-nightmare-tests '#:run-tests))"
"\n :depends-on"))))))))
(native-inputs
(list sbcl-lparallel sbcl-parachute))
(inputs
(list sbcl-alexandria
sbcl-babel
sbcl-bordeaux-threads
sbcl-dynamic-mixins
sbcl-esrap
sbcl-stealth-mixin
sbcl-trivia
sbcl-trivial-indent))
(home-page "https://github.com/telekons/one-more-re-nightmare")
(synopsis "Regular expression compiler in Common Lisp")
(description "@code{one-more-re-nightmare} is a regular expression engine
that uses the technique presented in Regular-expression derivatives
re-examined (Owens, Reppy and Turon, 2009;
@url{doi:10.1017/S0956796808007090}) to interpret and compile regular
expressions.")
(license license:bsd-2))))
(define-public cl-one-more-re-nightmare
(sbcl-package->cl-source-package sbcl-one-more-re-nightmare))
(define-public ecl-one-more-re-nightmare
(sbcl-package->ecl-package sbcl-one-more-re-nightmare))
(define-public sbcl-parse (define-public sbcl-parse
(let ((commit "2351ee78acac065fcf10b8713d3f404e2e910786") (let ((commit "2351ee78acac065fcf10b8713d3f404e2e910786")
(revision "1")) (revision "1"))
@ -2971,6 +3087,89 @@ pretty, documentation is code.")
(define-public ecl-mgl-pax (define-public ecl-mgl-pax
(sbcl-package->ecl-package sbcl-mgl-pax)) (sbcl-package->ecl-package sbcl-mgl-pax))
(define-public sbcl-40ants-doc
(let ((commit "7725ff67a380e9ebfc6155e14d91e650f256711b")
(revision "0"))
(package
(name "sbcl-40ants-doc")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/40ants/doc")
(commit commit)))
(sha256
(base32 "1v6gnhrk02vsixmprzk4wvvj7vh11vp5waxyih0qz2ih8d38r5pg"))
(file-name (git-file-name "cl-40ants-doc" version))))
(build-system asdf-build-system/sbcl)
(arguments
;; TODO: Add remaining dependencies of 40ants-doc-full and
;; 40ants-doc-test missing from Guix.
'(#:asd-systems '("40ants-doc"
;;"40ants-doc-full"
)
#:tests? #f))
;;(native-inputs
;; (list sbcl-rove))
(inputs
(list sbcl-named-readtables
sbcl-pythonic-string-reader
;; For 40ants-doc-full:
;;sbcl-3bmd
;;sbcl-alexandria
;;sbcl-babel
;;sbcl-cl-cookie
;;sbcl-cl-fad
;;sbcl-cl-ppcre
;;sbcl-common-doc ; Missing from Guix
;;sbcl-common-html ; Missing from Guix
;;sbcl-commondoc-markdown ; Missing from Guix
;;sbcl-dexador
;;sbcl-docs-builder ; Missing from Guix
;;sbcl-fare-utils
;;sbcl-jonathan
;;sbcl-lass
;;sbcl-local-time
;;sbcl-log4cl
;;sbcl-slime-swank
;;sbcl-slynk
;;sbcl-spinneret
;;sbcl-stem ; Missing from Guix; also, license is unconfirmed
;;sbcl-str
;;sbcl-tmpdir ; Missing from Guix
;;sbcl-trivial-extract ; Missing from Guix
;;sbcl-xml-emitter
))
(home-page "https://40ants.com/doc/")
(synopsis "Exploratory programming environment and documentation generator")
(description
"@code{40ants-doc} provides a rudimentary explorable programming
environment. The narrative primarily lives in so-called sections that mix
Markdown docstrings with references to functions, variables, etc., all of
which should probably have their own docstrings.
The primary focus is on making code easily explorable by using SLIME's
@kbd{M-.} (@code{slime-edit-definition}). Generating documentation in
Markdown or HTML format from sections and all the referenced items is also
implemented.
With the simplistic tools provided, one may obtain results similar to literate
programming, but documentation is generated from code, not the other way
around, and there is no support for chunking. Code comes first, code must
look pretty, documentation is code.
@code{40ants-doc} is a fork of MGL-PAX with fewer dependencies (only
@code{named-readtables} and @code{pythonic-string-reader}) for the core
system, and additional features in the full system.")
(license license:expat))))
(define-public cl-40ants-doc
(sbcl-package->cl-source-package sbcl-40ants-doc))
(define-public ecl-40ants-doc
(sbcl-package->ecl-package sbcl-40ants-doc))
(define-public sbcl-mssql (define-public sbcl-mssql
(let ((commit "045602a19a32254108f2b75871049293f49731eb") (let ((commit "045602a19a32254108f2b75871049293f49731eb")
(revision "1")) (revision "1"))
@ -7600,8 +7799,8 @@ extension-points via the concept of hooks.")
(define-public sbcl-s-sysdeps (define-public sbcl-s-sysdeps
;; No release since 2013. ;; No release since 2013.
(let ((commit "9aa23bbdceb24bcdbe0e7c39fa1901858f823106") (let ((commit "7f8de283b7fbd8b038fdf08493063a736db36ce7")
(revision "2")) (revision "3"))
(package (package
(name "sbcl-s-sysdeps") (name "sbcl-s-sysdeps")
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
@ -7616,7 +7815,7 @@ extension-points via the concept of hooks.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1fh8r7kf8s3hvqdg6b71b8p7w3v2kkga9bw8j3qqdxhzr6anpm0b")))) "0rp81iq0rgl48qdwbmfy89glga81hmry2lp8adjbr5h5ybr92b4n"))))
(inputs (inputs
(list sbcl-bordeaux-threads sbcl-usocket)) (list sbcl-bordeaux-threads sbcl-usocket))
(synopsis "Common Lisp abstraction layer over platform dependent functionality") (synopsis "Common Lisp abstraction layer over platform dependent functionality")
@ -7641,8 +7840,8 @@ number of other projects.
(sbcl-package->ecl-package sbcl-s-sysdeps)) (sbcl-package->ecl-package sbcl-s-sysdeps))
(define-public sbcl-cl-prevalence (define-public sbcl-cl-prevalence
(let ((commit "5a76be036092ed6c18cb695a9e03bce87e21b840") (let ((commit "e6b27640ce89ae5f8af38beb740e319bb6cd2368")
(revision "4")) (revision "6"))
(package (package
(name "sbcl-cl-prevalence") (name "sbcl-cl-prevalence")
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
@ -7657,11 +7856,11 @@ number of other projects.
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"050h6hwv8f16b5v6fzba8zmih92hgaaq27i2x9wv1iib41gbia3r")))) "1lb957ivshgp56phqhvhsmnc4r55x5shvi3mpsan2xsm4hvqspp0"))))
(inputs (inputs
(list sbcl-s-sysdeps sbcl-s-xml)) (list sbcl-moptilities sbcl-s-sysdeps sbcl-s-xml))
(native-inputs (native-inputs
(list sbcl-fiveam)) (list sbcl-fiveam sbcl-find-port))
(synopsis "Implementation of object prevalence for Common Lisp") (synopsis "Implementation of object prevalence for Common Lisp")
(description "This Common Lisp library implements object prevalence (see (description "This Common Lisp library implements object prevalence (see
@url{https://en.wikipedia.org/wiki/System_prevalence}). It allows @url{https://en.wikipedia.org/wiki/System_prevalence}). It allows
@ -8820,8 +9019,8 @@ macro. This library provides a set of simple utilities to help with that.")
(sbcl-package->ecl-package sbcl-form-fiddle)) (sbcl-package->ecl-package sbcl-form-fiddle))
(define-public sbcl-array-utils (define-public sbcl-array-utils
(let ((commit "f90eb9070d0b2205af51126a35033574725e5c56") (let ((commit "40cea8fc895add87d1dba9232da817750222b528")
(revision "0")) (revision "1"))
(package (package
(name "sbcl-array-utils") (name "sbcl-array-utils")
(version (git-version "1.1.1" revision commit)) (version (git-version "1.1.1" revision commit))
@ -8832,10 +9031,9 @@ macro. This library provides a set of simple utilities to help with that.")
(git-reference (git-reference
(url "https://github.com/Shinmera/array-utils") (url "https://github.com/Shinmera/array-utils")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name "cl-array-utils" version))
(sha256 (sha256
(base32 (base32 "0d7nddak8h2aa82z11vdbd97srk5bdgq41pzmibsz3ymspnndicd"))))
"0zhwfbpr53vs1ii4sx75dz2k9yhh1xpwdqqpg8nmfndxkmhpbi3x"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
(list sbcl-parachute)) (list sbcl-parachute))
@ -8889,8 +9087,8 @@ LASS files.")
(sbcl-package->ecl-package sbcl-lass)) (sbcl-package->ecl-package sbcl-lass))
(define-public sbcl-plump (define-public sbcl-plump
(let ((commit "3584275f0be9d06c0c51b5c08f89005deafc4ada") (let ((commit "0c3e0b57b43b6e0c5794b6a902f1cf5bee2a2927")
(revision "2")) (revision "3"))
(package (package
(name "sbcl-plump") (name "sbcl-plump")
(version (git-version "2.0.0" revision commit)) (version (git-version "2.0.0" revision commit))
@ -8901,10 +9099,9 @@ LASS files.")
(git-reference (git-reference
(url "https://github.com/Shinmera/plump") (url "https://github.com/Shinmera/plump")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name "cl-plump" version))
(sha256 (sha256
(base32 (base32 "1fyb66pqvr1iy31ah9638ihs8cax17zkxk0zq14jy7x5l9rq1qlf"))))
"1w4wz7f6dc2ckdq9wq9r5014bg2nxjifj9yz1zzn41r8h1h5xfcd"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
(list sbcl-array-utils sbcl-documentation-utils)) (list sbcl-array-utils sbcl-documentation-utils))
@ -9362,6 +9559,103 @@ archives such as those generated by the tar and cpio programs on Unix.")
(define-public ecl-archive (define-public ecl-archive
(sbcl-package->ecl-package sbcl-archive)) (sbcl-package->ecl-package sbcl-archive))
(define-public sbcl-tar-file
(let ((commit "0c10bc82f14702c97a26dc25ce075b5d3a2347d1")
(revision "0"))
(package
(name "sbcl-tar-file")
(version (git-version "0.2.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.common-lisp.net/cl-tar/cl-tar-file")
(commit commit)))
(file-name (git-file-name "cl-tar-file" version))
(sha256
(base32 "0i8j05fkgdqy4c4pqj0c68sh4s3klpx9kc5wp73qwzrl3xqd2svy"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-parachute))
(inputs
(list sbcl-40ants-doc
sbcl-alexandria
sbcl-babel
sbcl-chipz
sbcl-flexi-streams
sbcl-salza2
sbcl-trivial-gray-streams))
(home-page "https://gitlab.common-lisp.net/cl-tar/cl-tar-file")
(synopsis "Read and write physical entries to and from tar files")
(description
"@code{cl-tar-file} is a Common Lisp library that allows reading from
and writing to various tar archive formats. Currently supported are the POSIX
ustar, PAX (ustar with a few new entry types), GNU, and v7 (very old) formats.
This library is rather low level and is focused exclusively on reading and
writing physical tar file entries using streams. Therefore, it contains no
functionality for automatically building archives from a set of files on the
filesystem or writing the contents of a file to the filesystem. Additionally,
there are no smarts that read multiple physical entries and combine them into
a single logical entry (e.g., with PAX extended headers or GNU long link/path
name support). For a higher-level library that reads and writes logical
entries, and also includes filesystem integration, see @code{cl-tar}.")
(license license:bsd-3))))
(define-public cl-tar-file
(sbcl-package->cl-source-package sbcl-tar-file))
(define-public ecl-tar-file
(sbcl-package->ecl-package sbcl-tar-file))
(define-public sbcl-tar
(let ((commit "7c6e07a10c93d9e311f087b5f6328cddd481669a")
(revision "0"))
(package
(name "sbcl-tar")
(version (git-version "0.2.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.common-lisp.net/cl-tar/cl-tar")
(commit commit)))
(file-name (git-file-name "cl-tar" version))
(sha256
(base32 "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"))))
(build-system asdf-build-system/sbcl)
;; TODO: Build the tar program with 'build-program' when the
;; 'asdf-release-ops' library is added to Guix.
(arguments
'(#:asd-systems '("tar"
"tar/common-extract"
"tar/create"
"tar/docs"
"tar/extract"
"tar/simple-extract")))
(native-inputs
(list sbcl-parachute))
(inputs
(list sbcl-40ants-doc
sbcl-alexandria
sbcl-babel
sbcl-local-time
sbcl-osicat
sbcl-split-sequence
sbcl-tar-file))
(home-page "https://gitlab.common-lisp.net/cl-tar/cl-tar")
(synopsis "High-level interface for tar files")
(description
"@code{cl-tar} is a Common Lisp library providing a high-level interface
for interacting with tar archives.")
(license license:expat))))
(define-public cl-tar
(sbcl-package->cl-source-package sbcl-tar))
(define-public ecl-tar
(sbcl-package->ecl-package sbcl-tar))
(define-public sbcl-misc-extensions (define-public sbcl-misc-extensions
(let ((commit "101c05112bf2f1e1bbf527396822d2f50ca6327a") (let ((commit "101c05112bf2f1e1bbf527396822d2f50ca6327a")
(revision "1")) (revision "1"))
@ -12800,6 +13094,44 @@ than a few Kb.")
(define-public ecl-mmap (define-public ecl-mmap
(sbcl-package->ecl-package sbcl-mmap)) (sbcl-package->ecl-package sbcl-mmap))
(define-public sbcl-marray
(let ((commit "0352f316b6830f0b119088ba9be836e4726bd7d8")
(revision "0"))
(package
(name "sbcl-marray")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/death/marray")
(commit commit)))
(file-name (git-file-name "cl-marray" version))
(sha256
(base32 "0l4kvzpiw14vqhlsaflp3c7y51vznjjgbdi0q3axqk1wxvzy1zlx"))))
(build-system asdf-build-system/sbcl)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-dependencies
(lambda _
(substitute* "marray.asd"
((":components")
":depends-on (#+sbcl \"sb-posix\")\n :components")))))))
(home-page "https://github.com/death/marray")
(synopsis "Memory-mapped files as Common Lisp arrays")
(description
"MARRAY is a library which provides access to memory-mapped files
through Common Lisp arrays.")
(license license:expat))))
(define-public cl-marray
(sbcl-package->cl-source-package sbcl-marray))
;; ECL support not implemented yet.
;; (define-public ecl-marray
;; (sbcl-package->ecl-package sbcl-marray))
(define-public sbcl-3bz (define-public sbcl-3bz
(let ((commit "569614c40408f3aefc77ba233e0e4bd66d3850ad") (let ((commit "569614c40408f3aefc77ba233e0e4bd66d3850ad")
(revision "1")) (revision "1"))
@ -13971,6 +14303,39 @@ directly.")
(define-public ecl-custom-hash-table (define-public ecl-custom-hash-table
(sbcl-package->ecl-package sbcl-custom-hash-table)) (sbcl-package->ecl-package sbcl-custom-hash-table))
(define-public sbcl-concurrent-hash-tables
(let ((commit "1b9f0b5da54fece4f42296e1bdacfcec0c370a5a")
(revision "0"))
(package
(name "sbcl-concurrent-hash-tables")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/no-defun-allowed/concurrent-hash-tables")
(commit commit)))
(file-name (git-file-name "cl-concurrent-hash-tables" version))
(sha256
(base32 "03g24ycr1ngzg8bv10iwp1bmnldz5bxbfdqrzhfxhicpibh49r96"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-atomics sbcl-bordeaux-threads))
(home-page "https://github.com/no-defun-allowed/concurrent-hash-tables")
(synopsis "Portability library for concurrent hash tables in Common Lisp")
(description "@code{concurrent-hash-tables} is a Common Lisp portability
library wrapping some implementations of concurrent hash tables which do not
have to be entirely locked in their operation, including
@code{42nd-at-threadmill}, @code{luckless}, and a fallback, segmented hash
table.")
(license license:bsd-2))))
(define-public cl-concurrent-hash-tables
(sbcl-package->cl-source-package sbcl-concurrent-hash-tables))
(define-public ecl-concurrent-hash-tables
(sbcl-package->ecl-package sbcl-concurrent-hash-tables))
(define-public sbcl-collectors (define-public sbcl-collectors
(let ((commit "13acef25d8422d1d82e067b1861e513587c166ee")) (let ((commit "13acef25d8422d1d82e067b1861e513587c166ee"))
(package (package
@ -14272,6 +14637,34 @@ with a complex event filtering system.")
(define-public ecl-deeds (define-public ecl-deeds
(sbcl-package->ecl-package sbcl-deeds)) (sbcl-package->ecl-package sbcl-deeds))
(define-public sbcl-eventbus
(let ((commit "92c1fa3846ba0e3cc9e6d7605d765379c8658d84")
(revision "1"))
(package
(name "sbcl-eventbus")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/noloop/eventbus")
(commit commit)))
(file-name (git-file-name "eventbus" version))
(sha256
(base32 "0slqx3zq6sbz3rg4g79j8y25sx4405y6ff3x6l5v8v4v42m1s0p2"))))
(build-system asdf-build-system/sbcl)
(native-inputs (list sbcl-simplet))
(home-page "https://github.com/noloop/eventbus")
(synopsis "Event bus implementation in Common Lisp")
(description "This package provides a Common Lisp system implementing event bus.")
(license license:gpl3))))
(define-public ecl-eventbus
(sbcl-package->ecl-package sbcl-eventbus))
(define-public cl-eventbus
(sbcl-package->cl-source-package sbcl-eventbus))
(define-public sbcl-make-hash (define-public sbcl-make-hash
;; no tagged branch ;; no tagged branch
(let ((revision "1") (let ((revision "1")
@ -15014,6 +15407,80 @@ even by adding additional statistical @code{compute}ations.")
(define-public ecl-trivial-benchmark (define-public ecl-trivial-benchmark
(sbcl-package->ecl-package sbcl-trivial-benchmark)) (sbcl-package->ecl-package sbcl-trivial-benchmark))
(define-public sbcl-the-cost-of-nothing
(let ((commit "f364029fbbf37ae5786f2f9ddf6185dd204a7185")
(revision "0"))
(package
(name "sbcl-the-cost-of-nothing")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/marcoheisig/the-cost-of-nothing")
(commit commit)))
(file-name (git-file-name "cl-the-cost-of-nothing" version))
(sha256
(base32 "1ccrglyr1wnnfp218w1qj7yfl4yzlxkki3hqaifi5axgbi5dmmh8"))))
(build-system asdf-build-system/sbcl)
(arguments
;; The test operation benchmarks the Common Lisp implementation; it
;; doesn't test the package.
(list #:tests? #f))
(inputs
(list sbcl-alexandria
sbcl-closer-mop
sbcl-local-time
sbcl-trivial-garbage))
(home-page "https://github.com/marcoheisig/the-cost-of-nothing")
(synopsis "Measure the run time of Common Lisp code")
(description
"THE-COST-OF-NOTHING is a library for measuring the run time of Common
Lisp code. It provides macros and functions for accurate benchmarking and
lightweight monitoring. Furthermore, it provides predefined benchmarks to
determine the cost of certain actions on a given platform and implementation.")
(license license:expat))))
(define-public cl-the-cost-of-nothing
(sbcl-package->cl-source-package sbcl-the-cost-of-nothing))
(define-public ecl-the-cost-of-nothing
(sbcl-package->ecl-package sbcl-the-cost-of-nothing))
(define-public sbcl-atomichron
(let ((commit "5b3578bbad8c37ab559e56924d98c373efe11de5")
(revision "0"))
(package
(name "sbcl-atomichron")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/no-defun-allowed/atomichron")
(commit commit)))
(file-name (git-file-name "cl-atomichron" version))
(sha256
(base32 "1fmmhb3pbv7j4d1cc02zv24bpd0kd2agfjjcj46w3gmv1bb0hva1"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-atomics sbcl-bordeaux-threads))
(home-page "https://github.com/no-defun-allowed/atomichron")
(synopsis "Atomic metering library for Common Lisp")
(description
"@code{atomichron} is a Common Lisp library which implements a time
meter which tracks how many times a form is evaluated, and how long evaluation
takes. It uses atomic instructions so that meters will present correct
results in the presence of multiple threads, while trying to minimize
synchronization latency.")
(license license:bsd-2))))
(define-public cl-atomichron
(sbcl-package->cl-source-package sbcl-atomichron))
(define-public ecl-atomichron
(sbcl-package->ecl-package sbcl-atomichron))
(define-public sbcl-glyphs (define-public sbcl-glyphs
(let ((commit "1ff5714e8c1dca327bc604dfe3e3d1f4b7755373")) (let ((commit "1ff5714e8c1dca327bc604dfe3e3d1f4b7755373"))
(package (package
@ -16499,6 +16966,35 @@ return the CPU count of the current system.")
(define-public cl-cpus (define-public cl-cpus
(sbcl-package->cl-source-package sbcl-cl-cpus)) (sbcl-package->cl-source-package sbcl-cl-cpus))
(define-public sbcl-system-load
(let ((commit "3ff1a40be55866cc5316ac7a530d872b12510294")
(revision "0"))
(package
(name "sbcl-system-load")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shinmera/system-load")
(commit commit)))
(file-name (git-file-name "cl-system-load" version))
(sha256
(base32 "08d8kr8j5l2m8p69f47iklxhna394vx9mrys0sgplf5f2bqb7xcv"))))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/Shinmera/system-load")
(synopsis "Access system's CPU and memory usage from Common Lisp")
(description
"System-Load is a Common Lisp library for accessing the system's CPU and
memory usage.")
(license license:zlib))))
(define-public cl-system-load
(sbcl-package->cl-source-package sbcl-system-load))
(define-public ecl-system-load
(sbcl-package->ecl-package sbcl-system-load))
(define-public sbcl-fof (define-public sbcl-fof
(let ((commit "522879e7da110ecf2e841998b197b34062c54b29") (let ((commit "522879e7da110ecf2e841998b197b34062c54b29")
(revision "1")) (revision "1"))
@ -23666,6 +24162,38 @@ objects to be mixed and updated without manually defining many permutations.")
(define-public ecl-dynamic-mixins (define-public ecl-dynamic-mixins
(sbcl-package->ecl-package sbcl-dynamic-mixins)) (sbcl-package->ecl-package sbcl-dynamic-mixins))
(define-public sbcl-stealth-mixin
(let ((commit "2f853fcead554221d4be3b10522b502ea729e944")
(revision "0"))
(package
(name "sbcl-stealth-mixin")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/robert-strandh/Stealth-mixin")
(commit commit)))
(file-name (git-file-name "cl-stealth-mixin" version))
(sha256
(base32 "0ar9cdmbmdnqz1ywpw34n47hlh0vqmb6pl76f5vbfgip3c81xwyi"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-closer-mop))
(home-page "https://github.com/robert-strandh/Stealth-mixin")
(synopsis "Create stealth mixin classes")
(description
"Stealth-mixin is a Common Lisp library for creating stealth mixin
classes. These are classes that are dynamically mixed into other classes
without the latter being aware of it.")
(license license:bsd-2))))
(define-public cl-stealth-mixin
(sbcl-package->cl-source-package sbcl-stealth-mixin))
(define-public ecl-stealth-mixin
(sbcl-package->ecl-package sbcl-stealth-mixin))
(define-public sbcl-sealable-metaobjects (define-public sbcl-sealable-metaobjects
(let ((commit "e09ec97252e0844528f61abdc0c7ee256875f8ee")) (let ((commit "e09ec97252e0844528f61abdc0c7ee256875f8ee"))
(package (package
@ -24457,8 +24985,12 @@ between Lisp objects and some binary (i.e. octet-based) representation.")
(sha256 (sha256
(base32 "1iri5wsp9sc1f5q934cj87zd79r5dc8fda0gl7x1pz95v0wx28yk")))) (base32 "1iri5wsp9sc1f5q934cj87zd79r5dc8fda0gl7x1pz95v0wx28yk"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (arguments
(list sbcl-parachute)) '(;; FIXME: Tests disabled because of a circular dependency between
;; trivial-custom-debugger and parachute.
#:tests? #f))
;;(native-inputs
;; (list sbcl-parachute))
(home-page "https://github.com/phoe/trivial-custom-debugger/") (home-page "https://github.com/phoe/trivial-custom-debugger/")
(synopsis "Allow arbitrary functions as the standard Lisp debugger") (synopsis "Allow arbitrary functions as the standard Lisp debugger")
(description (description

View File

@ -563,11 +563,11 @@ output), and Binutils.")
(define %llvm-monorepo-hashes (define %llvm-monorepo-hashes
'(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx")
("15.0.4" . "0j5kx4s970qzcjr83kk6776zzjqfshl61x9fagqz8kjxcjbpg8cj"))) ("15.0.5" . "1z2szqlanksdmj91590wnxqav5z437mpasg00ghb610xkam2v34m")))
(define %llvm-patches (define %llvm-patches
'(("14.0.6" . ("clang-14.0-libc-search-path.patch")) '(("14.0.6" . ("clang-14.0-libc-search-path.patch"))
("15.0.4" . ("clang-15.0-libc-search-path.patch")))) ("15.0.5" . ("clang-15.0-libc-search-path.patch"))))
(define (llvm-monorepo version) (define (llvm-monorepo version)
(origin (origin
@ -583,7 +583,7 @@ output), and Binutils.")
(define-public llvm-15 (define-public llvm-15
(package (package
(name "llvm") (name "llvm")
(version "15.0.4") (version "15.0.5")
(source (llvm-monorepo version)) (source (llvm-monorepo version))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "opt-viewer")) (outputs '("out" "opt-viewer"))
@ -740,7 +740,7 @@ of programming tools as well as libraries with equivalent functionality.")
(package-version llvm-15))) (package-version llvm-15)))
(sha256 (sha256
(base32 (base32
"03adxlh84if9p53m6izjsql500rjza9rng8akab2pdqibgrg73rh"))))) "0sa6si9v7ddsa9vmg6s3918xx969rvck2v1a0g7hb0fp9jk9j4r1")))))
(define-public clang-14 (define-public clang-14
(clang-from-llvm (clang-from-llvm
@ -1522,7 +1522,7 @@ Library.")
(define-public lld-15 (define-public lld-15
(package (package
(name "lld") (name "lld")
(version "15.0.4") (version (package-version llvm-15))
(source (llvm-monorepo version)) (source (llvm-monorepo version))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
@ -1634,7 +1634,7 @@ misuse of libraries outside of the store.")))
(define-public lldb (define-public lldb
(package (package
(name "lldb") (name "lldb")
(version "14.0.6") (version (package-version llvm-15))
(source (llvm-monorepo version)) (source (llvm-monorepo version))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
@ -1648,8 +1648,8 @@ misuse of libraries outside of the store.")))
(native-inputs (native-inputs
(list pkg-config swig)) (list pkg-config swig))
(inputs (inputs
(list clang-14 (list clang-15
llvm-14 llvm-15
;; Optional (but recommended) inputs. ;; Optional (but recommended) inputs.
ncurses ncurses
libedit libedit
@ -1668,7 +1668,7 @@ which highly leverage existing libraries in the larger LLVM project.")
(define-public libcxx (define-public libcxx
(package (package
(name "libcxx") (name "libcxx")
(version "14.0.6") (version (package-version llvm-15))
(source (llvm-monorepo version)) (source (llvm-monorepo version))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments

View File

@ -3224,18 +3224,14 @@ Python.")
(define-public python-hmmlearn (define-public python-hmmlearn
(package (package
(name "python-hmmlearn") (name "python-hmmlearn")
(version "0.2.6") (version "0.2.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "hmmlearn" version)) (uri (pypi-uri "hmmlearn" version))
(sha256 (sha256
(base32 (base32
"1my0j3rzp17438idr32ssh0j969a98yjblx5igx5kgiiigr9qa1a")) "1qgnf1kdxicygy8nvpv866iqvwq0rc6xkd3s6slmvxvsy8h2fjvb"))))
(snippet
#~(begin
(use-modules ((guix build utils)))
(delete-file "lib/hmmlearn/_hmmc.c")))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -3247,7 +3243,11 @@ Python.")
(with-directory-excursion (string-append (assoc-ref outputs "out") "/lib") (with-directory-excursion (string-append (assoc-ref outputs "out") "/lib")
(invoke "python" "-m" "pytest")))))))) (invoke "python" "-m" "pytest"))))))))
(propagated-inputs (propagated-inputs
(list python-cython python-numpy python-scikit-learn python-scipy (list pybind11
python-cython
python-numpy
python-scikit-learn
python-scipy
python-setuptools-scm)) python-setuptools-scm))
(native-inputs (native-inputs
(list python-pytest)) (list python-pytest))

View File

@ -4557,7 +4557,7 @@ databases, and other tools to process Outlook email archives.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;no tests `(#:tests? #f ;no tests
#:make-flags `((string-append "CC=" ,(cc-for-target))) #:make-flags (list (string-append "CC=" ,(cc-for-target)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ;no configure script (delete 'configure) ;no configure script

View File

@ -1490,48 +1490,51 @@ used to bring up authentication dialogs.")
(native-inputs (list desktop-file-utils)) (native-inputs (list desktop-file-utils))
(inputs (inputs
;; TODO: Add more packages ;; TODO: Add more packages
`(("at-spi2-core" ,at-spi2-core) (append (if (or (%current-target-system)
("atril" ,atril) (supported-package? gnome-keyring))
("caja" ,caja) (list gnome-keyring)
("dbus" ,dbus) '())
("dconf" ,dconf) (list at-spi2-core
("engrampa" ,engrampa) atril
("eom" ,eom) caja
("font-abattis-cantarell" ,font-abattis-cantarell) dbus
("glib-networking" ,glib-networking) dconf
("gnome-keyring" ,gnome-keyring) engrampa
("gvfs" ,gvfs) eom
("hicolor-icon-theme" ,hicolor-icon-theme) font-abattis-cantarell
("libmatekbd" ,libmatekbd) glib-networking
("libmateweather" ,libmateweather) gvfs
("libmatemixer" ,libmatemixer) hicolor-icon-theme
("marco" ,marco) libmatekbd
("mate-session-manager" ,mate-session-manager) libmateweather
("mate-settings-daemon" ,mate-settings-daemon) libmatemixer
("mate-desktop" ,mate-desktop) marco
("mate-terminal" ,mate-terminal) mate-session-manager
("mate-themes" ,mate-themes) mate-settings-daemon
("mate-icon-theme" ,mate-icon-theme) mate-desktop
("mate-power-manager" ,mate-power-manager) mate-terminal
("mate-menu" ,mate-menus) mate-themes
("mate-panel" ,mate-panel) mate-icon-theme
("mate-control-center" ,mate-control-center) mate-power-manager
("mate-media" ,mate-media) mate-menus
("mate-applets" ,mate-applets) mate-panel
("mate-user-guide" ,mate-user-guide) mate-control-center
("mate-calc" ,mate-calc) mate-media
("mate-backgrounds" ,mate-backgrounds) mate-applets
("mate-netbook" ,mate-netbook) mate-user-guide
("mate-utils" ,mate-utils) mate-calc
("mate-polkit" ,mate-polkit) mate-backgrounds
("mate-system-monitor" ,mate-system-monitor) mate-netbook
("mate-utils" ,mate-utils) mate-utils
("pluma" ,pluma) mate-polkit
("pinentry-gnome3" ,pinentry-gnome3) mate-system-monitor
("pulseaudio" ,pulseaudio) mate-utils
("shared-mime-info" ,shared-mime-info) pluma
("yelp" ,yelp) pinentry-gnome3
("zenity" ,zenity))) pulseaudio
shared-mime-info
yelp
zenity)))
(propagated-inputs (propagated-inputs
;; Default font that applications such as IceCat require. ;; Default font that applications such as IceCat require.
(list font-dejavu)) (list font-dejavu))

View File

@ -55,6 +55,8 @@
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com> ;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2022 Marek Felšöci <marek@felsoci.sk> ;;; Copyright © 2022 Marek Felšöci <marek@felsoci.sk>
;;; Copyright © 2022 vicvbcun <guix@ikherbers.com> ;;; Copyright © 2022 vicvbcun <guix@ikherbers.com>
;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2022 Maximilian Heisinger <mail@maxheisinger.at>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -158,6 +160,7 @@
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
@ -894,20 +897,6 @@ large scale eigenvalue problems.")
(license (license:non-copyleft "file://COPYING" (license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution.")))) "See COPYING in the distribution."))))
(define-public arpack-ng-3.3.0
(package
(inherit arpack-ng)
(version "3.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference (url (package-home-page arpack-ng))
(commit version)))
(file-name (git-file-name (package-name arpack-ng) version))
(sha256
(base32
"00h6bjvxjq7bv0b8pwnc0gw33ns6brlqv00xx2rh3w9b5n205918"))))))
(define-public arpack-ng-openmpi (define-public arpack-ng-openmpi
(package (inherit arpack-ng) (package (inherit arpack-ng)
(name "arpack-ng-openmpi") (name "arpack-ng-openmpi")
@ -2556,7 +2545,7 @@ between aspif and smodels format or to a human-readable text format.")
(define-public clasp (define-public clasp
(package (package
(name "clasp") (name "clasp")
(version "3.3.6") (version "3.3.9")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2565,7 +2554,7 @@ between aspif and smodels format or to a human-readable text format.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0rahqiq530jckvx717858h1q5p8znp1kb6sjm95p8blkr4n3pvmj")))) "163ps9zq7xppqy9hj5qnw6z5lcjnm4xf5fwjsavpia5ynm3hngcw"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DCLASP_BUILD_TESTS=on" `(#:configure-flags '("-DCLASP_BUILD_TESTS=on"
@ -2761,7 +2750,7 @@ can solve two kinds of problems:
(define-public octave-cli (define-public octave-cli
(package (package
(name "octave-cli") (name "octave-cli")
(version "7.1.0") (version "7.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2769,7 +2758,7 @@ can solve two kinds of problems:
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0wv26nsfi6cq80np6p4av4wfrvbaflca6szajf6c60mbpdg63m1z")))) "0w81ncl9d4x1ay3ylsag87k20c0byiyjcmfd9kb7b7ylr71pivsa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
@ -2937,7 +2926,7 @@ Open CASCADE library.")
(define-public opencascade-occt (define-public opencascade-occt
(package (package
(name "opencascade-occt") (name "opencascade-occt")
(version "7.6.0") (version "7.6.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2949,7 +2938,7 @@ Open CASCADE library.")
version))))) version)))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1rcwm9fkx0j4wrsyikb6g7qd611kpry7dand5dzdjvs5vzd13zvd")) (base32 "07z5d83vm9f50an7vhimzl7gbmri1dn6p2g999l5fgyaj5sg5f02"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -4874,7 +4863,7 @@ Fresnel integrals, and similar related functions as well.")
(define-public suitesparse (define-public suitesparse
(package (package
(name "suitesparse") (name "suitesparse")
(version "5.12.0") (version "5.13.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4884,7 +4873,7 @@ Fresnel integrals, and similar related functions as well.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0zpl51pfpv7ap7z97jlryba2la1qdmzm11bhzkn55wlb03xzi6k6")) "1zwri246yr39p9ymjp18dzv36ch0dn107sf0jghj7capigasfxq2"))
(patches (search-patches "suitesparse-mongoose-cmake.patch")) (patches (search-patches "suitesparse-mongoose-cmake.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -6825,7 +6814,7 @@ assemble global function spaces on finite-element grids.")
"doc/dune-grid/grids/gridfactory/testgrids")) "doc/dune-grid/grids/gridfactory/testgrids"))
#t)) #t))
(add-after 'build 'build-tests (add-after 'build 'build-tests
(lambda* (#:key make-flags parallel-build? #:allow-other-keys) (lambda* (#:key inputs make-flags parallel-build? #:allow-other-keys)
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "dune-grid") "/share")) (string-append (assoc-ref inputs "dune-grid") "/share"))
(apply invoke "make" "build_tests" (apply invoke "make" "build_tests"
@ -7376,6 +7365,221 @@ back to C with improved data structures, better scheduling of inprocessing and
optimized algorithms and implementation.") optimized algorithms and implementation.")
(license license:expat))) (license license:expat)))
(define-public aiger
(package
(name "aiger")
(version "1.9.9")
(source (origin
(method url-fetch)
(uri (string-append "http://fmv.jku.at/aiger/aiger-"
version ".tar.gz"))
(sha256
(base32
"1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"))))
(outputs (list "out" "static"))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ; no check target
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "aiger.c"
(("\"(gzip|gunzip)" all cmd)
(string-append
"\""
(search-input-file inputs (string-append "bin/" cmd)))))))
(add-after 'unpack 'patch-build-files
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "makefile.in"
(("test -d .*") "true")
(("/usr/local") (assoc-ref outputs "out")))))
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
(apply invoke "./configure.sh" configure-flags)))
(add-after 'install 'install-static
(lambda* (#:key outputs #:allow-other-keys)
(apply invoke #$(ar-for-target) "rcs" "libaiger.a"
(find-files "." "\\.o$"))
(let* ((static (assoc-ref outputs "static"))
(lib (string-append static "/lib"))
(incl (string-append static "/include/aiger")))
(mkdir-p lib)
(mkdir-p incl)
(install-file "libaiger.a" lib)
(for-each (lambda (f) (install-file f incl))
(find-files "." "\\.h$"))))))))
(inputs (list gzip))
(home-page "http://fmv.jku.at/aiger")
(synopsis "Utilities for And-Inverter Graphs")
(description "AIGER is a format, library and set of utilities for
@acronym{AIG, And-Inverter Graphs}s. The focus is on conversion utilities and a
generic reader and writer API.")
(license (list license:expat
license:bsd-3)))) ; blif2aig
(define-public lingeling
(let ((commit "72d2b13eea5fbd95557a3d0d199cd98dfbdc76ee")
(revision "1"))
(package
(name "lingeling")
(version (git-version "sc2022" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/arminbiere/lingeling")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"16s30x8s2cw6icchwm65zj56ph4qwz6i07g3hwkknvajisvjq85c"))))
(build-system gnu-build-system)
(arguments
(list #:test-target "test"
#:modules `((ice-9 match)
,@%gnu-build-system-modules)
#:configure-flags #~(list "--aiger=.")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'unpack-aiger
(lambda* (#:key inputs #:allow-other-keys)
(invoke #$(ar-for-target) "x"
(search-input-file inputs "lib/libaiger.a")
"aiger.o")
(copy-file
(search-input-file inputs "include/aiger/aiger.h")
"aiger.h")))
(add-after 'unpack 'hard-code-commit
(lambda _
(substitute* "mkconfig.sh"
(("`\\./getgitid`") #$commit))))
(add-after 'unpack 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (list "treengeling.c" "lgldimacs.c")
(("\"(gunzip|xz|bzcat|7z)" all cmd)
(string-append
"\""
(search-input-file inputs (string-append "bin/" cmd)))))))
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
(apply invoke "./configure.sh" configure-flags)))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out")
"/bin")))
(mkdir-p bin)
(for-each
(lambda (file)
(install-file file bin))
'("blimc" "ilingeling" "lglddtrace" "lglmbt"
"lgluntrace" "lingeling" "plingeling"
"treengeling")))))
(add-after 'install 'wrap-path
(lambda* (#:key outputs #:allow-other-keys)
(with-directory-excursion (string-append
(assoc-ref outputs "out")
"/bin")
(for-each
(lambda (file)
(wrap-program
file
'("PATH" suffix
#$(map (lambda (input)
(file-append (this-package-input input) "/bin"))
'("gzip" "bzip2" "xz" "p7zip")))))
;; These programs use sprintf on buffers with magic
;; values to construct commands (yes, eww), so we
;; can't easily substitute* them.
'("lglddtrace" "lgluntrace" "lingeling" "plingeling"))))))))
(inputs (list `(,aiger "static") gzip bzip2 xz p7zip))
(home-page "http://fmv.jku.at/lingeling")
(synopsis "SAT solver")
(description "This package provides a range of SAT solvers, including
the sequential @command{lingeling} and its parallel variants
@command{plingeling} and @command{treengeling}. A bounded model checker is
also included.")
(license license:expat))))
(define-public louvain-community
(let ((commit "8cc5382d4844af127b1c1257373740d7e6b76f1e")
(revision "1"))
(package
(name "louvain-community")
(version (git-version "1.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/meelgroup/louvain-community")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1ss00hkdvr9bdkd355hxf8zd7xycb3nm8qpy7s75gjjf6yng0bfj"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f ; tests appear to require missing files
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'encode-git-hash
(lambda _
(substitute* "CMakeLists.txt"
(("GIT-hash-notfound") #$commit)))))))
(native-inputs (list python))
(home-page "https://github.com/meelgroup/louvain-communities")
(synopsis "Multi-criteria community detection")
(description "This package provides a C++ implementation of the Louvain
community detection algorithm.")
(license license:lgpl3+))))
(define-public cryptominisat
(package
(name "cryptominisat")
(version "5.11.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/msoos/cryptominisat")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1izjn44phjp9670s7bxrdx4p0r59idqwv3bm6sr0qnlqlha5z4zc"))))
(build-system cmake-build-system)
(arguments
(list
#:build-type "Release"
#:test-target "test"
#:configure-flags #~(list "-DENABLE_TESTING=ON" "-DSTATS=ON")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("add_subdirectory\\(utils/lingeling-ala\\)") ""))
;; Transitively included in vendored gtest.h. Fixed in
;; upstream:
;; https://github.com/msoos/cryptominisat/pull/686
(substitute* "tests/assump_test.cpp"
(("#include <vector>")
"#include <vector>\n#include <algorithm>"))
(substitute* "tests/CMakeLists.txt"
(("add_subdirectory\\(\\$\\{GTEST_PREFIX\\} gtest\\)")
"find_package(GTest REQUIRED)")
(("add_subdirectory\\(\\$\\{PROJECT_SOURCE_DIR\\}/utils/.*\\)")
"")))))))
(inputs (list boost louvain-community python python-numpy sqlite zlib))
(native-inputs (list googletest lingeling python python-wrapper python-lit))
(synopsis "Incremental SAT solver")
(description
"CryptoMiniSat is an incremental SAT solver with both command line and
library (C++, C, Python) interfaces. The command-line interface takes a
@acronym{CNF, Conjunctive Normal Form} as an input in the DIMACS format with
the extension of XOR clauses. The library interfaces mimic this and also
allow incremental solving, including assumptions.")
(home-page "https://github.com/msoos/cryptominisat")
(license license:expat)))
(define-public libqalculate (define-public libqalculate
(package (package
(name "libqalculate") (name "libqalculate")

View File

@ -48,6 +48,7 @@
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages cdrom) #:use-module (gnu packages cdrom)
#:use-module (gnu packages cmake) ;for MPD #:use-module (gnu packages cmake) ;for MPD
#:use-module (gnu packages cpp)
#:use-module (gnu packages freedesktop) ;elogind #:use-module (gnu packages freedesktop) ;elogind
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -55,6 +56,7 @@
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages lua)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -66,15 +68,19 @@
#:use-module (gnu packages music) #:use-module (gnu packages music)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print) #:use-module (gnu packages pretty-print)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages web)
#:use-module (gnu packages xiph)) #:use-module (gnu packages xiph))
(define-public libmpdclient (define-public libmpdclient
@ -380,7 +386,7 @@ MPD servers, search and multimedia key support.")
(define-public ashuffle (define-public ashuffle
(package (package
(name "ashuffle") (name "ashuffle")
(version "2.0.2") (version "3.13.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -389,10 +395,20 @@ MPD servers, search and multimedia key support.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"11aa95cg0yca2m2d00sar6wr14g3lc7cfm9bin1h7lk7asdm8azp")))) "09dvar0aglyy2h9y115ymgryd8l6npc2y2ccdzij0b70f47ncqmf"))))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(inputs (list libmpdclient)) (inputs
(list abseil-cpp-cxxstd17
googletest
libmpdclient
yaml-cpp))
(build-system meson-build-system) (build-system meson-build-system)
(arguments
(list #:configure-flags
#~'("-Dtests=enabled"
"-Dunsupported_use_system_absl=true"
"-Dunsupported_use_system_gtest=true"
"-Dunsupported_use_system_yamlcpp=true")))
(home-page "https://github.com/joshkunz/ashuffle") (home-page "https://github.com/joshkunz/ashuffle")
(synopsis "Automatic library-wide shuffle for mpd") (synopsis "Automatic library-wide shuffle for mpd")
(description "ashuffle is an application for automatically shuffling your (description "ashuffle is an application for automatically shuffling your
@ -561,3 +577,27 @@ which is focused on playing local music without the need of managing playlists.
Instead of maintaining a client side database of your music library, Instead of maintaining a client side database of your music library,
mpdevil loads all tags and covers on demand.") mpdevil loads all tags and covers on demand.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public mympd
(package
(name "mympd")
(version "10.1.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jcorporation/myMPD")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1cqq09j7mi7dz5y6l7i0sa6vi2n5zrndnrxnqsi4vcg99fc2vwv8"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f)) ; no test target
(native-inputs (list jq perl))
(inputs (list flac libid3tag lua openssl pcre2))
(home-page "https://jcorporation.github.io/")
(synopsis "Web-based MPD client")
(description "MyMPD is a mobile-friendly web client for the MPD music
player daemon.")
(license license:gpl3+)))

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
@ -1910,7 +1910,7 @@ with a selectable pattern matrix size.")
(package (package
(inherit bsequencer) (inherit bsequencer)
(name "bchoppr") (name "bchoppr")
(version "1.10.10") (version "1.12.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1919,7 +1919,7 @@ with a selectable pattern matrix size.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0gxz0cpxdfj7ajcd9yg05d26i7p24mx5865vy3ph76ni8kycdlrc")))) (base32 "1jfp98qa0frmdybrg71fn8wxn1b3ginkbkcg9cz9y83j1m0jqrif"))))
(synopsis "Audio stream-chopping LV2 plugin") (synopsis "Audio stream-chopping LV2 plugin")
(description "B.Choppr cuts the audio input stream into a repeated (description "B.Choppr cuts the audio input stream into a repeated
sequence of up to 16 chops. Each chop can be leveled up or down (gating). sequence of up to 16 chops. Each chop can be leveled up or down (gating).
@ -2300,10 +2300,10 @@ perform creative live mixes with digital music files.")
alsa-lib alsa-lib
new-session-manager new-session-manager
liblo liblo
qtbase-5 qtbase
qtsvg-5)) qtsvg))
(native-inputs (native-inputs
(list pkg-config qttools-5)) (list pkg-config qttools))
(home-page "https://synthv1.sourceforge.io") (home-page "https://synthv1.sourceforge.io")
(synopsis "Polyphonic subtractive synthesizer") (synopsis "Polyphonic subtractive synthesizer")
(description (description
@ -2333,10 +2333,10 @@ oscillators and stereo effects.")
alsa-lib alsa-lib
new-session-manager new-session-manager
liblo liblo
qtbase-5 qtbase
qtsvg-5)) qtsvg))
(native-inputs (native-inputs
(list pkg-config qttools-5)) (list pkg-config qttools))
(home-page "https://drumkv1.sourceforge.io") (home-page "https://drumkv1.sourceforge.io")
(synopsis "Drum-kit sampler synthesizer with stereo effects") (synopsis "Drum-kit sampler synthesizer with stereo effects")
(description (description
@ -2366,10 +2366,10 @@ effects.")
alsa-lib alsa-lib
new-session-manager new-session-manager
liblo liblo
qtbase-5 qtbase
qtsvg-5)) qtsvg))
(native-inputs (native-inputs
(list pkg-config qttools-5)) (list pkg-config qttools))
(home-page "https://samplv1.sourceforge.io") (home-page "https://samplv1.sourceforge.io")
(synopsis "Polyphonic sampler synthesizer with stereo effects") (synopsis "Polyphonic sampler synthesizer with stereo effects")
(description (description
@ -2399,10 +2399,10 @@ effects.")
new-session-manager new-session-manager
liblo liblo
fftwf fftwf
qtbase-5 qtbase
qtsvg-5)) qtsvg))
(native-inputs (native-inputs
(list pkg-config qttools-5)) (list pkg-config qttools))
(home-page "https://padthv1.sourceforge.io") (home-page "https://padthv1.sourceforge.io")
(synopsis "Polyphonic additive synthesizer") (synopsis "Polyphonic additive synthesizer")
(description (description
@ -3313,14 +3313,13 @@ from the command line.")
libvorbis libvorbis
lilv lilv
lv2 lv2
qtbase-5 qtbase
qtsvg-5 qtsvg
qtx11extras
rubberband rubberband
suil suil
zlib)) zlib))
(native-inputs (native-inputs
(list pkg-config qttools-5)) (list pkg-config qttools))
(home-page "https://qtractor.org/") (home-page "https://qtractor.org/")
(synopsis "Audio/MIDI multi-track sequencer") (synopsis "Audio/MIDI multi-track sequencer")
(description (description

View File

@ -593,7 +593,7 @@ supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.")
(define-public slurm-monitor (define-public slurm-monitor
(package (package
(name "slurm-monitor") (name "slurm-monitor")
(version "0.4.3") (version "0.4.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -603,9 +603,10 @@ supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.")
(commit (string-append "upstream/" version)))) (commit (string-append "upstream/" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1n6pgrcs8gwrcq5fch1q3yk3jipjwrf21s9a13fbjrl903g5zzv9")))) (base32 "07q8895bxsajkwip8dgrrwr1m8a10xnl4p0g6wqcrd2wf4hx5gn3"))))
(build-system cmake-build-system) (build-system meson-build-system)
(arguments `(#:tests? #f)) ;no tests (arguments `(#:tests? #f)) ;no tests
(native-inputs (list pkg-config))
(inputs (list ncurses)) (inputs (list ncurses))
(synopsis "Network load monitor") (synopsis "Network load monitor")
(description (description
@ -1538,22 +1539,14 @@ Ethernet devices.")
(define-public ifstatus (define-public ifstatus
(package (package
(name "ifstatus") (name "ifstatus")
(version "1.1.0") (version "2.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/ifstatus/ifstatus/" (uri (string-append "mirror://sourceforge/ifstatus/ifstatus/"
"ifstatus%20v" version "/ifstatus-v" "ifstatus-v" version ".tar.gz"))
version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"045cbsq9ps32j24v8y5hpyqxnqn9mpaf3mgvirlhgpqyb9jsia0c")) "0n622f2m3x901hcmad4ns52r2x75csy4nqraagzb8h9fn0j62jkv"))))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "Main.h"
(("#include <stdio.h>")
"#include <stdio.h>\n#include <stdlib.h>"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no "check" target '(#:tests? #f ; no "check" target

View File

@ -28,14 +28,14 @@
(define-public nickle (define-public nickle
(package (package
(name "nickle") (name "nickle")
(version "2.82") (version "2.90")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://nickle.org/release/nickle-" (uri (string-append "https://nickle.org/release/nickle-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jy96z01qbrnmsrywn5mfa14615qdix6b8520qd65c6yjyrk8gs0")))) "197532b7ghkfnzx9qvxd2qjpnqba7bfl79iff3hk2jxcl0d83czv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list readline)) (list readline))

View File

@ -1455,3 +1455,43 @@ are not using it. It uses the same GPG key to encrypt passwords and tomb,
therefore you don't need to manage more key or secret. Moreover, you can ask therefore you don't need to manage more key or secret. Moreover, you can ask
pass-tomb to automatically close your store after a given time.") pass-tomb to automatically close your store after a given time.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public xkcdpass
(package
(name "xkcdpass")
(version "1.19.3")
(home-page "https://github.com/redacted/XKCD-password-generator")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "xkcdpass-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0xfrmx9k2vinlagv476rfcfdp41aix1ldy6qnzzx26n985gcyk7p"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-manpage
(lambda* (#:key outputs #:allow-other-keys)
(install-file
"xkcdpass.1"
(string-append (assoc-ref outputs "out") "/share/man/man1")))))))
(synopsis
"Generate secure multiword passwords/passphrases, inspired by XKCD")
(description
"This package provides a flexible and scriptable password generator which
generates strong passphrases, inspired by
@url{https://xkcd.com/936/,XKCD 936}.")
(license (list license:bsd-3 ;code
license:cc0 ;spanish, eff_large_de, french word lists
license:cc-by-sa3.0 ;finnish, italian word list
license:cc-by-sa4.0 ;norwegian word list
license:eupl1.1 ;finnish word list
license:gpl2 ;portuguese word list
license:gpl3 ;ger-anix word list
license:lgpl2.0 ;finnish word list
license:lgpl2.1 ;portuguese word list
license:mpl1.1)))) ;portuguese word list

View File

@ -1,83 +0,0 @@
Patch backported by Sage.
Fix from upstream that happens to work around
https://trac.sagemath.org/ticket/23011
diff --git a/src/lsp/format.lsp b/src/lsp/format.lsp
index 77ca799..53b887c 100644
--- a/src/lsp/format.lsp
+++ b/src/lsp/format.lsp
@@ -307,11 +307,13 @@
:start (format-directive-start struct)
:end (format-directive-end struct))))
+(defconstant +format-directive-limit+ (1+ (char-code #\~)))
+
#+formatter
(defparameter *format-directive-expanders*
- (make-array char-code-limit :initial-element nil))
+ (make-array +format-directive-limit+ :initial-element nil))
(defparameter *format-directive-interpreters*
- (make-array char-code-limit :initial-element nil))
+ (make-array +format-directive-limit+ :initial-element nil))
(defparameter *default-format-error-control-string* nil)
(defparameter *default-format-error-offset* nil)
@@ -550,24 +552,24 @@
(write-string directive stream)
(interpret-directive-list stream (cdr directives) orig-args args))
(#-ecl format-directive #+ecl vector
+ (multiple-value-bind
+ (new-directives new-args)
+ (let* ((code (char-code (format-directive-character directive)))
+ (function
+ (and (< code +format-directive-limit+)
+ (svref *format-directive-interpreters* code)))
+ (*default-format-error-offset*
+ (1- (format-directive-end directive))))
+ (unless function
+ (error 'format-error
+ :complaint "Unknown format directive."))
(multiple-value-bind
(new-directives new-args)
- (let ((function
- (svref *format-directive-interpreters*
- (char-code (format-directive-character
- directive))))
- (*default-format-error-offset*
- (1- (format-directive-end directive))))
- (unless function
- (error 'format-error
- :complaint "Unknown format directive."))
- (multiple-value-bind
- (new-directives new-args)
- (funcall function stream directive
- (cdr directives) orig-args args)
- (values new-directives new-args)))
- (interpret-directive-list stream new-directives
- orig-args new-args)))))
+ (funcall function stream directive
+ (cdr directives) orig-args args)
+ (values new-directives new-args)))
+ (interpret-directive-list stream new-directives
+ orig-args new-args)))))
args))
@@ -639,11 +641,12 @@
(values `(write-string ,directive stream)
more-directives))
(format-directive
- (let ((expander
- (aref *format-directive-expanders*
- (char-code (format-directive-character directive))))
- (*default-format-error-offset*
- (1- (format-directive-end directive))))
+ (let* ((code (char-code (format-directive-character directive)))
+ (expander
+ (and (< code +format-directive-limit+)
+ (svref *format-directive-expanders* code)))
+ (*default-format-error-offset*
+ (1- (format-directive-end directive))))
(if expander
(funcall expander directive more-directives)
(error 'format-error

View File

@ -1,17 +0,0 @@
Patch adapted from Sage.
diff -Naur ecl-16.1.2.orig/src/c/file.d ecl-16.1.2/src/c/file.d
--- ecl-16.1.2.orig/src/c/file.d 2016-05-11 13:10:51.867673867 +1200
+++ ecl-16.1.2/src/c/file.d 2016-05-11 14:44:48.121907307 +1200
@@ -3354,8 +3354,10 @@
ecl_disable_interrupts();
do {
out = fwrite(c, sizeof(char), n, IO_STREAM_FILE(strm));
- } while (out < n && restartable_io_error(strm, "fwrite"));
- ecl_enable_interrupts();
+ /* Ignore write errors to stderr to avoid an infinite loop */
+ } while (out < n && (IO_STREAM_FILE(strm) != stderr) && restartable_io_error(strm, "fwrite"));
+
+ ecl_enable_interrupts();
return out;
}

View File

@ -1,16 +0,0 @@
Patch adapted from Sage. Allows building ECL on libffi 3.3.
diff --git a/src/c/ffi.d b/src/c/ffi.d
index 8861303e..8a959c23 100644
--- a/src/c/ffi.d
+++ b/src/c/ffi.d
@@ -133,8 +133,8 @@ static struct {
#elif defined(X86_WIN64)
{@':win64', FFI_WIN64},
#elif defined(X86_ANY) || defined(X86) || defined(X86_64)
- {@':cdecl', FFI_SYSV},
- {@':sysv', FFI_SYSV},
+ {@':cdecl', FFI_UNIX64},
+ {@':sysv', FFI_UNIX64},
{@':unix64', FFI_UNIX64},
#endif
};

View File

@ -0,0 +1,85 @@
From 5fc2ce8b9f34ea3218a030aeede01b70bedb2546 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Wed, 28 Sep 2022 20:58:43 +0200
Subject: [PATCH] autotests: Fix incorrect name of country in comparison.
diff --git a/autotests/addresstest.cpp b/autotests/addresstest.cpp
index fc6a9bc7..01e474b6 100644
--- a/autotests/addresstest.cpp
+++ b/autotests/addresstest.cpp
@@ -157,7 +157,7 @@ void AddressTest::formatTest()
const QString result(
QStringLiteral("Jim Knopf\nLummerlandstr. 1\n"
- "12345 Lummerstadt\n\nGERMANIA"));
+ "12345 Lummerstadt\n\nGERMANY"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Jim Knopf")), result);
#if KCONTACTS_BUILD_DEPRECATED_SINCE(5, 92)
@@ -175,7 +175,7 @@ void AddressTest::formatTest()
const QString result(
QStringLiteral("Huck Finn\n457 Foobar Ave\nNERVOUSBREAKTOWN,"
- " DC 1A2B3C\n\nSTATI UNITI"));
+ " DC 1A2B3C\n\nUNITED STATES"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Huck Finn")), result);
}
@@ -188,7 +188,7 @@ void AddressTest::formatTest()
const QString result(
QStringLiteral("Jim Knopf\nLummerlandstr. 1\n"
- "12345 Lummerstadt\n\nGERMANIA"));
+ "12345 Lummerstadt\n\nGERMANY"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Jim Knopf")), result);
}
@@ -214,7 +214,7 @@ void AddressTest::formatTest()
address.setCountry(QStringLiteral("Schweiz"));
// we want the Italian variant of the Swiss format for it_CH
- const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSVIZZERA"));
+ const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSWITZERLAND"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Dr. Konqui")), result);
}
@@ -228,14 +228,14 @@ void AddressTest::formatTest()
address.setCountry(QStringLiteral("CH"));
// we want the Italian variant of the Swiss format for it_CH
- const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSVIZZERA"));
+ const QString result(QStringLiteral("Dr. Konqui\nCasella postale 5678\nHaus Randa\n1234 Randa\n\nSWITZERLAND"));
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QStringLiteral("Dr. Konqui")), result);
}
{
KContacts::Address address;
address.setCountry(QStringLiteral("CH"));
- QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QString()), QLatin1String("SVIZZERA"));
+ QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal, QString()), QLatin1String("SWITZERLAND"));
}
{
@@ -257,14 +257,14 @@ void AddressTest::formatTest()
address.setLocality(QStringLiteral("Minato-ku"));
address.setPostalCode(QStringLiteral("106-0047"));
address.setStreet(QStringLiteral("4-6-28 Minami-Azabu"));
- auto result = QString::fromUtf8("4-6-28 Minami-Azabu, Minato-ku\nTOKYO 106-0047\n\nGIAPPONE");
+ auto result = QString::fromUtf8("4-6-28 Minami-Azabu, Minato-ku\nTOKYO 106-0047\n\nJAPAN");
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal), result);
address.setRegion(QStringLiteral("東京"));
address.setLocality(QStringLiteral("都港区"));
address.setPostalCode(QStringLiteral("106-0047"));
address.setStreet(QStringLiteral("南麻布 4-6-28"));
- result = QString::fromUtf8("〒106-0047\n東京都港区南麻布 4-6-28\n\nGIAPPONE");
+ result = QString::fromUtf8("〒106-0047\n東京都港区南麻布 4-6-28\n\nJAPAN");
QCOMPARE(address.formatted(KContacts::AddressFormatStyle::Postal), result);
}
}
base-commit: 1d757eba019718cab5d3b33a231d19daf31eb8ba
--
2.37.2

View File

@ -0,0 +1,26 @@
From f8cfb96a1540fc3256af95adf8003b75c305183c Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 30 Sep 2022 21:55:55 +0200
Subject: [PATCH] Add delay to update the mime db in testCreateMimeType test
function.
diff --git a/keditfiletype/tests/filetypestest.cpp b/keditfiletype/tests/filetypestest.cpp
index e58e6f2..a41d4ad 100644
--- a/keditfiletype/tests/filetypestest.cpp
+++ b/keditfiletype/tests/filetypestest.cpp
@@ -315,6 +315,9 @@ private Q_SLOTS:
QVERIFY(data.isDirty());
QVERIFY(data.sync());
MimeTypeWriter::runUpdateMimeDatabase();
+ // QMimeDatabase doesn't even try to update the cache if less than
+ // 5000 ms have passed (can't use qmime_secondsBetweenChecks)
+ QTest::qSleep(5000);
QMimeType mime = db.mimeTypeForName(mimeTypeName);
QVERIFY(mime.isValid());
QCOMPARE(mime.comment(), fakeComment);
base-commit: b5911cda17521156b22429436e19b508aa442a57
--
2.37.2

View File

@ -0,0 +1,24 @@
From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 07:07:22 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
processui/scripting.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/processui/scripting.cpp b/processui/scripting.cpp
index efed8ff..841761a 100644
--- a/processui/scripting.cpp
+++ b/processui/scripting.cpp
@@ -293,7 +293,7 @@ void Scripting::loadContextMenu()
const QStringList dirs =
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory);
for (const QString &dir : dirs) {
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
scripts.append(it.next());
}
--
2.5.2

View File

@ -0,0 +1,88 @@
Upstream status: https://marc.info/?l=linux-doc&m=166861669723994&w=2
From 7edb5b278ee383ff9bed525329b2cdbe22317bf2 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 14 Nov 2022 22:51:11 -0500
Subject: [PATCH] doc: add texinfodocs and infodocs targets
Sphinx supports generating Texinfo sources and Info documentation,
which can be navigated easily and is convenient to search (via the
indexed nodes or anchors, for example).
This change also causes the html output to appear under its own output
sub-directory, which makes it easier to install, since it's clean from
.doctrees or other output formats.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
Documentation/Makefile | 13 ++++++++++++-
Documentation/userspace-api/media/Makefile | 3 ++-
Makefile | 2 +-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 64d44c1ecad3..bd8dac560633 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -93,7 +93,16 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
htmldocs:
@$(srctree)/scripts/sphinx-pre-install --version-check
- @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))
+ @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),html,$(var)))
+
+texinfodocs:
+ @$(srctree)/scripts/sphinx-pre-install --version-check
+ @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,texinfo,$(var),texinfo,$(var)))
+
+# Note: the 'info' Make target is generated by sphinx itself when
+# running the texinfodocs target define above.
+infodocs: texinfodocs
+ $(MAKE) -C $(BUILDDIR)/texinfo info
linkcheckdocs:
@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,linkcheck,$(var),,$(var)))
@@ -143,6 +152,8 @@ cleandocs:
dochelp:
@echo ' Linux kernel internal documentation in different formats from ReST:'
@echo ' htmldocs - HTML'
+ @echo ' texinfodocs - Texinfo'
+ @echo ' infodocs - Info'
@echo ' latexdocs - LaTeX'
@echo ' pdfdocs - PDF'
@echo ' epubdocs - EPUB'
diff --git a/Documentation/userspace-api/media/Makefile b/Documentation/userspace-api/media/Makefile
index 00922aa7efde..3d8aaf5c253b 100644
--- a/Documentation/userspace-api/media/Makefile
+++ b/Documentation/userspace-api/media/Makefile
@@ -47,10 +47,11 @@ $(BUILDDIR)/lirc.h.rst: ${UAPI}/lirc.h ${PARSER} $(SRC_DIR)/lirc.h.rst.exception
# Media build rules
-.PHONY: all html epub xml latex
+.PHONY: all html texinfo epub xml latex
all: $(IMGDOT) $(BUILDDIR) ${TARGETS}
html: all
+texinfo: all
epub: all
xml: all
latex: $(IMGPDF) all
diff --git a/Makefile b/Makefile
index 58cd4f5e1c3a..b3266c408b6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1785,7 +1785,7 @@ $(help-board-dirs): help-%:
# Documentation targets
# ---------------------------------------------------------------------------
DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \
- linkcheckdocs dochelp refcheckdocs
+ linkcheckdocs dochelp refcheckdocs texinfodocs infodocs
PHONY += $(DOC_TARGETS)
$(DOC_TARGETS):
$(Q)$(MAKE) $(build)=Documentation $@
base-commit: 81e7cfa3a9eb4ba6993a9c71772fdab21bc5d870
--
2.38.1

View File

@ -0,0 +1,75 @@
Allow Nautilus to search for extensions in the directories listed
in $NAUTILUS_EXTENSION_PATH.
diff --git a/src/nautilus-module.c b/src/nautilus-module.c
index bf474bd..42e2a4e 100644
--- a/src/nautilus-module.c
+++ b/src/nautilus-module.c
@@ -211,6 +211,10 @@ static void
load_module_dir (const char *dirname)
{
GDir *dir;
+ static GHashTable *loaded = NULL;
+
+ if (loaded == NULL)
+ loaded = g_hash_table_new (g_str_hash, g_str_equal);
dir = g_dir_open (dirname, 0, NULL);
@@ -221,15 +225,22 @@ load_module_dir (const char *dirname)
while ((name = g_dir_read_name (dir)))
{
if (g_str_has_suffix (name, "." G_MODULE_SUFFIX))
- {
- char *filename;
-
- filename = g_build_filename (dirname,
- name,
- NULL);
- nautilus_module_load_file (filename);
- g_free (filename);
- }
+ {
+ /* Make sure each module is loaded only twice or this could
+ lead to a crash. Double loading can occur if DIRNAME
+ occurs more than once in $NAUTILUS_EXTENSION_PATH. */
+ if (!g_hash_table_contains (loaded, name))
+ {
+ char *filename;
+
+ filename = g_build_filename (dirname,
+ name,
+ NULL);
+ nautilus_module_load_file (filename);
+ g_hash_table_add (loaded, g_strdup (name));
+ g_free (filename);
+ }
+ }
}
g_dir_close (dir);
@@ -257,10 +268,24 @@ nautilus_module_setup (void)
if (!initialized)
{
+ const gchar *extension_path;
initialized = TRUE;
load_module_dir (NAUTILUS_EXTENSIONDIR);
+ /* Load additional modules from the user-provided search path. */
+ extension_path = g_getenv ("NAUTILUS_EXTENSION_PATH");
+ if (extension_path)
+ {
+ char **extension_dirs, **d;
+
+ extension_dirs = g_strsplit (extension_path, ":", -1);
+ for (d = extension_dirs; d != NULL && *d != NULL; d++)
+ load_module_dir (*d);
+
+ g_strfreev (extension_dirs);
+ }
+
eel_debug_call_at_shutdown (free_module_objects);
}
}

View File

@ -0,0 +1,11 @@
diff -rup wacomtablet-3.1.0/src/kcmodule/styluspagewidget.cpp wacomtablet-3.1.0.new/src/kcmodule/styluspagewidget.cpp
--- wacomtablet-3.1.0/src/kcmodule/styluspagewidget.cpp 2018-06-22 15:07:58.000000000 +0200
+++ wacomtablet-3.1.0.new/src/kcmodule/styluspagewidget.cpp 2018-07-10 17:38:09.239242847 +0200
@@ -25,6 +25,7 @@
#include "profilemanagement.h"
// common includes
+#include "logging.h"
#include "property.h"
#include "deviceprofile.h"
#include "dbustabletinterface.h"

View File

@ -0,0 +1,23 @@
From 4f73ff02b3efd5e8728b18fcf1067eca166704ee Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Thu, 4 Jun 2020 16:00:38 +0200
Subject: [PATCH] Fix build with Qt 5.15
---
src/kcmodule/pressurecurvewidget.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/kcmodule/pressurecurvewidget.cpp b/src/kcmodule/pressurecurvewidget.cpp
index 0c943b3..f047a6c 100644
--- a/src/kcmodule/pressurecurvewidget.cpp
+++ b/src/kcmodule/pressurecurvewidget.cpp
@@ -22,6 +22,7 @@
//Qt includes
#include <QDebug>
#include <QPainter>
+#include <QPainterPath>
#include <QMouseEvent>
#include <QResizeEvent>
#include <QTabletEvent>
--
GitLab

View File

@ -1899,14 +1899,14 @@ as defined by two typical specimens of Perl coders.")
(define-public perl-conf-libconfig (define-public perl-conf-libconfig
(package (package
(name "perl-conf-libconfig") (name "perl-conf-libconfig")
(version "0.100") (version "0.101")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/C/CN/CNANGEL/" (uri (string-append "mirror://cpan/authors/id/C/CN/CNANGEL/"
"Conf-Libconfig-" version ".tar.gz")) "Conf-Libconfig-" version ".tar.gz"))
(sha256 (sha256
(base32 "0qdypqd7mx96bwdjlv13fn6p96bs4w0yv94yv94xa7z5lqkdj4rg")))) (base32 "11dd3kb0k45gqahnnwz50x3b4b25c5jgykkwgf74rcyr0dsy0n5a"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
(list perl-extutils-pkgconfig perl-test-deep perl-test-exception (list perl-extutils-pkgconfig perl-test-deep perl-test-exception

View File

@ -189,7 +189,7 @@ internal RPC protocols and file formats.")
;; The 3.5 series are the last versions that do not require C++ 11. ;; The 3.5 series are the last versions that do not require C++ 11.
(define-public protobuf-3.5 (define-public protobuf-3.5
(package (package
(inherit protobuf) (inherit protobuf-3.6)
(version "3.5.1") (version "3.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)

View File

@ -1,9 +1,9 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018-2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
@ -31,6 +31,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -47,21 +48,20 @@
(define-public python-multivolumefile (define-public python-multivolumefile
(package (package
(name "python-multivolumefile") (name "python-multivolumefile")
(version "0.2.2") (version "0.2.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "multivolumefile" version)) (uri (pypi-uri "multivolumefile" version))
(sha256 (sha256
(base32 (base32
"0j46wab4b09s3favjzp3zs1cn2sn8pr7qyngs5wn31hpqqxbbz76")))) "1mh9sz50s1p8ik83a455pqd57syprad7xhfmk28yb5mwmw58sr50"))))
(build-system python-build-system) (build-system pyproject-build-system)
(native-inputs (native-inputs
(list python-pep517 (list python-setuptools-scm
python-setuptools
python-setuptools-scm
python-coverage python-coverage
python-coveralls python-coveralls
python-hypothesis
python-pyannotate python-pyannotate
python-pytest python-pytest
python-pytest-cov)) python-pytest-cov))
@ -72,6 +72,36 @@ file-object abstraction, making it possible to use multiple files as if they
were a single file.") were a single file.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public python-pybcj
(package
(name "python-pybcj")
(version "1.0.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "pybcj" version))
(sha256
(base32
"1hvm3c3mb20z25kmbzyyn6pr5inx50z0ignl8b0bggxaik82ws4b"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-importlib-metadata))
(native-inputs
(list python-coverage
python-hypothesis
python-pytest
python-pytest-cov
python-setuptools-scm))
(home-page "https://codeberg.org/miurahr/pybcj")
(synopsis "BCJ filter library")
(description "In data compression, BCJ, short for Branch-Call-Jump, refers
to a technique that improves the compression of machine code of executable
binaries by replacing relative branch addresses with absolute ones. This
allows a LZMA compressor to identify duplicate targets and archive higher
compression rate. BCJ is used in the 7-zip compression utility as the default
filter for executable binaries.
pybcj provides Python bindings to a BCJ implementation in C.")
(license license:lgpl2.1+)))
(define-public python-bcj-cffi (define-public python-bcj-cffi
(package (package
(name "python-bcj-cffi") (name "python-bcj-cffi")
@ -95,6 +125,59 @@ were a single file.")
Jump conversion filter by CFFI for Python.") Jump conversion filter by CFFI for Python.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public python-brotlicffi
(package
(name "python-brotlicffi")
(version "1.0.9.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "brotlicffi" version))
(sha256
(base32
"15kxgdiqcg0cm6h5xq3vkbhw7674673hcx3n2yicd3wx29l8l90c"))
(snippet
#~(begin
(use-modules (guix build utils))
(delete-file-recursively "libbrotli")))))
(build-system pyproject-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'use-shared-brotli
(lambda _
(setenv "USE_SHARED_BROTLI" "1"))))))
(propagated-inputs (list python-cffi))
(inputs (list brotli))
(home-page "https://github.com/python-hyper/brotlicffi")
(synopsis "Python CFFI bindings to the Brotli library")
(description "This package provides Python CFFI bindings to the Brotli
library.")
(license license:expat)))
(define-public python-inflate64
(package
(name "python-inflate64")
(version "0.3.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "inflate64" version))
(sha256
(base32
"0767j35gkwaykl1iq9qn8rc25j1ggv56x3d1vzjpk89bzpzdhbdm"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-importlib-metadata))
(native-inputs
(list python-pyannotate
python-pytest
python-setuptools-scm))
(home-page "https://pypi.org/project/inflate64/")
(synopsis "deflate64 compression/decompression library")
(description "The @code{inflate64} package provides @code{Deflater} and
@code{Inflater} classes to compress and decompress with the Enhanced Deflate
compression algorithm.")
(license license:lgpl2.1+)))
(define-public python-isal (define-public python-isal
(package (package
(name "python-isal") (name "python-isal")
@ -124,24 +207,50 @@ Jump conversion filter by CFFI for Python.")
and decompression by implementing Python bindings for the ISA-L library.") and decompression by implementing Python bindings for the ISA-L library.")
(license license:expat))) (license license:expat)))
(define-public python-pyppmd
(package
(name "python-pyppmd")
(version "1.0.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "pyppmd" version))
(sha256
(base32
"03w4x26mar0ha73c3v39psn1i0k6xrzwmaxfsxysic73jz99np07"))))
(build-system pyproject-build-system)
(native-inputs
(list python-coverage
python-hypothesis
python-pytest
python-pytest-benchmark
python-pytest-cov
python-pytest-timeout
python-setuptools-scm))
(home-page "https://github.com/miurahr/pyppmd")
(synopsis "PPMd compression/decompression library")
(description "Pyppmd provides classes and functions for compressing and
decompressing text data, using the @dfn{Prediction by partial matching} (PPM)
compression algorithm variation H and I.2. It provides an API similar to
Python's zlib/bz2/lzma modules.")
(license license:lgpl2.1+)))
(define-public python-ppmd-cffi (define-public python-ppmd-cffi
(package (package
(name "python-ppmd-cffi") (name "python-ppmd-cffi")
(version "0.3.3") (version "0.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ppmd-cffi" version)) (uri (pypi-uri "ppmd-cffi" version))
(sha256 (sha256
(base32 (base32
"01wcd9l6pp6hivdmd275qh9dhcwficjqfl67hxix5n07vvq7jzz0")))) "0vprpl29fkflqx0m6anfpx7q7i4cw0d0qxcdm91k4pl82dcad81g"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-cffi)) (list python-cffi))
(native-inputs (native-inputs
(list python-setuptools (list python-hypothesis
python-setuptools-scm python-setuptools-scm
python-pep517
python-coverage python-coverage
python-pytest python-pytest
python-pytest-cov)) python-pytest-cov))
@ -155,23 +264,27 @@ several possible methods.")
(define-public python-py7zr (define-public python-py7zr
(package (package
(name "python-py7zr") (name "python-py7zr")
(version "0.14.1") (version "0.20.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "py7zr" version)) (uri (pypi-uri "py7zr" version))
(sha256 (sha256
(base32 (base32
"1zmgp7yax328fj8yj8pj4l7yh78hp727j6wk12vfi6nmi82wl32i")))) "0lwniinfr3rb10n0c203a09vz06vxnnj637yqn8ipdlml89gj7kr"))))
(build-system python-build-system) (build-system pyproject-build-system)
(propagated-inputs (propagated-inputs
(list python-bcj-cffi (list python-brotli
python-brotlicffi
python-importlib-metadata
python-inflate64
python-multivolumefile python-multivolumefile
python-ppmd-cffi python-psutil
python-pycryptodome python-pybcj
python-pycryptodomex
python-pyppmd
python-pyzstd python-pyzstd
python-texttable python-texttable))
python-zstandard))
(native-inputs (native-inputs
(list python-setuptools (list python-setuptools
python-setuptools-scm python-setuptools-scm
@ -429,14 +542,16 @@ wrapper. It provides a backport of the @code{Path} object.")
(define-public python-zstandard (define-public python-zstandard
(package (package
(name "python-zstandard") (name "python-zstandard")
(version "0.15.2") (version "0.19.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "zstandard" version)) (uri (pypi-uri "zstandard" version))
(sha256 (sha256
(base32 "0by9z7nxnkzhmza075q6q91rs8lnpf91129k8ppv7kymbwshipjj")))) (base32 "0qvqhs121spk7yc1l20samflxx47waxv3xm55ksxpn1djk6jzl9i"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs
(list python-cffi))
(native-inputs (native-inputs
(list python-hypothesis)) (list python-hypothesis))
(home-page "https://github.com/indygreg/python-zstandard") (home-page "https://github.com/indygreg/python-zstandard")
@ -449,17 +564,18 @@ provided.")
(define-public python-pyzstd (define-public python-pyzstd
(package (package
(name "python-pyzstd") (name "python-pyzstd")
(version "0.14.3") (version "0.15.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyzstd" version)) (uri (pypi-uri "pyzstd" version))
(sha256 (sha256
(base32 (base32
"1d3mngs45w2p490vrq5ymd2wz4lp15phmks1ilcx4k7amgibml3d")))) "0wkli2i4my79l43b996bdga0fac8s8nfd1zjyzl46lwmsfsxlkmc"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "https://github.com/animalize/pyzstd") (home-page "https://github.com/animalize/pyzstd")
(synopsis "Zstandard bindings for Python") (synopsis "Zstandard bindings for Python")
(description "This package provides Python bindings to the Zstandard (zstd) (description "This package provides Python bindings to the
Zstandard (zstd)
compression library. The API is similar to Python's bz2/lzma/zlib module.") compression library. The API is similar to Python's bz2/lzma/zlib module.")
(license license:bsd-3))) (license license:bsd-3)))

View File

@ -4743,6 +4743,65 @@ Google search engine. Its module is called @code{googlesearch}.")
(description "Python client library for Google's discovery based APIs") (description "Python client library for Google's discovery based APIs")
(license license:asl2.0))) (license license:asl2.0)))
(define-public whoogle-search
(package
(name "whoogle-search")
(version "0.8.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "whoogle-search" version))
(sha256
(base32
"0h8cl9bkd3vx17kbvcnmc8cy6pc29lxr0drxm84kj37ka788cj2g"))))
(build-system python-build-system)
(arguments
(list
;; The tests need network access
#:tests? #f))
(propagated-inputs
(list python-attrs
python-beautifulsoup4
python-cachelib
python-certifi
python-cffi
python-brotli
python-chardet
python-click
python-cryptography
python-cssutils
python-defusedxml
python-flask
python-flask-session
python-idna
python-itsdangerous
python-jinja2
python-markupsafe
python-more-itertools
python-packaging
python-pluggy
python-py
python-pycodestyle
python-pycparser
python-pyopenssl
python-pyparsing
python-pysocks
python-dateutil
python-requests
python-soupsieve
python-stem
python-urllib3
python-waitress
python-wcwidth
python-werkzeug
python-dotenv))
(home-page "https://github.com/benbusby/whoogle-search")
(synopsis "Self-hosted, ad-free, privacy-respecting metasearch engine")
(description
"Get Google results, but without any ads, javascript, AMP links,
cookies, or IP address tracking. Quick and simple to implement as a primary
search engine replacement on both desktop and mobile.")
(license license:expat)))
(define-public python-hawkauthlib (define-public python-hawkauthlib
(package (package
(name "python-hawkauthlib") (name "python-hawkauthlib")

View File

@ -104,7 +104,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr> ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2021 Franck Pérignon <franck.perignon@univ-grenoble-alpes.fr> ;;; Copyright © 2021 Franck Pérignon <franck.perignon@univ-grenoble-alpes.fr>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 Simon Streit <simon@netpanic.org> ;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
;;; Copyright © 2021 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> ;;; Copyright © 2021 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
;;; Copyright © 2021, 2022 Pradana Aumars <paumars@courrier.dev> ;;; Copyright © 2021, 2022 Pradana Aumars <paumars@courrier.dev>
@ -3075,6 +3075,41 @@ applications. dogtail scripts are written in Python and executed like any
other Python program.") other Python program.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public python-doxyqml
(package
(name "python-doxyqml")
(version "0.5.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "doxyqml" version))
(sha256
(base32
"1f0jjqvamly4hn7f1palvq27z6yr694rfzyxrb6g0ysbbawxkvq9"))))
(build-system python-build-system)
(home-page "http://agateau.com/projects/doxyqml")
(synopsis "Doxygen input filter for QML files")
(description
"This package provides a Doxygen input filter for QML files.")
(license license:bsd-3)))
(define-public python-doxypypy
(package
(name "python-doxypypy")
(version "0.8.8.6")
(source (origin
(method url-fetch)
(uri (pypi-uri "doxypypy" version))
(sha256
(base32
"06z0vbh975g42z5szbfvn9i3bif3xwr5pncqd4fvjzjkbi2p2xb2"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ;no test suite
(home-page "https://github.com/Feneric/doxypypy")
(synopsis "Doxygen filter for Python")
(description
"This package provides a Doxygen filter for Python.")
(license license:gpl2+)))
(define-public python-empy (define-public python-empy
(package (package
(name "python-empy") (name "python-empy")
@ -3105,25 +3140,6 @@ system is highly configurable via command line options and embedded
commands.") commands.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public python-enum34
(package
(name "python-enum34")
(version "1.1.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "enum34" version))
(sha256
(base32
"1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a"))))
(build-system python-build-system)
(home-page "https://pypi.org/project/enum34/")
(synopsis "Backported Python 3.4 Enum")
(description
"Enum34 is the new Python stdlib enum module available in Python 3.4
backported for previous versions of Python from 2.4 to 3.3.")
(license license:bsd-3)))
(define-public python-parse-type (define-public python-parse-type
(package (package
(name "python-parse-type") (name "python-parse-type")
@ -7031,6 +7047,8 @@ as the original project seems to have been abandoned circa 2007.")
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f)) ; Tests try to access the network. `(#:tests? #f)) ; Tests try to access the network.
(propagated-inputs
(list python-six))
(home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/")
(synopsis "Python SOCKS module with chained proxies support") (synopsis "Python SOCKS module with chained proxies support")
(description (description
@ -10254,16 +10272,18 @@ more advanced mathematics.")
(define-public python-bigfloat (define-public python-bigfloat
(package (package
(name "python-bigfloat") (name "python-bigfloat")
(version "0.3.0") (version "0.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "bigfloat" version)) (uri (pypi-uri "bigfloat" version))
(sha256 (sha256
(base32 "0xd7q4l7v0f463diznjv4k9wlaks80pn9drdqmfifi7zx8qvybi6")))) (base32 "1f0c1hdr39bbl5rds5r1waa1papjmjiyp0ixs64mkjiahzg6pfaq"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
(list mpfr)) (list mpfr))
(propagated-inputs
(list python-six))
(home-page "https://github.com/mdickinson/bigfloat") (home-page "https://github.com/mdickinson/bigfloat")
(synopsis "Arbitrary precision floating-point arithmetic for Python") (synopsis "Arbitrary precision floating-point arithmetic for Python")
(description (description
@ -16025,6 +16045,20 @@ way.")
(sha256 (sha256
(base32 (base32
"00yvj8bxmhhhhd74v7j0x673is7vizmxwgb3dd5xmnkr74ybyi7w")))) "00yvj8bxmhhhhd74v7j0x673is7vizmxwgb3dd5xmnkr74ybyi7w"))))
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'disable-test
(lambda _
;; See https://github.com/bmc/munkres/issues/40
(substitute* "test/test_munkres.py"
(("^def test_profit_float" m)
(string-append "\
import platform
@pytest.mark.skipif(platform.architecture()[0] == \"32bit\",
reason=\"Fails on 32 bit architectures\")
" m))))))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (list python-pytest-6)) (native-inputs (list python-pytest-6))
(home-page "https://software.clapper.org/munkres/") (home-page "https://software.clapper.org/munkres/")
@ -17613,8 +17647,10 @@ It supports TSIG authenticated messages and EDNS0.")
(lambda _ (lambda _
(substitute* "setup.py" (substitute* "setup.py"
(("import DNS") "") (("import DNS") "")
(("DNS.__version__") (string-append "\"" ,version "\""))) (("DNS.__version__") (string-append "\"" ,version "\"")))))
#t))) ;; For the same reason, drop the sanity check because the library
;; fails to load without /etc/resolv.conf.
(delete 'sanity-check))
#:tests? #f)) ; Also skip the tests. #:tests? #f)) ; Also skip the tests.
(home-page "https://launchpad.net/py3dns") (home-page "https://launchpad.net/py3dns")
(synopsis "Python 3 DNS library") (synopsis "Python 3 DNS library")
@ -27371,14 +27407,14 @@ and pandoc-citeproc.")
(define-public python-rnc2rng (define-public python-rnc2rng
(package (package
(name "python-rnc2rng") (name "python-rnc2rng")
(version "2.6.4") (version "2.6.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "rnc2rng" version)) (uri (pypi-uri "rnc2rng" version))
(sha256 (sha256
(base32 (base32
"1kmp3iwxxyzjsd47j2sprd47ihhkwhb3yydih3af5bbfq0ibh1w8")))) "1wbqvz2bhq2f5kqi7q2q3m9y5vs9rj970zhnjh502pvvhmbx20as"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-rply)) (list python-rply))
@ -27575,6 +27611,8 @@ module patches @code{asyncio} to allow nested use of @code{asyncio.run} and
"1mzk4yabxj6r149fswhis18hd8dnag5sj8i4wb06450zq3pi8dh7")))) "1mzk4yabxj6r149fswhis18hd8dnag5sj8i4wb06450zq3pi8dh7"))))
(native-inputs (native-inputs
(list unzip)) (list unzip))
(propagated-inputs
(list python-six))
(build-system python-build-system) (build-system python-build-system)
(arguments '(#:tests? #f)) ; No test suite. (arguments '(#:tests? #f)) ; No test suite.
(home-page "https://www.parallelpython.com") (home-page "https://www.parallelpython.com")
@ -29603,7 +29641,7 @@ development, testing, production]};
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "pytest" "-vv"))))))) (invoke "pytest" "-vv")))))))
(native-inputs (list python-pytest python-pytest-mock)) (native-inputs (list python-pytest python-pytest-mock python-numpy))
(propagated-inputs (list python-jedi python-pygments python-urwid (propagated-inputs (list python-jedi python-pygments python-urwid
python-urwid-readline)) python-urwid-readline))
(home-page "https://documen.tician.de/pudb/") (home-page "https://documen.tician.de/pudb/")

View File

@ -25,6 +25,7 @@
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -48,6 +49,7 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
@ -59,17 +61,21 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages elf)
#:use-module (gnu packages enchant) #:use-module (gnu packages enchant)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gdb)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -140,8 +146,7 @@
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (lambda _
(chdir "libqite") (chdir "libqite"))))))
#t)))))
(inputs (inputs
(list qtbase-5 qtmultimedia-5)) (list qtbase-5 qtmultimedia-5))
(home-page "https://github.com/Ri0n/qite/") (home-page "https://github.com/Ri0n/qite/")
@ -219,10 +224,10 @@ window managers, that don't provide Qt integration by themselves.")
(native-inputs (native-inputs
(list cmake-shared extra-cmake-modules pkg-config)) (list cmake-shared extra-cmake-modules pkg-config))
(inputs (inputs
`(("qtbase" ,qtbase-5) (list qtbase-5
("qtwayland" ,qtwayland-5) qtwayland-5
("wayland" ,wayland) wayland
("xkbcommon" ,libxkbcommon))) libxkbcommon))
(synopsis "Material Decoration for Qt") (synopsis "Material Decoration for Qt")
(description "MaterialDecoration is a client-side decoration for Qt (description "MaterialDecoration is a client-side decoration for Qt
applications on Wayland.") applications on Wayland.")
@ -254,8 +259,7 @@ applications on Wayland.")
(add-before 'check 'check-setup (add-before 'check 'check-setup
(lambda _ (lambda _
;; make Qt render "offscreen", required for tests ;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QPA_PLATFORM" "offscreen"))))))
#t)))))
(home-page "https://github.com/steveire/grantlee") (home-page "https://github.com/steveire/grantlee")
(synopsis "Libraries for text templating with Qt") (synopsis "Libraries for text templating with Qt")
(description "Grantlee Templates can be used for theming and generation of (description "Grantlee Templates can be used for theming and generation of
@ -820,6 +824,69 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(variable "XDG_CONFIG_DIRS") (variable "XDG_CONFIG_DIRS")
(files '("etc/xdg"))))))) (files '("etc/xdg")))))))
(define-public qt3d-5
(package
(inherit qtbase-5)
(name "qt3d")
(version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
"1m3y7d58crn0qgfwkimxcggssn2pbs8nj5b9diwns6rwqg4aqk20"))))
(propagated-inputs `())
(native-inputs (list perl))
(inputs (list mesa qtbase-5 vulkan-headers zlib))
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-before 'configure 'configure-qmake
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((tmpdir (string-append (getenv "TMPDIR")))
(qmake (string-append tmpdir "/qmake"))
(qt.conf (string-append tmpdir "/qt.conf")))
(symlink (which "qmake") qmake)
(setenv "PATH"
(string-append tmpdir ":"
(getenv "PATH")))
(with-output-to-file qt.conf
(lambda ()
(format #t "[Paths]
Prefix=~a
ArchData=lib/qt5
Data=share/qt5
Documentation=share/doc/qt5
Headers=include/qt5
Libraries=lib
LibraryExecutables=lib/qt5/libexec
Binaries=bin
Tests=tests
Plugins=lib/qt5/plugins
Imports=lib/qt5/imports
Qml2Imports=lib/qt5/qml
Translations=share/qt5/translations
Settings=etc/xdg
Examples=share/doc/qt5/examples
HostPrefix=~a
HostData=lib/qt5
HostBinaries=bin
HostLibraries=lib
[EffectiveSourcePaths]
HostPrefix=~a
HostData=lib/qt5"
#$output #$output #$(this-package-input
"qtbase")))))))
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(invoke "qmake"
"QT_BUILD_PARTS = libs tools tests")))
(add-before 'check 'set-display
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen"))))))
(synopsis "Qt module for 3D")
(description "The Qt3d module provides classes for displaying 3D.")))
(define-public qt5compat (define-public qt5compat
(package (package
(name "qt5compat") (name "qt5compat")
@ -1802,9 +1869,22 @@ that helps in Qt development.")))
(list (list
;; The build system attempts to fetch online resources and fails when ;; The build system attempts to fetch online resources and fails when
;; building the test suite. ;; building the test suite.
#:configure-flags #~(list "-DQT_BUILD_TESTS=OFF"))) #:configure-flags #~(list "-DQT_BUILD_TESTS=OFF")
#:phases #~(modify-phases %standard-phases
(add-after 'install 'sanity-check
(lambda* (#:key outputs #:allow-other-keys)
;; This validation exists to validate that the dynamic
;; library for Clang works as intended; there was
;; originally problems due to left-overs patching the
;; value of BUILD_SHARED_LIBS in CLANG-FROM-LLVM that
;; would cause the following error: "CommandLine Error:
;; Option 'filter' registered more than once!"
(invoke/quiet (search-input-file outputs "bin/qdoc")
"--help"))))))
(native-inputs (list perl qtdeclarative vulkan-headers)) (native-inputs (list perl qtdeclarative vulkan-headers))
(inputs (list libxkbcommon mesa qtbase)) ;; Use clang-15, which is built using as a single shared library, which is
;; what the build system of qttools expects.
(inputs (list clang-15 libxkbcommon mesa qtbase))
(home-page (package-home-page qtbase)) (home-page (package-home-page qtbase))
(synopsis "Qt Tools and Designer modules") (synopsis "Qt Tools and Designer modules")
(description "The Qt Tools module provides a set of applications to browse (description "The Qt Tools module provides a set of applications to browse
@ -1814,6 +1894,27 @@ that helps in Qt development.")
;; LICENSES/Qt-GPL-exception-1.0.txt). ;; LICENSES/Qt-GPL-exception-1.0.txt).
(license (list license:gpl3)))) (license (list license:gpl3))))
(define-public qttranslations
(package
(name "qttranslations")
(version "6.3.1")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
"15yvvxw1vngnjlly6cady05ljamg01qiaqn2vh0xkph855gdbgfp"))))
(build-system cmake-build-system)
(arguments (list #:tests? #f))
(native-inputs (list qtbase qttools))
(home-page (package-home-page qtbase))
(synopsis "Qt translation catalogs")
(description "This package contains the translations for Qt contributed by
the Qt community.")
;; GPL 3 only with Qt GPL exception 1.0 (see:
;; LICENSES/Qt-GPL-exception-1.0.txt).
(license (list license:gpl3))))
(define-public qtscript (define-public qtscript
(package (inherit qtsvg-5) (package (inherit qtsvg-5)
(name "qtscript") (name "qtscript")
@ -1917,12 +2018,12 @@ coloring, and many more.")))
(native-inputs (native-inputs
(list perl pkg-config)) (list perl pkg-config))
(inputs (inputs
`(("fontconfig" ,fontconfig) (list fontconfig
("freetype" ,freetype) freetype
("libxrender" ,libxrender) libxrender
("sdl2" ,sdl2) sdl2
("qtbase" ,qtbase-5) qtbase-5
("qtdeclarative-5" ,qtdeclarative-5))) qtdeclarative-5))
(synopsis "Qt Gamepad module") (synopsis "Qt Gamepad module")
(description "The Qt Gamepad module is an add-on library that enables Qt (description "The Qt Gamepad module is an add-on library that enables Qt
applications to support the use of gamepad hardware and in some cases remote applications to support the use of gamepad hardware and in some cases remote
@ -2941,8 +3042,7 @@ system libraries.")
(string-append source "/" file) (string-append source "/" file)
(string-append out "/include"))) (string-append out "/include")))
'("SingleApplication" '("SingleApplication"
"singleapplication.h" "singleapplication_p.h")) "singleapplication.h" "singleapplication_p.h"))))))))
#t))))))
(inputs (inputs
(list qtbase-5)) (list qtbase-5))
(home-page "https://github.com/itay-grudev/SingleApplication") (home-page "https://github.com/itay-grudev/SingleApplication")
@ -3088,9 +3188,7 @@ module provides support functions to the automatically generated code.")
(let* ((qtbase (assoc-ref inputs "qtbase")) (let* ((qtbase (assoc-ref inputs "qtbase"))
(qtprinter.h (string-append "\"" qtbase "/include/qt5/QtPrintSupport/qprinter.h\""))) (qtprinter.h (string-append "\"" qtbase "/include/qt5/QtPrintSupport/qprinter.h\"")))
(substitute* "sip/QtPrintSupport/qprinter.sip" (substitute* "sip/QtPrintSupport/qprinter.sip"
(("<qprinter.h>") (("<qprinter.h>") qtprinter.h)))))
qtprinter.h))
#t)))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -3215,8 +3313,7 @@ contain over 620 classes.")
(lambda _ (display " (lambda _ (display "
from pkgutil import extend_path from pkgutil import extend_path
__path__ = extend_path(__path__, __name__) __path__ = extend_path(__path__, __name__)
"))) ")))))))))
#t))))))
(home-page "https://www.riverbankcomputing.com/software/pyqtwebengine/intro") (home-page "https://www.riverbankcomputing.com/software/pyqtwebengine/intro")
(synopsis "Python bindings for QtWebEngine") (synopsis "Python bindings for QtWebEngine")
(description (description
@ -3376,8 +3473,7 @@ indicators, code completion and call tips.")
(string-append out "/lib"))) (string-append out "/lib")))
;; And fix the installed.txt file ;; And fix the installed.txt file
(substitute* "installed.txt" (substitute* "installed.txt"
(("/gnu/store/[^/]+") out))) (("/gnu/store/[^/]+") out))))))))
#t)))))
(inputs (inputs
`(("qscintilla" ,qscintilla) `(("qscintilla" ,qscintilla)
("python" ,python) ("python" ,python)
@ -3405,8 +3501,7 @@ This package provides the Python bindings.")))
(match %build-inputs (match %build-inputs
(((names . directories) ...) (((names . directories) ...)
(union-build (assoc-ref %outputs "out") (union-build (assoc-ref %outputs "out")
directories) directories))))))
#t)))))
(inputs (inputs
`(("python-pyqt" ,python-pyqt) `(("python-pyqt" ,python-pyqt)
("python-qscintilla" ,python-qscintilla))) ("python-qscintilla" ,python-qscintilla)))
@ -3484,8 +3579,7 @@ securely. It will not store any data unencrypted unless explicitly requested.")
(("#include \"qtlockedfile.*\\.cpp\"") "") (("#include \"qtlockedfile.*\\.cpp\"") "")
;; Unwrap namespace added in the vendoring process. ;; Unwrap namespace added in the vendoring process.
(("QtLP_Private::QtLockedFile") (("QtLP_Private::QtLockedFile")
"QtLockedFile"))) "QtLockedFile")))))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No target `(#:tests? #f ; No target
@ -3509,8 +3603,7 @@ securely. It will not store any data unencrypted unless explicitly requested.")
(("SUBDIRS\\+=examples") "")) (("SUBDIRS\\+=examples") ""))
;; Fix deprecated functions. ;; Fix deprecated functions.
(substitute* "qtsoap/src/qtsoap.cpp" (substitute* "qtsoap/src/qtsoap.cpp"
(("toAscii") "toUtf8")) (("toAscii") "toUtf8"))))
#t))
(replace 'configure (replace 'configure
(lambda _ (lambda _
(for-each (lambda (solution) (for-each (lambda (solution)
@ -3518,16 +3611,14 @@ securely. It will not store any data unencrypted unless explicitly requested.")
(invoke "./configure" "-library") (invoke "./configure" "-library")
(invoke "qmake"))) (invoke "qmake")))
'("qtlockedfile" "qtpropertybrowser" "qtservice" '("qtlockedfile" "qtpropertybrowser" "qtservice"
"qtsingleapplication" "qtsoap")) "qtsingleapplication" "qtsoap"))))
#t))
(replace 'build (replace 'build
(lambda _ (lambda _
(for-each (lambda (solution) (for-each (lambda (solution)
(with-directory-excursion solution (with-directory-excursion solution
(invoke "make"))) (invoke "make")))
'("qtlockedfile" "qtpropertybrowser" "qtservice" '("qtlockedfile" "qtpropertybrowser" "qtservice"
"qtsingleapplication" "qtsoap")) "qtsingleapplication" "qtsoap"))))
#t))
(replace 'install (replace 'install
(lambda args (lambda args
(for-each (lambda (solution) (for-each (lambda (solution)
@ -3607,8 +3698,7 @@ that can be only started once per user.
;; Remove some incomplete manual pages. ;; Remove some incomplete manual pages.
(for-each delete-file (find-files "doc/man/man3" "^_tmp.*")) (for-each delete-file (find-files "doc/man/man3" "^_tmp.*"))
(mkdir-p man) (mkdir-p man)
(copy-recursively "doc/man" man) (copy-recursively "doc/man" man)))))))
#t))))))
(home-page "http://qwt.sourceforge.net") (home-page "http://qwt.sourceforge.net")
(synopsis "Qt widgets for plots, scales, dials and other technical software (synopsis "Qt widgets for plots, scales, dials and other technical software
GUI components") GUI components")
@ -3850,7 +3940,7 @@ color-related widgets.")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'use-shiboken-dir-only (add-after 'unpack 'use-shiboken-dir-only
(lambda _ (chdir "sources/shiboken2") #t)) (lambda _ (chdir "sources/shiboken2")))
(add-before 'configure 'make-files-writable-and-update-timestamps (add-before 'configure 'make-files-writable-and-update-timestamps
(lambda _ (lambda _
;; The build scripts need to modify some files in ;; The build scripts need to modify some files in
@ -3861,13 +3951,11 @@ color-related widgets.")
(for-each (lambda (file) (for-each (lambda (file)
(make-file-writable file) (make-file-writable file)
(utime file circa-1980 circa-1980)) (utime file circa-1980 circa-1980))
(find-files "."))) (find-files ".")))))
#t))
(add-before 'configure 'set-build-env (add-before 'configure 'set-build-env
(lambda _ (lambda _
(let ((llvm #$(this-package-input "clang-toolchain"))) (let ((llvm #$(this-package-input "clang-toolchain")))
(setenv "CLANG_INSTALL_DIR" llvm) (setenv "CLANG_INSTALL_DIR" llvm)))))))
#t))))))
(home-page "https://wiki.qt.io/Qt_for_Python") (home-page "https://wiki.qt.io/Qt_for_Python")
(synopsis (synopsis
"Shiboken generates bindings for C++ libraries using CPython source code") "Shiboken generates bindings for C++ libraries using CPython source code")
@ -3905,7 +3993,7 @@ color-related widgets.")
((#:phases p) ((#:phases p)
#~(modify-phases #$p #~(modify-phases #$p
(replace 'use-shiboken-dir-only (replace 'use-shiboken-dir-only
(lambda _ (chdir "sources/shiboken6") #t)))) (lambda _ (chdir "sources/shiboken6")))))
((#:configure-flags flags) ((#:configure-flags flags)
#~(cons* #~(cons*
;; The RUNPATH of shibokenmodule contains the entry in build ;; The RUNPATH of shibokenmodule contains the entry in build
@ -3959,7 +4047,7 @@ color-related widgets.")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'go-to-source-dir (add-after 'unpack 'go-to-source-dir
(lambda _ (chdir "sources/pyside2") #t)) (lambda _ (chdir "sources/pyside2")))
(add-after 'go-to-source-dir 'fix-qt-module-detection (add-after 'go-to-source-dir 'fix-qt-module-detection
(lambda _ (lambda _
;; Activate qt module support even if it not in the same ;; Activate qt module support even if it not in the same
@ -4054,7 +4142,7 @@ generate Python bindings for your C or C++ code.")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'go-to-source-dir (add-after 'unpack 'go-to-source-dir
(lambda _ (chdir "sources/pyside6") #t)) (lambda _ (chdir "sources/pyside6")))
(add-after 'go-to-source-dir 'fix-qt-module-detection (add-after 'go-to-source-dir 'fix-qt-module-detection
(lambda _ (lambda _
(substitute* "cmake/PySideHelpers.cmake" (substitute* "cmake/PySideHelpers.cmake"
@ -4114,7 +4202,7 @@ generate Python bindings for your C or C++ code.")))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'go-to-source-dir (add-after 'unpack 'go-to-source-dir
(lambda _ (chdir "sources/pyside2-tools") #t))))) (lambda _ (chdir "sources/pyside2-tools"))))))
(home-page "https://wiki.qt.io/Qt_for_Python") (home-page "https://wiki.qt.io/Qt_for_Python")
(synopsis (synopsis
"Command line tools for PySide2") "Command line tools for PySide2")
@ -4291,8 +4379,7 @@ and import their menus over DBus.")
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "ctest" "-E" ;; These tests try connect to the internet. (invoke "ctest" "-E" ;; These tests try connect to the internet.
"(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)")) "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)")))))))
#t)))))
(home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/") (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/")
(synopsis "Qt SOAP component") (synopsis "Qt SOAP component")
(description "KD SOAP is a tool for creating client applications for web (description "KD SOAP is a tool for creating client applications for web
@ -4300,6 +4387,349 @@ services using the XML based SOAP protocol and without the need for a dedicated
web server.") web server.")
(license (list license:gpl2 license:gpl3)))) (license (list license:gpl2 license:gpl3))))
(define-public libaccounts-qt
(package
(name "libaccounts-qt")
(version "1.16")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/accounts-sso/libaccounts-qt")
(commit (string-append "VERSION_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;TODO
#:phases
#~(modify-phases %standard-phases
(replace 'configure
(lambda _
(substitute* "tests/tst_libaccounts.pro"
(("QMAKE_RPATHDIR = \\$\\$\\{QMAKE_LIBDIR\\}")
(string-append "QMAKE_RPATHDIR ="
#$output "/lib")))
(invoke "qmake"
(string-append "PREFIX=" #$output)
(string-append "LIBDIR=" #$output "/lib")))))))
;; * SignOnQt5 (required version >= 8.55), D-Bus service which performs
;; user authentication on behalf of its clients,
;; <https://gitlab.com/accounts-sso/signond>
(native-inputs (list doxygen pkg-config qtbase-5 qttools-5))
(inputs (list glib signond libaccounts-glib))
(home-page "https://accounts-sso.gitlab.io/")
(synopsis "Qt5 bindings for libaccounts-glib")
(description
"Accounts SSO is a framework for application developers who
wish to acquire, use and store web account details and credentials. It
handles the authentication process of an account and securely stores the
credentials and service-specific settings.")
(license license:lgpl2.1+)))
(define-public libsignon-glib
(package
(name "libsignon-glib")
(version "2.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/accounts-sso/libsignon-glib")
(commit (string-append "VERSION_" version))
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"0gnx9gqsh0hcfm1lk7w60g64mkn1iicga5f5xcy1j9a9byacsfd0"))))
(build-system meson-build-system)
(arguments
(list #:tests? #f ;TODO: ninja: no work to do.
#:imported-modules `((guix build python-build-system)
,@%meson-build-system-modules)
#:modules '(((guix build python-build-system)
#:select (python-version))
(guix build meson-build-system)
(guix build utils))
#:configure-flags
#~(list "-Dtests=true"
(string-append "-Dpy-overrides-dir="
#$output "/lib/python"
(python-version #$(this-package-input
"python"))
"/site-packages/gi/overrides"))))
(native-inputs (list dbus
dbus-test-runner
`(,glib "bin")
gobject-introspection
gtk-doc
pkg-config
vala))
(inputs (list check signond python python-pygobject))
(propagated-inputs (list glib))
(home-page "https://accounts-sso.gitlab.io/libsignon-glib/")
(synopsis "Single signon authentication library for GLib applications")
(description
"This package provides single signon authentication library for
GLib applications.")
(license license:lgpl2.1+)))
(define-public packagekit-qt5
(package
(name "packagekit-qt5")
(version "1.0.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hughsie/PackageKit-Qt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1d20r503msw1vix3nb6a8bmdqld7fj8k9jk33bkqsc610a2zsms6"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ;no test suite
(native-inputs (list pkg-config))
(inputs (list packagekit qtbase-5))
(home-page "https://www.freedesktop.org/software/PackageKit/pk-intro.html")
(synopsis "Qt5 bindings for PackageKit")
(description "Provides Qt5 bindings to PackageKit which is a DBUS
abstraction layer that allows the session user to manage packages in
a secure way.")
(license license:lgpl2.1+)))
(define-public signond
(package
(name "signond")
(version "8.61")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/accounts-sso/signond")
(commit (string-append "VERSION_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0k6saz5spys4a4p6ws0ayrjks2gqdqvz7zfmlhdpz5axha0gbqq4"))))
(build-system qt-build-system)
(native-inputs (list doxygen pkg-config qtbase-5 qttools-5))
(inputs (list dbus glib libaccounts-glib))
(arguments
(list #:tests? #f ; Figure out how to run tests
#:phases
#~(modify-phases %standard-phases
(delete 'validate-runpath)
(replace 'configure
(lambda _
(substitute* "src/signond/signond.pro"
(("/etc/")
(string-append #$output "/etc/")))
(substitute*
'("tests/extensions/extensions.pri"
"tests/signond-tests/mock-ac-plugin/plugin.pro"
"tests/signond-tests/identity-tool.pro"
"tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro"
"tests/libsignon-qt-tests/libsignon-qt-tests.pro"
"tests/signond-tests/signond-tests.pri")
(("QMAKE_RPATHDIR = \\$\\$\\{QMAKE_LIBDIR\\}")
(string-append "QMAKE_RPATHDIR = "
#$output "/lib:"
#$output "/lib/signon")))
(invoke "qmake"
(string-append "PREFIX=" #$output)
(string-append "LIBDIR=" #$output "/lib")))))))
(home-page "http://accounts-sso.gitlab.io/signond/index.html")
(synopsis "Perform user authentication over D-Bus")
(description "This package provides a D-Bus service which performs user
authentication on behalf of its clients.")
(license license:lgpl2.1+)))
(define-public signon-plugin-oauth2
(package
(name "signon-plugin-oauth2")
(version "0.25")
(home-page "https://gitlab.com/accounts-sso/signon-plugin-oauth2")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "VERSION_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"16aslnyk8jdg03zcg97rp6qzd0gmclj14hyhliksz8jgfz1l0w7c"))))
(build-system qt-build-system)
(native-inputs (list doxygen pkg-config))
(inputs (list signond))
(arguments
(list #:tests? #f ;no tests
#:make-flags #~(list (string-append "INSTALL_ROOT=" #$output))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
(lambda _
(substitute* "common-project-config.pri"
(("-Werror")
""))
(invoke "qmake"
(string-append "PREFIX=" #$output)
(string-append "LIBDIR=" #$output "/lib")))))))
(synopsis "OAuth 2 plugin for signon")
(description
"This plugin for the Accounts-SSO SignOn daemon handles the OAuth
1.0 and 2.0 authentication protocols.")
(license license:lgpl2.1+)))
(define-public clazy
(package
(name "clazy")
(version "1.11")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KDE/clazy")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1y0n1jknq566z1rifkgdm1yqb0mw564lp51jidfz7q9w91spijci"))))
(build-system cmake-build-system)
(native-inputs (list python))
(inputs (list clang llvm))
(home-page "https://github.com/KDE/clazy/")
(synopsis "Qt-oriented static code analyzer")
(description "clazy is a compiler plugin which allows @command{clang} to
understand Qt semantics. It can emit more than fifty (50) Qt-related compiler
warnings, ranging from unneeded memory allocations to misuses of the API,
including @i{fix-its} for automatic refactoring.")
(license license:lgpl2.0+)))
(define-public qt-creator
(package
(name "qt-creator")
(version "9.0.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://download.qt.io/official_releases/qtcreator/"
(version-major+minor version) "/" version
"/qt-creator-opensource-src-" version ".tar.gz"))
(modules '((guix build utils)))
(snippet '(begin
(for-each
delete-file-recursively
;; Remove bundled libraries, where supported.
;; TODO: package and unbundle litehtml
'("src/libs/3rdparty/yaml-cpp"
"src/shared/qbs/src/shared/qtscript/src/3rdparty"
"tests/unit/unittest/3rdparty"
;; Marketplace recommends nonfree extensions;
;; remove it.
"src/plugins/marketplace"))
(substitute* "src/plugins/CMakeLists.txt"
(("add_subdirectory\\(marketplace).*") ""))
(substitute* "src/plugins/plugins.qbs"
((".*marketplace/marketplace.qbs.*") ""))))
(sha256
(base32
"1adyxs0cnqx14gwzkvh909c52449ia6y87n1r4qf6wwydhch43cs"))))
(build-system qt-build-system)
(arguments
(list
#:qtbase qtbase
#:configure-flags
#~(list "-DWITH_DOCS=ON"
"-DBUILD_DEVELOPER_DOCS=ON"
"-DCMAKE_VERBOSE_MAKEFILE=ON"
"-DWITH_TESTS=ON"
;; Extend the RUNPATH with lib/qtcreator, which contains
;; multiple shared objects.
(string-append "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath="
#$output "/lib/qtcreator"))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-tests-build
(lambda _
;; Add a missing link directive (see:
;; https://bugreports.qt.io/browse/QTCREATORBUG-28434).
(substitute* "src/libs/tracing/CMakeLists.txt"
(("DEPENDS Utils Qt5::Qml Qt5::Quick")
"DEPENDS Utils Qt5::Quick")
(("PUBLIC_DEPENDS Qt5::Widgets")
"PUBLIC_DEPENDS Qt5::Widgets Qt5::Qml"))))
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("src/libs/utils/commandline.cpp"
"src/libs/utils/deviceshell.cpp")
(("/bin/sh")
(search-input-file inputs "bin/sh")))
(substitute* "src/libs/utils/qtcprocess.cpp"
(("/usr/bin/env")
(search-input-file inputs "bin/env")))
(substitute* "tests/auto/utils/qtcprocess/tst_qtcprocess.cpp"
(("/bin/sh")
(which "sh")))))
(add-before 'build 'build-doc
(lambda _
(invoke "cmake" "--build" "." "--target=docs" "-v")))
(add-after 'build-doc 'install-doc
(lambda _
(invoke "cmake" "--install" "." "--prefix" #$output
"--component=qch_docs")
(invoke "cmake" "--install" "." "--prefix" #$output
"--component=html_docs")))
(replace 'check
;; Loosely based on .github/workflows/build_cmake.yml.
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(when tests?
(invoke "xvfb-run" ;for the 'renderpass' tests
"ctest" "-j" (if parallel-tests?
(number->string (parallel-job-count))
"1")
"--label-exclude" "exclude_from_precheck"
"--exclude-regex" "tst_perfdata"))))
(add-after 'qt-wrap 'wrap-bin
;; Make a few well-integrated tools readily available.
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/qtcreator")
`("PATH" suffix ,(map (lambda (c)
(dirname (search-input-file inputs c)))
'("bin/clang-tidy"
"bin/clazy-standalone"
"bin/gdb"
"bin/valgrind")))))))))
(native-inputs
(list googletest
pkg-config
python
qttools
qttranslations
vulkan-headers
xvfb-run))
(inputs
(list bash-minimal
coreutils-minimal
clang
clazy
elfutils
gdb
libxkbcommon
llvm
qt5compat
qtdeclarative
qtshadertools
qtsvg
yaml-cpp
valgrind
vulkan-loader
`(,zstd "lib")))
(home-page "https://www.qt.io/")
(synopsis "Integrated development environment (IDE) for Qt")
(description "Qt Creator is an IDE tailored to the needs of Qt developers.
It includes features such as an advanced code editor, a visual debugger and a
@acronym{GUI, Graphical User Interface} designer.")
(license license:gpl3+))) ;with the Qt Company GPL Exception 1.0
;;; ;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar ;;; of a merge conflict, place them above by existing packages with similar

View File

@ -175,7 +175,7 @@ used as a drop-in substitute for @code{libfec}.")
(define-public liquid-dsp (define-public liquid-dsp
(package (package
(name "liquid-dsp") (name "liquid-dsp")
(version "1.4.0") (version "1.5.0")
(source (source
(origin (method git-fetch) (origin (method git-fetch)
(uri (git-reference (uri (git-reference
@ -183,21 +183,25 @@ used as a drop-in substitute for @code{libfec}.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0")))) (base32 "0m0bhj80rs9yhfwnrlx960lii1cqijz1wr8q93i7m2z91h3v3w0j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list autoconf automake)) (list autoconf automake))
(inputs (inputs
(list fftwf libfec)) (list fftwf libfec))
(arguments (arguments
`(;; For reproducibility, disable use of SSE3, SSE4.1, etc. (list
#:configure-flags '("--enable-simdoverride") ;; For reproducibility, disable use of SSE3, SSE4.1, etc.
#:phases #:configure-flags #~(list "--enable-simdoverride")
(modify-phases %standard-phases #:phases
(add-after 'install 'delete-static-library #~(modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'delete-static-library
(delete-file (string-append (assoc-ref outputs "out") (lambda* (#:key outputs #:allow-other-keys)
"/lib/libliquid.a"))))))) (let ((version #$(version-major+minor
(package-version this-package))))
(delete-file (string-append #$output
"/lib/libliquid.a."
version))))))))
(home-page "https://liquidsdr.org") (home-page "https://liquidsdr.org")
(synopsis "Signal processing library for software-defined radios") (synopsis "Signal processing library for software-defined radios")
(description (description

View File

@ -170,27 +170,6 @@ represented as strings.")
(license license:public-domain) (license license:public-domain)
(home-page "https://github.com/miguelmarco/libhomfly"))) (home-page "https://github.com/miguelmarco/libhomfly")))
;; Sage 9.1 doesn't build with ECL 20. This won't be necessary once 9.2 is
;; released. See https://trac.sagemath.org/ticket/22191
(define-public ecl-16
(package
(inherit ecl)
(version "16.1.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://common-lisp.net/project/ecl/static/files/release/ecl"
"-" version ".tgz"))
(sha256
(base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"))
(patches (search-patches
"ecl-16-libffi.patch"
"ecl-16-ignore-stderr-write-error.patch"
"ecl-16-format-directive-limit.patch"))))
;; Current ECL uses LGPL 2.1+
(license license:lgpl2.0+)))
(define-public pynac (define-public pynac
(package (package
(name "pynac") (name "pynac")

View File

@ -891,7 +891,7 @@ phone is required.")
(define-public libfido2 (define-public libfido2
(package (package
(name "libfido2") (name "libfido2")
(version "1.11.0") (version "1.12.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -899,21 +899,21 @@ phone is required.")
(url "https://github.com/Yubico/libfido2") (url "https://github.com/Yubico/libfido2")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "1nk4irmdg36930lgc892qmlmd4whz4fq37wknkdx5ap57i5x18i6")))) (sha256 (base32 "123rysl21bmgk6rmpgg5s21a5ksmxnn1hc32ws88h7z0q4icvj87"))))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(inputs (list eudev libcbor openssl zlib)) (inputs (list eudev libcbor openssl zlib))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
#:configure-flags #:configure-flags
#~(list (string-append #~(list (string-append
"-DPKG_CONFIG_EXECUTABLE=" "-DPKG_CONFIG_EXECUTABLE="
(search-input-file %build-inputs (search-input-file %build-inputs
(string-append (string-append
"/bin/" #$(pkg-config-for-target)))) "/bin/" #$(pkg-config-for-target))))
(string-append "-DUDEV_RULES_DIR=" #$output "/lib/udev/rules.d")) (string-append "-DUDEV_RULES_DIR=" #$output "/lib/udev/rules.d"))
;; regress tests enabled only for debug builds ;; regress tests enabled only for debug builds
#:tests? #f)) #:tests? #f))
(synopsis "Library functionality and command-line tools for FIDO devices") (synopsis "Library functionality and command-line tools for FIDO devices")
(description "libfido2 provides library functionality and command-line (description "libfido2 provides library functionality and command-line
tools to communicate with a FIDO device over USB, and to verify attestation tools to communicate with a FIDO device over USB, and to verify attestation

View File

@ -578,27 +578,6 @@ object, without whitespace.")
RPC system. Think JSON, except binary. Or think Protocol Buffers, except faster.") RPC system. Think JSON, except binary. Or think Protocol Buffers, except faster.")
(license license:expat))) (license license:expat)))
(define-public libbson
(package
(name "libbson")
(version "1.6.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/mongodb/libbson/releases/"
"download/" version "/libbson-" version ".tar.gz"))
(sha256
(base32
"1fj4554msq0rrz14snbj908dzqj46gh7jg9w9j0akn2b7q911m5a"))))
(build-system gnu-build-system)
(native-inputs (list perl))
(home-page "http://mongoc.org/libbson/current/index.html")
(synopsis "C BSON library")
(description "Libbson can create and parse BSON documents. It can also
convert JSON documents to BSON and the opposite. BSON stands for Binary JSON,
it is comparable to protobuf.")
(license license:asl2.0)))
(define-public python-ruamel.yaml (define-public python-ruamel.yaml
(package (package
(name "python-ruamel.yaml") (name "python-ruamel.yaml")

View File

@ -206,7 +206,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
(define r-with-tests (define r-with-tests
(package (package
(name "r-with-tests") (name "r-with-tests")
(version "4.2.1") (version "4.2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cran/src/base/R-" (uri (string-append "mirror://cran/src/base/R-"
@ -214,7 +214,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0gv4di1x835i4nsy21vqw66c0blmmmvyjkixc5a8x117dm4dnljd")))) "1x9xjl6fyzs8r72zigirp905ki50wzyw9rxf7iqsbbsixi12pxhg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:disallowed-references (,tzdata-for-tests) `(#:disallowed-references (,tzdata-for-tests)
@ -310,7 +310,11 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
(("\\(2008\\)\n") "(2008) ") (("\\(2008\\)\n") "(2008) ")
((" ``Software") "``Software") ((" ``Software") "``Software")
(("Data Analysis:.") "Data Analysis:\n") (("Data Analysis:.") "Data Analysis:\n")
(("Programming with R") " Programming with R")))) (("Programming with R") " Programming with R"))
(substitute* "src/library/tools/DESCRIPTION.in"
(("codetools, methods, xml2, curl, commonmark, knitr, xfun, mathjaxr")
"codetools, methods, xml2, curl, commonmark,
knitr, xfun, mathjaxr"))))
(add-before 'build 'set-locales (add-before 'build 'set-locales
(lambda _ (lambda _
(setlocale LC_ALL "C") (setlocale LC_ALL "C")
@ -366,48 +370,48 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
;; As the JDK is a rather large input with only very limited effects on R, ;; As the JDK is a rather large input with only very limited effects on R,
;; we decided to drop it. ;; we decided to drop it.
(native-inputs (native-inputs
`(("bzip2" ,bzip2) (list bzip2
("perl" ,perl) perl
("pkg-config" ,pkg-config) pkg-config
("texinfo" ,texinfo) ; for building HTML manuals texinfo ; for building HTML manuals
("texlive" ,(texlive-updmap.cfg (list texlive-ae (texlive-updmap.cfg (list texlive-ae
texlive-inconsolata texlive-inconsolata
texlive-fonts-ec texlive-fonts-ec
texlive-grfext texlive-grfext
texlive-amsfonts texlive-amsfonts
texlive-latex-base texlive-latex-base
texlive-latex-fancyvrb texlive-latex-fancyvrb
texlive-latex-graphics texlive-latex-graphics
texlive-hyperref texlive-hyperref
texlive-oberdiek texlive-oberdiek
texlive-latex-tools texlive-latex-tools
texlive-latex-upquote texlive-latex-upquote
texlive-url texlive-url
texlive-latex-xkeyval))) texlive-latex-xkeyval))
("tzdata" ,tzdata-for-tests) tzdata-for-tests
("xz" ,xz))) xz))
(inputs (inputs
`(;; We need not only cairo here, but pango to ensure that tests for the (list coreutils
;; "cairo" bitmapType plotting backend succeed. curl
("pango" ,pango) openblas
("coreutils" ,coreutils) gfortran
("curl" ,curl) icu4c
("openblas" ,openblas) libjpeg-turbo
("gfortran" ,gfortran) libpng
("icu4c" ,icu4c) libtiff
("libjpeg" ,libjpeg-turbo) libxt
("libpng" ,libpng) ;; We need not only cairo here, but pango to ensure that tests for the
("libtiff" ,libtiff) ;; "cairo" bitmapType plotting backend succeed.
("libxt" ,libxt) pango
("pcre2" ,pcre2) pcre2
("readline" ,readline) readline
;; This avoids a reference to the ungraftable static bash. R uses the tcl
;; detected shell for the "system" procedure. tk
("bash" ,bash-minimal) which
("tcl" ,tcl) zlib
("tk" ,tk) ;; This avoids a reference to the ungraftable static bash. R uses the
("which" ,which) ;; detected shell for the "system" procedure.
("zlib" ,zlib))) bash-minimal))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "R_LIBS_SITE") (variable "R_LIBS_SITE")
@ -448,29 +452,23 @@ available, greatly increasing its breadth and scope.")
(substitute* (string-append out "/lib/R/bin/libtool") (substitute* (string-append out "/lib/R/bin/libtool")
(((string-append (((string-append
"(-L)?(" "(-L)?("
(assoc-ref inputs "bzip2")
"|"
(assoc-ref inputs "perl")
"|"
(assoc-ref inputs "texlive")
"|"
(assoc-ref inputs "texlive-bin")
"|"
(assoc-ref inputs "texinfo")
"|"
(assoc-ref inputs "xz")
"|"
(format #false (format #false
"/gnu/store/[^-]+-(~{~a~^|~})-[^/]+" "~a/[^-]+-(~{~a~^|~})-[^/]+"
'("glibc-utf8-locales" (%store-directory)
'("bzip2"
"file"
"glibc-utf8-locales"
"graphite2"
"libselinux" "libselinux"
"libsepol" "libsepol"
"file" "perl"
"texinfo"
"texlive-bin" "texlive-bin"
"util-macros" "util-macros"
"graphite2")) "xz"))
"|" "|"
"/gnu/store/[^-]+-glibc-[^-]+-static" (format #false "~a/[^-]+-glibc-[^-]+-static"
(%store-directory))
")/lib")) "")))))))))))) ")/lib")) ""))))))))))))
(define-public rmath-standalone (define-public rmath-standalone
@ -1236,25 +1234,28 @@ using just two functions: melt and dcast (or acast).")
(define-public r-ggplot2 (define-public r-ggplot2
(package (package
(name "r-ggplot2") (name "r-ggplot2")
(version "3.3.6") (version "3.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggplot2" version)) (uri (cran-uri "ggplot2" version))
(sha256 (sha256
(base32 "1aa377jdfajj8ld2fh159y8havlibsr4pjisf6mkzk8g5awlxjxz")))) (base32 "0gj7n2y8msnmhk3x4r481biknvn2dqhahwazfqwr8f3lz599wbx8"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-digest (list r-cli
r-digest
r-glue r-glue
r-gtable r-gtable
r-isoband r-isoband
r-lifecycle
r-mass r-mass
r-mgcv r-mgcv
r-tibble r-tibble
r-rlang r-rlang
r-scales r-scales
r-svglite ; Needed for 'ggsave' r-svglite ; Needed for 'ggsave'
r-vctrs
r-withr)) r-withr))
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))

View File

@ -3993,6 +3993,47 @@ definitions.")
(define-deprecated-package texlive-latex-amsmath texlive-amsmath) (define-deprecated-package texlive-latex-amsmath texlive-amsmath)
(define-public texlive-mathdots
(let ((template
(simple-texlive-package
"texlive-mathdots"
(list "doc/generic/mathdots/"
"source/generic/mathdots/"
"tex/generic/mathdots/")
(base32"1jaffj343p1chdxs2g7s6lpckvihk0jfw22nw0vmijyjxfiy9yg0"))))
(package
(inherit template)
(outputs '("out" "doc"))
(arguments
(substitute-keyword-arguments (package-arguments template)
((#:tex-directory _ '())
"generic/mathdots")
((#:build-targets _ '())
'(list "mathdots.ins"))
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'chdir
(lambda _
(chdir "source/generic/mathdots")))
(replace 'copy-files
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((origin (assoc-ref inputs "source"))
(source (string-append (assoc-ref outputs "out")
"/share/texmf-dist/source"))
(doc (string-append (assoc-ref outputs "doc")
"/share/texmf-dist/doc")))
(copy-recursively (string-append origin "/source") source)
(copy-recursively (string-append origin "/doc") doc))))))))
(home-page "https://ctan.org/macros/generic/mathdots")
(synopsis "Commands to produce dots in math that respect font size")
(description
"Mathdots redefines @code{\\ddots} and @code{\\vdots}, and defines
@code{\\iddots}. The dots produced by @code{\\iddots} slant in the opposite
direction to @code{\\ddots}. All the commands are designed to change size
appropriately in scripts, as well as in response to LaTeX size changing
commands. The commands may also be used in plain TeX.")
(license license:lppl))))
(define-public texlive-amscls (define-public texlive-amscls
(let ((template (simple-texlive-package (let ((template (simple-texlive-package
"texlive-amscls" "texlive-amscls"

View File

@ -49,6 +49,7 @@
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages aspell) #:use-module (gnu packages aspell)
@ -59,6 +60,7 @@
#:use-module (gnu packages code) #:use-module (gnu packages code)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages curl)
#:use-module (gnu packages datastructures) #:use-module (gnu packages datastructures)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
@ -895,6 +897,39 @@ Octave. TeXmacs is completely extensible via Guile.")
(license license:gpl3+) (license license:gpl3+)
(home-page "https://www.texmacs.org/tmweb/home/welcome.en.html"))) (home-page "https://www.texmacs.org/tmweb/home/welcome.en.html")))
(define-public mogan
(package
(inherit texmacs)
(name "mogan")
(version "1.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/XmacsLabs/mogan")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "04wz6xmimjv2l6baxgzm8vyq5grg102m3l4wq8i6bglv529yp4ff"))))
(build-system qt-build-system)
(inputs
(modify-inputs (package-inputs texmacs)
;; Replaced by S7 scheme
;; TODO: Maybe unbundle S7
(delete "guile")
(prepend curl)))
(arguments
(substitute-keyword-arguments (package-arguments texmacs)
((#:phases orig)
#~(modify-phases #$orig
;; The non-deterministic compression issue is solved in Mogan.
(delete 'gzip-flags)))))
(home-page "https://github.com/XmacsLabs/mogan")
(synopsis "Scientific structural text editor")
(description
"Mogan is a scientific structural text editor, a fork of GNU TeXmacs.")
(license license:gpl3+)))
(define-public textpieces (define-public textpieces
(package (package
(name "textpieces") (name "textpieces")

View File

@ -995,47 +995,6 @@ correct OpenSSL include path. It is intended for use in your
number generator") number generator")
(license license:perl-license))) (license license:perl-license)))
(define-public acme-client
(package
(name "acme-client")
(version "0.1.16")
(source (origin
(method url-fetch)
(uri (string-append "https://kristaps.bsd.lv/" name "/"
"snapshots/" name "-portable-"
version ".tgz"))
(sha256
(base32
"00q05b3b1dfnfp7sr1nbd212n0mqrycl3cr9lbs51m7ncaihbrz9"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no test suite
#:make-flags
(list "CC=gcc"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((pem (search-input-file inputs "/etc/ssl/cert.pem")))
(substitute* "http.c"
(("/etc/ssl/cert.pem") pem))
#t)))
(delete 'configure)))) ; no './configure' script
(native-inputs
(list pkg-config))
(inputs
(list libbsd libressl))
(synopsis "Let's Encrypt client by the OpenBSD project")
(description "acme-client is a Let's Encrypt client implemented in C. It
uses a modular design, and attempts to secure itself by dropping privileges and
operating in a chroot where possible. acme-client is developed on OpenBSD and
then ported to the GNU / Linux environment.")
(home-page "https://kristaps.bsd.lv/acme-client/")
;; acme-client is distributed under the ISC license, but the files 'jsmn.h'
;; and 'jsmn.c' are distributed under the Expat license.
(license (list license:isc license:expat))))
;; The "-apache" variant is the upstreamed prefered variant. A "-gpl" ;; The "-apache" variant is the upstreamed prefered variant. A "-gpl"
;; variant exists in addition to the "-apache" one. ;; variant exists in addition to the "-apache" one.
(define-public mbedtls-apache (define-public mbedtls-apache

View File

@ -2221,6 +2221,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
libxext libxext
libxkbcommon libxkbcommon
libxinerama libxinerama
libxpresent
libxrandr libxrandr
libxscrnsaver libxscrnsaver
libxv libxv

View File

@ -705,7 +705,7 @@ is fully configurable and extensible in Common Lisp.")
(define-public lagrange (define-public lagrange
(package (package
(name "lagrange") (name "lagrange")
(version "1.13.8") (version "1.14.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -713,7 +713,7 @@ is fully configurable and extensible in Common Lisp.")
(string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/"
"download/v" version "/lagrange-" version ".tar.gz")) "download/v" version "/lagrange-" version ".tar.gz"))
(sha256 (sha256
(base32 "1l6cfvmmw2g30qsxmn5jma17kxgmfknlgji4pbdj1flv8p73bvza")) (base32 "08qb8f0j3sdbrkr4zsy5pcpqz2cy520q6vb8vq7ilkbz0yfxmgf2"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

View File

@ -5849,13 +5849,13 @@ deployments.")
(package (package
(name "varnish") (name "varnish")
(home-page "https://varnish-cache.org/") (home-page "https://varnish-cache.org/")
(version "7.1.1") (version "7.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append home-page "_downloads/varnish-" version ".tgz")) (uri (string-append home-page "_downloads/varnish-" version ".tgz"))
(sha256 (sha256
(base32 (base32
"14512fjjzwini3fics6sib9y83s45vlrpncamixqmmg7j0jvxbrc")))) "0h590kr7rhp57a4kfx6apyvqk60w78qdjwpr6g2ikv5840bpv4sd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")

View File

@ -1140,19 +1140,19 @@ transparent text on your screen.")
(define-public wob (define-public wob
(package (package
(name "wob") (name "wob")
(version "0.13") (version "0.14.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/francma/wob/releases/download/" (uri (string-append "https://github.com/francma/wob/releases/download/"
version "/wob-" version ".tar.gz")) version "/wob-" version ".tar.gz"))
(sha256 (sha256
(base32 "0i8y6kq37qcgdq85ll4rapisjl7zw6aa11yx2f2xw2d3j93kdxh8")))) (base32 "12s9pc0dhqgawq6jiqhamj1zq9753kgpswny1rcsdx1lkpzrgaq1"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
(list pkg-config scdoc)) (list pkg-config scdoc))
(inputs (inputs
(list libseccomp wayland wayland-protocols)) (list libinih libseccomp wayland wayland-protocols))
(home-page "https://github.com/francma/wob") (home-page "https://github.com/francma/wob")
(synopsis "Lightweight overlay bar for Wayland") (synopsis "Lightweight overlay bar for Wayland")
(description (description

View File

@ -681,7 +681,7 @@ allows you to shut down the computer from Xfce.")
(define-public xfce4-settings (define-public xfce4-settings
(package (package
(name "xfce4-settings") (name "xfce4-settings")
(version "4.16.4") (version "4.16.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://archive.xfce.org/src/xfce/" (uri (string-append "https://archive.xfce.org/src/xfce/"
@ -689,7 +689,7 @@ allows you to shut down the computer from Xfce.")
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1vd3l20myjfbq53x8sywy989zd557adyv3bb2y0nhh2is8ps9aqq")) "13nj80mshkz3czrp8l1yxj6qmz0kkfhzv94z3ixfgmw64j078kvs"))
(patches (search-patches "xfce4-settings-defaults.patch")))) (patches (search-patches "xfce4-settings-defaults.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -1335,7 +1335,7 @@ of data to either CD/DVD/BD.")
(define-public xfce4-screenshooter (define-public xfce4-screenshooter
(package (package
(name "xfce4-screenshooter") (name "xfce4-screenshooter")
(version "1.9.11") (version "1.10.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://archive.xfce.org/src/apps/" (uri (string-append "https://archive.xfce.org/src/apps/"
@ -1345,7 +1345,7 @@ of data to either CD/DVD/BD.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1d7qyc2w4962crmkz5n0mma2qmyp9hhq455karyzacjbb6z0cgg7")))) "0lvv6iam348n7l3md94lanxyyn87xmrivzdvfi0fa3vgjfk88j56"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config intltool (list pkg-config intltool

View File

@ -1217,7 +1217,7 @@ hit when running single-threaded.")
"1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15")))) "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list xorgproto libxext libx11)) (list xorgproto libxext libx11 windowswmproto))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")

View File

@ -61,7 +61,7 @@ release corresponding to NAME and VERSION."
"/src/contrib/" "/src/contrib/"
name "_" version ".tar.gz") name "_" version ".tar.gz")
;; TODO: use %bioconductor-version from (guix import cran) ;; TODO: use %bioconductor-version from (guix import cran)
(string-append "https://bioconductor.org/packages/3.15" (string-append "https://bioconductor.org/packages/3.16"
type-url-part type-url-part
"/src/contrib/" "/src/contrib/"
name "_" version ".tar.gz")))) name "_" version ".tar.gz"))))

View File

@ -51,6 +51,7 @@
MS_RELATIME MS_RELATIME
MS_BIND MS_BIND
MS_MOVE MS_MOVE
MS_REC
MS_SHARED MS_SHARED
MS_LAZYTIME MS_LAZYTIME
MNT_FORCE MNT_FORCE
@ -541,6 +542,7 @@ the last argument of `mknod'."
(define MS_NODIRATIME 2048) (define MS_NODIRATIME 2048)
(define MS_BIND 4096) (define MS_BIND 4096)
(define MS_MOVE 8192) (define MS_MOVE 8192)
(define MS_REC 16384)
(define MS_SHARED 1048576) (define MS_SHARED 1048576)
(define MS_RELATIME 2097152) (define MS_RELATIME 2097152)
(define MS_STRICTATIME 16777216) (define MS_STRICTATIME 16777216)

View File

@ -188,9 +188,9 @@ package definition."
(define %cran-canonical-url "https://cran.r-project.org/package=") (define %cran-canonical-url "https://cran.r-project.org/package=")
(define %bioconductor-url "https://bioconductor.org/packages/") (define %bioconductor-url "https://bioconductor.org/packages/")
;; The latest Bioconductor release is 3.15. Bioconductor packages should be ;; The latest Bioconductor release is 3.16. Bioconductor packages should be
;; updated together. ;; updated together.
(define %bioconductor-version "3.15") (define %bioconductor-version "3.16")
(define* (bioconductor-packages-list-url #:optional type) (define* (bioconductor-packages-list-url #:optional type)
(string-append "https://bioconductor.org/packages/" (string-append "https://bioconductor.org/packages/"

View File

@ -69,6 +69,8 @@
inferior-exception-arguments inferior-exception-arguments
inferior-exception-inferior inferior-exception-inferior
inferior-exception-stack inferior-exception-stack
inferior-protocol-error?
inferior-protocol-error-inferior
read-repl-response read-repl-response
inferior-packages inferior-packages
@ -314,6 +316,10 @@ equivalent. Return #f if the inferior could not be launched."
(inferior inferior-exception-inferior) ;<inferior> | #f (inferior inferior-exception-inferior) ;<inferior> | #f
(stack inferior-exception-stack)) ;list of (FILE COLUMN LINE) (stack inferior-exception-stack)) ;list of (FILE COLUMN LINE)
(define-condition-type &inferior-protocol-error &error
inferior-protocol-error?
(inferior inferior-protocol-error-inferior)) ;<inferior>
(define* (read-repl-response port #:optional inferior) (define* (read-repl-response port #:optional inferior)
"Read a (guix repl) response from PORT and return it as a Scheme object. "Read a (guix repl) response from PORT and return it as a Scheme object.
Raise '&inferior-exception' when an exception is read from PORT." Raise '&inferior-exception' when an exception is read from PORT."
@ -339,7 +345,11 @@ Raise '&inferior-exception' when an exception is read from PORT."
(raise (condition (&inferior-exception (raise (condition (&inferior-exception
(arguments (cons key (map sexp->object objects))) (arguments (cons key (map sexp->object objects)))
(inferior inferior) (inferior inferior)
(stack '()))))))) (stack '())))))
(_
;; Protocol error.
(raise (condition (&inferior-protocol-error
(inferior inferior)))))))
(define (read-inferior-response inferior) (define (read-inferior-response inferior)
(read-repl-response (inferior-socket inferior) (read-repl-response (inferior-socket inferior)

View File

@ -57,6 +57,7 @@
edl1.0 edl1.0
epl1.0 epl1.0
epl2.0 epl2.0
eupl1.1
eupl1.2 eupl1.2
expat expat-0 expat expat-0
freetype freetype
@ -344,6 +345,11 @@ at URI, which may be a file:// URI pointing the package's tree."
"https://www.eclipse.org/legal/epl-2.0/" "https://www.eclipse.org/legal/epl-2.0/"
"https://www.gnu.org/licenses/license-list#EPL2")) "https://www.gnu.org/licenses/license-list#EPL2"))
(define eupl1.1
(license "EUPL 1.1"
"https://directory.fsf.org/wiki/License:EUPL-1.1"
"https://www.gnu.org/licenses/license-list#EUPL-1.1"))
(define eupl1.2 (define eupl1.2
(license "EUPL 1.2" (license "EUPL 1.2"
"https://directory.fsf.org/wiki/License:EUPL-1.2" "https://directory.fsf.org/wiki/License:EUPL-1.2"

View File

@ -1176,9 +1176,9 @@ inputs of Coreutils and adds libcap:
(modify-inputs (package-inputs coreutils) (modify-inputs (package-inputs coreutils)
(delete \"gmp\" \"acl\") (delete \"gmp\" \"acl\")
(append libcap)) (prepend libcap))
Other types of clauses include 'prepend' and 'replace'. Other types of clauses include 'append' and 'replace'.
The first argument must be a labeled input list; the result is also a labeled The first argument must be a labeled input list; the result is also a labeled
input list." input list."

View File

@ -25,7 +25,7 @@
#:autoload (ssh auth) (userauth-public-key!) #:autoload (ssh auth) (userauth-public-key!)
#:autoload (ssh session) (make-session #:autoload (ssh session) (make-session
connect! get-error connect! get-error
disconnect! session-set!) disconnect! session-set! session-get)
#:autoload (ssh version) (zlib-support?) #:autoload (ssh version) (zlib-support?)
#:use-module (guix config) #:use-module (guix config)
#:use-module (guix records) #:use-module (guix records)
@ -34,7 +34,8 @@
send-files retrieve-files retrieve-files* send-files retrieve-files retrieve-files*
remote-inferior report-guile-error) remote-inferior report-guile-error)
#:use-module (guix store) #:use-module (guix store)
#:autoload (guix inferior) (inferior-eval close-inferior inferior?) #:autoload (guix inferior) (inferior-eval close-inferior
inferior? inferior-protocol-error?)
#:autoload (guix derivations) (read-derivation-from-file #:autoload (guix derivations) (read-derivation-from-file
derivation-file-name derivation-file-name
build-derivations) build-derivations)
@ -111,7 +112,7 @@
;; A #f value tells the offload scheduler to disregard the load of the build ;; A #f value tells the offload scheduler to disregard the load of the build
;; machine when selecting the best offload machine. ;; machine when selecting the best offload machine.
(overload-threshold build-machine-overload-threshold ; inexact real between (overload-threshold build-machine-overload-threshold ; inexact real between
(default 0.6)) ; 0.0 and 1.0 | #f (default 0.8)) ; 0.0 and 1.0 | #f
(parallel-builds build-machine-parallel-builds ; number (parallel-builds build-machine-parallel-builds ; number
(default 1)) (default 1))
(speed build-machine-speed ; inexact real (speed build-machine-speed ; inexact real
@ -473,6 +474,15 @@ logical cores available, to give a rough estimation of CPU usage. Return
(vector-set! vec j (vector-ref vec (- i 1))) (vector-set! vec j (vector-ref vec (- i 1)))
(loop (cons val result) (- i 1)))))))) (loop (cons val result) (- i 1))))))))
(define (remote-inferior* session)
"Like 'remote-inferior', but upon error return #f."
(or (guard (c ((inferior-protocol-error? c) #f))
(remote-inferior session))
(begin
(warning (G_ "failed to run 'guix repl' on machine '~a'~%")
(session-get session 'host))
#f)))
(define (choose-build-machine machines) (define (choose-build-machine machines)
"Return two values: the best machine among MACHINES and its build "Return two values: the best machine among MACHINES and its build
slot (which must later be released with 'release-build-slot'), or #f and #f." slot (which must later be released with 'release-build-slot'), or #f and #f."
@ -511,7 +521,7 @@ slot (which must later be released with 'release-build-slot'), or #f and #f."
;; too costly to call it once for every machine. ;; too costly to call it once for every machine.
(let* ((session (false-if-exception (open-ssh-session best (let* ((session (false-if-exception (open-ssh-session best
%short-timeout))) %short-timeout)))
(node (and session (remote-inferior session))) (node (and session (remote-inferior* session)))
(load (and node (node-load node))) (load (and node (node-load node)))
(threshold (build-machine-overload-threshold best)) (threshold (build-machine-overload-threshold best))
(space (and node (node-free-disk-space node)))) (space (and node (node-free-disk-space node))))
@ -708,6 +718,11 @@ machine."
(and (string=? (build-machine-name m1) (build-machine-name m2)) (and (string=? (build-machine-name m1) (build-machine-name m2))
(= (build-machine-port m1) (build-machine-port m2)))) (= (build-machine-port m1) (build-machine-port m2))))
(define (if-true proc)
(lambda args
(when (every ->bool args)
(apply proc args))))
;; A given build machine may appear several times (e.g., once for ;; A given build machine may appear several times (e.g., once for
;; "x86_64-linux" and a second time for "i686-linux"); test them only once. ;; "x86_64-linux" and a second time for "i686-linux"); test them only once.
(let ((machines (filter pred (let ((machines (filter pred
@ -718,12 +733,12 @@ machine."
(let* ((names (map build-machine-name machines)) (let* ((names (map build-machine-name machines))
(sockets (map build-machine-daemon-socket machines)) (sockets (map build-machine-daemon-socket machines))
(sessions (map (cut open-ssh-session <> %short-timeout) machines)) (sessions (map (cut open-ssh-session <> %short-timeout) machines))
(nodes (map remote-inferior sessions))) (nodes (map remote-inferior* sessions)))
(for-each assert-node-has-guix nodes names) (for-each (if-true assert-node-has-guix) nodes names)
(for-each assert-node-repl nodes names) (for-each (if-true assert-node-repl) nodes names)
(for-each assert-node-can-import sessions nodes names sockets) (for-each (if-true assert-node-can-import) sessions nodes names sockets)
(for-each assert-node-can-export sessions nodes names sockets) (for-each (if-true assert-node-can-export) sessions nodes names sockets)
(for-each close-inferior nodes) (for-each (if-true close-inferior) nodes)
(for-each disconnect! sessions)))) (for-each disconnect! sessions))))
(define (check-machine-status machine-file pred) (define (check-machine-status machine-file pred)
@ -743,10 +758,9 @@ machine."
(define session (define session
(open-ssh-session machine %short-timeout)) (open-ssh-session machine %short-timeout))
(match (remote-inferior session) (match (remote-inferior* session)
(#f (#f
(warning (G_ "failed to run 'guix repl' on machine '~a'~%") #f)
(build-machine-name machine)))
((? inferior? inferior) ((? inferior? inferior)
(let ((now (car (gettimeofday)))) (let ((now (car (gettimeofday))))
(match (inferior-eval '(list (uname) (match (inferior-eval '(list (uname)

View File

@ -335,13 +335,15 @@ PACKAGE."
(define* (format-whole-file file #:rest rest) (define* (format-whole-file file #:rest rest)
"Reformat all of FILE." "Reformat all of FILE."
(let ((lst (call-with-input-file file read-with-comments/sequence))) (with-fluids ((%default-port-encoding "UTF-8"))
(with-atomic-file-output file (let ((lst (call-with-input-file file read-with-comments/sequence
(lambda (port) #:guess-encoding #t)))
(apply pretty-print-with-comments/splice port lst (with-atomic-file-output file
#:format-comment canonicalize-comment (lambda (port)
#:format-vertical-space canonicalize-vertical-space (apply pretty-print-with-comments/splice port lst
rest))))) #:format-comment canonicalize-comment
#:format-vertical-space canonicalize-vertical-space
rest))))))
;;; ;;;

View File

@ -40,9 +40,9 @@
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
#:use-module (srfi srfi-71)
#:use-module ((guix config) #:select (%guix-package-name)) #:use-module ((guix config) #:select (%guix-package-name))
#:export (switch-system-program #:export (switch-system-program
switch-to-system switch-to-system
@ -184,8 +184,8 @@ services as defined by OS."
#:target-type shepherd-root-service-type)))) #:target-type shepherd-root-service-type))))
(mlet* %store-monad ((live-services (running-services eval))) (mlet* %store-monad ((live-services (running-services eval)))
(let*-values (((to-unload to-restart) (let ((to-unload to-restart
(shepherd-service-upgrade live-services target-services))) (shepherd-service-upgrade live-services target-services)))
(let* ((to-unload (map live-service-canonical-name to-unload)) (let* ((to-unload (map live-service-canonical-name to-unload))
(to-restart (map shepherd-service-canonical-name to-restart)) (to-restart (map shepherd-service-canonical-name to-restart))
(running (map live-service-canonical-name (running (map live-service-canonical-name
@ -347,14 +347,12 @@ to commits of channels in NEW."
(channel-name old))) (channel-name old)))
new))) new)))
(and new (and new
(let-values (((checkout commit relation) (let ((checkout commit relation
(update-cached-checkout (update-cached-checkout
(channel-url new) (channel-url new)
#:ref #:ref `(commit . ,(channel-commit new))
`(commit . ,(channel-commit new)) #:starting-commit (channel-commit old)
#:starting-commit #:check-out? #f)))
(channel-commit old)
#:check-out? #f)))
(list new (list new
(channel-commit old) (channel-commit new) (channel-commit old) (channel-commit new)
relation))))) relation)))))