me
/
guix
Archived
1
0
Fork 0

Merge branch 'staging' into core-updates

master
Marius Bakke 2022-08-27 17:10:55 +02:00
commit ad384816fe
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
155 changed files with 5542 additions and 8483 deletions

View File

@ -586,7 +586,7 @@ great time to try it and get involved!
@item riscv64-linux
little-endian 64-bit RISC-V processors, specifically RV64GC, and
Linux-Libre kernel. This playform is available as a "technology preview":
Linux-Libre kernel. This platform is available as a "technology preview":
although it is supported, substitutes are not yet available from the
build farm (@pxref{Substitutes}), and some packages may fail to build
(@pxref{Tracking Bugs and Patches}). That said, the Guix community is
@ -7615,7 +7615,7 @@ procedure returns.
Return the list of inputs required by @var{package} for development
purposes on @var{system}. When @var{target} is true, return the inputs
needed to cross-compile @var{package} from @var{system} to
@var{triplet}, where @var{triplet} is a triplet such as
@var{target}, where @var{target} is a triplet such as
@code{"aarch64-linux-gnu"}.
Note that the result includes both explicit inputs and implicit
@ -15818,8 +15818,8 @@ cross-compilation, because every instruction needs to be emulated.
The availability of substitutes for the architecture targeted by the
@code{--system} option can mitigate this problem. An other way to work
around it is to install GNU Guix on a machine which CPU is supporting
the targeted instruction set, an set it up as an offload machine
around it is to install GNU Guix on a machine whose CPU supports
the targeted instruction set, and set it up as an offload machine
(@pxref{Daemon Offload Setup}).
@node System Configuration
@ -16439,9 +16439,13 @@ Manual}, for more information on these flags.
@item @code{options} (default: @code{#f})
This is either @code{#f}, or a string denoting mount options passed to
the file system driver. @xref{Mount-Unmount-Remount,,, libc, The GNU C
Library Reference Manual}, for details and run @command{man 8 mount} for
options for various file systems. Note that the
@code{file-system-options->alist} and @code{alist->file-system-options}
Library Reference Manual}, for details.
Run @command{man 8 mount} for options for various file systems, but
beware that what it lists as file-system-independent ``mount options'' are
in fact flags, and belong in the @code{flags} field described above.
The @code{file-system-options->alist} and @code{alist->file-system-options}
procedures from @code{(gnu system file-systems)} can be used to convert
file system options given as an association list to the string
representation, and vice-versa.
@ -18564,6 +18568,13 @@ the 'root' account has just been created.
@item @code{terminals} (default: @code{'()})
List of @code{greetd-terminal-configuration} per terminal for which
@code{greetd} should be started.
@item @code{greeter-supplementary-groups} (default: @code{'()})
List of groups which should be added to @code{greeter} user. For instance:
@lisp
(greeter-supplementary-groups '("seat" "video"))
@end lisp
Note that this example will fail if @code{seat} group does not exist.
@end table
@end deftp
@ -19851,7 +19862,7 @@ network. A specific port value can be provided by appending the
@code{:PORT} suffix. By default, it uses the Jami bootstrap nodes, but
any host can be specified here. It's also possible to disable
bootstrapping by explicitly setting this field to the
@code{'unset} value.
@code{%unset-value} value.
@item @code{port} (default: @code{4222}) (type: maybe-number)
The UDP port to bind to. When left unspecified, an available port is
@ -23161,6 +23172,30 @@ input), without requiring the applications needing access to be root.
%base-services)
@end lisp
@code{seatd} operates over a UNIX domain socket, with @code{libseat}
providing the client side of the protocol. Applications that acquire
access to the shared resources via @code{seatd} (e.g. @code{sway})
need to be able to talk to this socket.
This can be achieved by adding the user they run under to the group
owning @code{seatd}'s socket (usually ``seat''), like so:
@lisp
(user-account
(name "alice")
(group "users")
(supplementary-groups '("wheel" ; allow use of sudo, etc.
"seat" ; seat management
"audio" ; sound card
"video" ; video devices such as webcams
"cdrom")) ; the good ol' CD-ROM
(comment "Bob's sister"))
@end lisp
Depending on your setup, you will have to not only add regular users,
but also system users to this group. For instance, some greetd greeters
require graphics and therefore also need to negotiate with seatd.
@end defvr
@deftp {Data Type} seatd-configuration
@ -23170,10 +23205,7 @@ Configuration record for the seatd daemon service.
@item @code{seatd} (default: @code{seatd})
The seatd package to use.
@item @code{user} (default: @samp{"root"})
User to own the seatd socket.
@item @code{group} (default: @samp{"users"})
@item @code{group} (default: @samp{"seat"})
Group to own the seatd socket.
@item @code{socket} (default: @samp{"/run/seatd.sock"})
@ -23311,7 +23343,7 @@ Script file to use as @file{default.pa}. In case the
directive pointing to @file{/etc/pulse/default.pa.d} is appended to the
provided script.
@item @code{extra-script-files} (default: @code{'())})
@item @code{extra-script-files} (default: @code{'()})
A list of file-like objects defining extra PulseAudio scripts to run at
the initialization of the @command{pulseaudio} daemon, after the main
@code{script-file}. The scripts are deployed to the
@ -31334,7 +31366,7 @@ Each parameter definition is preceded by its type; for example,
@samp{boolean foo} indicates that the @code{foo} parameter should be
specified as a boolean. Types starting with @code{maybe-} denote
parameters that won't show up in TLP config file when their value is
left unset, or is explicitly set to the @code{'unset} value.
left unset, or is explicitly set to the @code{%unset-value} value.
@c The following documentation was initially generated by
@c (generate-tlp-documentation) in (gnu services pm). Manually maintained
@ -36638,9 +36670,9 @@ Set the mount @emph{options} of the root file system. It overrides the
@item fsck.mode=@var{mode}
Whether to check the @var{root} file system for errors before mounting
it. @var{mode} is one of @code{skip} (never check), @code{force} (always
check), or @code{auto} to respect the root file-system object's 'check?'
setting (@pxref{File Systems}) and run a full scan only if the file system
was not cleanly shut down.
check), or @code{auto} to respect the root @code{<file-system>} object's
@code{check?} setting (@pxref{File Systems}) and run a full scan only if
the file system was not cleanly shut down.
@code{auto} is the default if this option is not present or if @var{mode}
is not one of the above.
@ -38904,7 +38936,7 @@ In some cases multiple different configuration records might be defined
in the same file, but their serializers for the same type might have to
be different, because they have different configuration formats. For
example, the @code{serialize-boolean} procedure for the Getmail service
would have to be different for the one for the Transmission service. To
would have to be different from the one for the Transmission service. To
make it easier to deal with this situation, one can specify a serializer
prefix by using the @code{prefix} literal in the
@code{define-configuration} form. This means that one doesn't have to
@ -38955,8 +38987,7 @@ macro which is a shorthand of this.
Sometimes a field should not be serialized if the user doesnt specify a
value. To achieve this, you can use the @code{define-maybe} macro to
define a ``maybe type''; if the value of a maybe type is left unset, or
is set to the @code{'unset} value, then it will not be
serialized.
is set to the @code{%unset-value} value, then it will not be serialized.
When defining a ``maybe type'', the corresponding serializer for the
regular type will be used by default. For example, a field of type
@ -38975,7 +39006,7 @@ to be a string, or left unspecified.
(name
;; If set to a string, the `serialize-string' procedure will be used
;; to serialize the string. Otherwise this field is not serialized.
maybe-string ; equivalent to (maybe-string *unspecified*)
maybe-string
"The name of this module."))
@end lisp
@ -38986,7 +39017,7 @@ serializer name by using the @code{prefix} literal.
(define-maybe integer
(prefix baz-))
(define (baz-serialize-interger field-name value)
(define (baz-serialize-integer field-name value)
@dots{})
@end lisp
@ -39006,6 +39037,11 @@ whether its value is set or not.
@end lisp
@end deffn
@deffn (Scheme Procedure) maybe-value-set? @var{value}
Predicate to check whether a user explicitly specified the value of a
maybe field.
@end deffn
@deffn {Scheme Procedure} serialize-configuration @var{configuration} @
@var{fields}
Return a G-expression that contains the values corresponding to the
@ -39213,7 +39249,7 @@ software, configuration, and state. Software in mainstream distros are
usually installed system-wide, but with GNU Guix most software packages
can be installed on a per-user basis without needing root privileges,
and are thus considered part of the users @dfn{home environment}.
Packages on their own not very useful in many cases, because often they
Packages on their own are not very useful in many cases, because often they
require some additional configuration, usually config files that reside
in @env{XDG_CONFIG_HOME} (@file{~/.config} by default) or other
directories. Everything else can be considered state, like media files,
@ -39373,12 +39409,12 @@ specified) will ignore @file{~/.profile}, even if @file{~/.zprofile}
doesn't exist.
To make your shell respect @file{~/.profile}, add @code{. ~/.profile} or
@code{source ~/profile} to the startup file for the login shell. In
@code{source ~/.profile} to the startup file for the login shell. In
case of Bash, it is @file{~/.bash_profile}, and in case of Zsh, it is
@file{~/.zprofile}.
@quotation Note
This step is only required if your shell is NOT managed by Guix Home.
This step is only required if your shell is @emph{not} managed by Guix Home.
Otherwise, everything will be done automatically.
@end quotation
@ -39470,7 +39506,7 @@ export _JAVA_AWT_WM_NONREPARENTING
@quotation Note
Make sure that module @code{(gnu packages shells)} is imported with
@code{use-modules} or any other way, this namespace contains the
definition of the @code{zsh} packages, which is used in the example
definition of the @code{zsh} package, which is used in the example
above.
@end quotation
@ -39534,12 +39570,95 @@ users @emph{should not} use this service, in most cases it's better to extend
the required command using the appropriate service type.
@end defvr
@defvr {Scheme Variable} home-files-service-type
The service of this type allows to specify a list of files, which will
go to @file{~/.guix-home/files}, usually this directory contains
configuration files (to be more precise it contains symlinks to files in
@file{/gnu/store}), which should be placed in @file{$XDG_CONFIG_DIR} or
in rare cases in @file{$HOME}. It accepts extension values in the
following format:
@lisp
`((".sway/config" ,sway-file-like-object)
(".tmux.conf" ,(local-file "./tmux.conf")))
@end lisp
Each nested list contains two values: a subdirectory and file-like
object. After building a home environment @file{~/.guix-home/files}
will be populated with apropiate content and all nested directories will
be created accordingly, however, those files won't go any further until
some other service will do it. By default a
@code{home-symlink-manager-service-type}, which creates necessary
symlinks in home folder to files from @file{~/.guix-home/files} and
backs up already existing, but clashing configs and other things, is a
part of essential home services (enabled by default), but it's possible
to use alternative services to implement more advanced use cases like
read-only home. Feel free to experiment and share your results.
@end defvr
@defvr {Scheme Variable} home-xdg-configuration-files-service-type
The service is very similiar to @code{home-files-service-type} (and
actually extends it), but used for defining files, which will go to
@file{~/.guix-home/files/.config}, which will be symlinked to
@file{$XDG_CONFIG_DIR} by @code{home-symlink-manager-service-type} (for
example) during activation. It accepts extension values in the
following format:
@lisp
`(("sway/config" ,sway-file-like-object)
;; -> ~/.guix-home/files/.config/sway/config
;; -> $XDG_CONFIG_DIR/sway/config (by symlink-manager)
("tmux/tmux.conf" ,(local-file "./tmux.conf")))
@end lisp
@end defvr
@defvr {Scheme Variable} home-activation-service-type
The service of this type generates a guile script, which runs on every
@command{guix home reconfigure} invocation or any other action, which
leads to the activation of the home environment.
@end defvr
@defvr {Scheme Variable} home-symlink-manager-service-type
The service of this type generates a guile script, which will be
executed during activation of home environment, and do a few following
steps:
@enumerate
@item
Reads the content of @file{files/} directory of current and pending home
environments.
@item
Cleans up all symlinks created by symlink-manager on previous
activation. Also, sub-directories, which become empty also will be
cleaned up.
@item
Creates new symlinks the following way: It looks @file{files/} directory
(usually defined with @code{home-files-service-type},
@code{home-xdg-configuration-files-service-type} and maybe some others),
takes the files from @file{files/.config/} subdirectory and put
respective links in @env{XDG_CONFIG_DIR}. For example symlink for
@file{files/.config/sway/config} will end up in
@file{$XDG_CONFIG_DIR/sway/config}. The rest files in @file{files/}
outside of @file{files/.config/} subdirectory will be treated slightly
different: symlink will just go to @file{$HOME}.
@file{files/.some-program/config} will end up in
@file{$HOME/.some-program/config}.
@item
If some sub-directories are missing, they will be created.
@item
If there is a clashing files on the way, they will be backed up.
@end enumerate
symlink-manager is a part of essential home services and is enabled and
used by default.
@end defvr
@node Shells Home Services
@subsection Shells
@ -39609,7 +39728,7 @@ added after the contents of the @code{bash-profile} field.
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:
so something like this:
@lisp
'(("ls" . "ls -alF"))
@ -39643,7 +39762,7 @@ process for example).
@end deftp
You can extend the Bash service by using the @code{home-bash-extension}
configuration record, whose fields most mirror that of
configuration record, whose fields must 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

View File

@ -17,6 +17,7 @@
;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
;; Copyright © 2021 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com>
;;
;; Copying and distribution of this file, with or without modification, are
;; permitted in any medium without royalty provided the copyright notice and
@ -29,7 +30,8 @@
(title
(en "New @option{--whole-file} option for @command{guix style}")
(de "Neue Option @option{--whole-file} für @command{guix style}")
(fr "Nouvelle option @option{--whole-file} pour @command{guix style}"))
(fr "Nouvelle option @option{--whole-file} pour @command{guix style}")
(pt "Nova opção @option{--whole-file} para @command{guix style}"))
(body
(en "The @command{guix style} command has a new @option{--whole-file}
option: instead of formatting individual package definitions, this option lets
@ -52,7 +54,14 @@ s'avérer utile par exemple pour mettre en forme son fichier de configuration
du système d'exploitation.
Lancer @command{info \"(guix.fr) Invoquer guix style\"} pour plus
d'informations.")))
d'informations.")
(pt "O comando @command{guix style} tem uma nova opção
@option{--whole-file}: ao invés de formatar definições de pacote
individualmente, esta opção permite a reformatação de arquivos Scheme por
inteiro. Você pode querer usá-la para formatar seu arquivo de configuração do
sistema operacional, por exemplo.
Execute @command{info \"(guix) Invoking guix style\"} para mais informações.")))
(entry (commit "2ec7ab2610eb67e26dab52b671eb29e46f64ea0f")
(title

View File

@ -42,7 +42,7 @@
;; concurrent accesses are unsafe.
(mparameterize %store-monad ((%repository-cache-directory
(string-append (%repository-cache-directory)
"/time-travel")))
"/time-travel/" system)))
(return (mkdir-p (%repository-cache-directory)))
(latest-channel-derivation channels)))))

View File

@ -69,7 +69,6 @@
bootloader-configuration-terminal-inputs
bootloader-configuration-serial-unit
bootloader-configuration-serial-speed
bootloader-configuration-additional-configuration
%bootloaders
lookup-bootloader-by-name

View File

@ -254,37 +254,40 @@ otherwise use the IMAGE name."
(parameterize ((%graft? #f))
(derivation->job name drv))))
(define (image-jobs store system)
(define* (image-jobs store system
#:key source commit)
"Return a list of jobs that build images for SYSTEM."
(define MiB
(expt 2 20))
(if (member system %guix-system-supported-systems)
`(,(image->job store
(image
(inherit efi-disk-image)
(operating-system installation-os))
#:name "usb-image"
#:system system)
,(image->job
store
(image
(inherit (image-with-label
iso9660-image
(string-append "GUIX_" system "_"
(if (> (string-length %guix-version) 7)
(substring %guix-version 0 7)
%guix-version))))
(operating-system installation-os))
#:name "iso9660-image"
#:system system)
;; Only cross-compile Guix System images from x86_64-linux for now.
,@(if (string=? system "x86_64-linux")
(map (cut image->job store <>
#:system system)
%guix-system-images)
'()))
'()))
(parameterize ((current-guix-package
(channel-source->package source #:commit commit)))
(if (member system %guix-system-supported-systems)
`(,(image->job store
(image
(inherit efi-disk-image)
(operating-system installation-os))
#:name "usb-image"
#:system system)
,(image->job
store
(image
(inherit (image-with-label
iso9660-image
(string-append "GUIX_" system "_"
(if (> (string-length %guix-version) 7)
(substring %guix-version 0 7)
%guix-version))))
(operating-system installation-os))
#:name "iso9660-image"
#:system system)
;; Only cross-compile Guix System images from x86_64-linux for now.
,@(if (string=? system "x86_64-linux")
(map (cut image->job store <>
#:system system)
%guix-system-images)
'()))
'())))
(define* (system-test-jobs store system
#:key source commit)
@ -527,7 +530,9 @@ names."
hello system))))
('images
;; Build Guix System images only.
(image-jobs store system))
(image-jobs store system
#:source source
#:commit commit))
('system-tests
;; Build Guix System tests only.
(system-test-jobs store system

View File

@ -96,7 +96,7 @@
(home-environment-essential-services he))))
(define* (home-environment-derivation he)
"Return a derivation that builds OS."
"Return a derivation that builds home environment."
(let* ((services (home-environment-services he))
(home (fold-services services
#:target-type home-service-type)))

View File

@ -420,8 +420,9 @@ extended with one gexp.")))
(he-path (string-append (getenv "HOME") "/.guix-home"))
(new-home-env (getenv "GUIX_NEW_HOME"))
(new-home (or new-home-env
;; Path of the activation file if called interactively
(dirname (car (command-line)))))
;; Absolute path of the directory of the activation
;; file if called interactively.
(canonicalize-path (dirname (car (command-line))))))
(old-home-env (getenv "GUIX_OLD_HOME"))
(old-home (or old-home-env
(if (file-exists? (he-init-file he-path))

View File

@ -69,17 +69,19 @@
" " value "\n"))
(define (address-family? obj)
(memv obj (list 'unset AF_INET AF_INET6)))
(memv obj (list AF_INET AF_INET6)))
(define-maybe address-family)
(define (serialize-address-family field family)
(if (eq? 'unset family)
""
(if (maybe-value-set? family)
(string-append " " (serialize-field-name field) " "
(cond ((= family AF_INET) "inet")
((= family AF_INET6) "inet6")
;; The 'else' branch is unreachable.
(else (raise (condition (&error)))))
"\n")))
"\n")
""))
(define (natural-number? obj)
(and (integer? obj) (exact? obj) (> obj 0)))
@ -115,7 +117,7 @@
maybe-string
"Host name---e.g., @code{\"foo.example.org\"} or @code{\"192.168.1.2\"}.")
(address-family
address-family
maybe-address-family
"Address family to use when connecting to this host: one of
@code{AF_INET} (for IPv4 only), @code{AF_INET6} (for IPv6 only).
Additionally, the field can be left unset to allow any address family.")

View File

@ -80,7 +80,6 @@
efi-installation?
default-esp-mount-point
with-delay-device-in-use?
force-device-sync
eligible-devices
partition-user-type

View File

@ -1246,6 +1246,7 @@ dist_patch_DATA = \
%D%/packages/patches/guile-ac-d-bus-fix-tests.patch \
%D%/packages/patches/guile-cross-compilation.patch \
%D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \
%D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \
%D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
%D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \
@ -1370,10 +1371,6 @@ dist_patch_DATA = \
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
%D%/packages/patches/kodi-skip-test-449.patch \
%D%/packages/patches/laby-make-install.patch \
%D%/packages/patches/lcalc-default-parameters-1.patch \
%D%/packages/patches/lcalc-default-parameters-2.patch \
%D%/packages/patches/lcalc-lcommon-h.patch \
%D%/packages/patches/lcalc-using-namespace-std.patch \
%D%/packages/patches/ldns-drill-examples.patch \
%D%/packages/patches/leela-zero-gtest.patch \
%D%/packages/patches/less-hurd-path-max.patch \
@ -1461,7 +1458,6 @@ dist_patch_DATA = \
%D%/packages/patches/llvm-roc-4.0.0-remove-isystem-usr-include.patch \
%D%/packages/patches/llvm-roc-5.0.0-linkdl.patch \
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \
%D%/packages/patches/lrcalc-includes.patch \
%D%/packages/patches/lsh-fix-x11-forwarding.patch \
%D%/packages/patches/lsof-fatal-test-failures.patch \
%D%/packages/patches/lua-CVE-2014-5461.patch \
@ -1614,6 +1610,7 @@ dist_patch_DATA = \
%D%/packages/patches/perl-5.14-module-pluggable-search.patch \
%D%/packages/patches/perl-5.14-no-sys-dirs.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \
%D%/packages/patches/perl-class-methodmaker-reproducible.patch \
%D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
%D%/packages/patches/perl-image-exiftool-CVE-2021-22204.patch \
%D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \
@ -1640,9 +1637,6 @@ dist_patch_DATA = \
%D%/packages/patches/plib-CVE-2011-4620.patch \
%D%/packages/patches/plib-CVE-2012-4552.patch \
%D%/packages/patches/plotutils-spline-test.patch \
%D%/packages/patches/polkit-CVE-2021-4034.patch \
%D%/packages/patches/polkit-configure-elogind.patch \
%D%/packages/patches/polkit-use-duktape.patch \
%D%/packages/patches/portaudio-audacity-compat.patch \
%D%/packages/patches/portmidi-modular-build.patch \
%D%/packages/patches/postgresql-disable-resolve_symlinks.patch \
@ -1680,6 +1674,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-cross-compile.patch \
%D%/packages/patches/python-configobj-setuptools.patch \
%D%/packages/patches/python-dateutil-pytest-compat.patch \
%D%/packages/patches/python-debugpy-unbundle-pydevd.patch \
%D%/packages/patches/python-docopt-pytest6-compat.patch \
%D%/packages/patches/python-execnet-read-only-fix.patch \
@ -1721,8 +1716,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-versioneer-guix-support.patch \
%D%/packages/patches/python-waitress-fix-tests.patch \
%D%/packages/patches/python-werkzeug-tests.patch \
%D%/packages/patches/python-mypy-12332.patch \
%D%/packages/patches/python-mypy-use-sys-path.patch \
%D%/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch \
%D%/packages/patches/qemu-build-info-manual.patch \
%D%/packages/patches/qemu-glibc-2.27.patch \

View File

@ -784,7 +784,7 @@ memory, disks, network and processes. It's a Python port and continuation of
(define-public pies
(package
(name "pies")
(version "1.7")
(version "1.8")
(source
(origin
(method url-fetch)
@ -792,7 +792,16 @@ memory, disks, network and processes. It's a Python port and continuation of
version ".tar.bz2"))
(sha256
(base32
"0ajcah2y6n55qc0ckspcx0hfpm1yb2xa1apcyij7mclic4q2y330"))))
"0v0xcq0mfil440xq2pa5mjkyva5c9ahqda54z5w2ksl2d78v8a35"))
(snippet
#~(begin
(use-modules (guix build utils))
(for-each delete-file
(append
;; Generated by flex.
(find-files "gres/src" "lex\\.c$")
;; Generated by bison.
(find-files "gres/src" "-gram\\.[ch]$")))))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -804,6 +813,7 @@ memory, disks, network and processes. It's a Python port and continuation of
(substitute* '("src/progman.c" "src/comp.c")
(("\"/bin/sh\"")
(string-append "\"" bash "/bin/sh\"")))))))))
(native-inputs (list bison flex))
(home-page "https://www.gnu.org.ua/software/pies/")
(synopsis "Program invocation and execution supervisor")
(description
@ -4193,7 +4203,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi"))
(package
(name "inxi-minimal")
(version "3.3.19-1")
(version "3.3.20-1")
(source
(origin
(method git-fetch)
@ -4202,7 +4212,7 @@ Python loading in HPC environments.")
(commit version)))
(file-name (git-file-name real-name version))
(sha256
(base32 "0g5m43cj4534gb181zy1hwjz5il88xibf8psxw8a4s6jnaq1zdlk"))))
(base32 "182lczpa217gpzn58nfdzjbbinp3bw9lbm1x9lck1mkdmqklgl2a"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash-minimal)
@ -5444,3 +5454,40 @@ attempts, it cannot eliminate the risk presented by weak authentication. Set
up services to use only two factor, or public/private authentication
mechanisms if you really want to protect services.")
(license license:gpl2+)))
(define-public rex
(package
(name "rex")
(version "4.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://download.gnu.org.ua/pub/releases/rex/rex-"
version ".tar.gz"))
(sha256
(base32
"1arb8z602invwavskq36nhwy42a3v14iyhi06iqlngfai2k93fai"))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #f ; no tests
#:phases
#~(modify-phases %standard-phases
;; No configure script and Makefile.
(delete 'configure)
(delete 'build)
(add-before 'install 'patch-exec-expect
(lambda _
(substitute* "rex"
(("exec expect") (string-append "exec " (which "expect"))))))
(replace 'install
(lambda _
(invoke "./install"
(string-append "--prefix=" #$output)))))))
(inputs (list expect))
(home-page "https://www.gnu.org.ua/software/rex/")
(synopsis "Remote execution utility")
(description "@command{rex} runs a supplied command or shell script on
several hosts in succession or in parallel. It can also be used to copy a
file or files to several hosts.")
(license license:gpl3+)))

View File

@ -1628,7 +1628,7 @@ John Cremona to compute his elliptic curve database.")
(define-public lrcalc
(package
(name "lrcalc")
(version "1.2")
(version "2.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1637,18 +1637,10 @@ John Cremona to compute his elliptic curve database.")
(file-name (git-file-name name version))
(sha256
(base32
"1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss"))
(patches (search-patches "lrcalc-includes.patch"))))
"0s3amf3z75hnrjyszdndrvk4wp5p630dcgyj341i6l57h43d1p4k"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake libtool))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-permission
(lambda _
(chmod "lrcalc.maple.src" #o644)
#t)))))
(synopsis "Littlewood-Richardson calculator in algebraic combinatorics")
(description "The Littlewood-Richardson Calculator (lrcalc) is a
program designed to compute Littlewood-Richardson coefficients. It computes

View File

@ -2,7 +2,7 @@
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -323,7 +323,7 @@ audio or video backends, ensuring good performance.")
(define-public lightspark
(package
(name "lightspark")
(version "0.8.5")
(version "0.8.6")
(source
(origin
(method git-fetch)
@ -332,7 +332,7 @@ audio or video backends, ensuring good performance.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "00535ndzjbz5xyr95cih01wlkc2mgvg60bv6amz4lnnglk0c5v0p"))))
(base32 "0v7d7vwb0xqkk3v8dyks0wyk52ga57v5lg93y74v1d2wh7spmmzw"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;requires Adobe Flex SDK, see README.tests
@ -352,29 +352,28 @@ audio or video backends, ensuring good performance.")
(when tests?
(invoke "./tests")))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("nasm" ,nasm)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(list gettext-minimal
`(,glib "bin")
nasm
perl
pkg-config
python-wrapper))
(inputs
`(("cairo" ,cairo)
("curl" ,curl)
("ffmpeg" ,ffmpeg)
("freeglut" ,freeglut)
("glew" ,glew)
("glibmm" ,glibmm)
("gnash" ,gnash)
("gnutls" ,gnutls)
("libjpeg" ,libjpeg-turbo)
("openssl" ,openssl)
("pango" ,pango)
("pcre2" ,pcre2)
("rtmpdump" ,rtmpdump)
("sdl2" ,sdl2)
("sdl2-mixer" ,sdl2-mixer)
("zlib" ,zlib)))
(list cairo
curl
ffmpeg
freeglut
glew
glibmm
gnutls
libjpeg-turbo
openssl
pango
pcre2
rtmpdump
sdl2
sdl2-mixer
zlib))
(home-page "https://lightspark.github.io/")
(synopsis "Flash player implementation")
(description

View File

@ -291,7 +291,7 @@ runtime")
(define-public rgbds
(package
(name "rgbds")
(version "0.4.2")
(version "0.5.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -300,7 +300,7 @@ runtime")
(file-name (git-file-name name version))
(sha256
(base32
"0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p"))))
"13zy05xzh2yxyvzf78a5h59pabwrfr6qs5m453pfbdyd3msg2s7w"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -312,8 +312,7 @@ runtime")
(("pkg-config")
(or (which "pkg-config")
(string-append ,(%current-target-system)
"-pkg-config"))))
#t))
"-pkg-config"))))))
(replace 'check
(lambda _
(with-directory-excursion "test/asm"

View File

@ -38,6 +38,7 @@
;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
;;; Copyright © 2022 Juliana Sims <jtsims@protonmail.com>
;;; Copyright © 2022 Simon Streit <simon@netpanic.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -875,6 +876,10 @@ engineers, musicians, soundtrack editors and composers.")
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("libraries/lib-files/FileNames.cpp")
(("\"/usr/include/linux/magic.h\"") "<linux/magic.h>"))))
(add-after 'install 'delete-gratuitous-script
(lambda* (#:key outputs #:allow-other-keys)
(delete-file (string-append (assoc-ref outputs "out")
"/audacity"))))
(add-after 'wrap-program 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))
;; The test suite is not "well exercised" according to the developers,
@ -5863,3 +5868,30 @@ framework. It provides a visual interface to audio and video connections
managed by PipeWire.")
(home-page "https://gitlab.freedesktop.org/rncbc/qpwgraph")
(license license:gpl2)))
(define-public streamripper
(package
(name "streamripper")
(version "1.64.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://sourceforge.net/projects/streamripper"
"/files/streamripper%20(current)/"
version "/streamripper-" version ".tar.gz"))
(sha256
(base32 "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"))
(modules '((guix build utils)))
(snippet
;; Delete bundled copy of libmad.
'(delete-file-recursively "libmad-0.15.1b"))))
(build-system gnu-build-system)
(native-inputs (list pkg-config))
(inputs (list faad2 glib libmad libvorbis))
(home-page "http://streamripper.sourceforge.net")
(synopsis "Record audio streams to your hard drive")
(description "Streamripper records shoutcast-compatible
streams. For shoutcast style streams it finds the meta data or track
separation data, and uses that as a marker for where the track should
be separated.")
(license license:gpl2+)))

View File

@ -72,14 +72,14 @@
(define-public fio
(package
(name "fio")
(version "3.30")
(version "3.31")
(source (origin
(method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2"))
(sha256
(base32
"1qjivkisn7dxk8irrb0rglmmdpbnai6n7vindf18ln0j24cc1x56"))))
"03x0n18f2wsyjh6qv57kvgqcwga54rzngwzr6fzlrjsalqw7mxlp"))))
(build-system gnu-build-system)
(arguments
(list #:modules

View File

@ -35,6 +35,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system r)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bioinformatics)
#:use-module (gnu packages boost)
@ -1220,6 +1221,27 @@ demonstration purposes in the @code{AneuFinder} package.")
from Illumina 450k methylation arrays.")
(license license:artistic2.0)))
(define-public r-bladderbatch
(package
(name "r-bladderbatch")
(version "1.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "bladderbatch" version
'experiment))
(sha256
(base32
"1dpbaqsqizyi99r0imf5m4lndhhrkyiaqii9bi8rp18fjbjdd72k"))))
(properties `((upstream-name . "bladderbatch")))
(build-system r-build-system)
(propagated-inputs (list r-biobase))
(home-page "https://bioconductor.org/packages/bladderbatch")
(synopsis "Bladder gene expression data illustrating batch effects")
(description
"This package contains microarray gene expression data on 57 bladder samples from
5 batches. The data are used as an illustrative example for the sva package.")
(license license:artistic2.0)))
(define-public r-biscuiteerdata
(package
(name "r-biscuiteerdata")
@ -1540,6 +1562,30 @@ harmonized subsetting of rows (features) and columns (patients / samples)
across the entire multi-'omics experiment.")
(license license:artistic2.0)))
(define-public r-parathyroidse
(package
(name "r-parathyroidse")
(version "1.34.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "parathyroidSE" version
'experiment))
(sha256
(base32
"1h33x55c4gbzmh085skqif04wdcvjp2l9fm55qzwws27kwd30c16"))))
(properties `((upstream-name . "parathyroidSE")))
(build-system r-build-system)
(propagated-inputs (list r-summarizedexperiment))
(home-page "https://bioconductor.org/packages/parathyroidSE")
(synopsis "RangedSummarizedExperiment for RNA-Seq of parathyroid tumors")
(description
"This package provides @code{RangedSummarizedExperiment} objects of read
counts in genes and exonic parts for paired-end RNA-Seq data from experiments on
primary cultures of parathyroid tumors. The sequencing was performed on tumor
cultures from 4 patients at 2 time points over 3 conditions (DPN, OHT and control).")
;; The author(s) mentions only LGPL without any specific version.
(license license:lgpl2.1+)))
(define-public r-tcgabiolinksgui-data
(package
(name "r-tcgabiolinksgui-data")
@ -2090,8 +2136,8 @@ canonical cancer pathways.")
(description
"The project is intended to support the use of @dfn{sequins}(synthetic
sequencing spike-in controls) owned and made available by the Garvan Institute
of Medical Research. The goal is to provide a standard open source library for
quantitative analysis, modelling and visualization of spike-in controls.")
of Medical Research. The goal is to provide a standard library for quantitative
analysis, modelling, and visualization of spike-in controls.")
(license license:bsd-3)))
(define-public r-aneufinder
@ -5016,6 +5062,45 @@ proteowizard library for mzML and mzIdentML. The netCDF reading code has
previously been used in XCMS.")
(license license:artistic2.0)))
(define-public r-organism-dplyr
(package
(name "r-organism-dplyr")
(version "1.24.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Organism.dplyr" version))
(sha256
(base32
"0j29f85d66c45ww3417xx376vpz0mmvga5n7h2cl1sd4h70b55as"))))
(properties `((upstream-name . "Organism.dplyr")))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
r-annotationfilter
r-biocfilecache
r-dbi
r-dbplyr
r-dplyr
r-genomeinfodb
r-genomicfeatures
r-genomicranges
r-iranges
r-rlang
r-rsqlite
r-s4vectors
r-tibble))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/Organism.dplyr")
(synopsis "Dplyr-based access to Bioconductor annotation resources")
(description
"This package provides an alternative interface to Bioconductor @code{
annotation} resources, in particular the gene identifier mapping functionality
of the @code{org} packages (e.g., @code{org.Hs.eg.db}) and the genome coordinate
functionality of the @code{TxDb} packages (e.g.,
@code{TxDb.Hsapiens.UCSC.hg38.knownGene}).")
(license license:artistic2.0)))
(define-public r-organismdbi
(package
(name "r-organismdbi")
@ -5048,6 +5133,61 @@ annotation packages each of which has its own schema by taking advantage of
the fact that each of these packages implements a select methods.")
(license license:artistic2.0)))
(define-public r-pcaexplorer
(package
(name "r-pcaexplorer")
(version "2.22.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "pcaExplorer" version))
(sha256
(base32
"0xkafpi6y5n8hljdaj183hd5z4ik7lpbklg2cbx1hwfz4n4hh1bl"))))
(properties `((upstream-name . "pcaExplorer")))
(build-system r-build-system)
(propagated-inputs
(list r-annotationdbi
r-base64enc
r-biomart
r-deseq2
r-dt
r-genefilter
r-genomicranges
r-ggplot2
r-ggrepel
r-go-db
r-gostats
r-heatmaply
r-iranges
r-knitr
r-limma
r-nmf
r-pheatmap
r-plotly
r-plyr
r-rmarkdown
r-s4vectors
r-scales
r-shiny
r-shinyace
r-shinybs
r-shinydashboard
r-summarizedexperiment
r-threejs
r-tidyr
r-topgo))
(native-inputs (list r-knitr))
(home-page "https://github.com/federicomarini/pcaExplorer")
(synopsis
"Interactive Visualization of RNA-seq Data Using a Principal Components Approach")
(description
"This package provides functionality for interactive visualization of RNA-seq
datasets based on Principal Components Analysis. The methods provided allow for
quick information extraction and effective data exploration. A Shiny
application encapsulates the whole analysis.")
(license license:expat)))
(define-public r-pcamethods
(package
(name "r-pcamethods")
@ -5611,6 +5751,38 @@ a scRNA-seq experiment onto the cell-types or individual cells identified in a
different experiment.")
(license license:gpl3)))
(define-public r-scry
(package
(name "r-scry")
(version "1.8.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "scry" version))
(sha256
(base32
"16mj21r91jy8ircdz8rfrdli9gjy0hrx90kf6ghs305d3d4dl193"))))
(properties `((upstream-name . "scry")))
(build-system r-build-system)
(propagated-inputs
(list r-biocsingular
r-delayedarray
r-glmpca
r-hdf5array
r-matrix
r-singlecellexperiment
r-summarizedexperiment))
(native-inputs (list r-knitr))
(home-page "https://bioconductor.org/packages/scry.html")
(synopsis "Small-count analysis methods for high-dimensional data")
(description
"Many modern biological datasets consist of small counts that are not
well fit by standard linear-Gaussian methods such as principal component
analysis. This package provides implementations of count-based feature
selection and dimension reduction algorithms. These methods can be used to
facilitate unsupervised analysis of any high-dimensional data such as
single-cell RNA-seq.")
(license license:artistic2.0)))
(define-public r-seqlogo
(package
(name "r-seqlogo")
@ -6541,9 +6713,10 @@ problems in genomics, brain imaging, astrophysics, and data mining.")
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/yixuan/RcppNumerical")
(synopsis "Rcpp integration for numerical computing libraries")
(description "This package provides a collection of open source libraries
for numerical computing (numerical integration, optimization, etc.) and their
integration with @code{Rcpp}.")
(description
"This package provides a collection of libraries for numerical computing
(numerical integration, optimization, etc.) and their integration with
@code{Rcpp}.")
(license license:gpl2+)))
(define-public r-apeglm
@ -7917,6 +8090,16 @@ coordinates.")
(base32
"0kc708ss5byzw8qh439mb4nq6hsfmz73gfamiznw3lv352brd33g"))))
(build-system r-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'make-build-order-reproducible
(lambda _
(substitute* '("src/SYMPHONY/Cgl/configure.ac"
"src/SYMPHONY/Cgl/configure")
(("for file in `ls \\*/Makefile.in`")
"for file in `ls */Makefile.in | sort`")))))))
(inputs
(list zlib))
(native-inputs
@ -12985,8 +13168,22 @@ gene expression.")
"0q2y4n6bcc9pvz5sgfkw1lrb00rrp7q29i1vh7srdfmfhgpyz6bk"))))
(properties `((upstream-name . "bgx")))
(build-system r-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'do-not-tune-cflags-for-reproducibility
(lambda _
(substitute* "configure.ac"
(("AX_GCC_ARCHFLAG.*") ""))
(delete-file "configure")
(invoke "autoreconf" "-vif"))))))
(inputs
(list boost))
(propagated-inputs
(list r-affy r-biobase r-gcrma r-rcpp))
(native-inputs
(list autoconf automake))
(home-page "https://bioconductor.org/packages/bgx/")
(synopsis "Bayesian gene expression")
(description

View File

@ -3985,26 +3985,44 @@ HMMs).")
(define-public htseq
(package
(name "htseq")
(version "0.12.3")
(version "2.0.2")
;; Sources on pypi do not include everything needed to run the tests.
(source (origin
(method url-fetch)
(uri (pypi-uri "HTSeq" version))
(method git-fetch)
(uri (git-reference
(url "https://github.com/htseq/htseq")
(commit (string-append "release_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0pk41vkzxsbb5nv644325mh8akmz4zdply9r2s80dgg5b21pgp0b"))))
"1kbr4ydjjhizz6r5m3xd4f0wj7qnn8zs0vnzghhgaa0yhbya5r19"))))
(build-system python-build-system)
(native-inputs
(list python-cython))
;; Numpy needs to be propagated when htseq is used as a Python library.
(arguments
(list
#:phases
'(modify-phases %standard-phases
;; Avoid rebuilding the extension. Everything is built during the
;; 'install phase anyway.
(delete 'build)
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-v")))))))
(propagated-inputs
(list python-numpy))
(inputs
(list python-pysam python-matplotlib))
(home-page "https://htseq.readthedocs.io/")
(synopsis "Analysing high-throughput sequencing data with Python")
(list python-matplotlib
python-numpy
python-pysam))
(native-inputs
(list python-cython
python-pandas
python-pytest
python-scipy
swig))
(home-page "https://github.com/htseq")
(synopsis "Framework for analyzing high-throughput sequencing data")
(description
"HTSeq is a Python package that provides infrastructure to process data
from high-throughput sequencing assays.")
"This package provides a framework to process and analyze data from
high-throughput sequencing (HTS) assays")
(license license:gpl3+)))
(define-public java-htsjdk
@ -6276,36 +6294,37 @@ subsequent visualization, annotation and storage of results.")
(base32 "0m8wkyvbgvcr5kzc284w8fbhpxwglh2c1xq0yc3yv00a53gs7rv0"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
,#~(list "BLASFLAGS=-llapack -lopenblas"
(string-append "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1"
" -I" (search-input-directory
%build-inputs "include/simde"))
"ZLIB=-lz"
"BIN=plink prettify"
(string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output)
"DESTDIR=")
#:phases
(modify-phases %standard-phases
(list
#:tests? #false ;TEST_EXTRACT_CHR doesn't produce expected files
#:make-flags
#~(list "BLASFLAGS=-llapack -lopenblas"
"NO_SSE42=1"
"NO_AVX2=1"
"STATIC_ZSTD="
(string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output)
"DESTDIR=")
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _ (chdir "1.9")))
(delete 'configure) ; no "configure" script
(lambda _ (chdir "2.0/build_dynamic")))
(delete 'configure) ; no "configure" script
(replace 'check
(lambda* (#:key tests? inputs #:allow-other-keys)
(when tests?
(symlink "plink" "plink19")
(symlink (search-input-file inputs "/bin/plink") "plink107")
(setenv "PATH" (string-append (getcwd) ":" (getenv "PATH")))
(with-directory-excursion "tests"
;; The model test fails because of a 0.0001 difference.
(substitute* "tests.py"
(("diff -q test1.model test2.model")
"echo yes"))
(invoke "bash" "test_setup.sh")
(invoke "python3" "tests.py"))))))))
(with-directory-excursion "../Tests"
(substitute* "run_tests.sh"
(("^./run_tests" m)
(string-append (which "bash") " " m)))
(invoke "bash" "run_tests.sh")))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "plink2"
(string-append
(assoc-ref outputs "out") "/bin")))))))
(inputs
(list lapack openblas zlib))
(list lapack openblas zlib `(,zstd "lib")))
(native-inputs
(list diffutils plink python simde)) ; for tests
(home-page "https://www.cog-genomics.org/plink/")
@ -6430,6 +6449,86 @@ Values such as sequence name, sequence description, sequence quality and the
sequence itself can be retrieved from these databases.")
(license license:bsd-3)))
(define-public python-taggd
(package
(name "python-taggd")
(version "0.3.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/SpatialTranscriptomicsResearch/taggd")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0j19ah81z7aqrdljah9hyarp91gvgbk63pz6fz3pdpksy1yqyi6k"))
(modules '((guix build utils)))
(snippet
'(for-each delete-file
(find-files "taggd" "\\.c$")))))
(build-system python-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'disable-broken-tests
(lambda _
(substitute* "tests/taggd_demultiplex_test.py"
(("def test_normal_bam_run")
"def _disabled_test_normal_bam_run")))))))
(propagated-inputs
(list python-numpy python-pysam python-setuptools))
(native-inputs
(list python-cython))
(home-page "https://github.com/SpatialTranscriptomicsResearch/taggd")
(synopsis "Genetic barcode demultiplexing")
(description "This package provides TagGD barcode demultiplexing utilities
for Spatial Transcriptomics data.")
(license license:bsd-3)))
(define-public stpipeline
(package
(name "stpipeline")
(version "1.8.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "stpipeline" version))
(sha256
(base32
"0har2g42fvaqpiz66lincy86aj1hvwzds26kxhxfamvyvv4721wk"))))
(build-system python-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "requirements.txt"
(("argparse.*") "")))))))
(propagated-inputs
(list htseq
python-cython
python-invoke
python-numpy
python-pandas
python-pympler
python-pysam
python-regex
python-scikit-learn
python-scipy
python-seaborn
python-setuptools
python-sqlitedict
python-taggd
samtools
star))
(home-page "https://github.com/SpatialTranscriptomicsResearch/st_pipeline")
(synopsis "Pipeline for spatial mapping of unique transcripts")
(description
"This package provides an automated pipeline for spatial mapping of
unique transcripts.")
(license license:expat)))
(define-public sra-tools
(package
(name "sra-tools")
@ -11292,13 +11391,13 @@ cases include:
(define-public python-mappy
(package
(name "python-mappy")
(version "2.18")
(version "2.24")
(source (origin
(method url-fetch)
(uri (pypi-uri "mappy" version))
(sha256
(base32
"1a05p7rkmxa6qhm108na8flzj2v45jab06drk59kzk1ip2sgvzqq"))))
"1ycszza87p9qvx8mis9v1hry0ac465x1xcxbsn1k45qlxxrzp8im"))))
(build-system python-build-system)
(native-inputs
(list python-cython))
@ -16097,6 +16196,32 @@ control samples and applying quantile normalization on all markers of
interest.")
(license license:gpl2+))))
(define-public r-kbet
(let ((commit "f35171dfb04c7951b8a09ac778faf7424c4b6bc0")
(revision "1"))
(package
(name "r-kbet")
(version (git-version "0.99.6" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/theislab/kBET")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1r91prl2kki3zk694vhlmxdlqh0ixlhs8jfcqw6wc7cdsa0nv67k"))))
(properties `((upstream-name . "kBET")))
(build-system r-build-system)
(propagated-inputs (list r-cluster r-fnn r-ggplot2 r-mass r-rcolorbrewer))
(native-inputs (list r-knitr))
(home-page "https://github.com/theislab/kBET")
(synopsis "k-nearest neighbour batch effect test")
(description
"This tool detects batch effects in high-dimensional data based on chi^2-test.")
;; Any version of the GPL
(license license:gpl3+))))
(define-public ccwl
(package
(name "ccwl")
@ -16330,3 +16455,271 @@ alignment algorithm. It completes MashMap with a high-performance alignment
module capable of computing base-level alignments for very large sequences.")
(home-page "https://github.com/ekg/wfmash")
(license license:expat)))
(define-public flair
(package
(name "flair")
(version "1.6.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/BrooksLabUCSC/flair")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"106swb2q7l20ki58fca1hg95q5f79bgp9gjb0clr2243ycrzyxf8"))))
(build-system python-build-system)
(arguments
(list
#:tests? #false ;there are none
#:phases
#~(modify-phases %standard-phases
;; TODO: implement as a feature of python-build-system (PEP-621,
;; PEP-631, PEP-660)
(replace 'build
(lambda _
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)
;; ZIP does not support timestamps before 1980.
(setenv "SOURCE_DATE_EPOCH" "315532800")
(invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
(replace 'install
(lambda _
(apply invoke "pip" "--no-cache-dir" "--no-input"
"install" "--no-deps" "--prefix" #$output
(find-files "dist" "\\.whl$")))))))
(propagated-inputs
(list python-mappy
python-ncls
python-pybedtools
python-pysam
python-tqdm))
(native-inputs
(list python-pypa-build python-setuptools))
(home-page "https://flair.readthedocs.io/en/latest/")
(synopsis "Full-length alternative isoform analysis of RNA")
(description "This package implements FLAIR (Full-Length Alternative
Isoform analysis of RNA) for the correction, isoform definition, and
alternative splicing analysis of noisy reads. FLAIR has primarily been used
for nanopore cDNA, native RNA, and PacBio sequencing reads.")
(license license:bsd-3)))
(define-public go-github-com-biogo-graph
(package
(name "go-github-com-biogo-graph")
(version "0.0.0-20150317020928-057c1989faed")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/biogo/graph")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
"1kpzs5dfd5dsk4mg1g2qjz1prqd84ixhrcxxnf90hq25vxcnk7lh"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/biogo/graph"
#:tests? #false)) ;TODO: one of 13 tests fails for unknown reasons
(propagated-inputs
(list go-gopkg-in-check-v1))
(home-page "https://github.com/biogo/graph")
(synopsis "Undirected graph analysis for biogo")
(description "The package @code{graph} implements graph manipulation
functions.")
(license license:bsd-3)))
(define-public go-github-com-biogo-store-interval
(package
(name "go-github-com-biogo-store-interval")
(version "0.0.0-20201120204734-aad293a2328f")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/biogo/store")
(commit (go-version->git-ref version))))
(file-name (git-file-name name version))
(sha256
(base32
"0skizrp1j6vgbl0g1kmh73picagqlvwckaqs0gkl6rai5lckxj8a"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/biogo/store/interval"
#:unpack-path "github.com/biogo/store"))
(propagated-inputs
(list go-gopkg-in-check-v1
go-github-com-kr-pretty))
(home-page "https://github.com/biogo/store")
(synopsis "Interval store type for biogo")
(description
"The @code{store} package provides a number of data store types that are
useful for bioinformatic analysis.")
(license license:bsd-3)))
(define-public go-github-com-biogo-store-kdtree
(package
(inherit go-github-com-biogo-store-interval)
(name "go-github-com-biogo-store-kdtree")
(arguments
'(#:import-path "github.com/biogo/store/kdtree"
#:unpack-path "github.com/biogo/store"))
(propagated-inputs
(list go-gopkg-in-check-v1
go-github-com-kr-pretty))
(synopsis "kdtree store type for biogo")))
(define-public go-github-com-biogo-store-llrb
(package
(inherit go-github-com-biogo-store-interval)
(name "go-github-com-biogo-store-llrb")
(arguments
'(#:import-path "github.com/biogo/store/llrb"
#:unpack-path "github.com/biogo/store"))
(propagated-inputs
(list go-gopkg-in-check-v1
go-github-com-kr-pretty))
(synopsis "LLRB store for biogo")))
(define-public go-github-com-biogo-store-step
(package
(inherit go-github-com-biogo-store-interval)
(name "go-github-com-biogo-store-step")
(arguments
'(#:import-path "github.com/biogo/store/step"
#:unpack-path "github.com/biogo/store"))
(propagated-inputs
(list go-gopkg-in-check-v1
go-github-com-kr-pretty))
(synopsis "Step store for biogo")))
(define-public go-github-com-biogo-hts-bam
(package
(name "go-github-com-biogo-hts-bam")
(version "1.4.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/biogo/hts")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"013ga6ilc4m3hyfr3yyiva9g4vs81afhj73v2sy7r75b5zxw7lx1"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/biogo/hts/bam"
#:unpack-path "github.com/biogo/hts"))
(propagated-inputs
(list go-gopkg-in-check-v1))
(home-page "https://github.com/biogo/hts")
(synopsis "HTS BAM module for biogo")
(description "This package provides tools for handling BAM files.")
(license license:bsd-3)))
(define-public go-github-com-biogo-hts-sam
(package
(inherit go-github-com-biogo-hts-bam)
(name "go-github-com-biogo-hts-sam")
(arguments
'(#:import-path "github.com/biogo/hts/sam"
#:unpack-path "github.com/biogo/hts"))
(propagated-inputs
(list go-gopkg-in-check-v1))
(synopsis "HTS SAM module for biogo")
(description "This package provides tools for handling SAM files.")))
(define-public go-github-com-biogo-hts-tabix
(package
(inherit go-github-com-biogo-hts-bam)
(name "go-github-com-biogo-hts-tabix")
(arguments
'(#:import-path "github.com/biogo/hts/tabix"
#:unpack-path "github.com/biogo/hts"))
(propagated-inputs
(list go-gopkg-in-check-v1))
(synopsis "HTS Tabix module for biogo")
(description "This package provides tools for handling Tabix files.")))
(define-public go-github-com-biogo-hts-bgzf
(package
(inherit go-github-com-biogo-hts-bam)
(name "go-github-com-biogo-hts-bgzf")
(arguments
'(#:import-path "github.com/biogo/hts/bgzf"
#:unpack-path "github.com/biogo/hts"))
(propagated-inputs
(list go-gopkg-in-check-v1))
(synopsis "HTS bgzf module for biogo")
(description "This package provides tools for handling bgzf files.")))
(define-public go-github-com-biogo-hts-cram
(package
(inherit go-github-com-biogo-hts-bam)
(name "go-github-com-biogo-hts-cram")
(arguments
'(#:import-path "github.com/biogo/hts/cram"
#:unpack-path "github.com/biogo/hts"
#:tests? #false)) ;require network access
(propagated-inputs
(list go-gopkg-in-check-v1
go-github.com-ulikunitz-xz
go-github-com-kortschak-utter))
(synopsis "HTS CRAM module for biogo")
(description "This package provides tools for handling CRAM files.")))
(define-public go-github-com-biogo-hts-csi
(package
(inherit go-github-com-biogo-hts-bam)
(name "go-github-com-biogo-hts-csi")
(arguments
'(#:import-path "github.com/biogo/hts/csi"
#:unpack-path "github.com/biogo/hts"))
(propagated-inputs
(list go-gopkg-in-check-v1))
(synopsis "Coordinate sorted indexing for biogo")
(description "This package implements CSIv1 and CSIv2 coordinate sorted
indexing.")))
(define-public go-github-com-biogo-hts-fai
(package
(inherit go-github-com-biogo-hts-bam)
(name "go-github-com-biogo-hts-fai")
(arguments
'(#:import-path "github.com/biogo/hts/fai"
#:unpack-path "github.com/biogo/hts"))
(propagated-inputs
(list go-gopkg-in-check-v1))
(synopsis "Fasta sequence file index handling for biogo")
(description "This package implements FAI fasta sequence file index
handling.")))
(define-public go-github-com-biogo-biogo
(package
(name "go-github-com-biogo-biogo")
(version "1.0.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/biogo/biogo")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ali1mqf3dc26myv6l7wmqfr8i25461rbq3qdad8s0wi29622199"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/biogo/biogo"))
(propagated-inputs
(list go-gopkg-in-check-v1
go-github-com-biogo-store-interval
go-github-com-biogo-store-kdtree
go-github-com-biogo-store-llrb
go-github-com-biogo-store-step
go-github-com-biogo-hts-bam
go-github-com-biogo-graph))
(home-page "https://github.com/biogo/biogo")
(synopsis "Bioinformatics library for Go")
(description
"Bíogo is a bioinformatics library for the Go language.")
(license license:bsd-3)))

View File

@ -16,6 +16,7 @@
;;; Copyright © 2021 Josselin Poiret <josselin.poiret@protonmail.ch>
;;; Copyright © 2022 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2022 Jacob Hart <hartja1@yahoo.com>
;;; Copyright © 2022 Simon Streit <simon@netpanic.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -132,7 +133,7 @@
(string-append gui "/share/man/man1/transmission-gtk.1"))
#t))))))
(inputs
(list libevent curl openssl zlib gtk+))
(list libevent curl openssl zlib gtk+ libappindicator))
(native-inputs
(list intltool pkg-config))
(home-page "https://transmissionbt.com/")

View File

@ -7,7 +7,7 @@
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017, 2018, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 20182022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 nee <nee@cock.li>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
@ -1157,14 +1157,14 @@ tools, and more.")
(define-public os-prober
(package
(name "os-prober")
(version "1.80")
(version "1.81")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_"
version ".tar.xz"))
(sha256
(base32 "13z3rshgz5xj0328a80wavdimjw925yha9s1ks398sq0kn5w6qw0"))))
(base32 "10w8jz6mqhp0skdcam9mpgv79vx1sv7lkpra3rqjg0jkhvn2in9g"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)

View File

@ -51,7 +51,7 @@ supported content to the Kodi media center.")
(define ublock-origin
(package
(name "ublock-origin")
(version "1.43.0")
(version "1.44.0")
(home-page "https://github.com/gorhill/uBlock")
(source (origin
(method git-fetch)
@ -62,7 +62,7 @@ supported content to the Kodi media center.")
(file-name (git-file-name name version))
(sha256
(base32
"0w0by41v1s1cbd3bfjlb7kxr2bl6r5z3jvizlx02x14hqlppma9k"))))
"0sws7xd8nvxnzcyw92i9sc5xv3hpqw1kzdj9vm8bhfxlh042l7ly"))))
(build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium"))
(arguments

View File

@ -102,7 +102,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public bear
(package
(name "bear")
(version "3.0.19")
(version "3.0.20")
(source
(origin
(method git-fetch)
@ -111,7 +111,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "05jbcx5m923dg27j3i442hc73hdci5n7vp7a671x1w7bdivgqg96"))))
(base32 "0k89ccp9vz3x71w3r2wfpng9b8s0rxp4qr0ch9q32wq6y1ik847j"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases

View File

@ -463,7 +463,7 @@ as dictionaries, skip lists, and memory pools.")
(define-public packcc
(package
(name "packcc")
(version "1.7.2")
(version "1.8.0")
(home-page "https://github.com/arithy/packcc")
(source (origin
(method git-fetch)
@ -473,7 +473,7 @@ as dictionaries, skip lists, and memory pools.")
(file-name (git-file-name name version))
(sha256
(base32
"1mb6ys5ylvjz0xpq6769ir98s80p98s9ahd0c9k8p2ra1w20vz33"))))
"0b25p7ri1l2l20awyknljfnj7r4rg7cf2x3bljijx5q6j8rxdcsg"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases

View File

@ -408,58 +408,59 @@ or @command{xorrisofs} to create ISO 9660 images.")
(define-public dvdisaster
(package
(name "dvdisaster")
(version "0.79.9")
(version "0.79.10")
(source
(origin
(method url-fetch)
(uri (string-append "https://dvdisaster.jcea.es/downloads/dvdisaster-"
version ".tar.bz2"))
(sha256
(base32 "1hz3fvqfdrwb7dn6ggqkpcgyjag37ivm1layw27ncjz9glklxjbr"))))
(base32 "1s3z4098ixdjr3gjs36fg7rykqs0zz1rnvz2v9rvyj0s5zv9y2nx"))))
(build-system gnu-build-system)
(inputs
(list gtk+-2))
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("which" ,which)))
(list gettext-minimal pkg-config which))
(arguments
`(;; Parallel builds appear to be unsafe, see
;; <http://hydra.gnu.org/build/49331/nixlog/1/raw>.
#:parallel-build? #f
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(with-directory-excursion "regtest"
(substitute* "common.bash"
(("ISODIR=/var/tmp/regtest") "ISODIR=/tmp"))
(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")))
(substitute* "contrib/dvdisaster.desktop"
(("dvdisaster48.png") "dvdisaster.png"))
(install-file "contrib/dvdisaster.desktop"
(string-append datadir "/applications"))
(for-each
(lambda (png)
(let* ((size (substring png
(string-index png char-set:digit)
(string-rindex png #\.)))
(icondir (string-append datadir "/icons/"
size "x" size "/apps")))
(mkdir-p icondir)
(copy-file png (string-append icondir "/dvdisaster.png"))))
(find-files "contrib" "dvdisaster[0-9]*\\.png"))
(mkdir-p (string-append datadir "/pixmaps"))
(copy-file "contrib/dvdisaster48.xpm"
(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"))))))))
(list #:parallel-build? #f ; http://hydra.gnu.org/build/49331/nixlog/1/raw
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda _
(with-directory-excursion "regtest"
(substitute* "common.bash"
(("ISODIR=/var/tmp/regtest") "ISODIR=/tmp"))
(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")))
(substitute* "contrib/dvdisaster.desktop"
(("dvdisaster48.png") "dvdisaster.png"))
(install-file "contrib/dvdisaster.desktop"
(string-append datadir "/applications"))
(for-each
(lambda (png)
(let* ((size (substring
png
(string-index png char-set:digit)
(string-rindex png #\.)))
(icondir (string-append datadir "/icons/"
size "x" size "/apps")))
(mkdir-p icondir)
(copy-file png
(string-append icondir
"/dvdisaster.png"))))
(find-files "contrib" "dvdisaster[0-9]*\\.png"))
(mkdir-p (string-append datadir "/pixmaps"))
(copy-file "contrib/dvdisaster48.xpm"
(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

View File

@ -665,19 +665,27 @@ test) much simpler.")
(define-public go-github.com-smartystreets-assertions
(package
(name "go-github.com-smartystreets-assertions")
(version "1.8.1")
(version "1.13.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/smartystreets/assertions")
(commit version)))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1j0adgbykl55rf2945g0n5bmqdsnjcqlx5dcmpfh4chki43hiwg9"))))
(base32 "0flf3fb6fsw3bk1viva0fzrzw87djaj1mqvrx2gzg1ssn7xzfrzr"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/smartystreets/assertions"))
(list
#:import-path "github.com/smartystreets/assertions"
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(unless
;; The tests fail when run with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
(native-inputs
(list go-github.com-smartystreets-gunit))
(synopsis "Assertions for testing with Go")
@ -2689,18 +2697,29 @@ create data based on random numbers and yet remain repeatable.")
(define-public python-freezegun
(package
(name "python-freezegun")
(version "0.3.14")
(version "1.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "freezegun" version))
(sha256
(base32 "0al75mk829j1izxi760b7yjnknjihyfhp2mvi5qiyrxb9cpxwqk2"))))
(base32 "0ijlq32qvpm5zprfzbyzawpl9qjsknlxhryr1i0q84wl0sxd28nd"))
(modules '((guix build utils)))
(snippet
;; Add an explicit case for static methods as they are callable
;; in Python 3.10, breaking this conditional.
;; XXX Taken from upstream pull request:
;; https://github.com/spulec/freezegun/pull/397
'(substitute* "freezegun/api.py"
(("if not callable\\(attr_value\\) or \
inspect\\.isclass\\(attr_value\\):")
"if (not callable(attr_value) or inspect.isclass(attr_value)\
or isinstance(attr_value, staticmethod)):")))))
(build-system python-build-system)
(native-inputs
(list python-mock python-pytest))
(list python-pytest))
(propagated-inputs
(list python-six python-dateutil))
(list python-dateutil))
(arguments
`(#:phases
(modify-phases %standard-phases

View File

@ -316,7 +316,7 @@
;; run the Blink performance tests, just remove everything to save ~70MiB.
'("third_party/blink/perf_tests"))
(define %chromium-version "104.0.5112.81")
(define %chromium-version "104.0.5112.101")
(define %ungoogled-revision (string-append %chromium-version "-1"))
(define %debian-revision "debian/102.0.5005.61-1")
@ -328,7 +328,7 @@
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
(sha256
(base32
"0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w"))))
"0jy5hjn61p5mnbqns3jlybim7iy8w9cmzm3i84wn68cyyx1bk25m"))))
(define %debian-origin
(origin
@ -477,7 +477,7 @@
%chromium-version ".tar.xz"))
(sha256
(base32
"0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y"))
"0nrghgngxdn9richjnxii9y94dg5zpwc3gd3vx609r4xaphibw30"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system)

View File

@ -5,6 +5,7 @@
;;; Copyright © 2017, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -193,16 +194,16 @@ intended as a replacement for Hydra.")
(define-public laminar
(package
(name "laminar")
(version "1.1")
(version "1.2")
(source
(origin (method url-fetch)
(uri (string-append "https://github.com/ohwgiles/laminar/archive/"
version
".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(origin (method git-fetch)
(uri (git-reference
(url "https://github.com/ohwgiles/laminar")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1lzfmfjygmbdr2n1q49kwwffw8frz5y6iczhdz5skwmzwg0chbsf"))))
"1sg0kccp3nczkn2vxcsqv10vyvmjnhpaykc1nfhh55jyda4xzf9w"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; TODO Can't build tests
@ -223,8 +224,7 @@ intended as a replacement for Hydra.")
(("install\\(FILES \\$\\{CMAKE\\_CURRENT\\_BINARY\\_DIR\\}\\/laminar\\.service DESTINATION \\$\\{SYSTEMD\\_UNITDIR\\}\\)")
"")
(("install\\(FILES etc/laminar\\.conf DESTINATION \\/etc\\)") "")
(("\\/usr\\/") ""))
#t))
(("\\/usr\\/") ""))))
(add-after 'configure 'copy-in-javascript-and-css
(lambda* (#:key inputs outputs #:allow-other-keys)
(use-modules (ice-9 popen))
@ -253,9 +253,7 @@ intended as a replacement for Hydra.")
;; ansi_up.js isn't minified
(copy-file (assoc-ref inputs "ansi_up.js")
"../build/js/ansi_up.js")
#t)))))
"../build/js/ansi_up.js"))))))
(inputs
(list capnproto rapidjson sqlite boost zlib))
(native-inputs

View File

@ -390,7 +390,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(define-public universal-ctags
(package
(name "universal-ctags")
(version "5.9.20220626.0")
(version "5.9.20220807.0")
(source
(origin
(method git-fetch)
@ -400,7 +400,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(file-name (git-file-name name version))
(sha256
(base32
"1x5kqqznlbndwln8g0kcxnla6b94i7x7cd63ba2sj0fzzms5gx24"))
"1wjj6hlda7xyjm8yrl2zz74ks7azymm9yyrpz36zxxpx2scf6lsk"))
(modules '((guix build utils)))
(snippet
'(begin

View File

@ -101,7 +101,18 @@ It is developed using Objective Caml and Camlp5.")
(name "coq-stdlib")
(arguments
`(#:package "coq-stdlib"
#:test-target "."))
#:test-target "."
#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-dune
(lambda _
(substitute* "user-contrib/Ltac2/dune"
(("coq-core.plugins.ltac2")
(string-join
(map (lambda (plugin) (string-append "coq-core.plugins." plugin))
'("ltac2" "number_string_notation" "tauto" "cc"
"firstorder"))
" "))))))))
(inputs
(list coq-core gmp ocaml-zarith))
(native-inputs '())))

View File

@ -1871,3 +1871,37 @@ std::filesystem compatible helper library, based on the C++17 and C++20 specs,
but implemented for C++11, C++14, C++17 or C++20.")
(home-page "https://github.com/gulrak/filesystem")
(license license:expat)))
(define-public cpp-mustache
(package
(name "cpp-mustache")
(version "4.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kainjow/Mustache")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb"))))
(build-system cmake-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "./mustache"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "../source/mustache.hpp"
(string-append (assoc-ref outputs "out")
"/include")))))))
(home-page "https://github.com/kainjow/Mustache")
(synopsis "Mustache text templates for modern C++")
(description "@code{cpp-mustache} is a Mustache implementation for C++ 11
and above. It is header only and has zero dependencies. It provides a
templated string type for compatibility with any STL-like string (std::string,
std::wstring, etc).")
(license license:boost1.0)))

View File

@ -104,6 +104,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages statistics)
#:use-module (gnu packages tbb)
#:use-module (gnu packages tcl)
#:use-module (gnu packages tex)
#:use-module (gnu packages textutils)
@ -115,6 +116,35 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
(define-public r-aer
(package
(name "r-aer")
(version "1.2-10")
(source (origin
(method url-fetch)
(uri (cran-uri "AER" version))
(sha256
(base32
"1p6vxr0220lim5i4gwsvphqrfd65zbs8h3qydz4gipca9asmy2k5"))))
(properties `((upstream-name . "AER")))
(build-system r-build-system)
(propagated-inputs
(list r-car
r-formula
r-lmtest
r-sandwich
r-survival
r-zoo))
(home-page "https://cran.r-project.org/package=AER")
(synopsis "Applied econometrics with R")
(description
"This package provides functions, data sets, examples, demos, and
vignettes for the book Christian Kleiber and Achim Zeileis (2008), Applied
Econometrics with R, Springer-Verlag, New York. ISBN 978-0-387-77316-2. (See
the vignette \"AER\" for a package overview.)")
;; Either version of the GPL
(license (list license:gpl2 license:gpl3))))
(define-public r-afpt
(package
(name "r-afpt")
@ -392,6 +422,28 @@ Gaussian quadrature for a numerical solution.")
Distance (EMD).")
(license license:expat)))
(define-public r-glmpca
(package
(name "r-glmpca")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (cran-uri "glmpca" version))
(sha256
(base32
"02xjf0gg52925hw9nw2j0znfmzfzfwbv0fxjl9d2fy9j63drr2h4"))))
(properties `((upstream-name . "glmpca")))
(build-system r-build-system)
(propagated-inputs (list r-mass))
(native-inputs (list r-knitr))
(home-page "https://github.com/willtownes/glmpca")
(synopsis "Dimension Reduction of Non-Normally Distributed Data")
(description
"This package implements a generalized version of principal components
analysis (GLM-PCA) for dimension reduction of non-normally distributed data
such as counts or binary matrices.")
(license license:lgpl3+)))
(define-public r-googledrive
(package
(name "r-googledrive")
@ -748,6 +800,42 @@ similar rank-based tests for equal probability distributions due to Neuhauser
WebAssembly engine.")
(license license:expat)))
(define-public r-rvenn
(package
(name "r-rvenn")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "RVenn" version))
(sha256
(base32
"016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"))))
(properties `((upstream-name . "RVenn")))
(build-system r-build-system)
(propagated-inputs
(list r-ggforce
r-ggplot2
r-magrittr
r-pheatmap
r-purrr
r-rlang
r-vegan))
(native-inputs (list r-knitr))
(home-page "https://cran.r-project.org/package=RVenn")
(synopsis "Set operations for many sets")
(description
"The base functions for set operations in @code{R} can be used for only two
sets. This package @code{RVenn} provides functions for dealing with multiple sets.
It uses @code{purr} to find the union, intersection and difference of three or
more sets. This package also provides functions for pairwise set operations among
several sets. Further, based on @code{ggplot2} and @code{ggforce}, a Venn diagram
can be drawn for two or three sets. For bigger data sets, a clustered heatmap
showing the presence or absence of the elements of the sets can be drawn based on
the @code{pheatmap} package. Finally, enrichment test can be applied to two sets
whether an overlap is statistically significant or not.")
(license license:gpl3)))
(define-public r-dot
(package
(name "r-dot")
@ -1060,6 +1148,65 @@ the reasonable size limit without losing vector properties of the
scale-sensitive information.")
(license license:expat)))
(define-public r-ggvenn
(package
(name "r-ggvenn")
(version "0.1.9")
(source (origin
(method url-fetch)
(uri (cran-uri "ggvenn" version))
(sha256
(base32
"0bm52j3idchignp6nrw7c76jlbfkjf5zng258957vq019vx9qxrq"))))
(properties `((upstream-name . "ggvenn")))
(build-system r-build-system)
(propagated-inputs (list r-dplyr r-ggplot2))
(home-page "https://cran.r-project.org/package=ggvenn")
(synopsis "Draw Venn diagram with ggplot2")
(description
"This package offers an easy to use way to draw a Venn diagram with
@code{ggplot2}.")
(license license:expat)))
(define-public r-ggvenndiagram
(package
(name "r-ggvenndiagram")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggVennDiagram" version))
(sha256
(base32
"1mjs488npnxd53nsw936iw2vzv7z38h8d02pm4lwrz4i83jg3www"))))
(properties `((upstream-name . "ggVennDiagram")))
(build-system r-build-system)
(propagated-inputs
(list r-dplyr
r-ggplot2
r-magrittr
r-plotly
r-purrr
r-rvenn
r-sf
r-stringr
r-tibble))
(native-inputs (list r-knitr))
(home-page "https://github.com/gaospecial/ggVennDiagram")
(synopsis "Implementention of the Venn diagram using ggplot2")
(description
"This package implements easy-to-use functions to generate 2-7 sets Venn
plot in publication quality. @code{ggVennDiagram} plot Venn using
well-defined geometry dataset and @code{ggplot2}. The shapes of 2-4 sets Venn
use circles and ellipses, while the shapes of 4-7 sets Venn use irregular
polygons (4 has both forms), which are developed and imported from another
package @code{venn}. We provide internal functions to integrate shape data
with user provided sets data, and calculated the geometry of every
regions/intersections of them, then separately plot Venn in three components:
set edges, set labels, and regions. From version 1.0, it is possible to
customize these components as you demand in ordinary @code{ggplot2} grammar.")
(license license:gpl3)))
(define-public r-lmds
(package
(name "r-lmds")
@ -1482,6 +1629,28 @@ qualitative palettes with many (20-30 or more) colors. See Coombes and
colleagues (2019) @url{https://doi:10.18637/jss.v090.c01}.")
(license license:asl2.0)))
(define-public r-polylabelr
(package
(name "r-polylabelr")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (cran-uri "polylabelr" version))
(sha256
(base32
"01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2"))))
(properties `((upstream-name . "polylabelr")))
(build-system r-build-system)
(propagated-inputs (list r-rcpp))
(home-page "https://github.com/jolars/polylabelr")
(synopsis "Finding pole of inaccessibility (visual center) of a polygon")
(description
"This package provides a wrapper around the @code{C++} library @code{
polylabel} from @code{Mapbox}, providing an efficient routine for finding the
approximate pole of inaccessibility of a polygon, which usually serves as an
excellent candidate for labeling of a polygon.")
(license license:expat)))
(define-public r-poorman
(package
(name "r-poorman")
@ -3512,6 +3681,24 @@ coordinates.")
@end enumerate\n")
(license license:gpl2+)))
(define-public r-gensa
(package
(name "r-gensa")
(version "1.1.7")
(source (origin
(method url-fetch)
(uri (cran-uri "GenSA" version))
(sha256
(base32
"03xqwxm7v7rnihx730a4p65dfwhjh4345r3d78y0qxxplk8d76cx"))))
(properties `((upstream-name . "GenSA")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/package=GenSA")
(synopsis "Generalized simulated annealing")
(description "This package performs search for the global minimum of a very
complex non-linear objective function with a very large number of optima.")
(license license:gpl2)))
(define-public r-geosphere
(package
(name "r-geosphere")
@ -6393,6 +6580,27 @@ Information-Maximization (Infomax), and @dfn{Joint Approximate Diagonalization
of Eigenmatrices} (JADE).")
(license license:gpl2+)))
(define-public r-ips
(package
(name "r-ips")
(version "0.0.11")
(source (origin
(method url-fetch)
(uri (cran-uri "ips" version))
(sha256
(base32
"02jxanfhsjrabj33nwjv71vdc87hiyzikyqrfdj9ix6dky6lm199"))))
(properties `((upstream-name . "ips")))
(build-system r-build-system)
(propagated-inputs (list r-ape r-phangorn r-plyr r-seqinr r-xml))
(home-page "https://cran.r-project.org/package=ips")
(synopsis "Interfaces to phylogenetic software in R")
(description
"This package provides functions that wrap popular phylogenetic software
for sequence alignment, masking of sequence alignments, and estimation of
phylogenies and ancestral character states.")
(license license:gpl3)))
(define-public r-dtw
(package
(name "r-dtw")
@ -9216,6 +9424,14 @@ always locate the files relative to your project root.")
(base32
"0b1szzsqyc8wcfpkn5517bb1ds064vs2hky71my3p74kfngay991"))))
(build-system r-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'build-reproducibly
(lambda _
(setenv "PYTHONHASHSEED" "0")
(setenv "PYTHONDONTWRITEBYTECODE" "1"))))))
(inputs (list python))
(propagated-inputs
(list r-here
@ -13657,9 +13873,20 @@ package provides a minimal R interface by relying on the Rcpp package.")
(uri (cran-uri "RcppParallel" version))
(sha256
(base32
"1sn211ajlb1p12sglxqns175rg078yvww268m8cp0vvd7cmk55k3"))))
"1sn211ajlb1p12sglxqns175rg078yvww268m8cp0vvd7cmk55k3"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "src/tbb/"))))
(properties `((upstream-name . "RcppParallel")))
(build-system r-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'use-system-tbb
(lambda* (#:key inputs #:allow-other-keys)
(setenv "TBB_ROOT" (assoc-ref inputs "tbb")))))))
(inputs (list tbb-2020))
(home-page "https://rcppcore.github.io/RcppParallel/")
(synopsis "Parallel programming tools for Rcpp")
(description
@ -19040,6 +19267,15 @@ packages with Rcpp.")
(base32
"17znizh4yabh2zs9mzyr0sl6p0pw49961i61br7cl1b7v9sza18q"))))
(build-system r-build-system)
(arguments
(list
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'build-reproducibly
(lambda _
(substitute* "R/aaa.R"
(("BASEDATETIME <- Sys.time.*")
"BASEDATETIME <- structure(0, class = c(\"POSIXct\", \"POSIXt\"))\n")))))))
(propagated-inputs
(list r-farver r-magrittr r-rcpp r-rlang))
(home-page "https://github.com/thomasp85/tweenr")

View File

@ -10307,7 +10307,7 @@ box''.")
(define-public rust-cc-1
(package
(name "rust-cc")
(version "1.0.67")
(version "1.0.73")
(source
(origin
(method url-fetch)
@ -10315,7 +10315,7 @@ box''.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1z9p27ys80shv09zhknmlal8jjra78agdwg97i6jjd6lg83rpip3"))))
"04ccylrjq94jssh8f7d7hxv64gs9f1m1jrsxb7wqgfxk4xljmzrg"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f
@ -25025,14 +25025,14 @@ authenticated encryption cipher.")
(define-public rust-ghost-0.1
(package
(name "rust-ghost")
(version "0.1.2")
(version "0.1.6")
(source
(origin
(method url-fetch)
(uri (crate-uri "ghost" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0yalg3g1g3cz63n3phy7cdhh7p2qd220mrpxy96alwxbpqdwynqs"))))
(base32 "0fj42hmlgcj1rbqcshlvk65npsks4ba7vdzphb9202gawf6zw6gb"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@ -28897,14 +28897,14 @@ Rust.")
(define-public rust-indoc-1
(package
(name "rust-indoc")
(version "1.0.3")
(version "1.0.7")
(source
(origin
(method url-fetch)
(uri (crate-uri "indoc" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0diih20xsxjb159nr0dq6jxnyhq7gg10dlsnh2siikphmvm5m9z5"))))
(base32 "1qs42cn8rj7kdpmp1dlkzhv62rfmbx3ffwvsfw67zyq86jm1xaxd"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #true
@ -29479,8 +29479,37 @@ primitive Rust types.")
immutable interval tree.")
(license license:expat)))
(define-public rust-inventory-0.2
(package
(name "rust-inventory")
(version "0.2.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "inventory" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "06h9xw67wx18rank4yyz93iq89j0fk6fbazryfvf5ach1dp4qd44"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-ctor" ,rust-ctor-0.1)
("rust-ghost" ,rust-ghost-0.1))
#:cargo-development-inputs
(("rust-rustversion" ,rust-rustversion-1)
("rust-trybuild" ,rust-trybuild-1))))
(home-page "https://github.com/dtolnay/inventory")
(synopsis "Typed distributed plugin registration")
(description
"This package provides a way to set up a plugin registry into which
plugins can be registered from any source file linked into your program.
There does not need to be a central list of all the plugins.")
;; Either license can be chosen at the users option.
(license (list license:expat license:asl2.0))))
(define-public rust-inventory-0.1
(package
(inherit rust-inventory-0.2)
(name "rust-inventory")
(version "0.1.11")
(source
@ -29490,21 +29519,12 @@ immutable interval tree.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1m1zdjgs3nzfdxf86mc1i0id56fvk8rfw63rf04yi88bqrh53szh"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-ctor" ,rust-ctor-0.1)
("rust-ghost" ,rust-ghost-0.1)
("rust-inventory-impl" ,rust-inventory-impl-0.1))))
(home-page "https://github.com/dtolnay/inventory")
(synopsis "Typed distributed plugin registration")
(description
"This package provides a way to set up a plugin registry into which
plugins can be registered from any source file linked into your program.
There does not need to be a central list of all the plugins.")
;; Either license can be chosen at the users option.
(license (list license:expat license:asl2.0))))
("rust-inventory-impl" ,rust-inventory-impl-0.1))))))
(define-public rust-inventory-impl-0.1
(package
@ -40387,17 +40407,17 @@ platform-native strings.")
"11agh8n3x2l4sr3sxvx6byc1j3ryb1g6flb1ywn0qhq7xv1y3cmg"))))
(arguments `(#:skip-build? #t))))
(define-public rust-ouroboros-macro-0.14
(define-public rust-ouroboros-macro-0.15
(package
(name "rust-ouroboros-macro")
(version "0.14.0")
(version "0.15.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "ouroboros_macro" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "11cav04x82liknlrv50lpl1i1ln2jw4isdqzdjnjsg0pcpvwik9r"))))
(base32 "01lgyj5nxgr6r1l0m20pp4ilz3m14clsqg2j28hic2rrlsjafjkk"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@ -40413,8 +40433,45 @@ platform-native strings.")
"This package provides a proc macro for the @code{ouroboros} crate.")
(license (list license:expat license:asl2.0))))
(define-public rust-ouroboros-macro-0.14
(package
(inherit rust-ouroboros-macro-0.15)
(name "rust-ouroboros-macro")
(version "0.14.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "ouroboros_macro" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "11cav04x82liknlrv50lpl1i1ln2jw4isdqzdjnjsg0pcpvwik9r"))))))
(define-public rust-ouroboros-0.15
(package
(name "rust-ouroboros")
(version "0.15.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "ouroboros" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1qhd9cvc4hwdbr37da1jh0k0742slchixlxn4wxgc7g3l63yl9bl"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-aliasable" ,rust-aliasable-0.1)
("rust-ouroboros-macro" ,rust-ouroboros-macro-0.15)
("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
(home-page "https://github.com/joshua-maros/ouroboros")
(synopsis "Self-referential struct generation")
(description
"Easy, safe self-referential struct generation for Rust.")
(license (list license:expat license:asl2.0))))
(define-public rust-ouroboros-0.14
(package
(inherit rust-ouroboros-0.15)
(name "rust-ouroboros")
(version "0.14.0")
(source
@ -40424,17 +40481,11 @@ platform-native strings.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1ih1lna1d2is3a6aicmc7lpfhqmg046kssxpryk24kwg8j42ymh6"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-aliasable" ,rust-aliasable-0.1)
("rust-ouroboros-macro" ,rust-ouroboros-macro-0.14)
("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
(home-page "https://github.com/joshua-maros/ouroboros")
(synopsis "Self-referential struct generation")
(description
"Easy, safe self-referential struct generation for Rust.")
(license (list license:expat license:asl2.0))))
("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
(define-public rust-output-vt100-0.1
(package
@ -46269,8 +46320,34 @@ they were parsed from")
@code{LC_COLLATE} and @code{LC_CTYPE} are not yet supported.")
(license license:expat)))
(define-public rust-pyo3-build-config-0.16
(package
(name "rust-pyo3-build-config")
(version "0.16.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "pyo3-build-config" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1j2jj5qnnpagi3gvkwjpydcxfsd5qv3vmpghnaqs7n1mdia5pdmm"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-once-cell" ,rust-once-cell-1)
("rust-python3-dll-a" ,rust-python3-dll-a-0.2)
("rust-target-lexicon" ,rust-target-lexicon-0.12))))
(native-inputs (list python)) ;for tests
(home-page "https://github.com/pyo3/pyo3")
(synopsis "Build configuration for PyO3")
(description
"This package contains build configuration helpers for the PyO3
ecosystem.")
(license license:asl2.0)))
(define-public rust-pyo3-build-config-0.15
(package
(inherit rust-pyo3-build-config-0.16)
(name "rust-pyo3-build-config")
(version "0.15.1")
(source
@ -46280,20 +46357,63 @@ they were parsed from")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0aw5zfqwzj5rzfxjyqvrqfam138d1009jh6kia4xrgdz538y9yfv"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-once-cell" ,rust-once-cell-1))))
(native-inputs '())))
(define-public rust-pyo3-ffi-0.16
(package
(name "rust-pyo3-ffi")
(version "0.16.5")
(source (origin
(method url-fetch)
(uri (crate-uri "pyo3-ffi" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0avls4q393nmzhb124zg6kp5lj6xzy2f6qx564qa7b614xqs0xf2"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16))))
(home-page "https://github.com/pyo3/pyo3")
(synopsis "Build configuration for PyO3")
(synopsis "Python API bindings for the PyO3 ecosystem")
(description
"This package contains build configuration helpers for the PyO3
ecosystem.")
"This crate provides Rust FFI declarations for Python 3.")
(license license:asl2.0)))
(define-public rust-pyo3-macros-backend-0.16
(package
(name "rust-pyo3-macros-backend")
(version "0.16.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "pyo3-macros-backend" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1bvzvdx2a6hhliny12n2vy7v7gbsgzanxjckjr1cbxbkizss1gak"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))
(home-page "https://github.com/pyo3/pyo3")
(synopsis "Code generation for PyO3")
(description
"This package provides code generation backends for PyO3.")
(license license:asl2.0)))
(define-public rust-pyo3-macros-backend-0.15
(package
(inherit rust-pyo3-macros-backend-0.16)
(name "rust-pyo3-macros-backend")
(version "0.15.1")
(source
@ -46310,15 +46430,35 @@ ecosystem.")
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))
("rust-syn" ,rust-syn-1))))))
(define-public rust-pyo3-macros-0.16
(package
(name "rust-pyo3-macros")
(version "0.16.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "pyo3-macros" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1xwh7sl4n73746q80n5m5afd261zg0kxcqfnlr89ik7vbd4c8kr8"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.16)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))
(home-page "https://github.com/pyo3/pyo3")
(synopsis "Code generation for PyO3")
(synopsis "Proc macros for PyO3")
(description
"This package provides code generation backends for PyO3.")
"This package provides compiler macros for use with PyO3.")
(license license:asl2.0)))
(define-public rust-pyo3-macros-0.15
(package
(inherit rust-pyo3-macros-0.16)
(name "rust-pyo3-macros")
(version "0.15.1")
(source
@ -46334,15 +46474,64 @@ ecosystem.")
#:cargo-inputs
(("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.15)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))
("rust-syn" ,rust-syn-1))))))
(define-public rust-pyo3-0.16
(package
(name "rust-pyo3")
(version "0.16.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "pyo3" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1p5kjsj3jdw2gnahdjrzljmi93w3nxdp11qq8x3i80b0a3l04qqy"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-eyre" ,rust-eyre-0.6)
("rust-hashbrown" ,rust-hashbrown-0.11)
("rust-indexmap" ,rust-indexmap-1)
("rust-indoc" ,rust-indoc-1)
("rust-inventory" ,rust-inventory-0.2)
("rust-libc" ,rust-libc-0.2)
("rust-num-bigint" ,rust-num-bigint-0.4)
("rust-num-complex" ,rust-num-complex-0.4)
("rust-parking-lot" ,rust-parking-lot-0.11)
("rust-paste" ,rust-paste-0.1)
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)
("rust-pyo3-ffi" ,rust-pyo3-ffi-0.16)
("rust-pyo3-macros" ,rust-pyo3-macros-0.16)
("rust-serde" ,rust-serde-1)
("rust-unindent" ,rust-unindent-0.1))
#:cargo-development-inputs
(("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
("rust-bitflags" ,rust-bitflags-1.2)
("rust-criterion" ,rust-criterion-0.3)
("rust-half" ,rust-half-1)
("rust-proptest" ,rust-proptest-0.10)
("rust-rustversion" ,rust-rustversion-1)
("rust-send-wrapper" ,rust-send-wrapper-0.5)
("rust-serde-json" ,rust-serde-json-1)
("rust-trybuild" ,rust-trybuild-1)
("rust-widestring" ,rust-widestring-0.5))
;; FIXME: fails to initialize Python interpreter.
#:tests? #f))
(inputs (list python))
(home-page "https://github.com/pyo3/pyo3")
(synopsis "Proc macros for PyO3")
(synopsis "Rust bindings for the Python interpreter")
(description
"This package provides compiler macros for use with PyO3.")
"This package provides Rust bindings for Python, including tools for
creating native Python extension modules. Running and interacting with
Python code from a Rust binary is also supported.")
(license license:asl2.0)))
(define-public rust-pyo3-0.15
(package
(inherit rust-pyo3-0.16)
(name "rust-pyo3")
(version "0.15.1")
(source
@ -46388,15 +46577,29 @@ ecosystem.")
("rust-serde-json" ,rust-serde-json-1)
("rust-trybuild" ,rust-trybuild-1))
;; FIXME: fails to initialize Python interpreter.
#:tests? #f))
(inputs (list python))
(home-page "https://github.com/pyo3/pyo3")
(synopsis "Rust bindings for the Python interpreter")
#:tests? #f))))
(define-public rust-python3-dll-a-0.2
(package
(name "rust-python3-dll-a")
(version "0.2.5")
(source (origin
(method url-fetch)
(uri (crate-uri "python3-dll-a" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"01k2nf4wq4f4xnaq3fy1gx12v10pndwmdrjq4x4pshhjxxnrpml9"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ;Windows-like targets only
#:cargo-inputs (("rust-cc" ,rust-cc-1))))
(home-page "https://github.com/pyo3/python3-dll-a")
(synopsis "Python import library generator")
(description
"This package provides Rust bindings for Python, including tools for
creating native Python extension modules. Running and interacting with
Python code from a Rust binary is also supported.")
(license license:asl2.0)))
"This crate generates import libraries for the Python shared library
for MinGW-w64 and MSVC (cross-)compile targets.")
(license license:expat)))
(define-public rust-qstring-0.7
(package
@ -54504,17 +54707,17 @@ Semantic Versioning.")
(base32
"18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"))))))
(define-public rust-send-wrapper-0.4
(define-public rust-send-wrapper-0.5
(package
(name "rust-send-wrapper")
(version "0.4.0")
(version "0.5.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "send_wrapper" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1l7s28vfnwdbjyrrk3lx81jy4f0dcrv4iwyah2wj6vndxhqxaf7n"))))
(base32 "1mwbg1nv36d5kdjb0iwmprz24km0m8ck08dn59gdngqdc77hl34k"))))
(build-system cargo-build-system)
(arguments `(#:skip-build? #t))
(home-page "https://github.com/thk1/send_wrapper")
@ -54527,6 +54730,20 @@ also have to make sure that the wrapper is dropped from within the original
thread. If any of these constraints is violated, a panic occurs.")
(license (list license:expat license:asl2.0))))
(define-public rust-send-wrapper-0.4
(package
(inherit rust-send-wrapper-0.5)
(name "rust-send-wrapper")
(version "0.4.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "send_wrapper" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1l7s28vfnwdbjyrrk3lx81jy4f0dcrv4iwyah2wj6vndxhqxaf7n"))))
(arguments `(#:skip-build? #t))))
(define-public rust-seq-io-0.3
(package
(name "rust-seq-io")
@ -71599,10 +71816,10 @@ terms of allowing LLVM's auto-vectorizer to do its job.")
(("rust-bytemuck" ,rust-bytemuck-1))))
(license (list license:zlib))))
(define-public rust-widestring-0.4
(define-public rust-widestring-0.5
(package
(name "rust-widestring")
(version "0.4.2")
(version "0.5.1")
(source
(origin
(method url-fetch)
@ -71610,7 +71827,7 @@ terms of allowing LLVM's auto-vectorizer to do its job.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"13565qy4jhpg4x0xw8mwxzzsh0p8c93p5208lh6kpwp0q01y6qx7"))))
"10qrilijh1qzw362mvd4nsz3vv32dxx530vk41hkcx8hah22z20p"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-development-inputs
@ -71624,6 +71841,23 @@ UTF-32 types are provided, including support for malformed encoding.")
(license (list license:asl2.0
license:expat))))
(define-public rust-widestring-0.4
(package
(inherit rust-widestring-0.5)
(name "rust-widestring")
(version "0.4.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "widestring" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"13565qy4jhpg4x0xw8mwxzzsh0p8c93p5208lh6kpwp0q01y6qx7"))))
(arguments
`(#:cargo-development-inputs
(("rust-winapi" ,rust-winapi-0.3))))))
(define-public rust-wild-2
(package
(name "rust-wild")

View File

@ -51,6 +51,7 @@
#:use-module (gnu packages tls)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix gexp)
@ -457,17 +458,33 @@ applications''. These must be installed separately.")
(define-public cups-pk-helper
(package
(name "cups-pk-helper")
(version "0.2.6")
(version "0.2.7")
(source (origin
(method url-fetch)
(uri (string-append "https://freedesktop.org/software/"
name "/releases/" name "-" version ".tar.xz"))
(sha256
(base32
"0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"))))
(build-system gnu-build-system)
"0cg8wbxpkz9bkpasz973cdazi02svqpbw9mafvpgrscg8kdhs1v6"))))
(build-system meson-build-system)
(arguments
;; XXX The tests require a running D-Bus and CUPS daemon, of course.
(list #:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-compatibility-symlink
;; XXX Upstream (and, presumably, the world) has moved to
;; /share/dbus-1 over /etc/dbus-1, but Guix System's
;; dbus-configuration-directory has yet to catch up.
;; TODO It should be properly fixed and this phase removed.
(lambda* (#:key outputs #:allow-other-keys)
(with-directory-excursion (assoc-ref outputs "out")
(mkdir-p "etc")
(symlink "../share/dbus-1" "etc/dbus-1")))))))
(native-inputs
(list intltool pkg-config glib polkit cups))
(list intltool pkg-config `(,glib "bin")))
(inputs
(list glib polkit cups-minimal))
(home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/")
(synopsis "PolicyKit helper to configure CUPS with fine-grained privileges")
(description
@ -846,7 +863,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(define-public epson-inkjet-printer-escpr
(package
(name "epson-inkjet-printer-escpr")
(version "1.7.18")
(version "1.7.21")
;; XXX: This currently works. But it will break as soon as a newer
;; version is available since the URLs for older versions are not
;; preserved. An alternative source will be added as soon as
@ -854,11 +871,11 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(source
(origin
(method url-fetch)
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/43/"
"81/cbdd80826424935cef20d16be8ee5851388977a7/"
"epson-inkjet-printer-escpr-1.7.18-1lsb3.2.tar.gz"))
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/77/"
"93/e85dc2dc266e96fdc242bd95758bd88d1a51963e/"
"epson-inkjet-printer-escpr-1.7.21-1lsb3.2.tar.gz"))
(sha256
(base32 "06pa47rl1gy19bg3fsp4a4y9vdy4ya2maajm14n791ivhf2hcwyh"))))
(base32 "0z1x9p58321plf2swfxgl72wn7ls8bfbyjwd9l9c8jxfr1v2skkz"))))
(build-system gnu-build-system)
(arguments
(list #:modules

View File

@ -481,14 +481,14 @@ mapping from string keys to string values.")
(define-public memcached
(package
(name "memcached")
(version "1.6.15")
(version "1.6.16")
(source
(origin
(method url-fetch)
(uri (string-append
"https://memcached.org/files/memcached-" version ".tar.gz"))
(sha256
(base32 "05fmds73hr71bha9gszjfp02lgyacqfyyhkgl6xysy4kchyvwyld"))))
(base32 "1nilmfhy8hc7zzlihnx3hmiqf7siyrpgz2g5s3r3l36xy4xsjl9h"))))
(build-system gnu-build-system)
(inputs
(list libevent cyrus-sasl))
@ -699,6 +699,38 @@ auto-completion and syntax highlighting.")
\"special\", or \"backslash commands\") on PostgreSQL.")
(license license:bsd-3)))
(define-public python-sqlitedict
(package
(name "python-sqlitedict")
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "sqlitedict" version))
(sha256
(base32
"05sxy016k3p5sjjhdg0ad9z15i6vm3rq4cr9m8nrc7jfdx0p18r3"))))
(build-system python-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv"
"-k"
;; No idea why these fail.
(string-append "not test_py24_error"
" and not test_tablenames"))))))))
(native-inputs (list python-pytest))
(home-page "https://github.com/piskvorky/sqlitedict")
(synopsis "Persistent dict backed up by sqlite3 and pickle")
(description
"This package provides a lightweight wrapper around the sqlite3 database
with a simple, Pythonic @code{dict}-like interface and support for
multi-thread access.")
(license license:asl2.0)))
(define-public pgcli
(package
(name "pgcli")
@ -1489,8 +1521,6 @@ CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.")
(sha256
(base32 "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q"))))
(build-system python-build-system)
(native-inputs
(list python-unittest2))
(inputs
(list python-cryptography))
(arguments
@ -3510,44 +3540,37 @@ PickleShare.")
(define-public python-apsw
(package
(name "python-apsw")
(version "3.36.0-r1")
(version "3.39.2.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/rogerbinns/apsw/releases"
"/download/" version "/apsw-" version ".zip"))
(sha256
(base32
"0w8q73147hv77dlpqrx6h1gx03acc8xqhvdpfp6vkffdm0wmqd8p"))))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rogerbinns/apsw")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0q7fnk8n3m5mpjzh6xyhj409k8sacdbjsfis98my9c50fdn5sr7y"))))
(build-system python-build-system)
(native-inputs
(list unzip))
(inputs
(list sqlite))
(inputs (list sqlite))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'build
(lambda _
(invoke "python" "setup.py" "build" "--enable-all-extensions"
"--enable=load_extension")
#t))
(add-after 'build 'build-test-helper
(lambda _
(invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext"
"-I." "-Isqlite3" "src/testextension.c")
#t))
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "python" "setup.py" "test")
#t)))))
(list #:phases
#~(modify-phases %standard-phases
(replace 'build
(lambda _
(invoke "python" "setup.py" "build" "--enable-all-extensions"
"--enable=load_extension")))
(add-after 'build 'build-test-helper
(lambda _
(invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext"
"-I." "-Isqlite3" "src/testextension.c"))))))
(home-page "https://github.com/rogerbinns/apsw/")
(synopsis "Another Python SQLite Wrapper")
(description "APSW is a Python wrapper for the SQLite
embedded relational database engine. In contrast to other wrappers such as
pysqlite it focuses on being a minimal layer over SQLite attempting just to
translate the complete SQLite API into Python.")
(description
"APSW is a Python wrapper for the SQLite embedded relational database
engine. In contrast to other wrappers such as pysqlite it focuses on being a
minimal layer over SQLite attempting just to translate the complete SQLite API
into Python.")
(license license:zlib)))
(define-public python-aiosqlite
@ -3931,7 +3954,7 @@ reasonable substitute.")
(define-public python-rq
(package
(name "python-rq")
(version "1.5.2")
(version "1.11")
(source
(origin
(method git-fetch)
@ -3940,7 +3963,7 @@ reasonable substitute.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ikqmpq0g1qiqwd7ar1286l4hqjb6aj2wr844gihhb8ijzwhp8va"))))
(base32 "1dj3m8dh9vf1qiq1drjhfw5xbr975v1kpzn4fwja83cfd7jrpzvy"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -3957,7 +3980,7 @@ reasonable substitute.")
(getenv "PATH")))
(invoke "pytest" "-vv")))))))
(native-inputs
(list python-mock python-pytest redis))
(list python-mock python-psutil python-pytest redis))
(propagated-inputs
(list python-click python-redis))
(home-page "https://python-rq.org/")
@ -4757,9 +4780,9 @@ a Gtk.Grid Widget.")
sqlite))
(native-inputs (list qttools-5))
(home-page "https://sqlitebrowser.org/")
(synopsis "Database browser for SQLite")
(description "Sqlitebrowser is a high quaility, visual, open source tool to
create design, and edit database file compatible with SQLite.")
(synopsis "Visual database browser and editor for SQLite")
(description "Sqlitebrowser lets you create, design, and edit database files
compatible with SQLite using a graphical user interface.")
(license
;; dual license
(list license:gpl3+

View File

@ -331,9 +331,9 @@ debian/copyright for more information.")))))
(home-page "http://apt-mirror.github.io/")
(synopsis "Script for mirroring a Debian repository")
(description
"apt-mirror is a small tool that provides the ability to
selectively mirror Debian and Ubuntu GNU/Linux distributions or any
other apt sources typically provided by open source developers.")
"apt-mirror is a small tool that provides the ability to selectively
mirror @acronym{APT, advanced package tool} sources, including GNU/Linux
distributions such as Debian and Trisquel.")
(license license:gpl2))))
(define-public dpkg

View File

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

View File

@ -74,7 +74,7 @@
(define-public diffoscope
(package
(name "diffoscope")
(version "220")
(version "221")
(source
(origin
(method git-fetch)
@ -83,7 +83,7 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0lkwbyf1z93skgqp1w4p0d7y8wwqf0bs53i43micwaq8p8xjs1ph"))
(base32 "0b89hygd4m18p3wcx7haz0kwx7gn7irjswxz29lv8sb2r1vqq4za"))
(patches
(search-patches "diffoscope-fix-llvm-test.patch"))))
(build-system python-build-system)

View File

@ -140,7 +140,7 @@ protocol.")
(define-public ldns
(package
(name "ldns")
(version "1.8.1")
(version "1.8.3")
(source
(origin
(method url-fetch)
@ -148,7 +148,7 @@ protocol.")
(string-append "https://www.nlnetlabs.nl/downloads/"
"ldns/ldns-" version ".tar.gz"))
(sha256
(base32 "18vzdmyg9bm45janw602d4hifjsncrv143awlwcslfjdrsmjk0lm"))
(base32 "0q3q1svyxpj2g5wdkfy1ndb14m9fzffwyskflpihfabb0g8jvxy3"))
(patches
(search-patches
;; To create make-flag variables,
@ -333,14 +333,14 @@ and BOOTP/TFTP for network booting of diskless machines.")
;; When updating, check whether isc-dhcp's bundled copy should be as well.
;; The BIND release notes are available here:
;; https://www.isc.org/bind/
(version "9.16.31")
(version "9.16.32")
(source
(origin
(method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/bind9/" version
"/bind-" version ".tar.xz"))
(sha256
(base32 "1yvwdvcyy996p50j7nr4b010w16jjj5czw15g87wf1dn6xncp8lc"))
(base32 "0w2rcjxqnbhwzgsdsas36dadjq0qn6s1xjx4g4qk0ph2nvf4gj9j"))
(patches
(search-patches "bind-re-add-attr-constructor-priority.patch"))))
(build-system gnu-build-system)
@ -871,7 +871,7 @@ Extensions} (DNSSEC).")
(define-public knot
(package
(name "knot")
(version "3.1.8")
(version "3.1.9")
(source
(origin
(method git-fetch)
@ -880,7 +880,7 @@ Extensions} (DNSSEC).")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0v3rh27qnyihdqp5nm8bnn9xd5rl2fbwhj4cmdpc8ik4qs21xyf4"))
(base32 "0w3jyz9qgkb34gkv2lr71phk5ad3rycn86qyw7n88ryhdsk45j73"))
(modules '((guix build utils)))
(snippet
'(begin

View File

@ -341,12 +341,12 @@ additional metadata about the object to which the docstring belongs.")
(list intltool))
(home-page "http://scrollkeeper.sourceforge.net/")
(synopsis "Open Documentation Cataloging Project")
(description "ScrollKeeper is a cataloging system for documentation on open
systems. It manages documentation metadata as specified by the Open Source
Metadata Framework and provides a simple API to allow help browsers to find,
sort, and search the document catalog. It will also be able to communicate
with catalog servers on the Net to search for documents which are not on the
local system.")
(description
"ScrollKeeper is a cataloging system for documentation. It manages
documentation metadata as specified by the Open Source Metadata Framework and
provides a simple API to allow help browsers to find, sort, and search the
document catalog. It will also be able to communicate with catalog servers on
the Net to search for documents which are not on the local system.")
(license lgpl2.1+)))
(define-public zeal

View File

@ -41,7 +41,7 @@
(define-public dunst
(package
(name "dunst")
(version "1.8.1")
(version "1.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -50,7 +50,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"19bh5789whlc0n5wbyx3yx8px93hccn42f1p6i1dz96hdkk5mjb8"))))
"1nfxf2rahngxpy606yrizrz16d0pswl5sa9jfzpv7h19x6xy24vx"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target

View File

@ -518,7 +518,7 @@ following formats:
(define-public cozy
(package
(name "cozy")
(version "1.2.0")
(version "1.2.1")
(source
(origin
(method git-fetch)
@ -527,7 +527,7 @@ following formats:
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0igqf9b77i13sxlk4ziw549h379hmz1slrb3vvf8irk94gxabsaw"))))
(base32 "0qky885fl63d5ih5d3rggm8rhp00sk6lny26qljyz3gga8n9y6ki"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t

View File

@ -49,7 +49,7 @@
;;; 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, 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2019, 2020 Amin Bandali <bandali@gnu.org>
@ -250,7 +250,7 @@
(define-public emacs-geiser
(package
(name "emacs-geiser")
(version "0.23.2")
(version "0.26")
(source
(origin
(method git-fetch)
@ -259,7 +259,7 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0p5cwx0xwva4ajgj8hnrk8bx6n3hv1z7aqs4zivp81crnq4077yw"))))
(base32 "1pm33zlcq84h61xhplmrlicckrax1pv39zrmv8ryzhi9mqrb6bdg"))))
(build-system emacs-build-system)
(arguments
'(#:phases
@ -328,7 +328,7 @@ e.g. emacs-geiser-guile for Guile.")
(("\\(geiser-activate-implementation .*\\)" all)
(string-append
"(eval-after-load 'geiser-impl '" all ")"))))))))
(inputs (list guile-3.0))
(inputs (list guile-3.0-latest))
(propagated-inputs (list emacs-geiser))
(home-page "https://www.nongnu.org/geiser/")
(synopsis "Guile Scheme support for Geiser")
@ -642,6 +642,25 @@ outlines, manage all your contacts, your windows and frames, and search across
buffers, directory trees, or the web.")
(license license:gpl3+)))
(define-public emacs-vlf
(package
(name "emacs-vlf")
(version "1.7.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"vlf-" version ".tar"))
(sha256
(base32 "0hpri19z6b7dqmrj5ckp8sf0m0l72lkgahqzvfmwhgpgv2p81bny"))))
(build-system emacs-build-system)
(home-page "https://github.com/m00natic/vlfi/")
(synopsis "View large files in Emacs")
(description
"Vlf is an Emacs minor mode that allows viewing, editing, searching and
comparing large files in batches.")
(license license:gpl2+)))
(define-public emacs-hg-histedit
;; From 2021-03-02.
;; No releases available.
@ -2881,7 +2900,7 @@ while paused.")
(package
(name "emacs-async")
(home-page "https://github.com/jwiegley/emacs-async")
(version "1.9.4")
(version "1.9.6")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2890,7 +2909,7 @@ while paused.")
(file-name (git-file-name name version))
(sha256
(base32
"0hhpyxb3d531jb2f3wvzx25183f0anm8nxv6mh0p825q2gkm6ly7"))))
"1q480ss2jgijdpy6pa4xrjni9pf5q6dwf8hv052fhdpi55bmfdn2"))))
(build-system emacs-build-system)
(synopsis "Asynchronous processing in Emacs")
(description
@ -2961,7 +2980,7 @@ or XEmacs.")
(define-public emacs-autothemer
(package
(name "emacs-autothemer")
(version "0.2.2")
(version "0.2.9")
(source
(origin
(method git-fetch)
@ -2971,7 +2990,7 @@ or XEmacs.")
(file-name (git-file-name name version))
(sha256
(base32
"0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"))))
"1p7ii7f0w607zxyqnr8ivi0n0sg2p93pi6dpd9kjqywdagqyrnw1"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-dash))
@ -3162,7 +3181,7 @@ Its features are:
(define-public emacs-citeproc-el
(package
(name "emacs-citeproc-el")
(version "0.9")
(version "0.9.1")
(source
(origin
(method git-fetch)
@ -3171,7 +3190,7 @@ Its features are:
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1m5j1abyk68f3d1v781yrx2xkg42vyfgfckbj2yk2lgk6d7rz0p1"))))
(base32 "0rkwqn9pcimfcyq19wlrcij0kcjyhbwisla7vwbhjj8ang0bq9rm"))))
(build-system emacs-build-system)
(arguments
`(#:emacs ,emacs)) ;need libxml support
@ -4300,6 +4319,34 @@ which is restored where possible when the file is loaded again.")
strings.")
(license license:gpl3+)))
(define-public emacs-blight
(let ((commit "6bf9c6192d2bf979eebbfae1963401ef3ff4ef5d")
(revision "0"))
(package
(name "emacs-blight")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://codeberg.org/emacs-weirdware/blight")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1x7s1fcva5kkl9iyb5grd6crf38rrz3zb0c6wb85khi9far10vgq"))))
(build-system emacs-build-system)
(home-page "https://codeberg.org/emacs-weirdware/blight")
(synopsis "Control display brightness")
(description
"Blight allows you to control display brightness from Emacs. It
features object-oriented code using EIEIO, a base class implementing
a reasonable API which focuses on the @emph{set the back light to this
percentage} functionality, it includes a concrete implementation that uses
SysFS to control brightness. Other systems (D-Bus, xbacklight, XELB using
XRandR) are easily supportable, giving the same experience across
environments.")
(license license:gpl3+))))
(define-public emacs-symon
(package
(name "emacs-symon")
@ -4320,6 +4367,35 @@ strings.")
"Tiny graphical system monitor for the Emacs minibuffer when idle.")
(license license:gpl2+)))
(define-public emacs-lemon
(let ((commit "37a6e6d6ef0900ca19c820a2dbc122c7fe6d86cf")
(revision "0"))
(package
(name "emacs-lemon")
(version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://codeberg.org/emacs-weirdware/lemon")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0bc77vzi4p6mlzmhgybbldlpcsiiv4xqrd5lnc7wzvmxv8byhqpm"))))
(build-system emacs-build-system)
(native-inputs
(list emacs-blight emacs-emms))
(propagated-inputs
(list emacs-s))
(home-page "https://codeberg.org/emacs-weirdware/lemon")
(synopsis "System monitors in the echo area")
(description
"Lemon is a tiny system monitor which displays system information in
the echo area when Emacs is has been idle for a few seconds. This is a fork
of zk_phis Symon, which has been largely rewritten. It works nicely with
EXWM.")
(license license:gpl3+))))
(define-public emacs-sx
(let ((version "20191229")
(revision "0")
@ -6629,14 +6705,14 @@ src blocks.")
(define-public emacs-debbugs
(package
(name "emacs-debbugs")
(version "0.32")
(version "0.33")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/debbugs-"
version ".tar"))
(sha256
(base32 "1xp3mj3ndaljma0g7x9abziphgi2a6j8k1v52sb8xwgn4p5gdvby"))))
(base32 "1s4p3jf9yrm8pn5pljpkrw05n2p9v6fpl141rh1df7f7l0w80qbk"))))
(build-system emacs-build-system)
(arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$")))
(propagated-inputs
@ -8708,7 +8784,7 @@ built-in custom themes.")
(define-public emacs-gruvbox-theme
(package
(name "emacs-gruvbox-theme")
(version "1.29.0")
(version "1.30.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -8717,7 +8793,7 @@ built-in custom themes.")
(file-name (git-file-name name version))
(sha256
(base32
"0ydwr2l3jhqbs3gk5qajirl54vfb8i65qrlzrs04jnsj1pkzq5xa"))))
"1dzaivis9cpqzb53qmkmhijr5l4hl2l3yr2412jxrz2jmqi3q4c5"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-autothemer))
@ -9086,6 +9162,28 @@ Emacs completion function completing-read, which allows quickly selecting from a
list of candidates.")
(license license:gpl3+)))
(define-public emacs-consult-bibtex
;; XXX: Upstream contains a single commit, which matches the version below.
(let ((commit "2f870d6eefb54a53216d90a82cff0ff97ba54725"))
(package
(name "emacs-consult-bibtex")
(version "0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mohkale/consult-bibtex")
(commit commit)))
(sha256
(base32
"0jxjvpg3j8zk77sfhyy27fd1zbj2zz7xayavan3hhj4853q92kwq"))))
(build-system emacs-build-system)
(inputs (list emacs-consult emacs-embark emacs-org-roam-bibtex))
(home-page "https://github.com/mohkale/consult-bibtex")
(synopsis "Consulting-read interface for BibTeX completion")
(description "This package provides a read interface for BibTeX
completion using Consult.")
(license license:gpl3+))))
(define-public emacs-consult-dir
(package
(name "emacs-consult-dir")
@ -9155,6 +9253,31 @@ provides a front-end interface for the workspace/symbols LSP procedure
call.")
(license license:gpl3+)))
(define-public emacs-consult-yasnippet
(let ((commit "ae0450889484f23dc4ec37518852a2c61b89f184")
(revision "0"))
(package
(name "emacs-consult-yasnippet")
(version (git-version "0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mohkale/consult-yasnippet")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "13hmmsnmh32vafws61sckzzy354rq0nslqpyzhw97iwvn0fpsa35"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-consult emacs-yasnippet))
(home-page "https://github.com/mohkale/consult-yasnippet")
(synopsis "Consulting-read interface for Yasnippet")
(description
"This package allows you to expand Yasnippet' snippets through
a completing-read interface. It supports previewing the current snippet
expansion and overwriting the marked region with a new snippet completion.")
(license license:gpl3+))))
(define-public emacs-marginalia
(package
(name "emacs-marginalia")
@ -10503,14 +10626,14 @@ as Fuseki or DBPedia.")
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/technomancy/better-defaults")
(url "https://git.sr.ht/~technomancy/better-defaults")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr"))))
(build-system emacs-build-system)
(home-page "https://github.com/technomancy/better-defaults")
(home-page "https://git.sr.ht/~technomancy/better-defaults")
(synopsis "Better defaults for Emacs")
(description
"Better defaults attempts to address the most obvious deficiencies of the
@ -13618,10 +13741,35 @@ provides functions to convert hash tables from and to alists and plists.")
you to deal with multiple log levels.")
(license license:gpl3+)))
(define-public emacs-denote
(package
(name "emacs-denote")
(version "0.5.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~protesilaos/denote")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "00f50dhw0x1hn87rc6vkrdwpybnbphg5z0g2c6c4r4cbgaiia8bi"))))
(build-system emacs-build-system)
(native-inputs (list texinfo))
(home-page "https://protesilaos.com/emacs/denote/")
(synopsis "Simple notes for Emacs")
(description
"Denote is a simple note-taking tool for Emacs. It is based on the idea that
notes should follow a predictable and descriptive file-naming scheme. The
file name must offer a clear indication of what the note is about, without
reference to any other metadata. Denote basically streamlines the creation of
such files while providing facilities to link between them.")
(license license:gpl3+)))
(define-public emacs-logos
(package
(name "emacs-logos")
(version "0.3.1")
(version "0.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -13630,7 +13778,7 @@ you to deal with multiple log levels.")
(file-name (git-file-name name version))
(sha256
(base32
"1xhnhaxmjqdv0bbh22gj9ak83hha8d59q64b6aa4rynrgcyajk45"))))
"1f40h8kbmza2rgmz84rgwbb4bwqkbfxnc3sc7gqshvxdkz3flbb7"))))
(native-inputs (list texinfo))
(build-system emacs-build-system)
(arguments
@ -13654,6 +13802,40 @@ structure, or any other pattern.")
(license (list license:gpl3+
license:fdl1.3+)))) ; GFDLv1.3+ for the manual
(define-public emacs-tmr
(package
(name "emacs-tmr")
(version "0.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.sr.ht/~protesilaos/tmr")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1vz9zfqap221baiy41wpxph33g6h2plnanzgpjs0wk8dz1fpwfky"))))
(build-system emacs-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-ffplay
(lambda* (#:key inputs #:allow-other-keys)
(let ((ffplay (search-input-file inputs "/bin/ffplay")))
(make-file-writable "tmr.el")
(substitute* "tmr.el"
(("\"ffplay")
(string-append "\"" ffplay)))))))))
(native-inputs (list texinfo))
(inputs (list ffmpeg))
(home-page "https://protesilaos.com/emacs/tmr/")
(synopsis "Set timers using a convenient notation")
(description
"TMR is an Emacs package that provides facilities for setting timers
using a convenient notation.")
(license license:gpl3+)))
(define-public emacs-gn-mode
(package
(name "emacs-gn-mode")
@ -14944,7 +15126,7 @@ letter of Pinyin to Simplified/Traditional Chinese characters.")
(define-public emacs-reverse-im
(package
(name "emacs-reverse-im")
(version "0.0.7")
(version "0.0.8")
(source
(origin
(method git-fetch)
@ -14953,7 +15135,7 @@ letter of Pinyin to Simplified/Traditional Chinese characters.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn"))))
(base32 "1h4gpyqir0kqf6a7ni8dbqwd4mr33imay0fmprrpfpfqxj0lj7c1"))))
(build-system emacs-build-system)
(home-page "https://github.com/a13/reverse-im.el")
(synopsis "Reverse mapping for non-default system layouts")
@ -14962,6 +15144,31 @@ letter of Pinyin to Simplified/Traditional Chinese characters.")
methods from a given list.")
(license license:gpl3+)))
(define-public emacs-mini-frame
(let ((commit "60838f3cab438dcbda8eaa15ab3e5d1af88910e9")
(revision "0"))
(package
(name "emacs-mini-frame")
(version (git-version "1.19" revision commit))
(source
(origin
(uri (git-reference
(url "https://github.com/muffinmad/emacs-mini-frame.git")
(commit commit)))
(method git-fetch)
(sha256
(base32 "0q01iymz657bg3mcmq7vcl8r0ypsa1pqj1p6gxs7ywx1d33lan4d"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(home-page "https://github.com/muffinmad/emacs-mini-frame")
(synopsis "Show minibuffer in child frame")
(description
"@dfn{mini-frame-mode} adds an advice around @code{read-from-minibuffer}
to show the minibuffer as a child frame on top of the current frame.
@code{find-file} and similar functions associated mini-buffers may appear at
the center of the screen and not at the bottom.")
(license license:gpl3+))))
(define-public emacs-posframe
(package
(name "emacs-posframe")
@ -18673,7 +18880,7 @@ according to a parsing expression grammar.")
(define-public emacs-eldev
(package
(name "emacs-eldev")
(version "1.1.3")
(version "1.2.1")
(source
(origin
(method git-fetch)
@ -18682,7 +18889,7 @@ according to a parsing expression grammar.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1dgbwaar8l8nl79mlzf5g1n49f1j9yj4772yfmim9vv8ppxnzbqk"))))
(base32 "1zf3vrk9yw4f4fj31g3vphjd3rhr2hv3q2crkdsgi7z5xlb8frds"))))
(build-system emacs-build-system)
(arguments
(list
@ -18820,7 +19027,7 @@ Chinese to English.")
(define-public emacs-org-auto-tangle
(package
(name "emacs-org-auto-tangle")
(version "0.4.1")
(version "0.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -18829,7 +19036,7 @@ Chinese to English.")
(file-name (git-file-name name version))
(sha256
(base32
"1zb7vcmhmjiqpbbhqrqci689rnpn10p985cs5jk9sgg66xsbrgs3"))))
"1kn1jsbv97ps280lcdx19d6hs7pvz7q9ng67xlb1kwjb680pa7rl"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-async))
(home-page "https://github.com/yilkalargaw/org-auto-tangle")
@ -18942,7 +19149,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.")
(define-public emacs-citar
(package
(name "emacs-citar")
(version "0.9.7")
(version "1.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -18951,7 +19158,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.")
(file-name (git-file-name name version))
(sha256
(base32
"1f49l1zmy4fnz75b0m2rav5jm8yp6hry44bv9xasiszyy3bn0hv8"))))
"1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9"))))
(build-system emacs-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -18980,6 +19187,36 @@ With Embark, it also makes available at-point actions in Org
citations.")
(license license:gpl3+)))
(define-public emacs-citar-org-roam
(package
(name "emacs-citar-org-roam")
(version "0.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-citar/citar-org-roam")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1ldfs7g7ixnrwj23draiph4vy6xq7qgw18vhi7vbw6wvkh9fcv9r"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-org-roam emacs-citar))
(home-page "https://github.com/emacs-citar/citar-org-roam")
(synopsis "Emacs pacakge to provide tighter Citar and Org-Roam integration")
(description "\
Out-of-box, Citar provides default support for file-per-note bibliographic
notes that are compatible with Org-Roam v2. This package integrates directly
with the Org-Roam database, and provides the following additional features to
Citar note support:
@itemize
@item multiple references per note
@item multiple reference notes per file
@item ability to query note citations by reference
@item ``live'' updating of Citar UI for presence of notes
@end itemize")
(license license:gpl3)))
(define-public emacs-helm-bibtex
(let ((commit "aa775340ba691d2322948bfdc6a88158568a1399")
(revision "3"))
@ -19333,7 +19570,7 @@ navigate and display hierarchy structures.")
(define-public emacs-pulsar
(package
(name "emacs-pulsar")
(version "0.3.0")
(version "0.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -19342,7 +19579,7 @@ navigate and display hierarchy structures.")
(file-name (git-file-name name version))
(sha256
(base32
"09s1r9zqc28g75jjxajdm34ni4m7gynh0xsffy5d60c50igiqa94"))))
"05ig8p3y5k20w4xy0ahaml9z0i0xyw6fkypzvz0mjpldhxl7dbxd"))))
(native-inputs (list texinfo))
(build-system emacs-build-system)
(arguments
@ -19520,8 +19757,8 @@ never confused by comments or @code{foo-bar} matching @code{foo}.")
(define-public emacs-crdt
;; XXX: Upstream does not always tag new releases. The commit below
;; corresponds exactly to latest version bump.
(let ((commit "77be6cded0e2d24fc9c132032ae3bf7ae8ed2cf9")
(version "0.3.0"))
(let ((commit "2feb88ea9a2589946014878790af585cad9f28fc")
(version "0.3.2"))
(package
(name "emacs-crdt")
(version version)
@ -19533,7 +19770,7 @@ never confused by comments or @code{foo-bar} matching @code{foo}.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0irf2allz7bp696nqlgg70ma6n336bspz8794bff1s1pramrzlhz"))))
(base32 "1fc98kl5qm7h5hrd70g61zzbdinnbf0zvk9rghf6w78ndp6lv7fz"))))
(build-system emacs-build-system)
(home-page "https://code.librehq.com/qhong/crdt.el")
(synopsis "Real-time collaborative editing environment")
@ -20309,7 +20546,7 @@ powerful Org contents.")
(define-public emacs-org-re-reveal
(package
(name "emacs-org-re-reveal")
(version "3.14.1")
(version "3.15.0")
(source
(origin
(method git-fetch)
@ -20318,7 +20555,7 @@ powerful Org contents.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "180dn5iywarljbmx8lm61y30n2d800kg96psrvc8ghfglnvp6964"))))
(base32 "0mn7qn80289gizvnxyjjs00b7qmlf0692kai7qgzgfj6i87pjc38"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-htmlize emacs-org))
@ -23033,7 +23270,7 @@ source code.")
(define-public emacs-rustic
(package
(name "emacs-rustic")
(version "3.2")
(version "3.3")
(source
(origin
(method git-fetch)
@ -23042,7 +23279,7 @@ source code.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "000awxvnwxg2hmhhn6yd9pnvflr91npfs2v1p5y7hcwg1d6mmvgk"))))
(base32 "088g6arlbq7czxyg5f31zmcm0gla7qh4vapaaskf6866yyqhizvb"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-dash
@ -23999,7 +24236,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)")
(define-public emacs-buttercup
(package
(name "emacs-buttercup")
(version "1.25")
(version "1.26")
(source
(origin
(method git-fetch)
@ -24009,18 +24246,18 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)")
(file-name (git-file-name name version))
(sha256
(base32
"0fsysvsypda6b7azc15bpaprq3bwx4gb6rlq2mj6f8rgwdqc8153"))))
"1zr9lczdr9dfh99n079d5advxm9p32a8f984dx14f3jn5mx750b1"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("make" "test")
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-bin
(lambda* (#:key outputs #:allow-other-keys)
(install-file "bin/buttercup"
(string-append (assoc-ref outputs "out") "/bin"))
#t)))))
(list
#:tests? #t
#:test-command #~(list "make" "test")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-bin
(lambda _
(install-file "bin/buttercup"
(string-append #$output "/bin")))))))
(home-page "https://github.com/jorgenschaefer/emacs-buttercup")
(synopsis "Behavior driven emacs lisp testing framework")
(description "Buttercup is a behavior-driven development framework for
@ -25089,7 +25326,7 @@ constant expressions.")
(define-public emacs-dockerfile-mode
(package
(name "emacs-dockerfile-mode")
(version "1.6")
(version "1.7")
(source
(origin
(method git-fetch)
@ -25099,7 +25336,7 @@ constant expressions.")
(file-name (git-file-name name version))
(sha256
(base32
"0nmybfc9qch0jng06qgs2xb41dl9v52ckc9nc20d7hv3x36w555x"))))
"0hmzwh8m72rj6cwaxfypnv3fmjrs11iqr15vsdw1rw7m55xi675f"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-s))
@ -27962,6 +28199,29 @@ It can also be useful on Unix-like platforms to delay having to enter your
passphrase until the first time you push to a remote.")
(license license:gpl3+)))
(define-public emacs-super-save
(package
(name "emacs-super-save")
(version "0.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bbatsov/super-save")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"066fyg4r4pksyandpd7s53hagpvm2rw90q5ks4jlpgy7x00hw09l"))))
(build-system emacs-build-system)
(home-page "https://github.com/bbatsov/super-save")
(synopsis "Auto-save buffers, based on your activity")
(description "Super-save auto-saves your buffers, when certain events
happen, e.g., when you switch between buffers or when an Emacs frame loses
focus. You can think of it as both something that augments and replaces the
standard Auto-save mode.")
(license license:gpl3+)))
(define-public emacs-tao-theme
(let ((commit "468ee4f6ba7afb9dbfc8855ae2c333cb16ca4408")
(revision "1"))
@ -28081,7 +28341,7 @@ Emacs that integrate with major modes like Org-mode.")
(define-public emacs-modus-themes
(package
(name "emacs-modus-themes")
(version "2.5.0")
(version "2.6.0")
(source
(origin
(method git-fetch)
@ -28090,7 +28350,7 @@ Emacs that integrate with major modes like Org-mode.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0ng85240zabw87ac53xnrlrafp10ns5wn6dgv9d1jxvnq40p7zqz"))))
(base32 "1zl1gd3jlkanjmlsxmwhqaiwyblp6kzznfjnw9cq8ah2390y9n1c"))))
(native-inputs (list texinfo))
(build-system emacs-build-system)
(arguments
@ -28147,7 +28407,7 @@ color. Designed for 256-color terminals. Comes in light and dark!")
(define-public emacs-spacemacs-theme
(package
(name "emacs-spacemacs-theme")
(version "0.2")
(version "0.3")
(source
(origin
(method git-fetch)
@ -28156,7 +28416,7 @@ color. Designed for 256-color terminals. Comes in light and dark!")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "15l9hb8f08nkxsaj8pxbg2mip4pp2msnrl0nvlq22zg40gh7pqsn"))))
(base32 "1yz8xg9ni9290nly5b93djkzk9235q6k4lhb5ghs6snr0r39157n"))))
(build-system emacs-build-system)
(home-page "https://github.com/nashamri/spacemacs-theme")
(synopsis
@ -29432,6 +29692,27 @@ text, such a marking style might be used to show externally included text or
example code.")
(license license:gpl3+)))
(define-public emacs-buffer-env
(package
(name "emacs-buffer-env")
(version "0.4")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/buffer-env-"
version ".tar"))
(sha256
(base32
"0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-compat))
(home-page "https://github.com/astoff/buffer-env")
(synopsis "Create buffer-local process environments")
(description "This package creates buffer-local environments using scripts
similar to Direnv. This allows Emacs to call the correct version of external
programs such as linters, compilers, and language servers on a per-project
basis.")
(license license:gpl3+)))
(define-public emacs-buffer-move
(package
(name "emacs-buffer-move")
@ -31012,14 +31293,14 @@ work on alists, hash-table and arrays. All functions are prefixed with
(define-public emacs-xref
(package
(name "emacs-xref")
(version "1.4.1")
(version "1.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xref-"
version ".tar"))
(sha256
(base32 "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf"))))
(base32 "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/xref.html")
(synopsis "Cross-referencing commands")
@ -31762,7 +32043,7 @@ headlines, keywords, tables and source blocks.")
(license license:gpl3+)))) ; License is in pyimport.el
(define-public emacs-straight-el
(let ((commit "4517e118ee43f849f708025dbb2cf4f281793121")
(let ((commit "fed215348076ba9182f634e0770a175220474b5a")
(revision "0"))
(package
(name "emacs-straight-el")
@ -31772,11 +32053,11 @@ headlines, keywords, tables and source blocks.")
(method git-fetch)
(uri
(git-reference
(url "https://github.com/raxod502/straight.el")
(url "https://github.com/radian-software/straight.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0idhgh203rac9c046286gir9rq0lgnlllzj4b4hrjpd3idg9v0r8"))))
(base32 "0z0j670s18mp1bhrsnng0mybcbnlywarhlz7zmrf9399rr513z1x"))))
(build-system emacs-build-system)
(arguments
(list
@ -31808,7 +32089,7 @@ headlines, keywords, tables and source blocks.")
(list git))
(propagated-inputs
(list emacs-magit))
(home-page "https://github.com/raxod502/straight.el/")
(home-page "https://github.com/radian-software/straight.el/")
(synopsis "Purely functional package manager for the Emacs hacker")
(description
"@code{emacs-straight-el} is a purely functional package manager for the Emacs
@ -31925,6 +32206,53 @@ scrolling, and they even don't go away when switching buffer, but you
can bind a popon to a specific buffer to only show on that buffer.")
(license license:gpl3+))))
(define-public emacs-consult-lsp
(package
(name "emacs-consult-lsp")
(version "1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gagbo/consult-lsp")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "14dyclspkf1a34nvjj800ckz1phsizq07ps8k4x0ah6ik0hfhy1w"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-consult emacs-lsp-mode emacs-f))
(home-page "https://github.com/gagbo/consult-lsp/")
(synopsis "LSP-mode and consult helping each other")
(description
"@code{emacs-consult-lsp} provides helpers for interactively selecting LSP
workspace diagnostics, symbols, and file symbols from @{emacs-lsp-mode}
by leveraging @code{emacs-consult} APIs.")
(license license:expat)))
(define-public emacs-pdb-capf
(let ((commit "31602ccab53aa7dcf26a1af222c7da2bcc1390ed")
(revision "0"))
(package
(name "emacs-pdb-capf")
(version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/muffinmad/emacs-pdb-capf")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0x2pg03csf25vj8y2zb5sv493dk3n0s4xbkihii2mzhkx82vgpxg"))))
(build-system emacs-build-system)
(home-page "https://github.com/muffinmad/emacs-pdb-capf")
(synopsis "Completion-at-point function for pdb")
(description
"@code{emacs-pdb-capf} provides a @code{completion-at-point} function
for pdb allowing completion in a @code{*gud-pdb*} buffer.")
(license license:gpl3+))))
(define-public emacs-bitbake-modes
(package
(name "emacs-bitbake-modes")
@ -31967,3 +32295,27 @@ projects.")
tree to go back to previous buffer states. To use vundo, type @kbd{M-x vundo RET} in
the buffer you want to undo. An undo tree buffer should pop up.")
(license license:gpl3+)))
(define-public emacs-vertico-posframe
(package
(name "emacs-vertico-posframe")
(version "0.5.4")
(source (origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/vertico-posframe-" version
".tar"))
(sha256
(base32
"19lx6p06wkwfivxgswdljdsh9bgcd1b9zkzx426w3pwicdk0cvgg"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-posframe emacs-vertico))
(home-page "https://github.com/tumashu/vertico-posframe")
(synopsis "Pop up a frame at point to show vertical completion UI")
(description
"Vertico is an Emacs package that provides a vertical completion UI based
on the default completion system. Posframe is an Emacs package that provides
a way to pop up a frame at point. Vertico-posframe is an Emacs package and
a Vertico extension which provides a way to pop up a frame at point to show
a vertical completion UI.")
(license license:gpl3+)))

View File

@ -67,6 +67,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (gnu packages)
@ -88,6 +89,7 @@
#:use-module (gnu packages digest)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages file)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages fpga)
@ -142,6 +144,7 @@
#:use-module (gnu packages tbb)
#:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages text-editors)
#:use-module (gnu packages tls)
#:use-module (gnu packages tex)
#:use-module (gnu packages version-control)
@ -2438,7 +2441,7 @@ comments.")))
(define-public freecad
(package
(name "freecad")
(version "0.20")
(version "0.20.1")
(source
(origin
(method git-fetch)
@ -2447,7 +2450,7 @@ comments.")))
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "14bn75bjh93f8k3hinqw913z1q0ywq7niklwbbd99hf5n342hsv4"))))
(base32 "1pgkjlahisqjvi3dd7ywj1zwhsl3wn3p15sifbmrdfdmw9is3z2b"))))
(build-system qt-build-system)
(native-inputs
(list doxygen
@ -2524,12 +2527,11 @@ comments.")))
(home-page "https://www.freecadweb.org/")
(synopsis "Your Own 3D Parametric Modeler")
(description
"FreeCAD is a general purpose feature-based, parametric 3D modeler for
CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and
product design but also fits a wider range of uses in engineering, such as
architecture or other engineering specialties. It is 100% Open Source (LGPL2+
license) and extremely modular, allowing for very advanced extension and
customization.")
"FreeCAD is a general-purpose, feature-based, parametric 3D modeler for
CAD, MCAD, CAx, CAE, and PLM. It is aimed directly at mechanical engineering
and product design but also fits a wider range of uses in engineering, such as
architecture or other engineering specialties. It is modular, allowing for
extension and customization.")
(license
(list
license:lgpl2.1+
@ -3352,10 +3354,10 @@ facilitate the communication between Cura and its backend and similar code.")
"stb_image.h")))))))
(home-page "https://github.com/Ultimaker/CuraEngine")
(synopsis "Cura slicing engine")
(description "CuraEngine is a powerful, fast and robust engine for
processing 3D models into 3D printing instruction for Ultimaker and other
GCode based 3D printers. It is part of the larger open source project called
Cura.")
(description
"CuraEngine is an engine for processing 3D models into 3D printing
instructions for Ultimaker and other GCode-based 3D printers. It is part of a
larger project called Cura.")
(license license:agpl3+)))
(define-public cura-binary-data
@ -3757,3 +3759,57 @@ form, numpad.
@item Visualizing G-code files.
@end itemize")
(license license:gpl3+))))
(define-public rizin
(package
(name "rizin")
(version "0.4.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/rizinorg/rizin/releases/download/v"
version "/rizin-src-v" version ".tar.xz"))
(sha256
(base32
"0nkb6v9lks25w5sv5s6p2ghgqnnnsf39md8nlx1cy4z89xlaisq9"))))
(build-system meson-build-system)
(arguments
(list
#:configure-flags
#~(list "-Dpackager=guix"
(string-append "-Dpackager_version=" #$version)
"-Duse_sys_capstone=enabled"
"-Duse_sys_magic=enabled"
"-Duse_sys_libzip=enabled"
"-Duse_sys_zlib=enabled"
"-Duse_sys_lz4=enabled"
"-Duse_sys_xxhash=enabled"
"-Duse_sys_openssl=enabled"
"-Duse_sys_tree_sitter=enabled"
"-Duse_sys_libuv=enabled"
"-Duse_gpl=true")
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'skip-integration-tests
(lambda _
;; Skip integration tests, which require prebuilt binaries at:
;; <https://github.com/rizinorg/rizin-testbins>.
;; And 2 of them are failing, reported upstream:
;; <https://github.com/rizinorg/rizin/issues/2905>.
(substitute* "test/meson.build"
(("subdir\\('integration'\\)") "")))))))
(native-inputs (list pkg-config))
(inputs
(list capstone file libuv libzip lz4 openssl tree-sitter xxhash zlib))
(home-page "https://rizin.re")
(synopsis "Disasm, debug, analyze and manipulate binary files")
(description
"Rizin is a reverse engineering framework and a set of small command-line
utilities, providing a complete binary analysis experience with features like
disassembler, hexadecimal editor, emulation, binary inspection, debugger, and
more.")
;; Most files are under LGPL-3.0-only, other are under: Apache-2.0,
;; BSD-2-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, GPL-1.0-or-later,
;; GPL-2.0-only, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later,
;; LGPL-2.1-only, LGPL-2.1-or-later, LGPL-3.0-only, MIT, NCSA.
(license license:gpl3+)))

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 20202022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017, 2018, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
@ -380,6 +380,48 @@ is corrupted you'll lose the affected file(s) but not the whole back-up.")
(home-page "https://www.fsarchiver.org/")
(license license:gpl2)))
(define-public fstransform
(package
(name "fstransform")
(version "0.9.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cosmos72/fstransform")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0vhypb6pbghja95av62ds4mhldbg0h8g4yg94k9r7lsxm7bgpfr3"))))
(build-system gnu-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-README
;; There are no man pages. Install a poor substitute.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" #$name)))
(install-file "README" doc)))))))
(inputs (list e2fsprogs))
(home-page "https://github.com/cosmos72/fstransform")
(synopsis "Convert file system types in place without copying all data")
(description
"This package provides several command-line tools to transform a supported
file system, such as XFS, into one of a different supported type, such as ext4.
All existing file contents, names, and directories are preserved.
The conversion happens @dfn{in place}, without the need to create a complete
copy of the original data. This lets you transform almost full file systems on
systems where adding (sufficient) additional storage space is not an option.
Do @emph{not} use this package when you could simply create an empty file system
from scratch and restore from a back-up. Transformation is limited, slow, and
significantly increases the risk of irreversible data loss!")
;; Please follow <https://github.com/cosmos72/fstransform/issues/46>.
(license (list license:gpl2 ; fsattr/src/e4attr.* → sbin/fsattr
license:gpl3+)))) ; the rest
(define-public gphotofs
(package
(name "gphotofs")

View File

@ -9,7 +9,7 @@
;;; Copyright © 20172021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018, 2019, 2020, 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
@ -30,6 +30,8 @@
;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2022 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2022 Justin Veilleux <terramorpha@cock.li>
;;;
;;; This file is part of GNU Guix.
;;;
@ -78,14 +80,16 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages dns)
#:use-module (gnu packages emacs)
#:use-module (gnu packages emacs-xyz)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
#:use-module (gnu packages gtk)
#:use-module (gnu packages haskell-check)
#:use-module (gnu packages haskell-web)
@ -98,6 +102,7 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
#:use-module (gnu packages mpi)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
@ -278,14 +283,14 @@ Accounting.")
(define-public homebank
(package
(name "homebank")
(version "5.5.5")
(version "5.5.6")
(source (origin
(method url-fetch)
(uri (string-append "http://homebank.free.fr/public/homebank-"
version ".tar.gz"))
(sha256
(base32
"0rwykjpv4w7bffyvx2j6py17nxw9jcbml7ma4is194i3npn0bkmy"))))
"1nn75wzk9h82zsakxng1v94nlg7hq3ssicvskl1m5hg4fa68w3j6"))))
(build-system glib-or-gtk-build-system)
(native-inputs
(list pkg-config intltool))
@ -462,6 +467,37 @@ in ability, and easy to use.
This package provides the Emacs mode.")
(license license:gpl2+))))
(define-public emacs-hledger-mode
(let ((commit "400bde42a8d2712af80cd7c773c9cdfbb63a515a")
(revision "1"))
(package
(name "emacs-hledger-mode")
(version (git-version "20220515" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/narendraj9/hledger-mode")
(commit commit)))
(sha256
(base32
"0xmcfpr3rxli1adwypg18npl8hb8ak5rg6a6i26inzzqja6vr897"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-popup
emacs-async
emacs-htmlize))
(arguments
'(#:include '("^[^/]+.el$")
#:exclude '()))
(home-page "https://github.com/narendraj9/hledger-mode")
(synopsis "Mode for writing journal entries for hledger")
(description
"This major mode for Emacs enables writing and managing hledger
journal files. It generates some useful reports along with some financial
ratios that can help you keep a check on your financial health for users of
the plaintext accounting system hledger.")
(license license:gpl3))))
(define-public geierlein
(package
(name "geierlein")
@ -590,7 +626,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(define-public electron-cash
(package
(name "electron-cash")
(version "4.2.10")
(version "4.2.11")
(source
(origin
(method git-fetch)
@ -599,7 +635,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0axpypq9byda61rp3sznrq24b24qxbfwk56j75qp06s1ackg0pcv"))))
(base32 "1g0xnb63c52l379zrqkfhxlkg1d2hf2dgjs2swspa0vah845r282"))))
(build-system python-build-system)
(arguments
(list
@ -671,7 +707,7 @@ blockchain.")
;; the system's dynamically linked library.
(package
(name "monero")
(version "0.18.0.0")
(version "0.18.1.0")
(source
(origin
(method git-fetch)
@ -689,7 +725,7 @@ blockchain.")
delete-file-recursively
'("external/miniupnp" "external/rapidjson"))))
(sha256
(base32 "1jq2v2dg50gl3cf9s61jssny5rraclxqj4cc4y0sl00ip8icj08v"))))
(base32 "18yj44pki7x8ir6wg02g1h6yxp1hnqb0nrx9x5dvv94rda48cy66"))))
(build-system cmake-build-system)
(native-inputs
(list doxygen
@ -776,7 +812,7 @@ the Monero command line client and daemon.")
(define-public monero-gui
(package
(name "monero-gui")
(version "0.18.0.0")
(version "0.18.1.0")
(source
(origin
(method git-fetch)
@ -792,7 +828,7 @@ the Monero command line client and daemon.")
;; See the 'extract-monero-sources' phase.
(delete-file-recursively "monero")))
(sha256
(base32 "14rbw9803h3g7ld3d24vc3i9n55n09x13frkmd128xx5jw17v5sr"))))
(base32 "1z627jy9n6cwc9yv0w58fbhix4qnllk0q42ga75mhlawaz68j0qi"))))
(build-system qt-build-system)
(native-inputs
`(,@(package-native-inputs monero)
@ -801,6 +837,7 @@ the Monero command line client and daemon.")
(modify-inputs (package-inputs monero)
(append libgcrypt
monero
p2pool
qtbase-5
qtdeclarative-5
qtgraphicaleffects
@ -834,6 +871,17 @@ the Monero command line client and daemon.")
(string-append
"set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\")\n"
all)))))
(add-after 'unpack 'fix-p2pool-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/p2pool/P2PoolManager.cpp"
;; Location for files created by P2Pool
(("m_p2poolPath = QApplication::applicationDirPath\\(\\);")
"m_p2poolPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);")
;; Location of p2pool program
(("m_p2pool = m_p2poolPath \\+ \"/p2pool\";")
(string-append "m_p2pool = \""
(search-input-file inputs "/bin/p2pool")
"\";")))))
(replace 'install
(lambda _
(let ((bin (string-append #$output "/bin")))
@ -1236,13 +1284,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.")
(define-public python-duniterpy
(package
(name "python-duniterpy")
(version "1.0.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "duniterpy" version))
(sha256
(base32 "13kp2ph7fb1cdkx1y6j2h8q33fj2akc104l77ng52cy4v8jic9nz"))))
(base32 "18i5bqz58vjp740pxb4wb4ixg1g2d73cwi0d8gp85fmj5p8f2gx7"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required
@ -1255,13 +1303,11 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.")
(("mnemonic>=0\\.19,<0.20")
"mnemonic>=0.19")))))))
(propagated-inputs
(list python-aiohttp
python-attrs
(list python-attrs
python-base58
python-jsonschema
python-libnacl
python-pyaes
python-pylibscrypt
python-graphql-core
python-mnemonic
python-websocket-client
@ -2081,3 +2127,100 @@ analysis of financial market data.")
format used by SWIFT. It returns smart Python collections for statistics
and manipulation.")
(license license:bsd-3)))
(define-public xmrig
(package
(name "xmrig")
(version "6.18.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xmrig/xmrig")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (base32 "1ncnfjpjwjdv29plyiam2nh01bfni49sgfi3qkijygi1450w71dx"))
(modules '((guix build utils)))
(snippet
;; TODO: Try to use system libraries instead of bundled ones in
;; "src/3rdparty/". It requires changes to some "cmake/..." scripts
;; and to some source files.
#~(substitute* "src/donate.h"
(("constexpr const int kDefaultDonateLevel = 1;")
"constexpr const int kDefaultDonateLevel = 0;")
(("constexpr const int kMinimumDonateLevel = 1;")
"constexpr const int kMinimumDonateLevel = 0;")))))
(build-system cmake-build-system)
(inputs
(list
`(,hwloc "lib")
libuv
openssl))
(arguments
(list
;; There are no tests.
#:tests? #f
#:phases
#~(modify-phases
%standard-phases
(replace 'install
;; There is no 'install' target, we must install xmrig manually
(lambda* (#:key #:allow-other-keys)
(install-file "xmrig"
(string-append #$output "/bin")))))))
(home-page "https://xmrig.com/")
(synopsis "Monero miner")
(description
"XMRig is a high performance, cross platform RandomX, KawPow,
CryptoNight, AstroBWT and GhostRider unified CPU/GPU miner and RandomX
benchmark.
Warning: upstream, by default, receives a percentage of the mining time. This
anti-functionality has been neutralised in Guix, but possibly not in all other
distributions.
Warning: this software, because of it's nature, has high energy consumption.
Also, the energy expenses might be higher that the cryptocurrency gained by
mining.")
(license license:gpl3+)))
(define-public p2pool
(package
(name "p2pool")
(version "2.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/SChernykh/p2pool")
(commit (string-append "v" version))
(recursive? #t)))
(file-name (git-file-name name version))
(sha256 (base32 "19pn7axj96yvza2x7678rs79c2vgmhl8d7f9ki72v2n6l2630fw8"))
(modules '((guix build utils)))
(snippet
#~(for-each delete-file-recursively
'("external/lib"
"external/src/cppzmq"
"external/src/curl"
"external/src/libuv"
"external/src/libzmq"
"external/src/rapidjson")))))
(build-system cmake-build-system)
(inputs
(list cppzmq curl gss libuv rapidjson zeromq))
(arguments
(list
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(replace 'install
(lambda _
(install-file "p2pool" (string-append #$output "/bin")))))))
(home-page "https://p2pool.io/")
(synopsis "Decentralized Monero mining pool")
(description "Monero P2Pool is a peer-to-peer Monero mining pool. P2Pool
combines the advantages of pool and solo mining; you still fully control your
Monero node and what it mines, but you get frequent payouts like on a regular
pool.")
(license license:gpl3)))

View File

@ -265,9 +265,11 @@ broadband modem as found, for example, on PinePhone.")
bin))
#t)))))
(home-page "https://github.com/riscv-software-src/opensbi")
(synopsis "RISC-V Open Source Supervisor Binary Interface")
(description "A reference implementation of the RISC-V SBI specifications
for platform-specific firmwares executing in M-mode.")
(synopsis "RISC-V @acronym{SBI, Supervisor Binary Interface} implementation")
(description
"OpenSBI is the reference implementation of the RISC-V @acronym{SBI,
Supervisory Binary Interface} specifications for platform-specific firmwares
executing in M-mode.")
(license (list license:bsd-2
;; lib/utils/libfdt/* is dual licensed under bsd-2 and gpl2+.
license:gpl2+

View File

@ -51,6 +51,7 @@
;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2022 Nguyễn Gia Phong <mcsinyx@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -732,6 +733,26 @@ following fonts in the OpenType format: Adventor, Bonum, Chorus, Cursor,
Heros, Pagella, Schola, Termes.")
(license license:gfl1.0)))
(define-public font-latin-modern
(package
(name "font-latin-modern")
(version "2.004")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://www.gust.org.pl/projects/e-foundry/"
"latin-modern/download/lm" version "otf.zip"))
(sha256
(base32 "06qnvd6kh07gy2197vx3nmskhiqhp7ip9cpi2rkbwa1p3l2kc0jv"))))
(build-system font-build-system)
(home-page "https://www.gust.org.pl/projects/e-foundry/latin-modern")
(synopsis "OpenType fonts based on Computer Modern")
(description "The Latin Modern fonts are a set of scalable fonts based on
the PostScript Type 1 version of the Computer Modern fonts and contain many
additional characters (mostly accented ones). This package provides the
OpenType variant of these fonts.")
(license license:gfl1.0)))
(define-public font-amiri
(package
(name "font-amiri")
@ -821,7 +842,7 @@ for use at smaller text sizes")))
(define-public font-gnu-unifont
(package
(name "font-gnu-unifont")
(version "14.0.03")
(version "14.0.04")
(source
(origin
(method url-fetch)
@ -831,7 +852,7 @@ for use at smaller text sizes")))
(string-append "mirror://gnu/unifont/unifont-"
version "/unifont-" version ".tar.gz")))
(sha256
(base32 "1swzwh355ipqhm3vvy7005fqawydlcdbkxm3h04vhicahp8hl06l"))))
(base32 "1fzycjxmgnq77r2s5914w1phg3qdwwnwa6p3zyfa1cscrxy52phz"))))
(build-system gnu-build-system)
(outputs '("out" ; TrueType version
"pcf" ; PCF (bitmap) version

View File

@ -195,7 +195,8 @@ them as it goes.")
`("PATH" prefix (,bindir))))
commands)))))))
(native-inputs
(list ninja python-pytest python-scikit-build python-wheel))
(list ninja python-pytest python-scikit-build python-setuptools-scm
python-wheel))
(inputs (list java-antlr4-runtime-cpp `(,util-linux "lib")))
(propagated-inputs
(list psautohint
@ -389,7 +390,8 @@ converts any cubic curves to quadratic. The most useful function is probably
(sha256
(base32 "0a6iq5g6qdxj7nvip8nnf0mf8y5wmpd3wwq0dv7d4nm9bjrh0r6m"))))
(build-system python-build-system)
(native-inputs (list python-pytest python-pytest-runner))
(native-inputs
(list python-pytest python-pytest-runner python-setuptools-scm))
(propagated-inputs
(list python-booleanoperations
python-cffsubr
@ -497,7 +499,7 @@ implementing the pen protocol for manipulating glyphs.")
python-defcon-bootstrap
python-fontmath
python-fonttools))
(native-inputs (list unzip))
(native-inputs (list python-setuptools-scm unzip))
(home-page "https://github.com/robotools/fontParts")
(synopsis "Library for interacting with font parts")
(description "FontParts is an @acronym{API, Application Programming
@ -734,7 +736,7 @@ paths (intersection, union, difference, xor).")
python-fontparts
python-fonttools
python-mutatormath))
(native-inputs (list unzip))
(native-inputs (list python-setuptools-scm unzip))
(home-page "https://github.com/LettError/ufoProcessor")
(synopsis "Process and generate @acronym{UFO, Unified Font Object} files")
(description "This Python package processes and generates instances for

View File

@ -226,8 +226,8 @@ For synthesis, the compiler generates netlists in the desired format.")
(license license:isc)))
(define-public icestorm
(let ((commit "0ec00d892a91cc68e45479b46161f649caea2933")
(revision "3"))
(let ((commit "2bc541743ada3542c6da36a50e66303b9cbd2059")
(revision "4"))
(package
(name "icestorm")
(version (git-version "0.0" revision commit))
@ -239,7 +239,7 @@ For synthesis, the compiler generates netlists in the desired format.")
(file-name (git-file-name name version))
(sha256
(base32
"1qlh99fafb7xga702k64fmc9m700nsddrfgcq4x8qn8fplsb64f1"))))
"0d0ibdq3rzmjcbv97h4b9wgq8ikvgwlfw60spi2w81mis317lis8"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no unit tests that don't need an FPGA exist.

View File

@ -2136,10 +2136,11 @@ of the others")
(define-public ioquake3
;; We follow master since it seems that there won't be releases after 1.3.6.
(let ((commit "95b9cab4d644fa3bf757cfff821cc4f7d76e38b0"))
(let ((revision "2")
(commit "29b0cc3a4d037046eb3247fc04f4b703f6a33452"))
(package
(name "ioquake3")
(version (git-version "1.3.6" "1" commit))
(version (git-version "1.3.6" revision commit))
(source
(origin
(method git-fetch)
@ -2148,48 +2149,48 @@ of the others")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1vflk028z9gccg5yfi5451y1k5wxjdh3qbhjf4x6r7w2pzlxh16z"))))
(base32 "0fqq2qpnrgpgf3gs71wvxlkcihxcrvhvllh88ii4ip134c1qbs9q"))))
(build-system gnu-build-system)
(inputs
`(("sdl2" ,sdl2)
("libjpeg" ,libjpeg-turbo)
("openal" ,openal)
("curl" ,curl)
("opusfile" ,opusfile)
("opus" ,opus)
("libvorbis" ,libvorbis)
("freetype" ,freetype)
("libogg" ,libogg)))
(list curl
freetype
libjpeg-turbo
libogg
libvorbis
openal
opus
opusfile
sdl2))
(native-inputs
(list which ; Else SDL_version.h won't be found.
(list which ; else SDL_version.h won't be found.
pkg-config))
(arguments
'(#:tests? #f ; No tests.
#:make-flags '("CC=gcc"
"USE_INTERNAL_LIBS=0"
"USE_FREETYPE=1"
"USE_RENDERER_DLOPEN=0"
"USE_OPENAL_DLOPEN=0"
"USE_CURL_DLOPEN=0")
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "copyfiles" "CC=gcc"
"USE_INTERNAL_LIBS=0"
(list
#:tests? #f ; no tests
#:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
"USE_INTERNAL_LIBS=0"
"USE_FREETYPE=1"
"USE_RENDERER_DLOPEN=0"
"USE_OPENAL_DLOPEN=0"
"USE_CURL_DLOPEN=0")
#:phases
#~(modify-phases %standard-phases
(delete 'configure) ; no configure-script
(replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys)
(apply invoke "make" "copyfiles"
(string-append "COPYDIR="
(assoc-ref outputs "out")
"/bin")))))))
"/bin")
make-flags))))))
(home-page "https://ioquake3.org/")
(synopsis "FPS game engine based on Quake 3")
(description "ioquake3 is a free software first person shooter engine
based on the Quake 3: Arena and Quake 3: Team Arena source code. Compared to
the original, ioquake3 has been cleaned up, bugs have been fixed and features
added. The permanent goal is to create the open source Quake 3 distribution
upon which people base their games, ports to new platforms, and other
projects.")
added. The permanent goal is to create a Quake 3 distribution upon which
people base their games, ports to new platforms, and other projects.")
(license license:gpl2))))
(define-public instead
@ -2651,7 +2652,7 @@ game engine. id Tech 2 is the engine originally behind Quake 2.")
(define-public dhewm3
(package
(name "dhewm3")
(version "1.5.1")
(version "1.5.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -2659,7 +2660,7 @@ game engine. id Tech 2 is the engine originally behind Quake 2.")
version "/dhewm3-" version "-src.tar.xz"))
(sha256
(base32
"0s2brx6wyljhjbpli97iy4lc4fqqsvdc09raz8njg0vgzcsiyrri"))))
"10p0w1x5wx9b7d8mzvb6yqjia9prhkjwz04vbvphy8p383r33am6"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No tests.
@ -2667,17 +2668,13 @@ game engine. id Tech 2 is the engine originally behind Quake 2.")
(modify-phases %standard-phases
(add-after 'unpack 'change-to-build-dir
(lambda _
(chdir "neo")
#t)))))
(chdir "neo"))))))
(inputs
`(("curl" ,curl)
("libjpeg" ,libjpeg-turbo)
("libogg" ,libogg)
("libvorbis" ,libvorbis)
("libx11" ,libx11)
("openal" ,openal)
("sdl2" ,sdl2)
("zlib" ,zlib)))
(list curl
libx11
openal
sdl2
zlib))
(home-page "https://dhewm3.org/")
(synopsis "Port of the original Doom 3 engine")
(description
@ -2810,8 +2807,6 @@ construction toolset for games.
@item It is automatic, which means that you can throw any level geometry
at it and you will get robust mesh out.
@item It is fast which means swift turnaround times for level designers.
@item It is open source so it comes with full source and you can
customize it to your heart's content.
@end itemize
The Recast process starts with constructing a voxel mold from a level

View File

@ -10,7 +10,7 @@
;;; Copyright © 2014, 2015, 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015, 2017, 2018, 2021 Chris Lemmer Webber <cwebber@dustycloud.org>
;;; Copyright © 2015, 2017, 2018, 2021 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
@ -4163,7 +4163,7 @@ falling, themeable graphics and sounds, and replays.")
(define-public wesnoth
(package
(name "wesnoth")
(version "1.16.1")
(version "1.16.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/wesnoth/wesnoth-"
@ -4172,7 +4172,7 @@ falling, themeable graphics and sounds, and replays.")
"wesnoth-" version ".tar.bz2"))
(sha256
(base32
"0cyrwmdg93pqpdm7030540jznaky9rda355i9ym8am4k9civlcwf"))))
"02pzijbmkgcb8hc4l3f4r3r3mxqda936dp488i9sd9d4m3xdzimh"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;no check target
@ -6515,14 +6515,16 @@ fish. The whole game is accompanied by quiet, comforting music.")
(define-public crawl
(package
(name "crawl")
(version "0.28.0")
(version "0.29.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/crawl/crawl/releases/download/"
version "/stone_soup-" version "-nodeps.tar.xz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/crawl/crawl")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0irg5w4m127fxcj037kyp9vnyqyq1fi4q64rn6yq92w8z1lf2sss"))
(base32 "0cx67ln5qr4bawidi48ss63wflx7x22901da683c9wvy6m41vks8"))
(patches (search-patches "crawl-upgrade-saves.patch"))))
(build-system gnu-build-system)
(inputs
@ -6552,24 +6554,30 @@ fish. The whole game is accompanied by quiet, comforting music.")
"BUILD_LUA="
"BUILD_SQLITE="
"BUILD_ZLIB="
"-Csource")
"-Ccrawl-ref/source")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-version
(lambda _
(call-with-output-file "crawl-ref/source/util/release_ver"
(lambda (port)
(display #$version port)))))
(add-after 'unpack 'find-SDL-image
(lambda _
(substitute* "source/windowmanager-sdl.cc"
(substitute* "crawl-ref/source/windowmanager-sdl.cc"
(("SDL_image.h") "SDL2/SDL_image.h"))))
(delete 'configure)
(replace 'check
(lambda* (#:key make-flags #:allow-other-keys)
(setenv "HOME" (getcwd))
;; Fake a terminal for the test cases.
(setenv "TERM" "xterm-256color")
;; Run the tests that don't require a debug build.
(apply invoke "make" "nondebugtest"
(format #f "-j~d" (parallel-job-count))
;; Force command line build for test cases.
(append make-flags '("GAME=crawl" "TILES="))))))))
(lambda* (#:key tests? make-flags #:allow-other-keys)
(when tests?
(setenv "HOME" (getcwd))
;; Fake a terminal for the test cases.
(setenv "TERM" "xterm-256color")
;; Run the tests that don't require a debug build.
(apply invoke "make" "nondebugtest"
(format #f "-j~d" (parallel-job-count))
;; Force command line build for test cases.
(append make-flags '("GAME=crawl" "TILES=")))))))))
(synopsis "Roguelike dungeon crawler game")
(description "Dungeon Crawl Stone Soup (also known as \"Crawl\" or DCSS
for short) is a roguelike adventure through dungeons filled with dangerous
@ -6728,7 +6736,7 @@ fight against their plot and save his fellow rabbits from slavery.")
libxcursor
libxml2
miniupnpc
mozjs
mozjs-78
openal
sdl2
wxwidgets
@ -7759,38 +7767,33 @@ quotation from a collection of quotes.")
(define xonotic-data
(package
(name "xonotic-data")
(version "0.8.2")
(version "0.8.5")
(source
(origin
(method url-fetch)
(uri (string-append "http://dl.xonotic.org/xonotic-"
(uri (string-append "https://dl.xonotic.org/xonotic-"
version ".zip"))
(file-name (string-append name "-" version ".zip"))
(sha256
(base32
"1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2"))))
(base32 "1r9pdrrki7mkdw99zh9m7911fqldsfdnl0nrp5cv1bk2hcism4hg"))))
(build-system trivial-build-system)
(native-inputs
`(("unzip" ,unzip)))
(native-inputs (list unzip))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(xonotic (string-append out "/share/xonotic"))
(source (assoc-ref %build-inputs "source"))
(unzip (search-input-file %build-inputs "/bin/unzip")))
(copy-file source (string-append ,name "-" ,version ".zip"))
(invoke unzip (string-append ,name "-" ,version ".zip"))
(mkdir-p out)
(mkdir-p xonotic)
(chdir "Xonotic")
(copy-recursively "data"
(string-append xonotic "/data"))
(copy-recursively "server"
(string-append xonotic "/server"))
(install-file "key_0.d0pk" xonotic)))))
(list #:modules '((guix build utils))
#:builder
#~(begin
(use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out"))
(xonotic (string-append out "/share/xonotic"))
(source (assoc-ref %build-inputs "source"))
(unzip (search-input-file %build-inputs "/bin/unzip")))
(invoke unzip source)
(chdir "Xonotic")
(install-file "key_0.d0pk" xonotic)
(copy-recursively "data"
(string-append xonotic "/data"))
(copy-recursively "server"
(string-append xonotic "/server"))))))
(home-page "http://xonotic.org")
(synopsis "Data files for Xonotic")
(description
@ -7801,192 +7804,142 @@ quotation from a collection of quotes.")
(define-public xonotic
(package
(name "xonotic")
(version "0.8.2")
(version "0.8.5")
(source
(origin
(method url-fetch)
(uri (string-append "http://dl.xonotic.org/xonotic-"
(uri (string-append "https://dl.xonotic.org/xonotic-"
version "-source.zip"))
(file-name (string-append name "-" version ".zip"))
(sha256
(base32
"0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"))))
(base32 "0pgahai0gk8bjmvkwx948bl50l9f9dhmjzwffl4vyldibajipa51"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append "--prefix="
(assoc-ref %outputs "out"))
"--disable-rijndael")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'make-darkplaces
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(sharedir (string-append out "/share/xonotic/")))
(invoke "make" "-C" "source/darkplaces"
(string-append "DP_FS_BASEDIR="
sharedir)
"DP_LINK_TO_LIBJPEG=1"
"DP_SOUND_API=ALSA"
"CC=gcc"
"-f" "makefile"
"cl-release")
(invoke "make" "-C" "source/darkplaces"
(string-append "DP_FS_BASEDIR="
sharedir)
"DP_LINK_TO_LIBJPEG=1"
"DP_SOUND_API=ALSA"
"CC=gcc"
"-f" "makefile"
"sdl-release")
(invoke "make" "-C" "source/darkplaces"
(string-append "DP_FS_BASEDIR="
sharedir)
"DP_LINK_TO_LIBJPEG=1"
"DP_SOUND_API=ALSA"
"CC=gcc"
"-f" "makefile"
"sv-release"))))
(add-before 'configure 'bootstrap
(lambda _
(chdir "source/d0_blind_id")
(invoke "sh" "autogen.sh")))
(add-after 'build 'install-desktop-entry
(lambda* (#:key outputs #:allow-other-keys)
;; Add .desktop files for the 2 variants and the symlink
(let* ((output (assoc-ref outputs "out"))
(apps (string-append output "/share/applications")))
(mkdir-p apps)
(with-output-to-file
(string-append apps "/xonotic-glx.desktop")
(list #:configure-flags
#~(list (string-append "--prefix=" #$output)
"--disable-rijndael")
#:modules '((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'build-darkplaces
(lambda* (#:key make-flags parallel-build? outputs
#:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share/xonotic/")))
(apply invoke "make"
"-C" "source/darkplaces"
"-f" "makefile"
"-j" (if parallel-build?
(number->string (parallel-job-count))
"1")
(string-append "CC=" #$(cc-for-target))
(string-append "DP_FS_BASEDIR=" share)
"DP_LINK_TO_LIBJPEG=1"
"DP_SOUND_API=ALSA"
"cl-release"
"sdl-release"
"sv-release"
make-flags))))
(add-before 'configure 'preconfigure
(lambda _
(format #t
"[Desktop Entry]~@
Name=xonotic-glx~@
Comment=Xonotic glx~@
Exec=~a/bin/xonotic-glx~@
TryExec=~@*~a/bin/xonotic-glx~@
Icon=xonotic~@
Categories=Game~@
Type=Application~%"
output)))
(with-output-to-file
(string-append apps "/xonotic-sdl.desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=xonotic-sdl~@
Comment=Xonotic sdl~@
Exec=~a/bin/xonotic-sdl~@
TryExec=~@*~a/bin/xonotic-sdl~@
Icon=xonotic~@
Categories=Game~@
Type=Application~%"
output)))
(with-output-to-file
(string-append apps "/xonotic.desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=xonotic~@
Comment=Xonotic~@
Exec=~a/bin/xonotic-glx~@
TryExec=~@*~a/bin/xonotic~@
Icon=xonotic~@
Categories=Game~@
Type=Application~%"
output)))
#t)))
(add-after 'install-desktop-entry 'install-icons
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion "../../misc/logos/icons_png/"
(for-each
(lambda (file)
(let* ((size (string-filter char-numeric? file))
(icons (string-append out "/share/icons/hicolor/"
size "x" size "/apps")))
(mkdir-p icons)
(copy-file file (string-append icons "/xonotic.png"))))
'("xonotic_16.png" "xonotic_22.png" "xonotic_24.png"
"xonotic_32.png" "xonotic_48.png" "xonotic_64.png"
"xonotic_128.png" "xonotic_256.png" "xonotic_512.png"))))))
(add-after 'install-icons 'install-binaries
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(define (install src dst)
(let ((dst (string-append out dst)))
(mkdir-p (dirname dst))
(copy-file src dst)))
(mkdir-p (string-append out "/bin"))
(install "../darkplaces/darkplaces-dedicated"
"/bin/xonotic-dedicated")
(install "../darkplaces/darkplaces-glx"
"/bin/xonotic-glx")
(install "../darkplaces/darkplaces-sdl"
"/bin/xonotic-sdl")
;; Provide a default xonotic executable, defaulting to SDL.
(symlink (string-append out "/bin/xonotic-sdl")
(string-append out "/bin/xonotic"))
#t)))
(add-after 'install-binaries 'install-data
(lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(data (assoc-ref inputs "xonotic-data")))
(symlink (string-append data "/share/xonotic")
(string-append out "/share/xonotic"))
#t)))
(add-after 'install-binaries 'wrap-binaries
(lambda* (#:key outputs inputs #:allow-other-keys)
;; Curl and libvorbis need to be wrapped so that we get
;; sound and networking.
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/xonotic"))
(bin-sdl (string-append out "/bin/xonotic-sdl"))
(bin-glx (string-append out "/bin/xonotic-glx"))
(bin-dedicated (string-append out "/bin/xonotic-dedicated"))
(curl (assoc-ref inputs "curl"))
(vorbis (assoc-ref inputs "libvorbis")))
(wrap-program bin
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append curl "/lib:" vorbis "/lib"))))
(wrap-program bin-sdl
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append curl "/lib:" vorbis "/lib"))))
(wrap-program bin-glx
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append curl "/lib:" vorbis "/lib"))))
(wrap-program bin-dedicated
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append curl "/lib:" vorbis "/lib"))))
#t))))))
(inputs
`(("xonotic-data" ,xonotic-data)
("alsa-lib" ,alsa-lib)
("curl" ,curl)
("libjpeg" ,libjpeg-turbo)
("libmodplug" ,libmodplug)
("libvorbis" ,libvorbis)
("libogg" ,libogg)
("libxpm" ,libxpm)
("libxxf86dga" ,libxxf86dga)
("libxxf86vm" ,libxxf86vm)
("libx11" ,libx11)
("libxext" ,libxext)
("libxau" ,libxau)
("libxdmcp" ,libxdmcp)
("mesa" ,mesa)
("glu" ,glu)
("freetype" ,freetype)
("sdl2" ,sdl2)
("libpng" ,libpng)
("hicolor-icon-theme" ,hicolor-icon-theme)))
(chdir "source/d0_blind_id")
(invoke "sh" "autogen.sh")))
(add-after 'install 'symlink-data
(lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(data (assoc-ref inputs "xonotic-data")))
(symlink (string-append data "/share/xonotic")
(string-append out "/share/xonotic")))))
(add-after 'install 'install-desktop-entries
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(app (string-append out "/share/applications")))
;; Add .desktop files for the 2 variants and the symlink.
(for-each
(lambda (variant)
(let* ((file (if variant
(format #f "xonotic-~(~a~)" variant)
"xonotic"))
(name (if variant
(format #f "Xonotic (~a)" variant)
"Xonotic"))
(exec (string-append out "/bin/" file)))
(make-desktop-entry-file
(string-append app "/" file ".desktop")
#:name name
#:comment `((#f #$(package-synopsis this-package)))
#:exec exec
#:try-exec exec
#:icon "xonotic"
#:categories '("Game"))))
(list #f "GLX" "SDL")))))
(add-after 'install 'install-icons
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each
(lambda (file)
(let* ((size (string-filter char-numeric? file))
(icons (string-append out "/share/icons/hicolor/"
size "x" size "/apps")))
(mkdir-p icons)
(copy-file file (string-append icons "/xonotic.png"))))
(find-files "../../misc/logos/icons_png"
"^xonotic_[0-9]+\\.png$")))))
(add-after 'install 'install-binaries
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(for-each
(lambda (variant)
(copy-file
(string-append "../darkplaces/darkplaces-" variant)
(string-append bin "/xonotic-" variant)))
(list "dedicated" "glx" "sdl")))))
(add-after 'install-binaries 'wrap-binaries
(lambda* (#:key outputs inputs #:allow-other-keys)
;; All games must be wrapped to get sound and networking.
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(curl (assoc-ref inputs "curl"))
(vorbis (assoc-ref inputs "libvorbis")))
(for-each (cut wrap-program <>
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append curl "/lib:"
vorbis "/lib"))))
(find-files bin "^xonotic"))
;; Provide a default xonotic executable, defaulting to SDL.
(symlink "xonotic-sdl" (string-append bin "/xonotic"))))))))
(native-inputs
(list unzip
autoconf
(list autoconf
automake
pkg-config
gmp
libtool
gmp))
pkg-config
unzip))
(inputs
(list alsa-lib
curl
libjpeg-turbo
libmodplug
libvorbis
libogg
libpng
libx11
libxpm
libxxf86dga
libxxf86vm
libxext
libxau
libxdmcp
mesa
glu
freetype
sdl2
hicolor-icon-theme
xonotic-data))
(home-page "https://xonotic.org")
(synopsis "Fast-paced first-person shooter game")
(description
@ -8772,15 +8725,14 @@ game field is extended to 4D space, which has to filled up by the gamer with
(define-public arx-libertatis
(package
(name "arx-libertatis")
(version "1.2")
(version "1.2.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://arx-libertatis.org/files/arx-libertatis-"
version ".tar.xz"))
(sha256
(base32
"035dflxffa98bxmxkrqfizmhvnr09wyhhmzaqxk92772qil7gkxs"))))
(base32 "1pxf86sgwvy3785sq2wb4jvz6bdxm81ilrxd8xv7s61dxqqqizda"))))
(build-system cmake-build-system)
(outputs '("out" "installer"))
(arguments

View File

@ -702,14 +702,14 @@ It also includes runtime support libraries for these languages.")
(package
(inherit gcc-11)
;; Note: 'compiler-cpu-architectures' is unchanged compared to GCC 11.
(version "12.1.0")
(version "12.2.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz"))
(sha256
(base32
"0ywws66myjxcwsmla721g35d2ymlckq6ii7j9av0477ki5467zb2"))
"1zrhca90c7hqnjz3jgr1vl675q3h5lrd92b5ggi00jjryffcyjg5"))
(patches (search-patches "gcc-12-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch"))
(modules '((guix build utils)))

View File

@ -17,7 +17,7 @@
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021 Nikolay Korotkiy <sikmir@disroot.org>
;;; Copyright © 2021, 2022 Nikolay Korotkiy <sikmir@disroot.org>
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
;;;
;;; This file is part of GNU Guix.
@ -100,6 +100,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#: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)
@ -216,7 +217,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.")
(define-public geos
(package
(name "geos")
(version "3.10.2")
(version "3.11.0")
(source (origin
(method url-fetch)
(uri (string-append "http://download.osgeo.org/geos/geos-"
@ -224,7 +225,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.")
".tar.bz2"))
(sha256
(base32
"05apyh6dvv15fax4xvxa0kr622h4y08w9p3274mlqsrqmjcwbfsh"))))
"12l59pxawyizmc4wn20dvjn7aifqwkim4ysmc78h91mayjmqravr"))))
(build-system cmake-build-system)
(arguments `(#:phases
(modify-phases %standard-phases
@ -940,7 +941,7 @@ development.")
(define-public gdal
(package
(name "gdal")
(version "3.5.0")
(version "3.5.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -948,7 +949,7 @@ development.")
version ".tar.gz"))
(sha256
(base32
"0h7dgjx8nk3dd17wwqm2yjnaqciyrd2mz9gcjswpcnmap09wbzrs"))
"1l93q7xf6qx9ck5axfkf3ygmvclxkvrjd8x00ckn7j0d0750ci3w"))
(modules '((guix build utils)))
(snippet
`(begin
@ -1322,7 +1323,7 @@ based on the Osmium library.")
(define-public osm2pgsql
(package
(name "osm2pgsql")
(version "1.5.1")
(version "1.7.0")
(source
(origin
(method git-fetch)
@ -1331,32 +1332,30 @@ based on the Osmium library.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0i18mskcs087dn3f3h9n7j0wafn8502m0h13mrjwin38xsz0crfj"))
(base32 "15fxr4xq7siy237763l7nswx7v0swr3qzs2h3zkjzgvajw4p6qii"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "contrib/protozero")
(delete-file-recursively "contrib/libosmium")
#t))))
;; Remove bundled libraries.
'(delete-file-recursively "contrib"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f; tests fail because we need to setup a database
#:configure-flags
(list (string-append "-DOSMIUM_INCLUDE_DIR="
(assoc-ref %build-inputs "libosmium")
"/include")
(string-append "-DPROTOZERO_INCLUDE_DIR="
(assoc-ref %build-inputs "protozero")
"/include"))))
(list "-DEXTERNAL_LIBOSMIUM=ON"
"-DEXTERNAL_PROTOZERO=ON"
"-DEXTERNAL_FMT=ON"
"-DEXTERNAL_RAPIDJSON=ON")))
(inputs
(list boost
bzip2
expat
fmt
libosmium
lua
postgresql
proj
protozero
rapidjson
zlib))
(native-inputs
(list python python-psycopg2))
@ -1828,7 +1827,7 @@ ways, and relations) and their metadata tags.")
(define-public libmaxminddb
(package
(name "libmaxminddb")
(version "1.4.3")
(version "1.6.0")
(source
(origin
(method url-fetch)
@ -1836,7 +1835,7 @@ ways, and relations) and their metadata tags.")
"/releases/download/" version "/"
"/libmaxminddb-" version ".tar.gz"))
(sha256
(base32 "0fd4a4sxiiwzbd5h74wl1ijnb7xybjyybb7q41vdq3w8nk3zdzd5"))))
(base32 "0rw2z7rx8jzgdcgqlmc4wqrsjmiwd8vm5wvvrldy472rghcaq83n"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@ -1855,14 +1854,14 @@ associated with an address.")
(define-public python-maxminddb
(package
(name "python-maxminddb")
(version "1.5.1")
(version "2.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "maxminddb" version))
(sha256
(base32
"0y9giw81k4wdmpryr4k42w50z292mf364a6vs1vxf83ksc9ig6j4"))))
"1rc4a403r3b4vhmhb03gidd0fmsbvfpbf3qfcw25h4db9zn0fxz3"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;; Tests require a copy of the maxmind database

View File

@ -18,6 +18,7 @@
;;; Copyright © 2021 Charles Jackson <charles.b.jackson@protonmail.com>
;;; Copyright © 2022 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2022 Sughosha <sughosha@proton.me>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1137,7 +1138,7 @@ like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
(native-inputs
(list gtk+
`(,glib "bin") ; for "glib-compile-resources"
librsvg
(librsvg-for-system)
pkg-config
ruby-sass
sassc))

View File

@ -4904,7 +4904,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
(define-public libsecret
(package
(name "libsecret")
(version "0.20.4")
(version "0.20.5")
(source (origin
(method url-fetch)
(uri (string-append
@ -4913,28 +4913,47 @@ and the GLib main loop, to integrate well with GNOME applications.")
"libsecret-" version ".tar.xz"))
(sha256
(base32
"0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
"0k9bs47rzb3dwvznb4179d6nw7rbzjdyd4y8hx6vazfd1wscxcrz"))))
(build-system meson-build-system)
(arguments
`(#:tests? #f ; FIXME: Testing hangs.
#:configure-flags
(list (string-append "--with-html-dir="
(assoc-ref %outputs "doc")
"/share/gtk-doc/html"))))
(list
#:configure-flags
#~(list "-Dgtk_doc=false") ;requires gi-docgen
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-problematic-tests
(lambda _
(substitute* "libsecret/meson.build"
;; The test-collection test fails non-deterministically (see:
;; https://gitlab.gnome.org/GNOME/libsecret/-/issues/80).
((".*'test-collection',.*") ""))))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key tests? test-options #:allow-other-keys)
(when tests?
(setenv "HOME" "/tmp")
(setenv "XDG_DATA_DIRS" ;for /org/freedesktop/secrets/collection
(string-append #$output "/share:"
(getenv "XDG_DATA_DIRS")))
(apply invoke "dbus-run-session" "--"
"meson" "test" "--print-errorlogs" "-t" "0"
test-options)))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
("vala" ,vala)
("xsltproc" ,libxslt)))
(list dbus
docbook-xml-4.2
docbook-xsl
gettext-minimal
`(,glib "bin") ;for gdbus-codegen, etc.
gobject-introspection
libxml2 ;for XML_CATALOG_FILES
libxslt
pkg-config
python
python-dbus
python-pygobject
vala))
(propagated-inputs
(list glib)) ; required by libsecret-1.pc
(inputs
;; The build phase complains about missing docbook-xml-4.2 but adding it
;; doesn't seem to affect the build result.
(list docbook-xsl libgcrypt libxml2)) ; for XML_CATALOG_FILES
(list glib libgcrypt)) ;required by libsecret-1.pc
(home-page "https://wiki.gnome.org/Projects/Libsecret/")
(synopsis "GObject bindings for \"Secret Service\" API")
(description
@ -7130,7 +7149,7 @@ configuration program to choose applications starting on login.")
(define-public gjs
(package
(name "gjs")
(version "1.70.0")
(version "1.72.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -7138,7 +7157,7 @@ configuration program to choose applications starting on login.")
name "-" version ".tar.xz"))
(sha256
(base32
"0pqwhq0znprs0h5ixz396912acwzk9zvjfhi9qvh52ii38s2j1jb"))
"0xrrv9lsi087yb9yf146a1aarf5yh6rf4jw9blx30zasvjdkgvnx"))
(modules '((guix build utils)))
(snippet
'(begin
@ -7147,10 +7166,7 @@ configuration program to choose applications starting on login.")
(("☭") ""))))))
(build-system meson-build-system)
(arguments
;; Use meson-0.59, otherwise we'd get "ERROR: "install_dir" must be
;; specified when installing a target".
`(#:meson ,meson-0.59
#:configure-flags '("-Dinstalled_tests=false")
'(#:configure-flags '("-Dinstalled_tests=false")
#:phases
(modify-phases %standard-phases
(add-before 'check 'pre-check
@ -7162,17 +7178,17 @@ configuration program to choose applications starting on login.")
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-resources
("pkg-config" ,pkg-config)
("xmllint" ,libxml2)
;; For testing
("dbus-launch" ,dbus)
("dconf" ,dconf) ; required to properly store settings
("uuidgen" ,util-linux)
("xvfb" ,xorg-server-for-tests)))
(list `(,glib "bin") ;for glib-compile-resources
pkg-config
libxml2
;; For testing
dbus
dconf ;required to properly store settings
util-linux
xorg-server-for-tests))
(propagated-inputs
;; These are all in the Requires.private field of gjs-1.0.pc.
(list cairo gobject-introspection mozjs))
(list cairo gobject-introspection mozjs-91))
(inputs
(list gtk+ readline))
(synopsis "Javascript bindings for GNOME")

View File

@ -14,7 +14,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
;;; Copyright © 2020, 2021, 2022 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -97,16 +97,16 @@
(define-public mozjs
(package
(name "mozjs")
(version "78.15.0")
(version "102.2.0")
(source (origin
(method url-fetch)
;; TODO: Switch to IceCat source once available on ftp.gnu.org.
(uri (string-append "https://archive.mozilla.org/pub/firefox"
(uri (string-append "https://ftp.mozilla.org/pub/firefox"
"/releases/" version "esr/source/firefox-"
version "esr.source.tar.xz"))
(sha256
(base32
"0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4"))))
"1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81"))))
(build-system gnu-build-system)
(arguments
(list
@ -148,7 +148,7 @@
(for-each generate-all-checksums
'("js" "third_party/rust")))))
(replace 'configure
(lambda* (#:key inputs configure-flags #:allow-other-keys)
(lambda* (#:key configure-flags #:allow-other-keys)
;; The configure script does not accept environment variables as
;; arguments. It also must be run from a different directory,
;; but not the root directory either.
@ -157,43 +157,11 @@
(setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh"))
(setenv "AUTOCONF" (which "autoconf"))
(apply invoke "../js/src/configure"
(cons (string-append "--prefix=" #$output)
configure-flags))))
(add-after 'unpack 'adjust-for-icu-68
(lambda _
(with-directory-excursion "js/src/tests"
;; The test suite expects a lightly patched ICU 67. Since
;; Guix is about to switch to ICU 68, massage the tests to
;; work with that instead of patching ICU. Try removing this
;; phase for newer versions of mozjs.
;; These tests look up locale names and expects to get
;; "GB" instead of "UK".
(substitute* "non262/Intl/DisplayNames/language.js"
(("Traditionell, GB")
"Traditionell, UK"))
(substitute* "non262/Intl/DisplayNames/region.js"
(("\"GB\": \"GB\"")
"\"GB\": \"UK\""))
;; XXX: Some localized time formats have changed, and
;; substitution fails for accented characters, even though
;; it works in the REPL(?). Just delete these for now.
(delete-file "non262/Intl/Date/toLocaleString_timeZone.js")
(delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js")
;; Similarly, these get an unexpected "A" suffix when looking
;; up a time in the "ar-MA-u-ca-islamicc" locale, which is
;; tricky to substitute.
(delete-file "non262/Intl/DateTimeFormat/format_timeZone.js")
(delete-file "non262/Intl/DateTimeFormat/format.js")
;; This file compares a generated list of ICU locale names
;; with actual lookups. Some have changed slightly, i.e.
;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity.
(delete-file "non262/Intl/Locale/likely-subtags-generated.js"))))
(add-before 'check 'pre-check
(apply invoke "python" "../configure.py"
"--enable-project=js"
(string-append "--prefix=" #$output)
configure-flags)))
(add-before 'check 'adjust-tests
(lambda _
(with-directory-excursion "../js/src/tests"
(substitute* "shell/os.js"
@ -201,23 +169,174 @@
((".*killed process should not have exitStatus.*")
""))
;; XXX: Delete all tests that test time zone functionality,
;; because the test suite uses /etc/localtime to figure out
;; the offset from the hardware clock, which does not work
;; in the build container. See <tests/non262/Date/shell.js>.
(delete-file-recursively "non262/Date")
(delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")
;; The test suite expects a lightly patched ICU. Disable tests
;; that do not work with the system version. See
;; "intl/icu-patches" for clues.
(setenv "JSTESTS_EXTRA_ARGS"
(string-join
(list
;; Do not run tests marked as "random".
"--exclude-random"
;; Exclude web platform tests.
"--wpt=disabled"
;; Respect the daemons configured number of jobs.
(string-append "--worker-count="
(number->string (parallel-job-count))))))))))))
;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
;; related patch for why this is failing.
(delete-file "non262/Intl/DateTimeFormat/\
fractional-second-digits-append-item.js")
;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
(delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js")
;; FIXME: got "en-US-posix", expected "en-US-POSIX".
(delete-file "non262/Intl/available-locales-supported.js")
;; FIXME: got "en-US", expected "en-US-POSIX"
(delete-file "non262/Intl/available-locales-resolved.js"))))
(add-before 'check 'pre-check
(lambda _
(setenv "JSTESTS_EXTRA_ARGS"
(string-join
(list
;; Do not run tests marked as "random".
"--exclude-random"
;; Exclude web platform tests.
"--wpt=disabled"
;; Respect the daemons configured number of jobs.
(string-append "--worker-count="
(number->string (parallel-job-count)))))))))))
(native-inputs
(list autoconf
llvm ;for llvm-objdump
m4
perl
pkg-config
python-wrapper
rust
`(,rust "cargo")))
(inputs
(list icu4c readline zlib))
(propagated-inputs
(list nspr)) ; in the Requires.private field of mozjs-*.pc
(home-page
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey")
(synopsis "Mozilla javascript engine")
(description "SpiderMonkey is Mozilla's JavaScript engine written
in C/C++.")
(license license:mpl2.0))) ; and others for some files
(define-public mozjs-91
(package
(inherit mozjs)
(version "91.13.0")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.mozilla.org/pub/firefox"
"/releases/" version "esr/source/firefox-"
version "esr.source.tar.xz"))
(sha256
(base32
"0qh7j960wdp5zcfqhkj8ki47spp9i9ms12xx0v0kxvmmw36jpgjk"))))
(arguments
(substitute-keyword-arguments (package-arguments mozjs)
((#:phases phases)
#~(modify-phases #$phases
(add-before 'check 'disable-timezone-tests
(lambda _
(with-directory-excursion "../js/src/tests"
;; FIXME: Assertion failed: got "2021a", expected "2021a3"?
(delete-file "non262/Intl/DateTimeFormat/timeZone_version.js")
;; XXX: Delete all tests that test time zone functionality,
;; because the test suite uses /etc/localtime to figure out
;; the offset from the hardware clock, which does not work
;; in the build container. See <tests/non262/Date/shell.js>.
(delete-file-recursively "non262/Date")
(delete-file
"non262/Intl/DateTimeFormat/tz-environment-variable.js"))))))))
(inputs (modify-inputs (package-inputs mozjs)
(replace "icu4c" icu4c-69)))))
(define-public mozjs-78
(package
(inherit mozjs)
(name "mozjs")
(version "78.15.0")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.mozilla.org/pub/firefox"
"/releases/" version "esr/source/firefox-"
version "esr.source.tar.xz"))
(sha256
(base32
"0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4"))))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments mozjs)
((#:phases phases)
#~(modify-phases #$phases
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
;; The configure script does not accept environment variables as
;; arguments. It also must be run from a different directory,
;; but not the root directory either.
(mkdir "run-configure-from-here")
(chdir "run-configure-from-here")
(setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh"))
(setenv "AUTOCONF" (which "autoconf"))
(apply invoke "../js/src/configure"
(cons (string-append "--prefix=" #$output)
configure-flags))))
(replace 'adjust-tests
(lambda _
(with-directory-excursion "../js/src/tests"
;; The test suite expects a lightly patched ICU 67. Since
;; Guix is about to switch to ICU 68, massage the tests to
;; work with that instead of patching ICU. Try removing this
;; phase for newer versions of mozjs.
;; These tests look up locale names and expects to get
;; "GB" instead of "UK".
(substitute* "non262/Intl/DisplayNames/language.js"
(("Traditionell, GB")
"Traditionell, UK"))
(substitute* "non262/Intl/DisplayNames/region.js"
(("\"GB\": \"GB\"")
"\"GB\": \"UK\""))
;; XXX: Some localized time formats have changed, and
;; substitution fails for accented characters, even though
;; it works in the REPL(?). Just delete these for now.
(delete-file "non262/Intl/Date/toLocaleString_timeZone.js")
(delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js")
;; Similarly, these get an unexpected "A" suffix when looking
;; up a time in the "ar-MA-u-ca-islamicc" locale, which is
;; tricky to substitute.
(delete-file "non262/Intl/DateTimeFormat/format_timeZone.js")
(delete-file "non262/Intl/DateTimeFormat/format.js")
;; This file compares a generated list of ICU locale names
;; with actual lookups. Some have changed slightly, i.e.
;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity.
(delete-file "non262/Intl/Locale/likely-subtags-generated.js"))))
(replace 'pre-check
(lambda _
(with-directory-excursion "../js/src/tests"
(substitute* "shell/os.js"
;; FIXME: Why does the killed process have an exit status?
((".*killed process should not have exitStatus.*")
""))
;; XXX: Delete all tests that test time zone functionality,
;; because the test suite uses /etc/localtime to figure out
;; the offset from the hardware clock, which does not work
;; in the build container. See <tests/non262/Date/shell.js>.
(delete-file-recursively "non262/Date")
(delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")
(setenv "JSTESTS_EXTRA_ARGS"
(string-join
(list
;; Do not run tests marked as "random".
"--exclude-random"
;; Exclude web platform tests.
"--wpt=disabled"
;; Respect the daemons configured number of jobs.
(string-append "--worker-count="
(number->string
(parallel-job-count)))))))))))))
(native-inputs
(list autoconf-2.13
automake
@ -228,15 +347,7 @@
rust
`(,rust "cargo")))
(inputs
(list icu4c-69 readline zlib))
(propagated-inputs
(list nspr)) ; in the Requires.private field of mozjs-*.pc
(home-page
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey")
(synopsis "Mozilla javascript engine")
(description "SpiderMonkey is Mozilla's JavaScript engine written
in C/C++.")
(license license:mpl2.0))) ; and others for some files
(list icu4c-69 readline zlib))))
(define mozilla-compare-locales
(origin
@ -367,8 +478,8 @@ in C/C++.")
;; XXXX: Workaround 'snippet' limitations.
(define computed-origin-method (@@ (guix packages) computed-origin-method))
(define %icecat-version "91.12.0-guix0-preview1")
(define %icecat-build-id "20220726000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-version "91.13.0-guix0-preview1")
(define %icecat-build-id "20220823000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -390,11 +501,11 @@ in C/C++.")
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"0p1bhc1qla4a7iqk0fc6sj224ld6wplpmj4yw6nfx1b8hbqqy2vc"))))
"0qh7j960wdp5zcfqhkj8ki47spp9i9ms12xx0v0kxvmmw36jpgjk"))))
(upstream-icecat-base-version "91.12.0") ; maybe older than base-version
(upstream-icecat-base-version "91.13.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "298024d727053a1609df4003fb4438836d5181f4")
(gnuzilla-commit "4a87716686104266a9cccc2d83cc249e312f3673")
(gnuzilla-source
(origin
(method git-fetch)
@ -406,7 +517,7 @@ in C/C++.")
(string-take gnuzilla-commit 8)))
(sha256
(base32
"1lgz6knklxbrqr1vaj9d0y0997f4f6v44a8cng8ihkmn7aa7lvwg"))))
"070j78al04xzchfl5xj1w300hmw17a3iqcw7mnlxf6b8rqlgj20p"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.

View File

@ -23,7 +23,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@mgail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@ -54,6 +54,7 @@
(define-module (gnu packages golang)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix memoization)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix download)
@ -1142,6 +1143,29 @@ different output targets. Supports colors and text decoration to all popular
terminals.")
(license license:bsd-3)))
(define-public go-github-com-kortschak-utter
(package
(name "go-github-com-kortschak-utter")
(version "1.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kortschak/utter")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"13lg8gzvgjnljf1lz8qsfz3qcmbvrsxp3ip7mp2kscfz07r69dyw"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/kortschak/utter"))
(home-page "https://github.com/kortschak/utter")
(synopsis "Deep pretty printer")
(description
"This package implements a deep pretty printer for Go data structures to
aid data snapshotting.")
(license license:isc)))
(define-public go-github-com-shadowsocks-go-shadowsocks2
(package
(name "go-github-com-shadowsocks-go-shadowsocks2")
@ -2415,7 +2439,16 @@ termination.")
"1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jtolds/gls"))
(list
#:import-path "github.com/jtolds/gls"
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(unless
;; The tests fail when run with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
(synopsis "@code{gls} provides Goroutine local storage")
(description
"The @code{gls} package provides a way to store a retrieve values
@ -2976,7 +3009,7 @@ Go.")
(define-public go-github-com-stretchr-objx
(package
(name "go-github-com-stretchr-objx")
(version "0.2.0")
(version "0.4.0")
(source
(origin
(method git-fetch)
@ -2986,14 +3019,23 @@ Go.")
(file-name (git-file-name name version))
(sha256
(base32
"0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"))
"0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "vendor")))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/stretchr/objx"))
(list
#:import-path "github.com/stretchr/objx"
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(unless
;; The tests fail when run with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
(propagated-inputs
(list go-github-com-davecgh-go-spew
go-github-com-pmezard-go-difflib))
@ -3758,7 +3800,7 @@ application's http.Handlers.")
(define-public go-github-com-sirupsen-logrus
(package
(name "go-github-com-sirupsen-logrus")
(version "1.8.1")
(version "1.9.0")
(source
(origin
(method git-fetch)
@ -3768,14 +3810,23 @@ application's http.Handlers.")
(file-name (git-file-name name version))
(sha256
(base32
"0rvqzic2zz7fpxyizmqxwmhv1m52ii9bgxnqa6km8wsa0l08wh42"))))
"12i402dxq5js4npnncg043vx874h6nk4ffn4gswcccxrp6h10ivz"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/sirupsen/logrus"
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(unless
;; The tests fail when run with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
(propagated-inputs
(list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib
go-github-com-stretchr-testify go-golang-org-x-crypto
go-golang-org-x-sys))
(arguments
'(#:import-path "github.com/sirupsen/logrus"))
(home-page "https://github.com/sirupsen/logrus")
(synopsis "Structured, pluggable logging for Go")
(description "Logrus is a structured logger for Go, completely API
@ -4018,7 +4069,16 @@ which satisfies the cron expression.")
"1jwxndf8rsyx0fgrp47d99rp55yzssmryb92jfj3yf7zd8rjjljn"))))
(build-system go-build-system)
(arguments
'(#:import-path "gopkg.in/check.v1"))
(list
#:import-path "gopkg.in/check.v1"
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(unless
;; The tests fail when run with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
(propagated-inputs
(list go-github-com-kr-pretty))
(home-page "https://gopkg.in/check.v1")
@ -5994,7 +6054,16 @@ decode/encode structures and slices.")
"1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/pkg/errors"))
(list
#:import-path "github.com/pkg/errors"
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(unless
;; The tests fail when run with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
(synopsis "Go error handling primitives")
(description "This package provides @code{error}, which offers simple
error handling primitives in Go.")
@ -9069,7 +9138,7 @@ anti-fragmentation protection.")
(define-public go-github-com-valyala-fasthttp
(package
(name "go-github-com-valyala-fasthttp")
(version "1.31.0")
(version "1.39.0")
(source
(origin
(method git-fetch)
@ -9078,10 +9147,19 @@ anti-fragmentation protection.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ra0n2shcp11736xv37cjnsqn32gvqfm3dkf9v8j98xmch2wqxqg"))))
(base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/valyala/fasthttp"))
(list
#:import-path "github.com/valyala/fasthttp"
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(unless
;; Tests hang forever with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
(propagated-inputs
(list go-golang-org-x-sys
go-golang-org-x-net

View File

@ -537,7 +537,7 @@ of the Louvain algorithm, for a number of different methods.")
(define-public edge-addition-planarity-suite
(package
(name "edge-addition-planarity-suite")
(version "3.0.0.5")
(version "3.0.2.0")
(source
(origin
(method git-fetch)
@ -548,7 +548,7 @@ of the Louvain algorithm, for a number of different methods.")
(file-name (git-file-name name version))
(sha256
(base32
"01cm7ay1njkfsdnmnvh5zwc7wg7x189hq1vbfhh9p3ihrbnmqzh8"))))
"1c7bnxgiz28mqsq3a3msznmjq629w0qqjynm2rqnnjn2qpc22h3i"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake libtool))

View File

@ -177,6 +177,11 @@ framebuffer graphics, audio output and input event.")
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-buildtime
;; Remove embedded build time for reproducible builds
(lambda _
(substitute* "src/core/core.c"
(("..BUILDTIME..") ""))))
(add-after 'unpack 'disable-configure-during-bootstrap
(lambda _
(substitute* "autogen.sh"
@ -852,6 +857,7 @@ basic geometries.")
(native-inputs
(list python-defcon-bootstrap
python-fontpens-bootstrap
python-setuptools-scm
python-pytest
python-wheel
unzip))
@ -1915,8 +1921,9 @@ Cflags: -I${includedir}~%" #$output #$version))))))))
(inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib))
(home-page "https://skia.org/")
(synopsis "2D graphics library")
(description "Skia is an open source 2D graphics library. It can be
used for drawing text, geometries, and images and has support for:
(description
"Skia is a 2D graphics library for drawing text, geometries, and images.
It supports:
@itemize
@item 3x3 matrices with perspective
@item antialiasing, transparency, filters
@ -2018,7 +2025,7 @@ Some feature highlights:
(define-public openxr
(package
(name "openxr")
(version "1.0.23")
(version "1.0.24")
(source
(origin
(method git-fetch)
@ -2032,7 +2039,7 @@ Some feature highlights:
;; Delete bundled jsoncpp.
(delete-file-recursively "src/external/jsoncpp")))
(sha256
(base32 "11w5a2ny30r8jghd5jwdxi5b2c84m21fmkp0lhpicbrwr98xgpj3"))))
(base32 "1lkbw03hpwnqcbn0fmxs4cnp5m04hc0ys6y111n7vlrg11sjdpq5"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; there are no tests

View File

@ -121,6 +121,8 @@ way of representing structural information as diagrams of abstract graphs and
networks. It has important applications in networking, bioinformatics,
software engineering, database and web design, machine learning, and in visual
interfaces for other technical domains.")
(properties
'((release-monitoring-url . "https://graphviz.org/download/source/")))
(license license:epl1.0)))
;; Older Graphviz needed for pygraphviz. See

View File

@ -531,6 +531,7 @@ This package provides the core library and elements.")
(propagated-inputs
(cons* glib ;required by gstreamer-sdp-1.0.pc
gstreamer ;required by gstreamer-plugins-base-1.0.pc
libgudev ;required by gstreamer-gl-1.0.pc
;; wayland-client.h is referred to in
;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h
wayland
@ -547,7 +548,6 @@ This package provides the core library and elements.")
cdparanoia
graphene
iso-codes
libgudev
libjpeg-turbo
libogg
libpng

View File

@ -2190,13 +2190,13 @@ information.")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))))
(find-files (string-append out "/bin")))))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("itstool" ,itstool)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)))
(list gettext-minimal
`(,glib "bin")
gobject-introspection
itstool
perl
pkg-config
python-wrapper))
(inputs
(list bc
dblatex
@ -2210,7 +2210,6 @@ information.")
python-lxml
python-parameterized
python-pygments
python-unittest2
source-highlight
yelp-tools))
(home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc")
@ -2235,8 +2234,8 @@ with some extra work.")
(define-public gtk-doc/stable
(hidden-package
(package/inherit gtk-doc
(inputs (alist-replace "dblatex" `(,dblatex/stable)
(package-inputs gtk-doc))))))
(inputs (modify-inputs (package-inputs gtk-doc)
(replace "dblatex" dblatex/stable))))))
(define-public gtk-engines
(package

View File

@ -417,43 +417,36 @@ dictionary and suggesting spelling corrections.")
(package
(name "guile2.0-bash")
(version (string-append "0.1.6-" revision "." (string-take commit 7)))
(home-page
"https://anonscm.debian.org/cgit/users/kaction-guest/retired/dev.guile-bash.git")
(source (origin
(method git-fetch)
(uri (git-reference
(commit commit)
(url home-page)))
(url "https://git.sr.ht/~kaction/guile-bash")))
(sha256
(base32
"097vny990wp2qpjij6a5a5gwc6fxzg5wk56inhy18iki5v6pif1p"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
;; Add -I to match 'bash.pc' of Bash 4.4.
(list (string-append "CPPFLAGS=-I"
(assoc-ref %build-inputs "bash:include")
"/include/bash/include")
;; The '.a' file is useless.
"--disable-static"
;; Install 'lib/bash' as Bash 4.4 expects.
(string-append "--libdir=" (assoc-ref %outputs "out")
"/lib/bash"))))
(native-inputs `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
("gettext" ,gettext-minimal)
;; Bash with loadable module support, for the test
;; suite.
("bash-full" ,bash)))
(list
#:configure-flags
#~(list (string-append "CPPFLAGS=-I" ; match bash.pc
(assoc-ref %build-inputs "bash:include")
"/include/bash/include")
;; The '.a' file is useless.
"--disable-static"
;; Install 'lib/bash' as Bash 4.4 expects.
(string-append "--libdir=" #$output "/lib/bash"))))
(native-inputs
(list autoconf
automake
bash ; with loadable module support, for tests
gettext-minimal ; for AC_LIB_LINKFLAGS_FROM_LIBS
libtool
pkg-config))
(inputs `(("guile" ,guile-2.0)
("bash:include" ,bash "include")))
(home-page "https://git.sr.ht/~kaction/guile-bash")
(synopsis "Extend Bash using Guile")
(description
"Guile-Bash provides a shared library and set of Guile modules,
@ -483,19 +476,20 @@ and then run @command{scm example.scm}.")
(inherit guile2.0-bash)
(name "guile-bash")
(inputs
`(("guile" ,guile-3.0-latest)
,@(assoc-remove! (package-inputs guile2.0-bash) "guile")))
(modify-inputs (package-inputs guile2.0-bash)
(replace "guile" guile-3.0-latest)))
(arguments
`(#:tests? #f
#:phases (modify-phases %standard-phases
(add-after 'install 'install-guile
(lambda* (#:key inputs outputs #:allow-other-keys)
(copy-recursively
(string-append (assoc-ref outputs "out")
(assoc-ref inputs "guile") "/share")
(string-append (assoc-ref outputs "out") "/share"))
#t)))
,@(package-arguments guile2.0-bash)))))
(substitute-keyword-arguments (package-arguments guile2.0-bash)
;; XXX The tests succeed with Guile 2.0 but fail with 3.0.
((#:tests? _ #f) #f)
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
(add-after 'install 'install-guile
(lambda* (#:key inputs outputs #:allow-other-keys)
(copy-recursively
(string-append (assoc-ref outputs "out")
(assoc-ref inputs "guile") "/share")
(string-append (assoc-ref outputs "out") "/share"))))))))))
(define-public guile-8sync
(let ((commit "183b4f02e68279d4984e79b79e06bfcf1861fcbf") (revision "0"))
@ -621,7 +615,8 @@ Unix-style DSV format and RFC 4180 format.")
(base32
"0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc"))
(patches
(search-patches "guile-fibers-wait-for-io-readiness.patch"))))
(search-patches "guile-fibers-wait-for-io-readiness.patch"
"guile-fibers-epoll-instance-is-dead.patch"))))
(build-system gnu-build-system)
(native-inputs
(list texinfo pkg-config autoconf automake libtool
@ -3703,12 +3698,12 @@ the style of the Node Package Manager (NPM).")
(package
(name "guile-hashing")
(version "1.2.0")
(home-page "https://github.com/weinholt/hashing")
(home-page "https://gitlab.com/weinholt/hashing")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(commit "f138deaec38d54ddb621c082764ece276deebe7f")))
(file-name (git-file-name name version))
(sha256
(base32
@ -3761,12 +3756,12 @@ SHA-512).")
(package
(name "guile-packrat")
(version "0.1.1")
(home-page "https://github.com/weinholt/packrat")
(home-page "https://gitlab.com/weinholt/packrat")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(commit "4201ebe741b605db58a21d70195cfb7db3c38eae")))
(file-name (git-file-name name version))
(sha256
(base32
@ -4176,8 +4171,8 @@ more objects or strings, represented by a Json object or an IRI.")
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/weinholt/struct-pack")
(commit (string-append "v" version))))
(url "https://gitlab.com/weinholt/struct-pack")
(commit "11b71963793ed4a3bf761efdd83cf2fe123239ee")))
(file-name (git-file-name name version))
(sha256
(base32 "0hd72m821pahjphzyjn26i55542v8makr55xzjll2cycja4wsbc1"))))
@ -4205,7 +4200,7 @@ more objects or strings, represented by a Json object or an IRI.")
#t)))))
(native-inputs
(list guile-3.0))
(home-page "https://github.com/weinholt/struct-pack")
(home-page "https://gitlab.com/weinholt/struct-pack")
(synopsis "R6RS library for working with packed byte structures")
(description
"This is an R6RS library for working with packed byte structures. It is
@ -4215,16 +4210,16 @@ similar to struct in Python or pack and unpack in Perl.")
(define-public guile-machine-code
(package
(name "guile-machine-code")
(version "2.1.0")
(version "2.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/weinholt/machine-code")
(url "https://gitlab.com/weinholt/machine-code")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0wzj3caj2jypzyjqfkfqkvr3kkbjabsnhldv9kvnx9w9qnria5yd"))))
(base32 "1yjzpg5p082kg4vaqlwbwddrrhxyxar6gsx9ql72hpwah4ka82h5"))))
(build-system guile-build-system)
(arguments
`(#:compile-flags '("--r6rs" "-Wunbound-variable" "-Warity-mismatch")
@ -4251,7 +4246,7 @@ similar to struct in Python or pack and unpack in Perl.")
(list guile-3.0))
(propagated-inputs
(list guile-struct-pack))
(home-page "https://github.com/weinholt/machine-code")
(home-page "https://gitlab.com/weinholt/machine-code")
(synopsis "Tools that relate to machine code and object formats")
(description
"This project is about the development of tools that relate to machine
@ -4268,7 +4263,7 @@ object formats and related areas.")
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/weinholt/laesare")
(url "https://gitlab.com/weinholt/laesare")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -4297,7 +4292,7 @@ object formats and related areas.")
#t)))))
(native-inputs
(list guile-3.0))
(home-page "https://github.com/weinholt/laesare")
(home-page "https://gitlab.com/weinholt/laesare")
(synopsis "R6RS Scheme library that provides a reader")
(description
"This is an R6RS Scheme library that provides a reader with some extra

View File

@ -1147,9 +1147,7 @@ applications.")
(define-public usbguard
(package
(name "usbguard")
;; Note: Use a recent snapshot to get compatibility with newer system
;; libraries.
(version "1.0.0-55-g466f1f0")
(version "1.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1157,51 +1155,51 @@ applications.")
(commit (string-append "usbguard-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0rc0213qsfap3sgx9m3m1kppxbjl2fdwmzlbn5rbmn1i33125dfi"))))
(base32 "0lpyhkz5nr0c9mq57mgcvam5c8qfqqwjc4xd46n2ldqc9vhfsask"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-bootstrap-script
(lambda _
;; Don't attempt to fetch git submodules.
(substitute* "autogen.sh"
(("^git submodule.*")
""))))
(add-after 'bootstrap 'patch-build-scripts
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "configure"
(("/usr/include/catch")
(dirname (search-input-file inputs "include/catch.hpp"))))
;; Do not create log directory.
(substitute* "Makefile.in" ((".*/log/usbguard.*") ""))
;; Disable LDAP tests: they use 'sudo'.
(substitute* "src/Tests/Makefile.in"
(("\\$\\(am__append_2\\)") ""))))
(add-after 'install 'delete-static-library
(lambda* (#:key outputs #:allow-other-keys)
;; It can't be direclty disabled since it's needed for the tests.
(delete-file (string-append (assoc-ref outputs "out")
"/lib/libusbguard.a"))))
(add-after 'install 'install-zsh-completion
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(site-functions
(string-append out "/share/zsh/site-functions")))
(mkdir-p site-functions)
(copy-file "scripts/usbguard-zsh-completion"
(string-append site-functions "/_usbguard"))))))
#:make-flags
(list (string-append "BASH_COMPLETION_DIR="
(assoc-ref %outputs "out")
"/etc/bash_completion.d"))
#:configure-flags
(list
"--localstatedir=/var"
"--enable-systemd=no"
"--with-ldap"
"--with-dbus"
"--with-polkit")))
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-bootstrap-script
(lambda _
;; Don't attempt to fetch git submodules.
(substitute* "autogen.sh"
(("^git submodule.*")
""))))
(add-after 'bootstrap 'patch-build-scripts
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "configure"
(("/usr/include/catch")
(dirname (search-input-file inputs "include/catch.hpp"))))
;; Do not create log directory.
(substitute* "Makefile.in" ((".*/log/usbguard.*") ""))
;; Disable LDAP tests: they use 'sudo'.
(substitute* "src/Tests/Makefile.in"
(("\\$\\(am__append_2\\)") ""))))
(add-after 'install 'delete-static-library
(lambda args
;; It can't be directly disabled since it's needed for the tests.
(delete-file (string-append #$output
"/lib/libusbguard.a"))))
(add-after 'install 'install-zsh-completion
(lambda args
(let ((site-functions
(string-append #$output "/share/zsh/site-functions")))
(mkdir-p site-functions)
(copy-file "scripts/usbguard-zsh-completion"
(string-append site-functions "/_usbguard"))))))
#:make-flags
#~(list (string-append "BASH_COMPLETION_DIR="
#$output
"/etc/bash_completion.d"))
#:configure-flags
#~(list
"--localstatedir=/var"
"--enable-systemd=no"
"--with-ldap"
"--with-dbus"
"--with-polkit")))
(inputs
(list audit
catch-framework

View File

@ -408,7 +408,7 @@ libraries are included in this package.")
(define-public ghc-7
(package
(name "ghc")
(version "7.10.2")
(version "7.10.3")
(source
(origin
(method url-fetch)
@ -416,7 +416,7 @@ libraries are included in this package.")
version "/" name "-" version "-src.tar.xz"))
(sha256
(base32
"1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"))))
"1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"))))
(build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(outputs '("out" "doc"))
@ -436,7 +436,7 @@ libraries are included in this package.")
version "/" name "-" version "-testsuite.tar.xz"))
(sha256
(base32
"0qp9da9ar87zbyn6wjgacd2ic1vgzbi3cklxnhsmjqyafv9qaj4b"))))))
"0fk4xjw1x5lk2ifvgqij06lrbf1vxq9qfix86h9r16c0bilm3hah"))))))
(native-inputs
`(("perl" ,perl)
("python" ,python-2) ; for tests (fails with python-3)
@ -448,7 +448,8 @@ libraries are included in this package.")
ghc-bootstrap-x86_64-7.8.4
ghc-bootstrap-i686-7.8.4))))
(arguments
`(#:test-target "test"
(list
#:test-target "test"
;; We get a smaller number of test failures by disabling parallel test
;; execution.
#:parallel-tests? #f
@ -458,117 +459,108 @@ libraries are included in this package.")
;; then complains that they don't match.
#:build #f
#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26)
(srfi srfi-1))
#:modules '((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26)
(srfi srfi-1))
#:configure-flags
(list
(string-append "--with-gmp-libraries="
(assoc-ref %build-inputs "gmp") "/lib")
(string-append "--with-gmp-includes="
(assoc-ref %build-inputs "gmp") "/include")
"--with-system-libffi"
(string-append "--with-ffi-libraries="
(assoc-ref %build-inputs "libffi") "/lib")
(string-append "--with-ffi-includes="
(assoc-ref %build-inputs "libffi") "/include"))
#~(list
(string-append "--with-gmp-libraries="
(assoc-ref %build-inputs "gmp") "/lib")
(string-append "--with-gmp-includes="
(assoc-ref %build-inputs "gmp") "/include")
"--with-system-libffi"
(string-append "--with-ffi-libraries="
(assoc-ref %build-inputs "libffi") "/lib")
(string-append "--with-ffi-includes="
(assoc-ref %build-inputs "libffi") "/include"))
;; FIXME: The user-guide needs dblatex, docbook-xsl and docbook-utils.
;; Currently we do not have the last one.
;; #:make-flags
;; (list "BUILD_DOCBOOK_HTML = YES")
#:phases
(let* ((ghc-bootstrap-path
(string-append (getcwd) "/" ,name "-" ,version "/ghc-bin"))
(ghc-bootstrap-prefix
(string-append ghc-bootstrap-path "/usr" )))
(alist-cons-after
'unpack-bin 'unpack-testsuite-and-fix-bins
(lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion ".."
(copy-file (assoc-ref inputs "ghc-testsuite")
"ghc-testsuite.tar.xz")
(invoke "tar" "xvf" "ghc-testsuite.tar.xz"))
(substitute*
(list "testsuite/timeout/Makefile"
"testsuite/timeout/timeout.py"
"testsuite/timeout/timeout.hs"
"testsuite/tests/rename/prog006/Setup.lhs"
"testsuite/tests/programs/life_space_leak/life.test"
"libraries/process/System/Process/Internals.hs"
"libraries/unix/cbits/execvpe.c")
(("/bin/sh") (which "sh"))
(("/bin/rm") "rm"))
#t)
(alist-cons-after
'unpack 'unpack-bin
(lambda* (#:key inputs outputs #:allow-other-keys)
(mkdir-p ghc-bootstrap-prefix)
(with-directory-excursion ghc-bootstrap-path
(copy-file (assoc-ref inputs "ghc-binary")
"ghc-bin.tar.xz")
(invoke "tar" "xvf" "ghc-bin.tar.xz")))
(alist-cons-before
'install-bin 'configure-bin
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((binaries
(list
"./utils/ghc-pwd/dist-install/build/tmp/ghc-pwd"
"./utils/hpc/dist-install/build/tmp/hpc"
"./utils/haddock/dist/build/tmp/haddock"
"./utils/hsc2hs/dist-install/build/tmp/hsc2hs"
"./utils/runghc/dist-install/build/tmp/runghc"
"./utils/ghc-cabal/dist-install/build/tmp/ghc-cabal"
"./utils/hp2ps/dist/build/tmp/hp2ps"
"./utils/ghc-pkg/dist-install/build/tmp/ghc-pkg"
"./utils/unlit/dist/build/tmp/unlit"
"./ghc/stage2/build/tmp/ghc-stage2"))
(gmp (assoc-ref inputs "gmp"))
(gmp-lib (string-append gmp "/lib"))
(gmp-include (string-append gmp "/include"))
(ncurses-lib
(dirname (search-input-file inputs "/lib/libncurses.so")))
(ld-so (search-input-file inputs ,(glibc-dynamic-linker)))
(libtinfo-dir
(string-append ghc-bootstrap-prefix
"/lib/ghc-7.8.4/terminfo-0.4.0.0")))
(with-directory-excursion
(string-append ghc-bootstrap-path "/ghc-7.8.4")
(setenv "CONFIG_SHELL" (which "bash"))
(setenv "LD_LIBRARY_PATH" gmp-lib)
;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded.
(for-each
(cut invoke "patchelf" "--set-interpreter" ld-so <>)
binaries)
;; The binaries include a reference to libtinfo.so.5 which
;; is a subset of libncurses.so.5. We create a symlink in a
;; directory included in the bootstrap binaries rpath.
(mkdir-p libtinfo-dir)
(symlink
(string-append ncurses-lib "/libncursesw.so."
;; Extract "6.0" from "6.0-20170930" if a
;; dash-separated version tag exists.
,(let* ((v (package-version ncurses))
(d (or (string-index v #\-)
(string-length v))))
(version-major+minor (string-take v d))))
(string-append libtinfo-dir "/libtinfo.so.5"))
(setenv "PATH"
(string-append (getenv "PATH") ":"
ghc-bootstrap-prefix "/bin"))
(invoke
(string-append (getcwd) "/configure")
(string-append "--prefix=" ghc-bootstrap-prefix)
(string-append "--with-gmp-libraries=" gmp-lib)
(string-append "--with-gmp-includes=" gmp-include)))))
(alist-cons-before
'configure 'install-bin
(lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion
#~(let* ((ghc-bootstrap-path
(string-append (getcwd) "/" #$name "-" #$version "/ghc-bin"))
(ghc-bootstrap-prefix
(string-append ghc-bootstrap-path "/usr" )))
(modify-phases %standard-phases
(add-after 'unpack 'unpack-bin
(lambda* (#:key inputs outputs #:allow-other-keys)
(mkdir-p ghc-bootstrap-prefix)
(with-directory-excursion ghc-bootstrap-path
(invoke "tar" "xvf" (assoc-ref inputs "ghc-binary")))))
(add-after 'unpack-bin 'unpack-testsuite-and-fix-bins
(lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion ".."
(invoke "tar" "xvf" (assoc-ref inputs "ghc-testsuite")))
(substitute*
(list "testsuite/timeout/Makefile"
"testsuite/timeout/timeout.py"
"testsuite/timeout/timeout.hs"
"testsuite/tests/rename/prog006/Setup.lhs"
"testsuite/tests/programs/life_space_leak/life.test"
"libraries/process/System/Process/Internals.hs"
"libraries/unix/cbits/execvpe.c")
(("/bin/sh") (search-input-file inputs "/bin/sh"))
(("/bin/rm") "rm"))))
(add-before 'configure 'install-bin
(lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion
(string-append ghc-bootstrap-path "/ghc-7.8.4")
(invoke "make" "install")))
%standard-phases)))))))
(invoke "make" "install"))))
(add-before 'install-bin 'configure-bin
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((binaries
(list
"./utils/ghc-pwd/dist-install/build/tmp/ghc-pwd"
"./utils/hpc/dist-install/build/tmp/hpc"
"./utils/haddock/dist/build/tmp/haddock"
"./utils/hsc2hs/dist-install/build/tmp/hsc2hs"
"./utils/runghc/dist-install/build/tmp/runghc"
"./utils/ghc-cabal/dist-install/build/tmp/ghc-cabal"
"./utils/hp2ps/dist/build/tmp/hp2ps"
"./utils/ghc-pkg/dist-install/build/tmp/ghc-pkg"
"./utils/unlit/dist/build/tmp/unlit"
"./ghc/stage2/build/tmp/ghc-stage2"))
(gmp (assoc-ref inputs "gmp"))
(gmp-lib (string-append gmp "/lib"))
(gmp-include (string-append gmp "/include"))
(ncurses-lib
(dirname (search-input-file inputs "/lib/libncurses.so")))
(ld-so (search-input-file inputs #$(glibc-dynamic-linker)))
(libtinfo-dir
(string-append ghc-bootstrap-prefix
"/lib/ghc-7.8.4/terminfo-0.4.0.0")))
(with-directory-excursion
(string-append ghc-bootstrap-path "/ghc-7.8.4")
(setenv "CONFIG_SHELL" (which "bash"))
(setenv "LD_LIBRARY_PATH" gmp-lib)
;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded.
(for-each
(cut invoke "patchelf" "--set-interpreter" ld-so <>)
binaries)
;; The binaries include a reference to libtinfo.so.5 which
;; is a subset of libncurses.so.5. We create a symlink in a
;; directory included in the bootstrap binaries rpath.
(mkdir-p libtinfo-dir)
(symlink
(string-append ncurses-lib "/libncursesw.so."
;; Extract "6.0" from "6.0-20170930" if a
;; dash-separated version tag exists.
#$(let* ((v (package-version ncurses))
(d (or (string-index v #\-)
(string-length v))))
(version-major+minor (string-take v d))))
(string-append libtinfo-dir "/libtinfo.so.5"))
(setenv "PATH"
(string-append (getenv "PATH") ":"
ghc-bootstrap-prefix "/bin"))
(invoke
(string-append (getcwd) "/configure")
(string-append "--prefix=" ghc-bootstrap-prefix)
(string-append "--with-gmp-libraries=" gmp-lib)
(string-append "--with-gmp-includes=" gmp-include))))))))))
(native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH")
(files (list
@ -599,29 +591,26 @@ interactive environment for the functional language Haskell.")
(supported-systems '("i686-linux" "x86_64-linux"))
(outputs '("out" "doc"))
(inputs
`(("gmp" ,gmp)
("ncurses" ,ncurses)
;; Use a LibFFI variant without static trampolines to work around
;; <https://gitlab.haskell.org/ghc/ghc/-/issues/20051>.
("libffi" ,libffi-sans-static-trampolines)
("ghc-testsuite"
,(origin
(method url-fetch)
(uri (string-append
"https://www.haskell.org/ghc/dist/"
version "/" name "-" version "-testsuite.tar.xz"))
(sha256
(base32 "1wjc3x68l305bl1h1ijd3yhqp2vqj83lkp3kqbr94qmmkqlms8sj"))))))
;; Use a LibFFI variant without static trampolines to work around
;; <https://gitlab.haskell.org/ghc/ghc/-/issues/20051>.
(list gmp ncurses libffi-sans-static-trampolines))
(native-inputs
`(("perl" ,perl)
("python" ,python-2) ; for tests
("ghostscript" ,ghostscript) ; for tests
;; GHC is built with GHC.
("ghc-bootstrap" ,ghc-7)))
("ghc-bootstrap" ,ghc-7)
("ghc-testsuite"
,(origin
(method url-fetch)
(uri (string-append
"https://www.haskell.org/ghc/dist/"
version "/" name "-" version "-testsuite.tar.xz"))
(sha256
(base32 "1wjc3x68l305bl1h1ijd3yhqp2vqj83lkp3kqbr94qmmkqlms8sj")))) ))
(arguments
`(#:test-target "test"
(list
#:test-target "test"
;; We get a smaller number of test failures by disabling parallel test
;; execution.
#:parallel-tests? #f
@ -632,53 +621,48 @@ interactive environment for the functional language Haskell.")
#:build #f
#:configure-flags
(list
(string-append "--with-gmp-libraries="
(assoc-ref %build-inputs "gmp") "/lib")
(string-append "--with-gmp-includes="
(assoc-ref %build-inputs "gmp") "/include")
"--with-system-libffi"
(string-append "--with-ffi-libraries="
(assoc-ref %build-inputs "libffi") "/lib")
(string-append "--with-ffi-includes="
(assoc-ref %build-inputs "libffi") "/include")
(string-append "--with-curses-libraries="
(assoc-ref %build-inputs "ncurses") "/lib")
(string-append "--with-curses-includes="
(assoc-ref %build-inputs "ncurses") "/include"))
#~(list
(string-append "--with-gmp-libraries="
(assoc-ref %build-inputs "gmp") "/lib")
(string-append "--with-gmp-includes="
(assoc-ref %build-inputs "gmp") "/include")
"--with-system-libffi"
(string-append "--with-ffi-libraries="
(assoc-ref %build-inputs "libffi") "/lib")
(string-append "--with-ffi-includes="
(assoc-ref %build-inputs "libffi") "/include")
(string-append "--with-curses-libraries="
(assoc-ref %build-inputs "ncurses") "/lib")
(string-append "--with-curses-includes="
(assoc-ref %build-inputs "ncurses") "/include"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-testsuite
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion ".."
(copy-file (assoc-ref inputs "ghc-testsuite")
"ghc-testsuite.tar.xz")
(zero? (system* "tar" "xvf" "ghc-testsuite.tar.xz")))))
(add-before 'build 'fix-lib-paths
(lambda _
(substitute*
#~(modify-phases %standard-phases
(add-after 'unpack 'unpack-testsuite
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion ".."
(invoke "tar" "xvf" (assoc-ref inputs "ghc-testsuite")))))
(add-before 'build 'fix-lib-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute*
(list "libraries/process/System/Process/Posix.hs"
"libraries/process/tests/process001.hs"
"libraries/process/tests/process002.hs"
"libraries/unix/cbits/execvpe.c")
(("/bin/sh") (which "sh"))
(("/bin/ls") (which "ls")))
#t))
(add-before 'build 'fix-environment
(lambda _
(unsetenv "GHC_PACKAGE_PATH")
(setenv "CONFIG_SHELL" (which "bash"))
#t))
(add-before 'check 'fix-testsuite
(lambda _
(substitute*
(("/bin/sh") (search-input-file inputs "/bin/sh"))
(("/bin/ls") (search-input-file inputs "/bin/ls")))))
(add-before 'build 'fix-environment
(lambda _
(unsetenv "GHC_PACKAGE_PATH")
(setenv "CONFIG_SHELL" (which "bash"))))
(add-before 'check 'fix-testsuite
(lambda _
(substitute*
(list "testsuite/timeout/Makefile"
"testsuite/timeout/timeout.py"
"testsuite/timeout/timeout.hs"
"testsuite/tests/programs/life_space_leak/life.test")
(("/bin/sh") (which "sh"))
(("/bin/rm") "rm"))
#t)))))
(("/bin/sh") (which "sh"))
(("/bin/rm") "rm")))))))
(native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH")
(files (list
@ -703,15 +687,11 @@ interactive environment for the functional language Haskell.")
version "/" name "-" version "-src.tar.xz"))
(sha256
(base32 "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i"))))
(inputs
;; Note: GHC < 9 requires LibFFI < 3.4, or a variant without static
;; trampolines.
(list gmp ncurses libffi-sans-static-trampolines))
(native-inputs
`(("perl" ,perl)
("python" ,python) ; for tests
("ghostscript" ,ghostscript) ; for tests
;; GHC 8.4.3 is built with GHC 8.
;; GHC 8.4.4 is built with GHC >= 8.0.
("ghc-bootstrap" ,ghc-8.0)
("ghc-testsuite"
,(origin
@ -723,92 +703,39 @@ interactive environment for the functional language Haskell.")
(base32
"0s8lf9sxj7n89pjagi58b3fahnp34qvmwhnn0j1fbg6955vbrfj6"))))))
(arguments
`(#:test-target "test"
;; We get a smaller number of test failures by disabling parallel test
;; execution.
#:parallel-tests? #f
;; Don't pass --build=<triplet>, because the configure script
;; auto-detects slightly different triplets for --host and --target and
;; then complains that they don't match.
#:build #f
#:configure-flags
(list
(string-append "--with-gmp-libraries="
(assoc-ref %build-inputs "gmp") "/lib")
(string-append "--with-gmp-includes="
(assoc-ref %build-inputs "gmp") "/include")
"--with-system-libffi"
(string-append "--with-ffi-libraries="
(assoc-ref %build-inputs "libffi") "/lib")
(string-append "--with-ffi-includes="
(assoc-ref %build-inputs "libffi") "/include")
(string-append "--with-curses-libraries="
(assoc-ref %build-inputs "ncurses") "/lib")
(string-append "--with-curses-includes="
(assoc-ref %build-inputs "ncurses") "/include"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-testsuite
(lambda* (#:key inputs #:allow-other-keys)
(invoke "tar" "xvf"
(assoc-ref inputs "ghc-testsuite")
"--strip-components=1")
#t))
;; This phase patches the 'ghc-pkg' command so that it sorts the list
;; of packages in the binary cache it generates.
(add-before 'build 'fix-ghc-pkg-nondeterminism
(lambda _
(substitute* "utils/ghc-pkg/Main.hs"
(("confs = map \\(path </>\\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs")
"confs = map (path </>) $ filter (\".conf\" `isSuffixOf`) (sort fs)"))
#t))
(add-after 'unpack-testsuite 'fix-shell-wrappers
(lambda _
(substitute* '("driver/ghci/ghc.mk"
"utils/mkdirhier/ghc.mk"
"rules/shell-wrapper.mk")
(("echo '#!/bin/sh'")
(format #f "echo '#!~a'" (which "sh"))))
#t))
;; This is necessary because the configure system no longer uses
;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the
;; plain command names.
(add-before 'configure 'set-target-programs
(lambda* (#:key inputs #:allow-other-keys)
(let ((binutils (assoc-ref inputs "binutils"))
(gcc (assoc-ref inputs "gcc"))
(ld-wrapper (assoc-ref inputs "ld-wrapper")))
(setenv "CC" (string-append gcc "/bin/gcc"))
(setenv "CXX" (string-append gcc "/bin/g++"))
(setenv "LD" (string-append ld-wrapper "/bin/ld"))
(setenv "NM" (string-append binutils "/bin/nm"))
(setenv "RANLIB" (string-append binutils "/bin/ranlib"))
(setenv "STRIP" (string-append binutils "/bin/strip"))
;; The 'ar' command does not follow the same pattern.
(setenv "fp_prog_ar" (string-append binutils "/bin/ar"))
#t)))
(add-before 'build 'fix-references
(lambda _
(substitute* '("testsuite/timeout/Makefile"
"testsuite/timeout/timeout.py"
"testsuite/timeout/timeout.hs"
"testsuite/tests/programs/life_space_leak/life.test"
;; libraries
"libraries/process/System/Process/Posix.hs"
"libraries/process/tests/process001.hs"
"libraries/process/tests/process002.hs"
"libraries/unix/cbits/execvpe.c")
(("/bin/sh") (which "sh"))
(("/bin/ls") (which "ls"))
(("/bin/rm") "rm"))
#t))
(add-before 'build 'fix-environment
(lambda _
(unsetenv "GHC_PACKAGE_PATH")
(setenv "CONFIG_SHELL" (which "bash"))
#t)))))
(substitute-keyword-arguments (package-arguments ghc-8.0)
((#:phases phases)
#~(modify-phases #$phases
;; This phase patches the 'ghc-pkg' command so that it sorts the list
;; of packages in the binary cache it generates.
(add-before 'build 'fix-ghc-pkg-nondeterminism
(lambda _
(substitute* "utils/ghc-pkg/Main.hs"
(("confs = map \\(path </>\\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs")
"confs = map (path </>) $ filter (\".conf\" `isSuffixOf`) (sort fs)"))))
(add-after 'unpack-testsuite 'fix-shell-wrappers
(lambda _
(substitute* '("driver/ghci/ghc.mk"
"utils/mkdirhier/ghc.mk"
"rules/shell-wrapper.mk")
(("echo '#!/bin/sh'")
(format #f "echo '#!~a'" (which "sh"))))))
;; This is necessary because the configure system no longer uses
;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the
;; plain command names.
(add-before 'configure 'set-target-programs
(lambda* (#:key inputs #:allow-other-keys)
(let ((binutils (assoc-ref inputs "binutils"))
(gcc (assoc-ref inputs "gcc"))
(ld-wrapper (assoc-ref inputs "ld-wrapper")))
(setenv "CC" (string-append gcc "/bin/gcc"))
(setenv "CXX" (string-append gcc "/bin/g++"))
(setenv "LD" (string-append ld-wrapper "/bin/ld"))
(setenv "NM" (string-append binutils "/bin/nm"))
(setenv "RANLIB" (string-append binutils "/bin/ranlib"))
(setenv "STRIP" (string-append binutils "/bin/strip"))
;; The 'ar' command does not follow the same pattern.
(setenv "fp_prog_ar" (string-append binutils "/bin/ar")))))))))
(native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH")
(files (list
@ -848,10 +775,10 @@ interactive environment for the functional language Haskell.")
(arguments
(substitute-keyword-arguments (package-arguments ghc-8.4)
((#:make-flags make-flags ''())
`(cons "EXTRA_RUNTEST_OPTS=--skip-perf-tests"
,make-flags))
#~(cons "EXTRA_RUNTEST_OPTS=--skip-perf-tests"
#$make-flags))
((#:phases phases '%standard-phases)
`(modify-phases ,phases
#~(modify-phases #$phases
(add-after 'install 'remove-unnecessary-references
(lambda* (#:key outputs #:allow-other-keys)
(substitute* (find-files (string-append (assoc-ref outputs "out") "/lib/")
@ -876,8 +803,7 @@ interactive environment for the functional language Haskell.")
(new (string-append out subdir)))
(mkdir-p (dirname new))
(rename-file haddock-file new)))
(find-files doc "\\.haddock$")))
#t))
(find-files doc "\\.haddock$")))))
(add-after 'unpack-testsuite 'skip-tests
(lambda _
;; These two tests refer to the root user, which doesn't exist
@ -885,8 +811,7 @@ interactive environment for the functional language Haskell.")
(substitute* "libraries/unix/tests/all.T"
(("^test\\('T8108'") "# guix skipped: test('T8108'"))
(substitute* "libraries/unix/tests/libposix/all.T"
(("^test\\('posix010'") "# guix skipped: test('posix010'"))
#t))))))
(("^test\\('posix010'") "# guix skipped: test('posix010'"))))))))
(native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH")
(files (list
@ -926,19 +851,17 @@ interactive environment for the functional language Haskell.")
(arguments
(substitute-keyword-arguments (package-arguments ghc-8.6)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-after 'fix-references 'fix-cc-reference
#~(modify-phases #$phases
(add-before 'build 'fix-cc-reference
(lambda _
(substitute* "utils/hsc2hs/Common.hs"
(("\"cc\"") "\"gcc\""))
#t))
(("\"cc\"") "\"gcc\""))))
(add-after 'unpack-testsuite 'skip-more-tests
(lambda _
;; XXX: This test fails because our ld-wrapper script
;; mangles the response file passed to the linker.
(substitute* "testsuite/tests/hp2ps/all.T"
(("^test\\('T15904'") "# guix skipped: test('T15904'"))
#t))))))
(("^test\\('T15904'") "# guix skipped: test('T15904'"))))))))
(native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH")
(files (list
@ -959,7 +882,8 @@ interactive environment for the functional language Haskell.")
(sha256
(base32 "179ws2q0dinl1a39wm9j37xzwm84zfz3c5543vz8v479khigdvp3"))))
(native-inputs
`(("ghc-bootstrap" ,ghc-8.8)
`(;; GHC 8.10.7 must be built with GHC >= 8.6.
("ghc-bootstrap" ,ghc-8.6)
("ghc-testsuite"
,(origin
(method url-fetch)
@ -979,7 +903,7 @@ interactive environment for the functional language Haskell.")
(arguments
(substitute-keyword-arguments (package-arguments ghc-8.8)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
#~(modify-phases #$phases
(add-after 'unpack-testsuite 'patch-more-shebangs
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
@ -993,20 +917,16 @@ interactive environment for the functional language Haskell.")
(("extra_files" all) (string-append "[" all))
(("\\]\\), " all)
(string-append all "expect_broken(0)], ")))))
;; TODO: Turn this into an undconditional patch on the next rebuild.
,@(if (string-prefix? "i686" (or (%current-target-system)
(%current-system)))
'((add-after 'skip-more-tests 'skip-failing-tests-i686
(lambda _
(substitute* '("testsuite/tests/codeGen/should_compile/all.T")
(("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before)
(string-append before "when(arch('i386'), skip)")))
;; Unexpected failures:
;; quasiquotation/T14028.run T14028 [bad stderr] (dyn)
(substitute* '("testsuite/tests/quasiquotation/all.T")
(("unless\\(config.have_ext_interp, skip\\),")
"unless(config.have_ext_interp, skip), when(arch('i386'), skip),")))))
'())))))
(add-after 'skip-more-tests 'skip-failing-tests-i686
(lambda _
(substitute* '("testsuite/tests/codeGen/should_compile/all.T")
(("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before)
(string-append before "when(arch('i386'), skip)")))
;; Unexpected failures:
;; quasiquotation/T14028.run T14028 [bad stderr] (dyn)
(substitute* '("testsuite/tests/quasiquotation/all.T")
(("unless\\(config.have_ext_interp, skip\\),")
"unless(config.have_ext_interp, skip), when(arch('i386'), skip),"))))))))
(native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH")
(files (list

View File

@ -24,6 +24,7 @@
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 dissent <disseminatedissent@protonmail.com>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -287,7 +288,8 @@ collection. Geeqie was initially based on GQview.")
(base32
"0hi9v0rdx47nys0wvm9xasdrafa34r5kq6crb074a0ipwmc60iiq"))))
(build-system gnu-build-system)
(inputs (list gtk+-2 libjpeg-turbo))
(arguments (list #:configure-flags #~(list "--enable-gtk3")))
(inputs (list gtk+ libjpeg-turbo))
(native-inputs (list intltool pkg-config))
(synopsis "Simple and fast image viewer for X")
(description "gpicview is a lightweight GTK+ 2.x based image viewer.
@ -411,34 +413,32 @@ needs.")
(name "viewnior")
(version "1.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hellosiyan/Viewnior")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "14qvx1wajncd5ab0207274cwk32f4ipfnlaci6phmah0cwra2did"))))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hellosiyan/Viewnior")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "14qvx1wajncd5ab0207274cwk32f4ipfnlaci6phmah0cwra2did"))))
(build-system meson-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
;; Don't create 'icon-theme.cache'
(substitute* "meson.build"
(("meson.add_install_script*") ""))
#t)))
#:tests? #f)) ; no tests
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
;; Don't create 'icon-theme.cache'
(substitute* "meson.build"
(("meson.add_install_script*") "")))))
#:tests? #f)) ;no tests
(native-inputs
`(("gettext" ,gettext-minimal)
("glib" ,glib "bin") ; glib-genmarshal
("pkg-config" ,pkg-config)
("shared-mime-info" ,shared-mime-info)))
(list gettext-minimal
`(,glib "bin") ;glib-genmarshal
pkg-config
shared-mime-info))
(inputs
`(("exiv2" ,exiv2)
("gdk-pixbuf" ,gdk-pixbuf)
("gtk+-2" ,gtk+-2)))
(list exiv2
gdk-pixbuf
gtk+-2))
(home-page "https://siyanpanayotov.com/project/viewnior")
(synopsis "Simple, fast and elegant image viewer")
(description "Viewnior is an image viewer program. Created to be simple,

View File

@ -33,6 +33,7 @@
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2021 Alexandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
;;; Copyright © 2022 ( <paren@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2425,3 +2426,28 @@ month and day. All files which are not images or videos or those which do not
have creation date information will be placed in a folder called
@file{unknown}.")
(license license:expat)))
(define-public spng
(package
(name "spng")
(version "0.7.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/randy408/libspng")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0src9ii9w9afz2vgridn9r38pa6888myk28x2bjw0ynw5xcd62hs"))))
(build-system meson-build-system)
(inputs (list zlib))
(native-inputs (list libpng))
(home-page "https://libspng.org")
(synopsis "Simple PNG loading library")
(description
"@code{libspng} is a simple C library for loading Portable Network
Graphics (PNGs), intended as an easy-to-use replacement for @code{libpng}.")
(license license:bsd-2)
;; Supports SSE on x86-64 and NEON on AArch64.
(properties '((tunable? . #t)))))

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Olivier Dion <olivier.dion@polymtl.ca>
;;; Copyright © 2021, 2022 Olivier Dion <olivier.dion@polymtl.ca>
;;;
;;; This file is part of GNU Guix.
;;;
@ -50,6 +50,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system linux-module)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
@ -206,17 +207,41 @@ interactive SVGs out of traces genated from various tracing tools. It comes
with the script @command{flamegraph.pl} and many stackcollapse scripts.")
(license license:cddl1.0))))
(define-public lttng-modules
(package
(name "lttng-modules")
(version "2.13.4")
(source (origin
(method url-fetch)
(uri (string-append "https://lttng.org/files/lttng-modules/"
"lttng-modules-" version ".tar.bz2"))
(sha256
(base32
"1vm9nnjvid7acsvgwnjyxd60ih9rmbhnfjldxip58n8x9q7d0nb1"))))
(build-system linux-module-build-system)
(arguments
`(#:tests? #f ; no tests
#:make-flags (list "CONFIG_LTTNG=m"
"CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m")))
(home-page "https://lttng.org/")
(synopsis "LTTng kernel modules for the LTTng tracer toolset")
(description
"LTTng kernel modules are Linux kernel modules which make
LTTng kernel tracing possible. They include essential control modules and
many probes which instrument numerous interesting parts of Linux.")
(license (list license:lgpl2.1 license:gpl2 license:expat))))
(define-public lttng-ust
(package
(name "lttng-ust")
(version "2.13.1")
(version "2.13.3")
(source (origin
(method url-fetch)
(uri (string-append "https://lttng.org/files/lttng-ust/"
"lttng-ust-" version ".tar.bz2"))
(sha256
(base32
"1p7d94r275yvby6zqfxaswdl1q46zxbc8x5rkhnjxrp1d41byrsn"))))
"0vwgxp027pgwm0a4xr6bdibday7xjlnv6wmbqh546l2h2i8jzi1c"))))
(build-system gnu-build-system)
(inputs
(list numactl))
@ -235,14 +260,14 @@ to ring buffers shared with a consumer daemon.")
(define-public lttng-tools
(package
(name "lttng-tools")
(version "2.13.2")
(version "2.13.7")
(source (origin
(method url-fetch)
(uri (string-append "https://lttng.org/files/lttng-tools/"
"lttng-tools-" version ".tar.bz2"))
(sha256
(base32
"1gfp9y24lpaiz4lcmbp30yd400jmh99mlay9gb8pz9qd080bmlnf"))))
"13gh4bvlgbh82h9vb80aw8l1cfmdj3xyvjg30cscz9vqy7l04yni"))))
(build-system gnu-build-system)
(arguments
`( ;; FIXME - Currently there's a segmentation fault by swig when enabling

View File

@ -261,7 +261,7 @@ using a mouse. It is customizable and extensible with plugins and scripts.")
(define-public srain
(package
(name "srain")
(version "1.4.0")
(version "1.4.1")
(source
(origin
(method git-fetch)
@ -270,7 +270,7 @@ using a mouse. It is customizable and extensible with plugins and scripts.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "113nvai3nr2c8mrr5q56fb7smg5awgb2f243sib4k1zj437v9q51"))))
(base32 "05n8j36yrmk353nkapc1vywf25wklwbzwkl2a4kz92wv74zrwi6f"))))
(build-system meson-build-system)
(arguments
`(#:tests? #f ;there are no tests

View File

@ -2284,6 +2284,9 @@ new Date();"))
(("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))
(home-page "https://openjdk.java.net/projects/jdk/17")))
;;; Convenience alias to point to the latest version of OpenJDK.
(define-public openjdk openjdk17)
(define-public icedtea icedtea-8)

View File

@ -1,10 +1,10 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020, 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Tim Howes <timhowes@lavabit.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;; Copyright © 2021, 2022 Jean-Baptiste Volatier <jbv@pm.me>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@ -139,7 +139,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(define-public julia
(package
(name "julia")
(version "1.6.3")
(version "1.6.7")
(source (origin
(method url-fetch)
(uri (string-append
@ -147,7 +147,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
version "/julia-" version ".tar.gz"))
(sha256
(base32
"1515x8fs25l3f9csbmd1v4nm041zvjnvigy6s5iidy4yrkwdx4r5"))
"0q9xgdpvdkskpzl294w215f6c15c5jk276c9dah5f5w4np3ivbvl"))
(patches
(search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch"
"julia-allow-parallel-build.patch"))))
@ -206,6 +206,10 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(substitute* "base/Makefile"
(("\\$\\$\\(build_depsbindir\\)/libwhich")
(search-input-file inputs "/bin/libwhich")))))
(add-after 'unpack 'activate-gnu-source-for-loader
(lambda _
(substitute* "cli/Makefile"
(("LOADER_CFLAGS =") "LOADER_CFLAGS = -D_GNU_SOURCE"))))
(add-after 'unpack 'change-number-of-precompile-statements
(lambda _
;; Remove nss-certs drops the number of statements below 1200,
@ -222,12 +226,11 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
"base/Makefile")
((".*libquadmath.*") ""))
(substitute* "Makefile"
(("libquadmath ") ""))
#t)))
(("libquadmath ") "")))))
'())
(add-before 'check 'set-home
;; Some tests require a home directory to be set.
(lambda _ (setenv "HOME" "/tmp") #t))
(lambda _ (setenv "HOME" "/tmp")))
(add-before 'build 'fix-include-and-link-paths
(lambda* (#:key inputs #:allow-other-keys)
;; LIBUTF8PROC is a linker flag, not a build target. It is
@ -332,10 +335,11 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(mpfr (assoc-ref inputs "mpfr"))
(gmp (assoc-ref inputs "gmp"))
(nghttp2 (assoc-ref inputs "libnghttp2"))
(zlib (assoc-ref inputs "zlib"))
(suitesparse (assoc-ref inputs "suitesparse")))
;; Some tests only check to see if the input is the correct version.
(substitute* "stdlib/PCRE2_jll/test/runtests.jl"
(("10.36.0") ,(package-version pcre2)))
(("10.40.0") ,(package-version pcre2)))
(substitute* "stdlib/MbedTLS_jll/test/runtests.jl"
(("2.24.0") ,(package-version mbedtls-apache)))
(substitute* "stdlib/MPFR_jll/test/runtests.jl"
@ -344,6 +348,8 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(("6.2.0") ,(package-version gmp)))
(substitute* "stdlib/nghttp2_jll/test/runtests.jl"
(("1.41.0") ,(package-version nghttp2)))
(substitute* "stdlib/Zlib_jll/test/runtests.jl"
(("1.2.12") ,(package-version zlib)))
(substitute* "stdlib/SuiteSparse_jll/test/runtests.jl"
(("5004") ,(string-replace-substring
(version-major+minor
@ -355,17 +361,12 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
;; https://github.com/JuliaLang/julia/pull/41614
;; https://github.com/JuliaLang/julia/issues/41156
(substitute* "test/choosetests.jl"
(("skip_tests = \\[\\]")
"skip_tests = [\"REPL\", \"precompile\"]"))
(("\"precompile\",") ""))
;; Dates/io tests fail on master when networking is unavailable
;; https://github.com/JuliaLang/julia/issues/34655
(substitute* "stdlib/Dates/test/io.jl"
(("using Dates") "import Dates
using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
;; Upstream bug I found when packaging
;; https://github.com/JuliaLang/julia/issues/35785
(substitute* "test/file.jl"
(("@test dirname\\(t\\) == d") "@test_broken dirname(t) == d"))
;; julia embeds a certificate, we are not doing that
(substitute* "stdlib/MozillaCACerts_jll/test/runtests.jl"
(("@test isfile\\(MozillaCACerts_jll.cacert\\)")
@ -385,14 +386,7 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
(substitute* "test/cmdlineargs.jl"
(("test v\\[3") "test_broken v[3")
(("test isempty\\(v\\[3") "test_broken isempty(v[3"))
;; These tests randomly fails because they depend on CPU.
(substitute* "stdlib/LinearAlgebra/test/matmul.jl"
;; Fixed in v1.6.4 (see:
;; https://github.com/JuliaLang/julia/blob/v1.6.4/
;; stdlib/LinearAlgebra/test/matmul.jl#L155).
(("@test mul\\!\\(C, vf, transpose\\(vf\\), 2, 3\\)\
== 2vf\\*vf' \\.\\+ 3C0")
"@test mul!(C, vf, transpose(vf), 2, 3) ≈ 2vf*vf' .+ 3C0"))
;; These test(s) randomly fails because they depend on CPU.
(substitute* "test/math.jl"
;; @test_broken cannot be used because if the test randomly
;; passes, then it also raises an error.
@ -447,6 +441,7 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
("" "$JULIA_DEPOT_PATH"))))))))
#:make-flags
(list
"VERBOSE=1" ;; more helpful logging of what make is doing
(string-append "prefix=" (assoc-ref %outputs "out"))
;; Passing the MARCH or JULIA_CPU_TARGET flag is necessary to build

View File

@ -1254,8 +1254,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(dirname
(search-input-file %build-inputs
"lib/libboost_system.so")))
;; Avoid undefined symbols required by boost::spirit
"LDFLAGS=-lboost_system"
;; Avoid a dependency on ucpp.
"--with-idlc-cpp=cpp"
;; The fonts require an external tarball (crosextrafonts).
@ -1282,4 +1280,7 @@ a number of components: Writer, a word processor; Calc, a spreadsheet
application; Impress, a presentation engine; Draw, a drawing and
flowcharting application; Base, a database and database frontend;
Math for editing mathematics.")
(properties
'((release-monitoring-url
. "https://www.libreoffice.org/download/download-libreoffice/")))
(license license:mpl2.0)))

View File

@ -352,17 +352,17 @@ 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.18-version "5.18.16")
(define-public linux-libre-5.18-version "5.18.19")
(define-public linux-libre-5.18-gnu-revision "gnu")
(define deblob-scripts-5.18
(linux-libre-deblob-scripts
linux-libre-5.18-version
linux-libre-5.18-gnu-revision
(base32 "09aikdhij4d89wqd8mmkdr0nrfwqz6dx3n74qm6wx815rfngd2dz")
(base32 "0vjpn8iw9yg39sr6jfhzyvivf159h9zfgnjamwa283zfll0h0a53")))
(base32 "03w1p49rf7sqsxvwpdndqa0k9hc9748rplyqiiw1q6cbdjficwyw")))
(define-public linux-libre-5.18-pristine-source
(let ((version linux-libre-5.18-version)
(hash (base32 "1khi1npn8d8jimwdy8bf3r7l780mxdmvk5azdv419pk33qjqdxgi")))
(hash (base32 "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
@ -371,22 +371,22 @@ 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.15-version "5.15.59")
(define-public linux-libre-5.15-version "5.15.63")
(define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15
(linux-libre-deblob-scripts
linux-libre-5.15-version
linux-libre-5.15-gnu-revision
(base32 "1n57mz5agvf1d0ggbg080d7hvx8p9y0iqxkq4ypg10a7n96zy7y5")
(base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24")))
(base32 "1r189c704jvizk452zcsm9v3g27ybjcjchjwxazsy3nx0wdwx7si")))
(define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version)
(hash (base32 "1jxw6fnc7yaw7r6193wy6l8wdlpy3frw48drnc3dnh3k0m1cdpg6")))
(hash (base32 "0hbkxgadz0vcslni4r46yc202wcnxblcfvkcph1017b2b8gcvlvd")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.15)))
(define-public linux-libre-5.10-version "5.10.135")
(define-public linux-libre-5.10-version "5.10.138")
(define-public linux-libre-5.10-gnu-revision "gnu1")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
@ -396,12 +396,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
(hash (base32 "0i1kahv739qpyyml7d7sx306nv7gp55i5d97vlb0fryfx4dsd6g4")))
(hash (base32 "1a2vmcqzi71w88j79lxsrgyycq1l1gxp0cvh5ya4afhfisxh7819")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.209")
(define-public linux-libre-5.4-version "5.4.211")
(define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
@ -411,12 +411,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf")))
(hash (base32 "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.254")
(define-public linux-libre-4.19-version "4.19.256")
(define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
@ -426,12 +426,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i")))
(hash (base32 "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.290")
(define-public linux-libre-4.14-version "4.14.291")
(define-public linux-libre-4.14-gnu-revision "gnu1")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
@ -441,12 +441,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4")))
(hash (base32 "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.325")
(define-public linux-libre-4.9-version "4.9.326")
(define-public linux-libre-4.9-gnu-revision "gnu1")
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
@ -456,7 +456,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "04msx0x0d8v93zjr3jj0qqkgg7m4hb7rj6hk5vzrzasmgbjmb3dl")))
(hash (base32 "0yw83a8nk5abjsvqrz8m2sj699c228j2f2wr5q8m95vgqzfw5wrb")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
@ -1373,81 +1373,6 @@ and the notification, WiFi, and Bluetooth LED.")
detection of security vulnerability exploits against the kernel.")
(license license:gpl2)))
(define-public rtl8821ce-linux-module
(let ((commit "be733dc86781c68571650b395dd0fa6b53c0a039")
(revision "6"))
(package
(name "rtl8821ce-linux-module")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tomaspinho/rtl8821ce")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"00sd7s0582b9jcpfgy0fw6418dwg700mfyizkfr22jf2x140iy70"))))
(build-system linux-module-build-system)
(arguments
(list #:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "KSRC="
(assoc-ref %build-inputs
"linux-module-builder")
"/lib/modules/build"))
#:phases
#~(modify-phases %standard-phases
(replace 'build
(lambda* (#:key (make-flags '()) (parallel-build? #t)
#:allow-other-keys)
(apply invoke "make"
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags)))))
#:tests? #f)) ; no test suite
(home-page "https://github.com/tomaspinho/rtl8821ce")
(synopsis "Linux driver for Realtek RTL8821CE wireless network adapters")
(description "This is Realtek's RTL8821CE Linux driver for wireless
network adapters.")
(license license:gpl2))))
(define-public rtl8812au-aircrack-ng-linux-module
(let ((commit "6d0d9fb56d4d918012a5c7a030b9233cad039cdd")
(revision "8"))
(package
(inherit rtl8821ce-linux-module)
(name "rtl8812au-aircrack-ng-linux-module")
(version (git-version "5.6.4.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/aircrack-ng/rtl8812au")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "012asiy43ik13kl9p97sscdsqq5jihq73s4ws3g5wqqczqcgrsvc"))
(modules '((guix build utils)))
(snippet
#~(begin
;; Remove bundled tarballs, APKs, word lists, speadsheets,
;; and other unnecessary unlicenced things.
(for-each delete-file-recursively (list "android"
"docs"
"tools"))))))
(supported-systems '("x86_64-linux" "i686-linux"))
(home-page "https://github.com/aircrack-ng/rtl8812au")
(synopsis "Linux driver for Realtek USB wireless network adapters")
(description
"This is Realtek's rtl8812au Linux driver for USB 802.11n wireless
network adapters, modified by the aircrack-ng project to support monitor mode
and frame injection. It provides a @code{88XXau} kernel module that supports
RTL8812AU, RTL8821AU, and RTL8814AU chips.")
(license license:gpl2+))))
(define-public vhba-module
(package
(name "vhba-module")
@ -6662,7 +6587,7 @@ the @code{mce-inject} module loaded if it exists.")
(define-public mcelog
(package
(name "mcelog")
(version "181")
(version "187")
(source
(origin
(method git-fetch)
@ -6671,7 +6596,7 @@ the @code{mce-inject} module loaded if it exists.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0c9zdivv86xd8dmwia0k9fbr52zrafbyzn7ss53mh17sry5gm716"))
(base32 "0zdlwbdqs4s72yrpz4irhp12c1wqzy8kmf4hxahk13dmafd6dbnj"))
(modules '((guix build utils)))
(snippet
`(begin
@ -7286,14 +7211,14 @@ re-use code and to avoid re-inventing the wheel.")
(define-public libnftnl
(package
(name "libnftnl")
(version "1.2.2")
(version "1.2.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://netfilter.org/libnftnl/"
"libnftnl-" version ".tar.bz2"))
(sha256
(base32 "02kdxp4l1ds5lpkw6rxv6f7icc70am6ik3p9z5l8v48mkm7h1z4y"))))
(base32 "0m82bmh8i24hwxmz7rxwxjll4904ghd2b1x1p5h8algrg6dyl5p9"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
@ -7328,7 +7253,7 @@ used by nftables.")
(define-public nftables
(package
(name "nftables")
(version "1.0.4")
(version "1.0.5")
(source
(origin
(method url-fetch)
@ -7337,7 +7262,7 @@ used by nftables.")
(string-append "https://www.nftables.org/projects/nftables"
"/files/nftables-" version ".tar.bz2")))
(sha256
(base32 "0ddsdj6zs78hndffl3iikpa1wzjxcpmr3xqcq4la71gnl7zb2zwj"))))
(base32 "02p59m773l2xqcb7ib7cprlpjfdnp792bahbs6c3dx1s74c4n6wd"))))
(build-system gnu-build-system)
(arguments `(#:configure-flags
'("--disable-static"
@ -7840,14 +7765,14 @@ available in the kernel Linux.")
(define-public cpuid
(package
(name "cpuid")
(version "20220620")
(version "20220812")
(source (origin
(method url-fetch)
(uri (string-append "http://www.etallen.com/cpuid/cpuid-"
version ".src.tar.gz"))
(sha256
(base32
"06nb69vlv1szdzq1dp784pgbr9z2py050v1hlrn4rr56jp0a2nci"))))
"1gss85szv4b48d93d6hzkkzggicdvw8dijiwfs84ywclgnwqzxiv"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags

View File

@ -6831,7 +6831,7 @@ extension-points via the concept of hooks.")
(synopsis "Common Lisp abstraction layer over platform dependent functionality")
(description "@code{s-sysdeps} is an abstraction layer over platform
dependent functionality. This simple package is used as a building block in a
number of other open source projects.
number of other projects.
@code{s-sysdeps} abstracts:
@ -22665,6 +22665,38 @@ the Processing language and shares some of the API.")
(define-public ecl-sketch
(sbcl-package->ecl-package sbcl-sketch))
(define-public sbcl-string-pokemonize
(let ((commit "2dc01643defb497e4d1eb833def71dfc1e8d5da6")
(revision "0"))
(package
(name "sbcl-string-pokemonize")
(version (git-version "20210503" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/phoe/string-pokemonize")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1zk5klc94pxv7mhx6qrp93rk4ypwd6wfijap7gf9l0wpphg90r9x"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:tests? #f ; There are no tests.
#:asd-systems '("string-pokemonize")))
(synopsis "Alternate upper- and lowercase")
(description
"@code{string-pokemonize} provides a function that alternates uppercase
and lowercase characters for a given string.")
(home-page "https://github.com/phoe/string-pokemonize")
(license license:expat))))
(define-public cl-string-pokemonize
(sbcl-package->cl-source-package sbcl-string-pokemonize))
(define-public ecl-string-pokemonize
(sbcl-package->ecl-package sbcl-string-pokemonize))
(define-public sbcl-binary-types
(let ((commit "9ec42042a50403961c08179a892ae3de725b1d7a"))
(package

View File

@ -984,7 +984,7 @@ the HTML documentation of TXR.")
(define-public txr
(package
(name "txr")
(version "278")
(version "280")
(source
(origin
(method git-fetch)
@ -993,7 +993,7 @@ the HTML documentation of TXR.")
(commit (string-append "txr-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "08jmqv245vnvl4xx6x5a5hxlnhdcipfdbja54dvsi6wkiks2fif7"))))
(base32 "1ni2yb9dggldgizfp13mvrw5vzk13pg74dpk2lyn9dijqvs293s4"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -1232,7 +1232,7 @@ including a built-in database engine and a GUI system.")
(define-public janet
(package
(name "janet")
(version "1.23.0")
(version "1.24.0")
(source
(origin
(method git-fetch)
@ -1241,7 +1241,7 @@ including a built-in database engine and a GUI system.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1qfahq1203kv5jxd0im7nxm3yy1p9k1wc0pk34b5h2sfships1hm"))))
(base32 "07kyjzbj5g197008n9qwpdnagylzlv8x4zbsf2d233mpskv3dixi"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags

View File

@ -10,6 +10,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -59,6 +60,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@ -77,7 +79,8 @@
(base32
"1rfira3lx8v6scz1aq69925j4vslpp36bmgrrzcfby2c60q2c155"))))
(build-system gnu-build-system)
(inputs (list glib gtk+-2))
(arguments (list #:configure-flags #~(list "--with-gtk=3")))
(inputs (list glib gtk+))
(native-inputs (list intltool
`(,glib "bin") ; for gtester
libtool
@ -87,7 +90,7 @@
(synopsis "File management support (core library)")
(description "LibFM provides file management functions built on top of
Glib/GIO giving a higher-level API.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public libfm-extra
@ -112,12 +115,13 @@ libFM file management library.")))
(sha256
(base32 "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"))))
(build-system gnu-build-system)
(inputs (list gtk+-2))
(arguments (list #:configure-flags #~(list "--enable-gtk3")))
(inputs (list gtk+))
(native-inputs (list intltool pkg-config))
(synopsis "LXDE GTK+ theme switcher")
(description "LXAppearance is a desktop-independent GTK+ theme switcher
able to change themes, icons, and fonts used by GTK+ applications.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public lxrandr
@ -135,7 +139,8 @@ able to change themes, icons, and fonts used by GTK+ applications.")
"04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"))))
(build-system gnu-build-system)
(arguments
`(#:phases
`(#:configure-flags (list "--enable-gtk3")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'xrandr-absolutely
;; lxrandr is useless without xrandr and gives an unhelpful error
@ -143,9 +148,8 @@ able to change themes, icons, and fonts used by GTK+ applications.")
(lambda* (#:key input #:allow-other-keys)
(substitute* "src/lxrandr.c"
(("(\"|')xrandr\"" _ match)
(string-append match (which "xrandr") "\"")))
#t)))))
(inputs (list gtk+-2 xrandr))
(string-append match (which "xrandr") "\""))))))))
(inputs (list gtk+ xrandr))
(native-inputs (list intltool pkg-config))
(synopsis "LXDE monitor configuration tool")
(description "LXRandR is a very basic monitor configuration tool. It
@ -153,7 +157,7 @@ relies on the X11 resize-and-rotate (RandR) extension but doesn't aim to be a
full frontend of it. LXRandR only gives you some easy and quick options which
are intuitive. It's suitable for laptop users who frequently uses projectors
or external monitor.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public lxtask
@ -170,13 +174,14 @@ or external monitor.")
(base32
"0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2"))))
(build-system gnu-build-system)
(inputs (list gtk+-2))
(arguments (list #:configure-flags #~(list "--enable-gtk3")))
(inputs (list gtk+))
(native-inputs (list intltool pkg-config))
(synopsis "LXDE task manager")
(description "LXTask is a lightweight task manager derived from Xfce task
manager with all dependencies on Xfce removed. LXTask is based on the GTK+
toolkit. It allows users to monitor and control of running processes.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public lxterminal
@ -192,14 +197,15 @@ toolkit. It allows users to monitor and control of running processes.")
(base32
"1124pghrhnx6q4391ri8nvi6bsmvbj1dx81an08mird8jf2b2rii"))))
(build-system gnu-build-system)
(inputs (list gtk+-2 vte/gtk+-2))
(arguments (list #:configure-flags #~(list "--enable-gtk3")))
(inputs (list gtk+ vte))
(native-inputs (list intltool pkg-config))
(synopsis "LXDE terminal emulator")
(description "LXTerminal is a VTE-based terminal emulator. It supports
multiple tabs and has only minimal dependencies thus being completely
desktop-independent. In order to reduce memory usage and increase the
performance, all instances of the terminal are sharing a single process.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public menu-cache
@ -223,7 +229,7 @@ performance, all instances of the terminal are sharing a single process.")
(synopsis "LXDE implementation of the freedesktop menu's cache")
(description "Menu-cache is a library creating and utilizing caches to
speed up the access to freedesktop.org defined application menus.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:lgpl2.1+)))
(define-public pcmanfm
@ -239,15 +245,16 @@ speed up the access to freedesktop.org defined application menus.")
(base32
"1xqc2k2jh165mm81xg0ghxx0ml1s3rhh4ndvbzkcri4kfhj7pjql"))))
(build-system gnu-build-system)
(inputs (list gtk+-2 gvfs ; for trash and mount support
(arguments (list #:configure-flags #~(list "--with-gtk=3")))
(inputs (list gtk+ gvfs ;for trash and mount support
libfm libx11))
(native-inputs (list intltool libtool pkg-config))
(propagated-inputs
(list lxmenu-data)) ; for "Open With..." application list
(list lxmenu-data)) ;for "Open With..." application list
(synopsis "LXDE file manager")
(description "PCMan is a lightweight GTK+ based file manager, compliant
with freedesktop.org standard.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public spacefm
@ -415,7 +422,8 @@ customizable menu system, and Bash integration.")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
(uri (string-append "mirror://sourceforge//lxde/"
"lxmenu-data%20%28desktop%20menu%29/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -427,7 +435,7 @@ customizable menu system, and Bash integration.")
(description
"Lxmenu-data provides files required to build freedesktop.org
menu spec-compliant desktop menus for LXDE.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:lgpl2.1+)))
(define-public lxde-icon-theme
@ -437,7 +445,8 @@ menu spec-compliant desktop menus for LXDE.")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
(uri (string-append "mirror://sourceforge/lxde/LXDE%20Icon%20Theme/"
"lxde-icon-theme-" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -448,7 +457,7 @@ menu spec-compliant desktop menus for LXDE.")
(synopsis "LXDE default icon theme based on nuoveXT2")
(description
"Lxde-icon-theme provides an default icon theme for LXDE.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:lgpl3)))
(define-public lxde-common
@ -458,7 +467,9 @@ menu spec-compliant desktop menus for LXDE.")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
(uri (string-append "mirror://sourceforge/lxde/"
"lxde-common%20%28default%20config%29/"
"lxde-common%20" (version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -484,7 +495,7 @@ menu spec-compliant desktop menus for LXDE.")
(synopsis "Common files of the LXDE Desktop")
(description
"Lxde-common provides common files of the LXDE Desktop.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public lxinput
@ -494,21 +505,23 @@ menu spec-compliant desktop menus for LXDE.")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
name "-" version ".tar.xz"))
(uri (string-append "mirror://sourceforge/lxde/"
"LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29/"
"LXInput%200.3.x/" name "-" version ".tar.xz"))
(sha256
(base32
"123f3yn4rp1w5b3n5aj3ad9snkxab29qkrs7bcvf5bx4cn57g3sf"))))
(build-system gnu-build-system)
(arguments (list #:configure-flags #~(list "--enable-gtk3")))
(inputs
(list gtk+-2))
(list gtk+))
(native-inputs
(list pkg-config intltool))
(synopsis "Tool for mouse and keyboard configuration in LXDE")
(description
"Lxinput provides a small program to configure keyboard and mouse
in LXDE.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public lxsession
@ -518,7 +531,9 @@ in LXDE.")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
(uri (string-append "mirror://sourceforge/lxde/"
"LXSession%20%28session%20manager%29/"
"LXSession%200.5.x/"
"lxsession-" version ".tar.xz"))
(sha256
(base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4"))
@ -534,21 +549,20 @@ in LXDE.")
(and (string-suffix? ".c" file)
(file-exists? (c->vala file))))))
(for-each delete-file
(find-files "." generated-c-file?))
#t))))
(find-files "." generated-c-file?))))))
(build-system gnu-build-system)
(arguments
`(#:phases
`(#:configure-flags (list "--enable-gtk3")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'rm-stamp
(lambda _
(for-each delete-file (find-files "." "\\.stamp$"))
;; Force regeneration of configure script.
(delete-file "configure")
#t)))))
(delete-file "configure"))))))
(inputs
`(("gtk+-2" ,gtk+-2)
("polkit" ,polkit)))
(list gtk+
polkit))
(native-inputs
(list pkg-config
intltool
@ -560,7 +574,7 @@ in LXDE.")
(synopsis "Lightweight X11 session manager")
(description
"Lxsession provides an lightweight X11 session manager.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public lxpanel
@ -570,43 +584,51 @@ in LXDE.")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/lxde/"
"lxpanel-" version ".tar.xz"))
(uri (string-append "mirror://sourceforge/lxde/"
"LXPanel%20%28desktop%20panel%29/"
"LXPanel%200.10.x/lxpanel-"
version ".tar.xz"))
(sha256
(base32 "1s0y8jjkw6qz0r8l90618b8xly0c8g906kah7b162sz3sxbqyc8y"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(menu (assoc-ref inputs "lxmenu-data")))
(wrap-program (string-append out "/bin/lxpanel")
`("XDG_DATA_DIRS" ":" prefix
(,(string-append menu "/share"))))
#t))))))
(list
#:configure-flags #~(list "--enable-gtk3")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/lxpanel")
`("XDG_DATA_DIRS" ":" prefix
(,(string-append #$(this-package-input "lxmenu-data")
"/share")))))))))
(inputs
;; TODO: libindicator-0.3.0
`(("curl" ,curl)
("gtk+-2" ,gtk+-2)
("alsa-lib" ,alsa-lib)
("libwnck-2" ,libwnck-2)
("keybinder" ,keybinder)
("libxmu" ,libxmu)
("libxpm" ,libxpm)
("libxml2" ,libxml2)
("cairo" ,cairo)
("libx11" ,libx11)
("wireless-tools" ,wireless-tools)))
(list alsa-lib
bash-minimal ;for wrap-program
cairo
curl
gtk+
keybinder
libindicator
libwnck
libx11
libxml2
libxmu
libxpm
wireless-tools))
(native-inputs
(list pkg-config intltool docbook-xml gettext-minimal))
(list docbook-xml
gettext-minimal
intltool
pkg-config))
(propagated-inputs
(list lxmenu-data libfm menu-cache))
(list libfm
lxmenu-data
menu-cache))
(synopsis "X11 Desktop panel for LXDE")
(description
"Lxpanel provides an X11 desktop panel for LXDE.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+)))
(define-public lxde
@ -645,7 +667,7 @@ user friendly and slim, while keeping the resource usage low. LXDE uses
less RAM and less CPU while being a feature rich desktop environment. Unlike
other tightly integrated desktops LXDE strives to be modular, so each
component can be used independently with few dependencies.")
(home-page "https://lxde.github.io")
(home-page "https://www.lxde.org/")
(license license:gpl2+))) ; And others.
;;; lxde.scm ends here

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015, 2022 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
@ -31,6 +31,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
@ -129,7 +130,7 @@ to statistics about the system on which it's run.")
(define-public lxqt-build-tools
(package
(name "lxqt-build-tools")
(version "0.9.0")
(version "0.11.0")
(source
(origin
(method url-fetch)
@ -137,16 +138,29 @@ to statistics about the system on which it's run.")
"/download/" version
"/lxqt-build-tools-" version ".tar.xz"))
(sha256
(base32 "0kayad5l72h8n90zkf3hy8fxy72n4b1mrkjglpa9dj0cdj6qg0lp"))))
(base32 "1ff1pkrlxd8h0j8v49p6wrfhnqrz8s5b53hi835m41cvkzjljpfx"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests
#:configure-flags
;; 'startlxqt' will add LXQT_DATA_DIR to XDG_DATA_DIRS,
;; LXQT_ETC_XDG_DIR to XDG_CONFIG_DIRS, and 'lxqt-about' will report
;; LXQT_ETC_XDG_DIR in its "Technical Info".
'("-DLXQT_DATA_DIR=/run/current-system/profile/share"
"-DLXQT_ETC_XDG_DIR=/run/current-system/profile/etc/xdg")))
(list
#:tests? #f ; no tests
#:modules `((ice-9 regex)
(guix build cmake-build-system)
(guix build utils))
;; In phases and configure-flags: Set LXQT_TRANSLATIONS_DIR,
;; LXQT_DATA_DIR, etc. to relative paths, so that packages using
;; LXQtConfigVars.cmake from lxqt-build-tools will install translations
;; and data files into their outputs, remove the need to patch their
;; cmake files.
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'patch-LXQtConfigVars.cmake
(lambda _
(substitute* (string-append #$output
"/share/cmake/lxqt-build-tools"
"/modules/LXQtConfigVars.cmake")
(((regexp-quote (string-append #$output "/"))) "")))))
#:configure-flags
#~(list "-DLXQT_ETC_XDG_DIR=etc/xdg")))
(native-inputs
(list pkg-config glib))
(inputs
@ -164,7 +178,7 @@ itself as well as other components maintained by the LXQt project.")
(define-public libqtxdg
(package
(name "libqtxdg")
(version "3.7.1")
(version "3.9.1")
(source
(origin
(method url-fetch)
@ -172,7 +186,7 @@ itself as well as other components maintained by the LXQt project.")
"https://github.com/lxqt/libqtxdg/releases/download/"
version "/libqtxdg-" version ".tar.xz"))
(sha256
(base32 "16wav2b948c837cpbvdr6hs1zifwrpdk3yjvbzzp2l1hndvbwz27"))))
(base32 "1kh4hv59bkjifq20ksh1mizf9mp7x30v6fpwccr45mi7hasqvvfi"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
@ -196,10 +210,33 @@ itself as well as other components maintained by the LXQt project.")
in Qt.")
(license license:lgpl2.1+)))
(define-public qtxdg-tools
(package
(name "qtxdg-tools")
(version "3.9.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/lxqt/qtxdg-tools/releases/download/"
version "/qtxdg-tools-" version ".tar.xz"))
(sha256
(base32 "0qn35v4dv71g0a4cqkbikppwmihxmfa560q9kw5pwk2y0xiwpncr"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ; no tests
(propagated-inputs (list libqtxdg))
(native-inputs (list lxqt-build-tools))
(home-page "https://github.com/lxqt/qtxdg-tools")
(synopsis "User tools for libqtxdg")
(description "This package contains a CLI MIME tool, @command{qtxdg-mat},
for handling file associations and opening files with their default
applications.")
(license license:lgpl2.1+)))
(define-public liblxqt
(package
(name "liblxqt")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
@ -207,7 +244,7 @@ in Qt.")
"https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0ay3j6zdgffw3mzaq3wdq96la7fnn2dw52ij6987slv31563nknl"))))
(base32 "1fickg1q54pcb8bv3x0ydg4xx02cqykibnjcq09as2kws6xbhk9n"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests
@ -218,13 +255,6 @@ in Qt.")
(substitute* "CMakeLists.txt"
(("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
"DESTINATION \"share/polkit-1/actions"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(inputs
(list kwindowsystem
@ -244,14 +274,14 @@ components of the LXQt desktop environment.")
(define-public libsysstat
(package
(name "libsysstat")
(version "0.4.5")
(version "0.4.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1ljy5ggvqvpm3k6kfy03dn47ygr9lzi8hmqws4dcqfc9sx86b6zi"))))
(base32 "1ghkzgz3ypjii08f00g26pnmw0s5naf344p83dwnf3kfdlykiip6"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ; no tests
(inputs
@ -270,14 +300,14 @@ and memory usage or network traffic.")
(define-public lxqt-about
(package
(name "lxqt-about")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "04riqf2xgbcnq67l5zb0dfnnmc4a2zljx8zfn3jlvxirnd73l0zm"))))
(base32 "03bqhbpdnfpan3l4snzzz6j0054m4r9zcgygcg21znslwicbqnw3"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -295,13 +325,6 @@ and memory usage or network traffic.")
(add-before 'build 'setenv
(lambda _
(setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(home-page "https://lxqt-project.org")
(synopsis "Provides information about LXQt and the system")
@ -312,14 +335,14 @@ LXQt and the system it's running on.")
(define-public lxqt-admin
(package
(name "lxqt-admin")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "07fkn3zmpfxjzzsv1hyv50sx0359n10lxjil35qn266nz165wj43"))))
(base32 "1zah3xdnif9miaq52mmfbbzvqjhca7w7h81ngrn25j9pvd2bflm8"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -340,14 +363,6 @@ LXQt and the system it's running on.")
"lxqt-admin-time/CMakeLists.txt")
(("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
"DESTINATION \"share/polkit-1/actions"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("lxqt-admin-time/CMakeLists.txt"
"lxqt-admin-user/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(home-page "https://lxqt-project.org")
(synopsis "LXQt system administration tool")
@ -358,14 +373,14 @@ the operating system LXQt is running on.")
(define-public lxqt-config
(package
(name "lxqt-config")
(version "0.17.1")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0nr43d6fyc5zg4b3iwpca2cy58ry8q0rahrk6ixm7wrvmaiwkh93"))))
(base32 "0f0x82qma86kjdvn08qlg0ydxh9fnqikijfhnicynxdqfnp50ia5"))))
(build-system cmake-build-system)
(inputs
(list eudev
@ -391,12 +406,6 @@ the operating system LXQt is running on.")
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("src/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'set-xkeyboard-config-file-name
(lambda* (#:key inputs #:allow-other-keys)
;; Set the file name to xkeyboard-config.
@ -404,21 +413,7 @@ the operating system LXQt is running on.")
(substitute* "lxqt-config-input/keyboardlayoutconfig.h"
(("/usr/share/X11/xkb/rules/base.lst")
(string-append xkb "/share/X11/xkb/rules/base.lst")))
#t)))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("lxqt-config-file-associations/CMakeLists.txt"
"lxqt-config-brightness/CMakeLists.txt"
"lxqt-config-appearance/CMakeLists.txt"
"lxqt-config-locale/CMakeLists.txt"
"lxqt-config-monitor/CMakeLists.txt"
"lxqt-config-input/CMakeLists.txt"
"liblxqt-config-cursor/CMakeLists.txt"
"src/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
#t))))))
(home-page "https://lxqt-project.org")
(synopsis "Tools to configure LXQt and the underlying operating system")
(description "lxqt-config is providing several tools involved in the
@ -428,7 +423,7 @@ configuration of both LXQt and the underlying operating system.")
(define-public lxqt-globalkeys
(package
(name "lxqt-globalkeys")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
@ -436,7 +431,7 @@ configuration of both LXQt and the underlying operating system.")
"releases/download/" version "/"
"lxqt-globalkeys-" version ".tar.xz"))
(sha256
(base32 "0pnyqiqhaawrnyvw3ljp850d911abaalnl4rgvl2xyzybvlhki4h"))))
(base32 "0bbw85aa59w0qnvkdggm3hbacps6yfcvcrs32d34mvvhc7d6g04l"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -447,24 +442,7 @@ configuration of both LXQt and the underlying operating system.")
qtx11extras))
(native-inputs
(list pkg-config qttools-5 lxqt-build-tools))
(arguments
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("autostart/CMakeLists.txt"
"xdg/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "config/CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "Daemon used to register global keyboard shortcuts")
(description "lxqt-globalkeys is providing tools to set global keyboard
@ -475,14 +453,14 @@ as a whole and are not limited to distinct applications.")
(define-public lxqt-notificationd
(package
(name "lxqt-notificationd")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1dyal7brmfnydfgb6lpxnqww8fj5gzixs7s3wf5nn2ihsz1wm4nk"))))
(base32 "0bz3qdvv591zvpkxqzqqmh1yq5icc3iinmjr13qzws3ajlj19z44"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -493,24 +471,7 @@ as a whole and are not limited to distinct applications.")
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no test target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("config/CMakeLists.txt"
"src/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(arguments '(#:tests? #f)) ; no test target
(home-page "https://lxqt-project.org")
(synopsis "The LXQt notification daemon")
(description "lxqt-notificationd is LXQt's implementation of a daemon
@ -520,14 +481,14 @@ according to the Desktop Notifications Specification.")
(define-public lxqt-openssh-askpass
(package
(name "lxqt-openssh-askpass")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0gdcy8c21sbfrlfz9c3zqw4dvdwf309flkjgqanwwl9i8hr26chr"))))
(base32 "1hxix513z2sanmygfzq1fgx30kaxw5rjmmklbyyzl8bv1xzjcwk7"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -538,17 +499,7 @@ according to the Desktop Notifications Specification.")
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "GUI to query passwords on behalf of SSH agents")
(description "lxqt-openssh-askpass is a GUI to query credentials on behalf
@ -558,14 +509,14 @@ of other programs.")
(define-public lxqt-panel
(package
(name "lxqt-panel")
(version "0.17.1")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1k2cfs1mhad486kh93vbxma3jpjksp4hzjv1xmp1g5alb5dgnc0q"))))
(base32 "11dg18ac6kj8qkkrg940bzpykjih6nnw8y3hfww3wiyg6dka9gd7"))))
(build-system cmake-build-system)
(inputs
(list alsa-lib
@ -579,6 +530,7 @@ of other programs.")
libxdamage
libxkbcommon
libxrender
libxtst
`(,lm-sensors "lib")
lxqt-globalkeys
pcre
@ -588,6 +540,7 @@ of other programs.")
qtx11extras
solid
xcb-util
xcb-util-image
xkeyboard-config))
(native-inputs
(list pkg-config lxqt-build-tools qttools-5))
@ -599,21 +552,6 @@ of other programs.")
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("autostart/CMakeLists.txt"
"menu/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("cmake/BuildPlugin.cmake"
"panel/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))
(add-after 'unpack 'set-xkeyboard-config-file-path
(lambda* (#:key inputs #:allow-other-keys)
;; Set the path to xkeyboard-config.
@ -630,14 +568,14 @@ of other programs.")
(define-public lxqt-policykit
(package
(name "lxqt-policykit")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "119bjhx208g7wxmr8r0ajb3wl6vagq1aks6zz07df4bgjs3nnpli"))))
(base32 "150ggcfprascnwgsz721vnmay9cbar9annlhp6h2yzkl69iyc49r"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -650,23 +588,7 @@ of other programs.")
qtx11extras))
(native-inputs
(list pkg-config polkit lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no test target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(arguments '(#:tests? #f)) ; no test target
(home-page "https://lxqt-project.org")
(synopsis "The LXQt PolicyKit agent")
(description "lxqt-policykit is the polkit authentication agent of
@ -676,14 +598,14 @@ LXQt.")
(define-public lxqt-powermanagement
(package
(name "lxqt-powermanagement")
(version "0.17.1")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "00njx8a8cs0zzpz798qc9j16k7i4y0ydy1xmmcq9yv0wawh4gqck"))))
(base32 "0zy6abbf3iwrxsr18gbxidb4m5spsigpa2778xg7y9r7fwgmqqkk"))))
(build-system cmake-build-system)
(inputs
(list kidletime
@ -697,24 +619,7 @@ LXQt.")
solid))
(native-inputs
(list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("config/CMakeLists.txt"
"src/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "Power management module for LXQt")
(description "lxqt-powermanagement is providing tools to monitor power
@ -725,14 +630,14 @@ when laptop batteries are low on power.")
(define-public lxqt-qtplugin
(package
(name "lxqt-qtplugin")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "14c6abxfg3vda333wrvb5lk45c45hnb66jclbs3vsmrjxdb13vv5"))))
(base32 "1zw79lnm35gj3dyd4vlnk08n1lnr8391n36nbn81d0fgmvs21yx4"))))
(build-system cmake-build-system)
(inputs
(list libdbusmenu-qt
@ -762,14 +667,14 @@ Qt with LXQt.")
(define-public lxqt-runner
(package
(name "lxqt-runner")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0n53jbvkmp4vgi21a720gsvi407m4ybqk8xrpnm5f48yjr88r9i4"))))
(base32 "1wfng8g28mq97ibrgpfbj353i15vdimmjp83pfqrmkddx0yvzcdv"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -783,23 +688,7 @@ Qt with LXQt.")
qtx11extras))
(native-inputs
(list pkg-config qttools-5 lxqt-build-tools))
(arguments
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "Tool used to launch programs quickly by typing their names")
(description "lxqt-runner provides a GUI that comes up on the desktop and
@ -809,20 +698,20 @@ allows for launching applications or shutting down the system.")
(define-public lxqt-session
(package
(name "lxqt-session")
(version "0.17.1")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0iwwfyngpbhs2dwvbw0cci0bf3qbqcpjjw7h5vm46nimvgp8q1fr"))))
(base32 "0j8q5jfpb2l0vvji3xs8y0jcr792z6sxzj111qqvmdrbpxrkwxnw"))))
(build-system cmake-build-system)
(inputs
(list eudev
kwindowsystem
liblxqt
libqtxdg
qtxdg-tools
procps
qtbase-5
qtsvg-5
@ -836,40 +725,28 @@ allows for launching applications or shutting down the system.")
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("autostart/CMakeLists.txt"
"config/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
(let ((out (assoc-ref outputs "out")))
(substitute* '("xsession/lxqt.desktop.in")
(("Exec=startlxqt") (string-append "Exec=" out "/bin/startlxqt"))
(("TryExec=lxqt-session") (string-append "TryExec=" out "/bin/startlxqt")))
#t)))
;; add write permission to lxqt-rc.xml file which is stored as read-only in store
(("TryExec=lxqt-session") (string-append "TryExec=" out "/bin/startlxqt"))))))
(add-after 'unpack 'patch-openbox-permission
(lambda _
(substitute* "startlxqt.in"
;; Don't add 'etc/xdg' to XDG_CONFIG_DIRS, and 'share' to XDG_DATA_DIRS.
(("! contains .*;") "false;")
;; Add write permission to lxqt-rc.xml file which is stored as
;; read-only in store.
(("cp \"\\$LXQT_DEFAULT_OPENBOX_CONFIG\" \"\\$XDG_CONFIG_HOME/openbox\"")
(string-append "cp \"$LXQT_DEFAULT_OPENBOX_CONFIG\" \"$XDG_CONFIG_HOME/openbox\"\n"
" # fix openbox permission issue\n"
" chmod u+w \"$XDG_CONFIG_HOME/openbox\"/*")))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("lxqt-config-session/CMakeLists.txt"
"lxqt-leave/CMakeLists.txt"
"lxqt-session/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/startlxqt")
`("XDG_CONFIG_DIRS" ":" suffix ("/run/current-system/profile/share"
"/run/current-system/profile/share/pcmanfm-qt")))
#t))))))
" chmod u+w \"$XDG_CONFIG_HOME/openbox\"/*"))))))))
(native-search-paths
(list (search-path-specification
;; LXQt applications install their default config files into
;; 'share/lxqt' and search them from XDG_CONFIG_DIRS/lxqt.
(variable "XDG_CONFIG_DIRS")
(files '("share")))))
(home-page "https://lxqt-project.org")
(synopsis "Session manager for LXQt")
(description "lxqt-session provides the standard session manager
@ -879,14 +756,14 @@ for the LXQt desktop environment.")
(define-public lxqt-sudo
(package
(name "lxqt-sudo")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "02s38m0ywp0gjkjczvrc4r1ignshbajlj084xd61d3rcm7vahhic"))))
(base32 "064w40v43m91y9aywxxf2pj5rpcl4gbsgj7dv97pg4vhj9s790b8"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -898,17 +775,7 @@ for the LXQt desktop environment.")
sudo))
(native-inputs
(list pkg-config qttools-5 lxqt-build-tools))
(arguments
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t)))))
(arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "GUI frontend for sudo/su")
(description "lxqt-sudo is a graphical front-end of commands sudo and su
@ -919,30 +786,18 @@ permissions of other users including root.")
(define-public lxqt-themes
(package
(name "lxqt-themes")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0kmvcz6rxghxxgb0m264zbvycc1zjma8mr4cpwg5kyrzb47rdw9z"))))
(base32 "18zrp2j0xpsrzy6m2dw8k55zczcc9jzavncasrp5j1dxscnzwrcr"))))
(build-system cmake-build-system)
(native-inputs
(list lxqt-build-tools))
(arguments
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}")
"DESTINATION \"share/lxqt/graphics"))
(substitute* '("themes/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}")
"DESTINATION \"share/lxqt"))
#t)))))
(arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "Themes, graphics and icons for LXQt")
(description "This package comprises a number of graphic files and themes
@ -957,14 +812,14 @@ for LXQt.")
(define-public libfm-qt
(package
(name "libfm-qt")
(version "0.17.1")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1991lm1gnw9s5wwn1yf3vba63bfmrrgsxc70h3nhdl9mh16qygxa"))))
(base32 "0m2fq1wh553yqi64a5nrdvm57fk3jnc3kxgaf0ja7h95jw6czvm5"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no tests
@ -988,32 +843,31 @@ components to build desktop file managers which belongs to LXDE.")
(define-public pcmanfm-qt
(package
(name "pcmanfm-qt")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "1axs7dnh2z08ygy28iipfbgfck15k2i2pwlf0v8d8axjrmavzb3l"))))
(base32 "0pwl2j5kbs86vmq86phavq89bl2i82ic839bjk0v8kmxm9q2mrh9"))))
(build-system cmake-build-system)
(arguments
(list
#:tests? #f ; no tests
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'patch-settings.conf.in
(lambda* (#:key inputs #:allow-other-keys)
(let ((wallpaper (search-input-file inputs
"share/lxqt/wallpapers/waves-logo.png")))
(substitute* "config/pcmanfm-qt/lxqt/settings.conf.in"
(("Wallpaper=.*")
(string-append "Wallpaper=" wallpaper "\n")))))))))
(inputs
(list libfm-qt qtbase-5 qtx11extras))
(list libfm-qt qtbase-5 qtx11extras lxqt-themes))
(native-inputs
(list pkg-config qttools-5 lxqt-build-tools))
(arguments
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
(substitute* '("config/pcmanfm-qt/lxqt/settings.conf.in")
(("@LXQT_SHARE_DIR@")
"/run/current-system/profile/share/lxqt" ))
#t)))))
(home-page "https://lxqt-project.org")
(synopsis "File manager and desktop icon manager")
(description "PCManFM-Qt is the Qt port of PCManFM, the file manager of
@ -1039,16 +893,7 @@ LXDE.")
(list libconfig qtbase-5))
(native-inputs
(list lxqt-build-tools pkg-config qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* '("autostart/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
#t)))))
(arguments '(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org")
(synopsis "GUI configuration tool for compton X composite manager")
(description "@code{compton-conf} is a configuration tool for X composite
@ -1058,14 +903,14 @@ manager Compton.")
(define-public lximage-qt
(package
(name "lximage-qt")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0g6hs41xfw2ghhwpj0rqr2ciri0x9v984689yrnmnvah88zlya1f"))))
(base32 "0nal8n7nmkafapdbcs9c8rk313md2fak4xjl9m56n10dxcjpi2wb"))))
(build-system cmake-build-system)
(inputs
(list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras))
@ -1082,14 +927,14 @@ image viewer.")
(define-public obconf-qt
(package
(name "obconf-qt")
(version "0.16.1")
(version "0.16.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0hlbivdbiw7wjhwrp8qfmq50ks19v0q21m3pyjj0k2na7nv9d3a5"))))
(base32 "0q29f77dkwy005gzrmn2wj2ga1hdnfd2gwp05h72i2dj0qbdla3k"))))
(build-system cmake-build-system)
(inputs
(list imlib2
@ -1115,14 +960,14 @@ window manager OpenBox.")
(define-public pavucontrol-qt
(package
(name "pavucontrol-qt")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0w51dpjayav78lmhw966fz3gvypkmv64xgsd7x5rqs8am39lq9vc"))))
(base32 "0y3ql25cmg1cmzjvadf7zcb58hh69gcslvr944sxxhaqp4daz10v"))))
(build-system cmake-build-system)
(inputs
(list glib pcre pulseaudio qtbase-5 qtx11extras))
@ -1139,14 +984,14 @@ window manager OpenBox.")
(define-public qps
(package
(name "qps")
(version "2.3.0")
(version "2.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0zg0czrh3dlbnl5smxamhkdbj1g0szm47w1c0fwpaplgc1vv5lfq"))))
(base32 "16ybq07xpkl22mszakc1175xlqcayyj21i2h6wlxb8bmb7csg30n"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem
@ -1168,14 +1013,14 @@ processes currently in existence, much like code{top} or code{ps}.")
(define-public qtermwidget
(package
(name "qtermwidget")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "10lv475qj0x3c3vl4yhjyr6y10qj5pq8n5pal5k24f6pf7xv412f"))))
(base32 "1m64c1m8dkb06fgfk09da2anjspphph6qdk41rqhds2qymh090v4"))))
(build-system cmake-build-system)
(inputs
(list qtbase-5 utf8proc))
@ -1191,14 +1036,14 @@ processes currently in existence, much like code{top} or code{ps}.")
(define-public qterminal
(package
(name "qterminal")
(version "0.17.0")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0rfv7a6ncm8fs8aicinh9l29w4636gxzcqz735jmch2r41v9i1d9"))))
(base32 "1b9568y5xyxymk8r7pkz878ba24dyaxql2sfiy6blr8szf308c5l"))))
(build-system cmake-build-system)
(inputs
(list qtbase-5 qtx11extras qtermwidget))
@ -1215,14 +1060,14 @@ QTermWidget.")
(define-public screengrab
(package
(name "screengrab")
(version "2.2.0")
(version "2.4.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/screengrab/releases/download/"
version "/screengrab-" version ".tar.xz"))
(sha256
(base32 "0cilzw7rz5m2klzpax7rrs5rr6whfda2svwzsn2jvmrirmh5by7r"))))
(base32 "14kh287d70v1lpd5w8pji88nmw3jd44q4h927vnszrkv6bwplzx7"))))
(build-system cmake-build-system)
(inputs
(list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras))
@ -1240,14 +1085,14 @@ easily publishing them on internet image hosting services.")
(define-public lxqt-archiver
(package
(name "lxqt-archiver")
(version "0.4.0")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0fzgq7cyr7hx8qmq84xfgbsdx04mc1r7vzq5mz79j7bp2ysh134z"))))
(base32 "1cxxr7rpflh2ki272pac927gzcw2w1lp3qz8vplflf148laigwc0"))))
(build-system cmake-build-system)
(inputs
(list glib json-glib libfm-qt qtbase-5 qtx11extras))
@ -1294,14 +1139,6 @@ like @command{tar} and @command{zip}.")
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations"))
(("\\$\\{LXQT_ETC_XDG_DIR\\}") "etc/xdg"))
#t))
(add-after 'unpack 'remove-definitions
(lambda _
(substitute* "CMakeLists.txt"
@ -1357,7 +1194,7 @@ desktop.")
lximage-qt
obconf-qt
openbox
oxygen-icons
breeze-icons ; default by <lxqt-session>/share/lxqt/lxqt.conf
pavucontrol-qt
qps
qterminal))

View File

@ -828,10 +828,10 @@ in terms of new algorithms.")
(home-page "https://onnx.ai/")
(synopsis "Open Neural Network Exchange")
(description
"Open Neural Network Exchange (ONNX) provides an open source format for
AI models, both deep learning and traditional ML. It defines an extensible
computation graph model, as well as definitions of built-in operators and
standard data types.")
"@acronym{ONNX, Open Neural Network Exchange} is a format for AI models,
both deep learning and traditional @acronym{ML, machine learning}. It defines
an extensible computation graph model, as well as definitions of built-in
operators and standard data types.")
(license license:expat)))
(define-public python-onnx

View File

@ -558,7 +558,7 @@ aliasing facilities to work just as they would on normal mail.")
(define-public mutt
(package
(name "mutt")
(version "2.2.6")
(version "2.2.7")
(source (origin
(method url-fetch)
(uri (list
@ -568,7 +568,7 @@ aliasing facilities to work just as they would on normal mail.")
version ".tar.gz")))
(sha256
(base32
"1lw8111wbsw4hkvrlfsd2cf2l1j25vqwbzys07z0ding2wsxk8pz"))
"1wbdsgx5x7h4alsfmjqac46xvbbakc7djlpngd3rydmvb27qa4zb"))
(patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system)
(inputs
@ -1160,7 +1160,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu
(package
(name "mu")
(version "1.8.7")
(version "1.8.9")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1169,7 +1169,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(file-name (git-file-name name version))
(sha256
(base32
"0yfbw234yqnqfnsn5bj1hqwpy78pkxn05vl18z8nvsqdmpzal4gx"))))
"1anpv49242qpayziz111rzznkmfgkd2a9y5xda6xhmzhqdhx79h2"))))
(build-system meson-build-system)
(native-inputs
(list pkg-config
@ -1179,29 +1179,30 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(inputs
(list glib gmime xapian))
(arguments
`(#:modules ((guix build meson-build-system)
(list
#:modules '((guix build meson-build-system)
(guix build emacs-utils)
(guix build utils))
#:imported-modules (,@%meson-build-system-modules
#:imported-modules `(,@%meson-build-system-modules
(guix build emacs-utils))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-bin-references
(lambda _
(substitute* '("guile/tests/test-mu-guile.cc"
"mu/tests/test-mu-cmd.cc"
"mu/tests/test-mu-cmd-cfind.cc"
"mu/tests/test-mu-query.cc")
(("/bin/sh") (which "sh")))
(substitute* '("lib/tests/bench-indexer.cc"
"lib/utils/mu-utils.cc")
(("/bin/rm") (which "rm")))))
(add-after 'install 'install-emacs-autoloads
(lambda* (#:key outputs #:allow-other-keys)
(emacs-generate-autoloads
"mu4e"
(string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp")))))))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-bin-references
(lambda _
(substitute* '("guile/tests/test-mu-guile.cc"
"mu/tests/test-mu-cmd.cc"
"mu/tests/test-mu-cmd-cfind.cc"
"mu/tests/test-mu-query.cc")
(("/bin/sh") (which "sh")))
(substitute* '("lib/tests/bench-indexer.cc"
"lib/utils/mu-test-utils.cc")
(("/bin/rm") (which "rm")))))
(add-after 'install 'install-emacs-autoloads
(lambda* (#:key outputs #:allow-other-keys)
(emacs-generate-autoloads
"mu4e"
(string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp/mu4e")))))))
(home-page "https://www.djcbsoftware.nl/code/mu/")
(synopsis "Quickly find emails")
(description

View File

@ -1824,6 +1824,12 @@ the resulting text.")
(arguments `(#:tests? #f ; Tests require googletest *sources*
#:phases
(modify-phases %standard-phases
(add-after 'install 'delete-formulas-log
;; Contains date and timing information which is unreproducible,
;; and should not be needed when using the package
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(delete-file (string-append out "/share/doc/itpp/html/_formulas.log")))))
(add-after 'unpack 'set-man-page-date
(lambda _
(substitute* "itpp-config.1.cmake.in"
@ -7312,6 +7318,64 @@ researchers and developers alike to get started on SAT.")
"http://minisat.se/MiniSat.html")
(license license:expat))))
(define-public kissat
(package
(name "kissat")
(version "3.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/arminbiere/kissat")
(commit (string-append "rel-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"04x4w760srbdi4zci0s747qxk717x5d2x59ixraxh5104s9nyn8b"))))
(build-system gnu-build-system)
(inputs (list xz gzip lzip bzip2 p7zip))
(arguments
(list
#:test-target "test"
#:configure-flags #~(list "-shared")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/file.c"
(("(bzip2|gzip|lzma|xz) -c" all cmd)
(string-append (search-input-file inputs
(string-append "bin/" cmd))
" -c"))
(("7z ([ax])" all mode)
(string-append (search-input-file inputs "bin/7z")
" " mode))
;; Since we hard-coded the paths, we no longer need to find
;; them.
(("bool found = kissat_find_executable \\(name\\);")
"bool found = true;"))
(substitute* "test/testmain.c"
;; SIGINT is ignored inside invoke.
(("^SIGNAL\\(SIGINT\\)") ""))))
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
;; The configure script does not support standard GNU options.
(apply invoke "./configure" configure-flags)))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "build/kissat" (string-append out "/bin"))
(install-file "build/libkissat.so" (string-append out "/lib"))
(install-file "src/kissat.h"
(string-append out "/include"))))))))
(home-page "https://github.com/arminbiere/kissat")
(synopsis "Bare-metal SAT solver")
(description
"Kissat is a bare-metal SAT-solver written in C. It is a port of CaDiCaL
back to C with improved data structures, better scheduling of inprocessing and
optimized algorithms and implementation.")
(license license:expat)))
(define-public libqalculate
(package
(name "libqalculate")

View File

@ -1118,13 +1118,13 @@ gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x.")))
(define maven-pom
(package
(name "maven-pom")
(version "3.8.5")
(version "3.8.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/maven/"
"maven-3/" version "/source/"
"apache-maven-" version "-src.tar.gz"))
(sha256 (base32 "01y0fjvlvgy1bl3mdhbjll2xhzpli6aklqb3w29xpbgk6frxn3d6"))
(sha256 (base32 "0jszmcaxp597a62ajrc478jxix1qmw4pknhiygsbjdy3kccc7gvj"))
(modules '((guix build utils)))
(snippet
'(begin

View File

@ -3446,4 +3446,35 @@ Discord.")
(home-page "https://github.com/taylordotfish/harmony")
(license license:gpl3+)))
(define-public pn
(package
(name "pn")
(version "0.9.0")
(home-page "https://github.com/Orange-OpenSource/pn")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1lvzb0yixj7wmmqzsri20k9nn3gf06j0yjvmg2mi1zihywq7s4dx"))))
(build-system cmake-build-system)
(arguments
(list #:tests? #f ;no tests
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'set-lib-destination
(lambda _
(substitute* "CMakeLists.txt"
(("DESTINATION \\$\\{AWKLIBPATH\\}")
"DESTINATION lib")))))))
(inputs (list icu4c libphonenumber protobuf))
(synopsis "Command-line validation tool for phone numbers")
(description
"@code{pn} provides a command line tool that allows users to operate on
phone numbers (get validity information, reformat them, or extract numbers from
a text snippet), using @code{libphonenumber}.")
(license license:asl2.0)))
;;; messaging.scm ends here

View File

@ -28,15 +28,14 @@
(define-public moe
(package
(name "moe")
(version "1.11")
(version "1.12")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/moe/moe-"
version ".tar.lz"))
(sha256
(base32
"1yg2ln2mm6gzv61cxnv60dw1cr5bl2dhkjy685jrd3aabb7wpyqf"))))
(base32 "1s51swk8h5k32r2z4i1pla2l15b0v0mh35lwsd5f1y16whmmz24a"))))
(build-system gnu-build-system)
(native-inputs (list lzip))
(inputs (list ncurses))

View File

@ -2181,7 +2181,7 @@ users to select LV2 plugins and run them with jalv.")
(define-public mixxx
(package
(name "mixxx")
(version "2.3.2")
(version "2.3.3")
(source
(origin
(method git-fetch)
@ -2193,7 +2193,7 @@ users to select LV2 plugins and run them with jalv.")
(search-patches "mixxx-link-qtscriptbytearray-qtscript.patch"
"mixxx-system-googletest-benchmark.patch"))
(sha256
(base32 "1h26vpf60rk56fsw1nvmxihg7ammlj8q4zgim49q4s4ww7j8wwqj"))
(base32 "0zrmy97lk0xdfnlvygshr8vradypmnypki3s1mhc296xhq96n6rm"))
(modules '((guix build utils)))
(snippet
;; Delete libraries that we already have or don't need.
@ -3310,7 +3310,7 @@ from the command line.")
lilv
lv2
qtbase-5
qtsvg
qtsvg-5
qtx11extras
rubberband
suil
@ -3724,13 +3724,13 @@ websites such as Libre.fm.")
(define-public beets
(package
(name "beets")
(version "1.5.0")
(version "1.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "beets" version))
(sha256
(base32
"0arl4nc3y8iwa331hf6ggai19y8ns9pl03g5d6ac857wq2x7nzw8"))))
"0paj2nxvdx4zz9xawjpbsh0dy1kp9kfhxg8akh1rpz2awhsbfvxa"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -3773,7 +3773,6 @@ websites such as Libre.fm.")
python-munkres
python-musicbrainzngs
python-pyyaml
python-six
python-unidecode
;; Optional dependencies for plugins. Some of these are also required by tests.
python-beautifulsoup4 ; For lyrics.
@ -4849,7 +4848,7 @@ studio.")
(define-public gsequencer
(package
(name "gsequencer")
(version "3.18.2")
(version "4.3.4")
(source
(origin
(method git-fetch)
@ -4858,7 +4857,7 @@ studio.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1lkn7rfrjvmds62i69igcgmic2snscgb9f6gdg5nzyfkis1fq5iz"))))
(base32 "10rf9li9kr6qdzkqv66wlg7gw2il18n7kd4fhk848hh5dcmg1icv"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:phases
@ -4884,18 +4883,18 @@ studio.")
fftw
gst-plugins-base
gstreamer
gtk+
gtk
jack-1
ladspa
libinstpatch
libsamplerate
libsndfile
libsoup-minimal-2
libsoup
libxml2
lv2
pulseaudio
`(,util-linux "lib")
webkitgtk-with-libsoup2))
webkitgtk))
(home-page "https://nongnu.org/gsequencer/")
(synopsis "Advanced Gtk+ Sequencer")
(description

View File

@ -3055,6 +3055,11 @@ interface and a programmable text output for scripting.")
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-manpage-date
(lambda _
;; Replace current date with specific date to build reproducibly
(substitute* "doc/fixmanpages.in"
(("pod2man -d .* -n") "pod2man -d \"1970-01-01\" -n"))))
(add-before 'build 'build-doc
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "-C" "doc" "doc"
@ -3756,14 +3761,14 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP.")
(define-public bird
(package
(name "bird")
(version "2.0.8")
(version "2.0.10")
(source (origin
(method url-fetch)
(uri (string-append "ftp://bird.network.cz/pub/bird/bird-"
version ".tar.gz"))
(sha256
(base32
"1xp7f0im1v8pqqx3xqyfkd1nsxk8vnbqgrdrwnwhg8r5xs1xxlhr"))))
"0npx3zgbjnhm4905zmj2qkz3d13s8hakassq6sbzm1ywv3fl3lvy"))))
(inputs
(list libssh readline))
(native-inputs
@ -4149,11 +4154,11 @@ cables.")
(list lua openssl pcre2 zlib))
(home-page "https://www.haproxy.org/")
(synopsis "Reliable, high performance TCP/HTTP load balancer")
(description "HAProxy is a free, very fast and reliable solution offering
high availability, load balancing, and proxying for TCP and HTTP-based
applications. It is particularly suited for web sites crawling under very
high loads while needing persistence or Layer7 processing. Supporting tens of
thousands of connections is clearly realistic with today's hardware.")
(description "HAProxy offers @acronym{HA, high availability}, load
balancing, and proxying for TCP and HTTP-based applications. It is particularly
suited to Web sites crawling under very high loads while needing persistence or
Layer 7 processing. Supporting tens of thousands of connections is clearly
realistic with today's hardware.")
(license (list license:gpl2+
license:lgpl2.1
license:lgpl2.1+))))

View File

@ -591,31 +591,26 @@ for day to day programming.")
(define-public ocaml-cudf
(package
(name "ocaml-cudf")
(version "0.9")
(source
(origin
(method url-fetch)
(uri "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz")
(sha256
(base32
"0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"))))
(build-system ocaml-build-system)
(propagated-inputs (list ocaml-extlib))
(native-inputs
(list perl ocamlbuild ocaml-ounit))
(version "0.10")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/irill/cudf")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1lvrmpscbk1kjv5ag5bzlzv520xk5zw2haf6q7chvz98gcm9g0hk"))))
(build-system dune-build-system)
(arguments
`(#:make-flags
,#~(list
"all" "opt"
(string-append "BINDIR=" #$output "/bin"))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
'(#:test-target "."))
(propagated-inputs (list ocaml-extlib))
(native-inputs (list ocaml-ounit2))
(home-page "https://www.mancoosi.org/cudf/")
(synopsis "CUDF library (part of the Mancoosi tools)")
(description "CUDF (for Common Upgradeability Description Format) is a
format for describing upgrade scenarios in package-based Free and Open Source
Software distribution.")
(description
"@acronym{CUDF, Common Upgradeability Description Format} is a format for
describing upgrade scenarios in package-based software distributions.")
;; With static-linking exception
(license license:lgpl2.1+)))
@ -783,7 +778,7 @@ the opam file format.")
(define-public opam
(package
(name "opam")
(version "2.1.2")
(version "2.1.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -792,7 +787,7 @@ the opam file format.")
(file-name (git-file-name name version))
(sha256
(base32
"0mdr32mg63yaw89p44zx8b9dxp1167ckmlxkp8svd6fwgb3z49yx"))))
"1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
(build-system dune-build-system)
(arguments
`(#:test-target "."
@ -827,6 +822,12 @@ the opam file format.")
;; home directory.
(mkdir-p "test-home")
(setenv "HOME" (string-append (getcwd) "/test-home"))
(with-output-to-file (string-append (getcwd) "/test-home/.gitconfig")
(lambda _
(display "[user]
email = guix@localhost.none
name = Guix Builder")
(newline)))
;; Opam tests require data from opam-repository. Instead of
;; downloading them with wget from the guix environment, copy the
@ -837,11 +838,17 @@ the opam file format.")
(assoc-ref inputs (string-append "opam-repo-" commit))
"/ %{targets}) (run chmod +w -R %{targets}"))
(("wget[^)]*") "touch %{targets}")
;; Disable a failing test because of different line wrapping
(("diff cli-versioning.test cli-versioning.out") "run true")
;; Disable a failing test because it tries to clone a git
;; repository from inside bwrap
(("diff upgrade-format.test upgrade-format.out") "run true"))
(("diff upgrade-format.test upgrade-format.out") "run true")
;; Disable a failing test because it tries to figure out which
;; distro this is, and it doesn't know Guix
(("diff pin.unix.test pin.unix.out") "run true")
;; Disable a failing test because of a failed expansion
(("diff opamroot-versions.test opamroot-versions.out") "run true")
;; Disable a failing test, probably because the repository we
;; replaced is not as expected
(("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") "run true"))
(substitute* "tests/reftests/dune"
;; Because of our changes to the previous file, we cannot check
;; it can be regenerated
@ -879,6 +886,10 @@ the opam file format.")
;; Data for tests
("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2"
"1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w"))
("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15"
"1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmabn0z"))
("opam-repo-a5d7cdc0" ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd"
"0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369"))
("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4"
"1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8"))
("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0"
@ -1705,7 +1716,7 @@ full_split, cut, rcut, etc..")
(define dune-bootstrap
(package
(name "dune")
(version "3.3.1")
(version "3.4.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1714,7 +1725,7 @@ full_split, cut, rcut, etc..")
(file-name (git-file-name name version))
(sha256
(base32
"0wdja70l7y1cj1d0sijm0q0cbics8xd9wqka7zyb29y1cc57pasa"))))
"02zn79l7y7rvy7b6bimlf5qymrvzc43w8q7l4jx3k8wzn2g5326z"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f; require odoc
@ -2428,7 +2439,7 @@ immutability.")
(define-public ocaml-alcotest
(package
(name "ocaml-alcotest")
(version "1.5.0")
(version "1.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2437,7 +2448,7 @@ immutability.")
(file-name (git-file-name name version))
(sha256
(base32
"1lgadc7p56677fi5gwl7r9bml4z87rzh50khhqaij7bwp37zrmpi"))))
"195612n7p8y5ba6n19glql7qffl8n3aqkl9nrlln5lb9739gpv4w"))))
(build-system dune-build-system)
(arguments
`(#:package "alcotest"
@ -2449,7 +2460,6 @@ immutability.")
;; cmdliner changed the format and the tests fail
(substitute* "test/e2e/alcotest/failing/unknown_option.expected"
(("`") "'")
(("COMMAND") "[COMMAND]")
(("\\.\\.\\.") "…")))))))
(native-inputs
(list ocamlbuild))
@ -2550,21 +2560,21 @@ lets the client choose the concrete timeline.")
(define-public ocaml-ssl
(package
(name "ocaml-ssl")
(version "0.5.10")
(version "0.5.12")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/savonet/ocaml-ssl")
(commit (string-append "v" version))))
(commit version)))
(file-name (git-file-name name version))
(sha256 (base32
"1rszqiqayh67xlwd5411k8vib47x9kapdr037z1majd2c14z3kcb"))))
"1dr7yghbv0wncvggd2105bj097msgrdzxd9wjkw1xxf2vvp0j1bi"))))
(build-system dune-build-system)
(arguments
`(#:test-target "."))
(native-inputs
(list autoconf automake which))
(list autoconf automake ocaml-alcotest which))
(propagated-inputs (list openssl))
(home-page "https://github.com/savonet/ocaml-ssl/")
(synopsis "OCaml bindings for OpenSSL")
@ -3753,7 +3763,7 @@ big- and little-endian, with their unsafe counter-parts.")
(define-public ocaml-cstruct
(package
(name "ocaml-cstruct")
(version "6.1.0")
(version "6.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3762,7 +3772,7 @@ big- and little-endian, with their unsafe counter-parts.")
(file-name (git-file-name name version))
(sha256
(base32
"1pwfkfs8zzr88slnvl5b28lx6w2k149ybgvrs6diay3qvwcmkhx5"))))
"0dpbirs6lzp0bclr3wcw407jjspll7iy66z18zks3mjccvlxd21w"))))
(build-system dune-build-system)
(arguments
`(#:package "cstruct"
@ -3946,7 +3956,7 @@ Format module of the OCaml standard library.")
(define-public ocaml-piqilib
(package
(name "ocaml-piqilib")
(version "0.6.15")
(version "0.6.16")
(source
(origin
(method git-fetch)
@ -3955,7 +3965,7 @@ Format module of the OCaml standard library.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb"))))
(base32 "0mbhfrfrik3jlzx9zz680g0qdvv0b7cbjz28cgdlryp7nk4v4kx8"))))
(build-system ocaml-build-system)
(arguments
`(#:phases
@ -4074,7 +4084,7 @@ and 4 (random based) according to RFC 4122.")
(define-public ocaml-piqi
(package
(name "ocaml-piqi")
(version "0.7.7")
(version "0.7.8")
(source (origin
(method git-fetch)
(uri (git-reference
@ -4083,7 +4093,7 @@ and 4 (random based) according to RFC 4122.")
(file-name (git-file-name name version))
(sha256
(base32
"1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm"))))
"12m9vxir0cs2155nxs0a3m3npf3w79kyxf9a5lmf18qvvgismfz8"))))
(build-system ocaml-build-system)
(arguments
`(#:make-flags
@ -4293,7 +4303,7 @@ function that follows the prototype of POSIX's wcwidth.")
(define-public ocaml-zed
(package
(name "ocaml-zed")
(version "3.1.0")
(version "3.2.0")
(home-page "https://github.com/ocaml-community/zed")
(source
(origin
@ -4303,14 +4313,18 @@ function that follows the prototype of POSIX's wcwidth.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"))))
(base32 "1g171kk5wxnk66d4vwz2crh5i19vhqghp78iybl5am17gl9qf8pb"))))
(build-system dune-build-system)
(propagated-inputs
(list ocaml-react
ocaml-result
ocaml-uchar
ocaml-uutf
ocaml-uucp
ocaml-uuseg
ocaml-odoc))
(arguments
`(#:test-target "."))
(propagated-inputs
`(("ocaml-charInfo-width" ,ocaml-charinfo-width)
("ocaml-camomile" ,ocaml-camomile)
("ocaml-react" ,ocaml-react)))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed))))
(synopsis "Abstract engine for text edition in OCaml")
(description
@ -4337,12 +4351,16 @@ capabilities, Zed provides macro recording and cursor management facilities.")
(sha256
(base32
"0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"))))
(propagated-inputs
`(("ocaml-charInfo-width" ,ocaml-charinfo-width)
("ocaml-camomile" ,ocaml-camomile)
("ocaml-react" ,ocaml-react)))
(properties '()))))
(define-public ocaml-lambda-term
(package
(name "ocaml-lambda-term")
(version "3.2.0")
(version "3.3.1")
(home-page "https://github.com/ocaml-community/lambda-term")
(source (origin
(method git-fetch)
@ -4352,18 +4370,18 @@ capabilities, Zed provides macro recording and cursor management facilities.")
(file-name (git-file-name name version))
(sha256
(base32
"048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i"))))
"1pkamblc6h0rsbk901cqn3xr9gqa3g8wrwyx5zryaqvb2xpbhp8b"))))
(build-system dune-build-system)
(arguments
`(#:test-target "."))
(propagated-inputs
(list ocaml-lwt
ocaml-lwt-log
ocaml-react
ocaml-zed
ocaml-camomile
(list ocaml-logs
ocaml-lwt
ocaml-lwt-react
ocaml-mew-vi))
ocaml-mew-vi
ocaml-odoc
ocaml-react
ocaml-zed))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-lambda-term))))
(synopsis "Terminal manipulation library for OCaml")
(description "Lambda-Term is a cross-platform library for manipulating the
@ -4398,7 +4416,7 @@ instead of bindings to a C library.")
(define-public ocaml-utop
(package
(name "ocaml-utop")
(version "2.9.2")
(version "2.10.0")
(source
(origin
(method git-fetch)
@ -4407,15 +4425,19 @@ instead of bindings to a C library.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0z5anakgbndhyzbi570pfs2fy69bnmgq9jflgfbly2rhbhwa7wgj"))))
(base32 "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3"))))
(build-system dune-build-system)
(arguments
`(#:test-target "."))
(native-inputs
(list ocaml-cppo))
(propagated-inputs
(list ocaml-lambda-term ocaml-lwt ocaml-lwt-react ocaml-camomile
ocaml-react))
(list ocaml-lambda-term
ocaml-logs
ocaml-lwt
ocaml-lwt-react
ocaml-react
ocaml-zed))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-utop))))
(home-page "https://github.com/ocaml-community/utop")
(synopsis "Improved interface to the OCaml toplevel")
@ -4900,31 +4922,20 @@ is also support for writing OCaml syntax extensions in a camlp4 style.")
(define-public ocaml-timed
(package
(name "ocaml-timed")
(version "1.0")
(version "1.1")
(home-page "https://github.com/rlepigre/ocaml-timed")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append home-page ".git"))
(commit (string-append name "_" version))))
(commit version)))
(sha256
(base32
"0hfxz710faxy5yk97bkfnw87r732jcxxhmjppwrbfdb6pd0wks96"))
"1aqmkpjv5jk95lc2m3qyyrhw8ra7n9wj8pv3bfc83l737zv0hjn1"))
(file-name (git-file-name name version))))
(build-system ocaml-build-system)
(build-system dune-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda _
(invoke "make")))
(replace 'install
(lambda _
(invoke "make" "install")))
(replace 'check
(lambda _
(invoke "make" "tests"))))))
'(#:test-target "."))
(synopsis "Timed references for imperative state")
(description "Timed references for imperative state. This module provides
an alternative type for references (or mutable cells) supporting undo/redo
@ -4941,7 +4952,7 @@ than the first one.")
(define-public ocaml-biniou
(package
(name "ocaml-biniou")
(version "1.2.1")
(version "1.2.2")
(home-page "https://github.com/mjambon/biniou")
(source
(origin
@ -4952,7 +4963,7 @@ than the first one.")
(file-name (git-file-name name version))
(sha256
(base32
"0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790"))))
"1gd4nqffm9h7dzxyvpfpww24l61fqgazyh3p5f7k9jvgyv9y4vcn"))))
(build-system dune-build-system)
(arguments
`(#:phases
@ -4960,7 +4971,7 @@ than the first one.")
(add-before 'build 'make-writable
(lambda _ (for-each make-file-writable (find-files "." ".")))))))
(inputs
(list ocaml-easy-format))
(list ocaml-easy-format ocaml-camlp-streams))
(native-inputs
(list which))
(synopsis "Data format designed for speed, safety, ease of use and backward
@ -4975,7 +4986,7 @@ than yojson), with 25-35% space savings.")
(define-public ocaml-yojson
(package
(name "ocaml-yojson")
(version "1.7.0")
(version "2.0.2")
(home-page "https://github.com/ocaml-community/yojson")
(source
(origin
@ -4986,14 +4997,13 @@ than yojson), with 25-35% space savings.")
(file-name (git-file-name name version))
(sha256
(base32
"0zncsw8bgbkh1pfvfc7nh628hfj84lgx6jwhp9ashj3z1z0w3xjn"))))
"1habsh00ihjhk1g1csxqg3hj8izk5zvgc7wm579wyjw35vzcmwr1"))))
(build-system dune-build-system)
(arguments
`(#:test-target "."))
(propagated-inputs
(list ocaml-biniou ocaml-easy-format))
(native-inputs
(list ocaml-alcotest ocaml-cppo))
`(#:test-target "."
#:package "yojson"))
(propagated-inputs (list ocaml-seq))
(native-inputs (list ocaml-alcotest ocaml-cppo))
(synopsis "Low-level JSON library for OCaml")
(description "Yojson is an optimized parsing and printing library for the
JSON format. It addresses a few shortcomings of json-wheel including 2x
@ -5036,10 +5046,10 @@ Mercurial's @code{https://www.selenic.com/blog/?p=663, unified test
format}. @code{craml} is released as a single binary (called @code{craml}).")
(license license:isc)))
(define-public ocaml-dot-merlin-reader
(define-public ocaml-merlin-lib
(package
(name "ocaml-dot-merlin-reader")
(version "4.5-414")
(name "ocaml-merlin-lib")
(version "4.6-414")
(source
(origin
(method git-fetch)
@ -5049,17 +5059,27 @@ format}. @code{craml} is released as a single binary (called @code{craml}).")
(file-name (git-file-name name version))
(sha256
(base32
"125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c"))))
"1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh"))))
(build-system dune-build-system)
(arguments '(#:package "merlin-lib"
#:tests? #f)) ; no tests
(propagated-inputs (list ocaml-csexp ocaml-menhir))
(home-page "https://ocaml.github.io/merlin/")
(synopsis "Merlin libraries")
(description "These libraries provides access to low-level compiler
interfaces and the standard higher-level merlin protocol.")
(license license:expat)))
(define-public ocaml-dot-merlin-reader
(package
(inherit ocaml-merlin-lib)
(name "ocaml-dot-merlin-reader")
(arguments '(#:package "dot-merlin-reader"
#:tests? #f)) ; no tests
(inputs
(list ocaml-yojson ocaml-csexp ocaml-result))
(home-page "https://ocaml.github.io/merlin/")
(propagated-inputs (list ocaml-merlin-lib))
(synopsis "Reads config files for @code{ocaml-merlin}")
(description "@code{ocaml-dot-merlin-reader} is an external reader for
@code{ocaml-merlin} configurations.")
(license license:expat)))
@code{ocaml-merlin} configurations.")))
(define-public ocaml-merlin
(package
@ -5073,8 +5093,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).")
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
(inputs
(list ocaml-yojson ocaml-csexp ocaml-result))
(propagated-inputs (list ocaml-merlin-lib ocaml-yojson))
(native-inputs
(list ocaml-dot-merlin-reader ; required for tests
ocaml-mdx jq))
@ -5299,11 +5318,17 @@ parsexp_io.")
(define-public ocaml-sexplib
(package
(name "ocaml-sexplib")
(version "0.15.0")
(version "0.15.1")
(home-page "https://github.com/janestreet/sexplib")
(source
(janestreet-origin "sexplib" version
"1xs55f11yhscnfrzpvy1vn05j6xi9kxy097465624l615j7k8qm5"))
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1gcvcc0jw6pb69wwfjnaqz1jk5simap2kdb7g43v7v7mksg8sh9f"))))
(build-system dune-build-system)
(propagated-inputs
(list ocaml-base ocaml-num ocaml-parsexp ocaml-sexplib0))
@ -7632,7 +7657,8 @@ then run the Bisect_ppx report tool on the generated visitation files.")
(base32 "07zjkk455l51i29lcayzrc1q8j5bvbv97sscv8yhcj7x6h6q2nag"))))
(build-system dune-build-system)
(arguments
`(#:phases
`(#:tests? #f; not compatible with current version of ocaml-yojson
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-test
(lambda _
@ -7677,7 +7703,7 @@ complexity of the OCaml module system.")
(define-public ocaml-odoc-parser
(package
(name "ocaml-odoc-parser")
(version "1.0.0")
(version "2.0.0")
(source
(origin
(method git-fetch)
@ -7687,10 +7713,10 @@ complexity of the OCaml module system.")
(file-name (git-file-name name version))
(sha256
(base32
"0mvwbnla0wd29bc7ckwpb494qv7p616cx8hnm0zg36np7v3zwy4w"))))
"1x48kf051xs98rd6cri591bk1ccp9hyp93n1rlf6qnxic55jw683"))))
(build-system dune-build-system)
(propagated-inputs
(list ocaml-astring ocaml-result))
(list ocaml-astring ocaml-camlp-streams ocaml-result))
(native-inputs
(list ocaml-ppx-expect))
(home-page "https://github.com/ocaml-doc/odoc-parser")
@ -7831,7 +7857,7 @@ and SVG file output.")
(define-public ocaml-version
(package
(name "ocaml-version")
(version "3.4.0")
(version "3.5.0")
(source
(origin
(method git-fetch)
@ -7841,7 +7867,7 @@ and SVG file output.")
(file-name (git-file-name name version))
(sha256
(base32
"1c13zk1qna59m5z9jx7da3p7cxd48scpyk7zg7gi6gc6hx5hhjx8"))))
"1pnw2ym021j48zknhbi1kdiyfv9si8p2l04rdzbv4g51fclsqs92"))))
(build-system dune-build-system)
(arguments `(#:tests? #f)) ; no tests
(properties '((upstream-name . "ocaml-version")))
@ -8206,7 +8232,7 @@ defined in OCaml 4.12.0.")
(define-public ocamlformat
(package
(name "ocamlformat")
(version "0.22.4")
(version "0.24.1")
(source
(origin
(method git-fetch)
@ -8216,7 +8242,7 @@ defined in OCaml 4.12.0.")
(file-name (git-file-name name version))
(sha256
(base32
"171lq3vx4y8xj4by5zy93isx8nhg6ysxg1hxmkqkq16fdaiz8mnc"))))
"0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp"))))
(build-system dune-build-system)
(arguments
'(#:package "ocamlformat"
@ -8535,6 +8561,156 @@ It makes it possible to run pure OCaml programs in JavaScript environment like
browsers and Node.js.")
(license license:lgpl2.1+)))
(define-public ocaml-afl-persistent
(package
(name "ocaml-afl-persistent")
(version "1.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/stedolan/ocaml-afl-persistent")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i"))))
(build-system ocaml-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda _
(invoke "./build.sh")))
;; XXX: The tests are already run in the build.sh script.
(delete 'check))))
(native-inputs
`(("opam" ,opam)))
(home-page "https://github.com/stedolan/ocaml-afl-persistent")
(synopsis "Use afl-fuzz in persistent mode")
(description
"afl-fuzz normally works by repeatedly forking the program being tested.
Using this package, you can run afl-fuzz in ``persistent mode'', which avoids
repeated forking and is much faster.")
(license license:expat)))
(define-public ocaml-pprint
(package
(name "ocaml-pprint")
(version "20220103")
(home-page "https://github.com/fpottier/pprint")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"09y6nwnjldifm47406q1r9987njlk77g4ifqg6qs54dckhr64vax"))))
(build-system dune-build-system)
(synopsis "OCaml pretty-printing combinator library and rendering
engine")
(description "This OCaml library offers a set of combinators for building
so-called documents as well as an efficient engine for converting documents to
a textual, fixed-width format. The engine takes care of indentation and line
breaks, while respecting the constraints imposed by the structure of the
document and by the text width.")
(license license:lgpl2.0)))
(define-public ocaml-crowbar
(package
(name "ocaml-crowbar")
(version "0.2.1")
(home-page "https://github.com/stedolan/crowbar")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"11f3kiw58g8njx15akx16xcplzvzdw9y6c4jpyfxylkxws4g0f6j"))))
(build-system dune-build-system)
(arguments
`(#:test-target "."))
(propagated-inputs
(list ocaml-ocplib-endian
ocaml-cmdliner
ocaml-afl-persistent))
(native-inputs
(list ocaml-calendar
ocaml-fpath
ocaml-uucp
ocaml-uunf
ocaml-uutf
ocaml-pprint))
(synopsis "Ocaml library for tests, let a fuzzer find failing cases")
(description "Crowbar is a library for testing code, combining
QuickCheck-style property-based testing and the magical bug-finding powers of
@uref{http://lcamtuf.coredump.cx/afl/, afl-fuzz}.")
(license license:expat)))
(define-public ocaml-eqaf
(package
(name "ocaml-eqaf")
(version "0.9")
(home-page "https://github.com/mirage/eqaf")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"16ics56wiqyng70dy2hqikicm8ag1mv5w1h7hkiwvydw1x2j2rsl"))))
(build-system dune-build-system)
(propagated-inputs (list ocaml-cstruct))
(native-inputs (list ocaml-alcotest ocaml-crowbar))
(synopsis "OCaml library for constant-time equal function on string")
(description "This OCaml library provides an equal function on string in
constant-time to avoid timing-attack with crypto stuff.")
(license license:expat)))
(define-public ocaml-digestif
(package
(name "ocaml-digestif")
(version "1.1.2")
(home-page "https://github.com/mirage/digestif")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0mc233d63y04jznsn3bxncgv7fkvyngbv6hcka412iq0y3x4qsmq"))))
(build-system dune-build-system)
(propagated-inputs (list ocaml-eqaf))
(native-inputs
(list pkg-config
ocaml-fmt
ocaml-alcotest
ocaml-bos
ocaml-astring
ocaml-fpath
ocaml-rresult
ocaml-findlib))
(synopsis "Simple hash algorithms in OCaml")
(description
"Digestif is an OCaml library that provides implementations of hash
algorithms. Implemented hash algorithms include MD5, SHA1, SHA224, SHA256,
SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.")
(license license:expat)))
(define-public ocaml-bibtex2html
(package
(name "ocaml-bibtex2html")

View File

@ -5,6 +5,7 @@
;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2021 Andy Tai <atai@atai.org>
;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,6 +29,7 @@
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages)
@ -55,16 +57,16 @@
(define-public ocrad
(package
(name "ocrad")
(version "0.27")
(version "0.28")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/ocrad/ocrad-"
version ".tar.lz"))
(sha256
(base32
"0divffvcaim89g4pvqs8kslbcxi475bcl3b4ynphf284k9zfdgx9"))))
"0bmzpcv7sjf8f5pvd9wwh9yp6s7zqd226876g5csmbdxdmbymk1l"))))
(build-system gnu-build-system)
(native-inputs (list lzip))
(native-inputs (list libpng lzip))
(home-page "https://www.gnu.org/software/ocrad/")
(synopsis "Optical character recognition based on feature extraction")
(description
@ -73,72 +75,126 @@ feature extraction method. It can read images in PBM, PGM or PPM formats and
it produces text in 8-bit or UTF-8 formats.")
(license license:gpl3+)))
(define-public tesseract-ocr-tessdata-fast
(package
(name "tesseract-ocr-tessdata-fast")
(version "4.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tesseract-ocr/tessdata_fast")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1m310cpb87xx8l8q7jy9fvzf6a0m8rm0dmjpbiwhc2mi6w4gn084"))))
(build-system copy-build-system)
(arguments (list #:install-plan #~'(("." "share/tesseract-ocr/tessdata"))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'delete-broken-links
(lambda _
(delete-file "configs")
(delete-file "pdf.ttf"))))))
(home-page "https://github.com/tesseract-ocr/tessdata_fast")
(synopsis "Fast integer versions of trained LSTM models")
(description "This repository contains fast integer versions of trained
models for the Tesseract OCR Engine.")
(license license:asl2.0)))
(define-public tesseract-ocr
;; There are useful commits beyond the last official stable release.
(let ((commit "97079fa353557af6df86fd20b5d2e0dff5d8d5df")
(revision "1"))
(package
(name "tesseract-ocr")
(version (git-version "4.1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tesseract-ocr/tesseract")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"11137a4aaay7qp64vdjd83hz1l089nzi5a0ql0qgk8gn79pyhi98"))))
(build-system gnu-build-system)
(inputs
`(("cairo" ,cairo)
("icu" ,icu4c)
("leptonica" ,leptonica)
("pango" ,pango)
("python-wrapper" ,python-wrapper)))
(native-inputs
`(("asciidoc" ,asciidoc)
("autoconf" ,autoconf)
("automake" ,automake)
("docbook-xsl" ,docbook-xsl)
("libarchive" ,libarchive)
("libcurl" ,curl)
("libtool" ,libtool)
("libtiff" ,libtiff)
("pkg-config" ,pkg-config)
("xsltproc" ,libxslt)))
(arguments
`(#:configure-flags
(let ((leptonica (assoc-ref %build-inputs "leptonica")))
(list (string-append "LIBLEPT_HEADERSDIR=" leptonica "/include")))
#:tests? #f ; Tests currently result in a segfault
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-docbook
(lambda* (#:key inputs #:allow-other-keys)
;; Don't attempt to download XSL schema.
(substitute* "doc/Makefile.am"
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
(string-append (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl)
"/manpages/docbook.xsl")))))
(add-after 'install 'build-training
(lambda _
(invoke "make" "training")))
(add-after 'build-training 'install-training
(lambda _
(invoke "make" "training-install"))))))
(home-page "https://github.com/tesseract-ocr/tesseract")
(synopsis "Optical character recognition engine")
(description
"Tesseract is an optical character recognition (OCR) engine with very
(package
(name "tesseract-ocr")
(version "5.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tesseract-ocr/tesseract")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0dai539h07lqj8lyhznd3wbwdpqr78qrsczq78rsmsryqvmdbyaa"))))
(build-system gnu-build-system)
(arguments
(list
#:configure-flags
#~(list (string-append "LIBLEPT_HEADERSDIR="
#$(this-package-input "leptonica") "/include")
"--disable-static") ;avoid 6 MiB static archive
;; The unit tests are disabled because they require building bundled
;; third party libraries.
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'do-not-override-xml-catalog-files
(lambda _
(substitute* "configure.ac"
(("AC_SUBST\\(\\[XML_CATALOG_FILES])")
""))))
(add-after 'unpack 'adjust-TESSDATA_PREFIX-macro
(lambda _
;; Use a deeper TESSDATA_PREFIX hierarchy so that a more
;; specific search-path than '/share' can be specified. The
;; build system uses CPPFLAGS for itself, so we can't simply set
;; a make flag.
(substitute* "Makefile.am"
(("-DTESSDATA_PREFIX='\"@datadir@\"'")
"-DTESSDATA_PREFIX='\"@datadir@/tesseract-ocr\"'"))))
(add-after 'build 'build-training
(lambda* (#:key parallel-build? #:allow-other-keys)
(define n (if parallel-build? (number->string
(parallel-job-count))
"1"))
(invoke "make" "-j" n "training")))
(add-after 'install 'install-training
(lambda _
(invoke "make" "training-install")))
(add-after 'install 'install-minimal-tessdata
;; tesseract-ocr cannot be used without its trained models data;
;; install the English language as a minimal base which can be
;; extended via TESSDATA_PREFIX.
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(define eng.traineddata
"/share/tesseract-ocr/tessdata/eng.traineddata")
(install-file (search-input-file (or native-inputs inputs)
eng.traineddata)
(dirname (string-append #$output
eng.traineddata))))))))
(native-inputs
(list asciidoc
autoconf
automake
curl
docbook-xsl
libarchive
libtiff
libtool
libxml2 ;for XML_CATALOG_FILES
libxslt
pkg-config
tesseract-ocr-tessdata-fast))
(inputs
(list cairo
icu4c
leptonica
pango
python-wrapper))
(native-search-paths (list (search-path-specification
(variable "TESSDATA_PREFIX")
(files (list "share/tesseract-ocr/tessdata"))
(separator #f)))) ;single value
(home-page "https://github.com/tesseract-ocr/tesseract")
(synopsis "Optical character recognition engine")
(description
"Tesseract is an optical character recognition (OCR) engine with very
high accuracy. It supports many languages, output text formatting, hOCR
positional information and page layout analysis. Several image formats are
supported through the Leptonica library. It can also detect whether text is
monospaced or proportional.")
(license license:asl2.0))))
monospaced or proportional. Support for the English language is included by
default. To add support for more languages, the
@code{tesseract-ocr-tessdata-fast} package should be installed.")
(license license:asl2.0)))
(define-public gimagereader
(package

View File

@ -1356,6 +1356,23 @@ environments.")
;; and the fonts included in this package are licensed OFL1.1.
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public gwl/next
(let ((commit "706a0895f639ed3ed77d0fe88382f51a6638b514")
(revision "1"))
(package
(inherit gwl)
(name "gwl-next")
(version (git-version "0.5.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/gwl.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
(define-public guix-build-coordinator
(let ((commit "cc884efa7ee8a481cd3dae1b93d27454ac8dfcd2")
(revision "59"))

View File

@ -6,8 +6,8 @@ upgrade is required, but guix nulls all file dates,
and crawl would never upgrade saves.
diff -ur a/source/database.cc b/source/database.cc
--- a/source/database.cc 2018-08-09 21:49:26.000000000 -0400
+++ b/source/database.cc 2018-10-07 18:06:41.022445789 -0400
--- a/crawl-ref/source/database.cc 2018-08-09 21:49:26.000000000 -0400
+++ b/crawl-ref/source/database.cc 2018-10-07 18:06:41.022445789 -0400
@@ -24,6 +24,7 @@
#include "stringutil.h"
#include "syscalls.h"

View File

@ -0,0 +1,99 @@
From 5db4077e9f5166033637d2af9532ec6144b85646 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Thu, 30 Jun 2022 14:21:47 +0000
Subject: [PATCH 1/2] Fix behaviour of 'epoll-wake!' after 'run-fibers'.
This avoids the "epoll instance is dead" error noticed in
GNUnet-Scheme's test suite, as reported at
<https://github.com/wingo/fibers/issues/61>.
A test is added in the next commit.
This patch has been applied upstream, but there hasn't been
a new release yet at time of writing.
* fibers/epoll.scm (epoll-wake!)[dead]: Instead of throwing an error,
just return #t.
---
fibers/epoll.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fibers/epoll.scm b/fibers/epoll.scm
index d26db4d..eb63242 100644
--- a/fibers/epoll.scm
+++ b/fibers/epoll.scm
@@ -1,6 +1,7 @@
;; epoll
;;;; Copyright (C) 2016 Andy Wingo <wingo@pobox.com>
+;;;; Copyright (C) 2022 Maxime Devos <maximedevos@telenet.be>
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -135,7 +136,12 @@ epoll wait (if appropriate)."
('waiting
(primitive-epoll-wake (fileno (epoll-wake-write-pipe epoll))))
('not-waiting #t)
- ('dead (error "epoll instance is dead"))))
+ ;; This can happen if a fiber was waiting on a condition and
+ ;; run-fibers completes before the fiber completes and afterwards
+ ;; the condition is signalled. In that case, we don't have to
+ ;; resurrect the fiber or something, we can just do nothing.
+ ;; (Bug report: https://github.com/wingo/fibers/issues/61)
+ ('dead #t)))
(define (epoll-default-folder fd events seed)
(acons fd events seed))
From c01d3853eb56ea4adacc31f51f6e917f8c0abe1c Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Thu, 30 Jun 2022 14:18:36 +0000
Subject: [PATCH 2/2] Test for issue #61.
* tests/conditions.scm: Add a test.
---
tests/conditions.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/tests/conditions.scm b/tests/conditions.scm
index 505c42a..179605a 100644
--- a/tests/conditions.scm
+++ b/tests/conditions.scm
@@ -1,6 +1,7 @@
;; Fibers: cooperative, event-driven user-space threads.
;;;; Copyright (C) 2016 Free Software Foundation, Inc.
+;;;; Copyright (C) 2022 Maxime Devos <maximedevos@telenet.be>
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -21,6 +22,7 @@
#:use-module (fibers)
#:use-module (fibers conditions)
#:use-module (fibers operations)
+ #:use-module (fibers scheduler)
#:use-module (fibers timers))
(define failed? #f)
@@ -78,4 +80,22 @@
(wait cv)
#t))
+;; Make a condition, wait for it inside a fiber, let the fiber abruptly
+;; terminate and signal the condition afterwards. This tests for the bug
+;; noticed at <https://github.com/wingo/fibers/issues/61>.
+(assert-equal #t
+ (let ((cv (make-condition)))
+ (run-fibers
+ (lambda ()
+ (spawn-fiber (lambda () (wait cv)))
+ (yield-current-task)) ; let the other fiber wait forever
+ ;; This test relies on not draining -- this is the default,
+ ;; but let's make this explicit.
+ #:drain? #false ;
+ ;; For simplicity, disable concurrency and preemption.
+ ;; That way, we can use 'yield-current-task' instead of an
+ ;; arbitrary sleep time.
+ #:hz 0 #:parallelism 1)
+ (signal-condition! cv)))
+
(exit (if failed? 1 0))

View File

@ -1,26 +0,0 @@
Patch taken from the Sage packaging system.
diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h
--- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200
+++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200
@@ -43,7 +43,7 @@
//XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
template <class ttype>
Complex L_function <ttype>::
-dirichlet_series(Complex s, long long N=-1)
+dirichlet_series(Complex s, long long N)
{
Complex z=0.;
long long m,n;
diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h
--- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200
+++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200
@@ -491,7 +491,7 @@
//#include "Ldirichlet_series.h" //for computing Dirichlet series
Complex partial_dirichlet_series(Complex s, long long N1, long long N2);
- Complex dirichlet_series(Complex s, long long N);
+ Complex dirichlet_series(Complex s, long long N=-1LL);
//#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series
//void compute_taylor_series(int N, int K, Complex s_0, Complex *series);

View File

@ -1,58 +0,0 @@
Patch taken from the Sage packaging system.
--- lcalc-1.23/include/Lgamma.h 2012-08-08 23:21:55.000000000 +0200
+++ lcalc-1.23/include/Lgamma.h 2014-05-18 21:15:27.786889718 +0200
@@ -77,7 +77,7 @@
//n=0 should just give log_GAMMA(z)... thus making log_GAMMA
//code obsolete. But leave log_GAMMA intact anyways.
template <class ttype>
-precise(ttype) log_GAMMA (ttype z,int n=0)
+precise(ttype) log_GAMMA (ttype z,int n)
{
int M;
precise(ttype) log_G,r,r2,y;
@@ -230,7 +230,7 @@
//value exp_w which holds exp(-w)
//computes G(z,w), so there's an extra w^(-z) factor.
template <class ttype>
-Complex inc_GAMMA (ttype z,ttype w, const char *method="temme", ttype exp_w = 0, bool recycle=false)
+Complex inc_GAMMA (ttype z,ttype w, const char *method, ttype exp_w, bool recycle)
{
Complex G;
@@ -334,7 +334,7 @@
template <class ttype>
-ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w=0, bool recycle=false) //computes G(z,w) via continued fraction
+ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle) //computes G(z,w) via continued fraction
{
ttype G;
@@ -424,7 +424,7 @@
}
template <class ttype>
-ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w = 0, bool recycle=false) //computes G(z,w) via asymptotic series
+ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle) //computes G(z,w) via asymptotic series
{
if(my_verbose>3) cout << "called asympt_GAMMA("<<z<<","<<w<<")"<< endl;
@@ -446,7 +446,7 @@
template <class ttype>
-ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w = 0, bool recycle=false) //computes g(z,w)
+ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w, bool recycle) //computes g(z,w)
{
ttype g;
@@ -604,7 +604,7 @@
}
template <class ttype>
-Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta=1, const char *method="temme")
+Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta, const char *method)
{
Complex SUM=0;

View File

@ -1,13 +0,0 @@
Patch taken from the Sage packaging system.
--- src/include/Lcommon.h 2010-01-31 15:16:45.000000000 +0000
+++ src/include/Lcommon.h 2011-03-08 21:19:11.849443238 +0000
@@ -25,7 +25,7 @@
#ifdef USE_MPFR
inline double lcalc_to_double(const double& x) { return x; }
#endif
-//inline double lcalc_to_double(const long double& x) { return x; }
+inline double lcalc_to_double(const long double& x) { return x; }
inline double lcalc_to_double(const int& x) { return x; }
inline double lcalc_to_double(const long long& x) { return x; }
inline double lcalc_to_double(const short& x) { return x; }

View File

@ -1,43 +0,0 @@
Patch taken from the Sage packaging system.
diff --git a/include/Lcommon.h b/include/Lcommon.h
index 1b3be43..bf40532 100644
--- a/include/Lcommon.h
+++ b/include/Lcommon.h
@@ -48,7 +48,7 @@ const bool outputSeries=true; // Whether to output the coefficients or just th
// Loop i from m to n
// Useful in tidying up most for loops
-#define loop(i,m,n) for(typeof(m) i=(m); i!=(n); i++)
+#define loop(i,m,n) for(auto i=(m); i!=(n); i++)
// A class for calculations involving polynomials of small degree
// Not efficient enough for huge polynomials
diff --git a/include/Lcommon_ld.h b/include/Lcommon_ld.h
index 86ae4df..33c560c 100644
--- a/include/Lcommon_ld.h
+++ b/include/Lcommon_ld.h
@@ -53,7 +53,7 @@ const bool outputSeries=true; // Whether to output the coefficients or just th
// Loop i from m to n
// Useful in tidying up most for loops
-#define loop(i,m,n) for(typeof(m) i=(m); i!=(n); i++)
+#define loop(i,m,n) for(auto i=(m); i!=(n); i++)
// A class for calculations involving polynomials of small degree
// Not efficient enough for huge polynomials
diff --git a/include/Lglobals.h b/include/Lglobals.h
index 60002e4..ca2606c 100644
--- a/include/Lglobals.h
+++ b/include/Lglobals.h
@@ -24,9 +24,9 @@
#ifndef Lglobals_H
#define Lglobals_H
+#include <valarray>
using namespace std;
-#include <valarray>
#ifdef USE_MPFR
#include "Lgmpfrxx.h"
typedef mpfr_class Double;

View File

@ -1,92 +0,0 @@
Patch taken from the Sage packaging system.
From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001
From: Anders Skovsted Buch <asbuch@math.rutgers.edu>
Date: Sun, 29 Nov 2015 16:25:56 -0500
Subject: [PATCH] Patch by Jeroen Demeyer to change include <vector.h> to
"vector.h", plus similar cases.
---
src/lrcalc.c | 2 +-
src/maple.c | 4 ++--
src/schublib.h | 2 +-
src/symfcn.c | 6 +++---
src/symfcn.h | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/lrcalc.c b/src/lrcalc.c
index aff3f75..60df49e 100644
--- a/src/lrcalc.c
+++ b/src/lrcalc.c
@@ -8,7 +8,7 @@
#include <stdlib.h>
extern char *optarg;
-#include <vectarg.h>
+#include "vectarg.h"
#include "symfcn.h"
#include "maple.h"
diff --git a/src/maple.c b/src/maple.c
index fdc0768..a5f4d14 100644
--- a/src/maple.c
+++ b/src/maple.c
@@ -4,8 +4,8 @@
*/
#include <stdio.h>
-#include <vector.h>
-#include <hashtab.h>
+#include "vector.h"
+#include "hashtab.h"
#include "maple.h"
diff --git a/src/schublib.h b/src/schublib.h
index a8e8511..864850c 100644
--- a/src/schublib.h
+++ b/src/schublib.h
@@ -1,7 +1,7 @@
#ifndef _SCHUBLIB_H
#define _SCHUBLIB_H
-#include <hashtab.h>
+#include "hashtab.h"
hashtab *trans(vector *w, int vars, hashtab *res);
hashtab *monk(int i, hashtab *slc, int rank);
diff --git a/src/symfcn.c b/src/symfcn.c
index 4ffbe4b..fd5df5d 100644
--- a/src/symfcn.c
+++ b/src/symfcn.c
@@ -5,9 +5,9 @@
#include <stdio.h>
-#include <alloc.h>
-#include <vector.h>
-#include <hashtab.h>
+#include "alloc.h"
+#include "vector.h"
+#include "hashtab.h"
#include "symfcn.h"
diff --git a/src/symfcn.h b/src/symfcn.h
index b8543b1..29bb00d 100644
--- a/src/symfcn.h
+++ b/src/symfcn.h
@@ -1,8 +1,8 @@
#ifndef _SYMFCN_H
#define _SYMFCN_H
-#include <hashtab.h>
-#include <vector.h>
+#include "hashtab.h"
+#include "vector.h"
int part_itr_sz(vector *part);
int part_itr_sub(vector *part, vector *outer);
--
2.1.1.1.g1fb337f

View File

@ -0,0 +1,21 @@
Description: make build reproducible by sorting hash keys
cf. https://reproducible.debian.net/dbd/unstable/amd64/libclass-methodmaker-perl_2.21-1.debbindiff.html
Origin: vendor
Bug-Debian: https://bugs.debian.org/778979
Author: Chris Lamb <lamby@debian.org>
Reviewed-by: gregor herrmann <gregoa@debian.org>
Last-Update: 2015-05-02
Forwarded: https://rt.cpan.org/Ticket/Display.html?id=104163
Bug: https://rt.cpan.org/Ticket/Display.html?id=104163
--- a/lib/Class/MethodMaker/OptExt.pm
+++ b/lib/Class/MethodMaker/OptExt.pm
@@ -357,7 +357,7 @@
# -------------------------------------
-sub option_names { grep $_ ne 'DEFAULT', keys %{OPTEXT()} }
+sub option_names { grep $_ ne 'DEFAULT', sort keys %{OPTEXT()} }
sub optcode {
my $class = shift;

View File

@ -1,82 +0,0 @@
Fixes CVE-2021-4034, local privilege escalation with 'pkexec':
https://www.openwall.com/lists/oss-security/2022/01/25/11
Patch from <https://gitlab.freedesktop.org/polkit/polkit/-/commit/a2bf5c9c83b6ae46cbd5c779d3055bff81ded683>.
From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Tue, 25 Jan 2022 17:21:46 +0000
Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034)
---
src/programs/pkcheck.c | 5 +++++
src/programs/pkexec.c | 23 ++++++++++++++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c
index f1bb4e1..768525c 100644
--- a/src/programs/pkcheck.c
+++ b/src/programs/pkcheck.c
@@ -363,6 +363,11 @@ main (int argc, char *argv[])
local_agent_handle = NULL;
ret = 126;
+ if (argc < 1)
+ {
+ exit(126);
+ }
+
/* Disable remote file access from GIO. */
setenv ("GIO_USE_VFS", "local", 1);
diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
index 7698c5c..84e5ef6 100644
--- a/src/programs/pkexec.c
+++ b/src/programs/pkexec.c
@@ -488,6 +488,15 @@ main (int argc, char *argv[])
pid_t pid_of_caller;
gpointer local_agent_handle;
+
+ /*
+ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out.
+ */
+ if (argc<1)
+ {
+ exit(127);
+ }
+
ret = 127;
authority = NULL;
subject = NULL;
@@ -614,10 +623,10 @@ main (int argc, char *argv[])
path = g_strdup (pwstruct.pw_shell);
if (!path)
- {
+ {
g_printerr ("No shell configured or error retrieving pw_shell\n");
goto out;
- }
+ }
/* If you change this, be sure to change the if (!command_line)
case below too */
command_line = g_strdup (path);
@@ -636,7 +645,15 @@ main (int argc, char *argv[])
goto out;
}
g_free (path);
- argv[n] = path = s;
+ path = s;
+
+ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated.
+ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination
+ */
+ if (argv[n] != NULL)
+ {
+ argv[n] = path;
+ }
}
if (access (path, F_OK) != 0)
{

View File

@ -1,15 +0,0 @@
Even when the polkit configure script detects elogind, it does not use
it. This patch ensures that elogind is used when it is detected.
diff -ruN a/configure b/configure
--- a/configure 1969-12-31 19:00:01.000000000 -0500
+++ b/configure 2021-11-19 00:04:55.581385020 -0500
@@ -20390,7 +20390,7 @@
- if test "$have_libsystemd" = "yes"; then
+ if test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes"; then
HAVE_LIBSYSTEMD_TRUE=
HAVE_LIBSYSTEMD_FALSE='#'
else

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,43 @@
Add compatibility with newer versions of pytest.
Taken from upstream:
https://github.com/dateutil/dateutil/commit/2bdd63158b7f981fc6d70a869680451bdfd8d848
diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py
index 53081314..b32e6723 100644
--- a/dateutil/test/test_internals.py
+++ b/dateutil/test/test_internals.py
@@ -9,6 +9,7 @@
import sys
import pytest
+import warnings
from dateutil.parser._parser import _ymd
from dateutil import tz
@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
from dateutil.parser._parser import _timelex, _tzparser
from dateutil.parser._parser import _parsetz
- with pytest.warns(None) as recorder:
+ with warnings.catch_warnings():
+ warnings.simplefilter("error")
_tzparser()
- assert len(recorder) == 0
- with pytest.warns(None) as recorder:
+ with warnings.catch_warnings():
+ warnings.simplefilter("error")
_timelex('2014-03-03')
- assert len(recorder) == 0
-
- with pytest.warns(None) as recorder:
+ with warnings.catch_warnings():
+ warnings.simplefilter("error")
_parsetz('+05:00')
- assert len(recorder) == 0
@pytest.mark.tzstr

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