me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'staging' into core-updates 

Conflicts resolved in:
	gnu/local.mk
	gnu/packages/cmake.scm
	gnu/packages/glib.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/sdl.scm

pango-next, vala-next and librsvg-bootstrap were removed in the process.
master
Maxim Cournoyer 2022-09-15 11:29:02 -04:00
parent 513091dbd2 3d297a0017
commit 4920f6e634
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
114 changed files with 6646 additions and 4780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NEWS
View File

@ -4,7 +4,7 @@
Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@ -18,6 +18,7 @@ Please send Guix bug reports to bug-guix@gnu.org.
*** New ‘guix shell’ command, the successor to ‘guix environment’
*** New ‘deb’ format for the ‘guix pack’ command
*** New ‘guix import minetest’ command, to import Minetest extensions
*** New 'guix style' command, to auto-format package definitions
*** ‘guix import texlive’ rewritten to use the TLPDB as its source
*** ‘guix import elpa’ now supports the non-GNU ELPA repository
*** ‘guix import pypi’ can now import a specific version
@ -30,6 +31,18 @@ Please send Guix bug reports to bug-guix@gnu.org.
*** More control over boot-time file system checks and repairs
*** XFS file systems can be created by the installer and mounted by label/UUID
*** New interface for declaring swap space
*** GNOME is now at version 42
*** The Rust bootstrap now starts from 1.54 instead of 1.19
*** Most Python 2 packages have been removed
*** Guix now makes use of parallel xz compression
*** Faster shared libraries discovery via a per-package dynamic linker cache
*** Build phases are no longer required to return a boolean
*** Package inputs can now be provided without explicit labels
*** A package origin can now be a single file rather than an archive
*** Multiple Tex Live trees can now be used via GUIX_TEXMF
*** A new sanity-check phase detects packaging problems at build time
*** G-Expressions can now be used to author build phases
*** Fetching sources can now fall-back to use Disarchive
** Programming interfaces
*** (guix records) now supports “field sanitizers”
** Noteworthy bug fixes
@ -43,7 +56,13 @@ Please send Guix bug reports to bug-guix@gnu.org.
(<https://issues.guix.gnu.org/24937>)
*** File system flags are validated before system instantiation
(<https://issues.guix.gnu.org/51425>)
*** Fonts can now be discovered in any profile
*** Python modules discovery no longer uses PYTHONPATH
*** Various Python reproducibility fixes
*** Installer now supports MSDOS disk labels on UEFI systems
(<https://issues.guix.gnu.org/47889>)
*** Emacs handles major upgrades better without a re-login
(<https://bugs.gnu.org/47458>)
* Changes in 1.3.0 (since 1.2.0)
** Package management
*** POWER9 (powerpc64le-linux) is now supported as a technology preview

10
doc/guix.texi
View File

@ -36604,8 +36604,9 @@ extensions.
@item @code{extra-jails} (default: @code{()}) (type: list-of-fail2ban-jail-configurations)
Instances of @code{<fail2ban-jail-configuration>} explicitly provided.
@item @code{extra-content} (type: maybe-string)
Extra raw content to add to the end of the @file{jail.local} file.
@item @code{extra-content} (default: @code{()}) (type: text-config)
Extra raw content to add to the end of the @file{jail.local} file,
provided as a list of file-like objects.
@end table
@ -36732,8 +36733,9 @@ The file names of the log files to be monitored.
@item @code{action} (default: @code{()}) (type: list-of-fail2ban-jail-actions)
A list of @code{<fail2ban-jail-action-configuration>}.
@item @code{extra-content} (type: maybe-string)
Extra content for the jail configuration.
@item @code{extra-content} (default: @code{()}) (type: text-config)
Extra content for the jail configuration, provided as a list of file-like
objects.
@end table

41
etc/news.scm
View File

@ -25,15 +25,56 @@
(channel-news
(version 0)
(entry (commit "11a06d1e49f4d50d6789e05bbf35e2e145ff7838")
(title
(en "Emacs now supports native compilation")
(de "Emacs kann Pakete nun nativ kompilieren")
(pt "O Emacs agora suporta compilação nativa"))
(body
(en "Emacs can now compile packages natively. Under the default
configuration, this means that Emacs packages will now be just-in-time (JIT)
compiled as you use them, and the results stored in a subdirectory of your
@code{user-emacs-directory}.
Furthermore, the build system for Emacs packages transparently supports native
compilation, but note, that @code{emacs-minimal}---the default Emacs for
building packages---has been configured without native compilation.
To natively compile your emacs packages ahead of time, use a transformation
like @option{--with-input=emacs-minimal=emacs}.")
(de "Emacs kann nun native Maschinenbefehle erzeugen. Standardgemäß
kompiliert es nun Pakete „just in time“, während Sie diese laden, und platziert
die so erzeugten nativen Bibliotheken in einem Unterverzeichnis Ihres
@code{user-emacs-directory}.
Darüber hinaus unterstützt das Erstellungssystem für Emacs-Pakete die Erzeugung
nativer Maschinenbefehle. Beachten Sie jedoch, dass @code{emacs-minimal} –
die Emacs-Variante, mit der normalerweise Emacs-Pakete erstellt werden –
weiterhin keine nativen Befehle generiert. Um native Befehle für Ihre
Emacs-Pakete schon im Voraus zu erzeugen, nutzen Sie eine Transformation, z.B.
@option{--with-input=emacs-minimal=emacs}.")
(pt "Agora o Emacs pode compilar pacotes nativamente. Na
configuração padrão os pacotes do Emacs serão compilados “just-in-time” (JIT)
conforme forem usados, e os resultados armazenados em um subdiretório de
@code{user-emacs-directory}.
Além disso, o sistema de compilação para pacotes do Emacs suporta compilação
nativa de forma transparente. Note porém que o @code{emacs-minimal} --- a
variante padrão do Emacs para compilar pacotes --- foi configurado sem
compilação nativa. Para pré-compilar nativamente seus pacotes do Emacs use
uma transformação, como por exemplo
@code{--with-input=emacs-minimal=emacs}.")))
(entry (commit "c188cf57f161c0c26e2d7c8516bd1ddd1492d686")
(title
(en "Linux-libre kernel updated to 5.19")
(de "Linux-libre-Kernel wird auf 5.19 aktualisiert")
(fr "Le noyau linux-libre est mis à jour vers la 5.19")
(pt "Kernel linux-libre atualizado para 5.19"))
(body
(en "The default version of the linux-libre kernel has been
updated to the 5.19 release series.")
(de "Der standardmäßig verwendete @code{linux-libre}-Kernel basiert
jetzt auf der 5.19-Versionsreihe.")
(fr "La version par défaut du noyau linux-libre est mise à jour
vers la série des 5.19.")
(pt "A versão padrão do kernel linux-libre foi atualizada para a

6
etc/teams.scm.in
View File

@ -170,7 +170,7 @@ and the maven-build-system."))
(define-team home
(team 'home
#:name "Team for \"guix home\""))
#:name "Team for \"Guix Home\""))
(define-team mentors
(team 'mentors
@ -266,6 +266,10 @@ importer."))
"mail@cbaines.net")
core mentors ruby)
(define-member (person "Andrew Tropin"
"andrew@trop.in")
home emacs)
(define (find-team name)
(or (hash-ref %teams (string->symbol name))

4
gnu/build/secret-service.scm
View File

@ -119,7 +119,7 @@ wait for at most HANDSHAKE-TIMEOUT seconds for handshake to complete. Return
files)))
(log "sending secrets to ~a~%" port)
(let ((sock (socket AF_INET SOCK_STREAM 0))
(let ((sock (socket AF_INET (logior SOCK_CLOEXEC SOCK_STREAM) 0))
(addr (make-socket-address AF_INET INADDR_LOOPBACK port))
(sleep (if (resolve-module '(fibers) #f)
(module-ref (resolve-interface '(fibers)) 'sleep)
@ -177,7 +177,7 @@ and #f otherwise."
;; Wait for a TCP connection on PORT. Note: We cannot use the
;; virtio-serial ports, which would be safer, because they are
;; (presumably) unsupported on GNU/Hurd.
(let ((sock (socket AF_INET SOCK_STREAM 0)))
(let ((sock (socket AF_INET (logior SOCK_CLOEXEC SOCK_STREAM) 0)))
(bind sock AF_INET INADDR_ANY port)
(listen sock 1)
(log "waiting for secrets on port ~a...~%" port)

42
gnu/home/services/shepherd.scm
View File

@ -54,19 +54,22 @@
(default shepherd-0.9)) ; package
(auto-start? home-shepherd-configuration-auto-start?
(default #t))
(daemonize? home-shepherd-configuration-daemonize?
(default #t))
(services home-shepherd-configuration-services
(default '())))
(define (home-shepherd-configuration-file services shepherd)
(define (home-shepherd-configuration-file config)
"Return the shepherd configuration file for SERVICES. SHEPHERD is used
as shepherd package."
(assert-valid-graph services)
(let ((files (map shepherd-service-file services))
;; TODO: Add compilation of services, it can improve start
;; time.
;; (scm->go (cute scm->go <> shepherd))
)
(let* ((daemonize? (home-shepherd-configuration-daemonize? config))
(services (home-shepherd-configuration-services config))
(_ (assert-valid-graph services))
(files (map shepherd-service-file services))
;; TODO: Add compilation of services, it can improve start
;; time.
;; (scm->go (cute scm->go <> shepherd))
)
(define config
#~(begin
(use-modules (srfi srfi-34)
@ -76,7 +79,11 @@ as shepherd package."
(map
(lambda (file) (load file))
'#$files))
(action 'root 'daemonize)
#$@(if daemonize?
`((action 'root 'daemonize))
'())
(format #t "Starting services...~%")
(let ((services-to-start
'#$(append-map shepherd-service-provision
@ -92,8 +99,7 @@ as shepherd package."
(scheme-file "shepherd.conf" config)))
(define (launch-shepherd-gexp config)
(let* ((shepherd (home-shepherd-configuration-shepherd config))
(services (home-shepherd-configuration-services config)))
(let* ((shepherd (home-shepherd-configuration-shepherd config)))
(if (home-shepherd-configuration-auto-start? config)
(with-imported-modules '((guix build utils))
#~(unless (file-exists?
@ -104,22 +110,22 @@ as shepherd package."
(let ((log-dir (or (getenv "XDG_LOG_HOME")
(format #f "~a/.local/var/log"
(getenv "HOME")))))
;; TODO: Remove it, 0.9.2 creates it automatically?
((@ (guix build utils) mkdir-p) log-dir)
(system*
#$(file-append shepherd "/bin/shepherd")
"--logfile"
(string-append log-dir "/shepherd.log")
"--config"
#$(home-shepherd-configuration-file services shepherd)))))
#$(home-shepherd-configuration-file config)))))
#~"")))
(define (reload-configuration-gexp config)
(let* ((shepherd (home-shepherd-configuration-shepherd config))
(services (home-shepherd-configuration-services config)))
(let* ((shepherd (home-shepherd-configuration-shepherd config)))
#~(system*
#$(file-append shepherd "/bin/herd")
"load" "root"
#$(home-shepherd-configuration-file services shepherd))))
#$(home-shepherd-configuration-file config))))
(define (ensure-shepherd-gexp config)
#~(if (file-exists?
@ -130,12 +136,18 @@ as shepherd package."
#$(reload-configuration-gexp config)
#$(launch-shepherd-gexp config)))
(define (shepherd-xdg-configuration-files config)
`(("shepherd/init.scm" ,(home-shepherd-configuration-file config))))
(define-public home-shepherd-service-type
(service-type (name 'home-shepherd)
(extensions
(list (service-extension
home-run-on-first-login-service-type
launch-shepherd-gexp)
(service-extension
home-xdg-configuration-files-service-type
shepherd-xdg-configuration-files)
(service-extension
home-activation-service-type
ensure-shepherd-gexp)

16
gnu/local.mk
View File

@ -972,7 +972,7 @@ dist_patch_DATA = \
%D%/packages/patches/cling-use-shared-library.patch \
%D%/packages/patches/clucene-pkgconfig.patch \
%D%/packages/patches/cmake-curl-certificates.patch \
%D%/packages/patches/cmh-support-fplll.patch \
%D%/packages/patches/cmake-curl-certificates-3.24.patch \
%D%/packages/patches/coda-use-system-libs.patch \
%D%/packages/patches/collectd-5.11.0-noinstallvar.patch \
%D%/packages/patches/containerd-create-pid-file.patch \
@ -1044,9 +1044,9 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-telega-test-env.patch \
%D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \
%D%/packages/patches/emacs-yasnippet-fix-tests.patch \
%D%/packages/patches/emacs-kv-fix-tests.patch \
%D%/packages/patches/enjarify-setup-py.patch \
%D%/packages/patches/enlightenment-fix-setuid-path.patch \
%D%/packages/patches/eog-update-libportal-usage.patch \
%D%/packages/patches/erlang-man-path.patch \
%D%/packages/patches/esmtp-add-lesmtp.patch \
%D%/packages/patches/eudev-rules-directory.patch \
@ -1203,11 +1203,8 @@ dist_patch_DATA = \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnash-fix-giflib-version.patch \
%D%/packages/patches/gnome-boxes-add-guix-logo.patch \
%D%/packages/patches/gnome-builder-update-libportal.patch \
%D%/packages/patches/gnome-control-center-libexecdir.patch \
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-screenshot-meson-0.60.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-session-support-elogind.patch \
%D%/packages/patches/gnome-todo-libportal.patch \
@ -1217,7 +1214,9 @@ dist_patch_DATA = \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
%D%/packages/patches/gnutls-cross.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
%D%/packages/patches/gobject-introspection-cc-1.72.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
%D%/packages/patches/go-fix-script-tests.patch \
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
@ -1235,7 +1234,6 @@ dist_patch_DATA = \
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
%D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-2.2-skip-so-test.patch \
@ -1280,7 +1278,6 @@ dist_patch_DATA = \
%D%/packages/patches/hdf-eos5-remove-gctp.patch \
%D%/packages/patches/hdf-eos5-fix-szip.patch \
%D%/packages/patches/hdf-eos5-fortrantests.patch \
%D%/packages/patches/hedgewars-network-bsd.patch \
%D%/packages/patches/helm-fix-gcc-9-build.patch \
%D%/packages/patches/http-parser-CVE-2020-8287.patch \
%D%/packages/patches/htslib-for-stringtie.patch \
@ -1388,6 +1385,10 @@ dist_patch_DATA = \
%D%/packages/patches/libcroco-CVE-2020-12825.patch \
%D%/packages/patches/libcyaml-libyaml-compat.patch \
%D%/packages/patches/libexpected-nofetch.patch \
%D%/packages/patches/libgda-cve-2021-39359.patch \
%D%/packages/patches/libgda-fix-build.patch \
%D%/packages/patches/libgda-fix-missing-initialization.patch \
%D%/packages/patches/libgda-skip-postgresql-tests.patch \
%D%/packages/patches/libgit2-mtime-0.patch \
%D%/packages/patches/libgnome-encoding.patch \
%D%/packages/patches/libgnomeui-utf8.patch \
@ -1518,7 +1519,6 @@ dist_patch_DATA = \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/nautilus-add-libportal-gtk3.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/ncftp-reproducible.patch \
%D%/packages/patches/netcdf-date-time.patch \

8
gnu/packages/admin.scm
View File

@ -325,14 +325,14 @@ interface and is based on GNU Guile.")
(define-public shepherd-0.9
(package
(inherit shepherd)
(version "0.9.1")
(version "0.9.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-"
version ".tar.gz"))
(sha256
(base32
"0l2arn6gsyw88xk9phxnyplvv1mn8sqp3ipgyyb0nszdzvxlgd36"))
"0mcby3ygh3bpns44rb1vnk8bz2km4nlw092nrcgkm3nkqfmbp4p1"))
(modules '((guix build utils)))
(snippet
;; Avoid continuation barriers so (@ (fibers) sleep) can be
@ -3817,13 +3817,13 @@ you are running, what theme or icon set you are using, etc.")
(define-public hyfetch
(package
(name "hyfetch")
(version "1.0.2")
(version "1.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "HyFetch" version))
(sha256
(base32 "1bfkycdhsyzkk6q24gdy1xwvyz0rvkr7xk2khbn74b3nk6kp83r2"))))
(base32 "18s8r63aqyah34vbahccgkiqw4008i2w5kvhqd9s8bdd4yvsrn4n"))))
(build-system python-build-system)
(inputs (list python-hypy-utils python-typing-extensions))
(arguments `(#:phases (modify-phases %standard-phases

47
gnu/packages/algebra.scm
View File

@ -294,34 +294,33 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
(define-public cmh
(package
(name "cmh")
(version "1.1.0")
(source (origin
(method url-fetch)
;; Git repo at <https://gitlab.inria.fr/cmh/cmh>.
(uri (string-append "http://www.multiprecision.org/downloads/cmh-"
version ".tar.gz"))
(sha256
(base32
"1ws2yhzxmm2l5xqqqcjcimmg40f9qq5l9i6d4i5434an9v9s8531"))
(patches (search-patches "cmh-support-fplll.patch"))))
(build-system gnu-build-system)
(inputs
(list gmp
mpfr
mpc
mpfrcx
fplll
pari-gp))
(synopsis "Igusa class polynomial computations")
(description
"The CMH software computes Igusa (genus 2) class polynomials, which
(name "cmh")
(version "1.1.1")
(source (origin
(method url-fetch)
;; Git repo at <https://gitlab.inria.fr/cmh/cmh>.
(uri (string-append
"https://www.multiprecision.org/downloads/cmh-" version
".tar.gz"))
(sha256
(base32
"0nadvqfmidgks1s7aljsf8dp32pz7vjaxyaym36m9bx4zr8msk91"))))
(build-system gnu-build-system)
(inputs (list gmp
mpfr
mpc
mpfrcx
fplll
pari-gp))
(synopsis "Igusa class polynomial computations")
(description
"The CMH software computes Igusa (genus 2) class polynomials, which
parameterize the CM points in the moduli space of 2-dimensional abelian
varieties, i.e. Jacobians of hyperelliptic curves.
It can also be used to compute theta constants at arbitrary
precision.")
(license license:gpl3+)
(home-page "http://www.multiprecision.org/cmh/home.html")))
(license license:gpl3+)
(home-page "https://www.multiprecision.org/cmh/home.html")))
(define-public giac
(package

44
gnu/packages/bash.scm
View File

@ -37,6 +37,8 @@
#:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages guile)
#:use-module (gnu packages version-control)
#:use-module (gnu packages less)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@ -439,3 +441,45 @@ in Bash, but you can use it to test any UNIX program.")
function interface (FFI) directly in your shell. In other words, it allows
you to call routines in shared libraries from within Bash.")
(license license:expat)))
(define-public blesh
(package
(name "blesh")
(version "0.4.0-devel2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/akinomyoga/ble.sh")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"02fdjyh4x6wr5hg3i86nsxhz8ysgjrvvxdmk6pqr0lm8ngw9p3sh"))))
(arguments
(list #:make-flags #~(list (string-append "PREFIX="
#$output))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'pretend-contrib-.git-exists
(lambda _
(mkdir-p "contrib/.git")))
(add-after 'unpack 'make-readlink-work
(lambda _
(substitute* "ble.pp"
(("PATH=/bin:/usr/bin readlink")
(search-input-file %build-inputs
"/bin/readlink")))))
(delete 'configure) ;no configure
(add-before 'check 'use-LANG-for-tests
(lambda _
(setenv "LANG"
(getenv "LC_ALL"))
(unsetenv "LC_ALL"))))))
(build-system gnu-build-system)
(native-inputs (list less))
(home-page "https://github.com/akinomyoga/ble.sh")
(synopsis "Bash Line Editor")
(description
"Bash Line Editor (ble.sh) is a command line editor written in pure Bash
which replaces the default GNU Readline. It adds syntax highlighting, auto
suggestions, vim modes, and more to Bash interactive sessions.")
(license license:bsd-3)))

48
gnu/packages/bioconductor.scm
View File

@ -4708,6 +4708,35 @@ and the assessment of differential expression. The analysis methods apply to
different technologies, including microarrays, RNA-seq, and quantitative PCR.")
(license license:gpl2+)))
(define-public r-made4
(package
(name "r-made4")
(version "1.70.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "made4" version))
(sha256
(base32
"1wrv9d2mp799qzy1bsaj4w7wx12gdhfv9qvklz7z41vfz59d6bq5"))))
(properties `((upstream-name . "made4")))
(build-system r-build-system)
(propagated-inputs
(list r-ade4
r-biobase
r-gplots
r-rcolorbrewer
r-scatterplot3d
r-summarizedexperiment))
(native-inputs (list r-knitr))
(home-page "http://www.hsph.harvard.edu/aedin-culhane/")
(synopsis "Multivariate analysis of microarray data using ADE4")
(description
"This is a package for multivariate data analysis and graphical display
of microarray data. Functions are included for supervised dimension
reduction (between group analysis) and joint dimension reduction of two
datasets (coinertia analysis).")
(license license:artistic2.0)))
(define-public r-methylkit
(package
(name "r-methylkit")
@ -16759,6 +16788,25 @@ with a nested autoregressive correlated error structure for the effect of
interest on transformed methylation proportions.")
(license license:expat)))
(define-public r-omicade4
(package
(name "r-omicade4")
(version "1.36.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "omicade4" version))
(sha256
(base32
"1l7w3sczsimg640klq8navgdcwjj090wjqd40n4mw76pny2xj2lj"))))
(properties `((upstream-name . "omicade4")))
(build-system r-build-system)
(propagated-inputs (list r-ade4 r-biobase r-made4))
(home-page "https://bioconductor.org/packages/omicade4")
(synopsis "Multiple co-inertia analysis of omics datasets")
(description
"This package performes multiple co-inertia analysis of omics datasets.")
(license license:gpl2)))
(define-public r-omnipathr
(package
(name "r-omnipathr")

4
gnu/packages/bioinformatics.scm
View File

@ -14984,7 +14984,7 @@ international community.")
(define-public kraken2
(package
(name "kraken2")
(version "2.1.1")
(version "2.1.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -14993,7 +14993,7 @@ international community.")
(file-name (git-file-name name version))
(sha256
(base32
"0h7a7vygd7y5isbrnc6srwq6xj1rmyd33pm8mmcgfkmlxlg5vkg3"))))
"1pl6ml1ldg2hnhy8ps56q0fl1wq3g91qkhinj6pb4yjjhv1rxsjf"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #false ; there are none

39
gnu/packages/check.scm
View File

@ -56,6 +56,7 @@
(define-module (gnu packages check)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
@ -2852,7 +2853,7 @@ provides a simple way to achieve this.")
(define-public umockdev
(package
(name "umockdev")
(version "0.14.4")
(version "0.17.13")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/martinpitt/umockdev/"
@ -2860,23 +2861,25 @@ provides a simple way to achieve this.")
"umockdev-" version ".tar.xz"))
(sha256
(base32
"0xmi24ckpps32k7hc139psgbsnsf4g106sv4l9m445m46amkxggd"))))
(build-system gnu-build-system)
"1kqkraag5v1jl5qfv0mb3ckm8yq2im21mng08sbs9dh9c9pbyvkc"))))
(build-system meson-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-test
(add-after 'unpack 'skip-test-umockdev.c
;; This test depends on /sys being available, among other
;; things.
(lambda _
(substitute* "tests/test-umockdev.c"
(("/run") "/tmp"))))
(call-with-output-file "tests/test-umockdev.c"
(lambda (port)
(format port "int main(void) { return 0; }")))))
;; Avoid having to set 'LD_LIBRARY_PATH' to use umockdev
;; via introspection.
(add-after 'unpack 'absolute-introspection-library
(lambda _
(substitute* "Makefile.in"
(("g-ir-compiler -l libumockdev")
(string-append "g-ir-compiler -l " #$output
"/lib/libumockdev")))))
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "meson.build"
(("libumockdev.so.0" all)
(string-append #$output "/lib/" all)))))
(add-after 'install 'absolute-filenames
(lambda* (#:key inputs #:allow-other-keys)
;; 'patch-shebangs' will take care of the shebang.
@ -2885,17 +2888,19 @@ provides a simple way to achieve this.")
(("libumockdev")
(string-append #$output "/lib/libumockdev"))))))))
(native-inputs
(list vala
gobject-introspection
(list gobject-introspection
gtk-doc/stable
pkg-config
;; For tests.
python
vala
which))
(inputs
(list bash-minimal ;for umockdev-wrapper
coreutils-minimal ;for bin/env
glib eudev libgudev))
(list bash-minimal ;for umockdev-wrapper
coreutils-minimal ;for bin/env
eudev
glib
libgudev
libpcap))
(home-page "https://github.com/martinpitt/umockdev/")
(synopsis "Mock hardware devices for creating unit tests")
(description "umockdev mocks hardware devices for creating integration

6
gnu/packages/chromium.scm
View File

@ -317,7 +317,7 @@
;; run the Blink performance tests, just remove everything to save ~70MiB.
'("third_party/blink/perf_tests"))
(define %chromium-version "105.0.5195.102")
(define %chromium-version "105.0.5195.125")
(define %ungoogled-revision (string-append %chromium-version "-1"))
(define %debian-revision "debian/102.0.5005.61-1")
@ -329,7 +329,7 @@
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
(sha256
(base32
"17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc"))))
"0k16wma9lj9q34xgz377nasnfzcw7wi73l91r41yilvgb3l2fgw8"))))
(define %debian-origin
(origin
@ -506,7 +506,7 @@
%chromium-version ".tar.xz"))
(sha256
(base32
"0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw"))
"0rhay46fnfffqcpk6c856hj414508fmhda600lz5whcacr25q6r0"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system)

24
gnu/packages/cmake.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
@ -330,6 +330,24 @@ and workspaces that can be used in the compiler environment of your choice.")
(package
(inherit cmake-minimal)
(name "cmake")
(version "3.24.2")
(source (origin
(inherit (package-source cmake-minimal))
(method url-fetch)
(uri (string-append "https://cmake.org/files/v"
(version-major+minor version)
"/cmake-" version ".tar.gz"))
(snippet (match (origin-snippet (package-source cmake-minimal))
(('begin ('define 'preserved-files ('quote x))
rest ...)
`(begin (define preserved-files
',(cons "Utilities/cmelf" x))
,@rest))))
(sha256
(base32
"1ny8y2dzc6fww9gzb1ml0vjpx4kclphjihkxagxigprxdzq2140d"))
(patches (search-patches "cmake-curl-certificates-3.24.patch"))))
(outputs '("out" "doc"))
(arguments
(substitute-keyword-arguments (package-arguments cmake-minimal)
;; Use cmake-minimal this time.
@ -367,8 +385,8 @@ and workspaces that can be used in the compiler environment of your choice.")
;; Extra inputs required to build the documentation.
(native-inputs
(modify-inputs (package-native-inputs cmake-minimal)
(append python-sphinx texinfo)))
(outputs '("out" "doc"))
(append python-sphinx
texinfo)))
(properties (alist-delete 'hidden? (package-properties cmake-minimal)))))
(define-public cmake-minimal-cross

18
gnu/packages/containers.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2021 Timmy Douglas <mail@timmydouglas.com>
;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -155,7 +156,7 @@ runtime (like runc or crun) for a single container.")
(define-public libslirp
(package
(name "libslirp")
(version "4.6.1")
(version "4.7.0")
(source
(origin
(method git-fetch)
@ -163,10 +164,11 @@ runtime (like runc or crun) for a single container.")
(url "https://gitlab.freedesktop.org/slirp/libslirp")
(commit (string-append "v" version))))
(sha256
(base32 "1b4cn51xvzbrxd63g6w1033prvbxfxsnsn1l0fa5i311xv28vkh0"))
(base32 "0dny8187a8qh6akaa37aa9b5pjxx88f02wh6achp4mygff0ipxba"))
(file-name (git-file-name name version))))
(build-system meson-build-system)
(inputs
(propagated-inputs
;; In Requires of slirp.pc.
(list glib))
(native-inputs
(list pkg-config))
@ -180,7 +182,7 @@ containers or various tools.")
(define-public slirp4netns
(package
(name "slirp4netns")
(version "1.1.12")
(version "1.2.0")
(source
(origin
(method git-fetch)
@ -188,7 +190,7 @@ containers or various tools.")
(url "https://github.com/rootless-containers/slirp4netns")
(commit (string-append "v" version))))
(sha256
(base32 "03llv4dlf7qqxwz4zdyk926g4bigfj2gb50glm70ciflpvzs8081"))
(base32 "1rlzwp5fx1x3q179j9s2jp02imjag5pgj333z110nrvi7azl22l8"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@ -322,7 +324,11 @@ configure network interfaces in Linux containers.")
(("/usr/local/libexec/cni")
(string-append #$(this-package-input "cni-plugins")
"/bin"))
(("/usr/bin/crun") (which "crun"))))))))
(("/usr/bin/crun") (which "crun")))))
(add-after 'install 'install-completions
(lambda _
(invoke "make" "install.completions"
(string-append "PREFIX=" #$output)))))))
(inputs
(list btrfs-progs
cni-plugins

14
gnu/packages/cpp.scm
View File

@ -406,7 +406,7 @@ combination of these streams.")
(define-public xsimd
(package
(name "xsimd")
(version "8.1.0")
(version "9.0.1")
(source
(origin
(method git-fetch)
@ -414,7 +414,7 @@ combination of these streams.")
(url "https://github.com/QuantStack/xsimd")
(commit version)))
(sha256
(base32 "16b9fdvhhsbs93llbzccgpxjdkj8kfvac3wx0b30i306k5f3maq2"))
(base32 "1fcy0djwpwvls6yqxqa82s4l4gvwkqkr8i8bibbb3dm0lqvhnw52"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
@ -422,7 +422,7 @@ combination of these streams.")
#:test-target "xtest"))
(native-inputs
(list googletest))
(home-page "https://github.com/QuantStack/xsimd")
(home-page "https://github.com/xtensor-stack/xsimd")
(synopsis "C++ wrappers for SIMD intrinsics and math implementations")
(description
"xsimd provides a unified means for using @acronym{SIMD, single instruction
@ -456,12 +456,12 @@ operating on batches.")
library for SIMD (Single Instruction, Multiple Data) with runtime dispatch.")
(license license:asl2.0)))
(define-public xsmimd-benchmark
(define-public xsimd-benchmark
(package
(inherit xsimd)
(name "xsimd-benchmark")
(arguments
`(#:configure-flags (list "-DBUILD_BENCHMARK=ON")
`(#:configure-flags (list "-DBUILD_BENCHMARK=ON" "-DBUILD_EXAMPLES=ON")
#:tests? #f
#:phases (modify-phases %standard-phases
(add-after 'unpack 'remove-march=native
@ -470,9 +470,11 @@ library for SIMD (Single Instruction, Multiple Data) with runtime dispatch.")
(("-march=native") ""))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
;; Install nothing but the executable.
;; Install nothing but the executables.
(let ((out (assoc-ref outputs "out")))
(install-file "benchmark/benchmark_xsimd"
(string-append out "/bin"))
(install-file "examples/mandelbrot"
(string-append out "/bin"))))))))
(synopsis "Benchmark of the xsimd library")

113
gnu/packages/cran.scm
View File

@ -971,6 +971,28 @@ size and can be easily tested locally before being sent to a remote.")
the system clipboards.")
(license license:gpl3)))
(define-public r-clvalid
(package
(name "r-clvalid")
(version "0.7")
(source (origin
(method url-fetch)
(uri (cran-uri "clValid" version))
(sha256
(base32
"18aiyjhnh5mfdxbzns4cy0r8bymfikhwkybpn4g04qhli5ls8z83"))))
(properties `((upstream-name . "clValid")))
(build-system r-build-system)
(propagated-inputs (list r-class r-cluster))
(home-page "https://cran.r-project.org/package=clValid")
(synopsis "Validation of clustering results")
(description
"Statistical and biological validation of clustering results. This
package implements Dunn Index, Silhouette, Connectivity, Stability, BHI and
BSI. Further information can be found in Brock, G et al. (2008) <doi:
10.18637/jss.v025.i04>.")
(license license:lgpl3)))
(define-public r-dlm
(package
(name "r-dlm")
@ -6819,6 +6841,30 @@ Rscript front-end and facilitates turning an R script into an executable
script.")
(license license:gpl3+)))
(define-public r-aricode
(package
(name "r-aricode")
(version "1.0.1")
(source (origin
(method url-fetch)
(uri (cran-uri "aricode" version))
(sha256
(base32
"0772l9gyrih48l1kymih0mb7szjqqnwcm4lzj0yzp4cs8l2mdf4f"))))
(properties `((upstream-name . "aricode")))
(build-system r-build-system)
(propagated-inputs (list r-matrix r-rcpp))
(home-page "https://github.com/jchiquet/aricode")
(synopsis "Efficient computations of standard clustering comparison measures")
(description
"This package implements an efficient O(n) algorithm based on
bucket-sorting for fast computation of standard clustering comparison
measures. Available measures include @dfn{adjusted Rand index} (ARI),
@dfn{normalized information distance} (NID), @dfn{normalized mutual
information} (NMI), @dfn{adjusted mutual information} (AMI), @dfn{normalized
variation information} (NVI) and entropy.")
(license license:gpl3+)))
(define-public r-debugme
(package
(name "r-debugme")
@ -7974,6 +8020,29 @@ sample Robust Rank-Order Distributional Test.")
exponential, logarithm, square root, and related quantities.")
(license license:gpl2+)))
(define-public r-exposition
(package
(name "r-exposition")
(version "2.8.23")
(source (origin
(method url-fetch)
(uri (cran-uri "ExPosition" version))
(sha256
(base32
"0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"))))
(properties `((upstream-name . "ExPosition")))
(build-system r-build-system)
(propagated-inputs (list r-prettygraphs))
(home-page "https://cran.r-project.org/package=ExPosition")
(synopsis "Exploratory analysis with the singular value decomposition")
(description
"This package provides a variety of descriptive multivariate analyses
with the singular value decomposition, such as principal components analysis,
correspondence analysis, and multidimensional scaling. See An ExPosition of
the Singular Value Decomposition in R (Beaton et al 2014)
<doi:10.1016/j.csda.2013.11.006>.")
(license license:gpl2)))
(define-public r-complexplus
(package
(name "r-complexplus")
@ -9064,6 +9133,30 @@ and rows. The fst format allows for random access of stored data and
compression with the LZ4 and ZSTD compressors.")
(license license:agpl3)))
(define-public r-snftool
(package
(name "r-snftool")
(version "2.3.1")
(source (origin
(method url-fetch)
(uri (cran-uri "SNFtool" version))
(sha256
(base32
"05hz230aq5wbzhknxzr4iqv3nqjhbpf66n6bp1rc5h2jgz2yfbwq"))))
(properties `((upstream-name . "SNFtool")))
(build-system r-build-system)
(propagated-inputs (list r-alluvial r-exposition))
(home-page "https://cran.r-project.org/package=SNFtool")
(synopsis "Similarity network fusion")
(description
"Similarity Network Fusion takes multiple views of a network and fuses
them together to construct an overall status matrix. The input to our
algorithm can be feature vectors, pairwise distances, or pairwise
similarities. The learned status matrix can then be used for retrieval,
clustering, and classification.")
;; Any version of the GPL
(license license:gpl3+)))
(define-public r-snowfall
(package
(name "r-snowfall")
@ -10350,6 +10443,26 @@ from the @code{stats} package, as well as numerous other model classes from
other add-on packages.")
(license license:expat)))
(define-public r-prettygraphs
(package
(name "r-prettygraphs")
(version "2.1.6")
(source (origin
(method url-fetch)
(uri (cran-uri "prettyGraphs" version))
(sha256
(base32
"0yjpwxdy9mkj2k33zvd5klyv4ava46i19yls87n0bvf79y90ikpy"))))
(properties `((upstream-name . "prettyGraphs")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/package=prettyGraphs")
(synopsis "Publication-quality graphics")
(description
"This package provides simple and crisp publication-quality graphics for
the ExPosition family of packages. See An ExPosition of the Singular Value
Decomposition in R (Beaton et al 2014) <doi:10.1016/j.csda.2013.11.006>.")
(license license:gpl2)))
(define-public r-insight
(package
(name "r-insight")

6
gnu/packages/crates-graphics.scm
View File

@ -3582,3 +3582,9 @@ the platform-specific getters provided by winit, or another library.")
(arguments
`(#:cargo-development-inputs
(("rust-resize" ,rust-resize-0.3))))))
;;;
;;; 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
;;; functionality or similar names.
;;;

6
gnu/packages/crates-gtk.scm
View File

@ -2232,3 +2232,9 @@ library.")
(synopsis "Rust binding for webkit-gtk library")
(description "This crate provides Rust binding for webkit-gtk library.")
(license license:expat)))
;;;
;;; 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
;;; functionality or similar names.
;;;

4
gnu/packages/dezyne.scm
View File

@ -31,14 +31,14 @@
(define-public dezyne
(package
(name "dezyne")
(version "2.16.0")
(version "2.16.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://dezyne.org/download/dezyne/"
name "-" version ".tar.gz"))
(sha256
(base32 "1x14jpv89dmrldar9g8pighbm68pvm4fvxz81mhjkimgf7kb4hbd"))))
(base32 "093kcgvmr1zyrfi02y0vzbfl4llrvlvjxjp9iczpdv34lasqp621"))))
(inputs (list bash-minimal
guile-3.0-latest
guile-json-4

312
gnu/packages/emacs-xyz.scm
View File

@ -5045,18 +5045,20 @@ mode, which displays information about Elasticsearch clusters.")
(license license:gpl3+)))
(define-public emacs-expand-region
(package
(let ((commit "c5c4362741deebb0985a8a29f9b8b0e25160764a")
(revision "1"))
(package
(name "emacs-expand-region")
(version "0.11.0")
(version (git-version "0.11.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/magnars/expand-region.el")
(commit version)))
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35"))))
(base32 "17h58v5mnggbrwrp61cwkqx8hzazkdqyz9p6s1hl9g2hys7zkb00"))))
(build-system emacs-build-system)
(home-page "https://github.com/magnars/expand-region.el")
(synopsis "Increase selected region by semantic units")
@ -5064,7 +5066,7 @@ mode, which displays information about Elasticsearch clusters.")
"Expand region increases the selected region by semantic units. Just
keep pressing the key until it selects what you want. There's also
@code{er/contract-region} if you expand too far.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-explain-pause-mode
(let ((commit "2356c8c3639cbeeb9751744dbe737267849b4b51")
@ -13326,7 +13328,6 @@ passive voice.")
#:test-command '("make" "test-dirty")
#:phases
(modify-phases %standard-phases
(delete 'build)
(add-before 'check 'make
(lambda _
(invoke "make" (string-append "ORGVERSION=" ,version))))
@ -13399,23 +13400,24 @@ compatible with the Org stable version.")
(license license:gpl3+)))
(define-public emacs-org-contacts
;;; XXX: Upstream made no release yet.
(let ((commit "3d2f39f62aefb0a32d10607703e8b1d4f43821fa")
(revision "0"))
;; XXX: Upstream does not tag version bumps. Commit below matches latest
;; version bump.
(let ((commit "217ba04c9d638067a6ccb0829cf1885f54c1d568"))
(package
(name "emacs-org-contacts")
(version (git-version "0" revision commit))
(version "1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/stardiviner/org-contacts.el")
(url "https://repo.or.cz/org-contacts")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0a654406w8zd1hbp8ckc975jhl9mi14xzqizzwiki625dymiw5g5"))))
(base32 "0f0vjdvx0hffj2xvyrya8yfl77djmzmpxdxsx58ym4lmdvwyb6x3"))))
(build-system emacs-build-system)
(home-page "https://github.com/stardiviner/org-contacts.el")
(propagated-inputs (list emacs-org))
(home-page "https://repo.or.cz/org-contacts")
(synopsis "Contacts management system for Org mode")
(description "Manage your contacts from Org mode. You can auto
complete email addresses, export contacts to a vCard file, put birthdays
@ -14159,6 +14161,34 @@ automatically using existing List-ID headers in your mu database. Just press
automatically discovered and presented in recency order.")
(license license:gpl3+))))
(define-public emacs-mentor
(package
(name "emacs-mentor")
(version "0.3.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.nongnu.org/nongnu/mentor-"
version ".tar"))
(sha256
(base32
"01zrvfk2njzyzjzkvp5hv5cjl1k1qjrila1ab4bv26gf6bkq5xh3"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-async emacs-xml-rpc))
(home-page "https://elpa.nongnu.org/nongnu/mentor.html")
(synopsis "Emacs front-end for the rTorrent bittorrent client")
(description
"Mentor is a GNU Emacs frontend for the rTorrent bittorrent client.
By default, it will start and run rTorrent from within Emacs but can also be
configured to use an external rTorrent instance over XML-RPC.
This project aims to provide a feature complete and customizable interface,
that will feel familiar to Emacs users. Key bindings are chosen to be as
close to the vanilla rTorrent curses interface as possible.")
(license license:gpl3+)))
(define-public emacs-message-view-patch
(let ((commit "40bc2e554fc1d0b6f0c403192c0a3ceaa019a78d")
(revision "2"))
@ -15814,8 +15844,8 @@ lines, and @code{gc} to comment out the target of a motion.")
;; Tests for emacs-ansi have a circular dependency with ert-runner, and
;; therefore cannot be run
(define-public emacs-ansi
(let ((commit "a41d5cc719297515d85bb5256980cd1204a71b88")
(revision "1"))
(let ((commit "2367fba7b3b2340364a30cd6de7f3eb6bb9898a3")
(revision "2"))
(package
(name "emacs-ansi")
(version (git-version "0.4.1" revision commit))
@ -15827,10 +15857,8 @@ lines, and @code{gc} to comment out the target of a motion.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "051v8dmji90chwbsyqsqry7h35mksal2j6rgw1kpmjsni86d79y1"))))
(base32 "1n7h6l4icm6lks3zpvd83j1fzrnspw19rmz7c96vy7pdh1y4v3p3"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-dash emacs-s))
(home-page "https://github.com/rejeep/ansi.el")
(synopsis "Convert strings to ANSI")
(description "@code{emacs-ansi} defines functions that turns simple
@ -16544,33 +16572,31 @@ which avoids some of the issues with using Emacs’s built-in Url library.")
(license license:gpl3+)))
(define-public emacs-ement
(let ((commit "02015eacf682b53baaddf26c8a4046e6ff84d4e8")
(revision "3"))
(package
(name "emacs-ement")
(version (git-version "0.1-pre" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/ement.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0xnhhzl1si09l7lgh5smgpmxgbkzi8p68dykdgsawqa960w6n1ks"))))
(build-system emacs-build-system)
(arguments
`(#:emacs ,emacs)) ;need libxml support
(propagated-inputs
(list emacs-plz
emacs-svg-lib
emacs-taxy
emacs-taxy-magit-section
emacs-ts))
(home-page "https://github.com/alphapapa/ement.el")
(synopsis "Matrix client for Emacs")
(description "Ement.el is a Matrix client for Emacs.")
(license license:gpl3+))))
(package
(name "emacs-ement")
(version "0.1.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/ement.el")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "075mwlc616rr86zgli36n6r8w09c5cvlk43by0f1xzla5rmiza8r"))))
(build-system emacs-build-system)
(arguments
`(#:emacs ,emacs)) ;need libxml support
(propagated-inputs
(list emacs-plz
emacs-svg-lib
emacs-taxy
emacs-taxy-magit-section
emacs-ts))
(home-page "https://github.com/alphapapa/ement.el")
(synopsis "Matrix client for Emacs")
(description "Ement.el is a Matrix client for Emacs.")
(license license:gpl3+)))
(define-public emacs-rpm-spec-mode
(let ((commit "c1c38050c48ea330c7cea632b8785d66daeefb2b")
@ -17634,7 +17660,7 @@ languages while remaining inside the primary Org buffer.")
(define-public eless
(package
(name "eless")
(version "0.6")
(version "0.7")
(source
(origin
(method git-fetch)
@ -17643,7 +17669,7 @@ languages while remaining inside the primary Org buffer.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1xif339wsc79hsab3l1nnwvy20jg7s1r4akfj4qqi6qxizfhmb52"))))
(base32 "01gpzg35v972ik4bimcyhqabjca6sjj41kw2i15xj1k33p4sjqpf"))))
(build-system copy-build-system)
(inputs
(list bash emacs))
@ -17925,7 +17951,9 @@ formatting rules for that language.")
(file-name (git-file-name name version))
(sha256
(base32
"0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m"))))
"0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m"))
(patches
(search-patches "emacs-kv-fix-tests.patch"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
@ -25153,7 +25181,7 @@ according to their use.")
(define-public emacs-detached
(package
(name "emacs-detached")
(version "0.7")
(version "0.8.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -25162,22 +25190,17 @@ according to their use.")
(file-name (git-file-name name version))
(sha256
(base32
"160h60vrpxslw6y290ndc065cc75dab58aq7kjqash94vkifnii2"))))
"190sil04wbnnml7i1nv19xn8fpqwng9xngpsxvmfxj3bzn7slid6"))))
(arguments
(list
#:tests? #t
#:test-command #~(list "ert-runner")
#:phases
#~(modify-phases %standard-phases
(add-before 'install 'install-detached-env
(lambda _
(install-file "detached-env" (string-append #$output "/bin"))))
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
(make-file-writable "detached.el")
(emacs-substitute-variables "detached.el"
("detached-env"
(string-append #$output "/bin/detached-env"))
("detached-dtach-program"
(search-input-file inputs "/bin/dtach"))
("detached-shell-program"
@ -25676,7 +25699,7 @@ processes for Emacs.")
(define-public emacs-treemacs
(package
(name "emacs-treemacs")
(version "2.10")
(version "3.0")
(source
(origin
(method git-fetch)
@ -25685,7 +25708,7 @@ processes for Emacs.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np"))))
(base32 "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-ace-window
@ -25700,46 +25723,57 @@ processes for Emacs.")
(inputs
(list python))
(arguments
`(#:tests? #t
#:test-command '("make" "-C" "../.." "test")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-makefile
(lambda _
(substitute* "Makefile"
(("@\\$\\(CASK\\) exec ") "")
;; Guix does not need to prepare dependencies before testing.
(("test: prepare") "test:"))))
(add-after 'fix-makefile 'chdir-elisp
;; Elisp directory is not in root of the source.
(lambda _
(chdir "src/elisp")))
(add-before 'install 'patch-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion "../.." ;treemacs root
(chmod "src/elisp/treemacs-core-utils.el" #o644)
(emacs-substitute-variables "src/elisp/treemacs-core-utils.el"
("treemacs-dir"
(string-append (assoc-ref outputs "out") "/")))
(chmod "src/elisp/treemacs-icons.el" #o644)
(substitute* "src/elisp/treemacs-icons.el"
(("icons/default") "share/emacs-treemacs/images"))
(chmod "src/elisp/treemacs-customization.el" #o644)
(emacs-substitute-variables "src/elisp/treemacs-customization.el"
("treemacs-python-executable"
(search-input-file inputs "/bin/python3")))
(chmod "src/elisp/treemacs-async.el" #o644)
(substitute* "src/elisp/treemacs-async.el"
(("src/scripts") (string-append "share/" ,name "/scripts"))))))
(add-after 'install 'install-data
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion "../.." ;treemacs root
(copy-recursively "icons/default"
(string-append out "/share/" ,name "/images"))
(copy-recursively
"src/scripts"
(string-append out "/share/" ,name "/scripts")))))))))
(list
#:tests? #t
#:test-command #~(list "make" "-C" "../.." "test")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-makefile
(lambda _
(substitute* "Makefile"
(("@\\$\\(CASK\\) exec ") "")
;; Guix does not need to prepare dependencies before testing.
(("test: prepare") "test:"))))
(add-after 'fix-makefile 'chdir-elisp
;; Elisp directory is not in root of the source.
(lambda _
(chdir "src/elisp")))
(add-before 'check 'delete-failing-tests
;; FIXME: 4 tests out of 254 are failing.
(lambda _
(emacs-batch-edit-file "../../test/treemacs-test.el"
'(progn
(goto-char (point-min))
(re-search-forward "describe \"treemacs--parent\"")
(beginning-of-line)
(kill-sexp)
(basic-save-buffer)))))
(add-before 'install 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(make-file-writable "treemacs-core-utils.el")
(emacs-substitute-variables "treemacs-core-utils.el"
("treemacs-dir" (string-append #$output "/")))
(make-file-writable "treemacs-icons.el")
(substitute* "treemacs-icons.el"
(("icons/default")
(string-append (elpa-directory #$output) "/icons/default")))
(make-file-writable "treemacs-customization.el")
(emacs-substitute-variables "treemacs-customization.el"
("treemacs-python-executable"
(search-input-file inputs "/bin/python3")))
(make-file-writable "treemacs-async.el")
(substitute* "treemacs-async.el"
(("src/scripts")
(string-append (elpa-directory #$output) "/scripts")))))
(add-after 'install 'install-data
(lambda _
(with-directory-excursion "../.." ;treemacs root
(copy-recursively
"icons/default"
(string-append (elpa-directory #$output) "/icons/default"))
(copy-recursively
"src/scripts"
(string-append (elpa-directory #$output) "/scripts"))))))))
(home-page "https://github.com/Alexander-Miller/treemacs")
(synopsis "Emacs tree style file explorer")
(description
@ -25761,7 +25795,8 @@ utilities.")
("emacs-magit" ,emacs-magit)
("emacs-projectile" ,emacs-projectile)
("emacs-perspective" ,emacs-perspective)
("emacs-persp-mode" ,emacs-persp-mode)))
("emacs-persp-mode" ,emacs-persp-mode)
("mu" ,mu)))
(arguments
(substitute-keyword-arguments
(package-arguments emacs-treemacs)
@ -25773,9 +25808,9 @@ utilities.")
(define-public emacs-libyaml
;; Upstream made no release so far.
(let ((version "0")
(let ((version "0.1")
(revision "1")
(commit "703e0d448c7ee24e25b513a3c65980c80e166805"))
(commit "961e0d8b9ef47464c049e07be7fcefd3903f8cbc"))
(package
(name "emacs-libyaml")
(version (git-version version revision commit))
@ -25787,34 +25822,33 @@ utilities.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "08l7pm9v50ykd3fkbm0bh2kcd57cadbc5i9r6rj51vd32w3pl2yl"))))
(base32 "1c85583r47yjbpzbjgjzrwzqdlmy229xx9az2r18smcyd9da92c3"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f ;no test
#:modules ((guix build emacs-build-system)
(list
#:tests? #f ;no test
#:modules '((guix build emacs-build-system)
(guix build emacs-utils)
(guix build utils))
#:imported-modules (,@%emacs-build-system-modules
#:imported-modules `(,@%emacs-build-system-modules
(guix build gnu-build-system))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'substitute-libyaml-core-path
(lambda* (#:key outputs #:allow-other-keys)
(chmod "libyaml.el" #o644)
(substitute* "libyaml.el"
(("^\\(require 'libyaml-core\\)")
(string-append "(module-load \"" (assoc-ref outputs "out")
"/lib/libyaml-core.so\")")))
#t))
(add-after 'check 'make
;; Run make.
(lambda* (#:key (make-flags '()) outputs #:allow-other-keys)
;; Compile the shared object file.
(apply invoke "make" "all" "CPPFLAGS=" make-flags)
;; Move the file into /lib.
(install-file "libyaml-core.so"
(string-append (assoc-ref outputs "out") "/lib"))
#t)))))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'substitute-libyaml-core-path
(lambda _
(make-file-writable "libyaml.el")
(substitute* "libyaml.el"
(("^\\(require 'libyaml-core\\)")
(string-append "(module-load \"" #$output
"/lib/libyaml-core.so\")")))))
(add-after 'check 'make
;; Run make.
(lambda* (#:key (make-flags '()) #:allow-other-keys)
;; Compile the shared object file.
(apply invoke "make" "all" "CPPFLAGS=" make-flags)
;; Move the file into /lib.
(install-file "libyaml-core.so"
(string-append #$output "/lib")))))))
(native-inputs (list libyaml))
(home-page "https://github.com/syohex/emacs-libyaml")
(synopsis "Libyaml bindings for Emacs")
@ -29722,6 +29756,30 @@ It also provides original Helm commands: @command{helm-cider-spec},
data format @code{edn}. See @url{https://github.com/edn-format/edn}.")
(license license:gpl3+))))
(define-public emacs-ednc
(let ((commit "940a4adbbeb3b6b1a72270a814d52770dd89a997")
(revision "1"))
(package
(name "emacs-ednc")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sinic/ednc")
(commit commit)))
(sha256
(base32 "1gsx2qgv5xm9r0i0axd4hf31g2rq2m4a1hvnif48g4xb0llss73c"))))
(build-system emacs-build-system)
(home-page "https://github.com/sinic/ednc")
(synopsis "Emacs Desktop Notification Center")
(description
"The Emacs Desktop Notification Center (EDNC) is an Emacs package written
in pure Lisp that implements a Desktop Notifications service according to the
freedesktop.org specification. EDNC aspires to be a small, but flexible
drop-in replacement of standalone daemons like Dunst.")
(license license:gpl3+))))
(define-public emacs-helm-clojuredocs
(let ((commit "5a7f0f2cb401be0b09e73262a1c18265ab9a3cea"))
(package
@ -31704,7 +31762,7 @@ and preferred services can easily be configured.")
(define-public emacs-vertico
(package
(name "emacs-vertico")
(version "0.26")
(version "0.27")
(source
(origin
(method git-fetch)
@ -31713,7 +31771,7 @@ and preferred services can easily be configured.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "16bv4pfc3k37dqyj1va3cb24db36pn8hsazk3ak4xhrgf2q5l548"))))
(base32 "17ip4v0hkv9q2fsnpja24jnf5d5zn4g91553n2s0l5c6gwwpilkp"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@ -31930,7 +31988,7 @@ for detecting and improve non-idiomatic Clojure source code.")
(define-public emacs-mint-mode
(package
(name "emacs-mint-mode")
(version "1.0.2")
(version "1.0.3")
(source
(origin
(method git-fetch)
@ -31939,7 +31997,7 @@ for detecting and improve non-idiomatic Clojure source code.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1v8mp1k24lzvc0mh9l4k3fwzr4sr87f5p9ahpy7263pcbvcy11vl"))))
(base32 "19szk2dhsa0771kbg1ywp0zz8j6akysvwmmrx2bihq8h5j4y23pg"))))
(build-system emacs-build-system)
(arguments '(#:include '("\\.el$" "\\.txt$")))
(home-page "https://github.com/creatorrr/emacs-mint-mode")

64
gnu/packages/emacs.scm
View File

@ -45,6 +45,7 @@
#:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (gnu packages)
@ -55,6 +56,7 @@
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gd)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
@ -81,6 +83,13 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
(define (%emacs-modules build-system)
(let ((which (build-system-name build-system)))
`((guix build ,(symbol-append which '-build-system))
(guix build utils)
(srfi srfi-1)
(ice-9 ftw))))
(define-public emacs
(package
(name "emacs")
@ -129,11 +138,33 @@
(arguments
(list
#:tests? #f ; no check target
#:modules (%emacs-modules build-system)
#:configure-flags #~(list "--with-modules"
"--with-cairo"
"--with-native-compilation"
"--disable-build-details")
#:make-flags #~(list "NATIVE_FULL_AOT=1")
#:phases
#~(modify-phases %standard-phases
(add-after 'set-paths 'set-libgccjit-path
(lambda* (#:key inputs #:allow-other-keys)
(define (first-subdirectory/absolute directory)
(let ((files (scandir
directory
(lambda (file)
(and (not (member file '("." "..")))
(file-is-directory? (string-append
directory "/"
file)))))))
(and (not (null? files))
(string-append directory "/" (car files)))))
(let* ((libgccjit-libdir
(first-subdirectory/absolute ;; version
(first-subdirectory/absolute ;; host type
(search-input-directory inputs "lib/gcc")))))
(setenv "LIBRARY_PATH"
(string-append (getenv "LIBRARY_PATH")
":" libgccjit-libdir)))))
(add-after 'unpack 'enable-elogind
(lambda _
(substitute* "configure.ac"
@ -164,6 +195,20 @@
(("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process)
(format #f "(or ~a (tramp-compat-process-running-p ~s))"
all (string-append "." process "-real"))))))
(add-after 'unpack 'patch-compilation-driver
(lambda _
(substitute* "lisp/emacs-lisp/comp.el"
(("\\(defcustom native-comp-driver-options nil")
(format
#f "(defcustom native-comp-driver-options '(~@{~s~^ ~})"
(string-append
"-B" #$(this-package-input "binutils") "/bin/")
(string-append
"-B" #$(this-package-input "glibc") "/lib/")
(string-append
"-B" #$(this-package-input "libgccjit") "/lib/")
(string-append
"-B" #$(this-package-input "libgccjit") "/lib/gcc/"))))))
(add-before 'configure 'fix-/bin/pwd
(lambda _
;; Use `pwd', not `/bin/pwd'.
@ -256,6 +301,14 @@
(list gnutls
ncurses
;; To "unshadow" ld-wrapper in native builds
(make-ld-wrapper "ld-wrapper" #:binutils binutils)
;; For native compilation
binutils
glibc
libgccjit
;; Required for "core" functionality, such as dired and compression.
coreutils
gzip
@ -307,6 +360,9 @@
(list (search-path-specification
(variable "EMACSLOADPATH")
(files '("share/emacs/site-lisp")))
(search-path-specification
(variable "EMACSNATIVELOADPATH")
(files '("lib/emacs/native-site-lisp")))
(search-path-specification
(variable "INFOPATH")
(files '("share/info")))))
@ -378,11 +434,14 @@ GTK and also enables xwidgets.")))
(substitute-keyword-arguments (package-arguments emacs)
((#:configure-flags flags #~'())
#~(list "--with-gnutls=no" "--disable-build-details"))
((#:modules _) (%emacs-modules build-system))
((#:phases phases)
#~(modify-phases #$phases
(delete 'restore-emacs-pdmp)
(delete 'strip-double-wrap)))))
(inputs (list ncurses coreutils gzip))
(inputs (list ncurses coreutils gzip
(make-ld-wrapper "ld-wrapper" #:binutils binutils)
binutils glibc libgccjit zlib))
(native-inputs (list autoconf pkg-config))))
(define-public emacs-xwidgets
@ -395,6 +454,7 @@ editor (with xwidgets support)")
(substitute-keyword-arguments (package-arguments emacs)
((#:configure-flags flags #~'())
#~(cons "--with-xwidgets" #$flags))
((#:modules _) (%emacs-modules build-system))
((#:phases phases)
#~(modify-phases #$phases
(delete 'restore-emacs-pdmp)
@ -419,6 +479,7 @@ editor (console only)")
(substitute-keyword-arguments (package-arguments emacs)
((#:configure-flags flags #~'())
#~(delete "--with-cairo" #$flags))
((#:modules _) (%emacs-modules build-system))
((#:phases phases)
#~(modify-phases #$phases
(delete 'restore-emacs-pdmp)
@ -437,6 +498,7 @@ editor (without an X toolkit)" )
(substitute-keyword-arguments (package-arguments emacs)
((#:configure-flags flags #~'())
#~(cons "--with-x-toolkit=no" #$flags))
((#:modules _) (%emacs-modules build-system))
((#:phases phases)
#~(modify-phases #$phases
(delete 'restore-emacs-pdmp)

11
gnu/packages/embedded.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020, 2021, 2022 Simon South <simon@simonsouth.net>
@ -1330,7 +1330,14 @@ these identified regions.
(file-name (git-file-name name version))
(sha256
(base32
"1d10qxyghz66zp7iqpm8q8rfv9jz9n609gxmfcav1lssmf1dlyk3"))))
"1d10qxyghz66zp7iqpm8q8rfv9jz9n609gxmfcav1lssmf1dlyk3"))
(modules '((guix build utils)))
(snippet
;; Make tests compatible with PyYAML 6 and later.
'(substitute* '("tests/test_program.py"
"tests/test_fuzzing.py")
(("yaml\\.load\\(test_file\\.read\\(\\)\\)")
"yaml.load(test_file.read(), Loader=yaml.SafeLoader)")))))
(build-system python-build-system)
(propagated-inputs
(list python-pyserial python-pyusb python-tqdm))

10
gnu/packages/engineering.scm
View File

@ -2952,7 +2952,15 @@ dynamic calibration of the milling depth.")
(("message\\(STATUS \"Using in-tree mimalloc\"\\)")
"message(STATUS \"Using guix packaged mimalloc\")")
(("add_subdirectory\\(extlib/mimalloc EXCLUDE_FROM_ALL\\)")
"find_package(mimalloc REQUIRED)")))))))
"find_package(mimalloc REQUIRED)"))))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/solvespace")
;; For GtkFileChooserDialog.
`("GSETTINGS_SCHEMA_DIR" =
(,(string-append (assoc-ref inputs "gtk+")
"/share/glib-2.0/schemas")))))))))
(inputs (list cairo
eigen
freetype

15
gnu/packages/enlightenment.scm
View File

@ -385,7 +385,7 @@ embedded systems.")
(define-public python-efl
(package
(name "python-efl")
(version "1.25.0")
(version "1.26.0")
(source
(origin
(method url-fetch)
@ -393,7 +393,7 @@ embedded systems.")
"python/python-efl-" version ".tar.xz"))
(sha256
(base32
"0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"))
"0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"))
(modules '((guix build utils)))
;; Remove files generated by Cython
(snippet
@ -404,8 +404,7 @@ embedded systems.")
(when (file-exists? generated-file)
(delete-file generated-file))))
(find-files "efl" "\\.pyx$"))
(delete-file "efl/eo/efl.eo_api.h")
#t))))
(delete-file "efl/eo/efl.eo_api.h")))))
(build-system python-build-system)
(arguments
'(#:phases
@ -418,20 +417,18 @@ embedded systems.")
(lambda _
(setenv "CFLAGS"
(string-append "-I" (assoc-ref %build-inputs "python-dbus")
"/include/dbus-1.0"))
#t))
"/include/dbus-1.0"))))
(add-before 'check 'set-environment
(lambda _
;; Some tests require write access to HOME.
(setenv "HOME" "/tmp")
;; These tests try to connect to the internet.
(delete-file "tests/ecore/test_09_file_download.py")
(delete-file "tests/ecore/test_11_con.py")
#t)))))
(delete-file "tests/ecore/test_11_con.py"))))))
(native-inputs
(list pkg-config python-cython))
(inputs
(list efl python-dbus))
(list efl python-dbus python-packaging))
(home-page "https://www.enlightenment.org/")
(synopsis "Python bindings for EFL")
(description

20
gnu/packages/esolangs.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Hendursaga <hendursaga@yahoo.com>
;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -29,6 +30,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
@ -99,6 +101,24 @@ whenever possible to the extent that the above points are not compromized.
(home-page "http://lolcode.org/")
(license license:gpl3+))))
(define-public folders
(package
(name "folders")
(version "0.0.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Folders" version))
(sha256
(base32 "0qh80qx7sjx0zii1hf8fm853d9rcg4rginm6v4gpp0hgn2a4q4gh"))))
(build-system python-build-system)
(home-page "https://github.com/SinaKhalili/Folders.py")
(synopsis "Structural programming language")
(description "Folders is a programming language, in which programs
are encoded as (nested) directories. Note that the switches you pass to
@command{du} may affect your score when code golfing.")
(license license:expat)))
(define-public shakespeare-spl
(package
(name "shakespeare-spl")

80
gnu/packages/fcitx.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -22,6 +23,7 @@
#:use-module ((guix licenses) #:select (gpl2+ bsd-3))
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
@ -150,55 +152,55 @@ by the different predictive algorithms.")
(define-public fcitx
(package
(name "fcitx")
(version "4.2.9.8")
(version "4.2.9.9")
(source (origin
(method url-fetch)
(uri (string-append "http://download.fcitx-im.org/fcitx/"
(uri (string-append "https://download.fcitx-im.org/fcitx/"
"fcitx-" version "_dict.tar.xz"))
(sha256
(base32
"1iik80l7g8yk9iwsls6nl9whwgm0sj8i7s6s0bz4c5anl35iaddw"))))
"0x5980l7ry34scvfdwc330d9nxv3id9jj9wcl7bvqjkp32gz3aj5"))))
(build-system cmake-build-system)
(outputs '("out" "gtk2" "gtk3"))
(arguments
`(#:configure-flags
(list "-DENABLE_TEST=ON"
(string-append "-DXKB_RULES_XML_FILE="
(assoc-ref %build-inputs "xkeyboard-config")
"/share/X11/xkb/rules/evdev.xml")
"-DENABLE_GTK2_IM_MODULE=ON"
"-DENABLE_GTK3_IM_MODULE=ON"
(string-append "-DGTK2_IM_MODULEDIR="
(assoc-ref %outputs "gtk2")
"/lib/gtk-2.0/2.10.0/immodules")
(string-append "-DGTK3_IM_MODULEDIR="
(assoc-ref %outputs "gtk3")
"/lib/gtk-3.0/3.0.0/immodules")
;; XXX: Enable GObject Introspection and Qt4 support.
"-DENABLE_GIR=OFF"
"-DENABLE_QT=OFF"
"-DENABLE_QT_IM_MODULE=OFF")))
(list
#:configure-flags
#~(list "-DENABLE_TEST=ON"
(string-append "-DXKB_RULES_XML_FILE="
(search-input-file
%build-inputs "share/X11/xkb/rules/evdev.xml"))
"-DENABLE_GTK2_IM_MODULE=ON"
"-DENABLE_GTK3_IM_MODULE=ON"
(string-append "-DGTK2_IM_MODULEDIR="
#$output:gtk2
"/lib/gtk-2.0/2.10.0/immodules")
(string-append "-DGTK3_IM_MODULEDIR="
#$output:gtk3
"/lib/gtk-3.0/3.0.0/immodules")
;; XXX: Enable GObject Introspection and Qt4 support.
"-DENABLE_GIR=OFF"
"-DENABLE_QT=OFF"
"-DENABLE_QT_IM_MODULE=OFF")))
(native-inputs
`(("doxygen" ,doxygen)
("extra-cmake-modules"
;; XXX: We can't simply #:use-module due to a cycle somewhere.
,(module-ref
(resolve-interface '(gnu packages kde-frameworks))
'extra-cmake-modules))
("glib:bin" ,glib "bin") ; for glib-genmarshal
("pkg-config" ,pkg-config)))
(list doxygen
;; XXX: We can't simply #:use-module due to a cycle somewhere.
(module-ref
(resolve-interface '(gnu packages kde-frameworks))
'extra-cmake-modules)
`(,glib "bin") ; for glib-genmarshal
pkg-config))
(inputs
`(("dbus" ,dbus)
("enchant" ,enchant-1.6)
("gettext" ,gettext-minimal)
("gtk2" ,gtk+-2)
("gtk3" ,gtk+)
("icu4c" ,icu4c)
("iso-codes" ,iso-codes)
("json-c" ,json-c)
("libxkbfile" ,libxkbfile)
("libxml2" ,libxml2)
("xkeyboard-config" ,xkeyboard-config)))
(list dbus
enchant-1.6
gettext-minimal
gtk+-2
gtk+
icu4c
iso-codes
json-c
libxkbfile
libxml2
xkeyboard-config))
(home-page "https://fcitx-im.org")
(synopsis "Input method framework")
(description

21
gnu/packages/finance.scm
View File

@ -1639,7 +1639,7 @@ a client based on Qt. This is a fork of Bitcoin Core.")
(define-public libofx
(package
(name "libofx")
(version "0.9.15")
(version "0.10.7")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1648,14 +1648,15 @@ a client based on Qt. This is a fork of Bitcoin Core.")
(file-name (git-file-name name version))
(sha256
(base32
"1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy"))))
"1k3ygavyb9b3f1ra62dsa46iiia0a1588yn3zy7bh7w4vfcrbd6d"))))
(build-system gnu-build-system)
(arguments
'(#:parallel-build? #f ;fails with -j64
#:configure-flags
(list (string-append "--with-opensp-includes="
(assoc-ref %build-inputs "opensp")
"/include/OpenSP"))))
(list
#:parallel-build? #f ;fails with -j64
#:configure-flags
#~(list (string-append "--with-opensp-includes="
(search-input-directory %build-inputs
"include/OpenSP")))))
(native-inputs
(list autoconf
automake
@ -1664,9 +1665,9 @@ a client based on Qt. This is a fork of Bitcoin Core.")
libtool
pkg-config))
(inputs
`(("curl" ,curl)
("libxml++-2" ,libxml++-2)
("opensp" ,opensp)))
(list curl
libxml++-2
opensp))
(home-page "http://libofx.sourceforge.net/")
(synopsis "Library supporting the Open Financial Exchange format")
(description

6
gnu/packages/fonts.scm
View File

@ -42,7 +42,7 @@
;;; Copyright © 2021 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2021, 2022 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2022 Kitzman <kitzman@disroot.org>
;;; Copyright © 2021 Wamm K. D. <jaft.r@outlook.com>
@ -1993,7 +1993,7 @@ formatting.")
(define-public font-plemoljp
(package
(name "font-plemoljp")
(version "1.2.2")
(version "1.2.7")
(source (origin
(method url-fetch)
(uri (string-append
@ -2001,7 +2001,7 @@ formatting.")
"v" version "/PlemolJP_v" version ".zip"))
(sha256
(base32
"03cwzkqg09c87lmsx9xfzdrlgjml93bhhp1dqq3qkpdfww30wkaw"))))
"0pkkys5kl5s79shd1jmwfyk469ih8cymqb4vjwdadj52kzq4m9z6"))))
(build-system font-build-system)
(home-page "https://github.com/yuru7/PlemolJP")
(synopsis "Plex Mono Language JP")

31
gnu/packages/fontutils.scm
View File

@ -9,11 +9,10 @@
;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
;;;
@ -145,7 +144,15 @@ them as it goes.")
(method url-fetch)
(uri (pypi-uri "afdko" version))
(sha256
(base32 "171r9f7n8fgz37dkcgpzj508lxfafcyzzx43ps12j1z2nk1sk905"))))
(base32 "171r9f7n8fgz37dkcgpzj508lxfafcyzzx43ps12j1z2nk1sk905"))
(modules '((guix build utils)))
(snippet
#~(begin
(with-directory-excursion "c/makeotf/lib/hotconv"
;; Delete ANTLR-generated code.
(for-each delete-file
(find-files
"." "Feat(Parser|Lexer).*\\.(h|cpp|interp|tokens)$")))))))
(build-system python-build-system)
(arguments
(list
@ -173,6 +180,17 @@ them as it goes.")
(substitute* "c/makeotf/lib/hotconv/CMakeLists.txt"
(("antlr4_static")
"antlr4-runtime"))))
(add-after 'unpack 'regenerate-hotconv-grammar
(lambda _
(let ((antlr-version #$(package-version
(this-package-native-input "antlr4"))))
(with-directory-excursion "c/makeotf/lib/hotconv"
(substitute* "BuildGrammar.py"
(("antlr_version = .*")
(string-append "antlr_version = \""
antlr-version
"\"")))
(invoke "python" "BuildGrammar.py")))))
;; The test suite expects the commands to be Python rather than
;; shell scripts, so move the wrap phase after the tests.
(delete 'wrap)
@ -195,7 +213,12 @@ them as it goes.")
`("PATH" prefix (,bindir))))
commands)))))))
(native-inputs
(list ninja python-pytest python-scikit-build python-setuptools-scm
(list antlr4
openjdk ;required by antlr4
ninja
python-pytest
python-scikit-build
python-setuptools-scm
python-wheel))
(inputs (list java-antlr4-runtime-cpp `(,util-linux "lib")))
(propagated-inputs

88
gnu/packages/freedesktop.scm
View File

@ -940,6 +940,48 @@ backends, PackageKit can perform these tasks using the appropriate package
manager for the current system.")
(license license:gpl2+)))
(define-public python-libevdev
(package
(name "python-libevdev")
(version "0.11")
(source (origin
(method url-fetch)
(uri (pypi-uri "libevdev" version))
(sha256
(base32
"03snix86j0angq0lydp29f8833clxq8h0x4spmh8lj7j9mm01jp9"))))
(build-system python-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-dlopen-calls
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "libevdev/_clib.py"
(("libevdev.so.2")
(search-input-file inputs "lib/libevdev.so.2")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv" "test")))))))
(native-inputs (list python-pytest))
(inputs (list libevdev))
(home-page "https://gitlab.freedesktop.org/libevdev/python-libevdev")
(synopsis "Python wrapper for libevdev")
(description "This package provides a Python wrapper around
@code{libevdev}, taking advantage of @code{libevdev}'s advanced event
handling. Documentation is available at
@url{https://python-libevdev.readthedocs.io/en/latest/}.
@code{libevdev} makes it easy to:
@itemize
@item read and parse events from an input device;
@item create a virtual input device and make it send events;
@item duplicate an existing device and modify the event stream.
@end itemize
For information about libevdev, see:
@url{https://freedesktop.org/wiki/Software/libevdev/}.")
(license license:expat)))
(define-public python-pyxdg
(package
(name "python-pyxdg")
@ -1080,7 +1122,6 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.")
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
;;; This is just a temporary package that should be deleted
(define-public wayland-protocols-next
(package
(inherit wayland-protocols)
@ -1514,12 +1555,14 @@ message bus.")
python-dbusmock
python-pygobject))
(inputs
(list coreutils-minimal
(list bash-minimal
coreutils-minimal
dbus
elogind
shadow))
(propagated-inputs
(list polkit)) ; listed in Requires.private
;; accountsservice.pc 'Requires' these:
(list glib polkit))
(home-page "https://www.freedesktop.org/wiki/Software/AccountsService/")
(synopsis "D-Bus interface for user account query and manipulation")
(description
@ -1606,18 +1649,17 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
#:configure-flags
#~(list (string-append "--with-udev-base-dir=" #$output "/lib/udev"))))
(native-inputs
(list gettext-minimal
`(,glib "bin") ; for glib-mkenums
(list dbus
gettext-minimal
gobject-introspection
`(,glib "bin") ;for glib-mkenums
pkg-config
vala
;; For testing.
dbus
python
python-dbus
python-pygobject))
python-pygobject
vala))
(propagated-inputs
(list glib)) ; required by mm-glib.pc
(list glib)) ;required by mm-glib.pc
(inputs
(list libgudev libmbim libqmi polkit))
(synopsis "Mobile broadband modems manager")
@ -1729,27 +1771,35 @@ share connections to real-time communication services without conflicting.")
(define-public colord-gtk
(package
(name "colord-gtk")
(version "0.1.26")
(version "0.3.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.freedesktop.org/software/colord"
"/releases/" name "-" version ".tar.xz"))
(sha256
(base32
"0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"))))
(build-system gnu-build-system)
(arguments '(#:tests? #f)) ; require the colord system service
"1l61ydb0zv2ffilwpapgz5mm3bznr28zl16xqbxnz6kdsrb6cimr"))))
(build-system meson-build-system)
(arguments '(#:tests? #f ;require the colord system service
;; Building documentation fails with: "Cannot build man pages
;; without docbook-xsl-ns".
#:configure-flags (list "-Ddocs=false" "-Dman=false")))
(native-inputs
(list gobject-introspection intltool pkg-config vala))
(list gettext-minimal
gobject-introspection
pkg-config
vala))
(inputs
(list gtk+))
(propagated-inputs
;; colord-gtk.pc refers to all these.
(list colord gtk+))
(list colord gtk))
(synopsis "GTK integration for libcolord")
(home-page "https://www.freedesktop.org/software/colord/")
(description
"This is a GTK+ convenience library for interacting with colord. It is
useful for both applications which need colour management and applications that
wish to perform colour calibration.")
"This is a GTK convenience library for interacting with colord. It is
useful for both applications which need colour management and applications
that wish to perform colour calibration.")
(license license:lgpl2.1+)))
(define-public libfprint

153
gnu/packages/games.scm
View File

@ -1786,17 +1786,20 @@ destroying an ancient book using a special wand.")
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "meson_post_install.py"
(("gtk-update-icon-cache") "true"))
#t)))))
(("gtk-update-icon-cache") "true")))))))
(inputs
(list gtk+ clutter clutter-gtk libgee libgnome-games-support))
(list gtk+
clutter
clutter-gtk
libgee
libgnome-games-support-1))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for desktop-file-validate and appstream-util
("itstool" ,itstool)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(list gettext-minimal
`(,glib "bin") ; for desktop-file-validate and appstream-util
itstool
libxml2
pkg-config
vala))
(home-page "https://wiki.gnome.org/Apps/2048")
(synopsis "Move the tiles until you obtain the 2048 tile")
(description "GNOME 2048 provides a 2D grid for playing 2048, a
@ -6610,7 +6613,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
(define-public crawl
(package
(name "crawl")
(version "0.29.0")
(version "0.29.1")
(source
(origin
(method git-fetch)
@ -6619,7 +6622,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0cx67ln5qr4bawidi48ss63wflx7x22901da683c9wvy6m41vks8"))
(base32 "17bl8hdv2z3mpdfmd5gnwg3r1p9dqjbisiql24pxs1d33qcw0h7x"))
(patches (search-patches "crawl-upgrade-saves.patch"))))
(build-system gnu-build-system)
(inputs
@ -9308,60 +9311,56 @@ play with up to four players simultaneously. It has network support.")
(define-public hedgewars
(package
(name "hedgewars")
(version "1.0.0")
(version "1.0.2")
(source (origin
(method url-fetch)
(uri (string-append "https://www.hedgewars.org/download/releases/"
"hedgewars-src-" version ".tar.bz2"))
(patches (search-patches "hedgewars-network-bsd.patch"))
(sha256
(base32
"0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1"))))
"04pjpkjhpy720n803gv35iygmjdvsrmw13mih4ympjnqbgjfa7r0"))))
(build-system cmake-build-system)
(arguments
;; XXX: Engine is built as Pascal source code, requiring Free Pascal
;; Compiler, which we haven't packaged yet. With the flag below, we use
;; a Pascal to C translator and Clang instead.
`(#:configure-flags (list "-DBUILD_ENGINE_C=ON"
"-Dhaskell_flags=-dynamic;-fPIC")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-sources
(lambda _
;; Fix a missing 'include'.
(substitute* "QTfrontend/ui/page/pagegamestats.cpp"
(("#include <QSizePolicy>")
"#include <QSizePolicy>\n#include <QPainterPath>"))))
(replace 'check
(lambda _ (invoke "ctest")))
(add-after 'install 'install-icon
(lambda _
;; Install icon for the desktop file.
(let* ((out (assoc-ref %outputs "out"))
(icons (string-append out "/share/icons/hicolor/512x512/apps")))
(with-directory-excursion (string-append "../hedgewars-src-" ,version)
(install-file "misc/hedgewars.png" icons)))
#t)))))
(list
;; XXX: Engine is built as Pascal source code, requiring Free Pascal
;; Compiler, which we haven't packaged yet. With the flag below, we use
;; a Pascal to C translator and Clang instead.
#:configure-flags #~(list "-DBUILD_ENGINE_C=ON"
"-Dhaskell_flags=-dynamic;-fPIC")
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "ctest"))))
(add-after 'install 'install-icon
(lambda _
;; Install icon for the desktop file.
(let ((icons (string-append #$output
"/share/icons/hicolor/512x512/apps")))
(with-directory-excursion
(string-append "../hedgewars-src-" #$version)
(install-file "misc/hedgewars.png" icons))))))))
(inputs
`(("ffmpeg" ,ffmpeg)
("freeglut" ,freeglut)
("ghc-entropy" ,ghc-entropy)
("ghc-hslogger" ,ghc-hslogger)
("ghc-network" ,ghc-network)
("ghc-random" ,ghc-random)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-sandi" ,ghc-sandi)
("ghc-sha" ,ghc-sha)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-vector" ,ghc-vector)
("ghc-zlib" ,ghc-zlib)
("glew" ,glew)
("libpng" ,libpng)
("lua" ,lua-5.1)
("physfs" ,physfs)
("qtbase" ,qtbase-5)
("sdl" ,(sdl-union
(list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image)))))
(list ffmpeg
freeglut
ghc-entropy
ghc-hslogger
ghc-network
ghc-random
ghc-regex-tdfa
ghc-sandi
ghc-sha
ghc-utf8-string
ghc-vector
ghc-zlib
glew
libpng
lua-5.1
physfs
qtbase-5
(sdl-union
(list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image))))
(native-inputs
(list clang-9 ghc pkg-config qttools-5))
(home-page "https://hedgewars.org/")
@ -11169,3 +11168,45 @@ principle of prioritizing the guests' happiness with a well-maintained park.
Should they go unwise, a theme park plunge into chaos with vandalizing guests
and unsafe rides. Which path will you take?")
(license license:gpl2)))
(define-public steam-devices-udev-rules
;; Last release from 2019-04-10
(let ((commit "d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa")
(revision "0"))
(package
(name "steam-devices-udev-rules")
(version (git-version "1.0.0.61" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ValveSoftware/steam-devices")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1yqigraz9f19018ma5n2pbx7naadh9960lia3z8ayg7vz1fjdl54"))))
(build-system copy-build-system)
(arguments
'(#:install-plan '(("./" "lib/udev/rules.d"
#:include-regexp ("rules$")))
#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "60-steam-input.rules"
(("/bin/sh")
(search-input-file inputs "/bin/sh"))
(("udevadm")
(search-input-file inputs "/bin/udevadm"))))))))
(inputs (list eudev))
(home-page "https://github.com/ValveSoftware/steam-devices")
(synopsis "udev rules for game controllers and virtual reality devices")
(description
"This package provides a set of udev rules for game controllers and
virtual reality devices.")
(license license:expat))))
;;;
;;; 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
;;; functionality or similar names.
;;;

53
gnu/packages/gcc.scm
View File

@ -993,31 +993,43 @@ as the 'native-search-paths' field."
(custom-gcc gcc-11 "gdc" '("d")
%generic-search-paths)))
(define-public libgccjit
(define-public (make-libgccjit gcc)
(package
(inherit gcc-9)
(inherit gcc)
(name "libgccjit")
(outputs (delete "lib" (package-outputs gcc)))
(properties (alist-delete 'hidden? (package-properties gcc)))
(arguments
(substitute-keyword-arguments `(#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 regex)
(srfi srfi-1)
(srfi srfi-26))
,@(package-arguments gcc))
(substitute-keyword-arguments (package-arguments gcc)
((#:modules _ '())
'((guix build gnu-build-system)
(guix build utils)
(ice-9 regex)
(srfi srfi-1)
(srfi srfi-26)))
((#:configure-flags flags)
`(append `("--enable-host-shared"
,(string-append "--enable-languages=jit"))
#~(cons* "--disable-bootstrap"
"--disable-libatomic"
"--disable-libgomp"
"--disable-libquadmath"
"--disable-libssp"
"--enable-host-shared"
"--enable-checking=release"
"--enable-languages=jit"
(remove (cut string-match "--enable-languages.*" <>)
,flags)))
#$flags)))
((#:phases phases)
`(modify-phases ,phases
(add-after 'install 'remove-broken-or-conflicting-files
(lambda* (#:key outputs #:allow-other-keys)
(for-each delete-file
(find-files (string-append (assoc-ref outputs "out") "/bin")
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))
#~(modify-phases #$phases
(add-after 'install 'remove-broken-or-conflicting-files
(lambda* (#:key outputs #:allow-other-keys)
(for-each delete-file
(find-files
(string-append (assoc-ref outputs "out") "/bin")
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))
(inputs (modify-inputs (package-inputs gcc)
(delete "libstdc++")))
(native-inputs (modify-inputs (package-native-inputs gcc)
(prepend gcc)))
(synopsis "GCC library generating machine code on-the-fly at runtime")
(description
"This package is part of the GNU Compiler Collection and provides an
@ -1028,6 +1040,13 @@ It can also be used for ahead-of-time code generation for building standalone
compilers. The just-in-time (jit) part of the name is now something of a
misnomer.")))
(define-public libgccjit-9 (make-libgccjit gcc-9))
(define-public libgccjit-10 (make-libgccjit gcc-10))
(define-public libgccjit-11 (make-libgccjit gcc-11))
(define-public libgccjit-12 (make-libgccjit gcc-12))
(define-public libgccjit libgccjit-10)
(define (make-gccgo gcc)
"Return a gccgo package based on GCC."
(let ((gccgo (custom-gcc gcc "gccgo" '("go") %generic-search-paths)))

178
gnu/packages/geo.scm
View File

@ -19,6 +19,7 @@
;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021, 2022 Nikolay Korotkiy <sikmir@disroot.org>
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -253,7 +254,7 @@ topology functions.")
(define-public gnome-maps
(package
(name "gnome-maps")
(version "42.2")
(version "43.rc") ;for libsoup 3 support
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -261,77 +262,55 @@ topology functions.")
name "-" version ".tar.xz"))
(sha256
(base32
"1cb9s2zz1zib3f33c035lmgshpl679isbzdd3alrx4yclw61nvay"))))
"16a3j896fwxgnvrmx27jnrvhxzh3v22paaq87ad57yp8wkq946il"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "meson_post_install.py"
(("gtk-update-icon-cache") "true"))))
(add-after 'unpack 'patch-dbus-service
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "data/org.gnome.Maps.service.in"
(("@pkgdatadir@/org.gnome.Maps")
(string-append (assoc-ref outputs "out")
"/bin/gnome-maps")))))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(geocode-glib-path (string-append
(assoc-ref inputs "geocode-glib")
"/lib"))
(goa-path (string-append
(assoc-ref inputs "gnome-online-accounts:lib")
"/lib"))
(gdk-pixbuf-path (string-append
(assoc-ref inputs "gdk-pixbuf")
"/lib"))
(webkitgtk-path (string-append
(assoc-ref inputs "webkitgtk")
"/lib")))
(wrap-program (string-append out "/bin/gnome-maps")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
;; There seems to be no way to embed the path of
;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37,
;; libgdk_pixbuf-2.0.so, libjavascriptcoregtk-4.0.so.18, and
;; libgeocode-glib.so.0
`("LD_LIBRARY_PATH" ":" prefix (,goa-path
,webkitgtk-path
,gdk-pixbuf-path
,geocode-glib-path)))
#t))))))
(list
#:glib-or-gtk? #t
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "meson_post_install.py"
(("gtk-update-icon-cache") "true"))))
(add-after 'unpack 'patch-dbus-service
(lambda _
(substitute* "data/org.gnome.Maps.service.in"
(("@pkgdatadir@/org.gnome.Maps")
(string-append #$output "/bin/gnome-maps")))))
(add-after 'install 'wrap
(lambda _
(wrap-program (string-append #$output "/bin/gnome-maps")
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)))
(list gettext-minimal
`(,glib "bin")
gobject-introspection
pkg-config))
(inputs
`(("evolution-data-server" ,evolution-data-server)
("folks" ,folks)
("libchamplain" ,libchamplain)
("libgee" ,libgee)
("libhandy" ,libhandy)
("libsecret" ,libsecret)
("libsoup" ,libsoup-minimal-2)
("libgweather" ,libgweather4)
("libxml2" ,libxml2)
("librsvg" ,librsvg)
("glib-networking" ,glib-networking)
("geoclue" ,geoclue)
("geocode-glib" ,geocode-glib)
("gfbgraph" ,gfbgraph)
("gjs" ,gjs)
("glib" ,glib)
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
("rest" ,rest)
("webkitgtk" ,webkitgtk-with-libsoup2)))
(list folks
evolution-data-server
geoclue
geocode-glib
gfbgraph
gjs
glib
glib-networking
gnome-online-accounts
gsettings-desktop-schemas
gtk+
libadwaita
libgee
libgweather4
libhandy
librsvg
libsecret
libshumate
libsoup
libxml2
rest-next
webkitgtk))
(synopsis "Graphical map viewer and wayfinding program")
(description "GNOME Maps is a graphical map viewer. It uses map data from
the OpenStreetMap project. It can provide directions for walking, bicycling,
@ -536,7 +515,7 @@ fully fledged Spatial SQL capabilities.")
(define-public proj
(package
(name "proj")
(version "7.2.1")
(version "9.1.0")
(source
(origin
(method url-fetch)
@ -544,20 +523,10 @@ fully fledged Spatial SQL capabilities.")
version ".tar.gz"))
(sha256
(base32
"050apzdn0isxpsblys1shrl9ccli5vd32kgswlgx1imrbwpg915k"))))
"0593vd9sac0c98j1f4rammd90d4xnhygbr6d49i8il6ajjdj7cl1"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DUSE_EXTERNAL_GTEST=ON")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-version
(lambda _
(substitute* "CMakeLists.txt"
(("MAJOR 7 MINOR 2 PATCH 0") "MAJOR 7 MINOR 2 PATCH 1")))))))
(inputs
(list curl libjpeg-turbo libtiff sqlite))
(native-inputs
(list googletest pkg-config))
(native-inputs (list googletest pkg-config))
(propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc
(home-page "https://proj.org/")
(synopsis "Coordinate transformation software")
(description
@ -574,6 +543,27 @@ lets developers use the functionality of Proj in their own software.")
;; src/geodesic.*, src/tests/geodtest.cpp
license:x11))))
; This is the last version of proj that provides the old proj.4 API.
(define-public proj-7
(package (inherit proj)
(version "7.2.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://download.osgeo.org/proj/proj-"
version ".tar.gz"))
(sha256
(base32
"050apzdn0isxpsblys1shrl9ccli5vd32kgswlgx1imrbwpg915k"))))
(arguments
`(#:configure-flags '("-DUSE_EXTERNAL_GTEST=ON")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-version
(lambda _
(substitute* "CMakeLists.txt"
(("MAJOR 7 MINOR 2 PATCH 0") "MAJOR 7 MINOR 2 PATCH 1")))))))))
(define-public proj.4
(package
(name "proj.4")
@ -627,14 +617,14 @@ projections.")
(define-public python-pyproj
(package
(name "python-pyproj")
(version "3.2.1")
(version "3.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyproj" version))
(sha256
(base32
"0xrqpy708qlyd7nqjra0dl7nvkqzaj9w0v7wq4j5pxazha9n14sa"))))
"1gjg63irs44djyqbp9gg7s02d0y5i9cd1a83phyzp5fcj56y3n5k"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -1073,13 +1063,13 @@ utilities for data translation and processing.")
(package
(name "python-cartopy")
;; This is a post-release fix that adds build_ext to setup.py.
(version "0.19.0.post1")
(version "0.20.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Cartopy" version))
(sha256
(base32 "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb"))))
(base32 "01lhnkhw22jp6hnrs5qvgkq4fqcni2sx7ydiyv8w8xxx5wpglq0d"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -1097,11 +1087,16 @@ utilities for data translation and processing.")
(list python-matplotlib
python-numpy
python-pykdtree
python-pyproj
python-pyshp
python-scipy
python-shapely))
(inputs
(list geos proj))
(list geos
;; cartopy's setup.py looks for the proj executable.
;; Not sure if it actually makes use of it since it
;; probably uses proj only through pyproj.
proj))
(native-inputs
(list python-cython python-flufl-lock python-pytest))
(home-page "https://scitools.org.uk/cartopy/docs/latest/")
@ -1501,7 +1496,7 @@ map display. Downloads map data from a number of websites, including
libnova
libpng
openjpeg
proj
proj-7
qtbase-5
zlib))
(native-search-paths
@ -1953,7 +1948,8 @@ using the dataset of topographical information collected by
(native-inputs
(list pkg-config qttools-5))
(inputs
(list gdal
(list curl
gdal
libjpeg-turbo
proj
qtbase-5
@ -2189,6 +2185,7 @@ track your position right from your laptop.")
(inputs
`(("clipper" ,clipper)
("cups" ,cups)
("curl" ,curl)
("gdal" ,gdal)
("proj" ,proj)
("qtbase" ,qtbase-5)
@ -2450,6 +2447,7 @@ growing set of geoscientific methods.")
"ProcessingOtbAlgorithmsTest"
"test_core_authmanager"
"test_core_compositionconverter"
"test_core_coordinatereferencesystem"
"test_core_gdalutils"
"test_core_labelingengine"
"test_core_layout"
@ -2459,6 +2457,7 @@ growing set of geoscientific methods.")
"test_core_layoutpicture"
"test_core_legendrenderer"
"test_core_networkaccessmanager"
"test_core_rasterfilewriter"
"test_core_tiledownloadmanager"
"test_gui_dualview"
"test_gui_htmlwidgetwrapper"
@ -2711,6 +2710,7 @@ using third-party geocoders and other data sources.")
(inputs
(list boost
cgal
curl
gdal
glew
glu

79
gnu/packages/glib.scm
View File

@ -48,6 +48,7 @@
#:use-module (gnu packages enlightenment)
#:use-module (gnu packages file)
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
#:use-module (gnu packages graphviz)
@ -374,6 +375,64 @@ functions for strings and common data structures.")
(license license:lgpl2.1+)
(properties '((hidden? . #t)))))
(define-public glib-next
(package
(inherit glib)
(name "glib")
(version "2.73.3")
(source
(origin
(inherit (package-source glib))
(uri
(string-append "mirror://gnome/sources/"
name "/" (string-take version 4) "/"
name "-" version ".tar.xz"))
(snippet
'(substitute* "glib/tests/spawn-test.c"
(("/bin/sh") "sh")))
(sha256
(base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
(arguments
(substitute-keyword-arguments (package-arguments glib)
((#:test-options test-options ''())
;; Skip flaky or slow tests.
`(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options))
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(replace 'disable-failing-tests
(lambda _
(with-directory-excursion "glib/tests"
(substitute* '("unix.c" "utils.c")
(("[ \t]*g_test_add_func.*;") "")))
;; The "glib:gio / file" test fails with the error "No
;; application is registered as handling this file" (see:
;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742).
(with-directory-excursion "gio/tests"
(substitute* '("appinfo.c"
"contenttype.c"
"desktop-app-info.c"
"file.c"
"gdbus-address-get-session.c"
"gdbus-peer.c")
(("[ \t]*g_test_add_func.*;") "")))
,@(if (target-x86-32?)
;; Comment out parts of timer.c that fail on i686 due to
;; excess precision when building with GCC 10:
;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>.
'((substitute* "glib/tests/timer.c"
(("^ g_assert_cmpuint \\(micros.*" all)
(string-append "//" all "\n"))
(("^ g_assert_cmpfloat \\(elapsed, ==.*" all)
(string-append "//" all "\n"))))
'())))))))
(native-inputs
(modify-inputs (package-native-inputs glib)
(append desktop-file-utils)))
(propagated-inputs
(modify-inputs (package-propagated-inputs glib)
(replace "pcre" pcre2)))))
(define-public glib-with-documentation
;; glib's doc must be built in a separate package since it requires gtk-doc,
;; which in turn depends on glib.
@ -535,6 +594,26 @@ provide bindings to call into the C library.")
;; For tools.
license:gpl2+))))
(define-public gobject-introspection-next
(package
(inherit gobject-introspection)
(name "gobject-introspection")
(version "1.73.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
(base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
(patches (search-patches
"gobject-introspection-cc-1.72.patch"
"gobject-introspection-girepository.patch"
"gobject-introspection-absolute-shlib-path-1.72.patch"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs gobject-introspection)
(replace "glib" glib-next)))))
(define intltool
(package
(name "intltool")

51
gnu/packages/gnome-xyz.scm
View File

@ -776,7 +776,7 @@ notebooks and tiling window managers.")
(define-public gpaste
(package
(name "gpaste")
(version "3.42.2")
(version "42.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -785,19 +785,25 @@ notebooks and tiling window managers.")
(file-name (git-file-name name version))
(sha256
(base32
"1k5qvgzwl357k72qfim5zfas2a0n6j24jnlm1v472l7h6gb6lssm"))
"1dlqa69zvzzdxyh21qfrx2nhpfy0fbihxpgkxqmramcgv3h5k4q3"))
(patches
(search-patches "gpaste-fix-paths.patch"))))
(build-system meson-build-system)
(native-inputs
(list autoconf automake gettext-minimal gobject-introspection
(list gettext-minimal
gobject-introspection
(list glib "bin") ; for glib-compile-resources
libtool pkg-config vala))
pkg-config
vala))
(inputs
(list appstream-glib libarchive gjs mutter graphene))
(list appstream-glib
gjs
gtk
mutter
libadwaita
libarchive))
(arguments
(list #:meson meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #true
(list #:glib-or-gtk? #true
#:configure-flags
#~(list
(string-append "-Dcontrol-center-keybindings-dir="
@ -809,12 +815,11 @@ notebooks and tiling window managers.")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-introspection-install-dir
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* '("src/gnome-shell/extension.js"
"src/gnome-shell/prefs.js")
(("@typelibPath@")
(string-append out "/lib/girepository-1.0/")))))))))
(lambda _
(substitute* '("src/gnome-shell/extension.js"
"src/gnome-shell/prefs.js")
(("@typelibPath@")
(string-append #$output "/lib/girepository-1.0/"))))))))
(home-page "https://github.com/Keruspe/GPaste")
(synopsis "Clipboard management system for GNOME Shell")
(description "GPaste is a clipboard manager, a tool which allows you to
@ -1084,7 +1089,7 @@ of windows.")
(define-public arc-theme
(package
(name "arc-theme")
(version "20210412")
(version "20220405")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1093,7 +1098,7 @@ of windows.")
(file-name (git-file-name name version))
(sha256
(base32
"0zs44dagp6baiyszlr1kj5ncap43fg32dv07rl46nxbds2p65lh4"))))
"1gjwf75sg4xyfypb08qiy2cmqyr2mamjc4i46ifrq7snj15gy608"))))
(build-system meson-build-system)
(arguments
'(#:configure-flags
@ -1102,8 +1107,7 @@ of windows.")
(modify-phases %standard-phases
(add-before 'build 'set-home ;placate Inkscape
(lambda _
(setenv "HOME" (getcwd))
#t)))))
(setenv "HOME" (getcwd)))))))
(native-inputs
(list `(,glib "bin") ; for glib-compile-resources
gnome-shell
@ -1111,6 +1115,7 @@ of windows.")
inkscape/stable
optipng
pkg-config
python
sassc/libsass-3.5))
(synopsis "Flat GTK+ theme with transparent elements")
(description "Arc is a flat theme with transparent elements for GTK 3, GTK
@ -1240,13 +1245,13 @@ Cinnamon, MATE, Unity, Xfce, LightDM, GDM, Chrome theme, etc.")
#:tests? #f
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(delete 'configure)))) ; no configure script
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas
("gnome-shell" ,gnome-shell)
("gtk+" ,gtk+)
("xmllint" ,libxml2)
("ruby-sass" ,ruby-sass)))
(list `(,glib "bin") ; for glib-compile-schemas
gnome-shell
gtk+
libxml2
ruby-sass))
(synopsis "Flat theme with light and dark elements")
(description "Numix is a modern flat theme with a combination of light and
dark elements. It supports GNOME, Unity, Xfce, and Openbox.")

5993
gnu/packages/gnome.scm
View File

File diff suppressed because it is too large Load Diff

290
gnu/packages/gnucash.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
;;; Copyright © 2020 Christopher Lam <christopher.lck@gmail.com>
@ -26,12 +26,6 @@
(define-module (gnu packages gnucash)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages boost)
@ -42,9 +36,9 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages finance)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c)
@ -56,155 +50,146 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xml))
#:use-module (gnu packages xml)
#:use-module (gnu packages)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix utils))
(define-public gnucash
;; TODO: Unbundle libraries such as guile-json found under the "borrowed/"
;; directory.
(package
(name "gnucash")
(version "4.10")
(version "4.11")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-" version ".tar.bz2"))
(sha256
(base32 "0fy9p5fgi2i0x7acg5fnkfdrxxd3dypi3ykvnj53hfbfky8vpm3z"))))
(base32 "069b216dkpjs9hp32s4bhi6f76lbc81qvbmjmz0dxq3v1piys57q"))))
(outputs '("out" "doc" "debug" "python"))
(build-system cmake-build-system)
(inputs
`(("guile" ,guile-3.0)
("boost" ,boost)
("icu4c" ,icu4c)
("glib" ,glib)
("gtk" ,gtk+)
("libdbi" ,libdbi)
("libdbi-drivers" ,libdbi-drivers)
("libofx" ,libofx)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("webkitgtk" ,webkitgtk-with-libsoup2)
("aqbanking" ,aqbanking)
("python" ,python)
("perl-date-manip" ,perl-date-manip)
("perl-finance-quote" ,perl-finance-quote)
("tzdata" ,tzdata-for-tests)))
(arguments
(list
#:test-target "check"
#:configure-flags #~(list "-DWITH_PYTHON=ON")
#:make-flags #~(list "GUILE_AUTO_COMPILE=0")
#:imported-modules `(,@%gnu-build-system-modules
(guix build cmake-build-system)
(guix build glib-or-gtk-build-system))
#:modules '((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-env-vars
(lambda* (#:key inputs #:allow-other-keys)
;; At least one test is time-related and requires this
;; environment variable.
(setenv "TZDIR" (search-input-directory inputs "share/zoneinfo"))
(substitute* "CMakeLists.txt"
(("set\\(SHELL /bin/bash\\)")
(string-append "set(SHELL " (which "bash") ")")))))
;; After wrapping gnc-fq-check and gnc-fq-helper we can no longer
;; execute them with perl, so execute them directly instead.
(add-after 'unpack 'fix-finance-quote-check
(lambda _
(substitute* "gnucash/price-quotes.scm"
(("\"perl\" \"-w\" ") ""))))
;; The qof test requires the en_US, en_GB, and fr_FR locales.
(add-before 'check 'install-locales
(lambda _
(setenv "LOCPATH" (getcwd))
(invoke "localedef" "-i" "en_US" "-f" "UTF-8" "./en_US.UTF-8")
(invoke "localedef" "-i" "en_GB" "-f" "UTF-8" "./en_GB.UTF-8")
(invoke "localedef" "-i" "fr_FR" "-f" "UTF-8" "./fr_FR.UTF-8")))
;; There is about 100 MiB of documentation.
(add-after 'install 'install-docs
(lambda _
(mkdir-p (string-append #$output:doc "/share"))
(symlink (string-append
#$(this-package-native-input "gnucash-docs")
"/share/gnome")
(string-append #$output:doc "/share/gnome"))))
(add-after 'install 'split-python-bindings
(lambda _
(let ((python-bindings (string-append
"lib/python"
#$(version-major+minor
(package-version python)))))
(mkdir-p (string-append #$output:python "/" python-bindings))
(copy-recursively
(string-append #$output "/" python-bindings)
(string-append #$output:python "/" python-bindings))
(delete-file-recursively
(string-append #$output "/" python-bindings)))))
(add-after 'install-docs 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys)
(for-each
(lambda (prog)
(wrap-program (search-input-file
outputs (string-append "bin/" prog))
`("GNC_DBD_DIR" =
(,(search-input-directory inputs "lib/dbd")))
`("PERL5LIB" ":" prefix
,(map (lambda (o)
(string-append o "/lib/perl5/site_perl/"
#$(package-version perl)))
(if (string=? prog "gnc-fq-helper")
(list
#$@(transitive-input-references
'inputs
(map (lambda (l)
(assoc l (package-inputs this-package)))
'("perl-finance-quote"
"perl-date-manip"))))
(list
#$@(transitive-input-references
'inputs
(map (lambda (l)
(assoc l (package-inputs this-package)))
'("perl-finance-quote")))))))))
'("gnucash"
"gnc-fq-check"
"gnc-fq-helper"
"gnc-fq-dump"))))
(add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs
`(("glib" ,glib "bin") ; glib-compile-schemas, etc.
("intltool" ,intltool)
("gmp" ,gmp)
("googlemock" ,(package-source googletest))
("googletest" ,googletest)
("gnucash-docs" ,gnucash-docs)
("swig" ,swig)
("pkg-config" ,pkg-config)))
(list gmp
`(,glib "bin") ;glib-compile-schemas, etc.
gnucash-docs
googletest
intltool
pkg-config
swig))
(inputs
(list aqbanking
boost
glib
gtk+
guile-3.0
icu4c
libdbi
libdbi-drivers
libofx
libxml2
libxslt
perl-date-manip
perl-finance-quote
python
tzdata-for-tests
webkitgtk-with-libsoup2))
(propagated-inputs
;; dconf is required at runtime according to README.dependencies.
(list dconf))
(outputs '("out" "doc" "debug" "python"))
(arguments
`(#:test-target "check"
#:configure-flags '("-DWITH_PYTHON=ON")
#:make-flags '("GUILE_AUTO_COMPILE=0")
#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build cmake-build-system)
(guix build glib-or-gtk-build-system))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-gmock
(lambda* (#:key inputs #:allow-other-keys)
(mkdir "gmock")
(copy-recursively (assoc-ref inputs "googlemock") "gmock")
(setenv "GMOCK_ROOT" (string-append (getcwd) "/gmock/googlemock"))
#t))
(add-after 'unpack 'set-env-vars
(lambda* (#:key inputs #:allow-other-keys)
(let ((tzdata (assoc-ref inputs "tzdata")))
;; At least one test is time-related and requires this
;; environment variable.
(setenv "TZDIR"
(string-append tzdata
"/share/zoneinfo"))
(substitute* "CMakeLists.txt"
(("set\\(SHELL /bin/bash\\)")
(string-append "set(SHELL " (which "bash") ")")))
#t)))
;; After wrapping gnc-fq-check and gnc-fq-helper we can no longer
;; execute them with perl, so execute them directly instead.
(add-after 'unpack 'fix-finance-quote-check
(lambda _
(substitute* "gnucash/price-quotes.scm"
(("\"perl\" \"-w\" ") ""))
#t))
;; The qof test requires the en_US, en_GB, and fr_FR locales.
(add-before 'check 'install-locales
(lambda _
(setenv "LOCPATH" (getcwd))
(invoke "localedef" "-i" "en_US" "-f" "UTF-8" "./en_US.UTF-8")
(invoke "localedef" "-i" "en_GB" "-f" "UTF-8" "./en_GB.UTF-8")
(invoke "localedef" "-i" "fr_FR" "-f" "UTF-8" "./fr_FR.UTF-8")
#t))
;; There are about 100 megabytes of documentation.
(add-after 'install 'install-docs
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((docs (assoc-ref inputs "gnucash-docs"))
(doc-output (assoc-ref outputs "doc")))
(mkdir-p (string-append doc-output "/share"))
(symlink (string-append docs "/share/gnome")
(string-append doc-output "/share/gnome"))
#t)))
(add-after 'install 'split-python-bindings
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(python-output (assoc-ref outputs "python"))
(python-bindings (string-append
"lib/python"
,(version-major+minor
(package-version python)))))
(mkdir-p (string-append python-output "/" python-bindings))
(copy-recursively
(string-append out "/" python-bindings)
(string-append python-output "/" python-bindings))
(delete-file-recursively
(string-append out "/" python-bindings)))))
(add-after 'install-docs 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys)
(for-each (lambda (prog)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/" prog)
`("GNC_DBD_DIR" =
(,(string-append
(assoc-ref inputs "libdbi-drivers")
"/lib/dbd")))
`("PERL5LIB" ":" prefix
,(map (lambda (o)
(string-append o "/lib/perl5/site_perl/"
,(package-version perl)))
(if (string=? prog "gnc-fq-helper")
(list
,@(transitive-input-references
'inputs
(map (lambda (l)
(assoc l (package-inputs this-package)))
'("perl-finance-quote"
"perl-date-manip"))))
(list
,@(transitive-input-references
'inputs
(map (lambda (l)
(assoc l (package-inputs this-package)))
'("perl-finance-quote")))))))))
'("gnucash"
"gnc-fq-check"
"gnc-fq-helper"
"gnc-fq-dump"))))
(add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(home-page "https://www.gnucash.org/")
(synopsis "Personal and small business financial accounting software")
(description
@ -221,30 +206,31 @@ installed as well as Yelp, the Gnome help browser.")
;; This package is not public, since we use it to build the "doc" output of
;; the gnucash package (see above). It would be confusing if it were public.
(define gnucash-docs
(let ((revision "")) ;set to the empty string when no revision
(let ((revision "")) ;set to the empty string when no revision
(package
(name "gnucash-docs")
(version (package-version gnucash))
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-docs-" version ".1" revision ".tar.gz"))
(uri (string-append
"mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-docs-" version revision ".tar.gz"))
(sha256
(base32 "0cf2m1lgpq6if89w8anz522nar5kwpfzi0kacymw17m42fzxz0cg"))))
(base32 "162qq8p76grczdnsd4qbpxn1d8ap6l2n1a00a601v5hij7rqwfx8"))))
(build-system cmake-build-system)
;; These are native-inputs because they are only required for building the
;; documentation.
(native-inputs
`(("libxml2" ,libxml2)
;; The "check" target needs the docbook xml package for validating the
;; DocBook XML during the tests.
("docbook-xml" ,docbook-xml)
("libxslt" ,libxslt)
("docbook-xsl" ,docbook-xsl)
("scrollkeeper" ,scrollkeeper)))
;; The "check" target needs docbook-xml package to validate the DocBook
;; XML during the tests.
(list docbook-xml
docbook-xsl
libxml2
libxslt
scrollkeeper))
(arguments
`(#:tests? #f)) ;no test target
`(#:tests? #f)) ;no test target
(home-page "https://www.gnucash.org/")
(synopsis "Documentation for GnuCash")
(description

4
gnu/packages/gnuzilla.scm
View File

@ -210,8 +210,8 @@ fractional-second-digits-append-item.js")
(propagated-inputs
(list nspr)) ; in the Requires.private field of mozjs-*.pc
(home-page
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey")
(synopsis "Mozilla javascript engine")
"https://spidermonkey.dev/")
(synopsis "Mozilla JavaScript engine")
(description "SpiderMonkey is Mozilla's JavaScript engine written
in C/C++.")
(license license:mpl2.0))) ; and others for some files

391
gnu/packages/gtk.scm
View File

@ -567,109 +567,100 @@ printing and other features typical of a source code editor.")
(home-page "https://developer.gnome.org/gtksourceview/")))
(define-public gtksourceview
(package
(name "gtksourceview")
(version "5.4.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtksourceview/"
(version-major+minor version) "/"
"gtksourceview-" version ".tar.xz"))
(sha256
(base32
"1rwxnzq2vvck5ni5zsfnmnx2kgasi3a2n29w93g106c4xc3hw55d"))))
(build-system meson-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-build
(package
(name "gtksourceview")
(version "5.5.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtksourceview/"
(version-major+minor version) "/"
"gtksourceview-" version ".tar.xz"))
(sha256
(base32
"068dqhacvs65gnmrryahm6qs0q050admlpqqi1gy8wgh2p6qrraa"))))
(build-system meson-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-gtk-update-icon-cache
(lambda _
(substitute* "meson.build"
(("gnome.post_install" all)
(string-append "# " all)))))
(("gtk_update_icon_cache: true")
"gtk_update_icon_cache: false"))))
(add-before 'check 'pre-check
(lambda* (#:key inputs native-inputs #:allow-other-kgeys)
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((Xvfb (search-input-file (or native-inputs inputs)
"/bin/Xvfb")))
"bin/Xvfb")))
;; Tests require a running X server.
(system (format #f "~a :1 &" Xvfb))
(system (string-append Xvfb " :1 &"))
(setenv "DISPLAY" ":1")
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))))))
(native-inputs
(list `(,glib "bin") ; for glib-genmarshal, etc.
intltool
itstool
gobject-introspection
pkg-config
vala
;; For testing.
xorg-server-for-tests
shared-mime-info))
(propagated-inputs
;; gtksourceview-5.0.pc refers to all these.
(list glib gtk libxml2 pcre2))
(home-page "https://wiki.gnome.org/Projects/GtkSourceView")
(synopsis "GNOME source code widget")
(description "GtkSourceView is a text widget that extends the standard
(setenv "DBUS_FATAL_WARNINGS" "0")))))))
(native-inputs
(list `(,glib "bin") ; for glib-genmarshal, etc.
gettext-minimal
gi-docgen
gobject-introspection-next
pkg-config
vala
;; For testing.
xorg-server-for-tests
shared-mime-info))
(propagated-inputs
;; gtksourceview-5.pc refers to all these.
(list fontconfig
fribidi
glib-next
gtk
libxml2
pango
pcre2))
(home-page "https://wiki.gnome.org/Projects/GtkSourceView")
(synopsis "GNOME source code widget")
(description "GtkSourceView is a text widget that extends the standard
GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax
highlighting and other features typical of a source code editor.")
(license license:lgpl2.1+)))
(license license:lgpl2.1+)))
;;; This older version is used by tepl.
(define-public gtksourceview-4
(package
(inherit gtksourceview)
(version "4.2.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtksourceview/"
(version-major+minor version) "/"
"gtksourceview-" version ".tar.xz"))
(sha256
(base32
"0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before
'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server")))
;; Tests require a running X server.
(system (format #f "~a/bin/Xvfb :1 &" xorg-server))
(setenv "DISPLAY" ":1")
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.
("intltool" ,intltool)
("itstool" ,itstool)
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
("vala" ,vala)
;; For testing.
("xorg-server" ,xorg-server-for-tests)
("shared-mime-info" ,shared-mime-info)))
(propagated-inputs
;; gtksourceview-3.0.pc refers to all these.
(list glib gtk+ libxml2))))
(package
(inherit gtksourceview)
(version "4.8.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtksourceview/"
(version-major+minor version) "/"
"gtksourceview-" version ".tar.xz"))
(sha256
(base32
"10n61sa0g447nx73yapb00z57shp48gfvk1lv1s29ji0cd81j063"))))
(native-inputs
(modify-inputs (package-native-inputs gtksourceview)
(replace "gobject-introspection" gobject-introspection)))
(propagated-inputs
(modify-inputs (package-propagated-inputs gtksourceview)
(replace "gtk" gtk+)
(replace "glib" glib)))))
(define-public gtksourceview-3
(package (inherit gtksourceview-4)
(name "gtksourceview")
(version "3.24.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"))))))
(package
(inherit gtksourceview-4)
(name "gtksourceview")
(version "3.24.11")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"))))
(build-system gnu-build-system)
(arguments (substitute-keyword-arguments (package-arguments gtksourceview)
((#:phases phases)
`(modify-phases ,phases
(delete 'disable-gtk-update-icon-cache)))))))
(define-public gdk-pixbuf
(package
@ -992,9 +983,7 @@ application suites.")
fribidi
fontconfig
freetype
(if (target-x86-64?)
librsvg
librsvg-2.40)
(librsvg-for-system)
glib
libcloudproviders-minimal
libepoxy
@ -1103,7 +1092,7 @@ application suites.")
(define-public gtk
(package
(name "gtk")
(version "4.6.7")
(version "4.8.0")
(source
(origin
(method url-fetch)
@ -1111,110 +1100,111 @@ application suites.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32 "1s0hn1mqw9zzr99bgc5bj90am2x6vr5g5q23mmzmqajy9dy2xzgg"))
(base32 "0zxxvjnbmaahvm9lwm007dzgc0yl8qamkp1467c5kqyi6ws21mn8"))
(patches
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))))
(build-system meson-build-system)
(outputs '("out" "bin" "doc"))
(arguments
`(#:modules ((guix build utils)
(list
#:modules '((guix build utils)
(guix build meson-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
#:configure-flags
(list
"-Dbroadway-backend=true" ;for broadway display-backend
"-Dcloudproviders=enabled" ;for cloud-providers support
"-Dtracker=enabled" ;for filechooser search support
"-Dcolord=enabled" ;for color printing support
,@(if (%current-target-system)
;; If true, gtkdoc-scangobj will try to execute a
;; cross-compiled binary.
'("-Dgtk_doc=false")
'("-Dgtk_doc=true"))
"-Dman-pages=true")
#:parallel-tests? #f ;parallel tests are not supported
#:test-options '("--setup=x11" ;defaults to wayland
;; Use the same test options as upstream uses for
;; their CI.
"--suite=gtk"
"--no-suite=gsk-compare-broadway")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file))
(add-after 'unpack 'patch-rst2man
(lambda _
(substitute* "docs/reference/gtk/meson.build"
(("find_program\\('rst2man'") "find_program('rst2man.py'"))))
(add-after 'unpack 'patch
(lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
;; Correct DTD resources of docbook.
(substitute* (find-files "docs" "\\.xml$")
(("http://www.oasis-open.org/docbook/xml/4.3/")
(string-append
(assoc-ref (or native-inputs inputs) "docbook-xml-4.3")
"/xml/dtd/docbook/")))
;; Disable building of icon cache.
(substitute* "meson.build"
(("gtk_update_icon_cache: true")
"gtk_update_icon_cache: false"))
;; Disable failing tests.
(substitute* (find-files "testsuite" "meson.build")
(("[ \t]*'empty-text.node',") "")
(("[ \t]*'testswitch.node',") "")
(("[ \t]*'widgetfactory.node',") "")
;; The unaligned-offscreen test fails for unknown reasons, also
;; on different distributions (see:
;; https://gitlab.gnome.org/GNOME/gtk/-/issues/4889).
((" 'unaligned-offscreen',") ""))
(substitute* "testsuite/reftests/meson.build"
(("[ \t]*'label-wrap-justify.ui',") ""))))
(add-before 'build 'set-cache
(lambda _
(setenv "XDG_CACHE_HOME" (getcwd))))
(add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys)
;; Tests require a running X server.
(system "Xvfb :1 +extension GLX &")
(setenv "DISPLAY" ":1")
;; Tests write to $HOME.
(setenv "HOME" (getcwd))
;; Tests look for those variables.
(setenv "XDG_RUNTIME_DIR" (getcwd))
;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
;; Required for the calendar test.
(setenv "TZDIR" (search-input-directory inputs
"share/zoneinfo"))))
(add-after 'install 'move-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (assoc-ref outputs "bin"))
(doc (assoc-ref outputs "doc")))
(for-each mkdir-p
(list
(string-append bin "/bin")
(string-append bin "/share/applications")
(string-append bin "/share/icons")
(string-append bin "/share/man")
(string-append bin "/share/metainfo")
(string-append doc "/share/doc")))
;; Move programs and related files to output 'bin'.
(for-each (lambda (dir)
(rename-file
(string-append out dir)
(string-append bin dir)))
(list
"/bin"
"/share/applications"
"/share/icons"
"/share/man"
"/share/metainfo"))
;; Move HTML documentation to output 'doc'.
(rename-file
(string-append out "/share/doc")
(string-append doc "/share/doc"))))))))
#:configure-flags
#~(list
"-Dbroadway-backend=true" ;for broadway display-backend
"-Dcloudproviders=enabled" ;for cloud-providers support
"-Dtracker=enabled" ;for filechooser search support
"-Dcolord=enabled" ;for color printing support
#$@(if (%current-target-system)
;; If true, gtkdoc-scangobj will try to execute a
;; cross-compiled binary.
'("-Dgtk_doc=false")
'("-Dgtk_doc=true"))
"-Dman-pages=true")
#:test-options '(list "--setup=x11" ;defaults to wayland
;; Use the same test options as upstream uses for
;; their CI.
"--suite=gtk"
"--no-suite=gsk-compare-broadway")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file))
(add-after 'unpack 'patch-rst2man
(lambda _
(substitute* "docs/reference/gtk/meson.build"
(("find_program\\('rst2man'")
"find_program('rst2man.py'"))))
(add-after 'unpack 'patch
(lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
;; Correct DTD resources of docbook.
(substitute* (find-files "docs" "\\.xml$")
(("http://www.oasis-open.org/docbook/xml/4.3/")
(string-append #$(this-package-native-input "docbook-xml")
"/xml/dtd/docbook/")))
;; Disable building of icon cache.
(substitute* "meson.build"
(("gtk_update_icon_cache: true")
"gtk_update_icon_cache: false"))
;; Disable failing tests.
(substitute* (find-files "testsuite" "meson.build")
(("[ \t]*'empty-text.node',") "")
(("[ \t]*'testswitch.node',") "")
(("[ \t]*'widgetfactory.node',") "")
;; The unaligned-offscreen test fails for unknown reasons, also
;; on different distributions (see:
;; https://gitlab.gnome.org/GNOME/gtk/-/issues/4889).
((" 'unaligned-offscreen',") ""))
(substitute* "testsuite/reftests/meson.build"
(("[ \t]*'label-wrap-justify.ui',") "")
;; The inscription-markup.ui fails due to /etc/machine-id
;; related warnings (see:
;; https://gitlab.gnome.org/GNOME/gtk/-/issues/5169).
(("[ \t]*'inscription-markup.ui',") ""))))
(add-before 'build 'set-cache
(lambda _
(setenv "XDG_CACHE_HOME" (getcwd))))
(add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys)
;; Tests require a running X server.
(system "Xvfb :1 +extension GLX &")
(setenv "DISPLAY" ":1")
;; Tests write to $HOME.
(setenv "HOME" (getcwd))
;; Tests look for those variables.
(setenv "XDG_RUNTIME_DIR" (getcwd))
;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
;; Required for the calendar test.
(setenv "TZDIR" (search-input-directory inputs
"share/zoneinfo"))))
(add-after 'install 'move-files
(lambda _
(for-each mkdir-p
(list
(string-append #$output:bin "/bin")
(string-append #$output:bin "/share/applications")
(string-append #$output:bin "/share/icons")
(string-append #$output:bin "/share/man")
(string-append #$output:bin "/share/metainfo")
(string-append #$output:doc "/share/doc")))
;; Move programs and related files to output 'bin'.
(for-each (lambda (dir)
(rename-file
(string-append #$output dir)
(string-append #$output:bin dir)))
(list
"/bin"
"/share/applications"
"/share/icons"
"/share/man"
"/share/metainfo"))
;; Move HTML documentation to output 'doc'.
(rename-file
(string-append #$output "/share/doc")
(string-append #$output:doc "/share/doc")))))))
(native-inputs
(list docbook-xml-4.3
docbook-xsl
@ -1254,7 +1244,6 @@ application suites.")
libgudev ;for gstreamer-gl
libjpeg-turbo
libpng
librsvg
libtiff
python
rest
@ -1263,7 +1252,7 @@ application suites.")
;; Following dependencies are referenced in .pc files.
(list cairo
fontconfig
librsvg
(librsvg-for-system)
glib
graphene
libepoxy
@ -2542,15 +2531,13 @@ shell scripts. Example of how to use @code{yad} can be consulted at
(inputs (list gtk+))
(native-inputs (list pkg-config))
(arguments
`(#:tests? #f ; no check
#:make-flags
(list (string-append "CC=" ,(cc-for-target))
;; makefile uses PREFIX for the binary location
(string-append "PREFIX=" (assoc-ref %outputs "out")
"/bin"))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(list
#:tests? #f ; no check target
#:make-flags #~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(synopsis "Drag and drop source/target for X")
(description
"Dragon is a lightweight drag-and-drop source for X where you can run:

35
gnu/packages/haskell-xyz.scm
View File

@ -30,6 +30,7 @@
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2021, 2022 Alice BRENON <alice.brenon@ens-lyon.fr>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -75,6 +76,7 @@
#:use-module (gnu packages xorg)
#:use-module (guix build-system haskell)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
@ -297,14 +299,13 @@ systems.")
"042lrkn0dbpjn5ivj6j26jzb1fwrj8c1aj18ykxja89isg0hiali"))))
(build-system haskell-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'set-check-variables
(lambda _
(setenv "PATH" (string-append (getcwd) "/dist/build/alex:"
(getenv "PATH")))
(setenv "alex_datadir" (string-append (getcwd) "/data"))
#t)))))
(list #:phases
#~(modify-phases %standard-phases
(add-before 'check 'set-check-variables
(lambda _
(setenv "PATH" (string-append (getcwd) "/dist/build/alex:"
(getenv "PATH")))
(setenv "alex_datadir" (string-append (getcwd) "/data")))))))
(inputs (list ghc-quickcheck))
(native-inputs
(list which))
@ -16099,6 +16100,24 @@ data Dec a
@end example")
(license license:bsd-3)))
(define-public ghc-ansi2html
(package
(name "ghc-ansi2html")
(version "0.9")
(source (origin
(method url-fetch)
(uri (hackage-uri "Ansi2Html" version))
(sha256
(base32
"1dqq1rnx1w0cn4w11knmxvn7qy4lg4m39dgw4rs6r2pjqzgrwarh"))))
(build-system haskell-build-system)
(home-page "http://janzzstimmpfle.de/~jens/software/Ansi2Html/")
(synopsis "Convert ANSI Terminal Sequences to nice HTML markup")
(description
"This package enables integration of terminal screen state in html
pages.")
(license license:bsd-3)))
(define-public ghc-singleton-bool
(package
(name "ghc-singleton-bool")

273
gnu/packages/ibus.scm
View File

@ -41,6 +41,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages anthy)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages base)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
@ -71,7 +72,7 @@
(define-public ibus
(package
(name "ibus")
(version "1.5.24")
(version "1.5.27")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/ibus/ibus/"
@ -79,143 +80,149 @@
version "/ibus-" version ".tar.gz"))
(sha256
(base32
"07s2ly75xv50bqg37mn37i9akqvcfd45k2mbplxrsqk3a2b3mwxb"))))
"1pwppcy0xpidxa7db9lykjjjj1rcjrqf5l88f77hgxlnvdddmyvf"))))
(build-system glib-or-gtk-build-system)
(outputs '("out" "doc"))
(arguments
`(#:parallel-build? #f ; race condition discovered with emoji support
#:configure-flags (list "--enable-python-library"
"--enable-gtk-doc"
"--enable-memconf"
(string-append
"--with-unicode-emoji-dir="
(assoc-ref %build-inputs "unicode-emoji")
"/share/unicode/emoji")
(string-append
"--with-emoji-annotation-dir="
(assoc-ref %build-inputs "unicode-cldr-common")
"/share/unicode/cldr/common/annotations")
(string-append "--with-ucd-dir="
(assoc-ref %build-inputs "ucd")
"/share/ucd")
"--enable-wayland")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
;; These tests require /etc/machine-id.
(with-directory-excursion "src/tests"
(substitute* '("ibus-share.c" "ibus-compose.c"
"ibus-keypress.c")
(("[ \t]*return g_test_run \\(\\);") "")))))
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "docs/reference/ibus"
(substitute* "ibus-docs.sgml.in"
(("http://www.oasis-open.org/docbook/xml/4.1.2/")
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/"))))))
(add-after 'unpack 'patch-python-target-directories
(lambda* (#:key outputs #:allow-other-keys)
(let ((root (string-append (assoc-ref outputs "out")
"/lib/python"
,(version-major+minor (package-version python))
"/site-packages")))
(substitute* "configure"
(("(py2?overridesdir)=.*" _ var)
(string-append var "=" root "/gi/overrides/"))
(("(pkgpython2dir=).*" _ var)
(string-append var root "/ibus"))))))
(add-before 'configure 'disable-dconf-update
(lambda _
(substitute* "data/dconf/Makefile.in"
(("dconf update") "echo dconf update"))))
(add-after 'unpack 'delete-generated-files
(lambda _
(for-each (lambda (file)
(let ((c (string-append (string-drop-right file 4) "c")))
(when (file-exists? c)
(format #t "deleting ~a\n" c)
(delete-file c))))
(find-files "." "\\.vala"))))
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/ibusenginesimple.c"
(("/usr/share/X11/locale")
(search-input-directory inputs
"share/X11/locale")))
(substitute* "ui/gtk3/xkblayout.vala"
(("\"(setxkbmap|xmodmap)\"" _ prog)
(string-append "\""
(search-input-file inputs
(string-append "bin/" prog))
"\"")))))
(add-before 'check 'pre-check
(lambda _
;; Tests write to $HOME.
(setenv "HOME" (getcwd))
;; Tests look for $XDG_RUNTIME_DIR.
(setenv "XDG_RUNTIME_DIR" (getcwd))
;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
;; Tests require a running X server.
(system "Xvfb :1 +extension GLX &")
(setenv "DISPLAY" ":1")
;; Tests require running iBus daemon.
(system "./bus/ibus-daemon --daemonize")))
(add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share"))
(rename-file
(string-append out "/share/gtk-doc")
(string-append doc "/share/gtk-doc")))))
(add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
;; GI_TYPELIB_PATH.
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/ibus-setup")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append out "/lib/girepository-1.0"))))))))))
(list
#:configure-flags #~(list "--enable-python-library"
"--enable-gtk-doc"
"--enable-memconf"
(string-append
"--with-unicode-emoji-dir="
(search-input-directory %build-inputs
"share/unicode/emoji"))
(string-append
"--with-emoji-annotation-dir="
(search-input-directory
%build-inputs
"share/unicode/cldr/common/annotations"))
(string-append
"--with-ucd-dir="
(search-input-directory %build-inputs
"share/ucd"))
"--enable-wayland"
"--disable-systemd-services")
#:make-flags
;; The GUI tests not only require a DISPLAY, but also a window manager
;; since IBus needs to receive focus-in/out events to test IBus with GTK
;; applications (see: https://github.com/ibus/ibus/issues/2307).
#~(list (string-append "DISABLE_GUI_TESTS=ibus-compose "
"ibus-inputcontext-create "
"xkb-latin-layouts "))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
;; These tests require /etc/machine-id.
(with-directory-excursion "src/tests"
(substitute* '("ibus-share.c" "ibus-compose.c"
"ibus-keypress.c")
(("[ \t]*return g_test_run \\(\\);") "")))))
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "docs/reference/ibus"
(substitute* "ibus-docs.sgml.in"
(("http://www.oasis-open.org/docbook/xml/4.1.2/")
(string-append #$(this-package-native-input "docbook-xml")
"/xml/dtd/docbook/"))))))
(add-after 'unpack 'patch-python-target-directories
(lambda _
(let ((root (string-append #$output
"/lib/python"
#$(version-major+minor
(package-version python))
"/site-packages")))
(substitute* "configure"
(("(py2?overridesdir)=.*" _ var)
(string-append var "=" root "/gi/overrides/"))
(("(pkgpython2dir=).*" _ var)
(string-append var root "/ibus"))))))
(add-before 'configure 'disable-dconf-update
(lambda _
(substitute* "data/dconf/Makefile.in"
(("dconf update") "echo dconf update"))))
(add-after 'unpack 'delete-generated-files
(lambda _
(for-each (lambda (file)
(let ((c (string-append (string-drop-right file 4) "c")))
(when (file-exists? c)
(format #t "deleting ~a\n" c)
(delete-file c))))
(find-files "." "\\.vala"))))
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/ibusenginesimple.c"
(("/usr/share/X11/locale")
(search-input-directory inputs "share/X11/locale")))
(substitute* "ui/gtk3/xkblayout.vala"
(("\"(setxkbmap|xmodmap)\"" _ prog)
(format #f "~s" (search-input-file
inputs (string-append "bin/" prog)))))))
(add-before 'check 'pre-check
(lambda _
;; Tests write to $HOME.
(setenv "HOME" (getcwd))
;; Tests look for $XDG_RUNTIME_DIR.
(setenv "XDG_RUNTIME_DIR" (getcwd))
;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
;; Tests require a running X server.
(system "Xvfb :1 +extension GLX &")
(setenv "DISPLAY" ":1")
;; Tests require running iBus daemon.
(system "./bus/ibus-daemon --daemonize")))
(add-after 'install 'move-doc
(lambda _
(mkdir-p (string-append #$output:doc "/share"))
(rename-file
(string-append #$output "/share/gtk-doc")
(string-append #$output:doc "/share/gtk-doc"))))
(add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
;; GI_TYPELIB_PATH.
(wrap-program (search-input-file outputs "bin/ibus-setup")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append #$output "/lib/girepository-1.0")))))))))
(inputs
`(("dbus" ,dbus)
("dconf" ,dconf)
("glib" ,glib)
("gtk2" ,gtk+-2)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("json-glib" ,json-glib)
("libnotify" ,libnotify)
("libx11" ,libx11)
("libxkbcommon" ,libxkbcommon)
("libxtst" ,libxtst)
("pygobject" ,python-pygobject)
("python" ,python)
("python-dbus" ,python-dbus)
("setxkbmap" ,setxkbmap)
("ucd" ,ucd)
("unicode-cldr-common" ,unicode-cldr-common)
("unicode-emoji" ,unicode-emoji)
("wayland" ,wayland)
("xmodmap" ,xmodmap)))
(list bash-minimal
dbus
dconf
glib
gtk+-2
gtk+
iso-codes
json-glib
libnotify
libx11
libxkbcommon
libxtst
python-pygobject
python
python-dbus
setxkbmap
ucd
unicode-cldr-common
unicode-emoji
wayland
xmodmap))
(native-inputs
`(("docbook-xml" ,docbook-xml-4.1.2)
("glib" ,glib "bin") ; for glib-genmarshal
("gettext" ,gettext-minimal)
("gnome-common" ,gnome-common)
("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler
("gtk+:bin" ,gtk+ "bin")
("gtk-doc" ,gtk-doc)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)
("vala" ,vala)
("which" ,which)
("xorg-server" ,xorg-server-for-tests)))
(list docbook-xml-4.1.2
`(,glib "bin") ;for glib-genmarshal
gettext-minimal
gnome-common
gobject-introspection ;for g-ir-compiler
`(,gtk+ "bin")
gtk-doc
perl
pkg-config
python-wrapper
vala
which
xorg-server-for-tests))
(native-search-paths
(list (search-path-specification
(variable "IBUS_COMPONENT_PATH")

2
gnu/packages/image-processing.scm
View File

@ -391,7 +391,7 @@ many popular formats.")
mesa
netcdf
libpng
proj
proj-7
python
;("pugixml" ,pugixml)
sqlite

27
gnu/packages/ipfs.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -22,6 +22,7 @@
(define-module (gnu packages ipfs)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix download)
#:use-module (guix build-system go)
@ -229,10 +230,28 @@ written in Go.")
(file-name (string-append name "-" version "-source"))))
(build-system go-build-system)
(arguments
`(#:unpack-path "github.com/ipfs/go-ipfs"
#:import-path "github.com/ipfs/go-ipfs/cmd/ipfs"))
(list
#:unpack-path "github.com/ipfs/go-ipfs"
#:import-path "github.com/ipfs/go-ipfs/cmd/ipfs"
#:phases
#~(modify-phases %standard-phases
;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md
(add-after 'install 'install-bashcompletion
(lambda _
(let ((completiondir (string-append #$output
"/etc/bash_completion.d")))
(mkdir-p completiondir)
(with-output-to-file (string-append completiondir "/ipfs")
(lambda _
(invoke #$(if (%current-target-system)
"ipfs"
#~(string-append #$output "/bin/ipfs"))
"commands" "completion" "bash")))))))))
(native-inputs
(list python-minimal-wrapper zsh))
(append (if (%current-target-system)
(list this-package)
'())
(list python-minimal-wrapper zsh)))
(home-page "https://ipfs.io")
(synopsis "Go implementation of IPFS, a peer-to-peer hypermedia protocol")
(description "IPFS is a global, versioned, peer-to-peer file system. It

42
gnu/packages/java.scm
View File

@ -8081,12 +8081,14 @@ more efficient storage-wise than an uncompressed bitmap (as implemented in the
(name "java-slf4j-api")
(version "1.7.25")
(source (origin
(method url-fetch)
(uri (string-append "https://www.slf4j.org/dist/slf4j-"
version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/qos-ch/slf4j")
(commit (string-append "v_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"13j51sgzmhhdrfa74gkal5zpip7r1440dh7zsi2c8bpb2zs1v8kb"))
"15n42zq3k1iyn752nwdcbs44hxns2rmxhglwjfr4np7lxx56apjl"))
(modules '((guix build utils)))
;; Delete bundled jars.
(snippet
@ -8182,6 +8184,38 @@ all events to System.err. Only messages of level INFO and higher are
printed.")
(license license:expat)))
(define-public java-slf4j-nop
(package
(name "java-slf4j-nop")
(version "1.7.25")
(source (package-source java-slf4j-api))
(build-system ant-build-system)
(arguments
`(#:jar-name "slf4j-nop.jar"
#:source-dir "slf4j-nop/src/main"
#:test-dir "slf4j-nop/src/test"
#:phases (modify-phases %standard-phases
;; The tests need some test classes from slf4j-api
(add-before 'check 'build-slf4j-api-test-helpers
(lambda _
;; Add current dir to CLASSPATH ...
(setenv "CLASSPATH"
(string-append (getcwd) ":"
(getenv "CLASSPATH")))
;; ... and build test helper classes here:
(apply invoke
`("javac" "-d" "."
,@(find-files "slf4j-api/src/test" ".*\\.java")))))
(replace 'install
(install-from-pom "slf4j-nop/pom.xml")))))
(propagated-inputs (list java-slf4j-api))
(native-inputs (list java-junit java-hamcrest-core))
(home-page "https://www.slf4j.org/")
(synopsis "SLF4J binding that silently discards all logging messages")
(description "Binding/provider for NOP, an implementation that silently
discards all logging messages.")
(license license:expat)))
(define-public antlr2
(package
(name "antlr2")

43
gnu/packages/linux.scm
View File

@ -44,7 +44,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com>
;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
@ -1469,7 +1469,7 @@ supported under @file{/sys/class/backlight/}.")
(define-public v4l2loopback-linux-module
(package
(name "v4l2loopback-linux-module")
(version "0.12.5")
(version "0.12.7")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1478,7 +1478,7 @@ supported under @file{/sys/class/backlight/}.")
(file-name (git-file-name name version))
(sha256
(base32
"1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn"))))
"1yghxl7gjr1zxi3a1kiz6d7yh68z64xayzm925zan4jqhrwv1h68"))))
(build-system linux-module-build-system)
(arguments
(list #:tests? #f)) ; no test suite
@ -8655,11 +8655,11 @@ of Linux application development.")
(base32
"066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1"))))
(arguments
'(#:configure-flags
(list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out")
"/lib/udev/rules.d")
"-Dsystemd=disabled"
"-Dsession-managers=[]")))
(list
#:configure-flags
#~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d")
"-Dsystemd=disabled"
"-Dsession-managers=[]")))
(inputs (modify-inputs (package-inputs pipewire)
(prepend avahi
bluez
@ -9291,3 +9291,30 @@ desktop.")
directly from the kernel device and prints a device description and the events
with the value and the symbolic name.")
(license license:gpl2+)))
(define-public tp-smapi-module
(package
(name "tp-smapi-module")
(version "0.43")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/linux-thinkpad/tp_smapi")
(commit (string-append "tp-smapi/" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g"))))
(build-system linux-module-build-system)
(arguments
`(#:tests? #f)) ;there are none.
(home-page "https://github.com/linux-thinkpad/tp_smapi")
(synopsis
"Linux Kernel module exposing features of ThinkPad hardware")
(description
"This package provides a Linux Kernel module that allows to control
battery charging of specific ThinkPad laptops. It also includes an improved
version of the HDAPS driver. The underlying hardware interfaces are
@acronym{SMAPI, System Management Application Program Interface} and direct
access to the embedded controller.")
(license license:gpl2+)))

259
gnu/packages/lisp-xyz.scm
View File

@ -35,6 +35,8 @@
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org>
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 Trevor Richards <trev@trevdev.ca>
;;; Copyright © 2022 Artyom Bologov <mail@aartaka.me>
;;;
;;; This file is part of GNU Guix.
;;;
@ -184,6 +186,34 @@ portable between implementations.")
(define-public ecl-alexandria
(sbcl-package->ecl-package sbcl-alexandria))
(define-public sbcl-alea
(package
(name "sbcl-alea")
(version "1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/eXodiquas/alea")
(commit (string-append "v" version))))
(file-name (git-file-name "cl-alea" version))
(sha256
(base32 "0nd9fdjli22ygfw3c8k9nh7d36c92866hics5aij6x7ly1q781gz"))))
(build-system asdf-build-system/sbcl)
(native-inputs (list sbcl-fiveam))
(synopsis "Dice rolling library")
(description
"This package provides a Common Lisp library for dice rolling and working
with dice-roll statistics.")
(home-page "https://github.com/eXodiquas/alea")
(license license:expat)))
(define-public cl-alea
(sbcl-package->cl-source-package sbcl-alea))
(define-public ecl-alea
(sbcl-package->ecl-package sbcl-alea))
(define-public sbcl-map-bind
(let ((commit "532d55d93540c632e22b2cd264b5daa5f9d3d900")
(revision "0"))
@ -292,6 +322,37 @@ collection.")
(define-public cl-bodge-utilities
(sbcl-package->cl-source-package sbcl-bodge-utilities))
(define-public sbcl-meta
(let ((commit "74faea662139fbbfb9c99341aaed989f5b0e9da3")
(revision "0"))
(package
(name "sbcl-meta")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.common-lisp.net/frideau/meta")
(commit commit)))
(file-name (git-file-name "cl-meta" version))
(sha256
(base32 "08s53zj3mcx82kszp1bg2vsb4kydvkc70kj4hpq9h1l5a1wh44cy"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-named-readtables))
(home-page "https://gitlab.common-lisp.net/frideau/meta")
(synopsis "Recursive-descent parser DSL for Common Lisp")
(description
"This package provides a recursive-descent parser DSL for Common Lisp.
It's intended as a simpler alternative to parser generators.")
(license license:bsd-2))))
(define-public cl-meta
(sbcl-package->cl-source-package sbcl-meta))
(define-public ecl-meta
(sbcl-package->ecl-package sbcl-meta))
(define-public sbcl-bodge-queue
(let ((commit "948c9a501dcd412689952d09eb7453ec2722336a")
(revision "0"))
@ -3808,6 +3869,37 @@ and designers will be able to understand the embedded HTML.")
(define-public cl-markup-reader
(sbcl-package->cl-source-package sbcl-markup-reader))
(define-public sbcl-xml-emitter
(package
(name "sbcl-xml-emitter")
(version "1.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/VitoVan/xml-emitter")
(commit version)))
(file-name (git-file-name "cl-xml-emitter" version))
(sha256
(base32
"1w9yx8gc4imimvjqkhq8yzpg3kjrp2y37rjix5c1lnz4s7bxvhk9"))))
(build-system asdf-build-system/sbcl)
(native-inputs (list sbcl-1am))
(inputs (list sbcl-cl-utilities))
(synopsis "Common lisp library for emitting XML output")
(description
"This package provides functions to emit XML, with some complexity for
handling indentation. It can be used to produce all sorts of useful XML
output; it has an RSS 2.0 emitter built in, so you can make RSS feeds
trivially.")
(home-page "https://www.cliki.net/xml-emitter")
(license license:expat)))
(define-public cl-xml-emitter
(sbcl-package->cl-source-package sbcl-xml-emitter))
(define-public ecl-xml-emitter
(sbcl-package->ecl-package sbcl-xml-emitter))
(define-public sbcl-cl-mustache
(package
(name "sbcl-cl-mustache")
@ -7375,8 +7467,8 @@ cl-plumbing libraries.")
(sbcl-package->ecl-package sbcl-cl-octet-streams))
(define-public sbcl-lzlib
(let ((commit "c8102fc8c959b7c418eb60657bd6c8b875f10ba9")
(revision "1"))
(let ((commit "22767ca12d1c1bd59a7ae1f9c5ef7d2e937206bb")
(revision "2"))
(package
(name "sbcl-lzlib")
(version (git-version "2.0" revision commit))
@ -7388,7 +7480,7 @@ cl-plumbing libraries.")
(commit commit)))
(file-name (git-file-name "cl-lzlib" version))
(sha256
(base32 "1glg1y1s1mqgypvxp0ss11cicrddri006wqwhy47lgq7mk5853zz"))))
(base32 "1dxzlkay7aqcs65h2f7j7rl4sdjija60dshlahzyllfw174p9d3m"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-fiveam))
@ -22041,6 +22133,106 @@ instead of #'FOO.
(define-public ecl-nkeymaps
(sbcl-package->ecl-package sbcl-nkeymaps))
(define-public sbcl-njson
(package
(name "sbcl-njson")
(version "0.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/atlas-engineer/njson")
(commit version)))
(file-name (git-file-name "cl-njson" version))
(sha256
(base32
"0lv3q1841s4avii1jp89r91jq21sids2ycpy2id0kzhrljzhmy6j"))))
(build-system asdf-build-system/sbcl)
(inputs (list sbcl-cl-json))
(native-inputs (list sbcl-lisp-unit2))
(home-page "https://github.com/atlas-engineer/njson")
(synopsis "JSON handling framework for Common Lisp")
(description
"NJSON aims to make it convenient for one to decode, encode,
and process JSON data, in the minimum keystrokes/minutes possible.
NJSON is parser-independent, with existing Common Lisp JSON parsers being
loadable as additional system. @code{cl-json} is included by default, though.
Conveniences that NJSON provides are:
@itemize
@item @code{encode} and @code{decode} as single entry points for JSON reading
and writing, be it from streams/string/files, or from those.
@item @code{jget}, @code{jrem}, @code{jtruep}, and their aliases to
access/delete the decoded objects' properties and check their truth value
without the need to worry about the low-level details of how these values are
decoded.
@item @code{jif}, @code{jwhen}, @code{jor}, @code{jand}, and other macros
mimicking Lisp ones, while using truth values of JSON-decoded data.
@end itemize\n")
(license license:bsd-3)))
(define-public cl-njson
(sbcl-package->cl-source-package sbcl-njson))
(define-public ecl-njson
(sbcl-package->ecl-package sbcl-njson))
(define-public sbcl-nactivitypub
(package
(name "sbcl-nactivitypub")
(version "0.0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/atlas-engineer/nactivitypub")
(commit version)))
(file-name (git-file-name "cl-nactivitypub" version))
(sha256
(base32
"07n8a9cfzc96kwsb6z4v5ns09ad2qyq45bjb779azcs7ds144a6r"))))
(build-system asdf-build-system/sbcl)
(inputs (list sbcl-cl-str
sbcl-dexador
sbcl-local-time
sbcl-lparallel
sbcl-njson
sbcl-quri
sbcl-serapeum))
(home-page "https://github.com/atlas-engineer/nactivitypub")
(synopsis
"Common Lisp implementation of ActivityPub and ActivityStreams standards")
(description
"This package provides a Common Lisp implementation of ActivityPub and
ActivityStreams standards for social networking.
Features:
@itemize
@item Parsing and un-parsing ActivityStreams JSON-LD objects to/from CLOS
objects with convenient accessors on those.
@item Sending and fetching ActivityStreams objects to/from the
ActivityStreams-enabled HTTP(S) URLs.
@item Semantic info extraction with methods like @code{name*}, @code{url*},
@code{author*}, and @code{published*}.
@item No reliance on JSON parser. @code{njson} is used for parser-independent
JSON handling. Load the parser backend you prefer!
@end itemize")
(license license:bsd-3)))
(define-public cl-nactivitypub
(sbcl-package->cl-source-package sbcl-nactivitypub))
(define-public ecl-nactivitypub
(sbcl-package->ecl-package sbcl-nactivitypub))
(define-public sbcl-utils-kt
(let ((commit "4adfe2889036ab5ffdd3cc2182ca2cc692bf11ff"))
(package
@ -23874,6 +24066,67 @@ processing named definitions.")
(define-public ecl-definitions-systems
(sbcl-package->ecl-package sbcl-definitions-systems))
(define-public sbcl-draw-cons-tree
(let ((commit "04334f5885a85cd7127db8dda3f6d6686a0438b1")
(revision "0"))
(package
(name "sbcl-draw-cons-tree")
(version (git-version "1.0" revision commit))
;; https://github.com/quicklisp/quicklisp-projects/issues/2149
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/phoe/draw-cons-tree")
(commit commit)))
(file-name (git-file-name "cl-draw-cons-tree" version))
(sha256
(base32 "1523bdkq8a5qn0qp9q7r16w47y6jb0hkfj7hbjfj6mg3xv001s3x"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-fiveam sbcl-split-sequence))
(inputs
(list sbcl-alexandria))
(synopsis "Draw an ascii picture of a cons tree")
(description
"@code{cl-draw-cons-tree} draws a cons tree in ASCII-art style.")
(home-page "https://github.com/phoe/draw-cons-tree/")
(license license:unlicense))))
(define-public cl-draw-cons-tree
(sbcl-package->cl-source-package sbcl-draw-cons-tree))
(define-public ecl-draw-cons-tree
(sbcl-package->ecl-package sbcl-draw-cons-tree))
(define-public sbcl-cl-morse
(package
(name "sbcl-cl-morse")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/em7/cl-morse")
(commit (string-append "v" version))))
(file-name (git-file-name "cl-morse" version))
(sha256
(base32 "01sh34nhbsx2dsrb2r1vkd4j8lzm9gjd5jfi8a4cs4m3djjwhh5i"))))
(build-system asdf-build-system/sbcl)
(inputs (list sbcl-cl-ppcre))
(native-inputs (list sbcl-fiveam))
(home-page "https://github.com/em7/cl-morse")
(synopsis "Morse code translation library for Common Lisp")
(description
"@code{cl-morse} is a Morse code translation library for Common Lisp.")
(license license:bsd-3)))
(define-public cl-morse
(sbcl-package->cl-source-package sbcl-cl-morse))
(define-public ecl-cl-morse
(sbcl-package->ecl-package sbcl-cl-morse))
(define-public sbcl-smug
(let ((commit "647a2428df297e1dd183ba7c19574bdb1320ae79")
(revision "0"))

8
gnu/packages/lisp.scm
View File

@ -988,7 +988,7 @@ the HTML documentation of TXR.")
(define-public txr
(package
(name "txr")
(version "280")
(version "281")
(source
(origin
(method git-fetch)
@ -997,7 +997,7 @@ the HTML documentation of TXR.")
(commit (string-append "txr-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1ni2yb9dggldgizfp13mvrw5vzk13pg74dpk2lyn9dijqvs293s4"))))
(base32 "18sncprahl41hcy9l6mc4vwlaiamkwrs805974g4vci4waccb37k"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -1236,7 +1236,7 @@ including a built-in database engine and a GUI system.")
(define-public janet
(package
(name "janet")
(version "1.24.0")
(version "1.24.1")
(source
(origin
(method git-fetch)
@ -1245,7 +1245,7 @@ including a built-in database engine and a GUI system.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "07kyjzbj5g197008n9qwpdnagylzlv8x4zbsf2d233mpskv3dixi"))))
(base32 "1zaf2z2x5mgfp2nwj3q6pmcj558mw1772a09xn8b8na0cahxlrmq"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags

16
gnu/packages/machine-learning.scm
View File

@ -1097,7 +1097,7 @@ computing environments.")
(define-public python-scikit-learn
(package
(name "python-scikit-learn")
(version "1.0.2")
(version "1.1.2")
(source
(origin
(method git-fetch)
@ -1107,7 +1107,7 @@ computing environments.")
(file-name (git-file-name name version))
(sha256
(base32
"1rli53544vlsnmx4v4xcb8fdqcy5n3zksl4plwp76gsmrppb2lig"))))
"0wcngyfm2fl3vgyi2aq6j5fvky5185xjzgip64968wqj1hmir5nv"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -1128,10 +1128,14 @@ computing environments.")
;; Some tests require write access to $HOME.
(setenv "HOME" "/tmp")
(invoke "pytest" "sklearn" "-m" "not network"
"-n" (number->string (parallel-job-count))
;; This test tries to access the internet.
"-k" "not test_load_boston_alternative")))))))
;; Step out of the source directory to avoid interference;
;; we want to run the installed code with extensions etc.
(with-directory-excursion "/tmp"
(invoke "pytest" "-vv" "--pyargs" "sklearn"
"-m" "not network"
"-n" (number->string (parallel-job-count))
;; This test tries to access the internet.
"-k" "not test_load_boston_alternative"))))))))
(inputs (list openblas))
(native-inputs
(list python-cython

107
gnu/packages/messaging.scm
View File

@ -24,7 +24,7 @@
;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mason Hock <chaosmonk@riseup.net>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2022 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2020, 2021 Robert Karszniewicz <avoidr@posteo.de>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
@ -2338,7 +2338,7 @@ QMatrixClient project.")
(define-public mtxclient
(package
(name "mtxclient")
(version "0.8.0")
(version "0.8.2")
(source
(origin
(method git-fetch)
@ -2347,7 +2347,7 @@ QMatrixClient project.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0gkzgq6rzanvgyk47d25nqz7m0lwa3kz5pc0m4w0ada38xwhy2j9"))))
(base32 "041ckjvfxapv1q6x9xd8q70x43cz10x7p11aql58lnc0jp0kwry7"))))
(arguments
`(#:configure-flags
(list
@ -2383,7 +2383,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
(define-public nheko
(package
(name "nheko")
(version "0.10.0")
(version "0.10.1")
(source
(origin
(method git-fetch)
@ -2392,7 +2392,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1n7czmv8mamaphpr2cnppddpgmb914pjd7msxng0fim6w7bhil14"))
(base32 "0a3wvv7vzh60hvyzy6776v6wa9d6n020684dqbcl4dw608mf4ahk"))
(modules '((guix build utils)))
(snippet
'(begin
@ -2805,10 +2805,10 @@ validating international phone numbers.")
(license license:asl2.0)))
(define-public chatty
(package
(name "chatty")
(version "0.6.7")
(source (origin
(package
(name "chatty")
(version "0.6.7")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://source.puri.sm/Librem5/chatty.git")
@ -2823,51 +2823,52 @@ validating international phone numbers.")
(sha256
(base32
"11q07vjrrjf3k00kk41vm79brpq0qigz7l328br3g0li979kz32v"))))
(build-system meson-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-updating-desktop-database
(lambda _
(substitute* "meson.build"
(("meson.add_install_script.*") ""))))
(add-before 'check 'pre-check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; One test requires a running Xorg server. Start one.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
;; HOME must be writable for writing configuration files.
(setenv "HOME" "/tmp")))))))
(native-inputs
(list gettext-minimal
`(,glib "bin")
pkg-config
protobuf
xorg-server-for-tests))
(inputs
(list feedbackd
folks
gnome-desktop
gsettings-desktop-schemas
gspell
json-glib
libgcrypt
libgee
libhandy
libolm
libphonenumber
modem-manager
pidgin
purple-mm-sms
sqlite))
(propagated-inputs
(list adwaita-icon-theme evolution-data-server))
(synopsis "Mobile client for XMPP and SMS messaging")
(description "Chatty is a chat program for XMPP and SMS. It works on mobile
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-updating-desktop-database
(lambda _
(substitute* "meson.build"
(("meson.add_install_script.*") ""))))
(add-before 'check 'pre-check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; One test requires a running Xorg server. Start one.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
;; HOME must be writable for writing configuration files.
(setenv "HOME" "/tmp")))))))
(native-inputs
(list gettext-minimal
`(,glib "bin")
pkg-config
protobuf
xorg-server-for-tests))
(inputs
(list feedbackd
folks-with-libsoup2
gnome-desktop
gsettings-desktop-schemas
gspell
json-glib
libgcrypt
libgee
libhandy
libolm
libphonenumber
modem-manager
pidgin
purple-mm-sms
sqlite))
(propagated-inputs
(list adwaita-icon-theme evolution-data-server-3.44))
(synopsis "Mobile client for XMPP and SMS messaging")
(description "Chatty is a chat program for XMPP and SMS. It works on mobile
as well as on desktop platforms. It's based on libpurple and ModemManager.")
(home-page "https://source.puri.sm/Librem5/chatty")
(license license:gpl3+)))
(home-page "https://source.puri.sm/Librem5/chatty")
(license license:gpl3+)))
(define-public mosquitto
(package

6
gnu/packages/music.scm
View File

@ -6895,3 +6895,9 @@ sending MIDI, OSC, and UDP to your audio/visual interfaces like Ableton,
Renoise, VCV Rack, or SuperCollider.")
(home-page "https://100r.co/site/orca.html")
(license license:expat))))
;;;
;;; 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
;;; functionality or similar names.
;;;

38
gnu/packages/networking.scm
View File

@ -24,7 +24,7 @@
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2018, 2020-2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2020, 2021, 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com>
@ -2731,7 +2731,7 @@ procedure calls (RPCs).")
(define-public openvswitch
(package
(name "openvswitch")
(version "2.16.1")
(version "3.0.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -2739,7 +2739,7 @@ procedure calls (RPCs).")
version ".tar.gz"))
(sha256
(base32
"1x0k0pw6jykrfgb8rq56bp2ghxd433d55pmr8mxy9gbzw1nc1vbi"))))
"17hr7x9iahhmskp70pv59v4bsn86r2jmbaw37vs03jsz3k1a57gs"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
@ -2751,18 +2751,22 @@ procedure calls (RPCs).")
(modify-phases %standard-phases
(add-after 'unpack 'use-absolute-/bin/sh
(lambda* (#:key inputs #:allow-other-keys)
(let* ((bash (assoc-ref inputs "bash-minimal")))
(let ((/bin/sh (search-input-file inputs "bin/sh")))
(substitute* "ovsdb/ovsdb-server.c"
(("/bin/sh") (string-append bash "/bin/sh"))))))
(("/bin/sh") /bin/sh)))))
(add-before 'check 'adjust-tests
(lambda* (#:key inputs #:allow-other-keys)
(let* ((bash (assoc-ref inputs "bash-minimal"))
(/bin/sh (string-append bash "/bin/sh")))
(let ((/bin/sh (search-input-file inputs "bin/sh")))
(with-fluids ((%default-port-encoding "ISO-8859-1"))
(substitute* (find-files "tests" ".*(run|testsuite)$")
(("#! /bin/sh")
(string-append "#! " /bin/sh))
;; grep 3.8 emits a warning for 'egrep' which breaks
;; expected output; adjust accordingly.
(("egrep")
"grep -E")
;; The tests use 'kill -0' to check whether a test has
;; completed, but it does not work in the build container
;; because zombies are not reaped automatically (PID 1 is
@ -2789,13 +2793,14 @@ ps --no-header -p $1 -o state= | grep -qv '^Z$'"
"DBDIR=/tmp"
"install"))))))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
;; for testing
("bash" ,bash) ;for 'compgen'
("procps" ,procps)
("util-linux" ,util-linux)))
(list perl
pkg-config
python-wrapper
;; For testing.
bash ;for 'compgen'
procps
util-linux))
(inputs
(list bash-minimal libcap-ng openssl))
(synopsis "Virtual network switch")
@ -2805,6 +2810,8 @@ ps --no-header -p $1 -o state= | grep -qv '^Z$'"
massive network automation through programmatic extension, while still
supporting standard management interfaces and protocols (e.g. NetFlow, sFlow,
IPFIX, RSPAN, CLI, LACP, 802.1ag).")
(properties
'((release-monitoring-url . "https://www.openvswitch.org/download/")))
(license ; see debian/copyright for detail
(list license:lgpl2.1 ; xenserver and utilities/bugtool
license:gpl2 ; datapath
@ -3090,8 +3097,9 @@ can be whipped up with little effort.")
(sha256
(base32 "0haanralbvd12pvkyihgkmx9ld74dnzm1s7mzparfandl416ibff"))))
(build-system gnu-build-system)
(native-inputs (list pkg-config))
(inputs
(list libcap ncurses))
(list jansson libcap ncurses))
(arguments
`(#:tests? #f)) ; tests require network access
(home-page "https://www.bitwizard.nl/mtr/")

12
gnu/packages/ntp.scm
View File

@ -129,7 +129,17 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.")
(file-name "ntp-gcc-compat.patch")
(sha256
(base32
"13d28sg45rflc7kqiv30asrhna8n69wlpwx16l65rravgpvp90h2")))))
"13d28sg45rflc7kqiv30asrhna8n69wlpwx16l65rravgpvp90h2")))
;; And another one that fixes the build with glibc 2.34:
;; <https://bugs.ntp.org/show_bug.cgi?id=3741>.
(origin
(method url-fetch)
(uri "https://bugs.ntp.org/attachment.cgi?id=1814\
&action=diff&collapsed=&headers=1&format=raw")
(file-name "ntp-glibc-compat.patch")
(sha256
(base32
"0z8ndaw3l086mbm42v9gfgxild1yvg0anxf3724lsalvgqlndcj4")))))
(modules '((guix build utils)))
(snippet
'(begin

21
gnu/packages/patches/cmake-curl-certificates-3.24.patch 100644
View File

@ -0,0 +1,21 @@
Submitted upstream at https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7670.
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
index 28ee24dfe9..fc5405213a 100644
--- a/Source/cmCurl.cxx
+++ b/Source/cmCurl.cxx
@@ -38,6 +38,14 @@ std::string cmCurlSetCAInfo(::CURL* curl, const std::string& cafile)
::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile.c_str());
check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
}
+ /* Honor the user-configurable OpenSSL environment variables. */
+ else if (cmSystemTools::GetEnv("SSL_CERT_FILE", e)) {
+ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, e.c_str());
+ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
+ } else if (cmSystemTools::GetEnv("SSL_CERT_DIR", e)) {
+ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAPATH, e.c_str());
+ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
+ }
#ifdef CMAKE_FIND_CAFILE
# define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt"
else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) {

27
gnu/packages/patches/cmh-support-fplll.patch
View File

@ -1,27 +0,0 @@
Patch from the CMH git, after the 1.1.0 release.
From 2328c819317dda2171217002268f57c74cedc476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Thom=C3=A9?= <Emmanuel.Thome@inria.fr>
Date: Tue, 7 Jun 2022 12:17:05 -0700
Subject: [PATCH] patch suggested by @x-YVicto
---
src/lll.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lll.cpp b/src/lll.cpp
index 83dab07..f005931 100644
--- a/src/lll.cpp
+++ b/src/lll.cpp
@@ -37,7 +37,7 @@
#ifdef HAVE_FPLLL
static void lll_fplll (mpz_t *v, mpz_t **M, const int m, const int n)
{
- ZZ_mat <mpz_t> Mp (m, n);
+ fplll::ZZ_mat <mpz_t> Mp (m, n);
int i, j;
for (i = 0; i < m; i++)
--
2.36.1

30
gnu/packages/patches/emacs-kv-fix-tests.patch 100644
View File

@ -0,0 +1,30 @@
From 4702849bfe7462fb6c6303786dac1b670c8f0f8f Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Wed, 14 Sep 2022 09:17:31 +0300
Subject: [PATCH] remove copypasted kvaq test
---
kv-tests.el | 7 -------
1 file changed, 7 deletions(-)
diff --git a/kv-tests.el b/kv-tests.el
index 1713e5e..abd6a24 100644
--- a/kv-tests.el
+++ b/kv-tests.el
@@ -105,13 +105,6 @@
(should-not (equal "b" (kvaq "a" '((:a . :b)("a" . "b")))))
(should-not (kvaq "b" '((:a . :b)("a" . "b")))))
-(ert-deftest kvaq ()
- "Test the simple assq."
- (should (equal :b (kvaq :a '((:a . :b)("a" . "b")))))
- (should (equal 2 (kvaq 1 '((1 . 2)("a" . "b")))))
- (should-not (equal "b" (kvaq "a" '((:a . :b)("a" . "b")))))
- (should-not (kvaq "b" '((:a . :b)("a" . "b")))))
-
(ert-deftest kvaqc ()
"Test the simple assq."
(should (equal :b (kvaqc :a '((:a . :b)("a" . "b")))))
--
2.37.3

30
gnu/packages/patches/emacs-yasnippet-fix-tests.patch
View File

@ -9,12 +9,13 @@ Content-Transfer-Encoding: 8bit
- Emacs 28 has a new mode ‘lisp-data-mode’ for Lisp data.
- A test that was temporarily broken passes again.
- The default for ‘org-adapt-indentation’ has changed.
- buffer-list may be called with arguments when native-comp is enabled.
---
yasnippet-tests.el | 41 ++++++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 15 deletions(-)
yasnippet-tests.el | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index b8a7980f..9fadf00c 100644
index f7ca2bb..7618ab7 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -1,6 +1,6 @@
@ -55,7 +56,21 @@ index b8a7980f..9fadf00c 100644
;; Some org-mode versions leave trailing whitespace, some don't.
(delete-trailing-whitespace)
(should (equal expected (buffer-string))))))
@@ -1390,7 +1393,9 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \
@@ -1195,11 +1198,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \
(let ((saved-sym (make-symbol "yas--buffer-list")))
`(let ((,saved-sym (symbol-function 'buffer-list)))
(cl-letf (((symbol-function 'buffer-list)
- (lambda ()
+ (lambda (&rest args)
(cl-remove-if (lambda (buf)
(with-current-buffer buf
(eq major-mode 'lisp-interaction-mode)))
- (funcall ,saved-sym)))))
+ (funcall ,saved-sym args)))))
,@body))))
@@ -1356,7 +1359,9 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \
,@(if (fboundp 'prog-mode)
'(prog-mode))
emacs-lisp-mode
@ -66,7 +81,7 @@ index b8a7980f..9fadf00c 100644
(observed (yas--modes-to-activate)))
(should (equal major-mode (car observed)))
(should (equal (sort expected #'string<) (sort observed #'string<))))))))
@@ -1418,7 +1423,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \
@@ -1384,7 +1389,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \
'(prog-mode))
emacs-lisp-mode
and-also-this-one
@ -79,7 +94,7 @@ index b8a7980f..9fadf00c 100644
(observed (yas--modes-to-activate)))
(should (equal expected-first
(cl-subseq observed 0 (length expected-first))))
@@ -1691,9 +1700,11 @@ TODO: be meaner"
@@ -1657,9 +1666,11 @@ TODO: be meaner"
"Test expansion of snippets in org source blocks."
;; org 9+ no longer runs fontification for text-mode, so our hacks
;; don't work. Note that old ert doesn't have skipping, so we have
@ -93,3 +108,6 @@ index b8a7980f..9fadf00c 100644
:passed :failed)
(let ((text-mode-hook #'yas-minor-mode))
(do-yas-org-native-tab-in-source-block "text")))
--
2.37.2

40
gnu/packages/patches/eog-update-libportal-usage.patch
View File

@ -1,40 +0,0 @@
Fix eog to work with libportal-0.5
This patch is extracted from upstream, see here
https://gitlab.gnome.org/GNOME/eog/-/commit/a06e6325907e136678b0bbe7058c25d688034afd
diff --git a/meson.build b/meson.build
index 9a32e4bb..9d49aa45 100644
--- a/meson.build
+++ b/meson.build
@@ -165,10 +165,14 @@ config_h.set('HAVE_EXEMPI', enable_xmp)
# xdg-desktop-portal support with libportal (optional)
enable_libportal = get_option('libportal')
if enable_libportal
- libportal_dep = dependency('libportal', version: '>= 0.3', required: false)
+ libportal_dep = dependency('libportal', version: '>= 0.5', required: false)
assert(libportal_dep.found() and cc.has_header('libportal/portal.h', dependencies: libportal_dep),
'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false')
- common_deps += libportal_dep
+ libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: false)
+ assert(libportal_gtk3_dep.found() and cc.has_header('libportal-gtk3/portal-gtk3.h', dependencies: libportal_gtk3_dep),
+ 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false')
+
+ common_deps += [libportal_dep, libportal_gtk3_dep]
endif
config_h.set('HAVE_LIBPORTAL', enable_libportal)
diff --git a/src/eog-util.c b/src/eog-util.c
index 90b9768e..56d23472 100644
--- a/src/eog-util.c
+++ b/src/eog-util.c
@@ -45,7 +45,7 @@
#include <glib/gi18n.h>
#ifdef HAVE_LIBPORTAL
#include <libportal/portal.h>
-#include <libportal/portal-gtk3.h>
+#include <libportal-gtk3/portal-gtk3.h>
#endif
void

67
gnu/packages/patches/gdm-default-session.patch
View File

@ -4,12 +4,14 @@ and not in the directories listed in $XDG_DATA_DIRS. The latter includes
/run/current-system/profile, and only then.
Fixes <https://bugs.gnu.org/37831>.
--- a/daemon/gdm-session.c 2021-07-23 15:16:15.164201000 +0000
+++ b/daemon/gdm-session.c 2021-09-26 08:18:58.730134555 +0000
@@ -354,25 +354,19 @@
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 4b709731..3b83fcd3 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -362,16 +362,15 @@ get_system_session_dirs (GdmSession *self,
GArray *search_array = NULL;
char **search_dirs;
int i;
int i, j;
- const gchar * const *system_data_dirs = g_get_system_data_dirs ();
static const char *x_search_dirs[] = {
@ -25,43 +27,44 @@ Fixes <https://bugs.gnu.org/37831>.
search_array = g_array_new (TRUE, TRUE, sizeof (char *));
if (type == NULL || g_str_equal (type, "x11")) {
- for (i = 0; system_data_dirs[i]; i++) {
- gchar *dir = g_build_filename (system_data_dirs[i], "xsessions", NULL);
- g_array_append_val (search_array, dir);
- }
-
g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs));
}
@@ -380,11 +379,6 @@ get_system_session_dirs (GdmSession *self,
@@ -382,16 +376,7 @@
#ifdef ENABLE_USER_DISPLAY_SERVER
g_array_prepend_val (search_array, wayland_search_dir);
- for (i = 0; system_data_dirs[i]; i++) {
- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL);
- g_array_insert_val (search_array, i, dir);
- }
#else
- for (i = 0; system_data_dirs[i]; i++) {
- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL);
- g_array_append_val (search_array, dir);
- }
if (g_str_equal (supported_type, "x11") &&
(type == NULL || g_str_equal (type, supported_type))) {
- for (i = 0; system_data_dirs[i]; i++) {
- gchar *dir = g_build_filename (system_data_dirs[i], "xsessions", NULL);
- g_array_append_val (search_array, dir);
- }
-
g_array_append_val (search_array, wayland_search_dir);
g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs));
}
@@ -392,11 +386,6 @@ get_system_session_dirs (GdmSession *self,
#ifdef ENABLE_WAYLAND_SUPPORT
if (g_str_equal (supported_type, "wayland") &&
(type == NULL || g_str_equal (type, supported_type))) {
- for (i = 0; system_data_dirs[i]; i++) {
- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL);
- g_array_append_val (search_array, dir);
- }
-
g_array_append_val (search_array, wayland_search_dir);
}
#endif
}
diff -ur a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c
--- a/libgdm/gdm-sessions.c 2019-10-07 04:53:35.000000000 -0400
+++ b/libgdm/gdm-sessions.c 2020-04-18 18:31:42.491348691 -0400
@@ -245,35 +245,23 @@
diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c
index d8b4d5cd..7ed8de91 100644
--- a/libgdm/gdm-sessions.c
+++ b/libgdm/gdm-sessions.c
@@ -275,7 +275,7 @@ collect_sessions (void)
"/etc/X11/sessions/",
DMCONFDIR "/Sessions/",
DATADIR "/gdm/BuiltInSessions/",
- DATADIR "/xsessions/",
+ "/run/current-system/profile/share/xsessions/"
};
const gchar *supported_session_types_env = NULL;
g_auto (GStrv) supported_session_types = NULL;
@@ -288,29 +288,17 @@ collect_sessions (void)
names_seen_before = g_hash_table_new (g_str_hash, g_str_equal);
xorg_search_array = g_ptr_array_new_with_free_func (g_free);

21
gnu/packages/patches/gdm-elogind-support.patch
View File

@ -19,7 +19,7 @@ system and user units.
6 files changed, 66 insertions(+), 42 deletions(-)
diff --git a/common/meson.build b/common/meson.build
index 074dd92e1..bca58f7c4 100644
index 074dd92e..bca58f7c 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -11,7 +11,7 @@ libgdmcommon_src = files(
@ -32,10 +32,10 @@ index 074dd92e1..bca58f7c4 100644
gio_dep,
gio_unix_dep,
diff --git a/data/meson.build b/data/meson.build
index 7c5222eaf..403336c31 100644
index 2dec4c23..c3452e1c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -168,41 +168,53 @@ else
@@ -164,41 +164,53 @@ else
service_config.set('PLYMOUTH_QUIT_SERVICE', '')
endif
@ -115,7 +115,7 @@ index 7c5222eaf..403336c31 100644
# XSession
if get_option('gdm-xsession')
diff --git a/libgdm/meson.build b/libgdm/meson.build
index 3f8cafbb7..83e95151b 100644
index 3f8cafbb..83e95151 100644
--- a/libgdm/meson.build
+++ b/libgdm/meson.build
@@ -56,7 +56,7 @@ libgdm_deps = [
@ -128,12 +128,12 @@ index 3f8cafbb7..83e95151b 100644
]
diff --git a/meson.build b/meson.build
index e6fcf4b8b..a86a486b7 100644
index 845f673e..d0ca41ef 100644
--- a/meson.build
+++ b/meson.build
@@ -92,21 +92,30 @@ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
@@ -96,21 +96,30 @@ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
if xdmcp_dep.found() and get_option('tcp-wrappers')
libwrap_dep = cc.find_library('libwrap')
libwrap_dep = cc.find_library('wrap')
endif
-# systemd
-systemd_dep = dependency('systemd')
@ -175,7 +175,7 @@ index e6fcf4b8b..a86a486b7 100644
# Plymouth
plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth'))
# Check for Solaris auditing API (ADT)
@@ -313,6 +322,7 @@ summary({
@@ -319,6 +328,7 @@ summary({
'PAM Syslog': have_pam_syslog,
'Supports PAM Extensions': pam_extensions_supported,
'SeLinux': libselinux_dep.found(),
@ -184,7 +184,7 @@ index e6fcf4b8b..a86a486b7 100644
'Use UserDisplayServer': get_option('user-display-server'),
'Use SystemdJournal': get_option('systemd-journal'),
diff --git a/meson_options.txt b/meson_options.txt
index 14e0b908b..5135d7d66 100644
index 14e0b908..5135d7d6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,6 +12,7 @@ option('initial-vt', type: 'integer', value: 1, description: 'Initial virtual te
@ -206,6 +206,3 @@ index 14e0b908b..5135d7d66 100644
option('tcp-wrappers', type: 'boolean', value: false, description: 'Use TCP wrappers.')
option('udev-dir', type: 'string', value: '', description: 'Directory for udev rules file.')
option('user', type: 'string', value: 'gdm', description: 'GDM\'s username.')
--
GitLab

13
gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
View File

@ -1,17 +1,11 @@
From 444250fce55f916af993bc855930c6809686e4bd Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Tue, 23 Nov 2021 18:39:39 +0000
Subject: [PATCH] Make GDM pass GDK_PIXBUF_MODULE_FILE to sessions
---
daemon/gdm-launch-environment.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index 14ecfac2..3e618321 100644
index 932c3e8a..a50dcc8c 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -158,6 +158,7 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment,
@@ -157,6 +157,7 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment,
"WINDOWPATH",
"XCURSOR_PATH",
"XDG_CONFIG_DIRS",
@ -19,6 +13,3 @@ index 14ecfac2..3e618321 100644
NULL
};
char *system_data_dirs;
--
2.33.1

36
gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch
View File

@ -1,22 +1,28 @@
Remove check for hardcoded Xwayland path in gdm.
---
daemon/gdm-local-display-factory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index da1093bb..37355c06 100644
index 7de7b99c..065325f4 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -203,7 +203,7 @@ gdm_local_display_factory_use_wayland (void)
@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
const char *session_type;
} display_server_configuration[] = {
#ifdef ENABLE_WAYLAND_SUPPORT
gboolean wayland_enabled = FALSE;
if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) {
- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) )
+ if (wayland_enabled)
return TRUE;
}
- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
+ { "wayland", GDM_KEY_WAYLAND_ENABLE, "", "wayland" },
#endif
--
2.33.0
- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
+ { "xorg", GDM_KEY_XORG_ENABLE, "", "x11" },
{ NULL, NULL, NULL },
};
@@ -269,9 +269,6 @@ display_server_enabled (GdmLocalDisplayFactory *factory,
if (!gdm_settings_direct_get_boolean (key, &enabled) || !enabled)
return FALSE;
- if (!g_file_test (binary, G_FILE_TEST_IS_EXECUTABLE))
- return FALSE;
-
return TRUE;
}

13
gnu/packages/patches/gdm-wayland-session-wrapper-from-env.patch
View File

@ -1,14 +1,10 @@
Get wayland-session wrapper from environment.
---
daemon/gdm-session.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 4e303e70..1deca4e9 100644
index 3b83fcd3..e60e6a57 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -2888,8 +2888,9 @@ gdm_session_start_session (GdmSession *self,
@@ -2933,8 +2933,9 @@ gdm_session_start_session (GdmSession *self,
allow_remote_connections? "--allow-remote-connections " : "",
command);
} else {
@ -19,7 +15,7 @@ index 4e303e70..1deca4e9 100644
command);
}
} else if (run_xsession_script) {
@@ -2942,8 +2942,9 @@
@@ -2965,8 +2966,9 @@ gdm_session_start_session (GdmSession *self,
register_session ? "--register-session " : "",
self->selected_program);
} else {
@ -30,6 +26,3 @@ index 4e303e70..1deca4e9 100644
self->selected_program);
}
} else {
--
2.33.0

28
gnu/packages/patches/geoclue-config.patch
View File

@ -1,25 +1,27 @@
Allow the configuration file to be specified via an environment variable.
--- geoclue-2.1.10/src/gclue-config.c 2015-04-07 09:50:07.721074380 +0200
+++ geoclue-2.1.10/src/gclue-config.c 2015-04-07 10:27:26.613171960 +0200
@@ -235,6 +235,11 @@
diff --git a/src/gclue-config.c b/src/gclue-config.c
index 7ab2a67..e41f3df 100644
--- a/src/gclue-config.c
+++ b/src/gclue-config.c
@@ -332,6 +332,11 @@ static void
gclue_config_init (GClueConfig *config)
{
GError *error = NULL;
+ const char *config_file_path;
+
+ config_file_path = g_getenv ("GEOCLUE_CONFIG_FILE");
+ if (config_file_path == NULL)
+ config_file_path = CONFIG_FILE_PATH;
+ if (!config_file_path)
+ config_file_path = CONFIG_FILE_PATH;
config->priv =
G_TYPE_INSTANCE_GET_PRIVATE (config,
@@ -242,7 +247,7 @@
GClueConfigPrivate);
config->priv = gclue_config_get_instance_private(config);
config->priv->key_file = g_key_file_new ();
g_key_file_load_from_file (config->priv->key_file,
- CONFIG_FILE_PATH,
+ config_file_path,
0,
@@ -341,7 +346,7 @@ gclue_config_init (GClueConfig *config)
&error);
if (error != NULL) {
g_critical ("Failed to load configuration file '%s': %s",
- CONFIG_FILE_PATH, error->message);
+ config_file_path, error->message);
g_error_free (error);
return;

32
gnu/packages/patches/gnome-boxes-add-guix-logo.patch
View File

@ -1,32 +0,0 @@
Taken from upstream commit: 9091c6849652fa083297bc12645d8c57a962874a.
diff --git a/data/osinfo/guix-1.3.xml b/data/osinfo/guix-1.3.xml
new file mode 100644
index 00000000..d4e1c167
--- /dev/null
+++ b/data/osinfo/guix-1.3.xml
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+
+ <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
+
+ <os id="http://guix.gnu.org/guix/1.3">
+ <logo>https://gitlab.gnome.org/GNOME/gnome-boxes-logos/-/raw/master/logos/guix.svg</logo>
+ </os>
+
+</libosinfo>
diff --git a/data/osinfo/meson.build b/data/osinfo/meson.build
index 46ff1570..d5531e60 100644
--- a/data/osinfo/meson.build
+++ b/data/osinfo/meson.build
@@ -7,6 +7,7 @@ osinfo_db = [
['freedos-1.2.xml', 'gnome-boxes/osinfo/os/freedos.org'],
['gnome-nightly.xml', 'gnome-boxes/osinfo/os/gnome.org'],
['gnome-3.38.xml', 'gnome-boxes/osinfo/os/gnome.org'],
+ ['guix-1.3.xml', 'gnome-boxes/osinfo/os/guix.gnu.org'],
['manjaro-19.0.xml', 'gnome-boxes/osinfo/os/manjaro.org'],
['nixos-20.03.xml', 'gnome-boxes/osinfo/os/nixos.org'],
['opensuse-10.2.xml', 'gnome-boxes/osinfo/os/opensuse.org'],
--
2.34.0

93
gnu/packages/patches/gnome-builder-update-libportal.patch
View File

@ -1,93 +0,0 @@
From b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1 Mon Sep 17 00:00:00 2001
From: Abderrahim Kitouni <akitouni@gnome.org>
Date: Sat, 25 Dec 2021 16:25:43 +0100
Subject: [PATCH] build: use libportal 0.5
This partly reverts 2aea4bd7d0ced77a7d0778517b4505af5dea2dac
---
build-aux/flatpak/org.gnome.Builder.json | 7 ++++---
meson.build | 2 +-
src/gstyle/gstyle-color-panel.c | 2 +-
src/plugins/devhelp/gbp-devhelp-page.c | 2 +-
src/plugins/open-with-external/gbp-owe-workbench-addin.c | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 02ac31ede..a32d29b92 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -601,15 +601,16 @@
"name" : "libportal",
"config-opts" : [
"--libdir=/app/lib",
- "--buildtype=debugoptimized"
+ "--buildtype=debugoptimized",
+ "-Dbackends=gtk3"
],
"buildsystem" : "meson",
"builddir" : true,
"sources" : [
{
"type" : "archive",
- "url" : "https://github.com/flatpak/libportal/releases/download/0.4/libportal-0.4.tar.xz",
- "sha256" : "3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28"
+ "url" : "https://github.com/flatpak/libportal/releases/download/0.5/libportal-0.5.tar.xz",
+ "sha256" : "d8c8cb18a34e5eeb26a39c94044c955995b01de0e139caac5e18c076cf821b3b"
}
]
},
diff --git a/meson.build b/meson.build
index 01737034b..494e0d752 100644
--- a/meson.build
+++ b/meson.build
@@ -284,7 +284,7 @@ libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.41.0')
libm_dep = cc.find_library('m', required: false)
libpangoft2_dep = dependency('pangoft2', version: '>= 1.38.0')
libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0')
-libportal_dep = dependency('libportal', version: '>= 0.3', required: false)
+libportal_dep = dependency('libportal-gtk3', required: false)
libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.28.0')
libvte_dep = dependency('vte-2.91', version: '>= 0.65.0')
libwebkit_dep = dependency('webkit2gtk-4.0', version: '>= 2.26', required: false)
diff --git a/src/gstyle/gstyle-color-panel.c b/src/gstyle/gstyle-color-panel.c
index 15742a7be..a6295c168 100644
--- a/src/gstyle/gstyle-color-panel.c
+++ b/src/gstyle/gstyle-color-panel.c
@@ -30,7 +30,7 @@
#include "gstyle-color.h"
#include <libportal/portal.h>
-#include <libportal/portal-gtk3.h>
+#include <libportal-gtk3/portal-gtk3.h>
#define HSV_TO_SCALE_FACTOR (1.0 / 256.0)
#define CIELAB_L_TO_SCALE_FACTOR (100.0 / 256.0)
diff --git a/src/plugins/devhelp/gbp-devhelp-page.c b/src/plugins/devhelp/gbp-devhelp-page.c
index 5d5c52b0d..2ac788414 100644
--- a/src/plugins/devhelp/gbp-devhelp-page.c
+++ b/src/plugins/devhelp/gbp-devhelp-page.c
@@ -25,7 +25,7 @@
#include <webkit2/webkit2.h>
#include <libportal/portal.h>
-#include <libportal/portal-gtk3.h>
+#include <libportal-gtk3/portal-gtk3.h>
#include "gbp-devhelp-page.h"
#include "gbp-devhelp-search.h"
diff --git a/src/plugins/open-with-external/gbp-owe-workbench-addin.c b/src/plugins/open-with-external/gbp-owe-workbench-addin.c
index 51d2da844..816fe643f 100644
--- a/src/plugins/open-with-external/gbp-owe-workbench-addin.c
+++ b/src/plugins/open-with-external/gbp-owe-workbench-addin.c
@@ -23,7 +23,7 @@
#include "gbp-owe-workbench-addin.h"
#include <libportal/portal.h>
-#include <libportal/portal-gtk3.h>
+#include <libportal-gtk3/portal-gtk3.h>
struct _GbpOweWorkbenchAddin
{
--
GitLab

39
gnu/packages/patches/gnome-screenshot-meson-0.60.patch
View File

@ -1,39 +0,0 @@
Fixes build issue with Meson 0.60.0. Taken from upstream
https://gitlab.gnome.org/GNOME/gnome-screenshot/-/merge_requests/57
From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001
From: Jack Hill <jackhill@jackhill.us>
Date: Thu, 18 Nov 2021 00:46:58 -0500
Subject: [PATCH] meson: remove extraneous positional argument
* data/meson.build (desktop_file)
(metainfo_file): Remove extraneous positional argument.
Closes #186
---
data/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index fd570b3..4e2e2e8 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,6 @@
gnome = import('gnome')
desktop_file = i18n.merge_file(
- 'desktop',
type: 'desktop',
input: 'org.gnome.Screenshot.desktop.in',
output: 'org.gnome.Screenshot.desktop',
@@ -23,7 +22,6 @@ if desktop_file_validate.found()
endif
metainfo_file = i18n.merge_file(
- 'appdata',
input: 'org.gnome.Screenshot.metainfo.xml.in',
output: 'org.gnome.Screenshot.metainfo.xml',
po_dir: join_paths(meson.current_source_dir(), '../po'),
--
2.33.1

173
gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch 100644
View File

@ -0,0 +1,173 @@
Names of libraries included in typelib files are opened by dlopen.
Here we add the full path.
This patch was provided by Luca Bruno <lucabru@src.gnome.org>,
for 'gobject-introspection' 1.40.0 in Nix.
It has since been updated to work with newer versions of
gobject-introspection.
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index 1d39ab84..e12ed24e 100644
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
return group
+def _get_default_fallback_libpath():
+ # Newer multiple-output-optimized stdenv has an environment variable
+ # $outputLib which in turn specifies another variable which then is used as
+ # the destination for the library contents (${!outputLib}/lib).
+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None
+ if store_path is None:
+ outputs = os.environ.get("outputs", "out").split()
+ if "lib" in outputs:
+ # For multiple output derivations let's try whether there is a $lib
+ # environment variable and use that as the base store path.
+ store_path = os.environ.get("lib")
+ elif "out" in outputs:
+ # Otherwise we have a single output derivation, so the libraries
+ # most certainly will end up in "$out/lib".
+ store_path = os.environ.get("out")
+
+ if store_path is not None:
+ # Even if we have a $lib as output, there still should be a $lib/lib
+ # directory.
+ return os.path.join(store_path, 'lib')
+ else:
+ # If we haven't found a possible scenario, let's return an empty string
+ # so that the shared library won't be prepended with a path.
+ #
+ # Note that this doesn't mean that all hope is lost, because after all
+ # we can still use --fallback-library-path to set one.
+ #
+ # Also, we're not returning None, because that would make it very
+ # difficult to disable adding fallback paths altogether using something
+ # like: --fallback-library-path=""
+ return ""
+
+
def _get_option_parser():
parser = optparse.OptionParser('%prog [options] sources',
version='%prog ' + giscanner.__version__)
@@ -220,6 +253,10 @@ match the namespace prefix.""")
parser.add_option("", "--compiler",
action="store", dest="compiler", default=None,
help="the C compiler to use internally")
+ parser.add_option("", "--fallback-library-path",
+ action="store", dest="fallback_libpath",
+ default=_get_default_fallback_libpath(),
+ help="Path to prepend to unknown shared libraries")
group = get_preprocessor_option_group(parser)
parser.add_option_group(group)
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index 9f8ab5df..8aa37c99 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
$""" % re.escape(library_name), re.VERBOSE)
+def _ldd_library_guix_pattern(library_name):
+ store_dir = re.escape(
+ os.environ.get("NIX_STORE", default="/gnu/store")
+ )
+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
+ return re.compile(pattern % (store_dir, re.escape(library_name)))
+
+
# This is a what we do for non-la files. We assume that we are on an
# ELF-like system where ldd exists and the soname extracted with ldd is
# a filename that can be opened with dlopen().
@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
output = output.decode("utf-8", "replace")
shlibs = resolve_from_ldd_output(libraries, output)
- return list(map(sanitize_shlib_path, shlibs))
+ fallback_libpath = options.fallback_libpath or "";
+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs)))
def sanitize_shlib_path(lib):
@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib):
# In case we get relative paths on macOS (like @rpath) then we fall
# back to the basename as well:
# https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
- if sys.platform == "darwin":
- if not os.path.isabs(lib):
- return os.path.basename(lib)
- return lib
- else:
+
+ # Always use absolute paths if available
+ if not os.path.isabs(lib):
return os.path.basename(lib)
+ return lib
def resolve_from_ldd_output(libraries, output):
patterns = {}
for library in libraries:
if not os.path.isfile(library):
- patterns[library] = _ldd_library_pattern(library)
+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library))
if len(patterns) == 0:
return []
@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
if line.endswith(':'):
continue
for word in line.split():
- for library, pattern in patterns.items():
- m = pattern.match(word)
+ for library, (pattern, guix_pattern) in patterns.items():
+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store")
+ if line.find(store_dir) != -1:
+ m = guix_pattern.match(word)
+ else:
+ m = pattern.match(word)
if m:
del patterns[library]
shlibs.append(m.group())
diff --git a/giscanner/utils.py b/giscanner/utils.py
index 31c7ea48..630002a8 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
if dlname is None:
return None
- # Darwin uses absolute paths where possible; since the libtool files never
- # contain absolute paths, use the libdir field
- if platform.system() == 'Darwin':
- dlbasename = os.path.basename(dlname)
- libdir = _extract_libdir_field(la_file)
- if libdir is None:
- return dlbasename
- return libdir + '/' + dlbasename
- # Older libtools had a path rather than the raw dlname
- return os.path.basename(dlname)
+ dlbasename = os.path.basename(dlname)
+ libdir = _extract_libdir_field(la_file)
+ if libdir is None:
+ return dlbasename
+ return libdir + '/' + dlbasename
# Returns arguments for invoking libtool, if applicable, otherwise None
diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
index a8337c60..7f123103 100644
--- a/tests/scanner/test_shlibs.py
+++ b/tests/scanner/test_shlibs.py
@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
self.assertEqual(
sanitize_shlib_path('/foo/bar'),
- '/foo/bar' if sys.platform == 'darwin' else 'bar')
+ # Always use an absolute filename for Guix
+ '/foo/bar')
def test_unresolved_library(self):
output = ''

15
gnu/packages/patches/gobject-introspection-cc-1.72.patch 100644
View File

@ -0,0 +1,15 @@
Use gcc as the default C compiler if CC is not set.
diff --git a/giscanner/__init__.py b/giscanner/__init__.py
index 7c2f365a..607fe341 100644
--- a/giscanner/__init__.py
+++ b/giscanner/__init__.py
@@ -21,6 +21,8 @@ import os
builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
if builddir is not None:
__path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422
+if not 'CC' in os.environ:
+ os.environ['CC'] = 'gcc'
try:
from ._version import __version__
except ImportError:

29
gnu/packages/patches/gpaste-fix-paths.patch
View File

@ -1,5 +1,7 @@
This is copied from NixOS, which is under MIT licence.
https://github.com/NixOS/nixpkgs/blob/master/pkgs/desktops/gnome/misc/gpaste/
diff --git a/src/gnome-shell/extension.js b/src/gnome-shell/extension.js
index c8773fd6..9efbed67 100644
--- a/src/gnome-shell/extension.js
+++ b/src/gnome-shell/extension.js
@@ -6,6 +6,8 @@
@ -10,15 +12,34 @@ https://github.com/NixOS/nixpkgs/blob/master/pkgs/desktops/gnome/misc/gpaste/
+
imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
imports.gi.versions.GLib = '2.0';
imports.gi.versions.GPaste = '1.0';
imports.gi.versions.GPaste = '2';
diff --git a/src/gnome-shell/prefs.js b/src/gnome-shell/prefs.js
index 32244ab2..74b85572 100644
--- a/src/gnome-shell/prefs.js
+++ b/src/gnome-shell/prefs.js
@@ -6,6 +6,8 @@
const Gettext = imports.gettext;
imports.gi.versions.GPasteGtk = '4';
+imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@');
+
//const { GPaste } = imports.gi;
const ExtensionUtils = imports.misc.extensionUtils;
const { GPasteGtk } = imports.gi;
diff --git a/src/libgpaste/gpaste/gpaste-settings.c b/src/libgpaste/gpaste/gpaste-settings.c
index 7e53eb64..57c399fc 100644
--- a/src/libgpaste/gpaste/gpaste-settings.c
+++ b/src/libgpaste/gpaste/gpaste-settings.c
@@ -1013,7 +1013,11 @@ create_g_settings (void)
}
else
{
- return g_settings_new (G_PASTE_SETTINGS_NAME);
+ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library
+ GSettingsSchemaSource *schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL);
+ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE);
+ g_settings_schema_source_unref (schema_source);
+ return g_settings_new_full (schema, NULL, NULL);
}
}

22
gnu/packages/patches/gspell-dash-test.patch
View File

@ -1,22 +0,0 @@
Somehow, Aspell 0.60.6.1 and aspell-dict-en-2016.11.20-0 don't consider
this a valid spelling. Skip it.
TODO: Migrate to using hunspell. According to upstream, this bug won't be fixed.
See https://bugzilla.gnome.org/show_bug.cgi?id=772406.
--- a/testsuite/test-checker.c 2017-03-24 09:50:50.000000000 -0400
+++ b/testsuite/test-checker.c 2017-06-15 21:47:07.116173895 -0400
@@ -105,10 +105,11 @@
* be considered deprecated, it is better to use hunspell, so WONTFIX.
* For more details, see:
* https://bugzilla.gnome.org/show_bug.cgi?id=772406
+ *
+ * correctly_spelled = gspell_checker_check_word (checker, "spell-checking", -1, &error);
+ * g_assert_no_error (error);
+ * g_assert (correctly_spelled);
*/
- correctly_spelled = gspell_checker_check_word (checker, "spell-checking", -1, &error);
- g_assert_no_error (error);
- g_assert (correctly_spelled);
correctly_spelled = gspell_checker_check_word (checker, "nrst-auie", -1, &error);
g_assert_no_error (error);

150
gnu/packages/patches/hedgewars-network-bsd.patch
View File

@ -1,150 +0,0 @@
From f813f3d5b63bb5be1b5e0b44930e77656c547aad Mon Sep 17 00:00:00 2001
From: Jens Petersen <none@none>
Date: Wed, 8 Jul 2020 17:02:45 +0300
Subject: [PATCH] update server network
---
gameServer/Actions.hs | 2 +-
gameServer/CMakeLists.txt | 3 ++-
gameServer/ClientIO.hs | 4 ++--
gameServer/CoreTypes.hs | 2 +-
gameServer/OfficialServer/checker.hs | 5 ++---
gameServer/Utils.hs | 6 +-----
gameServer/hedgewars-server.cabal | 3 ++-
gameServer/hedgewars-server.hs | 5 +++--
8 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/gameServer/Actions.hs b/gameServer/Actions.hs
index 125d6ea832..c42d17b9a9 100644
--- a/gameServer/Actions.hs
+++ b/gameServer/Actions.hs
@@ -709,7 +709,7 @@ processAction RestartServer = do
args <- gets (runArgs . serverInfo)
io $ do
noticeM "Core" "Closing listening socket"
- sClose sock
+ close sock
noticeM "Core" "Spawning new server"
_ <- createProcess (proc "./hedgewars-server" args)
return ()
diff --git a/gameServer/CMakeLists.txt b/gameServer/CMakeLists.txt
index 5f2c882563..e71650c70c 100644
--- a/gameServer/CMakeLists.txt
+++ b/gameServer/CMakeLists.txt
@@ -9,7 +9,8 @@ check_haskell_package_exists(base "Control.Exception" mask 1)
check_haskell_package_exists(containers "Data.Map" size 1)
check_haskell_package_exists(vector "Data.Vector" length 1)
check_haskell_package_exists(bytestring "Data.ByteString" pack 1)
-check_haskell_package_exists(network "Network.BSD" getHostName 0)
+check_haskell_package_exists(network "Network.Socket" defaultHints 0)
+check_haskell_package_exists(network-bsd "Network.BSD" getHostName 0)
check_haskell_package_exists(time "Data.Time" getCurrentTime 0)
check_haskell_package_exists(mtl "Control.Monad.State" fix 1)
check_haskell_package_exists(sandi "Codec.Binary.Base64" encode 1)
diff --git a/gameServer/ClientIO.hs b/gameServer/ClientIO.hs
index 46dd40ed9f..0c97bde932 100644
--- a/gameServer/ClientIO.hs
+++ b/gameServer/ClientIO.hs
@@ -23,7 +23,7 @@ import qualified Control.Exception as Exception
import Control.Monad.State
import Control.Concurrent.Chan
import Control.Concurrent
-import Network
+import Network.Socket hiding (recv)
import Network.Socket.ByteString
import qualified Data.ByteString.Char8 as B
----------------
@@ -90,7 +90,7 @@ clientSendLoop s tId chan ci = do
sendAll s $ B.unlines answer `B.snoc` '\n'
if isQuit answer then
- sClose s
+ close s
else
clientSendLoop s tId chan ci
diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs
index f547df483a..72f35807e3 100644
--- a/gameServer/CoreTypes.hs
+++ b/gameServer/CoreTypes.hs
@@ -23,7 +23,7 @@ import Control.Concurrent
import Data.Word
import qualified Data.Map as Map
import Data.Time
-import Network
+import Network.Socket
import Data.Function
import Data.ByteString.Char8 as B
import Data.Unique
diff --git a/gameServer/OfficialServer/checker.hs b/gameServer/OfficialServer/checker.hs
index 37df3208b9..b4ecb8fc57 100644
--- a/gameServer/OfficialServer/checker.hs
+++ b/gameServer/OfficialServer/checker.hs
@@ -28,8 +28,7 @@ import System.Directory
import Control.Monad.State
import Control.Concurrent.Chan
import Control.Concurrent
-import Network
-import Network.BSD
+import Network.BSD hiding (recv)
import Network.Socket hiding (recv, sClose)
import Network.Socket.ByteString
import qualified Data.ByteString.Char8 as B
@@ -207,7 +206,7 @@ main = withSocketsDo . forever $ do
Exception.bracket
setupConnection
- (\s -> noticeM "Core" "Shutting down" >> sClose s)
+ (\s -> noticeM "Core" "Shutting down" >> close s)
(session login password (d ++ "/.hedgewars") exeFullname dataPrefix)
where
setupConnection = do
diff --git a/gameServer/Utils.hs b/gameServer/Utils.hs
index 3d81b7f7c6..9fd80c01ba 100644
--- a/gameServer/Utils.hs
+++ b/gameServer/Utils.hs
@@ -41,11 +41,7 @@ import CoreTypes
sockAddr2String :: SockAddr -> IO B.ByteString
-sockAddr2String (SockAddrInet _ hostAddr) = liftM B.pack $ inet_ntoa hostAddr
-sockAddr2String (SockAddrInet6 _ _ (a, b, c, d) _) =
- return $ B.pack $ (foldr1 (.)
- $ List.intersperse (':':)
- $ concatMap (\n -> (\(a0, a1) -> [showHex a0, showHex a1]) $ divMod n 65536) [a, b, c, d]) []
+sockAddr2String = liftM (B.pack . fromJust . fst) . getNameInfo [] True False
maybeRead :: Read a => String -> Maybe a
maybeRead s = case reads s of
diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal
index 3c7f2418c9..9f764fd997 100644
--- a/gameServer/hedgewars-server.cabal
+++ b/gameServer/hedgewars-server.cabal
@@ -57,7 +57,8 @@ Executable checker
containers,
vector,
bytestring,
- network >= 2.3 && < 3.0,
+ network >= 2.3,
+ network-bsd,
mtl >= 2,
sandi,
hslogger,
diff --git a/gameServer/hedgewars-server.hs b/gameServer/hedgewars-server.hs
index e47ae2891d..7e6ab8fa38 100644
--- a/gameServer/hedgewars-server.hs
+++ b/gameServer/hedgewars-server.hs
@@ -50,10 +50,11 @@ server si = do
proto <- getProtocolNumber "tcp"
E.bracket
(socket AF_INET Stream proto)
- sClose
+ close
(\sock -> do
setSocketOption sock ReuseAddr 1
- bindSocket sock (SockAddrInet (listenPort si) iNADDR_ANY)
+ iNADDR_ANY <- addrAddress . head <$> getAddrInfo Nothing (Just "0") (Just (show (listenPort si)))
+ bind sock iNADDR_ANY
listen sock maxListenQueue
startServer si{serverSocket = Just sock}
)

33
gnu/packages/patches/libgda-cve-2021-39359.patch 100644
View File

@ -0,0 +1,33 @@
From bebdffb4de586fb43fd07ac549121f4b22f6812d Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 18 Oct 2021 13:18:01 -0500
Subject: [PATCH] Fix CVE-2021-39359 by forcing TLS certificate validation
This was done by adding "ssl-use-system-ca-file", TRUE to the options
for each soup_session_new_with_options() call that was made.
Tested on Linux From Scratch 11.0 and Debian 11.
Fixes #249
---
providers/web/gda-web-provider.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/providers/web/gda-web-provider.c b/providers/web/gda-web-provider.c
index cf8d14dc3..cc818895f 100644
--- a/providers/web/gda-web-provider.c
+++ b/providers/web/gda-web-provider.c
@@ -355,8 +355,8 @@ gda_web_provider_open_connection (GdaServerProvider *provider, GdaConnection *cn
g_rec_mutex_init (& (cdata->mutex));
cdata->server_id = NULL;
cdata->forced_closing = FALSE;
- cdata->worker_session = soup_session_new ();
- cdata->front_session = soup_session_new_with_options ("max-conns-per-host", 1, NULL);
+ cdata->worker_session = soup_session_new_with_options ("ssl-use-system-ca-file", TRUE, NULL);
+ cdata->front_session = soup_session_new_with_options ("max-conns-per-host", 1, "ssl-use-system-ca-file", TRUE, NULL);
if (use_ssl) {
server_url = g_string_new ("https://");
g_print ("USING SSL\n");
--
GitLab

131
gnu/packages/patches/libgda-fix-build.patch 100644
View File

@ -0,0 +1,131 @@
Taken from upstream.
From 4c2369083c5941ffada100e4a7e4702e681585e3 Mon Sep 17 00:00:00 2001
From: taozuhong <taozuhong@gmail.com>
Date: Tue, 11 Jan 2022 15:03:28 +0800
Subject: [PATCH] fixed compile error
---
libgda/Gda-6.0-custom.vala | 3 +++
libgda/sql-parser/lemon.c | 39 +++++++++++++++++++-------------------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/libgda/Gda-6.0-custom.vala b/libgda/Gda-6.0-custom.vala
index d046c5c24..4d1408648 100644
--- a/libgda/Gda-6.0-custom.vala
+++ b/libgda/Gda-6.0-custom.vala
@@ -92,7 +92,10 @@ namespace Gda {
[CCode (cheader_filename = "libgda.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gda_sql_statement_get_type ()")]
[Compact]
public class SqlStatement {
+ #if VALA_0_50
+ #else
public static Gda.SqlStatementContentsInfo get_contents_infos (Gda.SqlStatementType type);
+ #endif
}
}
diff --git a/libgda/sql-parser/lemon.c b/libgda/sql-parser/lemon.c
index a6fe75bb9..a3c727777 100644
--- a/libgda/sql-parser/lemon.c
+++ b/libgda/sql-parser/lemon.c
@@ -11,6 +11,7 @@
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
+#include <stdint.h>
#include <assert.h>
#include <gio/gio.h>
@@ -40,7 +41,7 @@ static const char **made_files = NULL;
static int made_files_count = 0;
static int successful_exit = 0;
-static char *msort(char*,char**,int(*)(const char*,const char*));
+static uintptr_t msort(uintptr_t, uintptr_t*, int(*)(const uintptr_t, const uintptr_t));
/*
** Compilers are getting increasingly pedantic about type conversions
@@ -396,8 +397,7 @@ static int actioncmp(
static struct action *Action_sort(
struct action *ap
){
- ap = (struct action *)msort((char *)ap,(char **)&ap->next,
- (int(*)(const char*,const char*))actioncmp);
+ ap = (struct action *)msort(ap, &ap->next, actioncmp);
return ap;
}
@@ -1277,14 +1277,14 @@ void Configlist_closure(struct lemon *lemp)
/* Sort the configuration list */
void Configlist_sort(){
- current = (struct config *)msort((char *)current,(char **)&(current->next),Configcmp);
+ current = (struct config *)msort(current, &(current->next), Configcmp);
currentend = 0;
return;
}
/* Sort the basis configuration list */
void Configlist_sortbasis(){
- basis = (struct config *)msort((char *)current,(char **)&(current->bp),Configcmp);
+ basis = (struct config *)msort(current, &(current->bp), Configcmp);
basisend = 0;
return;
}
@@ -1577,7 +1577,7 @@ int main(G_GNUC_UNUSED int argc, char **argv)
/*
** Return a pointer to the next structure in the linked list.
*/
-#define NEXT(A) (*(char**)(((unsigned long)A)+offset))
+#define NEXT(A) (*(uintptr_t *)(((uintptr_t)A)+offset))
/*
** Inputs:
@@ -1594,13 +1594,13 @@ int main(G_GNUC_UNUSED int argc, char **argv)
** The "next" pointers for elements in the lists a and b are
** changed.
*/
-static char *merge(
- char *a,
- char *b,
- int (*cmp)(const char*,const char*),
- int offset
+static uintptr_t merge(
+ uintptr_t a,
+ uintptr_t b,
+ int (*cmp)(const uintptr_t, const uintptr_t),
+ uintptr_t offset
){
- char *ptr, *head;
+ uintptr_t ptr, *head;
if( a==0 ){
head = b;
@@ -1646,16 +1646,15 @@ static char *merge(
** The "next" pointers for elements in list are changed.
*/
#define LISTSIZE 30
-static char *msort(
- char *list,
- char **next,
- int (*cmp)(const char*,const char*)
+static uintptr_t msort(
+ uintptr_t list,
+ uintptr_t *next,
+ int (*cmp)(const uintptr_t, const uintptr_t)
){
- unsigned long offset;
- char *ep;
- char *set[LISTSIZE];
+ uintptr_t ep;
+ uintptr_t set[LISTSIZE];
int i;
- offset = (unsigned long)next - (unsigned long)list;
+ uintptr_t offset = (uintptr_t)next - (uintptr_t)list;
for(i=0; i<LISTSIZE; i++) set[i] = 0;
while( list ){
ep = list;
--
GitLab

26
gnu/packages/patches/libgda-fix-missing-initialization.patch 100644
View File

@ -0,0 +1,26 @@
Taken from upstream.
From a4a3930ecfc4dc815b7a18dbb7338c165ea08f4e Mon Sep 17 00:00:00 2001
From: Pavlo Solntsev <p.sun.fun@gmail.com>
Date: Sun, 19 Sep 2021 22:54:33 -0500
Subject: [PATCH] Test: Fixing missing initialization
---
libgda/thread-wrapper/test-itsignaler.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libgda/thread-wrapper/test-itsignaler.c b/libgda/thread-wrapper/test-itsignaler.c
index d0c15ae17..7ac4e958a 100644
--- a/libgda/thread-wrapper/test-itsignaler.c
+++ b/libgda/thread-wrapper/test-itsignaler.c
@@ -203,6 +203,7 @@ test2 (void)
CbData cbdata;
cbdata.counter = 0;
cbdata.loop = loop;
+ cbdata.its = its;
itsignaler_add (its, NULL, (ITSignalerFunc) source_callback, &cbdata, NULL);
itsignaler_unref (its);
g_mutex_unlock (&mutex);
--
GitLab

91
gnu/packages/patches/libgda-skip-postgresql-tests.patch 100644
View File

@ -0,0 +1,91 @@
Taken from upstream.
From b0cd77e588620465b78f7c017d3f240e13936aa3 Mon Sep 17 00:00:00 2001
From: Pavlo Solntsev <p.sun.fun@gmail.com>
Date: Sun, 19 Sep 2021 22:51:38 -0500
Subject: [PATCH] Test: Skip test if no server available
Two variables will be checked. If they set
and provide all needed information the test
will be executed. If they are not set, the test
will return TRUE and will terminate with
termination status EXIT_SUCCESS.
---
tests/db/check-db-catalog-postgresql.c | 16 ++++++++++++++++
tests/test-server-operation-postgresql.c | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/tests/db/check-db-catalog-postgresql.c b/tests/db/check-db-catalog-postgresql.c
index 5b8e9395c..bf9a8942c 100644
--- a/tests/db/check-db-catalog-postgresql.c
+++ b/tests/db/check-db-catalog-postgresql.c
@@ -25,6 +25,9 @@
#include <libgda/libgda.h>
#include "../test-cnc-utils.h"
+#define PROVIDER_DB_CREATE_PARAMS "POSTGRESQL_DBCREATE_PARAMS"
+#define PROVIDER_CNC_PARAMS "POSTGRESQL_CNC_PARAMS"
+
typedef struct {
GdaDbCatalog *catalog;
GdaConnection *cnc;
@@ -359,6 +362,19 @@ main (gint argc,
{
setlocale (LC_ALL,"");
+ const gchar *db_create_str;
+ const gchar *cnc_params;
+
+ db_create_str = g_getenv (PROVIDER_DB_CREATE_PARAMS);
+ cnc_params = g_getenv (PROVIDER_CNC_PARAMS);
+
+ if (!db_create_str || !cnc_params) {
+ g_print ("Please set POSTGRESQL_DBCREATE_PARAMS and POSTGRESQL_CNC_PARAMS variable"
+ "with dbname, host, user and port (usually 5432)\n");
+ g_print ("Test will not be performed\n");
+ return EXIT_SUCCESS;
+ }
+
g_test_init (&argc,&argv,NULL);
g_test_add ("/test-db-postgresql/meta-tables",
diff --git a/tests/test-server-operation-postgresql.c b/tests/test-server-operation-postgresql.c
index 37796c4be..860f41a18 100644
--- a/tests/test-server-operation-postgresql.c
+++ b/tests/test-server-operation-postgresql.c
@@ -38,9 +38,12 @@
#include <glib/gi18n.h>
#include <locale.h>
#include <libgda/libgda.h>
+/*#include <stdlib.h>*/
#include "test-cnc-utils.h"
#define PROVIDER_NAME "PostgreSQL"
+#define PROVIDER_DB_CREATE_PARAMS "POSTGRESQL_DBCREATE_PARAMS"
+#define PROVIDER_CNC_PARAMS "POSTGRESQL_CNC_PARAMS"
#define GDA_PGSQL_ERROR_HANDLE(e) (g_print("Error: %s: %s\n", G_STRLOC, e && e->message ? e->message : "No default"));
@@ -1335,6 +1338,19 @@ main(gint argc, gchar *argv[])
{
setlocale (LC_ALL,"");
+ const gchar *db_create_str;
+ const gchar *cnc_params;
+
+ db_create_str = g_getenv (PROVIDER_DB_CREATE_PARAMS);
+ cnc_params = g_getenv (PROVIDER_CNC_PARAMS);
+
+ if (!db_create_str || !cnc_params) {
+ g_print ("Please set POSTGRESQL_DBCREATE_PARAMS and POSTGRESQL_CNC_PARAMS variable"
+ "with dbname, host, user and port (usually 5432)\n");
+ g_print ("Test will not be performed\n");
+ return EXIT_SUCCESS;
+ }
+
g_test_init (&argc,&argv,NULL);
g_test_add ("/test-server-operation-sqlite/old-so-module",
--
GitLab

61
gnu/packages/patches/nautilus-add-libportal-gtk3.patch
View File

@ -1,61 +0,0 @@
From 55cfd66ccca391fc144f5863ff6bfc1f3b137e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniojpfernandes@gmail.com>
Date: Tue, 21 Dec 2021 17:42:27 +0000
Subject: [PATCH] general: Add libportal-gtk3 dependency
The portal-gtk3.h header has been moved into a separate library which
binds gtk3 explicitly.
https://github.com/flatpak/libportal/pull/53
---
build-aux/flatpak/org.gnome.Nautilus.json | 5 +++-- ;; Changes removed in Guix
build-aux/flatpak/org.gnome.Nautilus.yml | 3 ++- ;; Changes removed in Guix
meson.build | 4 +++-
src/meson.build | 1 +
src/nautilus-files-view.c | 2 +-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index 927216636..4626fa0bb 100644
--- a/meson.build
+++ b/meson.build
@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
gtk = dependency('gtk+-3.0', version: '>= 3.22.27')
libhandy = dependency('libhandy-1', version: '>= 1.1.90')
libportal = []
+libportal_gtk3 = []
if get_option('libportal')
- libportal = dependency('libportal', version: '>= 0.3')
+ libportal = dependency('libportal', version: '>= 0.5')
+ libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5')
endif
selinux = []
if get_option('selinux')
diff --git a/src/meson.build b/src/meson.build
index 682d6f3a3..d7fb76d53 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -285,6 +285,7 @@ nautilus_deps = [
libgd_dep,
libhandy,
libportal,
+ libportal_gtk3,
nautilus_extension,
selinux,
tracker_sparql,
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index dfb7fb26c..a24005a11 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -93,7 +93,7 @@
#ifdef HAVE_LIBPORTAL
#include <libportal/portal.h>
-#include <libportal/portal-gtk3.h>
+#include <libportal-gtk3/portal-gtk3.h>
#endif
/* Minimum starting update inverval */
--
GitLab

38
gnu/packages/patches/network-manager-plugin-path.patch
View File

@ -3,39 +3,47 @@ From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@gnu.org>
Date: Wed, 3 Jul 2019 13:31:54 +0200
Subject: [PATCH] respect NM_VPN_PLUGIN_DIR
--- a/src/core/vpn/nm-vpn-manager.c 2021-10-29 13:20:01.062917840 -0400
+++ b/src/core/vpn/nm-vpn-manager.c 2021-10-29 13:26:46.094397018 -0400
@@ -211,6 +211,7 @@
GSList * infos, *info;
const char * conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc();
const char * conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib();
+ const char * conf_dir_user = _nm_vpn_plugin_info_get_default_dir_user ();
Rebased by Maxim Cournoyer on 2022/08/23.
diff --git a/src/core/vpn/nm-vpn-manager.c b/src/core/vpn/nm-vpn-manager.c
index 6bf8edaee5..9bd960ba86 100644
--- a/src/core/vpn/nm-vpn-manager.c
+++ b/src/core/vpn/nm-vpn-manager.c
@@ -209,8 +209,9 @@ nm_vpn_manager_init(NMVpnManager *self)
NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE(self);
GFile *file;
GSList *infos, *info;
- const char *conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc();
- const char *conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib();
+ const char *conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc();
+ const char *conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib();
+ const char *conf_dir_user = _nm_vpn_plugin_info_get_default_dir_user();
/* Watch the VPN directory for changes */
file = g_file_new_for_path(conf_dir_lib);
@@ -229,6 +230,14 @@
@@ -229,6 +230,14 @@ nm_vpn_manager_init(NMVpnManager *self)
g_signal_connect(priv->monitor_etc, "changed", G_CALLBACK(vpn_dir_changed), self);
}
+ file = g_file_new_for_path (conf_dir_user);
+ priv->monitor_etc = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL);
+ g_object_unref (file);
+ file = g_file_new_for_path(conf_dir_user);
+ priv->monitor_etc = g_file_monitor_directory(file, G_FILE_MONITOR_NONE, NULL, NULL);
+ g_object_unref(file);
+ if (priv->monitor_etc) {
+ priv->monitor_id_etc =
+ g_signal_connect (priv->monitor_etc, "changed", G_CALLBACK (vpn_dir_changed), self);
+ g_signal_connect(priv->monitor_etc, "changed", G_CALLBACK(vpn_dir_changed), self);
+ }
+
/* first read conf_dir_lib. The name files are not really user configuration, but
* plugin configuration. Hence we expect ~newer~ plugins to install their files
* in /usr/lib/NetworkManager. We want to prefer those files.
@@ -243,6 +252,11 @@
@@ -243,6 +252,11 @@ nm_vpn_manager_init(NMVpnManager *self)
try_add_plugin(self, info->data);
g_slist_free_full(infos, g_object_unref);
+ infos = _nm_vpn_plugin_info_list_load_dir(conf_dir_user, TRUE, 0, NULL, NULL);
+ for (info = infos; info; info = info->next)
+ try_add_plugin (self, info->data);
+ g_slist_free_full (infos, g_object_unref);
+ try_add_plugin(self, info->data);
+ g_slist_free_full(infos, g_object_unref);
+
priv->active_services = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, NULL);
}

38
gnu/packages/patchutils.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,6 +22,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages patchutils)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix licenses)
@ -40,6 +42,7 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages less)
#:use-module (gnu packages mail)
@ -441,6 +444,41 @@ Users can login allowing them to change the state of patches.")
(home-page "http://jk.ozlabs.org/projects/patchwork/")
(license gpl2+)))
(define-public wiggle
(package
(name "wiggle")
(version "1.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/neilbrown/wiggle")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf"))))
(build-system gnu-build-system)
(arguments
(list
#:make-flags
#~(list "CFLAGS=-I. -O3" "INSTALL=install" "STRIP=-s"
(string-append "CC=" #$(cc-for-target))
(string-append "BINDIR=" #$output "/bin")
(string-append "MANDIR=" #$output "/share/man")
(string-append "PREFIX=" #$output))
#:test-target "test"
#:phases
#~(modify-phases %standard-phases
(delete 'configure))))
(home-page "http://neil.brown.name/wiggle/")
(inputs (list ncurses))
(native-inputs (list groff))
(synopsis "Apply patches with conflicts")
(description
"@code{wiggle} attempts to apply patches to a target file even if the
patches do not match perfectly.")
(license gpl2+)))
(define-public pwclient
(package
(name "pwclient")

19
gnu/packages/pdf.scm
View File

@ -315,6 +315,25 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
(license (list license:bsd-3
license:gpl2))))
;; XXX: Remove it on core-updates. It is only needed for evince 42.3 that
;; requires a recent poppler.
(define-public poppler-next
(package/inherit poppler
(name "poppler-next")
(version "22.09.0")
(source (origin
(method url-fetch)
(uri (string-append "https://poppler.freedesktop.org/poppler-"
version ".tar.xz"))
(sha256
(base32
"0bhyli95h3dkirjc0ibh08s4nim6rn7f38sbfzdwln8k454gga6p"))))
(native-inputs
(list pkg-config
`(,glib "bin") ; glib-mkenums, etc.
gobject-introspection
python)) ))
(define-public poppler-qt5
(package/inherit poppler
(name "poppler-qt5")

24
gnu/packages/pkg-config.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -167,3 +168,26 @@ exec ~a \"$@\""
(inherit original)
(variable "PKG_CONFIG_PATH_FOR_BUILD")))
(package-native-search-paths %pkg-config)))))
(define-public pkgconf
(package
(name "pkgconf")
(version "1.9.3")
(source (origin
(method url-fetch)
(uri (string-append "https://distfiles.dereferenced.org/"
name "/" name "-" version ".tar.xz"))
(sha256
(base32
"17b9cl2s99pzgblaj0yg49k3m0by5x78vwg4879vckymhys5bcsz"))))
(build-system gnu-build-system)
(arguments (list #:tests? #f)) ;TODO: package kyua
(home-page "http://pkgconf.org/")
(synopsis "Package compiler and linker metadata toolkit")
(description "@command{pkgconf} is a program which helps to configure
compiler and linker flags for development libraries. It is similar to
pkg-config from freedesktop.org. @code{libpkgconf} is a library which
provides access to most of pkgconf's functionality, to allow other tooling
such as compilers and IDEs to discover and use libraries configured by
pkgconf.")
(license isc)))

13
gnu/packages/python-science.scm
View File

@ -835,7 +835,7 @@ of Pandas
(define-public python-pingouin
(package
(name "python-pingouin")
(version "0.5.1")
(version "0.5.2")
(source
;; The PyPI tarball does not contain the tests.
(origin
@ -846,18 +846,25 @@ of Pandas
(file-name (git-file-name name version))
(sha256
(base32
"10v3mwcmyc7rd2957cbmfcw66yw2y0fz7zcfyx46q8slbmd1d8d4"))))
"0czy7cpn6xx9fs6wbz6rq2lpkb1a89bzxj1anf2f9in1m5qyrh83"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'loosen-requirements
(lambda _
(substitute* '("requirements.txt" "setup.py")
;; Remove sklearn pinning since it works fine with 1.1.2:
;; https://github.com/raphaelvallat/pingouin/pull/300
(("scikit-learn<1\\.1\\.0")
"scikit-learn"))))
;; On loading, Pingouin uses the outdated package to check if a newer
;; version is available on PyPI. This check adds an extra dependency
;; and is irrelevant to Guix users. So, disable it.
(add-after 'unpack 'remove-outdated-check
(lambda _
(substitute* "setup.py"
(("'outdated',") ""))
(("\"outdated\",") ""))
(substitute* "pingouin/__init__.py"
(("^from outdated[^\n]*") "")
(("^warn_if_outdated[^\n]*") ""))))

7
gnu/packages/python-web.scm
View File

@ -4984,12 +4984,17 @@ hard or impossible to fix in cssselect.")
;; The tests are prone to get stuck. Use pytest-timeout’s --timeout
;; flag to get a meaningful idea about where.
(invoke "pytest" "-vv" "--timeout=300"
"-k" ,(string-append
"--timeout-method=thread"
"-k" (string-append
;; Timeout, because SIGINT cannot be sent to child.
"not test_signals_sigint_pycode_continue "
"and not test_signals_sigint_pycode_stop "
"and not test_signals_sigint_uvcode "
"and not test_signals_sigint_uvcode_two_loop_runs "
;; This test is racy and prone to get stuck on
;; various platforms, possibly a aiohttp issue:
;; https://github.com/MagicStack/uvloop/issues/412
"and not test_remote_shutdown_receives_trailing_data "
;; It looks like pytest is preventing
;; custom stdout/stderr redirection,
;; even with -s.

58
gnu/packages/python-xyz.scm
View File

@ -4381,6 +4381,18 @@ via commands such as @command{rst2man}, as well as supporting Python code.")
;; licensed under the PFSL, BSD 2-clause, and GPLv3+ licenses.
(license (list license:public-domain license:psfl license:bsd-2 license:gpl3+))))
;; TODO: Make this the default in the next rebuild cycle.
(define-public python-docutils-0.19
(package
(inherit python-docutils)
(version "0.19")
(source (origin
(method url-fetch)
(uri (pypi-uri "docutils" version))
(sha256
(base32
"1rprvir116g5rz2bgzkzgyn6mv0z8582rz7bgxbpy2y3adkmm69k"))))))
;; awscli refuses to be built with docutils < 0.16.
(define-public python-docutils-0.15
(package
@ -10469,21 +10481,20 @@ plugin for flake8 to check PEP-8 naming conventions.")
(invoke "pytest") #t))))))
(native-inputs (list python-mock python-pytest python-testpath))))
(define-public python-pep621
(define-public python-pyproject-metadata
(package
(name "python-pep621")
(version "0.4.0")
(name "python-pyproject-metadata")
(version "0.6.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/FFY00/python-pep621")
(url "https://github.com/FFY00/python-pyproject-metadata")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0nzig7bmzf0xx5svxlf065mrzihr0ci4p1yaxka9flqjba98flpr"))))
"00zahgw9zjfqwf0218bj5k732aibnn68cq1p8f0wmbirb7fy5k31"))))
(build-system python-build-system)
(arguments
(list
@ -10511,7 +10522,7 @@ plugin for flake8 to check PEP-8 naming conventions.")
"install" "--no-deps" "--prefix" #$output whl)))))))
(propagated-inputs (list python-packaging))
(native-inputs (list python-pypa-build python-pytest python-tomli))
(home-page "https://github.com/FFY00/python-pep621")
(home-page "https://github.com/FFY00/python-pyproject-metadata")
(synopsis "Dataclass for PEP 621 metadata")
(description "This project does not implement the parsing of
@file{pyproject.toml} containing PEP 621 metadata. Instead, given a Python
@ -10520,6 +10531,10 @@ validate this input and generate a PEP 643-compliant metadata
file (e.g. @file{PKG-INFO}).")
(license license:expat)))
;; pep621 was renamed to pyproject-metadata.
(define-public python-pep621
(deprecated-package "python-pep621" python-pyproject-metadata))
(define-public python-pyflakes
(package
(name "python-pyflakes")
@ -18813,21 +18828,20 @@ from the header, as well as section details and data available.")
(define-public python-qrcode
(package
(name "python-qrcode")
(version "6.1")
(version "7.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "qrcode" version))
(sha256
(base32 "0sa3n298b9jpz6zn0birnjii3mg9sihjq28n9nzjlzv09y2m6ljh"))))
(base32 "0y35jlwfvkgn9341lzshyaqgpp61vysjh107vhdd96ya83r6ynip"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests require packaging 'pymaging'.
'(#:tests? #f))
(propagated-inputs
(list python-lxml ; for SVG output
python-pillow ; for PNG output
python-six))
python-pillow)) ; for PNG output
(home-page "https://github.com/lincolnloop/python-qrcode")
(synopsis "QR Code image generator")
(description "This package provides a pure Python QR Code generator
@ -20623,14 +20637,14 @@ ignoring formatting changes.")
(define-public python-tqdm
(package
(name "python-tqdm")
(version "4.62.3")
(version "4.64.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "tqdm" version))
(sha256
(base32
"03cjj8jl8iybvfjbpvdql5qfslzfv043g7w6nx8rhv2h2xrdwnfk"))))
"1r7i9kswpnrx4ppfvzz6discb04j1rqkqxdwa2sc2la900m6hksz"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -23485,13 +23499,13 @@ source via the Abstract Syntax Tree.")
(define-public python-astunparse
(package
(name "python-astunparse")
(version "1.6.2")
(version "1.6.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astunparse" version))
(sha256
(base32 "0rzbc44xcvzjhhiy7wac96mgal5mcjz1mfq8rmvgswskf4kf9cys"))))
(base32 "0wh8jjvwafxc7rvbyb13cdwndkicm7cry1bd8p1q9l7has23mnas"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; there are none
(propagated-inputs
@ -23506,17 +23520,25 @@ distribution.")
(define-public python-gast
(package
(name "python-gast")
(version "0.5.2")
(version "0.5.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "gast" version))
(sha256
(base32 "1xv77kzghiqfm4fnvlv0p878ma152dvcfkly3jij89lqigxcw7zq"))))
(base32 "1sidaczriw54pfkj3523y9j9q2harrczc1qqgnfaylz641ca5gng"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv")))))))
(native-inputs
(list python-pytest))
(propagated-inputs
(list python-astunparse))
(home-page "https://pypi.org/project/gast/")
(home-page "https://github.com/serge-sans-paille/gast/")
(synopsis "Generic Python AST that abstracts the underlying Python version")
(description
"GAST provides a compatibility layer between the AST of various Python

8
gnu/packages/qt.scm
View File

@ -1381,7 +1381,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
(description "The @code{qtshadertools} module provides APIs and tools
supporting shader pipeline functionality as offered in Qt Quick to operate on
Vulkan, OpenGL and other main graphic APIs.")
(license (package-home-page qtbase))))
(license (package-license qtbase))))
(define-public qtmultimedia
(package
@ -4233,3 +4233,9 @@ and import their menus over DBus.")
services using the XML based SOAP protocol and without the need for a dedicated
web server.")
(license (list license:gpl2 license:gpl3))))
;;;
;;; 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
;;; functionality or similar names.
;;;

10
gnu/packages/rsync.scm
View File

@ -29,6 +29,7 @@
#:use-module (gnu packages digest)
#:use-module (gnu packages perl)
#:use-module (gnu packages popt)
#:use-module (gnu packages tls)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
@ -39,27 +40,26 @@
(define-public rsync
(package
(name "rsync")
(version "3.2.5")
(version "3.2.6")
(source (origin
(method url-fetch)
(uri (string-append "https://rsync.samba.org/ftp/rsync/src/rsync-"
version ".tar.gz"))
(sha256
(base32
"1flsqq01dmbz0m2vwn4sj46zb9yxlrfc6xy3gf393xyd6lbd5i1a"))))
"1lslaj1s7mpgf4v5lxhhiyy4ffmxaxy9cbplx8gx8dvqnax6aczv"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
;; The bundled copies are preferred by default.
(list "--without-included-zlib"
"--without-included-popt"
;; Avoid these dependencies for now.
"--disable-openssl")))
"--without-included-popt")))
(native-inputs
(list perl))
(inputs
(list acl
lz4
openssl
popt
xxhash
zlib

34
gnu/packages/rust.scm
View File

@ -557,13 +557,33 @@ safety and thread safety guarantees.")
rust-1.57 "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))
(define rust-1.59
(rust-bootstrapped-package
;; Verified that it *doesn't* build with 1.57. e.g.:
;; * error: `doc(primitive)` should never have been stable
;; * error[E0522]: definition of an unknown language item:
;; `generator_return`
;; * error[E0206]: the trait `Copy` may not be implemented for this type
rust-1.58 "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57"))
(let ((base-rust
(rust-bootstrapped-package
;; Verified that it *doesn't* build with 1.57. e.g.:
;; * error: `doc(primitive)` should never have been stable
;; * error[E0522]: definition of an unknown language item:
;; `generator_return`
;; * error[E0206]: the trait `Copy` may not be implemented for this type
rust-1.58 "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57")))
(package
(inherit base-rust)
(arguments
(if (target-riscv64?)
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'revert-riscv-pause-instruction
(lambda _
;; This fails with:
;; error: unknown directive, referring to '.insn'.
;; This is due to building with llvm < 14.
;; https://github.com/rust-lang/stdarch/issues/1291
;; Partial roll-back from this commit:
;; https://github.com/rust-lang/stdarch/pull/1271
(substitute*
"library/stdarch/crates/core_arch/src/riscv_shared/mod.rs"
(("\\.insn i 0x0F, 0, x0, x0, 0x010") ".word 0x0100000F")))))))
(package-arguments base-rust))))))
(define rust-1.60
(rust-bootstrapped-package

45
gnu/packages/sdl.scm
View File

@ -13,6 +13,7 @@
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -34,6 +35,7 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (gnu packages)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
@ -113,7 +115,7 @@ joystick, and graphics hardware.")
(package
(inherit sdl)
(name "sdl2")
(version "2.0.18")
(version "2.24.0")
(source (origin
(method url-fetch)
(uri
@ -121,37 +123,36 @@ joystick, and graphics hardware.")
version ".tar.gz"))
(sha256
(base32
"073iwmggkvvl82fssqb7xzbb4awraprjig6zxav0p8dz7pbhrm4l"))))
"15vd9najhjh6s9z9hhx7zp51iby690a1g3h7kcwjvyb82x5w7r4i"))))
(arguments
(substitute-keyword-arguments (package-arguments sdl)
((#:configure-flags flags)
`(append '("--disable-wayland-shared" "--enable-video-kmsdrm"
"--disable-kmsdrm-shared")
,flags))
#~(append '("--disable-wayland-shared" "--enable-video-kmsdrm"
"--disable-kmsdrm-shared")
#$flags))
((#:make-flags flags ''())
`(cons*
;; SDL dlopens libudev, so make sure it is in rpath. This overrides
;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary
;; as sdl2 includes Mesa by default.
(string-append "LDFLAGS=-Wl,-rpath,"
(assoc-ref %build-inputs "eudev") "/lib")
,flags))))
#~(cons*
;; SDL dlopens libudev, so make sure it is in rpath. This overrides
;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary
;; as sdl2 includes Mesa by default.
(string-append "LDFLAGS=-Wl,-rpath,"
#$(this-package-input "eudev") "/lib")
#$flags))))
(inputs
;; SDL2 needs to be built with ibus support otherwise some systems
;; experience a bug where input events are doubled.
;;
;; For more information, see: https://dev.solus-project.com/T1721
(modify-inputs (package-inputs sdl)
(prepend
dbus
eudev ;for discovering input devices
fcitx ;helps with CJK input
glib
ibus
libxkbcommon
libxcursor
wayland ;enables X11 cursor support
wayland-protocols)))
(append dbus
eudev ;for discovering input devices
fcitx ;helps with CJK input
glib
ibus
libxkbcommon
libxcursor ;enables X11 cursor support
wayland
wayland-protocols)))
(license license:bsd-3)))
(define-public libmikmod

6
gnu/packages/search.scm
View File

@ -11,6 +11,7 @@
;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -361,20 +362,21 @@ Search Engine. It is written in C and based on GTK3.")
(define-public recoll
(package
(name "recoll")
(version "1.31.2")
(version "1.32.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.lesbonscomptes.com/recoll/"
"recoll-" version ".tar.gz"))
(sha256
(base32 "0m1w5hf2n09lbzmzvlrm2lks4lci9vvjxy2mcmgb2avgly7v5vfk"))))
(base32 "1fkx6dk8s808ay4hf7ycfcs38kywmavsjqm02pwrnl8bpgsac26a"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--disable-webkit"
"--disable-python-module"
"--without-systemd"
"--with-inotify"
(string-append "QMAKEPATH=" (assoc-ref %build-inputs "qtbase")
"/bin/qmake"))
#:phases

33
gnu/packages/shellutils.scm
View File

@ -57,6 +57,7 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages shells)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tmux)
#:use-module (gnu packages vim))
@ -271,6 +272,38 @@ interactive terminal. This helps in reviewing commands before running them,
particularly in catching syntax errors.")
(license license:bsd-3)))
(define-public grml-zsh-config
(package
(name "grml-zsh-config")
(version "0.19.3")
(source (origin
(method url-fetch)
(uri (string-append
"https://deb.grml.org/pool/main/g/grml-etc-core/grml-etc-core_"
version ".tar.gz"))
(sha256
(base32
"05fri77028znjnvmh8mz3424rn8ilysj7hn8br2hk1qwkp4zzwp9"))))
(build-system copy-build-system)
(arguments
(list
#:phases
#~(modify-phases
%standard-phases
(add-before 'install 'make-doc
(lambda _ (with-directory-excursion "doc" (invoke "make")))))
#:install-plan
#~'(("etc/skel/.zshrc" "etc/skel/.zshrc")
("etc/zsh/keephack" "etc/zsh/keephack")
("etc/zsh/zshrc" "etc/zsh/zshrc")
("doc/grmlzshrc.5" "share/man/man5/grmlzshrc.5"))))
(native-inputs (list txt2tags))
(home-page "https://grml.org/zsh/")
(synopsis "Grml's zsh configuration")
(description "This package provides an interactive setup for zsh
preconfigured by the Grml project.")
(license license:gpl2)))
(define-public sh-z
(package
(name "sh-z")

35
gnu/packages/sphinx.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2015, 2017, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016-2019, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
@ -385,6 +385,33 @@ grid layout. It is no longer maintained and users are encouraged to use
@code{sphinx-design} instead.")
(license license:expat)))
(define-public python-sphinx-tabs
(package
(name "python-sphinx-tabs")
(version "3.4.1")
(home-page "https://github.com/executablebooks/sphinx-tabs")
(source (origin
(method url-fetch)
(uri (pypi-uri "sphinx-tabs" version))
(sha256
(base32
"0cmqw5ck2jcxqyf5ibz543idspq0g0fdzxh3fpah1r0nhfg9z86j"))))
(build-system python-build-system)
(arguments
'(#:tests? #f ;TODO: requires sphinx-testing and rinohtype
#:phases (modify-phases %standard-phases
(add-after 'unpack 'loosen-docutils-requirement
(lambda _
(substitute* "setup.py"
(("docutils~=0\\.18\\.0")
"docutils>=0.17.0")))))))
(propagated-inputs
(list python-docutils python-pygments python-sphinx))
(synopsis "Tabbed views for Sphinx")
(description
"Create tabbed content in Sphinx documentation when building HTML.")
(license license:expat)))
(define-public python-sphinxcontrib-programoutput
(package
(name "python-sphinxcontrib-programoutput")
@ -986,7 +1013,7 @@ automated way to document command-line programs. It scans
(define-public python-sphinx-theme-builder
(package
(name "python-sphinx-theme-builder")
(version "0.2.0a14")
(version "0.2.0b1")
(source
(origin
(method git-fetch) ;no tests in pypi archive
@ -996,7 +1023,7 @@ automated way to document command-line programs. It scans
(file-name (git-file-name name version))
(sha256
(base32
"1brqp34q716gglliallbgq4m63hl3nk8j6w8wcl8f2vvnkch6v98"))))
"15gvwzd4l3wcmd6fns8xvv44yzxmamr1nfn28mp12sdw2y10v2ba"))))
(build-system python-build-system)
(arguments
(list
@ -1023,7 +1050,7 @@ automated way to document command-line programs. It scans
python-click
python-nodeenv
python-packaging
python-pep621
python-pyproject-metadata
python-rich
python-sphinx-autobuild
python-tomli))

3
gnu/packages/tex.scm
View File

@ -11965,7 +11965,8 @@ lines in a document. Package options include @code{singlespacing},
@code{onehalfspacing}, and @code{doublespacing}. Alternatively the spacing
can be changed as required with the @code{\\singlespacing},
@code{\\onehalfspacing}, and @code{\\doublespacing} commands. Other size
spacings also available.")))
spacings also available.")
(license license:lppl)))
(define-public texlive-pgfgantt
(package

20
gnu/packages/textutils.scm
View File

@ -68,6 +68,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
@ -972,6 +973,25 @@ source code.")
and Cython.")
(license license:expat))))
(define-public txt2tags
(package
(name "txt2tags")
(version "3.7")
(source (origin
(method url-fetch)
(uri (pypi-uri "txt2tags" version))
(sha256
(base32
"12hpnvdy7dgarq6ini9jp7dp2zcmvpax04zbl3jb84kd423r75i7"))))
(build-system python-build-system)
(native-inputs (list python-tox))
(home-page "https://txt2tags.org")
(synopsis "Convert between markup languages")
(description
"txt2tags is a document generator. It reads a text file with minimal
markup and converts it to multiple formats.")
(license license:gpl2)))
(define-public go-github.com-mattn-go-runewidth
(let ((commit "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211")
(version "0.0.4")

5
gnu/packages/uml.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -31,14 +32,14 @@
(define-public plantuml
(package
(name "plantuml")
(version "1.2022.3")
(version "1.2022.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/plantuml/"
version "/plantuml-" version ".tar.gz"))
(sha256
(base32
"1k5c97iicdvamkcdaz7c2b79qaciz5gvgs7n67as7hcbm2q85q3b"))))
"0lcvp6hdlzgh6ia14zzdc6h9hn8xrm9w9dcx5jpzhs8nbygkazvj"))))
(build-system ant-build-system)
(arguments
`(#:tests? #f ; no tests

11
gnu/packages/version-control.scm
View File

@ -1734,7 +1734,7 @@ execution of any hook written in any language before every commit.")
(define-public mercurial
(package
(name "mercurial")
(version "6.2.1")
(version "6.2.2")
(source (origin
(method url-fetch)
(uri (string-append "https://www.mercurial-scm.org/"
@ -1743,7 +1743,14 @@ execution of any hook written in any language before every commit.")
"mercurial-openssl-compat.patch"))
(sha256
(base32
"1nl2726szaxyrxlyssrsir5c6vb4ci0i6g969i6xaahw1nidgica"))))
"1pr00hdk3l9095fhq6302fgj0wmbqhqs93y4r457ba4pyjjrvyly"))
(modules '((guix build utils)))
(snippet
'(substitute* (find-files "tests" "\\.(t|sh)$")
;; grep 3.8 emits deprecation warnings for 'egrep' and
;; 'fgrep' which breaks expected test output.
(("egrep") "grep -E")
(("fgrep") "grep -F")))))
(build-system gnu-build-system)
(arguments
`(#:make-flags

4
gnu/packages/video.scm
View File

@ -2293,7 +2293,7 @@ the last played position, etc.")
(define-public gallery-dl
(package
(name "gallery-dl")
(version "1.20.5")
(version "1.23.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mikf/gallery-dl"
@ -2301,7 +2301,7 @@ the last played position, etc.")
version ".tar.gz"))
(sha256
(base32
"0149hd4nh7bk2yqjdnvrkvag5mwgsb6gxrgfcd88q4cv3k2ji42h"))))
"12rhzf8cwsvlg0vxzydgc7x04gmccxkjk8ghb5s8lk0gjp7ysqkh"))))
(build-system python-build-system)
(inputs (list python-requests ffmpeg))
(home-page "https://github.com/mikf/gallery-dl")

11
gnu/packages/virtualization.scm
View File

@ -61,6 +61,7 @@
#:use-module (gnu packages cluster)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages containers)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
@ -172,8 +173,10 @@
(modules '((guix build utils)))
(snippet
'(begin
;; Delete the bundled meson copy.
(delete-file-recursively "meson")))))
;; Delete bundled code that we provide externally.
;; TODO: Unbundle SeaBIOS!
(for-each delete-file-recursively
'("dtc" "meson" "slirp"))))))
(outputs '("out" "static" "doc")) ;5.3 MiB of HTML docs
(build-system gnu-build-system)
(arguments
@ -190,6 +193,8 @@
(string-append "--host-cc=" gcc)
(string-append "--prefix=" out)
"--sysconfdir=/etc"
"--enable-slirp=system"
"--enable-fdt=system"
(string-append "--smbd=" out "/libexec/samba-wrapper")
"--disable-debug-info" ;for space considerations
;; The binaries need to be linked against -lrt.
@ -329,6 +334,7 @@ exec smbd $@")))
(inputs
(list alsa-lib
bash-minimal
dtc
glib
gtk+
libaio
@ -339,6 +345,7 @@ exec smbd $@")))
libjpeg-turbo
libpng
libseccomp
libslirp
liburing
libusb ;USB pass-through support
mesa

10
gnu/packages/web.scm
View File

@ -5809,14 +5809,14 @@ tools like SSH (Secure Shell) to reach the outside world.")
(define-public stunnel
(package
(name "stunnel")
(version "5.61")
(version "5.66")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.stunnel.org/downloads/stunnel-"
version ".tar.gz"))
(sha256
(base32 "0yjx07r5wc987s4z0wm37381fa3az2s4mrhyjxypx3rd92k0rsli"))))
(base32 "172pkzp8qilj0gd92bhdi96739gjpgbcav5c7a4gd98s9mq7i0am"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@ -8256,3 +8256,9 @@ You can feed it URLs one at a time, or schedule regular imports. It saves
snapshots of the URLs you feed it in several formats.")
(home-page "https://archivebox.io/")
(license license:expat)))
;;;
;;; 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
;;; functionality or similar names.
;;;

47
gnu/packages/webkit.scm
View File

@ -124,7 +124,7 @@ the WPE-flavored port of WebKit.")
engine that uses Wayland for graphics output.")
(license license:bsd-2)))
(define %webkit-version "2.36.7")
(define %webkit-version "2.36.7") ;webkit2gtk4
(define-public webkitgtk
(package
@ -279,11 +279,46 @@ propagated by default) such as @code{gst-plugins-good} and
license:bsd-2
license:bsd-3))))
;;; Required by gnome-online-accounts as webkitgtk propagates libsoup 3, which
;;; causes the build to fail. Also required by e.g. emacs-next-pgtk,
;;; emacs-xwidgets, and some other GNOME packages for webkit2gtk-4.0. See
;;; also the upstream tracker for libsoup 3:
;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218
(define-public webkitgtk-next
(package
(inherit webkitgtk)
(name "webkitgtk")
(version "2.37.91") ;webkit2gtk5
(source (origin
(inherit (package-source webkitgtk))
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz"))
(sha256
(base32 "0r2d1dbx6s8bad011dkmx7j34gcxlz9bs14pip1qn7n1rhgxb3qi"))))
(build-system cmake-build-system)
(arguments
(substitute-keyword-arguments (package-arguments webkitgtk)
((#:configure-flags flags)
#~(cons* "-DENABLE_INTROSPECTION=ON"
"-DUSE_GTK4=ON"
(delete "-DENABLE_GTKDOC=ON" #$flags)))
((#:phases phases)
#~(modify-phases #$phases
(add-before 'build 'set-CC
(lambda _
;; Some Perl scripts check for the CC environment variable, else
;; use /usr/bin/gcc.
(setenv "CC" "gcc")))))))
(native-inputs
(modify-inputs (package-native-inputs webkitgtk)
(delete "docbook-xml" "gtk-doc")
(append gi-docgen)))
(propagated-inputs
(modify-inputs (package-propagated-inputs webkitgtk)
(replace "gtk+" gtk)))
(inputs
(modify-inputs (package-inputs webkitgtk)
(delete "gtk+-2" "libnotify")))))
;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3:
;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218.
(define-public webkitgtk-with-libsoup2
(package/inherit webkitgtk
(name "webkitgtk-with-libsoup2")

Some files were not shown because too many files have changed in this diff Show More