Merge remote-tracking branch 'origin/master' into core-updates-frozen
Efraim Flashner
commit
1c94392a13
3
.mailmap
3
.mailmap
|
|
@ -41,7 +41,8 @@ Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
|
|||
Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
|
||||
Kei Kebreau <kkebreau@posteo.net>
|
||||
Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
|
||||
Liliana Prikler <liliana.prikler@gmail.com> Leo Prikler <leo.prikler@student.tugraz.at>
|
||||
Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
Liliana Marie Prikler <liliana.prikler@gmail.com> Leo Prikler <leo.prikler@student.tugraz.at>
|
||||
Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
|
||||
Marek Benc <dusxmt@gmx.com> <merkur32@gmail.com>
|
||||
Marius Bakke <marius@gnu.org> <mbakke@fastmail.com>
|
||||
|
|
|
|||
|
|
@ -12271,7 +12271,7 @@ coexist.
|
|||
@cindex egg
|
||||
Import metadata for @uref{https://wiki.call-cc.org/eggs, CHICKEN eggs}.
|
||||
The information is taken from @file{PACKAGE.egg} files found in the
|
||||
@uref{git://code.call-cc.org/eggs-5-latest, eggs-5-latest} Git
|
||||
@uref{git://code.call-cc.org/eggs-5-all, eggs-5-all} Git
|
||||
repository. However, it does not provide all the information that we
|
||||
need, there is no ``description'' field, and the licenses used are not
|
||||
always precise (BSD is often used instead of BSD-N).
|
||||
|
|
@ -12280,6 +12280,12 @@ always precise (BSD is often used instead of BSD-N).
|
|||
guix import egg sourcehut
|
||||
@end example
|
||||
|
||||
You can also ask for a specific version:
|
||||
|
||||
@example
|
||||
guix import egg arrays@@1.0
|
||||
@end example
|
||||
|
||||
Additional options include:
|
||||
@table @code
|
||||
@item --recursive
|
||||
|
|
@ -36383,6 +36389,7 @@ Extend home-shell-profile service only if you really know what you do.
|
|||
|
||||
@subsubheading Bash Home Service
|
||||
|
||||
@anchor{home-bash-configuration}
|
||||
@deftp {Data Type} home-bash-configuration
|
||||
Available @code{home-bash-configuration} fields are:
|
||||
|
||||
|
|
@ -36391,11 +36398,30 @@ Available @code{home-bash-configuration} fields are:
|
|||
The Bash package to use.
|
||||
|
||||
@item @code{guix-defaults?} (default: @code{#t}) (type: boolean)
|
||||
Add sane defaults like reading @file{/etc/bashrc}, coloring output for
|
||||
@code{ls} provided by guix to @file{.bashrc}.
|
||||
Add sane defaults like reading @file{/etc/bashrc} and coloring the output of
|
||||
@command{ls} to the end of the @file{.bashrc} file.
|
||||
|
||||
@item @code{environment-variables} (default: @code{()}) (type: alist)
|
||||
Association list of environment variables to set for the Bash session.
|
||||
Association list of environment variables to set for the Bash session. The
|
||||
rules for the @code{home-environment-variables-service-type} apply
|
||||
here (@pxref{Essential Home Services}). The contents of this field will be
|
||||
added after the contents of the @code{bash-profile} field.
|
||||
|
||||
@item @code{aliases} (default: @code{()}) (type: alist)
|
||||
Association list of aliases to set for the Bash session. The aliases
|
||||
will be defined after the contents of the @code{bashrc} field has been
|
||||
put in the @file{.bashrc} file. The alias will automatically be quoted,
|
||||
so something line this:
|
||||
|
||||
@lisp
|
||||
'((\"ls\" . \"ls -alF\"))
|
||||
@end lisp
|
||||
|
||||
turns into
|
||||
|
||||
@example
|
||||
alias ls=\"ls -alF\"
|
||||
@end example
|
||||
|
||||
@item @code{bash-profile} (default: @code{()}) (type: text-config)
|
||||
List of file-like objects, which will be added to @file{.bash_profile}.
|
||||
|
|
@ -36416,7 +36442,41 @@ be read in some cases (if the shell terminates by exec'ing another
|
|||
process for example).
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
You can extend the Bash service by using the @code{home-bash-extension}
|
||||
configuration record, whose fields most mirror that of
|
||||
@code{home-bash-configuration} (@pxref{home-bash-configuration}). The
|
||||
contents of the extensions will be added to the end of the corresponding
|
||||
Bash configuration files (@pxref{Bash Startup Files,,, bash, The GNU
|
||||
Bash Reference Manual}.
|
||||
|
||||
@deftp {Data Type} home-bash-extension
|
||||
Available @code{home-bash-extension} fields are:
|
||||
|
||||
@table @asis
|
||||
@item @code{environment-variables} (default: @code{()}) (type: alist)
|
||||
Additional environment variables to set. These will be combined with the
|
||||
environment variables from other extensions and the base service to form one
|
||||
coherent block of environment variables.
|
||||
|
||||
@item @code{aliases} (default: @code{()}) (type: alist)
|
||||
Additional aliases to set. These will be combined with the aliases from
|
||||
other extensions and the base service.
|
||||
|
||||
@item @code{bash-profile} (default: @code{()}) (type: text-config)
|
||||
Additional text blocks to add to @file{.bash_profile}, which will be combined
|
||||
with text blocks from other extensions and the base service.
|
||||
|
||||
@item @code{bashrc} (default: @code{()}) (type: text-config)
|
||||
Additional text blocks to add to @file{.bashrc}, which will be combined
|
||||
with text blocks from other extensions and the base service.
|
||||
|
||||
@item @code{bash-logout} (default: @code{()}) (type: text-config)
|
||||
Additional text blocks to add to @file{.bash_logout}, which will be combined
|
||||
with text blocks from other extensions and the base service.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@subsubheading Zsh Home Service
|
||||
|
|
@ -36835,7 +36895,9 @@ $ info -k TLS
|
|||
@end example
|
||||
|
||||
@noindent
|
||||
The command below searches for the same keyword in man pages:
|
||||
The command below searches for the same keyword in man
|
||||
pages@footnote{The database searched by @command{man -k} is only created
|
||||
in profiles that contain the @code{man-db} package.}:
|
||||
|
||||
@example
|
||||
$ man -k TLS
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
# If adding a language, update the following variables, and info_TEXINFOS.
|
||||
MANUAL_LANGUAGES = de es fa fr it ko pt_BR ru sk zh_CN
|
||||
COOKBOOK_LANGUAGES = de fa fr ko ru sk zh_Hans
|
||||
COOKBOOK_LANGUAGES = de es fa fr ko ru sk zh_Hans
|
||||
|
||||
# Arg1: A list of languages codes.
|
||||
# Arg2: The file name stem.
|
||||
|
|
@ -44,6 +44,7 @@ info_TEXINFOS = %D%/guix.texi \
|
|||
%D%/guix.zh_CN.texi \
|
||||
%D%/guix-cookbook.texi \
|
||||
%D%/guix-cookbook.de.texi \
|
||||
%D%/guix-cookbook.es.texi \
|
||||
%D%/guix-cookbook.fa.texi \
|
||||
%D%/guix-cookbook.fr.texi \
|
||||
%D%/guix-cookbook.ko.texi \
|
||||
|
|
|
|||
|
|
@ -345,11 +345,11 @@ sys_create_store()
|
|||
mv "${tmp_path}/gnu" /
|
||||
|
||||
_msg "${INF}Linking the root user's profile"
|
||||
mkdir -p "~root/.config/guix"
|
||||
mkdir -p ~root/.config/guix
|
||||
ln -sf /var/guix/profiles/per-user/root/current-guix \
|
||||
"~root/.config/guix/current"
|
||||
~root/.config/guix/current
|
||||
|
||||
GUIX_PROFILE="~root/.config/guix/current"
|
||||
GUIX_PROFILE=~root/.config/guix/current
|
||||
# shellcheck disable=SC1090
|
||||
source "${GUIX_PROFILE}/etc/profile"
|
||||
_msg "${PAS}activated root profile at ${GUIX_PROFILE}"
|
||||
|
|
@ -405,7 +405,7 @@ sys_enable_guix_daemon()
|
|||
case "$INIT_SYS" in
|
||||
upstart)
|
||||
{ initctl reload-configuration;
|
||||
cp "~root/.config/guix/current/lib/upstart/system/guix-daemon.conf" \
|
||||
cp ~root/.config/guix/current/lib/upstart/system/guix-daemon.conf \
|
||||
/etc/init/ &&
|
||||
configure_substitute_discovery /etc/init/guix-daemon.conf &&
|
||||
start guix-daemon; } &&
|
||||
|
|
@ -415,15 +415,15 @@ sys_enable_guix_daemon()
|
|||
{ # systemd .mount units must be named after the target directory.
|
||||
# Here we assume a hard-coded name of /gnu/store.
|
||||
# XXX Work around <https://issues.guix.gnu.org/41356> until next release.
|
||||
if [ -f "~root/.config/guix/current/lib/systemd/system/gnu-store.mount" ]; then
|
||||
cp "~root/.config/guix/current/lib/systemd/system/gnu-store.mount" \
|
||||
if [ -f ~root/.config/guix/current/lib/systemd/system/gnu-store.mount ]; then
|
||||
cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \
|
||||
/etc/systemd/system/;
|
||||
chmod 664 /etc/systemd/system/gnu-store.mount;
|
||||
systemctl daemon-reload &&
|
||||
systemctl enable gnu-store.mount;
|
||||
fi
|
||||
|
||||
cp "~root/.config/guix/current/lib/systemd/system/guix-daemon.service" \
|
||||
cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \
|
||||
/etc/systemd/system/;
|
||||
chmod 664 /etc/systemd/system/guix-daemon.service;
|
||||
|
||||
|
|
@ -447,7 +447,7 @@ sys_enable_guix_daemon()
|
|||
;;
|
||||
sysv-init)
|
||||
{ mkdir -p /etc/init.d;
|
||||
cp "~root/.config/guix/current/etc/init.d/guix-daemon" \
|
||||
cp ~root/.config/guix/current/etc/init.d/guix-daemon \
|
||||
/etc/init.d/guix-daemon;
|
||||
chmod 775 /etc/init.d/guix-daemon;
|
||||
|
||||
|
|
@ -460,7 +460,7 @@ sys_enable_guix_daemon()
|
|||
;;
|
||||
openrc)
|
||||
{ mkdir -p /etc/init.d;
|
||||
cp "~root/.config/guix/current/etc/openrc/guix-daemon" \
|
||||
cp ~root/.config/guix/current/etc/openrc/guix-daemon \
|
||||
/etc/init.d/guix-daemon;
|
||||
chmod 775 /etc/init.d/guix-daemon;
|
||||
|
||||
|
|
@ -492,7 +492,7 @@ sys_authorize_build_farms()
|
|||
if prompt_yes_no "Permit downloading pre-built package binaries from the \
|
||||
project's build farm? (yes/no)"; then
|
||||
guix archive --authorize \
|
||||
< "~root/.config/guix/current/share/guix/ci.guix.gnu.org.pub" \
|
||||
< ~root/.config/guix/current/share/guix/ci.guix.gnu.org.pub \
|
||||
&& _msg "${PAS}Authorized public key for ci.guix.gnu.org"
|
||||
else
|
||||
_msg "${INF}Skipped authorizing build farm public keys"
|
||||
|
|
|
|||
|
|
@ -305,18 +305,50 @@ source ~/.profile
|
|||
;;; Bash.
|
||||
;;;
|
||||
|
||||
(define (bash-serialize-aliases field-name val)
|
||||
#~(string-append
|
||||
#$@(map
|
||||
(match-lambda
|
||||
((key . #f)
|
||||
"")
|
||||
((key . #t)
|
||||
#~(string-append "alias " #$key "\n"))
|
||||
((key . value)
|
||||
#~(string-append "alias " #$key "=\"" #$value "\"\n")))
|
||||
val)))
|
||||
|
||||
(define-configuration home-bash-configuration
|
||||
(package
|
||||
(package bash)
|
||||
"The Bash package to use.")
|
||||
(guix-defaults?
|
||||
(boolean #t)
|
||||
"Add sane defaults like reading @file{/etc/bashrc}, coloring output
|
||||
for @code{ls} provided by guix to @file{.bashrc}.")
|
||||
"Add sane defaults like reading @file{/etc/bashrc} and coloring the output of
|
||||
@command{ls} to the end of the @file{.bashrc} file.")
|
||||
(environment-variables
|
||||
(alist '())
|
||||
"Association list of environment variables to set for the Bash session."
|
||||
"Association list of environment variables to set for the Bash session. The
|
||||
rules for the @code{home-environment-variables-service-type} apply
|
||||
here (@pxref{Essential Home Services}). The contents of this field will be
|
||||
added after the contents of the @code{bash-profile} field."
|
||||
serialize-posix-env-vars)
|
||||
(aliases
|
||||
(alist '())
|
||||
"Association list of aliases to set for the Bash session. The aliases will be
|
||||
defined after the contents of the @code{bashrc} field has been put in the
|
||||
@file{.bashrc} file. The alias will automatically be quoted, so something line
|
||||
this:
|
||||
|
||||
@lisp
|
||||
'((\"ls\" . \"ls -alF\"))
|
||||
@end lisp
|
||||
|
||||
turns into
|
||||
|
||||
@example
|
||||
alias ls=\"ls -alF\"
|
||||
@end example"
|
||||
bash-serialize-aliases)
|
||||
(bash-profile
|
||||
(text-config '())
|
||||
"List of file-like objects, which will be added to @file{.bash_profile}.
|
||||
|
|
@ -387,10 +419,10 @@ alias grep='grep --color=auto'\n")
|
|||
(if (or extra-content
|
||||
(not (null? ((configuration-field-getter field-obj) config))))
|
||||
`(,(object->snake-case-string file-name)
|
||||
,(mixed-text-file
|
||||
,(apply mixed-text-file
|
||||
(object->snake-case-string file-name)
|
||||
(if extra-content extra-content "")
|
||||
(serialize-field field)))
|
||||
(cons (serialize-field field)
|
||||
(if extra-content extra-content '()))))
|
||||
'())))
|
||||
|
||||
(filter
|
||||
|
|
@ -413,8 +445,8 @@ if [ -f ~/.bashrc ]; then source ~/.bashrc; fi
|
|||
,@(list (file-if-not-empty
|
||||
'bashrc
|
||||
(if (home-bash-configuration-guix-defaults? config)
|
||||
guix-bashrc
|
||||
#f))
|
||||
(list (serialize-field 'aliases) guix-bashrc)
|
||||
(list (serialize-field 'alises))))
|
||||
(file-if-not-empty 'bash-logout)))))
|
||||
|
||||
(define (add-bash-packages config)
|
||||
|
|
@ -423,36 +455,52 @@ if [ -f ~/.bashrc ]; then source ~/.bashrc; fi
|
|||
(define-configuration/no-serialization home-bash-extension
|
||||
(environment-variables
|
||||
(alist '())
|
||||
"Association list of environment variables to set.")
|
||||
"Additional environment variables to set. These will be combined with the
|
||||
environment variables from other extensions and the base service to form one
|
||||
coherent block of environment variables.")
|
||||
(aliases
|
||||
(alist '())
|
||||
"Additional aliases to set. These will be combined with the aliases from
|
||||
other extensions and the base service.")
|
||||
(bash-profile
|
||||
(text-config '())
|
||||
"List of file-like objects.")
|
||||
"Additional text blocks to add to @file{.bash_profile}, which will be combined
|
||||
with text blocks from other extensions and the base service.")
|
||||
(bashrc
|
||||
(text-config '())
|
||||
"List of file-like objects.")
|
||||
"Additional text blocks to add to @file{.bashrc}, which will be combined
|
||||
with text blocks from other extensions and the base service.")
|
||||
(bash-logout
|
||||
(text-config '())
|
||||
"List of file-like objects."))
|
||||
"Additional text blocks to add to @file{.bash_logout}, which will be combined
|
||||
with text blocks from other extensions and the base service."))
|
||||
|
||||
(define (home-bash-extensions original-config extension-configs)
|
||||
(home-bash-configuration
|
||||
(inherit original-config)
|
||||
(environment-variables
|
||||
(append (home-bash-configuration-environment-variables original-config)
|
||||
(append-map
|
||||
home-bash-extension-environment-variables extension-configs)))
|
||||
(bash-profile
|
||||
(append (home-bash-configuration-bash-profile original-config)
|
||||
(append-map
|
||||
home-bash-extension-bash-profile extension-configs)))
|
||||
(bashrc
|
||||
(append (home-bash-configuration-bashrc original-config)
|
||||
(append-map
|
||||
home-bash-extension-bashrc extension-configs)))
|
||||
(bash-logout
|
||||
(append (home-bash-configuration-bash-logout original-config)
|
||||
(append-map
|
||||
home-bash-extension-bash-logout extension-configs)))))
|
||||
(match original-config
|
||||
(($ <home-bash-configuration> _ _ _ environment-variables aliases
|
||||
bash-profile bashrc bash-logout)
|
||||
(home-bash-configuration
|
||||
(inherit original-config)
|
||||
(environment-variables
|
||||
(append environment-variables
|
||||
(append-map
|
||||
home-bash-extension-environment-variables extension-configs)))
|
||||
(aliases
|
||||
(append aliases
|
||||
(append-map
|
||||
home-bash-extension-aliases extension-configs)))
|
||||
(bash-profile
|
||||
(append bash-profile
|
||||
(append-map
|
||||
home-bash-extension-bash-profile extension-configs)))
|
||||
(bashrc
|
||||
(append bashrc
|
||||
(append-map
|
||||
home-bash-extension-bashrc extension-configs)))
|
||||
(bash-logout
|
||||
(append bash-logout
|
||||
(append-map
|
||||
home-bash-extension-bash-logout extension-configs)))))))
|
||||
|
||||
(define home-bash-service-type
|
||||
(service-type (name 'home-bash)
|
||||
|
|
@ -609,10 +657,16 @@ Install and configure Fish, the friendly interactive shell.")))
|
|||
'home-shell-profile-configuration))
|
||||
|
||||
(define (generate-home-bash-documentation)
|
||||
(generate-documentation
|
||||
`((home-bash-configuration
|
||||
,home-bash-configuration-fields))
|
||||
'home-bash-configuration))
|
||||
(string-append
|
||||
(generate-documentation
|
||||
`((home-bash-configuration
|
||||
,home-bash-configuration-fields))
|
||||
'home-bash-configuration)
|
||||
"\n\n"
|
||||
(generate-documentation
|
||||
`((home-bash-extension
|
||||
,home-bash-extension-fields))
|
||||
'home-bash-extension)))
|
||||
|
||||
(define (generate-home-zsh-documentation)
|
||||
(generate-documentation
|
||||
|
|
|
|||
|
|
@ -1323,7 +1323,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
|
||||
%D%/packages/patches/julia-tracker-16-compat.patch \
|
||||
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
|
||||
%D%/packages/patches/libblockdev-glib-compat.patch \
|
||||
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
|
||||
%D%/packages/patches/libffi-float128-powerpc64le.patch \
|
||||
%D%/packages/patches/librime-fix-build-with-gcc10.patch \
|
||||
|
|
|
|||
|
|
@ -2522,14 +2522,13 @@ of supported upstream metrics systems simultaneously.")
|
|||
(define-public ansible-core
|
||||
(package
|
||||
(name "ansible-core")
|
||||
(version "2.11.4")
|
||||
(version "2.11.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ansible-core" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0jgahcv2pyc5ky0wir55a1h9q9d6rgqj60rqmvlpbj76vz1agsi2"))))
|
||||
(base32 "0fih7nxszni8imi5sywsifd976v77ydhip43pzg7dd65qy1h5mck"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build python-build-system)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2018 Brett Gilio <brettg@gnu.org>
|
||||
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
|
||||
;;; Copyright © 2018, 2021 Thorsten Wilms <t_w_@freenet.de>
|
||||
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2018 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
|
|
@ -616,7 +616,7 @@ streams from live audio.")
|
|||
(define-public ardour
|
||||
(package
|
||||
(name "ardour")
|
||||
(version "6.8")
|
||||
(version "6.9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -634,7 +634,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
|
|||
#t)))
|
||||
(sha256
|
||||
(base32
|
||||
"16x7bkzbrk0rgywq5vrkhf2z3jj08jw1bvaq9vwlf2b4h4sd7i4s"))
|
||||
"0vlcbd70y0an881zv87kc3akmaiz4w7whsy3yaiiqqjww35jg1mm"))
|
||||
(file-name (string-append name "-" version))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
|
|
@ -2207,14 +2207,14 @@ synchronous execution of all clients, and low latency operation.")
|
|||
(define-public jalv
|
||||
(package
|
||||
(name "jalv")
|
||||
(version "1.6.4")
|
||||
(version "1.6.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.drobilla.net/jalv-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2"))))
|
||||
"05lycfq0f06zjp5xqvzjz9hx9kmqx72yng1lghh76hv63dw43lcj"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
|
@ -2612,14 +2612,14 @@ frequencies. This data is then formatted to MIDI and written to disk.")
|
|||
(define-public lilv
|
||||
(package
|
||||
(name "lilv")
|
||||
(version "0.24.10")
|
||||
(version "0.24.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.drobilla.net/lilv-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi"))))
|
||||
"0qchfsyrsrp2pdpd59025kllycr04ddpzd03ha1iz70ci687g8r6"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
|
@ -2629,15 +2629,13 @@ frequencies. This data is then formatted to MIDI and written to disk.")
|
|||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(setenv "LDFLAGS"
|
||||
(string-append "-Wl,-rpath="
|
||||
(assoc-ref outputs "out") "/lib"))
|
||||
#t))
|
||||
(assoc-ref outputs "out") "/lib"))))
|
||||
(add-after 'unpack 'full-store-path-to-shared-library
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(with-directory-excursion "bindings/python"
|
||||
(substitute* "lilv.py"
|
||||
(("liblilv-0.so") (string-append (assoc-ref outputs "out")
|
||||
"/lib/liblilv-0.so"))))
|
||||
#t)))))
|
||||
"/lib/liblilv-0.so")))))))))
|
||||
;; Required by lilv-0.pc.
|
||||
(propagated-inputs
|
||||
`(("lv2" ,lv2)
|
||||
|
|
@ -2658,14 +2656,14 @@ significantly faster and have minimal dependencies.")
|
|||
(define-public lv2
|
||||
(package
|
||||
(name "lv2")
|
||||
(version "1.18.0")
|
||||
(version "1.18.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://lv2plug.in/spec/lv2-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh"))))
|
||||
"0pp0n9x1rg8d4fw853z9cvfifjdi4bl85yjxxddqa1acfjy1z2af"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
|
@ -3316,7 +3314,7 @@ Suil currently supports every combination of Gtk, Qt, and X11.")
|
|||
(define-public libebur128
|
||||
(package
|
||||
(name "libebur128")
|
||||
(version "1.2.4")
|
||||
(version "1.2.6")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -3325,7 +3323,7 @@ Suil currently supports every combination of Gtk, Qt, and X11.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"))))
|
||||
(base32 "0xkpz5rzz1j1srhprbh89669gw8z5f1njpvcnxqgf7qax69vd8sh"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(;; Tests require proprietary .wav files. See
|
||||
|
|
@ -4921,7 +4919,7 @@ workstations as well as consumer software such as music players.")
|
|||
(define-public redkite
|
||||
(package
|
||||
(name "redkite")
|
||||
(version "1.3.0") ;marked unmaintained as of Oct. 2021
|
||||
(version "1.3.1") ;marked unmaintained as of Oct. 2021
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -4930,7 +4928,7 @@ workstations as well as consumer software such as music players.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "16j9zp5i7svq3g38rfb6h257qfgnd2brrxi7cjd2pdax9xxwj40y"))))
|
||||
(base32 "1zb2k2a4m7z2ravqrjn8fq8lic20wbr2m8kja3p3113jsk7j9zvd"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ;no tests included
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2017, 2021 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2017 Dave Love <fx@gnu.org>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
|
|
@ -47,7 +47,6 @@
|
|||
#:use-module (gnu packages python-science)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages storage)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
(define-public fio
|
||||
|
|
@ -63,55 +62,41 @@
|
|||
"0ba9cnjrnm3nwcfbhh5x2sycr54j3yn1rqn76kjdyz40f3pdg3qm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:test-target "test"
|
||||
`(#:modules (,@%gnu-build-system-modules
|
||||
(ice-9 textual-ports))
|
||||
#:test-target "test"
|
||||
#:configure-flags '("--disable-native") ;don't generate code for the build CPU
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after
|
||||
'unpack 'patch-paths
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(gnuplot (search-input-file inputs "/bin/gnuplot")))
|
||||
(substitute* "tools/plot/fio2gnuplot"
|
||||
(("/usr/share/fio") (string-append out "/share/fio"))
|
||||
;; FIXME (upstream): The 'gnuplot' executable is used inline
|
||||
;; in various os.system() calls mixed with *.gnuplot filenames.
|
||||
(("; do gnuplot") (string-append "; do " gnuplot))
|
||||
(("gnuplot mymath") (string-append gnuplot " mymath"))
|
||||
(("gnuplot mygraph") (string-append gnuplot " mygraph"))))))
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(lambda* (#:key (configure-flags ''()) outputs #:allow-other-keys)
|
||||
;; The configure script doesn't understand some of the
|
||||
;; GNU options, so we can't use #:configure-flags.
|
||||
;; GNU options, so we can't use the stock phase.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(invoke "./configure"
|
||||
(string-append "--prefix=" out)))))
|
||||
(apply invoke "./configure"
|
||||
(string-append "--prefix=" out)
|
||||
configure-flags))))
|
||||
;; The main `fio` executable is fairly small and self contained.
|
||||
;; Moving the auxiliary python and gnuplot scripts to a separate
|
||||
;; output saves almost 400 MiB on the closure.
|
||||
;; Moving the auxiliary scripts to a separate output saves ~100 MiB
|
||||
;; on the closure.
|
||||
(add-after 'install 'move-outputs
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((oldbin (string-append (assoc-ref outputs "out") "/bin"))
|
||||
(newbin (string-append (assoc-ref outputs "utils") "/bin")))
|
||||
(newbin (string-append (assoc-ref outputs "utils") "/bin"))
|
||||
(script? (lambda* (file #:rest _)
|
||||
(call-with-input-file file
|
||||
(lambda (port)
|
||||
(char=? #\# (peek-char port)))))))
|
||||
(mkdir-p newbin)
|
||||
(for-each (lambda (file)
|
||||
(let ((src (string-append oldbin "/" file))
|
||||
(dst (string-append newbin "/" file)))
|
||||
(link src dst)
|
||||
(delete-file src)))
|
||||
'("fio2gnuplot" "fiologparser_hist.py"
|
||||
"fiologparser.py"))
|
||||
;; Make sure numpy et.al is found.
|
||||
(wrap-program (string-append newbin "/fiologparser_hist.py")
|
||||
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))))))))
|
||||
(link file (string-append newbin "/" (basename file)))
|
||||
(delete-file file))
|
||||
(find-files oldbin script?))))))))
|
||||
(outputs '("out" "utils"))
|
||||
(inputs
|
||||
`(("ceph" ,ceph "lib")
|
||||
("libaio" ,libaio)
|
||||
("gnuplot" ,gnuplot)
|
||||
("zlib" ,zlib)
|
||||
("python-numpy" ,python2-numpy)
|
||||
("python-pandas" ,python2-pandas)
|
||||
("python" ,python-2)))
|
||||
`(("libaio" ,libaio)
|
||||
("python" ,python)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://github.com/axboe/fio")
|
||||
(synopsis "Flexible I/O tester")
|
||||
(description
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -528,14 +528,26 @@ BED, GFF/GTF, VCF.")
|
|||
'(#:test-target "test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'compatibility
|
||||
(lambda _
|
||||
(substitute* "src/utils/fileType/FileRecordTypeChecker.h"
|
||||
(("static const float PERCENTAGE")
|
||||
"static constexpr float PERCENTAGE"))
|
||||
(substitute* "src/utils/general/DualQueue.h"
|
||||
(("template <class T, template<class T> class CompareFunc>")
|
||||
"template <class T, template<class U> class CompareFunc>"))))
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
|
||||
(for-each (lambda (file)
|
||||
(install-file file bin))
|
||||
(find-files "bin" ".*")))
|
||||
#t)))))))
|
||||
(find-files "bin" ".*"))))))))
|
||||
(native-inputs
|
||||
`(("python" ,python-wrapper)))
|
||||
(inputs
|
||||
`(("samtools" ,samtools)
|
||||
("zlib" ,zlib)))))
|
||||
|
||||
(define-public pbbam
|
||||
(package
|
||||
|
|
|
|||
|
|
@ -419,16 +419,14 @@ or @command{xorrisofs} to create ISO 9660 images.")
|
|||
(define-public dvdisaster
|
||||
(package
|
||||
(name "dvdisaster")
|
||||
(version "0.79.5")
|
||||
(version "0.79.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
;; Update this (and update HOME-PAGE) when/if one reappears.
|
||||
(uri (string-append "https://web.archive.org/web/20180428070843/"
|
||||
"http://dvdisaster.net/downloads/dvdisaster-"
|
||||
(uri (string-append "https://dvdisaster.jcea.es/downloads/dvdisaster-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w"))))
|
||||
(base32 "1hz3fvqfdrwb7dn6ggqkpcgyjag37ivm1layw27ncjz9glklxjbr"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gtk+" ,gtk+-2)))
|
||||
|
|
@ -447,8 +445,7 @@ or @command{xorrisofs} to create ISO 9660 images.")
|
|||
(with-directory-excursion "regtest"
|
||||
(substitute* "common.bash"
|
||||
(("ISODIR=/var/tmp/regtest") "ISODIR=/tmp"))
|
||||
(for-each invoke (find-files "." "rs.*\\.bash")))
|
||||
#t))
|
||||
(for-each invoke (find-files "." "rs.*\\.bash")))))
|
||||
(add-after 'install 'install-desktop
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((datadir (string-append (assoc-ref outputs "out") "/share")))
|
||||
|
|
@ -468,10 +465,13 @@ or @command{xorrisofs} to create ISO 9660 images.")
|
|||
(find-files "contrib" "dvdisaster[0-9]*\\.png"))
|
||||
(mkdir-p (string-append datadir "/pixmaps"))
|
||||
(copy-file "contrib/dvdisaster48.xpm"
|
||||
(string-append datadir "/pixmaps/dvdisaster.xpm"))
|
||||
#t))))))
|
||||
(home-page (string-append "https://web.archive.org/web/20180428070843/"
|
||||
"http://dvdisaster.net/en/index.html"))
|
||||
(string-append datadir "/pixmaps/dvdisaster.xpm")))))
|
||||
(add-after 'install 'remove-uninstall-script
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
(delete-file
|
||||
(string-append out "/bin/dvdisaster-uninstall.sh"))))))))
|
||||
(home-page "https://dvdisaster.jcea.es/")
|
||||
(synopsis "Error correcting codes for optical media images")
|
||||
(description "Optical media (CD,DVD,BD) keep their data only for a
|
||||
finite time (typically for many years). After that time, data loss develops
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -502,14 +502,14 @@ should only be used as part of the Guix cups-pk-helper service.")
|
|||
(define-public hplip
|
||||
(package
|
||||
(name "hplip")
|
||||
(version "3.21.8")
|
||||
(version "3.21.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
|
||||
"/hplip-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"076fjzgw86q817c660h1vzwdp00cyjr49b9bfi7qkhphq6am4gpi"))
|
||||
"0q3adcp8iygravp4bq4gw14jk20c5rhnawj1333qyw8yvlghw8yy"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -524,9 +524,13 @@ should only be used as part of the Guix cups-pk-helper service.")
|
|||
(delete-file "prnt/hpcups/ImageProcessor.h")
|
||||
(substitute* "Makefile.in"
|
||||
((" -lImageProcessor ") " ")
|
||||
(("(\\@HPLIP_BUILD_TRUE\\@[[:blank:]]*).*libImageProcessor.*"
|
||||
;; Turn shell commands inside an if…fi into harmless no-ops.
|
||||
(("^(\\@HPLIP_BUILD_TRUE\\@[[:blank:]]*).*libImageProcessor.*"
|
||||
_ prefix)
|
||||
(string-append prefix ":; \\\n")))
|
||||
(string-append prefix ": ; \\\n"))
|
||||
;; Remove the lines adding file targets altogether.
|
||||
(("^\\@FULL_BUILD_TRUE\\@.*libImageProcessor.*")
|
||||
""))
|
||||
|
||||
;; Install binaries under libexec/hplip instead of
|
||||
;; share/hplip; that'll at least ensure they get stripped.
|
||||
|
|
|
|||
|
|
@ -2198,7 +2198,7 @@ easy, requiring concise and simple code.")
|
|||
"UnQLite is an in-process software library which implements a
|
||||
self-contained, serverless, zero-configuration, transactional NoSQL
|
||||
database engine. UnQLite is a document store database similar to
|
||||
MongoDB, Redis, CouchDB, etc. as well as a standard Key/Value store
|
||||
Redis, CouchDB, etc., as well as a standard key/value store
|
||||
similar to BerkeleyDB, LevelDB, etc.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
|
|
@ -2961,13 +2961,13 @@ Database API 2.0T.")
|
|||
(define-public python-sqlalchemy
|
||||
(package
|
||||
(name "python-sqlalchemy")
|
||||
(version "1.4.23")
|
||||
(version "1.4.26")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "SQLAlchemy" version))
|
||||
(sha256
|
||||
(base32 "10vm8hm8w4yfsab076ak8r4vp5v1jqdi71cky6dhha7mh5l29zvn"))))
|
||||
(base32 "06imr96jirwmkc8mkxrl9bi413yd3638lc5idn65xx8fv7bzkivb"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-cython" ,python-cython) ; for C extensions
|
||||
|
|
@ -2979,7 +2979,9 @@ Database API 2.0T.")
|
|||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _ (invoke "py.test"))))))
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "py.test")))))))
|
||||
(home-page "https://www.sqlalchemy.org")
|
||||
(synopsis "Database abstraction library")
|
||||
(description
|
||||
|
|
@ -2990,6 +2992,18 @@ designed for efficient and high-performing database access, adapted into a
|
|||
simple and Pythonic domain language.")
|
||||
(license license:x11)))
|
||||
|
||||
(define-public python-sqlalchemy-1.3
|
||||
(package
|
||||
(inherit python-sqlalchemy)
|
||||
(version "1.3.20")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "SQLAlchemy" version))
|
||||
(sha256
|
||||
(base32 "18b9am7bsqc4nj3d2h5r93i002apczxfvpfpcqbd6f0385zmrwnj"))))
|
||||
(propagated-inputs '())))
|
||||
|
||||
(define-public python2-sqlalchemy
|
||||
(package-with-python2 python-sqlalchemy))
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
(define-public diffoscope
|
||||
(package
|
||||
(name "diffoscope")
|
||||
(version "189")
|
||||
(version "190")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0dai9gwsr9xnficjy8myq6xr301y4iy82aidm936qsqjwrp8q1sm"))
|
||||
(base32 "10q93qybwqf2nzj3iakw1pxhccq10ixm9fn7xgdr4p88qb0wchb5"))
|
||||
(patches
|
||||
(search-patches "diffoscope-fix-llvm-test.patch"))))
|
||||
(build-system python-build-system)
|
||||
|
|
|
|||
|
|
@ -923,16 +923,15 @@ to create devices with respective mappings for the ATARAID sets discovered.")
|
|||
(define-public libblockdev
|
||||
(package
|
||||
(name "libblockdev")
|
||||
(version "2.25")
|
||||
(version "2.26")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/storaged-project/"
|
||||
"libblockdev/releases/download/"
|
||||
version "-1/libblockdev-" version ".tar.gz"))
|
||||
(patches (search-patches "libblockdev-glib-compat.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0s0nazkpzpn4an00qghjkk9n7gdm5a8dqfr5hfnlk5mk5lma8njm"))))
|
||||
"0sg068jb87ljhn8yazrqxi6ri10ic2sh1lp6ikd2nqxc6l5y3h64"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
|||
|
|
@ -592,14 +592,14 @@ asynchronous fashion.")
|
|||
(define-public nsd
|
||||
(package
|
||||
(name "nsd")
|
||||
(version "4.3.7")
|
||||
(version "4.3.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1bg87g0i66hw16fm7gbqmzyi2rcn1hadzz0bg9b8s5mx7g2rwfzx"))))
|
||||
(base32 "1qcrrglm3r486r6n26h5fr1xb1k8jf63gm9b43wrhnigywjpx28i"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
@ -635,8 +635,7 @@ asynchronous fashion.")
|
|||
((".*INSTALL.*\\$\\((config|pid|xfr|db)dir" command)
|
||||
(string-append "#" command))
|
||||
(("\\$\\(nsdconfigfile\\)\\.sample" file-name)
|
||||
(string-append doc "/examples/" file-name)))
|
||||
#t))))
|
||||
(string-append doc "/examples/" file-name)))))))
|
||||
#:tests? #f)) ; no tests
|
||||
(inputs
|
||||
`(("libevent" ,libevent)
|
||||
|
|
@ -924,7 +923,7 @@ Extensions} (DNSSEC).")
|
|||
(define-public knot
|
||||
(package
|
||||
(name "knot")
|
||||
(version "3.1.2")
|
||||
(version "3.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -933,7 +932,7 @@ Extensions} (DNSSEC).")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kyjf6d1jx8q0zjzwy06f4d3ar5cbbqxka8cc7ckwmbpf1n6cij5"))
|
||||
(base32 "0wx8ad95adryzp527m4k0lja8y39qqd65f5z9immhfpb9cyax6i7"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com>
|
||||
;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com>
|
||||
;;; Copyright © 2019, 2020, 2021 Joseph LaFreniere <joseph@lafreniere.xyz>
|
||||
;;; Copyright © 2019 Todor Kondić <tk.code@protonmail.com>15669
|
||||
;;; Copyright © 2019 Amar Singh <nly@disroot.org>
|
||||
;;; Copyright © 2019 Baptiste Strazzulla <bstrazzull@hotmail.fr>
|
||||
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
|
|
@ -280,7 +281,7 @@ e.g. emacs-geiser-guile for Guile.")
|
|||
(define-public emacs-geiser-guile
|
||||
(package
|
||||
(name "emacs-geiser-guile")
|
||||
(version "0.17")
|
||||
(version "0.18")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -289,7 +290,7 @@ e.g. emacs-geiser-guile for Guile.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0"))))
|
||||
(base32 "0gndf0w8dbv54bzc04svp2ck8wypa7i3b8kpixf6rkg91l79xpci"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
'(#:include (cons "^src/" %default-include)
|
||||
|
|
@ -304,8 +305,7 @@ e.g. emacs-geiser-guile for Guile.")
|
|||
;; loaded, so let's defer that until it is.
|
||||
(("\\(geiser-activate-implementation .*\\)" all)
|
||||
(string-append
|
||||
"(eval-after-load 'geiser-impl '" all ")")))
|
||||
#t)))))
|
||||
"(eval-after-load 'geiser-impl '" all ")"))))))))
|
||||
(inputs
|
||||
`(("guile" ,guile-3.0)))
|
||||
(propagated-inputs
|
||||
|
|
@ -650,22 +650,23 @@ some utility functions, and commands using that infrastructure.")
|
|||
(define-public git-modes
|
||||
(package
|
||||
(name "emacs-git-modes")
|
||||
(version "1.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/magit/git-modes")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6"))))
|
||||
(version "1.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/magit/git-modes")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0aqz65pcqc35h5z4s606f48iqn87h5v9nj3cp6n9yjxa2v7w5hfk"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/magit/git-modes")
|
||||
(synopsis "Emacs major modes for Git configuration files")
|
||||
(description
|
||||
"This package provides Emacs major modes for editing various Git
|
||||
configuration files, such as .gitattributes, .gitignore, and .git/config.")
|
||||
configuration files, such as @file{.gitattributes}, @file{.gitignore}, and
|
||||
@file{.git/config}.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-with-editor
|
||||
|
|
@ -1646,6 +1647,19 @@ boilerplate code from defining new Flymake backend functions.")
|
|||
(sha256
|
||||
(base32 "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'substitute-shellcheck-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(make-file-writable "flymake-shellcheck.el")
|
||||
(emacs-substitute-sexps "flymake-shellcheck.el"
|
||||
("defcustom flymake-shellcheck-path"
|
||||
`(or (executable-find "shellcheck")
|
||||
,(string-append (assoc-ref inputs "shellcheck")
|
||||
"/bin/shellcheck")))))))))
|
||||
(inputs
|
||||
`(("shellcheck" ,shellcheck)))
|
||||
(home-page "https://github.com/federicotdn/flymake-shellcheck")
|
||||
(synopsis "Flymake backend for Bash/Sh powered by ShellCheck")
|
||||
(description
|
||||
|
|
@ -12645,7 +12659,6 @@ editing nginx config files.")
|
|||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"stream-" version ".tar"))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "00c3n4gyxzv7vczqms0d62kl8zsmjfyxa92mwxn2snyx857a9jfw"))))
|
||||
(build-system emacs-build-system)
|
||||
|
|
@ -13922,14 +13935,14 @@ methods from a given list.")
|
|||
(define-public emacs-posframe
|
||||
(package
|
||||
(name "emacs-posframe")
|
||||
(version "1.0.4")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"posframe-" version ".tar"))
|
||||
(sha256
|
||||
(base32 "0i2pw90gw9zb22gj8yyvcp3b2k1bxxhbjj0idvr5iz1vd9023bc6"))))
|
||||
(base32 "0ddm149dz71nksbpz7rwa8cax1nisf6wklv5iq4zrcbf5ghpagkg"))))
|
||||
(build-system emacs-build-system)
|
||||
;; emacs-minimal does not include the function font-info.
|
||||
(arguments
|
||||
|
|
@ -17677,7 +17690,7 @@ files to be expanded upon opening them.")
|
|||
(define-public emacs-ebib
|
||||
(package
|
||||
(name "emacs-ebib")
|
||||
(version "2.32.2")
|
||||
(version "2.33")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -17686,10 +17699,11 @@ files to be expanded upon opening them.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7"))))
|
||||
(base32 "18gvmymkpzws8s4zjcm1kijyr55dgfcq201z3w1jzhkhcs01bfsc"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-biblio" ,emacs-biblio)
|
||||
("emacs-ivy" ,emacs-ivy)
|
||||
("emacs-parsebib" ,emacs-parsebib)))
|
||||
(home-page "https://joostkremers.github.io/ebib/")
|
||||
(synopsis "BibTeX database manager for Emacs")
|
||||
|
|
@ -17732,13 +17746,48 @@ and publications from various sources, by keywords or by DOI. References are
|
|||
automatically fetched from well-curated sources, and formatted as BibTeX.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-citar
|
||||
(package
|
||||
(name "emacs-citar")
|
||||
(version "0.8")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/bdarcus/citar")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1jrfcfr976c9nb2vpfrh6yhck5gm34wcjzbk0m6gq2xg3qfv2g6p"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-auctex" ,emacs-auctex)
|
||||
("emacs-helm-bibtex" ,emacs-helm-bibtex)
|
||||
("emacs-org" ,emacs-org)
|
||||
("emacs-parsebib" ,emacs-parsebib)
|
||||
("emacs-s" ,emacs-s)))
|
||||
(home-page "https://github.com/bdarcus/citar")
|
||||
(synopsis "Emacs package to quickly find and act on bibliographic entries")
|
||||
(description
|
||||
"This package provides a completing-read front-end to browse and
|
||||
act on BibTeX, BibLaTeX, and CSL JSON bibliographic data, and LaTeX,
|
||||
markdown, and Org cite editing support.
|
||||
|
||||
When used with Vertico (or Selectrum), Embark, and Marginalia, it
|
||||
provides similar functionality to helm-bibtex and ivy-bibtex: quick
|
||||
filtering and selecting of bibliographic entries from the minibuffer,
|
||||
and the option to run different commands against them.
|
||||
|
||||
With Embark, it also makes available at-point actions in Org
|
||||
citations.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-helm-bibtex
|
||||
(let ((commit "d4471232be26793fbf56c0ac3690b5f537c378b9")
|
||||
(revision "2"))
|
||||
(let ((commit "aa775340ba691d2322948bfdc6a88158568a1399")
|
||||
(revision "3"))
|
||||
(package
|
||||
(name "emacs-helm-bibtex")
|
||||
(version (string-append "2.0.0" "-" revision "."
|
||||
(string-take commit 7)))
|
||||
(version (git-version "2.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -17747,8 +17796,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.")
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j"))))
|
||||
(base32 "1d3mc17ga09m41i06khghlvixr6gsiacifnhdbrfnp0w5592aprk"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-helm" ,emacs-helm)
|
||||
|
|
@ -25160,6 +25208,27 @@ Dash docsets.")
|
|||
through Dash docsets.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public emacs-devdocs
|
||||
(package
|
||||
(name "emacs-devdocs")
|
||||
(version "0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://elpa.gnu.org/packages/"
|
||||
"devdocs-" version ".tar"))
|
||||
(sha256
|
||||
(base32 "1npc7yra7pvf86ahmz1h7hnjxrz15ar1vjcalg4ilizypycpgrwj"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/astoff/devdocs.el")
|
||||
(synopsis "Emacs viewer for DevDocs")
|
||||
(description
|
||||
"This package provides a documentation viewer similar to Emacs's
|
||||
built-in Info browser, but geared towards documentation obtained from
|
||||
@url{https://devdocs.io}.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-cascading-dir-locals
|
||||
(let ((release "0.1")
|
||||
(revision "0")
|
||||
|
|
@ -25636,6 +25705,120 @@ provided. Those alternative commands are and bound by default to their
|
|||
corresponding Evil keys.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public emacs-ntlm
|
||||
(package
|
||||
(name "emacs-ntlm")
|
||||
(version "2.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/ntlm-" version ".el"))
|
||||
(sha256
|
||||
(base32 "01d0bcmh8a36qf871w6bc05kjk9bmnh843m9869xw06zyvqwg9mv"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://elpa.gnu.org/packages/ntlm.html")
|
||||
(synopsis "NTLM (NT LanManager) authentication support")
|
||||
(description
|
||||
"This library is a direct translation of the Samba release 2.2.0
|
||||
implementation of Windows NT and LanManager compatible password encryption.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-nadvice
|
||||
(package
|
||||
(name "emacs-nadvice")
|
||||
(version "0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"nadvice-" version ".el"))
|
||||
(sha256
|
||||
(base32 "0gi3csnxbs8h7iy0scsl35sic3gv90swa89hhdjwb7qvpirfdcgw"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://elpa.gnu.org/packages/nadvice.html")
|
||||
(synopsis "Forward compatibility for Emacs-24.4's nadvice")
|
||||
(description
|
||||
"This package tries to re-implement some of nadvice.el's functionality on
|
||||
top of the old defadvice system, to help users of defadvice move to the new
|
||||
advice system without dropping support for Emacs<24.4.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-url-http-ntlm
|
||||
(package
|
||||
(name "emacs-url-http-ntlm")
|
||||
(version "2.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"url-http-ntlm-" version ".el"))
|
||||
(sha256
|
||||
(base32 "1cakq2ykraci7d1gl8rnpv4f2f5ffyaidhqb1282g7i72adwmb98"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs `(("emacs-ntlm" ,emacs-ntlm)))
|
||||
(home-page "https://elpa.gnu.org/packages/url-http-ntlm.html")
|
||||
(synopsis "NTLM authentication for the url library")
|
||||
(description "This package provides a NTLM handler for the URL package.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-soap-client
|
||||
(package
|
||||
(name "emacs-soap-client")
|
||||
(version "3.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"soap-client-" version ".tar"))
|
||||
(sha256
|
||||
(base32 "1s0bwnip22nj6kgjadd4zlj9j729hiyyjb66sr51i2mddnf9i95s"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "httpa://elpa.gnu.org/packages/soap-client.html")
|
||||
(synopsis "Access SOAP web services")
|
||||
(description
|
||||
"This package provides a SOAP client to access web services.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-fsm
|
||||
(package
|
||||
(name "emacs-fsm")
|
||||
(version "0.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/fsm-" version ".el"))
|
||||
(sha256
|
||||
(base32 "1jyxyqdbfl8nv7c50q0sg3w5p7whp1sqgi7w921k5hfar4d11qqp"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://elpa.gnu.org/packages/fsm.html")
|
||||
(synopsis "Finite State Machine library")
|
||||
(description
|
||||
"This package provides Finite State Machine library to make asynchronous
|
||||
programming in Emacs Lisp easy and fun.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-excorporate
|
||||
(package
|
||||
(name "emacs-excorporate")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"excorporate-" version ".tar"))
|
||||
(sha256
|
||||
(base32 "1g0wc2kp15ra323b4rxvdh58q9c4h7m20grw6a0cs53m7l9xi62f"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-fsm" ,emacs-fsm)
|
||||
("emacs-nadvice" ,emacs-nadvice)
|
||||
("emacs-soap-client" ,emacs-soap-client)
|
||||
("emacs-url-http-ntlm" ,emacs-url-http-ntlm)))
|
||||
(home-page "https://elpa.gnu.org/packages/excorporate.html")
|
||||
(synopsis "Exchange integration")
|
||||
(description "This package provides Exchange integration for Emacs.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-evil-traces
|
||||
(let ((commit "1931e3ea2c64b4aec393a9c25063c330deff55e3")
|
||||
(revision "2"))
|
||||
|
|
@ -26618,19 +26801,18 @@ available.")
|
|||
(define-public emacs-eshell-did-you-mean
|
||||
(package
|
||||
(name "emacs-eshell-did-you-mean")
|
||||
(version "0.1")
|
||||
(home-page "https://github.com/xuchunyang/eshell-did-you-mean")
|
||||
(version "0.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(url "https://github.com/xuchunyang/eshell-did-you-mean")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg"))))
|
||||
(base32 "158g8b4crm0gf5pilfxf89hdsb22gr1wbrjyx9gf45bmcll3i9vf"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/xuchunyang/eshell-did-you-mean")
|
||||
(synopsis "Display suggestions on 'command not found' in Eshell")
|
||||
(description "This library adds a list of 'Did you mean...' suggestions
|
||||
when the command was not found in Eshell. The suggestions are found after the
|
||||
|
|
@ -27225,14 +27407,14 @@ interface.")
|
|||
(define-public emacs-ivy-posframe
|
||||
(package
|
||||
(name "emacs-ivy-posframe")
|
||||
(version "0.6.2")
|
||||
(version "0.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"ivy-posframe-" version ".tar"))
|
||||
(sha256
|
||||
(base32 "1x6pm0pry2j7yazhxvq1gydbymwll9yg85m8qi4sh8s0pnm0vjzk"))))
|
||||
(base32 "0b498qzaydjrhplx4d7zcrs883dlrhfiz812sv4m3pmhfwifcchh"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-ivy" ,emacs-ivy)
|
||||
|
|
|
|||
|
|
@ -1029,8 +1029,8 @@ APFS.")
|
|||
|
||||
(define-public xfstests
|
||||
;; The last release (1.1.0) is from 2011.
|
||||
(let ((revision "0")
|
||||
(commit "1c18b9ec2fcc94bd05ecdd136aa51c97bf3fa70d"))
|
||||
(let ((revision "1")
|
||||
(commit "bae1d15f6421cbe99b3e2e134c39d50248e7c261"))
|
||||
(package
|
||||
(name "xfstests")
|
||||
(version (git-version "1.1.0" revision commit))
|
||||
|
|
@ -1042,7 +1042,7 @@ APFS.")
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rrv0rs9nhaza0jk5k0bj27w4lcd1s4a1ls8nr679qi02bgx630x"))))
|
||||
(base32 "01y7dx5sx1xg3dycqlp2b6azclz3xcnx7vdy2rr6zmf210501xd9"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@
|
|||
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
|
||||
;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
|
||||
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
|
||||
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2021 Christopher Baines <mail@cbaines.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -151,6 +153,7 @@
|
|||
#:use-module (gnu packages less)
|
||||
#:use-module (gnu packages libcanberra)
|
||||
#:use-module (gnu packages libedit)
|
||||
#:use-module (gnu packages libidn)
|
||||
#:use-module (gnu packages libunwind)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages llvm)
|
||||
|
|
@ -171,6 +174,7 @@
|
|||
#:use-module (gnu packages perl-check)
|
||||
#:use-module (gnu packages perl-compression)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pretty-print)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages python)
|
||||
|
|
@ -4276,14 +4280,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
|
|||
(define openttd-engine
|
||||
(package
|
||||
(name "openttd-engine")
|
||||
(version "1.11.2")
|
||||
(version "12.0")
|
||||
(source
|
||||
(origin (method url-fetch)
|
||||
(uri (string-append "https://cdn.openttd.org/openttd-releases/"
|
||||
version "/openttd-" version "-source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v9f93lsdcv3ia28y8iihx9nj9zp6fpf5hkdrpl4ypw159d97fhg"))))
|
||||
"1p1j5cf4ry57dcgm7qx2g2s00z1c6qgjabb4kqjp00yz00wgv85v"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("allegro" ,allegro)
|
||||
|
|
@ -4313,7 +4317,7 @@ engine. When you start it you will be prompted to download a graphics set.")
|
|||
(define openttd-opengfx
|
||||
(package
|
||||
(name "openttd-opengfx")
|
||||
(version "0.6.1")
|
||||
(version "7.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -4321,10 +4325,10 @@ engine. When you start it you will be prompted to download a graphics set.")
|
|||
version "/opengfx-" version "-source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jgy8xv7r72m127qn09vr3rxhnbakl2990f7lldsk0d5d8n993vd"))))
|
||||
"0nhzlk6s73qvznm5fdwcs1b42g2plf26s5ag39fvck45zm7m48jk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags (list "CC=gcc"
|
||||
`(#:make-flags (list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "INSTALL_DIR="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/games/openttd/baseset/opengfx"))
|
||||
|
|
@ -4352,7 +4356,7 @@ engine. When you start it you will be prompted to download a graphics set.")
|
|||
("grfcodec" ,grfcodec)
|
||||
("nml" ,nml)
|
||||
("which" ,which)
|
||||
("python" ,python-2)))
|
||||
("python" ,python)))
|
||||
(home-page "http://dev.openttdcoop.org/projects/opengfx")
|
||||
(synopsis "Base graphics set for OpenTTD")
|
||||
(description
|
||||
|
|
@ -4372,7 +4376,7 @@ OpenGFX provides you with...
|
|||
(define openttd-opensfx
|
||||
(package
|
||||
(name "openttd-opensfx")
|
||||
(version "1.0.1")
|
||||
(version "1.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -4381,11 +4385,11 @@ OpenGFX provides you with...
|
|||
version "/opensfx-" version "-source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06vycppqcxbfdqlxzna5xr303zgcmpcvj6ylw5b2ws0ssph2f1s0"))))
|
||||
"0aym026lg0r7dp3jxxs9c0rj8lwy1fz3v9hmk3mml6sycsg3fv42"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("catcodec" ,catcodec)
|
||||
("python" ,python-2)
|
||||
("python" ,python)
|
||||
("tar" ,tar)))
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
|
@ -4422,7 +4426,7 @@ the original Transport Tycoon Deluxe.")
|
|||
(define openttd-openmsx
|
||||
(package
|
||||
(name "openttd-openmsx")
|
||||
(version "0.4.0")
|
||||
(version "0.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -4431,11 +4435,13 @@ the original Transport Tycoon Deluxe.")
|
|||
version "/openmsx-" version "-source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0prjljsdgdxqdhhcriqskqha004ybs575xcjq80zha3pqnmrdk0k"))))
|
||||
"0h583d8fxy78kc3jvpp78r76a48qhxrhm4q7jbnj74aw0kwrcl8g"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("grfcodec" ,grfcodec)
|
||||
("python" ,python-2)
|
||||
; Scripts are Python3 compatible, but call the interpreter as
|
||||
; python instead of python3.
|
||||
("python" ,python-wrapper)
|
||||
("tar" ,tar)))
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
|
@ -4484,6 +4490,7 @@ Transport Tycoon Deluxe.")
|
|||
`(("opengfx" ,openttd-opengfx)
|
||||
("openmsx" ,openttd-openmsx)
|
||||
("opensfx" ,openttd-opensfx)
|
||||
("gcc" ,gcc-9) ; for #include <charconv>
|
||||
,@(package-native-inputs openttd-engine)))))
|
||||
|
||||
(define openrct2-title-sequences
|
||||
|
|
@ -6647,7 +6654,7 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
(define-public 0ad-data
|
||||
(package
|
||||
(name "0ad-data")
|
||||
(version "0.0.23b-alpha")
|
||||
(version "0.0.25b-alpha")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -6655,21 +6662,10 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
version "-unix-data.tar.xz"))
|
||||
(file-name (string-append name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04x7729hk6zw1xj3n4s4lvaviijsnbjf5rhzvjxlr5fygvg4l6z1"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(for-each (lambda (name)
|
||||
(let* ((dir (string-append "binaries/data/mods/" name))
|
||||
(file (string-append dir "/" name ".zip"))
|
||||
(unzip #$(file-append unzip "/bin/unzip")))
|
||||
(invoke unzip "-d" dir file)
|
||||
(delete-file file)))
|
||||
'("mod" "public"))
|
||||
#t))))
|
||||
(base32 "1c9zrddmjxvvacismld6fbwbw9vrdbq6g6d3424p8w5p6xg5wlwy"))))
|
||||
(build-system trivial-build-system)
|
||||
(native-inputs `(("tar" ,tar)
|
||||
("unzip" ,unzip)
|
||||
("xz" ,xz)))
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
|
|
@ -6679,10 +6675,17 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
(let ((out (assoc-ref %outputs "out"))
|
||||
(source (assoc-ref %build-inputs "source"))
|
||||
(tar (search-input-file %build-inputs "/bin/tar"))
|
||||
(unzip (search-input-file %build-inputs "/bin/unzip"))
|
||||
(xz-path (string-append (assoc-ref %build-inputs "xz") "/bin")))
|
||||
(setenv "PATH" xz-path)
|
||||
(mkdir out)
|
||||
(invoke tar "xvf" source "-C" out "--strip=3")))))
|
||||
(invoke tar "xvf" source "-C" out "--strip=3")
|
||||
(for-each (lambda (name)
|
||||
(let* ((dir (string-append out "/mods/" name))
|
||||
(file (string-append dir "/" name ".zip")))
|
||||
(invoke unzip "-o" "-d" dir file)
|
||||
(delete-file file)))
|
||||
'("mod" "public"))))))
|
||||
(synopsis "Data files for 0ad")
|
||||
(description "0ad-data provides the data files required by the game 0ad.")
|
||||
(home-page "https://play0ad.com")
|
||||
|
|
@ -6700,7 +6703,7 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
(define-public 0ad
|
||||
(package
|
||||
(name "0ad")
|
||||
(version "0.0.23b-alpha")
|
||||
(version "0.0.25b-alpha")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -6708,23 +6711,24 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
version "-unix-build.tar.xz"))
|
||||
(file-name (string-append name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1"))))
|
||||
;; A snippet here would cause a build failure because of timestamps
|
||||
;; reset. See https://bugs.gnu.org/26734.
|
||||
(base32 "1p9fa8f7sjb9c5wl3mawzyfqvgr614kdkhrj2k4db9vkyisws3fp"))))
|
||||
;; A snippet here would cause a build failure because of timestamps
|
||||
;; reset. See https://bugs.gnu.org/26734.
|
||||
(inputs
|
||||
`(("0ad-data" ,0ad-data)
|
||||
("curl" ,curl)
|
||||
("enet" ,enet)
|
||||
("fmt" ,fmt)
|
||||
("gloox" ,gloox)
|
||||
("icu4c" ,icu4c)
|
||||
("icu4c" ,icu4c-68)
|
||||
("libidn" ,libidn)
|
||||
("libpng" ,libpng)
|
||||
("libsodium" ,libsodium)
|
||||
("libvorbis" ,libvorbis)
|
||||
("libxcursor" ,libxcursor)
|
||||
("libxml2" ,libxml2)
|
||||
("miniupnpc" ,miniupnpc)
|
||||
("mozjs-38" ,mozjs-38)
|
||||
("mozjs" ,mozjs-78)
|
||||
("openal" ,openal)
|
||||
("sdl2" ,sdl2)
|
||||
("wxwidgets" ,wxwidgets)
|
||||
|
|
@ -6732,29 +6736,27 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
(native-inputs
|
||||
`(("boost" ,boost)
|
||||
("cmake" ,cmake-minimal)
|
||||
("cxxtest" ,cxxtest)
|
||||
("mesa" ,mesa)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-2" ,python-2)))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags '("config=release" "verbose=1" "-C" "build/workspaces/gcc")
|
||||
#:tests? #f ;tests fail currently
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-bundles
|
||||
(lambda _
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(delete-file-recursively "libraries/source/spidermonkey")
|
||||
#t))
|
||||
(add-after 'unpack 'fix-x11-includes
|
||||
(lambda _
|
||||
(substitute* "source/lib/sysdep/os/unix/x/x.cpp"
|
||||
(("<Xlib.h>") "<X11/Xlib.h>"))
|
||||
(substitute* "source/lib/sysdep/os/unix/x/x.cpp"
|
||||
(("<Xatom.h>") "<X11/Xatom.h>"))
|
||||
(substitute* "source/lib/sysdep/os/unix/x/x.cpp"
|
||||
(("<Xcursor/Xcursor.h>") "<X11/Xcursor/Xcursor.h>"))
|
||||
#t))
|
||||
(delete-file-recursively "libraries/source/cxxtest-4.4")
|
||||
(substitute* "build/premake/premake5.lua"
|
||||
(("rootdir\\.\\.\"\\/libraries\\/source\\/cxxtest-4.4\\/bin\\/cxxtestgen\"")
|
||||
(string-append "\"" (assoc-ref inputs "cxxtest")
|
||||
"/bin/cxxtestgen"
|
||||
"\"")))))
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
|
||||
(let* ((jobs (number->string (parallel-job-count)))
|
||||
(out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib"))
|
||||
|
|
@ -6762,11 +6764,13 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
(setenv "JOBS" (string-append "-j" jobs))
|
||||
(setenv "CC" "gcc")
|
||||
(with-directory-excursion "build/workspaces"
|
||||
(invoke "./update-workspaces.sh"
|
||||
(string-append "--libdir=" lib)
|
||||
(string-append "--datadir=" data)
|
||||
;; TODO: "--with-system-nvtt"
|
||||
"--with-system-mozjs38")))))
|
||||
(apply invoke
|
||||
`("./update-workspaces.sh"
|
||||
,(string-append "--libdir=" lib)
|
||||
,(string-append "--datadir=" data)
|
||||
;; TODO: "--with-system-nvtt"
|
||||
"--with-system-mozjs"
|
||||
,@(if tests? '() '("--without-tests"))))))))
|
||||
(delete 'check)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
|
|
@ -6776,7 +6780,9 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
(lib (string-append out "/lib"))
|
||||
(data (string-append out "/share/0ad"))
|
||||
(applications (string-append out "/share/applications"))
|
||||
(pixmaps (string-append out "/share/pixmaps"))
|
||||
(hicolor (string-append out "/share/icons/hicolor/128x128/apps"))
|
||||
(metainfo (string-append out "/share/metainfo"))
|
||||
(mime (string-append out "/share/mime/application"))
|
||||
(0ad-data (assoc-ref inputs "0ad-data")))
|
||||
;; data
|
||||
(copy-recursively "data" data)
|
||||
|
|
@ -6795,12 +6801,14 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
;; resources
|
||||
(with-directory-excursion "../build/resources"
|
||||
(install-file "0ad.desktop" applications)
|
||||
(install-file "0ad.png" pixmaps))
|
||||
#t)))
|
||||
(install-file "0ad.png" hicolor)
|
||||
(install-file "0ad.appdata.xml" metainfo)
|
||||
(install-file "pyrogenesis.xml" mime)))))
|
||||
(add-after 'install 'check
|
||||
(lambda _
|
||||
(with-directory-excursion "system"
|
||||
(invoke "./test")))))))
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(with-directory-excursion "system"
|
||||
(invoke "./test"))))))))
|
||||
(home-page "https://play0ad.com")
|
||||
(synopsis "3D real-time strategy game of ancient warfare")
|
||||
(description "0 A.D. is a real-time strategy (RTS) game of ancient
|
||||
|
|
@ -9242,7 +9250,7 @@ levels to unlock.")
|
|||
(define simgear
|
||||
(package
|
||||
(name "simgear")
|
||||
(version "2018.3.5")
|
||||
(version "2020.3.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -9250,22 +9258,31 @@ levels to unlock.")
|
|||
(version-major+minor version) "/"
|
||||
"simgear-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1vkqm66r1205k3hdjmx5wmx5kvmsb0dgfzrs8n5gqnxj8szs42dl"))))
|
||||
(base32 "0g2g3n3sb6kdimvcrn9kvlhyyrp5c6lx20fgzz8l609v5aygr3dv"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; There are some bundled libraries.
|
||||
(for-each delete-file-recursively
|
||||
'("3rdparty/expat/"))
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
`(#:configure-flags (list "-DSYSTEM_EXPAT=ON")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; Skip tests that require internet access.
|
||||
(invoke "ctest" "-E" "(http|dns)"))))))
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; Skip tests that require internet access.
|
||||
(invoke "ctest" "-E" "(http|dns)")))))))
|
||||
(inputs
|
||||
`(("boost" ,boost-for-mysql) ; fails with 1.69
|
||||
`(("boost" ,boost)
|
||||
("curl" ,curl)
|
||||
("expat" ,expat)
|
||||
("mesa" ,mesa)
|
||||
("openal" ,openal)
|
||||
("openscenegraph" ,openscenegraph-3.4)
|
||||
("openscenegraph" ,openscenegraph)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://home.flightgear.org/")
|
||||
(synopsis "Libraries for 3D simulations and games")
|
||||
|
|
@ -9286,41 +9303,42 @@ and also provides the base for the FlightGear Flight Simulator.")
|
|||
(version-major+minor version) "/"
|
||||
"flightgear-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0ya3vb539kwi1qrifqhsj5j3k4w6s06hrllp2vdzxf6id7cgf0hc"))
|
||||
(base32 "15sar94x13j2y1m6adgmz2q1m1i9bzj3sxqla6y3m9vyf33hc9zy"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; There are some bundled libraries.
|
||||
(for-each delete-file-recursively
|
||||
'("3rdparty/sqlite3/"))
|
||||
'("3rdparty/sqlite3/"
|
||||
"3rdparty/cppunit/"))
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "-DSYSTEM_SQLITE=ON"
|
||||
"-DSYSTEM_CPPUNIT=ON"
|
||||
(string-append "-DFG_DATA_DIR="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/flightgear"))
|
||||
;; TODO: test cannot be run because the "run_test_suite" executable
|
||||
;; does not seem to be built.
|
||||
;; TODO: test suite segfaults.
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-executable
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(wrap-program (string-append out "/bin/fgfs")
|
||||
`("QT_PLUGIN_PATH" ":" prefix
|
||||
,(map (lambda (label)
|
||||
(string-append (assoc-ref inputs label)
|
||||
"/lib/qt5/plugins"))
|
||||
'("qtbase" "qtdeclarative" "qtsvg")))
|
||||
`("QML2_IMPORT_PATH" ":" prefix
|
||||
,(map (lambda (label)
|
||||
(string-append (assoc-ref inputs label)
|
||||
"/lib/qt5/qml"))
|
||||
'("qtdeclarative" "qtsvg"))))
|
||||
#t)))
|
||||
(add-after 'unpack 'skip-some-tests
|
||||
(lambda _
|
||||
(substitute* "test_suite/unit_tests/Instrumentation/test_gps.hxx"
|
||||
(("CPPUNIT_TEST\\(testLongLegWestbound\\);" all)
|
||||
(string-append "// " all))
|
||||
(("CPPUNIT_TEST\\(testFinalLegCourse\\);" all)
|
||||
(string-append "// " all)))))
|
||||
(add-after 'build 'build-test-suite
|
||||
(lambda* args
|
||||
((assoc-ref %standard-phases 'build)
|
||||
#:make-flags (list "fgfs_test_suite"))))
|
||||
;; Test suite needs access to FGData so run it after 'install.
|
||||
(delete 'check)
|
||||
(add-after 'install-data 'check
|
||||
(assoc-ref %standard-phases 'check))
|
||||
(add-after 'install 'install-data
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((share (string-append (assoc-ref outputs "out") "/share/flightgear")))
|
||||
|
|
@ -9330,7 +9348,7 @@ and also provides the base for the FlightGear Flight Simulator.")
|
|||
"--strip-components=1")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("boost" ,boost-for-mysql) ; same as simgear
|
||||
`(("boost" ,boost)
|
||||
("dbus" ,dbus)
|
||||
("eudev" ,eudev)
|
||||
("freeglut" ,freeglut)
|
||||
|
|
@ -9338,7 +9356,7 @@ and also provides the base for the FlightGear Flight Simulator.")
|
|||
("glew" ,glew)
|
||||
("libpng" ,libpng)
|
||||
("openal" ,openal)
|
||||
("openscenegraph" ,openscenegraph-3.4)
|
||||
("openscenegraph" ,openscenegraph)
|
||||
("plib" ,plib)
|
||||
("qtbase" ,qtbase-5)
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
|
|
@ -9356,11 +9374,11 @@ and also provides the base for the FlightGear Flight Simulator.")
|
|||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/flightgear/release-"
|
||||
(version-major+minor version) "/"
|
||||
"FlightGear-" version "-data.tar.bz2"))
|
||||
"FlightGear-" version "-data.txz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04fv9za5zlyxlyfh6jx78y42l3jazvzl9dq2y6rzxqlcc9g5swhk"))))))
|
||||
(home-page "https://home.flightgear.org/")
|
||||
"0n5mw9vw1snab16c1y3i9ylkiv54az57bs2mvpq20hhg5hdiagqj"))))))
|
||||
(home-page "https://www.flightgear.org/")
|
||||
(synopsis "Flight simulator")
|
||||
(description "The goal of the FlightGear project is to create a
|
||||
sophisticated flight simulator framework for use in research or academic
|
||||
|
|
@ -12656,7 +12674,7 @@ disassembly of the DOS version, extended with new features.")
|
|||
(define-public fheroes2
|
||||
(package
|
||||
(name "fheroes2")
|
||||
(version "0.9.8")
|
||||
(version "0.9.9")
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
|
@ -12676,7 +12694,7 @@ disassembly of the DOS version, extended with new features.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1sc7rmyiciahxh5f6rarhil2hrw8q8sjdssh063grji50mlnrf6a"))))
|
||||
(base32 "030kfaagxy3i7bjvbx2nf05jmbbh5g2r52l17y9bl6vbfj67yvxy"))))
|
||||
(home-page "https://ihhub.github.io/fheroes2/")
|
||||
(synopsis "Turn-based strategy game engine")
|
||||
(description "@code{fheroes2} is an implementation of Heroes of Might and
|
||||
|
|
|
|||
|
|
@ -1181,7 +1181,7 @@ to create databases that are optimized for rendering/tile/map-services.")
|
|||
(define-public libosmium
|
||||
(package
|
||||
(name "libosmium")
|
||||
(version "2.15.6")
|
||||
(version "2.17.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1190,7 +1190,7 @@ to create databases that are optimized for rendering/tile/map-services.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2"))))
|
||||
(base32 "0xw71lrw4q4sdm51rl0zg87ywxfkxbw9h52zqim0z0xl5qh5q8xf"))))
|
||||
(build-system cmake-build-system)
|
||||
(propagated-inputs
|
||||
`(("boost" ,boost)
|
||||
|
|
@ -1214,7 +1214,7 @@ OpenStreetMap data.")
|
|||
(define-public osm2pgsql
|
||||
(package
|
||||
(name "osm2pgsql")
|
||||
(version "1.2.2")
|
||||
(version "1.5.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1223,7 +1223,7 @@ OpenStreetMap data.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1j35aa8qinhavliqi5pdm0viyi7lm5xyk402rliaxxs1r2hbsafn"))
|
||||
(base32 "0i18mskcs087dn3f3h9n7j0wafn8502m0h13mrjwin38xsz0crfj"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
|
||||
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
|
||||
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
|
||||
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
|
||||
|
|
@ -12003,7 +12003,7 @@ provided there is a DBus service present:
|
|||
(define-public parlatype
|
||||
(package
|
||||
(name "parlatype")
|
||||
(version "2.1")
|
||||
(version "3.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -12012,13 +12012,17 @@ provided there is a DBus service present:
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1c15ja0rwz3jj8bnqdq0nmqka39iwrhy8krdv2a2x8nl4shfpmv0"))))
|
||||
(base32 "0mvzagkg9kq2ji6mffi37mdjxmlj3wa65d4lcayij9hsmjlklnzs"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
#:tests? #f ;require internet access
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'skip-gtk-update-icon-cache
|
||||
(lambda _
|
||||
(substitute* "data/meson_post_install.py"
|
||||
(("gtk-update-icon-cache") "true"))))
|
||||
(add-after 'install 'wrap-parlatype
|
||||
;; Add gstreamer plugin provided in this package to system's
|
||||
;; plugins.
|
||||
|
|
@ -12029,8 +12033,7 @@ provided there is a DBus service present:
|
|||
":"
|
||||
(getenv "GST_PLUGIN_SYSTEM_PATH"))))
|
||||
(wrap-program (string-append out "/bin/parlatype")
|
||||
`("GST_PLUGIN_SYSTEM_PATH" ":" = (,gst-plugin-path))))
|
||||
#t)))))
|
||||
`("GST_PLUGIN_SYSTEM_PATH" ":" = (,gst-plugin-path)))))))))
|
||||
(native-inputs
|
||||
`(("appstream-glib" ,appstream-glib)
|
||||
("desktop-file-utils" ,desktop-file-utils) ;for desktop-file-validate
|
||||
|
|
@ -12043,10 +12046,11 @@ provided there is a DBus service present:
|
|||
("gst-plugins-good" ,gst-plugins-good)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gtk+" ,gtk+)
|
||||
("iso-codes" ,iso-codes)
|
||||
("pocketsphinx" ,pocketsphinx)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("sphinxbase" ,sphinxbase)))
|
||||
(home-page "http://gkarsay.github.io/parlatype/")
|
||||
(home-page "https://www.parlatype.org")
|
||||
(synopsis "GNOME audio player for transcription")
|
||||
(description "Parlatype is an audio player for the GNOME desktop
|
||||
environment. Its main purpose is the manual transcription of spoken
|
||||
|
|
|
|||
|
|
@ -1289,32 +1289,6 @@ virtual reality, scientific visualization and modeling.")
|
|||
;; LGPL 2.1, but with 4 exceptions. This version is called OSGPL.
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
;; We need this for simgear
|
||||
(define-public openscenegraph-3.4
|
||||
(package (inherit openscenegraph)
|
||||
(name "openscenegraph")
|
||||
(version "3.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/openscenegraph/OpenSceneGraph")
|
||||
(commit (string-append "OpenSceneGraph-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fbzg1ihjpxk6smlq80p3h3ggllbr16ihd2fxpfwzam8yr8yxip9"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openscenegraph)
|
||||
((#:configure-flags flags)
|
||||
`(cons
|
||||
;; The jpeg plugin requires conversion between integers and booleans
|
||||
"-DCMAKE_CXX_FLAGS=-fpermissive"
|
||||
,flags))))
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg-turbo)
|
||||
,@(package-inputs openscenegraph)))))
|
||||
|
||||
(define-public gr-framework
|
||||
(package
|
||||
(name "gr-framework")
|
||||
|
|
|
|||
|
|
@ -316,14 +316,14 @@ to @code{cabal repl}).")
|
|||
(define-public git-annex
|
||||
(package
|
||||
(name "git-annex")
|
||||
(version "8.20211011")
|
||||
(version "8.20211028")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"git-annex/git-annex-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "02s7921ihmbndp7lk1nhhiljky02ikq4qax4mhg609qjhbl6piwd"))))
|
||||
(base32 "0bff1bchp60hbslb9yaagvd7hym26w0c3gkkssm7sildwqazwpng"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
|||
|
|
@ -9873,8 +9873,7 @@ syntax and semantics as Perl 5.")
|
|||
(home-page "https://www.yesodweb.com/book/persistent")
|
||||
(synopsis "Type-safe, multi-backend data serialization for Haskell")
|
||||
(description "This Haskell package allows Haskell programs to access data
|
||||
storage systems like PostgreSQL, SQLite, MySQL and MongoDB in a type-safe
|
||||
way.")
|
||||
storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-persistent-sqlite
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
|
||||
;; The current "stable" kernels. That is, the most recently released major
|
||||
;; versions that are still supported upstream.
|
||||
(define-public linux-libre-5.14-version "5.14.15")
|
||||
(define-public linux-libre-5.14-version "5.14.16")
|
||||
(define-public linux-libre-5.14-gnu-revision "gnu")
|
||||
(define deblob-scripts-5.14
|
||||
(linux-libre-deblob-scripts
|
||||
|
|
@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7")))
|
||||
(define-public linux-libre-5.14-pristine-source
|
||||
(let ((version linux-libre-5.14-version)
|
||||
(hash (base32 "01m4qw1z7xn3ngsbm1bvcvikqpkjjr9n8585556wkmz9d469mwvl")))
|
||||
(hash (base32 "005wis2y5dhksb6n0r4p3xjldppmdnd360dhxa04rfc4z2qwn3f3")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.14)))
|
||||
|
|
@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
;; The "longterm" kernels — the older releases with long-term upstream support.
|
||||
;; Here are the support timelines:
|
||||
;; <https://www.kernel.org/category/releases.html>
|
||||
(define-public linux-libre-5.10-version "5.10.76")
|
||||
(define-public linux-libre-5.10-version "5.10.77")
|
||||
(define-public linux-libre-5.10-gnu-revision "gnu1")
|
||||
(define deblob-scripts-5.10
|
||||
(linux-libre-deblob-scripts
|
||||
|
|
@ -380,12 +380,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7")))
|
||||
(define-public linux-libre-5.10-pristine-source
|
||||
(let ((version linux-libre-5.10-version)
|
||||
(hash (base32 "140qkvs88b5zh6mxxzpf36z1r8bbvyh3yigripqjz1k236x0j2j8")))
|
||||
(hash (base32 "1hwgbcfv9wfx9ka25lsqjrnzskynfgmswcyp5vk14wnxq7glxdnk")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.10)))
|
||||
|
||||
(define-public linux-libre-5.4-version "5.4.156")
|
||||
(define-public linux-libre-5.4-version "5.4.157")
|
||||
(define-public linux-libre-5.4-gnu-revision "gnu1")
|
||||
(define deblob-scripts-5.4
|
||||
(linux-libre-deblob-scripts
|
||||
|
|
@ -395,12 +395,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
|
||||
(define-public linux-libre-5.4-pristine-source
|
||||
(let ((version linux-libre-5.4-version)
|
||||
(hash (base32 "1zkpqfhrc5n0yiij3jzvzywgabva53c8668f1ly1pkrzcbj77zh6")))
|
||||
(hash (base32 "0jl62j22vs59bc90mvzavv0ii9hvk436pbnrpqf3x9f8nfybngwz")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.4)))
|
||||
|
||||
(define-public linux-libre-4.19-version "4.19.214")
|
||||
(define-public linux-libre-4.19-version "4.19.215")
|
||||
(define-public linux-libre-4.19-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.19
|
||||
(linux-libre-deblob-scripts
|
||||
|
|
@ -410,12 +410,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
|
||||
(define-public linux-libre-4.19-pristine-source
|
||||
(let ((version linux-libre-4.19-version)
|
||||
(hash (base32 "0i08np4gxiks7chp6j328pdqb02apbba53mj4zvxb9v37qpxzqgz")))
|
||||
(hash (base32 "1czjqa5wbsmzgl7wwqlp9qbdig45ibq11m9pcykrjaclrgwn884y")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.19)))
|
||||
|
||||
(define-public linux-libre-4.14-version "4.14.253")
|
||||
(define-public linux-libre-4.14-version "4.14.254")
|
||||
(define-public linux-libre-4.14-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.14
|
||||
(linux-libre-deblob-scripts
|
||||
|
|
@ -425,12 +425,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
|
||||
(define-public linux-libre-4.14-pristine-source
|
||||
(let ((version linux-libre-4.14-version)
|
||||
(hash (base32 "1mgl55c8fa2ry4qp0phkdkzjhwfnkbhvi266n348kyjyqnjl234f")))
|
||||
(hash (base32 "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.14)))
|
||||
|
||||
(define-public linux-libre-4.9-version "4.9.288")
|
||||
(define-public linux-libre-4.9-version "4.9.289")
|
||||
(define-public linux-libre-4.9-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.9
|
||||
(linux-libre-deblob-scripts
|
||||
|
|
@ -440,12 +440,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
|
||||
(define-public linux-libre-4.9-pristine-source
|
||||
(let ((version linux-libre-4.9-version)
|
||||
(hash (base32 "0v5592v565bl924c23m1n7p5zddr0w7zn8m97pmikk6p7cyhjq9n")))
|
||||
(hash (base32 "19kz74qgw5yzfinnsvljmn2zm855lr4cxgfpn8gwljmkspyx1hm5")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.9)))
|
||||
|
||||
(define-public linux-libre-4.4-version "4.4.290")
|
||||
(define-public linux-libre-4.4-version "4.4.291")
|
||||
(define-public linux-libre-4.4-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.4
|
||||
(linux-libre-deblob-scripts
|
||||
|
|
@ -455,7 +455,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
|
||||
(define-public linux-libre-4.4-pristine-source
|
||||
(let ((version linux-libre-4.4-version)
|
||||
(hash (base32 "1dcx58nmzkcc5nz2b5b7mgw4w7y28v3s9wd8h78czdqfa0kxrl20")))
|
||||
(hash (base32 "0lbbvv3ha4d8nwzjh8bdk0aqyd12w6gw0nsxsdnp8pbmnndgb9vh")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.4)))
|
||||
|
|
|
|||
|
|
@ -1734,14 +1734,14 @@ addons which can add many functionalities to the base client.")
|
|||
(define-public msmtp
|
||||
(package
|
||||
(name "msmtp")
|
||||
(version "1.8.18")
|
||||
(version "1.8.19")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://marlam.de/msmtp/releases/"
|
||||
"/msmtp-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "19b0anfrkg4lqp4h13qi2rqgwvipp1ga0id237nwbp7b6ypn5z0l"))))
|
||||
(base32 "0ssj8izcw1fywihlip6wljd9i41w23cy0vp69sz4v1vn26cf389l"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libsecret" ,libsecret)
|
||||
|
|
@ -1772,6 +1772,8 @@ addons which can add many functionalities to the base client.")
|
|||
;; connection, instead look up and ping debian.org.
|
||||
(substitute* (string-append bin "/msmtpq")
|
||||
(("EMAIL_CONN_TEST=n") "EMAIL_CONN_TEST=p"))))))))
|
||||
(properties
|
||||
'((release-monitoring-url . "https://marlam.de/msmtp/download/")))
|
||||
(synopsis
|
||||
"Simple and easy to use SMTP client with decent sendmail compatibility")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 EuAndreh <eu@euandre.org>
|
||||
;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
|
||||
;;; Copyright © 2021 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -24,7 +26,7 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages markup)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
|
|
@ -34,6 +36,7 @@
|
|||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages perl)
|
||||
|
|
@ -67,7 +70,7 @@
|
|||
(description "Hoedown is a standards compliant, fast, secure markdown
|
||||
processing library written in C.")
|
||||
(home-page "https://github.com/hoedown/hoedown")
|
||||
(license expat)))
|
||||
(license license:expat)))
|
||||
|
||||
(define-public markdown
|
||||
(package
|
||||
|
|
@ -110,8 +113,38 @@ processing library written in C.")
|
|||
"Markdown is a text-to-HTML conversion tool for web writers. It allows
|
||||
you to write using an easy-to-read, easy-to-write plain text format, then
|
||||
convert it to structurally valid XHTML (or HTML).")
|
||||
(license (non-copyleft "file://License.text"
|
||||
"See License.text in the distribution."))))
|
||||
(license (license:non-copyleft "file://License.text"
|
||||
"See License.text in the distribution."))))
|
||||
|
||||
(define-public lowdown
|
||||
(package
|
||||
(name "lowdown")
|
||||
(version "0.10.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "15v2kk4ffqw3n6y6n9plch4qcib3ynnhw0ih8wn2v9qgn4jssp5p"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "regress"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(invoke "./configure"
|
||||
(string-append "PREFIX=" out)
|
||||
(string-append "MANDIR=" out "/share/man"))))))))
|
||||
(native-inputs
|
||||
`(("which" ,which)))
|
||||
(home-page "https://kristaps.bsd.lv/lowdown/")
|
||||
(synopsis "Simple Markdown translator")
|
||||
(description "Lowdown is a Markdown translator producing HTML5,
|
||||
roff documents in the ms and man formats, LaTeX, gemini, and terminal output.")
|
||||
(license license:isc)))
|
||||
|
||||
(define-public discount
|
||||
(package
|
||||
|
|
@ -157,7 +190,7 @@ convert it to structurally valid XHTML (or HTML).")
|
|||
"Discount is a markdown implementation, written in C. It provides a
|
||||
@command{markdown} command, and a library.")
|
||||
(home-page "https://www.pell.portland.or.us/~orc/Code/discount/")
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public perl-text-markdown-discount
|
||||
(package
|
||||
|
|
@ -202,7 +235,7 @@ implementation.
|
|||
use Text::Markdown::Discount;
|
||||
my $html = markdown($text)
|
||||
@end example")
|
||||
(license perl-license)))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public cmark
|
||||
(package
|
||||
|
|
@ -242,7 +275,7 @@ for parsing and rendering CommonMark.")
|
|||
;; cmark is distributed with a BSD-2 license, but some components are Expat
|
||||
;; licensed. The CommonMark specification is Creative Commons CC-BY-SA 4.0
|
||||
;; licensed. See 'COPYING' in the source distribution for more information.
|
||||
(license (list bsd-2 expat cc-by-sa4.0))))
|
||||
(license (list license:bsd-2 license:expat license:cc-by-sa4.0))))
|
||||
|
||||
(define-public smu
|
||||
(package
|
||||
|
|
@ -278,7 +311,7 @@ amount of indents it scales just great.
|
|||
Smu was started as a rewrite of Markdown but became something more
|
||||
lightweight and consistent. The biggest difference between Markdown
|
||||
and smu is that smu doesn't support reference style links.")
|
||||
(license x11)))
|
||||
(license license:x11)))
|
||||
|
||||
(define-public md4c
|
||||
(package
|
||||
|
|
@ -300,7 +333,7 @@ and smu is that smu doesn't support reference style links.")
|
|||
(description "MD4C is a C Markdown parser with a
|
||||
SAX-like interface. It is compliant to the CommonMark specification,
|
||||
with a few extensions.")
|
||||
(license expat)))
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-mistletoe
|
||||
(package
|
||||
|
|
@ -322,4 +355,4 @@ parser that supports definitions of custom tokens.
|
|||
Parsing Markdown into an abstract syntax tree also allows @code{mistletoe} to
|
||||
swap out renderers for different output formats, without touching any of the
|
||||
core components.")
|
||||
(license expat)))
|
||||
(license license:expat)))
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
|
||||
;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
|
|
@ -2986,4 +2986,121 @@ API. Mattermost is not required.")
|
|||
(home-page "https://github.com/42wim/matterbridge")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public weechat-matrix
|
||||
(package
|
||||
(name "weechat-matrix")
|
||||
(version "0.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/poljar/weechat-matrix")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1iv55n4k05139f7jzkhczgw4qp6qwilrvfsy3c6v2m1kxffj12d3"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'build)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((weechat-python (string-append (assoc-ref outputs "out")
|
||||
"/share/weechat/python")))
|
||||
;; Avoid circular import by renaming the matrix module to
|
||||
;; weechat_matrix.
|
||||
(substitute* (cons "main.py"
|
||||
(append (find-files "matrix")
|
||||
(find-files "tests")))
|
||||
(("from matrix") "from weechat_matrix")
|
||||
(("import matrix") "import weechat_matrix"))
|
||||
;; Install python modules.
|
||||
(invoke "make" "install-lib"
|
||||
(string-append "INSTALLDIR="
|
||||
(site-packages inputs outputs)
|
||||
"/weechat_matrix"))
|
||||
;; Extend PYTHONPATH to find installed python modules.
|
||||
(add-installed-pythonpath inputs outputs)
|
||||
;; Augment sys.path so that dependencies are found.
|
||||
(substitute* "main.py"
|
||||
(("import os\n" all)
|
||||
(apply string-append
|
||||
all
|
||||
"import sys\n"
|
||||
(map (lambda (path)
|
||||
(string-append "sys.path.append('" path "')\n"))
|
||||
(string-split (getenv "PYTHONPATH") #\:)))))
|
||||
;; Install script.
|
||||
(mkdir-p weechat-python)
|
||||
(copy-file "main.py"
|
||||
(string-append weechat-python "/matrix.py")))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "pytest")))))))
|
||||
(inputs
|
||||
`(("python-matrix-nio" ,python-matrix-nio)
|
||||
("python-pygments" ,python-pygments)
|
||||
("python-pyopenssl" ,python-pyopenssl)
|
||||
("python-webcolors" ,python-webcolors)))
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest)))
|
||||
(home-page "https://github.com/poljar/weechat-matrix")
|
||||
(synopsis "Weechat Matrix protocol script")
|
||||
(description "@code{weechat-matrix} is a Python plugin for Weechat that lets
|
||||
Weechat communicate over the Matrix protocol.")
|
||||
(license license:isc)))
|
||||
|
||||
(define-public weechat-wee-slack
|
||||
(package
|
||||
(name "weechat-wee-slack")
|
||||
(version "2.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/wee-slack/wee-slack")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0xfklr0gsc9jgxfyrrb2j756lclz9g8imcb0pk0xgyj8mhsw23zk"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'build)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Augment sys.path so that dependencies are found.
|
||||
(substitute* "wee_slack.py"
|
||||
(("import sys\n" all)
|
||||
(apply string-append
|
||||
all
|
||||
(map (lambda (path)
|
||||
(string-append "sys.path.append('" path "')\n"))
|
||||
(string-split (getenv "PYTHONPATH") #\:)))))
|
||||
;; Install script.
|
||||
(install-file "wee_slack.py"
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/share/weechat/python"))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "pytest")))))))
|
||||
(inputs
|
||||
`(("python-websocket-client" ,python-websocket-client)))
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest)))
|
||||
(home-page "https://github.com/wee-slack/wee-slack")
|
||||
(synopsis "Weechat Slack script")
|
||||
(description "@code{weechat-wee-slack} is a WeeChat native client for
|
||||
Slack. It provides supplemental features only available in the web/mobile
|
||||
clients such as synchronizing read markers, typing notification, threads (and
|
||||
more)! It connects via the Slack API, and maintains a persistent websocket
|
||||
for notification of events.")
|
||||
(license license:expat)))
|
||||
|
||||
;;; messaging.scm ends here
|
||||
|
|
|
|||
|
|
@ -6079,7 +6079,7 @@ short-time Fourier transform, available as LV2 audio plugin and JACK client.")
|
|||
(define-public x42-plugins
|
||||
(package
|
||||
(name "x42-plugins")
|
||||
(version "20200714")
|
||||
(version "20211016")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -6087,7 +6087,7 @@ short-time Fourier transform, available as LV2 audio plugin and JACK client.")
|
|||
(string-append "https://gareus.org/misc/x42-plugins/x42-plugins-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl"))))
|
||||
(base32 "11bf6q42ihyk4qxwf83y0847zzyl65kwpbk3hmyz0f0ykil5fsb7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no "check" target
|
||||
|
|
@ -6096,13 +6096,10 @@ short-time Fourier transform, available as LV2 audio plugin and JACK client.")
|
|||
"LIBZITACONVOLVER=-lzita-convolver"
|
||||
(string-append "FONTFILE="
|
||||
(assoc-ref %build-inputs "font-dejavu")
|
||||
"/share/fonts/truetype/DejaVuSans-Bold.ttf"))
|
||||
"/share/fonts/truetype/DejaVuSans-Bold.ttf")
|
||||
(string-append "CC=" ,(cc-for-target)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'set-CC-variable
|
||||
(lambda _
|
||||
(setenv "CC" "gcc")
|
||||
#t))
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
|
|
|
|||
|
|
@ -778,7 +778,7 @@ the opam file format.")
|
|||
(define-public opam
|
||||
(package
|
||||
(name "opam")
|
||||
(version "2.1.0")
|
||||
(version "2.1.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -787,7 +787,7 @@ the opam file format.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"12l7l4pbzy71k1yc7ym5aczajszvc9bqkdnfg8xhqc8ch8j1h1lj"))))
|
||||
"12cxpnkv8n90g66b31c7hsxl2yy537fgf19xhr6zn4n024bh6dh3"))))
|
||||
(build-system dune-build-system)
|
||||
(arguments
|
||||
`(#:test-target "."
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
From 3006390c0058f06c255d9850327163aebcdc3b40 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Hodina <phodina@protonmail.com>
|
||||
Date: Mon, 11 Oct 2021 22:35:39 +0200
|
||||
Subject: [PATCH] Enable unstable features.
|
||||
|
||||
|
||||
diff --git a/src/main.rs b/src/main.rs
|
||||
index d9e964b..820e22e 100644
|
||||
--- a/src/main.rs
|
||||
+++ b/src/main.rs
|
||||
@@ -1,3 +1,6 @@
|
||||
+#![feature(bool_to_option)]
|
||||
+#![feature(clamp)]
|
||||
+
|
||||
#[macro_use]
|
||||
mod de;
|
||||
#[macro_use]
|
||||
--
|
||||
2.33.0
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
Don't use g_memdup() which is removed in newer versions of GLib.
|
||||
|
||||
See <https://github.com/storaged-project/libblockdev/pull/623>.
|
||||
|
||||
Taken from upstream:
|
||||
https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940
|
||||
|
||||
diff --git a/src/lib/plugin_apis/vdo.api b/src/lib/plugin_apis/vdo.api
|
||||
--- a/src/lib/plugin_apis/vdo.api
|
||||
+++ b/src/lib/plugin_apis/vdo.api
|
||||
@@ -170,7 +170,22 @@ void bd_vdo_stats_free (BDVDOStats *stats) {
|
||||
* Deprecated: 2.24: Use LVM-VDO integration instead.
|
||||
*/
|
||||
BDVDOStats* bd_vdo_stats_copy (BDVDOStats *stats) {
|
||||
- return g_memdup (stats, sizeof (BDVDOStats));
|
||||
+ if (stats == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ BDVDOStats *new_stats = g_new0 (BDVDOStats, 1);
|
||||
+
|
||||
+ new_stats->block_size = stats->block_size;
|
||||
+ new_stats->logical_block_size = stats->logical_block_size;
|
||||
+ new_stats->physical_blocks = stats->physical_blocks;
|
||||
+ new_stats->data_blocks_used = stats->data_blocks_used;
|
||||
+ new_stats->overhead_blocks_used = stats->overhead_blocks_used;
|
||||
+ new_stats->logical_blocks_used = stats->logical_blocks_used;
|
||||
+ new_stats->used_percent = stats->used_percent;
|
||||
+ new_stats->saving_percent = stats->saving_percent;
|
||||
+ new_stats->write_amplification_ratio = stats->write_amplification_ratio;
|
||||
+
|
||||
+ return new_stats;
|
||||
}
|
||||
|
||||
GType bd_vdo_stats_get_type () {
|
||||
diff --git a/src/plugins/vdo.c b/src/plugins/vdo.c
|
||||
--- a/src/plugins/vdo.c
|
||||
+++ b/src/plugins/vdo.c
|
||||
@@ -81,7 +81,22 @@ void bd_vdo_stats_free (BDVDOStats *stats) {
|
||||
}
|
||||
|
||||
BDVDOStats* bd_vdo_stats_copy (BDVDOStats *stats) {
|
||||
- return g_memdup (stats, sizeof (BDVDOStats));
|
||||
+ if (stats == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ BDVDOStats *new_stats = g_new0 (BDVDOStats, 1);
|
||||
+
|
||||
+ new_stats->block_size = stats->block_size;
|
||||
+ new_stats->logical_block_size = stats->logical_block_size;
|
||||
+ new_stats->physical_blocks = stats->physical_blocks;
|
||||
+ new_stats->data_blocks_used = stats->data_blocks_used;
|
||||
+ new_stats->overhead_blocks_used = stats->overhead_blocks_used;
|
||||
+ new_stats->logical_blocks_used = stats->logical_blocks_used;
|
||||
+ new_stats->used_percent = stats->used_percent;
|
||||
+ new_stats->saving_percent = stats->saving_percent;
|
||||
+ new_stats->write_amplification_ratio = stats->write_amplification_ratio;
|
||||
+
|
||||
+ return new_stats;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
|
||||
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -209,7 +210,7 @@ code.")
|
|||
(define-public protozero
|
||||
(package
|
||||
(name "protozero")
|
||||
(version "1.6.8")
|
||||
(version "1.7.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -218,7 +219,7 @@ code.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1hfijpfylf1c71wa3mk70gjc88b6k1q7cxb87cwqdflw5q2x8ma6"))))
|
||||
(base32 "0fdihfl5j68wayjjxvpvhvnjq1anzcfnfl09f68wpzbkg3zmhblz"))))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "https://github.com/mapbox/protozero")
|
||||
(synopsis "Minimalistic protocol buffer decoder and encoder in C++")
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
|
||||
;;; Copyright © 2021 Pradana Aumars <paumars@courrier.dev>
|
||||
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -6242,3 +6243,79 @@ communicate with Microsoft Azure Storage services.")
|
|||
comments, or tags from HTML snippets, extract base url from HTML snippets,
|
||||
translate entities on HTML strings, among other things.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-webcolors
|
||||
(package
|
||||
(name "python-webcolors")
|
||||
(version "1.11.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "webcolors" version))
|
||||
(sha256
|
||||
(base32 "1rkda75h2p65zx6r84c9mjavn4xpviqvqrklvdvcklapd5in1wvn"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
|
||||
(when tests?
|
||||
(add-installed-pythonpath inputs outputs)
|
||||
(invoke "pytest")))))))
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest)))
|
||||
(home-page "https://github.com/ubernostrum/webcolors")
|
||||
(synopsis "HTML/CSS color definitions library")
|
||||
(description "@code{python-webcolors} is a module for working with
|
||||
HTML/CSS color definitions. Normalizing and converting between the following
|
||||
formats is supported.
|
||||
@itemize
|
||||
@item Specification-defined color names
|
||||
@item Six-digit hexadecimal
|
||||
@item Three-digit hexadecimal
|
||||
@item Integer rgb() triplet
|
||||
@item Percentage rgb() triplet
|
||||
@end itemize
|
||||
Only the RGB colorspace is supported. Conversion to/from the HSL colorspace
|
||||
can be handled by the @code{colorsys} module in the Python standard library.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-flask-combo-jsonapi
|
||||
(package
|
||||
(name "python-flask-combo-jsonapi")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/AdCombo/flask-combo-jsonapi")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "07fhcjiyif80z1vyh35za29sqx1mmqh568jrbrrs675j4a797sj1"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-flask" ,python-flask)
|
||||
("python-marshmallow" ,python-marshmallow-3.2)
|
||||
("python-marshmallow-jsonapi" ,python-marshmallow-jsonapi)
|
||||
("python-simplejson" ,python-simplejson)
|
||||
("python-sqlalchemy" ,python-sqlalchemy-1.3)
|
||||
("python-apispec" ,python-apispec)
|
||||
("python-simplejson" ,python-simplejson)
|
||||
("python-six" ,python-six)))
|
||||
(native-inputs
|
||||
`(("python-coverage" ,python-coverage)
|
||||
("python-coveralls" ,python-coveralls)
|
||||
("python-pytest" ,python-pytest)
|
||||
("python-pytest-runner" ,python-pytest-runner)))
|
||||
(home-page "https://github.com/AdCombo/flask-combo-jsonapi")
|
||||
(synopsis "Flask extension to quickly create JSON:API 1.0 REST Web APIs")
|
||||
(description
|
||||
"Flask-COMBO-JSONAPI is a Python Flask extension for building REST Web APIs
|
||||
compliant with the @uref{https://jsonapi.org, JSON:API 1.0} specification.
|
||||
|
||||
It tries to combine the power of Flask-Restless with the flexibility of
|
||||
Flask-RESTful to quickly build APIs that fit the complexity of existing
|
||||
real-life projects with legacy data and diverse storage providers.")
|
||||
(license license:expat)))
|
||||
|
|
|
|||
|
|
@ -19203,11 +19203,52 @@ address is valid and really exists.")
|
|||
("python-pytz" ,python-pytz)))
|
||||
(home-page "https://github.com/marshmallow-code/marshmallow")
|
||||
(synopsis "Convert complex datatypes to and from native
|
||||
Python datatypes.")
|
||||
Python datatypes")
|
||||
(description "@code{marshmallow} provides a library for converting
|
||||
complex datatypes to and from native Python datatypes.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-marshmallow-3.2
|
||||
(package
|
||||
(inherit python-marshmallow)
|
||||
(version "3.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "marshmallow" version))
|
||||
(sha256
|
||||
(base32 "1w18klwj0z9bqxj252qpj1hz8l46nl27sbc89rkajc7mln73wbws"))))))
|
||||
|
||||
(define-public python-marshmallow-jsonapi
|
||||
(package
|
||||
(name "python-marshmallow-jsonapi")
|
||||
(version "0.24.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "marshmallow-jsonapi" version))
|
||||
(sha256
|
||||
(base32 "1d9pxcgmln4gls99vwj1h24qv0lz7fb2jqmqrsiv1pid1snc125x"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-marshmallow" ,python-marshmallow-3.2)))
|
||||
(native-inputs
|
||||
`(("python-faker" ,python-faker)
|
||||
("python-flake8" ,python-flake8)
|
||||
("python-flake8-bugbear" ,python-flake8-bugbear)
|
||||
("python-flask" ,python-flask)
|
||||
("python-mock" ,python-mock)
|
||||
("python-pre-commit" ,python-pre-commit)
|
||||
("python-pytest" ,python-pytest)
|
||||
("python-tox" ,python-tox)))
|
||||
(home-page "https://github.com/marshmallow-code/marshmallow-jsonapi")
|
||||
(synopsis "JSON:API 1.0 formatting with Marshmallow")
|
||||
(description
|
||||
"The marshmallow-jsonapi package provides a simple way to produce
|
||||
@uref{https://jsonapi.org, JSON:API}-compliant data in any Python Web framework.
|
||||
It includes optional utilities to integrate with Flask.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-apispec
|
||||
(package
|
||||
(name "python-apispec")
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -34,6 +35,8 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages crates-io)
|
||||
|
|
@ -41,12 +44,14 @@
|
|||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages jemalloc)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages ssh)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages rust)
|
||||
#:use-module (gnu packages tls)
|
||||
|
|
@ -439,6 +444,78 @@ characters, ASCII whitespace characters, other ASCII characters and non-ASCII.")
|
|||
"This package provides a command-line benchmarking tool.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public i3status-rust
|
||||
(package
|
||||
(name "i3status-rust")
|
||||
(version "0.20.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/greshake/i3status-rust")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "i3status-rust-enable-unstable-features.patch"))
|
||||
(sha256
|
||||
(base32 "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s"))))
|
||||
(build-system cargo-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
("dbus" ,dbus)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("openssl" ,openssl)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:features '("pulseaudio" "libpulse-binding")
|
||||
#:install-source? #f
|
||||
#:cargo-inputs
|
||||
(("rust-chrono" ,rust-chrono-0.4)
|
||||
("rust-chrono-tz" ,rust-chrono-tz-0.5)
|
||||
("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
|
||||
("rust-curl" ,rust-curl-0.4)
|
||||
("rust-dbus" ,rust-dbus-0.9)
|
||||
("rust-dbus-tree" ,rust-dbus-tree-0.9)
|
||||
("rust-lazy-static" ,rust-lazy-static-1)
|
||||
("rust-nix" ,rust-nix-0.20)
|
||||
("rust-nl80211" ,rust-nl80211-0.0.2)
|
||||
("rust-serde" ,rust-serde-1)
|
||||
("rust-serde-derive" ,rust-serde-derive-1)
|
||||
("rust-serde-json" ,rust-serde-json-1)
|
||||
("rust-signal-hook" ,rust-signal-hook-0.3)
|
||||
("rust-swayipc" ,rust-swayipc-2)
|
||||
("rust-toml" ,rust-toml-0.5)
|
||||
("rust-cpuprofiler" ,rust-cpuprofiler-0.0)
|
||||
("rust-inotify" ,rust-inotify-0.9)
|
||||
("rust-libpulse-binding" ,rust-libpulse-binding-2)
|
||||
("rust-maildir" ,rust-maildir-0.5)
|
||||
("rust-notmuch" ,rust-notmuch-0.6)
|
||||
("rust-progress" ,rust-progress-0.2))
|
||||
#:cargo-development-inputs
|
||||
(("rust-assert-fs" ,rust-assert-fs-1))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-resources-path
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((resources (string-append %output "/share")))
|
||||
(substitute* "src/util.rs"
|
||||
(("/usr/share/i3status-rust") resources)))))
|
||||
(add-after 'install 'install-resources
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(copy-recursively "files" (string-append %output "/share"))))
|
||||
(add-after 'unpack 'enable-unstable-features
|
||||
(lambda _
|
||||
(setenv "RUSTC_BOOTSTRAP" "1")
|
||||
#t)))))
|
||||
(home-page "https://github.com/greshake/i3status-rust")
|
||||
(synopsis "i3status, written in pure Rust")
|
||||
(description "@code{i3status-rs} is a feature-rich and resource-friendly
|
||||
replacement for i3status, written in pure Rust. It provides a way to display
|
||||
@code{blocks} of system information (time, battery status, volume, etc) on the i3
|
||||
bar. It is also compatible with sway.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public ripgrep
|
||||
(package
|
||||
(name "ripgrep")
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
|
|||
(define r-with-tests
|
||||
(package
|
||||
(name "r-with-tests")
|
||||
(version "4.1.1")
|
||||
(version "4.1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cran/src/base/R-"
|
||||
|
|
@ -199,7 +199,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji"))))
|
||||
"1brqmc7mmb0z94kcs4crgl6v9a6sxhm9fm3y177d81vjkxg24di0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:disallowed-references (,tzdata-for-tests)
|
||||
|
|
@ -216,8 +216,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
|
|||
;; This ensures that Guix can detect embedded store references;
|
||||
;; see bug #28157 for details.
|
||||
(substitute* "src/library/base/makebasedb.R"
|
||||
(("compress = TRUE") "compress = FALSE"))
|
||||
#t))
|
||||
(("compress = TRUE") "compress = FALSE"))))
|
||||
(add-before 'configure 'patch-coreutils-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((uname-bin (search-input-file inputs "/bin/uname"))
|
||||
|
|
@ -225,8 +224,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
|
|||
(substitute* "src/scripts/R.sh.in"
|
||||
(("uname") uname-bin))
|
||||
(substitute* "src/unix/sys-std.c"
|
||||
(("rm -Rf ") (string-append rm-bin " -Rf "))))
|
||||
#t))
|
||||
(("rm -Rf ") (string-append rm-bin " -Rf "))))))
|
||||
(add-after 'unpack 'build-reproducibly
|
||||
(lambda _
|
||||
;; The documentation contains time stamps to demonstrate
|
||||
|
|
@ -285,17 +283,17 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
|
|||
;; that is suspected to be the culprit.
|
||||
(substitute* "src/library/methods/DESCRIPTION.in"
|
||||
(("\\(2008\\)\n") "(2008) ")
|
||||
((" ``Software") "``Software"))
|
||||
#t))
|
||||
((" ``Software") "``Software")
|
||||
(("Data Analysis:.") "Data Analysis:\n")
|
||||
(("Programming with R") " Programming with R"))))
|
||||
(add-before 'build 'set-locales
|
||||
(lambda _
|
||||
(setlocale LC_ALL "C")
|
||||
(setenv "LC_ALL" "C")
|
||||
#t))
|
||||
(setenv "LC_ALL" "C")))
|
||||
(add-before 'configure 'set-default-pager
|
||||
;; Set default pager to "cat", because otherwise it is "false",
|
||||
;; making "help()" print nothing at all.
|
||||
(lambda _ (setenv "PAGER" "cat") #t))
|
||||
(lambda _ (setenv "PAGER" "cat")))
|
||||
(add-before 'check 'set-timezone
|
||||
;; Some tests require the timezone to be set. However, the
|
||||
;; timezone may not just be "UTC", or else a brittle regression
|
||||
|
|
@ -638,13 +636,13 @@ nonlinear mixed-effects models.")
|
|||
(define-public r-mgcv
|
||||
(package
|
||||
(name "r-mgcv")
|
||||
(version "1.8-37")
|
||||
(version "1.8-38")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mgcv" version))
|
||||
(sha256
|
||||
(base32 "14gw714xcyvgrbajijmyd4v8zs84i701g7gyld6z8p7677dgc8w8"))))
|
||||
(base32 "1fyx8b0xjyx75mp90v314gayzydkca5y90p76jnwxzfnhxbys4nd"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-matrix" ,r-matrix)
|
||||
|
|
@ -1047,14 +1045,14 @@ solution for sending email, including attachments, from within R.")
|
|||
(define-public r-stringi
|
||||
(package
|
||||
(name "r-stringi")
|
||||
(version "1.7.4")
|
||||
(version "1.7.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "stringi" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mda4612sc573zabsvygnla3vpnf3mql58fc9j450540h6hlwfv2"))))
|
||||
"0r959gzyqkq9683qdfy95g9plwpj3c73n9lhf0a6byybw4scq519"))))
|
||||
(build-system r-build-system)
|
||||
(inputs `(("icu4c" ,icu4c)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
|
|
@ -1386,13 +1384,13 @@ supported via Andre Simon's highlight package.")
|
|||
(define-public r-mime
|
||||
(package
|
||||
(name "r-mime")
|
||||
(version "0.11")
|
||||
(version "0.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mime" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1h7fz0rqnp970r9q0d95qcxpxm9mb98rqhcdncx0w2qdkyj2fm11"))))
|
||||
"0j9qbq9jfsp61h2d0xmb87pa2wi8nhb1h2wih7l5drf1sr8i0059"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/yihui/mime")
|
||||
(synopsis "R package to map filenames to MIME types")
|
||||
|
|
@ -1449,13 +1447,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.")
|
|||
(define-public r-knitr
|
||||
(package
|
||||
(name "r-knitr")
|
||||
(version "1.34")
|
||||
(version "1.36")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "knitr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0p6jdicyqknrqilcjm2h4r6vza5lpzccnsdirj92jb3ljg10b0by"))))
|
||||
"0hcf5gii0qlvv15f86y6h08qp0hd9lcrykzj0mdfjdfi52sgbkkf"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-evaluate" ,r-evaluate)
|
||||
|
|
@ -1602,13 +1600,13 @@ R packages that praise their users.")
|
|||
(define-public r-testthat
|
||||
(package
|
||||
(name "r-testthat")
|
||||
(version "3.0.4")
|
||||
(version "3.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "testthat" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0iqizv2gpv9fg766qv8hbkmc6c5i9xcfrmq9k5m2550p28zff2w3"))))
|
||||
"11s98q0gm37z1cqzwvdm9pq26v0zbdq9vc5ssl1nsxhsi42v2577"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-brio" ,r-brio)
|
||||
|
|
@ -1664,13 +1662,13 @@ defined in different packages.")
|
|||
(define-public r-rlang
|
||||
(package
|
||||
(name "r-rlang")
|
||||
(version "0.4.11")
|
||||
(version "0.4.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rlang" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pfm24jjkxzdb5qcbc05dcjxyk69zpfr5jv4xakqh1xh41mr43kl"))))
|
||||
"05cr08smr8dlk10m810rw4qi1yhgnny83rwkxib0l4my71br29ia"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "http://rlang.tidyverse.org")
|
||||
(synopsis "Functions for base types, core R and Tidyverse features")
|
||||
|
|
@ -1682,14 +1680,14 @@ like tidy evaluation.")
|
|||
(define-public r-tibble
|
||||
(package
|
||||
(name "r-tibble")
|
||||
(version "3.1.4")
|
||||
(version "3.1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "tibble" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zqpg2haph0qi1x5r6wr083xckab9gw21jbr9spcr8xdf43hx1vk"))))
|
||||
"1ryv1r3cah1s8dyqdhcb0yl81r384jvgc4d1q9zwsrrsd2x8fqys"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-ellipsis" ,r-ellipsis)
|
||||
|
|
@ -1870,13 +1868,13 @@ times.")
|
|||
(define-public r-data-table
|
||||
(package
|
||||
(name "r-data-table")
|
||||
(version "1.14.0")
|
||||
(version "1.14.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "data.table" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0kgbvap5v2spnkz3dwfm4jh4qcpvbzdn9s8bzfnhzabz9qjdxw8k"))))
|
||||
"0arx5wna0sh0vf5q8rjhh8nqdmnvg2pdpbhljl9l0x4kwm8vjhgp"))))
|
||||
(build-system r-build-system)
|
||||
(inputs
|
||||
`(("zlib" ,zlib)))
|
||||
|
|
@ -2284,14 +2282,14 @@ module, Java Server Pages, and Python's psp module.")
|
|||
(define-public r-desc
|
||||
(package
|
||||
(name "r-desc")
|
||||
(version "1.3.0")
|
||||
(version "1.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "desc" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1sw4vya3l971gpccq4gnjywgbl73bgx8la18l0wy617qv94f905y"))))
|
||||
"0jfnwn1kpiill8v4hmzdk90yz4gk2ha0prr2p0hq36s40v3y8842"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-crayon" ,r-crayon)
|
||||
|
|
@ -2557,13 +2555,13 @@ time-of-day values, based on the @code{difftime} class.")
|
|||
(define-public r-readr
|
||||
(package
|
||||
(name "r-readr")
|
||||
(version "2.0.1")
|
||||
(version "2.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "readr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cj5k3ykkhixgdsqm1gnmpc0d8z04l3fhvm2dr5xp7cpmhgsrpfr"))))
|
||||
"05bnvcc55i0xjilfrqx3700mwiz8sgihq1wxlbvvr8nxa7bmxc4q"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-cli" ,r-cli)
|
||||
|
|
@ -2650,13 +2648,13 @@ well as additional utilities such as panel and axis annotation functions.")
|
|||
(define-public r-rcpparmadillo
|
||||
(package
|
||||
(name "r-rcpparmadillo")
|
||||
(version "0.10.6.0.0")
|
||||
(version "0.10.7.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "RcppArmadillo" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1bcx8fk5l5mmwb6cw36ndvld9v3amkz6vyc19059dw0xp7mxx04v"))))
|
||||
"1x35xb5yfslsdpaz9msl5p9f7gilnbkhwvq7pbycwasvkp2fma01"))))
|
||||
(properties `((upstream-name . "RcppArmadillo")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -4002,13 +4000,13 @@ vignettes.")
|
|||
(define-public r-mvtnorm
|
||||
(package
|
||||
(name "r-mvtnorm")
|
||||
(version "1.1-2")
|
||||
(version "1.1-3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mvtnorm" version))
|
||||
(sha256
|
||||
(base32
|
||||
"05wh7mprf2sim2kxh3d72pdcmml6vbikzxavws1dq6mxwlsy2p7j"))))
|
||||
"0j14q2bkc14v35s5k03sw44zsssrd2qjljlwzj014qxs74hk0kpz"))))
|
||||
(build-system r-build-system)
|
||||
(native-inputs
|
||||
`(("gfortran" ,gfortran)))
|
||||
|
|
@ -4050,13 +4048,13 @@ memory usage.")
|
|||
(define-public r-viridis
|
||||
(package
|
||||
(name "r-viridis")
|
||||
(version "0.6.1")
|
||||
(version "0.6.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "viridis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fyax36ycjiypcnxhrv58pq67qv03vfg4lx822d38jpjly54q128"))))
|
||||
"048kwhbhd49g86cq11fl7vm0whwhjl5gs9xjn040lwcjv78qrdb9"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-ggplot2" ,r-ggplot2)
|
||||
|
|
@ -4134,14 +4132,14 @@ selection.")
|
|||
(define-public r-tidyr
|
||||
(package
|
||||
(name "r-tidyr")
|
||||
(version "1.1.3")
|
||||
(version "1.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "tidyr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cpbrvr759z8p7r9lpkjhj2dcdymsbnaib0rma9b4jb7i3qzmh2a"))))
|
||||
"0h8jfsmn4r7zgfyjmg2qkjd54n0sncq07xjh4mdf2cx4k2z9h30b"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-cpp11" ,r-cpp11)
|
||||
|
|
@ -4219,13 +4217,13 @@ features present in other programming languages.")
|
|||
(define-public r-plotly
|
||||
(package
|
||||
(name "r-plotly")
|
||||
(version "4.9.4.1")
|
||||
(version "4.10.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "plotly" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1q711c0lg0jmzrmcc2fhjy70ms49as7cakdbgbh2ij9s149fa7iq"))))
|
||||
"16iqj7sv49mva6siibsci7iijsbnk7pqvfns9al0k35w9mjmr6dx"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-base64enc" ,r-base64enc)
|
||||
|
|
@ -4422,13 +4420,13 @@ package instead.")
|
|||
(define-public r-hmisc
|
||||
(package
|
||||
(name "r-hmisc")
|
||||
(version "4.5-0")
|
||||
(version "4.6-0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "Hmisc" version))
|
||||
(sha256
|
||||
(base32 "11qj73zj16p113jpwn2vv06l99kqlcxcmrldbpyi5s7pwing9jnx"))))
|
||||
(base32 "1bd1c8sichyijprfpnqj5g72nmgs9jvi0zyw8v4nsg1kn83fj71c"))))
|
||||
(properties `((upstream-name . "Hmisc")))
|
||||
(build-system r-build-system)
|
||||
(native-inputs
|
||||
|
|
@ -4683,13 +4681,13 @@ mechanism.")
|
|||
(define-public r-ztable
|
||||
(package
|
||||
(name "r-ztable")
|
||||
(version "0.2.2")
|
||||
(version "0.2.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ztable" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0wxcdb7yp2r6w5iznz1k49npp5sn4jiybfcj30s3198hkcnv0r8y"))))
|
||||
"1ps7ix0hc84s0p0ra6bkjxky3cffs1rvdcagqzj78lbdq22dk5j8"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-flextable" ,r-flextable)
|
||||
|
|
@ -5173,14 +5171,14 @@ can be efficiently implemented directly in the R language.")
|
|||
(define-public r-robustbase
|
||||
(package
|
||||
(name "r-robustbase")
|
||||
(version "0.93-8")
|
||||
(version "0.93-9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "robustbase" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16fmnk3p32mi70rkx89l1v4pry3gnrpy9jicnlfnk6lg1pwz5j8w"))))
|
||||
"0i9wf4aq8zpn2np6z2rjja21ks9n740dgkiv0qfwdzk3ah3vapyp"))))
|
||||
(build-system r-build-system)
|
||||
(native-inputs
|
||||
`(("gfortran" ,gfortran)))
|
||||
|
|
@ -5886,18 +5884,18 @@ is supported.")
|
|||
(define-public r-lubridate
|
||||
(package
|
||||
(name "r-lubridate")
|
||||
(version "1.7.10")
|
||||
(version "1.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "lubridate" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1s653d6rnpf9bkynxmbq4fdjdcz7r9ma19aph8f5y9ck70his4hm"))))
|
||||
"199b00cql07gf3rf4hh5ba34amnk0ai40zhx73dq1mpkn7ynxml7"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-generics" ,r-generics)
|
||||
("r-rcpp" ,r-rcpp)))
|
||||
("r-cpp11" ,r-cpp11)))
|
||||
(native-inputs
|
||||
`(("r-knitr" ,r-knitr)))
|
||||
(home-page "https://cran.r-project.org/web/packages/lubridate/")
|
||||
|
|
|
|||
|
|
@ -1294,3 +1294,32 @@ a sidebar that displays the ctags-generated tags of the current file, ordered
|
|||
by their scope. This means that for example methods in C++ are displayed under
|
||||
the class they are defined in.")
|
||||
(license license:vim)))
|
||||
|
||||
(define-public vim-nerdcommenter
|
||||
(let ((commit "a65465d321f2f8a74b2ffa540b9b87563f7e12e8")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "vim-nerdcommenter")
|
||||
(version (git-version "2.5.2" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/preservim/nerdcommenter")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "00ir65iv8jfbgzjmj7332fmydh0qhabbhx8zbvd3j6pgfxqpaafw"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
'(#:install-plan
|
||||
'(("autoload" "share/vim/vimfiles/")
|
||||
("doc" "share/vim/vimfiles/")
|
||||
("plugin" "share/vim/vimfiles/"))))
|
||||
(home-page "https://github.com/preservim/nerdcommenter")
|
||||
(synopsis "Vim plugin for easy commenting of code")
|
||||
(description
|
||||
"NERD commenter is a Vim plugin that provides many different commenting
|
||||
operations and styles which are invoked via key mappings and a menu. These
|
||||
operations are available for most filetypes.")
|
||||
(license license:cc0))))
|
||||
|
|
|
|||
|
|
@ -370,18 +370,18 @@ the same, being completely separated from the Internet.")
|
|||
(define-public nginx
|
||||
(package
|
||||
(name "nginx")
|
||||
;; Please update the nginx-documentation package together with this one!
|
||||
;; Track the ‘mainline’ branch. Upstream considers it more reliable than
|
||||
;; ’stable’ and recommends that “in general you deploy the NGINX mainline
|
||||
;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/)
|
||||
;; Please update the nginx-documentation package together with this one!
|
||||
(version "1.21.3")
|
||||
(version "1.21.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://nginx.org/download/nginx-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nhps7igdqcpcy1r8677ar807rfclpylmz3y858a678m1np4lxql"))))
|
||||
"1ziv3xargxhxycd5hp6r3r5mww54nvvydiywcpsamg3i9r3jzxyi"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libxml2" ,libxml2)
|
||||
("libxslt" ,libxslt)
|
||||
|
|
@ -476,9 +476,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
|
|||
|
||||
(define-public nginx-documentation
|
||||
;; This documentation should be relevant for the current nginx package.
|
||||
(let ((version "1.21.3")
|
||||
(revision 2769)
|
||||
(changeset "16f6fa718be2"))
|
||||
(let ((version "1.21.4")
|
||||
(revision 2791)
|
||||
(changeset "9385526a9b2d"))
|
||||
(package
|
||||
(name "nginx-documentation")
|
||||
(version (simple-format #f "~A-~A-~A" version revision changeset))
|
||||
|
|
@ -490,7 +490,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
|
|||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rjq5xqzx843yk9nblz8lq14r4kmlrahap7m0lkvx5mky80vqp79"))))
|
||||
"07v5vpwg2k4y1asbygmrvsk61l1vbdb2pyllc5k4hcjykg9avfza"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no test suite
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
|
|||
(build-system cmake-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
'(#:tests? #f ; no tests
|
||||
`(#:tests? #f ; no tests
|
||||
#:build-type "Release" ; turn off debugging symbols to save space
|
||||
#:configure-flags (list
|
||||
"-DPORT=GTK"
|
||||
|
|
@ -295,10 +295,24 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
|
|||
(("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version)
|
||||
(string-append wpebackend-fdo "/lib/" all)))
|
||||
#t)))
|
||||
,@(if (string-prefix? "x86_64" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
'()
|
||||
'((add-after 'unpack 'disable-sse2
|
||||
(lambda _
|
||||
(substitute* "Source/cmake/DetectSSE2.cmake"
|
||||
(("CHECK_FOR_SSE2\\(\\)") ""))))))
|
||||
(add-before 'configure 'prepare-build-environment
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "CC" "clang")
|
||||
(setenv "CXX" "clang++")
|
||||
;; XXX Until we switch back to using GCC,
|
||||
;; work around <https://bugs.gnu.org/51591>.
|
||||
,@(if (target-x86-32?)
|
||||
'((substitute* "Source/WTF/wtf/CheckedArithmetic.h"
|
||||
(("#define USE_MUL_OVERFLOW 1")
|
||||
"#define USE_MUL_OVERFLOW 0")))
|
||||
'())
|
||||
#t))
|
||||
(add-after 'install 'move-doc-files
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021 Liliana Prikler <liliana.prikler@gmail.com>
|
||||
;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013-2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020 Google LLC
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
|
|
@ -30,7 +30,8 @@
|
|||
#:use-module (srfi srfi-35)
|
||||
#:use-module (srfi srfi-9 gnu)
|
||||
#:use-module (guix records)
|
||||
#:use-module ((guix diagnostics) #:select (&fix-hint))
|
||||
#:use-module ((guix diagnostics)
|
||||
#:select (source-properties->location leave &fix-hint))
|
||||
#:use-module (guix i18n)
|
||||
#:use-module (gnu system uuid)
|
||||
#:re-export (uuid ;backward compatibility
|
||||
|
|
@ -107,6 +108,45 @@
|
|||
;;;
|
||||
;;; Code:
|
||||
|
||||
(eval-when (expand load eval)
|
||||
(define invalid-file-system-flags
|
||||
;; Note: Keep in sync with 'mount-flags->bit-mask'.
|
||||
(let ((known-flags '(read-only
|
||||
bind-mount no-suid no-dev no-exec
|
||||
no-atime strict-atime lazy-time)))
|
||||
(lambda (flags)
|
||||
"Return the subset of FLAGS that is invalid."
|
||||
(remove (cut memq <> known-flags) flags))))
|
||||
|
||||
(define (%validate-file-system-flags flags location)
|
||||
"Raise an error if FLAGS contains invalid mount flags; otherwise return
|
||||
FLAGS."
|
||||
(match (invalid-file-system-flags flags)
|
||||
(() flags)
|
||||
(invalid
|
||||
(leave (source-properties->location location)
|
||||
(N_ "invalid file system mount flag:~{ ~s~}~%"
|
||||
"invalid file system mount flags:~{ ~s~}~%"
|
||||
(length invalid))
|
||||
invalid)))))
|
||||
|
||||
(define-syntax validate-file-system-flags
|
||||
(lambda (s)
|
||||
"Validate the given file system mount flags, raising an error if invalid
|
||||
flags are found."
|
||||
(syntax-case s (quote)
|
||||
((_ (quote (symbols ...))) ;validate at expansion time
|
||||
(begin
|
||||
(%validate-file-system-flags (syntax->datum #'(symbols ...))
|
||||
(syntax-source s))
|
||||
#'(quote (symbols ...))))
|
||||
((_ flags)
|
||||
#`(%validate-file-system-flags flags
|
||||
'#,(datum->syntax s (syntax-source s))))
|
||||
(id
|
||||
(identifier? #'id)
|
||||
#'%validate-file-system-flags))))
|
||||
|
||||
;; File system declaration.
|
||||
(define-record-type* <file-system> %file-system
|
||||
make-file-system
|
||||
|
|
@ -115,7 +155,8 @@
|
|||
(mount-point file-system-mount-point) ; string
|
||||
(type file-system-type) ; string
|
||||
(flags file-system-flags ; list of symbols
|
||||
(default '()))
|
||||
(default '())
|
||||
(sanitize validate-file-system-flags))
|
||||
(options file-system-options ; string or #f
|
||||
(default #f))
|
||||
(mount? file-system-mount? ; Boolean
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ release corresponding to NAME and VERSION."
|
|||
"/src/contrib/"
|
||||
name "_" version ".tar.gz")
|
||||
;; TODO: use %bioconductor-version from (guix import cran)
|
||||
(string-append "https://bioconductor.org/packages/3.13"
|
||||
(string-append "https://bioconductor.org/packages/3.14"
|
||||
type-url-part
|
||||
"/src/contrib/"
|
||||
name "_" version ".tar.gz"))))
|
||||
|
|
|
|||
|
|
@ -155,9 +155,9 @@ package definition."
|
|||
(define %cran-canonical-url "https://cran.r-project.org/package=")
|
||||
(define %bioconductor-url "https://bioconductor.org/packages/")
|
||||
|
||||
;; The latest Bioconductor release is 3.13. Bioconductor packages should be
|
||||
;; The latest Bioconductor release is 3.14. Bioconductor packages should be
|
||||
;; updated together.
|
||||
(define %bioconductor-version "3.13")
|
||||
(define %bioconductor-version "3.14")
|
||||
|
||||
(define* (bioconductor-packages-list-url #:optional type)
|
||||
(string-append "https://bioconductor.org/packages/"
|
||||
|
|
|
|||
|
|
@ -52,10 +52,10 @@
|
|||
;;;
|
||||
;;; The following happens under the hood:
|
||||
;;;
|
||||
;;; * <git://code.call-cc.org/eggs-5-latest> is a Git repository that contains
|
||||
;;; the latest version of all CHICKEN eggs. We look clone this repository
|
||||
;;; and retrieve the latest version number, and the PACKAGE.egg file, which
|
||||
;;; contains a list of lists containing metadata about the egg.
|
||||
;;; * <git://code.call-cc.org/eggs-5-all> is a Git repository that contains
|
||||
;;; all versions of all CHICKEN eggs. We look clone this repository and, by
|
||||
;;; default, retrieve the latest version number, and the PACKAGE.egg file,
|
||||
;;; which contains a list of lists containing metadata about the egg.
|
||||
;;;
|
||||
;;; * All the eggs are stored as tarballs at
|
||||
;;; <https://code.call-cc.org/egg-tarballs/5>, so we grab the tarball for
|
||||
|
|
@ -97,7 +97,7 @@ NAME."
|
|||
(define (eggs-repository)
|
||||
"Update or fetch the latest version of the eggs repository and return the path
|
||||
to the repository."
|
||||
(let* ((url "git://code.call-cc.org/eggs-5-latest")
|
||||
(let* ((url "git://code.call-cc.org/eggs-5-all")
|
||||
(directory commit _ (update-cached-checkout url)))
|
||||
directory))
|
||||
|
||||
|
|
@ -113,12 +113,13 @@ to the repository."
|
|||
(last directory)
|
||||
#f)))
|
||||
|
||||
(define* (egg-metadata name #:optional file)
|
||||
"Return the package metadata file for the egg NAME, or if FILE is specified,
|
||||
return the package metadata in FILE."
|
||||
(define* (egg-metadata name #:key (version #f) (file #f))
|
||||
"Return the package metadata file for the egg NAME at version VERSION, or if
|
||||
FILE is specified, return the package metadata in FILE."
|
||||
(call-with-input-file (or file
|
||||
(string-append (egg-directory name) "/"
|
||||
(find-latest-version name)
|
||||
(or version
|
||||
(find-latest-version name))
|
||||
"/" name ".egg"))
|
||||
read))
|
||||
|
||||
|
|
@ -174,10 +175,11 @@ return the package metadata in FILE."
|
|||
;;; Egg importer.
|
||||
;;;
|
||||
|
||||
(define* (egg->guix-package name #:key (file #f) (source #f))
|
||||
"Import a CHICKEN egg called NAME from either the given .egg FILE, or from
|
||||
the latest NAME metadata downloaded from the official repository if FILE is #f.
|
||||
Return a <package> record or #f on failure.
|
||||
(define* (egg->guix-package name version #:key (file #f) (source #f))
|
||||
"Import a CHICKEN egg called NAME from either the given .egg FILE, or from the
|
||||
latest NAME metadata downloaded from the official repository if FILE is #f.
|
||||
Return a <package> record or #f on failure. If VERSION is specified, import
|
||||
the particular version from the egg repository.
|
||||
|
||||
SOURCE is a ``file-like'' object containing the source code corresponding to
|
||||
the egg. If SOURCE is not specified, the latest tarball for egg NAME will be
|
||||
|
|
@ -187,8 +189,8 @@ Specifying the SOURCE argument is mainly useful for developing a CHICKEN egg
|
|||
locally. Note that if FILE and SOURCE are specified, recursive import will
|
||||
not work."
|
||||
(define egg-content (if file
|
||||
(egg-metadata name file)
|
||||
(egg-metadata name)))
|
||||
(egg-metadata name #:file file)
|
||||
(egg-metadata name #:version version)))
|
||||
(if (not egg-content)
|
||||
(values #f '()) ; egg doesn't exist
|
||||
(let* ((version* (or (assoc-ref egg-content 'version)
|
||||
|
|
@ -324,10 +326,11 @@ not work."
|
|||
(define egg->guix-package/m ;memoized variant
|
||||
(memoize egg->guix-package))
|
||||
|
||||
(define (egg-recursive-import package-name)
|
||||
(define* (egg-recursive-import package-name #:optional version)
|
||||
(recursive-import package-name
|
||||
#:version version
|
||||
#:repo->guix-package (lambda* (name #:key version repo)
|
||||
(egg->guix-package/m name))
|
||||
(egg->guix-package/m name version))
|
||||
#:guix-name egg-name->guix-name))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -337,9 +337,10 @@ the package named PACKAGE-NAME."
|
|||
type '<elpa-package>'."
|
||||
|
||||
(define melpa-recipe
|
||||
(if (eq? repo 'melpa)
|
||||
(package-name->melpa-recipe (elpa-package-name pkg))
|
||||
#f))
|
||||
;; XXX: Call 'identity' to work around a Guile 3.0.[5-7] compiler bug:
|
||||
;; <https://bugs.gnu.org/48368>.
|
||||
(and (eq? (identity repo) 'melpa)
|
||||
(package-name->melpa-recipe (elpa-package-name pkg))))
|
||||
|
||||
(define name (elpa-package-name pkg))
|
||||
|
||||
|
|
|
|||
|
|
@ -1682,11 +1682,119 @@ the entries in MANIFEST."
|
|||
`((type . profile-hook)
|
||||
(hook . manual-database))))
|
||||
|
||||
(define (manual-database/optional manifest)
|
||||
"Return a derivation to build the manual database of MANIFEST, but only if
|
||||
MANIFEST contains the \"man-db\" package. Otherwise, return #f."
|
||||
;; Building the man database (for "man -k") is expensive and rarely used.
|
||||
;; Build it only if the profile also contains "man-db".
|
||||
(mlet %store-monad ((man-db (manifest-lookup-package manifest "man-db")))
|
||||
(if man-db
|
||||
(manual-database manifest)
|
||||
(return #f))))
|
||||
|
||||
(define (texlive-configuration manifest)
|
||||
"Return a derivation that builds a TeXlive configuration for the entries in
|
||||
MANIFEST."
|
||||
(define entry->texlive-input
|
||||
(match-lambda
|
||||
(($ <manifest-entry> name version output thing deps)
|
||||
(if (string-prefix? "texlive-" name)
|
||||
(cons (gexp-input thing output)
|
||||
(append-map entry->texlive-input deps))
|
||||
'()))))
|
||||
(define texlive-bin
|
||||
(module-ref (resolve-interface '(gnu packages tex)) 'texlive-bin))
|
||||
(define coreutils
|
||||
(module-ref (resolve-interface '(gnu packages base)) 'coreutils))
|
||||
(define sed
|
||||
(module-ref (resolve-interface '(gnu packages base)) 'sed))
|
||||
(define updmap.cfg
|
||||
(module-ref (resolve-interface '(gnu packages tex))
|
||||
'texlive-default-updmap.cfg))
|
||||
(define build
|
||||
(with-imported-modules '((guix build utils)
|
||||
(guix build union))
|
||||
#~(begin
|
||||
(use-modules (guix build utils)
|
||||
(guix build union)
|
||||
(ice-9 popen))
|
||||
|
||||
;; Build a modifiable union of all texlive inputs. We do this so
|
||||
;; that TeX live can resolve the parent and grandparent directories
|
||||
;; correctly. There might be a more elegant way to accomplish this.
|
||||
(union-build #$output
|
||||
'#$(append-map entry->texlive-input
|
||||
(manifest-entries manifest))
|
||||
#:create-all-directories? #t
|
||||
#:log-port (%make-void-port "w"))
|
||||
(let ((texmf.cnf (string-append
|
||||
#$output
|
||||
"/share/texmf-dist/web2c/texmf.cnf")))
|
||||
(when (file-exists? texmf.cnf)
|
||||
(substitute* texmf.cnf
|
||||
(("^TEXMFROOT = .*")
|
||||
(string-append "TEXMFROOT = " #$output "/share\n"))
|
||||
(("^TEXMF = .*")
|
||||
"TEXMF = $TEXMFROOT/share/texmf-dist\n"))
|
||||
|
||||
;; XXX: This is annoying, but it's necessary because texlive-bin
|
||||
;; does not provide wrapped executables.
|
||||
(setenv "PATH"
|
||||
(string-append #$(file-append coreutils "/bin")
|
||||
":"
|
||||
#$(file-append sed "/bin")))
|
||||
(setenv "PERL5LIB" #$(file-append texlive-bin "/share/tlpkg"))
|
||||
(setenv "TEXMF" (string-append #$output "/share/texmf-dist"))
|
||||
|
||||
;; Remove invalid maps from config file.
|
||||
(let* ((web2c (string-append #$output "/share/texmf-config/web2c/"))
|
||||
(maproot (string-append #$output "/share/texmf-dist/fonts/map/"))
|
||||
(updmap.cfg (string-append web2c "updmap.cfg")))
|
||||
(mkdir-p web2c)
|
||||
|
||||
;; Some profiles may already have this file, which prevents us
|
||||
;; from copying it. Since we need to generate it from scratch
|
||||
;; anyway, we delete it here.
|
||||
(when (file-exists? updmap.cfg)
|
||||
(delete-file updmap.cfg))
|
||||
(copy-file #$updmap.cfg updmap.cfg)
|
||||
(make-file-writable updmap.cfg)
|
||||
(let* ((port (open-pipe* OPEN_WRITE
|
||||
#$(file-append texlive-bin "/bin/updmap-sys")
|
||||
"--syncwithtrees"
|
||||
"--nohash"
|
||||
"--force"
|
||||
(string-append "--cnffile=" web2c "updmap.cfg"))))
|
||||
(display "Y\n" port)
|
||||
(when (not (zero? (status:exit-val (close-pipe port))))
|
||||
(error "failed to filter updmap.cfg")))
|
||||
|
||||
;; Generate font maps.
|
||||
(invoke #$(file-append texlive-bin "/bin/updmap-sys")
|
||||
(string-append "--cnffile=" web2c "updmap.cfg")
|
||||
(string-append "--dvipdfmxoutputdir="
|
||||
maproot "updmap/dvipdfmx/")
|
||||
(string-append "--dvipsoutputdir="
|
||||
maproot "updmap/dvips/")
|
||||
(string-append "--pdftexoutputdir="
|
||||
maproot "updmap/pdftex/")))))
|
||||
#t)))
|
||||
|
||||
(mlet %store-monad ((texlive-base (manifest-lookup-package manifest "texlive-base")))
|
||||
(if texlive-base
|
||||
(gexp->derivation "texlive-configuration" build
|
||||
#:substitutable? #f
|
||||
#:local-build? #t
|
||||
#:properties
|
||||
`((type . profile-hook)
|
||||
(hook . texlive-configuration)))
|
||||
(return #f))))
|
||||
|
||||
(define %default-profile-hooks
|
||||
;; This is the list of derivation-returning procedures that are called by
|
||||
;; default when making a non-empty profile.
|
||||
(list info-dir-file
|
||||
manual-database
|
||||
manual-database/optional
|
||||
fonts-dir-file
|
||||
ghc-package-cache-file
|
||||
ca-certificate-bundle
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
#:use-module (guix scripts)
|
||||
#:use-module (guix scripts build)
|
||||
#:use-module (guix transformations)
|
||||
#:autoload (ice-9 ftw) (scandir)
|
||||
#:autoload (gnu build linux-container) (call-with-container %namespaces
|
||||
user-namespace-supported?
|
||||
unprivileged-user-namespace-supported?
|
||||
|
|
@ -401,7 +402,12 @@ regexps in WHITE-LIST."
|
|||
|
||||
(match command
|
||||
((program . args)
|
||||
(apply execlp program program args))))
|
||||
(catch 'system-error
|
||||
(lambda ()
|
||||
(apply execlp program program args))
|
||||
(lambda _
|
||||
;; Following established convention, exit with 127 upon ENOENT.
|
||||
(primitive-_exit 127))))))
|
||||
|
||||
(define (child-shell-environment shell profile manifest)
|
||||
"Create a child process, load PROFILE and MANIFEST, and then run SHELL in
|
||||
|
|
@ -552,6 +558,38 @@ running in a \"container\", immune to the issue described above."))
|
|||
(info (G_ "All is good! The shell gets correct environment \
|
||||
variables.~%")))))
|
||||
|
||||
(define (suggest-command-name profile command)
|
||||
"COMMAND was not found in PROFILE so display a hint suggesting the closest
|
||||
command name."
|
||||
(define not-dot?
|
||||
(match-lambda
|
||||
((or "." "..") #f)
|
||||
(_ #t)))
|
||||
|
||||
(match (scandir (string-append profile "/bin") not-dot?)
|
||||
(() #f)
|
||||
(available
|
||||
(match command
|
||||
((executable _ ...)
|
||||
;; Look for a suggestion with a high threshold: a suggestion is
|
||||
;; usually better than no suggestion.
|
||||
(let ((closest (string-closest executable available
|
||||
#:threshold 12)))
|
||||
(unless (or (not closest) (string=? closest executable))
|
||||
(display-hint (format #f (G_ "Did you mean '~a'?~%")
|
||||
closest)))))))))
|
||||
|
||||
(define (validate-exit-status profile command status)
|
||||
"When STATUS, an integer as returned by 'waitpid', is 127, raise a \"command
|
||||
not found\" error. Otherwise return STATUS."
|
||||
;; Most likely, exit value 127 means ENOENT.
|
||||
(when (eqv? (status:exit-val status) 127)
|
||||
(report-error (G_ "~a: command not found~%")
|
||||
(first command))
|
||||
(suggest-command-name profile command)
|
||||
(exit 1))
|
||||
status)
|
||||
|
||||
(define* (launch-environment/fork command profile manifest
|
||||
#:key pure? (white-list '()))
|
||||
"Run COMMAND in a new process with an environment containing PROFILE, with
|
||||
|
|
@ -563,7 +601,8 @@ regexps in WHITE-LIST."
|
|||
#:pure? pure?
|
||||
#:white-list white-list))
|
||||
(pid (match (waitpid pid)
|
||||
((_ . status) status)))))
|
||||
((_ . status)
|
||||
(validate-exit-status profile command status))))))
|
||||
|
||||
(define* (launch-environment/container #:key command bash user user-mappings
|
||||
profile manifest link-profile? network?
|
||||
|
|
@ -584,6 +623,9 @@ WHILE-LIST."
|
|||
(and (file-exists? (file-system-mapping-source mapping))
|
||||
(file-system-mapping->bind-mount mapping)))
|
||||
|
||||
(define (exit/status* status)
|
||||
(exit/status (validate-exit-status profile command status)))
|
||||
|
||||
(mlet %store-monad ((reqs (inputs->requisites
|
||||
(list (direct-store-path bash) profile))))
|
||||
(return
|
||||
|
|
@ -640,7 +682,7 @@ WHILE-LIST."
|
|||
'())
|
||||
(map file-system-mapping->bind-mount
|
||||
mappings))))
|
||||
(exit/status
|
||||
(exit/status*
|
||||
(call-with-container file-systems
|
||||
(lambda ()
|
||||
;; Setup global shell.
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 pretty-print)
|
||||
#:use-module (ice-9 rdelim)
|
||||
#:use-module (ice-9 regex)
|
||||
#:use-module (ice-9 popen)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:export (import-manifest
|
||||
|
|
@ -56,11 +59,32 @@ FILE-NAME with \"-\", and return the basename of it."
|
|||
(define (destination-append path)
|
||||
(string-append destination-directory "/" path))
|
||||
|
||||
(define (bash-alias->pair line)
|
||||
(if (string-prefix? "alias" line)
|
||||
(let ((matched (string-match "alias (.+)=\"?'?([^\"']+)\"?'?" line)))
|
||||
`(,(match:substring matched 1) . ,(match:substring matched 2)))
|
||||
'()))
|
||||
|
||||
(define (parse-aliases input)
|
||||
(let loop ((line (read-line input))
|
||||
(result '()))
|
||||
(if (eof-object? line)
|
||||
(reverse result)
|
||||
(loop (read-line input)
|
||||
(cons (bash-alias->pair line) result)))))
|
||||
|
||||
(let ((rc (destination-append ".bashrc"))
|
||||
(profile (destination-append ".bash_profile"))
|
||||
(logout (destination-append ".bash_logout")))
|
||||
`((service home-bash-service-type
|
||||
(home-bash-configuration
|
||||
,@(if (file-exists? rc)
|
||||
`((aliases
|
||||
',(let* ((port (open-pipe* OPEN_READ "bash" "-i" "-c" "alias"))
|
||||
(alist (parse-aliases port)))
|
||||
(close-port port)
|
||||
(filter (negate null?) alist))))
|
||||
'())
|
||||
,@(if (file-exists? rc)
|
||||
`((bashrc
|
||||
(list (local-file ,rc
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-11)
|
||||
#:use-module (srfi srfi-37)
|
||||
#:use-module (srfi srfi-71)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 format)
|
||||
#:export (guix-import-egg))
|
||||
|
|
@ -83,21 +84,24 @@ Import and convert the egg package for PACKAGE-NAME.\n"))
|
|||
(_ #f))
|
||||
(reverse opts))))
|
||||
(match args
|
||||
((package-name)
|
||||
(if (assoc-ref opts 'recursive)
|
||||
;; Recursive import
|
||||
(map (match-lambda
|
||||
((and ('package ('name name) . rest) pkg)
|
||||
`(define-public ,(string->symbol name)
|
||||
,pkg))
|
||||
(_ #f))
|
||||
(egg-recursive-import package-name))
|
||||
;; Single import
|
||||
(let ((sexp (egg->guix-package package-name)))
|
||||
(unless sexp
|
||||
(leave (G_ "failed to download meta-data for package '~a'~%")
|
||||
package-name))
|
||||
sexp)))
|
||||
((spec)
|
||||
(let ((name version (package-name->name+version spec)))
|
||||
(if (assoc-ref opts 'recursive)
|
||||
;; Recursive import
|
||||
(map (match-lambda
|
||||
((and ('package ('name name) . rest) pkg)
|
||||
`(define-public ,(string->symbol name)
|
||||
,pkg))
|
||||
(_ #f))
|
||||
(egg-recursive-import name version))
|
||||
;; Single import
|
||||
(let ((sexp (egg->guix-package name version)))
|
||||
(unless sexp
|
||||
(leave (G_ "failed to download meta-data for package '~a'~%")
|
||||
(if version
|
||||
(string-append name "@" version)
|
||||
name)))
|
||||
sexp))))
|
||||
(()
|
||||
(leave (G_ "too few arguments~%")))
|
||||
((many ...)
|
||||
|
|
|
|||
|
|
@ -387,8 +387,14 @@ echo ~a >> ~a
|
|||
(display-hint (G_ "Consider passing the @option{--check} option once
|
||||
to make sure your shell does not clobber environment variables."))) )
|
||||
|
||||
(let ((result (guix-environment* opts)))
|
||||
(maybe-remove-expired-cache-entries (%profile-cache-directory)
|
||||
cache-entries
|
||||
#:entry-expiration entry-expiration)
|
||||
result))
|
||||
;; Clean the cache in EXIT-HOOK so that (1) it happens after potential use
|
||||
;; of cached profiles, and (2) cleanup actually happens, even when
|
||||
;; 'guix-environment*' calls 'exit'.
|
||||
(add-hook! exit-hook
|
||||
(lambda _
|
||||
(maybe-remove-expired-cache-entries
|
||||
(%profile-cache-directory)
|
||||
cache-entries
|
||||
#:entry-expiration entry-expiration)))
|
||||
|
||||
(guix-environment* opts))
|
||||
|
|
|
|||
|
|
@ -377,7 +377,8 @@ ARGS is the list of arguments received by the 'throw' handler."
|
|||
(+ 2 (string-contains message ": ")))))
|
||||
(format (current-error-port) (G_ "~amissing closing parenthesis~%")
|
||||
location))
|
||||
(apply throw args)))
|
||||
(report-error (G_ "read error while loading '~a': ~a~%")
|
||||
file (apply format #f message args))))
|
||||
(('syntax-error proc message properties form subform . rest)
|
||||
(let ((loc (source-properties->location properties)))
|
||||
(report-error loc (G_ "~s: ~a~%")
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
24019
po/doc/guix-manual.de.po
24019
po/doc/guix-manual.de.po
File diff suppressed because it is too large
Load Diff
23788
po/doc/guix-manual.es.po
23788
po/doc/guix-manual.es.po
File diff suppressed because it is too large
Load Diff
34148
po/doc/guix-manual.fa.po
34148
po/doc/guix-manual.fa.po
File diff suppressed because it is too large
Load Diff
23714
po/doc/guix-manual.fr.po
23714
po/doc/guix-manual.fr.po
File diff suppressed because it is too large
Load Diff
34149
po/doc/guix-manual.it.po
34149
po/doc/guix-manual.it.po
File diff suppressed because it is too large
Load Diff
34184
po/doc/guix-manual.ko.po
34184
po/doc/guix-manual.ko.po
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
63703
po/doc/guix-manual.ru.po
63703
po/doc/guix-manual.ru.po
File diff suppressed because it is too large
Load Diff
34158
po/doc/guix-manual.sk.po
34158
po/doc/guix-manual.sk.po
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -31,6 +31,7 @@ DOC_PO_FILES = \
|
|||
|
||||
DOC_COOKBOOK_PO_FILES = \
|
||||
%D%/guix-cookbook.de.po \
|
||||
%D%/guix-cookbook.es.po \
|
||||
%D%/guix-cookbook.fa.po \
|
||||
%D%/guix-cookbook.fr.po \
|
||||
%D%/guix-cookbook.ko.po \
|
||||
|
|
|
|||
820
po/guix/cs.po
820
po/guix/cs.po
File diff suppressed because it is too large
Load Diff
852
po/guix/da.po
852
po/guix/da.po
File diff suppressed because it is too large
Load Diff
1313
po/guix/de.po
1313
po/guix/de.po
File diff suppressed because it is too large
Load Diff
848
po/guix/eo.po
848
po/guix/eo.po
File diff suppressed because it is too large
Load Diff
1011
po/guix/es.po
1011
po/guix/es.po
File diff suppressed because it is too large
Load Diff
888
po/guix/fr.po
888
po/guix/fr.po
File diff suppressed because it is too large
Load Diff
997
po/guix/hu.po
997
po/guix/hu.po
File diff suppressed because it is too large
Load Diff
806
po/guix/it.po
806
po/guix/it.po
File diff suppressed because it is too large
Load Diff
806
po/guix/ko.po
806
po/guix/ko.po
File diff suppressed because it is too large
Load Diff
877
po/guix/nl.po
877
po/guix/nl.po
File diff suppressed because it is too large
Load Diff
803
po/guix/oc.po
803
po/guix/oc.po
File diff suppressed because it is too large
Load Diff
821
po/guix/pl.po
821
po/guix/pl.po
File diff suppressed because it is too large
Load Diff
883
po/guix/pt_BR.po
883
po/guix/pt_BR.po
File diff suppressed because it is too large
Load Diff
803
po/guix/si.po
803
po/guix/si.po
File diff suppressed because it is too large
Load Diff
877
po/guix/sk.po
877
po/guix/sk.po
File diff suppressed because it is too large
Load Diff
986
po/guix/sr.po
986
po/guix/sr.po
File diff suppressed because it is too large
Load Diff
1002
po/guix/sv.po
1002
po/guix/sv.po
File diff suppressed because it is too large
Load Diff
992
po/guix/ta.po
992
po/guix/ta.po
File diff suppressed because it is too large
Load Diff
998
po/guix/vi.po
998
po/guix/vi.po
File diff suppressed because it is too large
Load Diff
823
po/guix/zh_CN.po
823
po/guix/zh_CN.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/da.po
1601
po/packages/da.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/de.po
1601
po/packages/de.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/eo.po
1601
po/packages/eo.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/es.po
1601
po/packages/es.po
File diff suppressed because it is too large
Load Diff
1663
po/packages/fr.po
1663
po/packages/fr.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/hu.po
1601
po/packages/hu.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/it.po
1601
po/packages/it.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/ko.po
1601
po/packages/ko.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/nl.po
1601
po/packages/nl.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/oc.po
1601
po/packages/oc.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/pl.po
1601
po/packages/pl.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/pt_BR.po
1601
po/packages/pt_BR.po
File diff suppressed because it is too large
Load Diff
1601
po/packages/sk.po
1601
po/packages/sk.po
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue