Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2020-03-04 23:16:17 +01:00
commit ebb7cf9e21
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
237 changed files with 18974 additions and 4698 deletions

View file

@ -122,6 +122,7 @@ MODULES = \
guix/build-system/meson.scm \ guix/build-system/meson.scm \
guix/build-system/minify.scm \ guix/build-system/minify.scm \
guix/build-system/asdf.scm \ guix/build-system/asdf.scm \
guix/build-system/copy.scm \
guix/build-system/glib-or-gtk.scm \ guix/build-system/glib-or-gtk.scm \
guix/build-system/gnu.scm \ guix/build-system/gnu.scm \
guix/build-system/guile.scm \ guix/build-system/guile.scm \
@ -169,6 +170,7 @@ MODULES = \
guix/build/go-build-system.scm \ guix/build/go-build-system.scm \
guix/build/asdf-build-system.scm \ guix/build/asdf-build-system.scm \
guix/build/bzr.scm \ guix/build/bzr.scm \
guix/build/copy-build-system.scm \
guix/build/git.scm \ guix/build/git.scm \
guix/build/hg.scm \ guix/build/hg.scm \
guix/build/glib-or-gtk-build-system.scm \ guix/build/glib-or-gtk-build-system.scm \

View file

@ -16,7 +16,7 @@ for lang in ${langs}; do
fi fi
done done
langs=`find po/doc -type f -name 'guix-cookbook*.po' \ langs=`find po/doc -type f -name 'guix-cookbook*.po' \
| sed -e 's,guix-manual\.,,' \ | sed -e 's,guix-cookbook\.,,' \
| xargs -n 1 -I{} basename {} .po` | xargs -n 1 -I{} basename {} .po`
for lang in ${langs}; do for lang in ${langs}; do
if [ ! -e "doc/guix-cookbook.${lang}.texi" ]; then if [ ! -e "doc/guix-cookbook.${lang}.texi" ]; then

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -420,6 +420,7 @@ files."
;; $GUILE_LOAD_PATH & co. ;; $GUILE_LOAD_PATH & co.
(with-clean-environment (with-clean-environment
(setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive (setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive
(setenv "COLUMNS" "120") ;show wider backtraces
(when home (when home
;; Inherit HOME so that 'xdg-directory' works. ;; Inherit HOME so that 'xdg-directory' works.
(setenv "HOME" home)) (setenv "HOME" home))

View file

@ -134,7 +134,8 @@
("lsl88" ("lsl88"
"2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC")
("mab" ("mab"
"BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"
"39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2")
("marusich" ("marusich"
"CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D")
("mbakke" ("mbakke"
@ -183,8 +184,6 @@
"77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423") "77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423")
("snape" ("snape"
"F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7") "F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7")
("snape"
"F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7")
("steap" ("steap"
"4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336") "4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336")
("taylanub" ("taylanub"
@ -192,7 +191,8 @@
;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html ;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html
("thomasd" ("thomasd"
"1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD") ;; primary: "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD"
"3D2C DA58 819C 08C2 A649 D43D 5C3B 064C 724A 5726")
("thomasd (old)" ("thomasd (old)"
"A5C5 92EA 606E 7106 A6A3 BC08 98B2 1575 91E1 2B08") "A5C5 92EA 606E 7106 A6A3 BC08 98B2 1575 91E1 2B08")

View file

@ -274,6 +274,33 @@ trigger string @code{origin...}, which can be expanded further. The
@code{origin} snippet in turn may insert other trigger strings ending on @code{origin} snippet in turn may insert other trigger strings ending on
@code{...}, which also can be expanded further. @code{...}, which also can be expanded further.
@cindex insert or update copyright
@cindex @code{M-x guix-copyright}
@cindex @code{M-x copyright-update}
Additionaly we provide insertion and automatic update of a copyright in
@file{etc/copyright.el}. You may want to set your full name, mail, and
load a file.
@lisp
(setq user-full-name "Alice Doe")
(setq user-mail-address "alice@@mail.org")
;; @r{Assuming the Guix checkout is in ~/src/guix.}
(load-file "~/src/guix/etc/copyright.el")
@end lisp
To insert a copyright at the current line invoke @code{M-x guix-copyright}.
To update a copyright you need to specify a @code{copyright-names-regexp}.
@lisp
(setq copyright-names-regexp
(format "%s <%s>" user-full-name user-mail-address))
@end lisp
You can check if your copyright is up to date by evaluating @code{M-x
copyright-update}. If you want to do it automatically after each buffer
save then add @code{(add-hook 'after-save-hook 'copyright-update)} in
Emacs.
@node Packaging Guidelines @node Packaging Guidelines
@section Packaging Guidelines @section Packaging Guidelines
@ -347,6 +374,7 @@ needed is to review and apply the patch.
* Python Modules:: A touch of British comedy. * Python Modules:: A touch of British comedy.
* Perl Modules:: Little pearls. * Perl Modules:: Little pearls.
* Java Packages:: Coffee break. * Java Packages:: Coffee break.
* Rust Crates:: Beware of oxidation.
* Fonts:: Fond of fonts. * Fonts:: Fond of fonts.
@end menu @end menu
@ -685,6 +713,40 @@ dashes and prepend the prefix @code{java-}. So the class
@code{java-apache-commons-cli}. @code{java-apache-commons-cli}.
@node Rust Crates
@subsection Rust Crates
@cindex rust
Rust programs standing for themselves are named as any other package, using the
lowercase upstream name.
To prevent namespace collisions we prefix all other Rust packages with the
@code{rust-} prefix. The name should be changed to lowercase as appropriate and
dashes should remain in place.
In the rust ecosystem it is common for multiple incompatible versions of a
package to be used at any given time, so all packages should have a versioned
suffix. If a package has passed version 1.0.0 then just the major version
number is sufficient (e.g.@: @code{rust-clap-2}), otherwise the version suffix
should contain both the major and minor version (e.g.@: @code{rust-rand-0.6}).
Because of the difficulty in reusing rust packages as pre-compiled inputs for
other packages the Cargo build system (@pxref{Build Systems,
@code{cargo-build-system}}) presents the @code{#:cargo-inputs} and
@code{cargo-development-inputs} keywords as build system arguments. It would be
helpful to think of these as similar to @code{propagated-inputs} and
@code{native-inputs}. Rust @code{dependencies} and @code{build-dependencies}
should go in @code{#:cargo-inputs}, and @code{dev-dependencies} should go in
@code{#:cargo-development-inputs}. If a Rust package links to other libraries
then the standard placement in @code{inputs} and the like should be used.
Care should be taken to ensure the correct version of dependencies are used; to
this end we try to refrain from skipping the tests or using @code{#:skip-build?}
when possible. Of course this is not always possible, as the package may be
developed for a different Operating System, depend on features from the Nightly
Rust compiler, or the test suite may have atrophied since it was released.
@node Fonts @node Fonts
@subsection Fonts @subsection Fonts

View file

@ -73,6 +73,7 @@ Copyright @copyright{} 2020 Leo Prikler@*
Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2019, 2020 Simon Tournier@*
Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Wiktor Żelazny@*
Copyright @copyright{} 2020 Damien Cassou@* Copyright @copyright{} 2020 Damien Cassou@*
Copyright @copyright{} 2020 Jakub Kądziołka@*
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or under the terms of the GNU Free Documentation License, Version 1.3 or
@ -771,11 +772,11 @@ The following dependencies are optional:
@itemize @itemize
@item @item
@c Note: We need at least 0.10.2 for 'channel-send-eof'. @c Note: We need at least 0.12.0 for 'userauth-gssapi!'.
Support for build offloading (@pxref{Daemon Offload Setup}) and Support for build offloading (@pxref{Daemon Offload Setup}) and
@command{guix copy} (@pxref{Invoking guix copy}) depends on @command{guix copy} (@pxref{Invoking guix copy}) depends on
@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH},
version 0.10.2 or later. version 0.12.0 or later.
@item @item
When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib
@ -2440,6 +2441,11 @@ your system includes the latest security updates (@pxref{Security Updates}).
Note that @command{sudo guix} runs your user's @command{guix} command and Note that @command{sudo guix} runs your user's @command{guix} command and
@emph{not} root's, because @command{sudo} leaves @code{PATH} unchanged. To @emph{not} root's, because @command{sudo} leaves @code{PATH} unchanged. To
explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}. explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}.
The difference matters here, because @command{guix pull} updates
the @command{guix} command and package definitions only for the user it is ran
as. This means that if you choose to use @command{guix system reconfigure} in
root's login shell, you'll need to @command{guix pull} separately.
@end quotation @end quotation
Join us on @code{#guix} on the Freenode IRC network or on Join us on @code{#guix} on the Freenode IRC network or on
@ -4230,7 +4236,7 @@ guix time-machine -- build hello
@end example @end example
will thus build the package @code{hello} as defined in the master branch, will thus build the package @code{hello} as defined in the master branch,
which is in general a newer revison of Guix than you have installed. which is in general a newer revision of Guix than you have installed.
Time travel works in both directions! Time travel works in both directions!
Note that @command{guix time-machine} can trigger builds of channels and Note that @command{guix time-machine} can trigger builds of channels and
@ -4958,8 +4964,10 @@ shared and will change to the user's home directory within the container
instead. See also @code{--user}. instead. See also @code{--user}.
@item --expose=@var{source}[=@var{target}] @item --expose=@var{source}[=@var{target}]
For containers, expose the file system @var{source} from the host system @itemx --share=@var{source}[=@var{target}]
as the read-only file system @var{target} within the container. If For containers, @code{--expose} (resp. @code{--share}) exposes the file
system @var{source} from the host system as the read-only
(resp. writable) file system @var{target} within the container. If
@var{target} is not specified, @var{source} is used as the target mount @var{target} is not specified, @var{source} is used as the target mount
point in the container. point in the container.
@ -4971,19 +4979,6 @@ directory:
guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile
@end example @end example
@item --share=@var{source}[=@var{target}]
For containers, share the file system @var{source} from the host system
as the writable file system @var{target} within the container. If
@var{target} is not specified, @var{source} is used as the target mount
point in the container.
The example below spawns a Guile REPL in a container in which the user's
home directory is accessible for both reading and writing via the
@file{/exchange} directory:
@example
guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile
@end example
@end table @end table
@command{guix environment} @command{guix environment}
@ -6159,6 +6154,70 @@ parameters available to cargo. It will also remove an included
if they are defined by the crate. if they are defined by the crate.
@end defvr @end defvr
@defvr {Scheme Variable} copy-build-system
@cindex (copy build system)
This variable is exported by @code{(guix build-system copy)}. It
supports builds of simple packages that don't require much compiling,
mostly just moving files around.
It adds much of the @code{gnu-build-system} packages to the set of
inputs. Because of this, the @code{copy-build-system} does not require
all the boilerplate code often needed for the
@code{trivial-build-system}.
To further simplify the file installation process, an
@code{#:install-plan} argument is exposed to let the packager specify
which files go where. The install plan is a list of @code{(@var{source}
@var{target} [@var{filters}])}. @var{filters} are optional.
@itemize
@item When @var{source} matches a file or directory without trailing slash, install it to @var{target}.
@itemize
@item If @var{target} has a trailing slash, install @var{source} basename beneath @var{target}.
@item Otherwise install @var{source} as @var{target}.
@end itemize
@item When @var{source} is a directory with a trailing slash, or when @var{filters} are used,
the trailing slash of @var{target} is implied with the same meaning
as above.
@itemize
@item Without @var{filters}, install the full @var{source} @emph{content} to @var{target}.
@item With @var{filters} among @code{#:include}, @code{#:include-regexp}, @code{#:exclude},
@code{#:exclude-regexp}, only select files are installed depending on
the filters. Each filters is specified by a list of strings.
@itemize
@item With @code{#:include}, install all the files which the path suffix matches
at least one of the elements in the given list.
@item With @code{#:include-regexp}, install all the files which the
subpaths match at least one of the regular expressions in the given
list.
@item The @code{#:exclude} and @code{#:exclude-regexp} filters
are the complement of their inclusion counterpart. Without @code{#:include} flags,
install all files but those matching the exclusion filters.
If both inclusions and exclusions are specified, the exclusions are done
on top of the inclusions.
@end itemize
@end itemize
In all cases, the paths relative to @var{source} are preserved within
@var{target}.
@end itemize
Examples:
@itemize
@item @code{("foo/bar" "share/my-app/")}: Install @file{bar} to @file{share/my-app/bar}.
@item @code{("foo/bar" "share/my-app/baz")}: Install @file{bar} to @file{share/my-app/baz}.
@item @code{("foo/" "share/my-app")}: Install the content of @file{foo} inside @file{share/my-app},
e.g., install @file{foo/sub/file} to @file{share/my-app/sub/file}.
@item @code{("foo/" "share/my-app" #:include ("sub/file"))}: Install only @file{foo/sub/file} to
@file{share/my-app/sub/file}.
@item @code{("foo/sub" "share/my-app" #:include ("file"))}: Install @file{foo/sub/file} to
@file{share/my-app/file}.
@end itemize
@end defvr
@cindex Clojure (programming language) @cindex Clojure (programming language)
@cindex simple Clojure build system @cindex simple Clojure build system
@defvr {Scheme Variable} clojure-build-system @defvr {Scheme Variable} clojure-build-system
@ -6815,9 +6874,11 @@ instruct it to listen for TCP connections (@pxref{Invoking guix-daemon,
@item ssh @item ssh
@cindex SSH access to build daemons @cindex SSH access to build daemons
These URIs allow you to connect to a remote daemon over These URIs allow you to connect to a remote daemon over SSH. This
SSH@footnote{This feature requires Guile-SSH (@pxref{Requirements}).}. feature requires Guile-SSH (@pxref{Requirements}) and a working
A typical URL might look like this: @code{guile} binary in @code{PATH} on the destination machine. It
supports public key and GSSAPI authentication. A typical URL might look
like this:
@example @example
ssh://charlie@@guix.example.org:22 ssh://charlie@@guix.example.org:22
@ -14037,7 +14098,7 @@ Each string gets on its own line. See the @code{AcceptEnv} option in
This example allows ssh-clients to export the @code{COLORTERM} variable. This example allows ssh-clients to export the @code{COLORTERM} variable.
It is set by terminal emulators, which support colors. You can use it in It is set by terminal emulators, which support colors. You can use it in
your shell's ressource file to enable colors for the prompt and commands your shell's resource file to enable colors for the prompt and commands
if this variable is set. if this variable is set.
@lisp @lisp
@ -14463,7 +14524,7 @@ Command to run when halting.
Command to run when rebooting. Command to run when rebooting.
@item @code{theme} (default "maldives") @item @code{theme} (default "maldives")
Theme to use. Default themes provided by SDDM are "elarun" or "maldives". Theme to use. Default themes provided by SDDM are "elarun", "maldives" or "maya".
@item @code{themes-directory} (default "/run/current-system/profile/share/sddm/themes") @item @code{themes-directory} (default "/run/current-system/profile/share/sddm/themes")
Directory to look for themes. Directory to look for themes.
@ -14538,7 +14599,7 @@ Relogin after logout.
@cindex X11 login @cindex X11 login
@defvr {Scheme Variable} sddm-service-type @defvr {Scheme Variable} sddm-service-type
This is the type of the service to run the This is the type of the service to run the
@uref{https://github.com/sddm/sddm,SSDM display manager}. Its value @uref{https://github.com/sddm/sddm,SDDM display manager}. Its value
must be a @code{sddm-configuration} record (see below). must be a @code{sddm-configuration} record (see below).
Here's an example use: Here's an example use:
@ -15560,7 +15621,7 @@ adding a service of type @code{mate-desktop-service-type} adds the MATE
metapackage to the system profile. ``Adding Enlightenment'' means that metapackage to the system profile. ``Adding Enlightenment'' means that
@code{dbus} is extended appropriately, and several of Enlightenment's binaries @code{dbus} is extended appropriately, and several of Enlightenment's binaries
are set as setuid, allowing Enlightenment's screen locker and other are set as setuid, allowing Enlightenment's screen locker and other
functionality to work as expetected. functionality to work as expected.
The desktop environments in Guix use the Xorg display server by The desktop environments in Guix use the Xorg display server by
default. If you'd like to use the newer display server protocol default. If you'd like to use the newer display server protocol
@ -19987,7 +20048,7 @@ The @code{ServerName} in the configuration file, used to specify the
request scheme, hostname and port that the server uses to identify request scheme, hostname and port that the server uses to identify
itself. itself.
This doesn't need to be set in the server config, and can be specifyed This doesn't need to be set in the server config, and can be specified
in virtual hosts. The default is @code{#f} to not specify a in virtual hosts. The default is @code{#f} to not specify a
@code{ServerName}. @code{ServerName}.
@ -21143,7 +21204,7 @@ false, listed actions are allowed.
@end deftp @end deftp
@deftp {Data Type} zone-entry @deftp {Data Type} zone-entry
Data type represnting a record entry in a zone file. Data type representing a record entry in a zone file.
This type has the following parameters: This type has the following parameters:
@table @asis @table @asis
@ -21266,7 +21327,7 @@ The backend to store the keys in. Can be @code{'pem} or @code{'pkcs11}.
@item @code{config} (default: @code{"/var/lib/knot/keys/keys"}) @item @code{config} (default: @code{"/var/lib/knot/keys/keys"})
The configuration string of the backend. An example for the PKCS#11 is: The configuration string of the backend. An example for the PKCS#11 is:
@code{"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so"}. @code{"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so"}.
For the pem backend, the string reprensents a path in the file system. For the pem backend, the string represents a path in the file system.
@end table @end table
@end deftp @end deftp
@ -21799,6 +21860,13 @@ Defaults to @samp{#t}.
@end deftypevr @end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} boolean fast-io?
(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to
poll/epoll/select prior to the write operation.
Defaults to @samp{#f}.
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} number verbosity @deftypevr {@code{openvpn-client-configuration} parameter} number verbosity
Verbosity level. Verbosity level.
@ -21814,6 +21882,14 @@ Defaults to @samp{#f}.
@end deftypevr @end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} maybe-string auth-user-pass
Authenticate with server using username/password. The option is a file
containing username/password on 2 lines. Do not use a file-like object as it
would be added to the store and readable by any user.
Defaults to @samp{'disabled}.
@end deftypevr
@deftypevr {@code{openvpn-client-configuration} parameter} key-usage verify-key-usage? @deftypevr {@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?
Whether to check the server certificate has server usage extension. Whether to check the server certificate has server usage extension.
@ -21935,6 +22011,13 @@ Defaults to @samp{#t}.
@end deftypevr @end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} boolean fast-io?
(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to
poll/epoll/select prior to the write operation.
Defaults to @samp{#f}.
@end deftypevr
@deftypevr {@code{openvpn-server-configuration} parameter} number verbosity @deftypevr {@code{openvpn-server-configuration} parameter} number verbosity
Verbosity level. Verbosity level.
@ -24499,7 +24582,7 @@ Defaults to @samp{"a fast webinterface for the git dscm"}.
@deftypevr {@code{cgit-configuration} parameter} string root-readme @deftypevr {@code{cgit-configuration} parameter} string root-readme
The content of the file specified with this option will be included The content of the file specified with this option will be included
verbatim below thef "about" link on the repository index page. verbatim below the "about" link on the repository index page.
Defaults to @samp{""}. Defaults to @samp{""}.
@ -25382,7 +25465,7 @@ of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}).
The optional @var{config} argument specifies the configuration for The optional @var{config} argument specifies the configuration for
@command{dicod}, which should be a @code{<dicod-configuration>} object, by @command{dicod}, which should be a @code{<dicod-configuration>} object, by
default it serves the GNU Collaborative International Dictonary of English. default it serves the GNU Collaborative International Dictionary of English.
You can add @command{open localhost} to your @file{~/.dico} file to make You can add @command{open localhost} to your @file{~/.dico} file to make
@code{localhost} the default server for @command{dico} client @code{localhost} the default server for @command{dico} client
@ -26364,7 +26447,7 @@ Switch to an existing system generation. This action atomically
switches the system profile to the specified system generation. It switches the system profile to the specified system generation. It
also rearranges the system's existing bootloader menu entries. It also rearranges the system's existing bootloader menu entries. It
makes the menu entry for the specified system generation the default, makes the menu entry for the specified system generation the default,
and it moves the entries for the other generatiors to a submenu, if and it moves the entries for the other generations to a submenu, if
supported by the bootloader being used. The next time the system supported by the bootloader being used. The next time the system
boots, it will use the specified system generation. boots, it will use the specified system generation.

View file

@ -27,7 +27,8 @@ info_TEXINFOS = %D%/guix.texi \
%D%/guix.fr.texi \ %D%/guix.fr.texi \
%D%/guix.ru.texi \ %D%/guix.ru.texi \
%D%/guix.zh_CN.texi \ %D%/guix.zh_CN.texi \
%D%/guix-cookbook.texi %D%/guix-cookbook.texi \
%D%/guix-cookbook.de.texi
%C%_guix_TEXINFOS = \ %C%_guix_TEXINFOS = \
%D%/contributing.texi \ %D%/contributing.texi \
@ -69,7 +70,8 @@ TRANSLATED_INFO = \
%D%/contributing.es.texi \ %D%/contributing.es.texi \
%D%/contributing.fr.texi \ %D%/contributing.fr.texi \
%D%/contributing.ru.texi \ %D%/contributing.ru.texi \
%D%/contributing.zh_CN.texi %D%/contributing.zh_CN.texi \
%D%/guix-cookbook.de.texi
# Bundle this file so that makeinfo finds it in out-of-source-tree builds. # Bundle this file so that makeinfo finds it in out-of-source-tree builds.
BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO)

34
etc/copyright.el Normal file
View file

@ -0,0 +1,34 @@
;;; copyright.el --- Insert a Guix copyright.
;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;; This file is part of GNU Guix.
;; GNU Guix is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Guix is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; This package provides skeleton to insert a copyright with `guix-copyright'.
;;; Code:
(define-skeleton guix-copyright
"Insert a copyright by $USER notice at cursor."
"FULL_NAME <MAIL_ADDRESS>: "
comment-start
";; Copyright © " `(format-time-string "%Y") " "
(or (format "%s <%s>" user-full-name user-mail-address) str)
comment-end)
;;; copyright.el ends here

View file

@ -5,6 +5,7 @@
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net> ;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -581,6 +582,7 @@ were found."
((string-prefix? "btrfs" type) check-btrfs-file-system) ((string-prefix? "btrfs" type) check-btrfs-file-system)
((string-suffix? "fat" type) check-fat-file-system) ((string-suffix? "fat" type) check-fat-file-system)
((string-prefix? "jfs" type) check-jfs-file-system) ((string-prefix? "jfs" type) check-jfs-file-system)
((string-prefix? "nfs" type) (const 'pass))
(else #f))) (else #f)))
(if check-procedure (if check-procedure

View file

@ -362,12 +362,12 @@ the last argument of `mknod'."
"Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is
true, mount ROOT read-only and make it an overlay with a writable tmpfs using true, mount ROOT read-only and make it an overlay with a writable tmpfs using
the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use
to mount ROOT." to mount ROOT, and behave the same as for the `mount' procedure."
(if volatile-root? (if volatile-root?
(begin (begin
(mkdir-p "/real-root") (mkdir-p "/real-root")
(mount root "/real-root" type MS_RDONLY options) (mount root "/real-root" type (logior MS_RDONLY flags) options)
(mkdir-p "/rw-root") (mkdir-p "/rw-root")
(mount "none" "/rw-root" "tmpfs") (mount "none" "/rw-root" "tmpfs")

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -204,6 +204,7 @@ MARIONETTE. Raise an error on failure."
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
(connect sock AF_INET INADDR_LOOPBACK ,port) (connect sock AF_INET INADDR_LOOPBACK ,port)
(close-port sock)
'success) 'success)
(lambda args (lambda args
(if (< i ,timeout) (if (< i ,timeout)
@ -227,6 +228,7 @@ accept connections in MARIONETTE. Raise an error on failure."
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
(connect sock AF_UNIX ,file-name) (connect sock AF_UNIX ,file-name)
(close-port sock)
'success) 'success)
(lambda args (lambda args
(if (< i ,timeout) (if (< i ,timeout)
@ -315,8 +317,8 @@ PREDICATE, whichever comes first. Raise an error when TIMEOUT is exceeded."
(#\( . "shift-9") (#\( . "shift-9")
(#\) . "shift-0") (#\) . "shift-0")
(#\/ . "slash") (#\/ . "slash")
(#\< . "less") (#\< . "shift-comma")
(#\> . "shift-less") (#\> . "shift-dot")
(#\. . "dot") (#\. . "dot")
(#\, . "comma") (#\, . "comma")
(#\; . "semicolon") (#\; . "semicolon")

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -26,6 +26,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix ui) #:use-module (guix ui)
#:use-module ((guix self) #:select (make-config.scm)) #:use-module ((guix self) #:select (make-config.scm))
#:use-module (gnu installer utils)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
@ -395,6 +396,8 @@ selected keymap."
#f))) #f)))
(const #f) (const #f)
(lambda (key . args) (lambda (key . args)
(syslog "crashing due to uncaught exception: ~s ~s~%"
key args)
(let ((error-file "/tmp/last-installer-error")) (let ((error-file "/tmp/last-installer-error"))
(call-with-output-file error-file (call-with-output-file error-file
(lambda (port) (lambda (port)

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -1070,6 +1070,8 @@ USER-PARTITION if it is encrypted, or the plain file-name otherwise."
(call-with-luks-key-file (call-with-luks-key-file
password password
(lambda (key-file) (lambda (key-file)
(syslog "formatting and opening LUKS entry ~s at ~s~%"
label file-name)
(system* "cryptsetup" "-q" "luksFormat" file-name key-file) (system* "cryptsetup" "-q" "luksFormat" file-name key-file)
(system* "cryptsetup" "open" "--type" "luks" (system* "cryptsetup" "open" "--type" "luks"
"--key-file" key-file file-name label))))) "--key-file" key-file file-name label)))))
@ -1077,6 +1079,7 @@ USER-PARTITION if it is encrypted, or the plain file-name otherwise."
(define (luks-close user-partition) (define (luks-close user-partition)
"Close the encrypted partition pointed by USER-PARTITION." "Close the encrypted partition pointed by USER-PARTITION."
(let ((label (user-partition-crypt-label user-partition))) (let ((label (user-partition-crypt-label user-partition)))
(syslog "closing LUKS entry ~s~%" label)
(system* "cryptsetup" "close" label))) (system* "cryptsetup" "close" label)))
(define (format-user-partitions user-partitions) (define (format-user-partitions user-partitions)
@ -1150,6 +1153,7 @@ respective mount-points."
(file-name (file-name
(user-partition-upper-file-name user-partition))) (user-partition-upper-file-name user-partition)))
(mkdir-p target) (mkdir-p target)
(syslog "mounting ~s on ~s~%" file-name target)
(mount file-name target mount-type))) (mount file-name target mount-type)))
sorted-partitions))) sorted-partitions)))
@ -1165,6 +1169,7 @@ respective mount-points."
(target (target
(string-append (%installer-target-dir) (string-append (%installer-target-dir)
mount-point))) mount-point)))
(syslog "unmounting ~s~%" target)
(umount target) (umount target)
(when crypt-label (when crypt-label
(luks-close user-partition)))) (luks-close user-partition))))

View file

@ -177,6 +177,7 @@ return the accumalated result so far."
#:done-steps '()))))) #:done-steps '())))))
((installer-step-break? c) ((installer-step-break? c)
(reverse result))) (reverse result)))
(syslog "running step '~a'~%" (installer-step-id step))
(let* ((id (installer-step-id step)) (let* ((id (installer-step-id step))
(compute (installer-step-compute step)) (compute (installer-step-compute step))
(res (compute result done-steps))) (res (compute result done-steps)))

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,12 +24,16 @@
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (ice-9 rdelim) #:use-module (ice-9 rdelim)
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
#:use-module (ice-9 format)
#:use-module (ice-9 textual-ports) #:use-module (ice-9 textual-ports)
#:export (read-lines #:export (read-lines
read-all read-all
nearest-exact-integer nearest-exact-integer
read-percentage read-percentage
run-shell-command)) run-shell-command
syslog-port
syslog))
(define* (read-lines #:optional (port (current-input-port))) (define* (read-lines #:optional (port (current-input-port)))
"Read lines from PORT and return them as a list." "Read lines from PORT and return them as a list."
@ -85,9 +89,48 @@ COMMAND exited successfully, #f otherwise."
(format (current-error-port) (format (current-error-port)
(G_ "Command failed with exit code ~a.~%") (G_ "Command failed with exit code ~a.~%")
(invoke-error-exit-status c)) (invoke-error-exit-status c))
(syslog "command ~s failed with exit code ~a"
command (invoke-error-exit-status c))
(pause) (pause)
#f)) #f))
(syslog "running command ~s~%" command)
(invoke "bash" "--init-file" file) (invoke "bash" "--init-file" file)
(syslog "command ~s succeeded~%" command)
(newline) (newline)
(pause) (pause)
#t)))) #t))))
;;;
;;; Logging.
;;;
(define (open-syslog-port)
"Return an open port (a socket) to /dev/log or #f if that wasn't possible."
(let ((sock (socket AF_UNIX SOCK_DGRAM 0)))
(catch 'system-error
(lambda ()
(connect sock AF_UNIX "/dev/log")
(setvbuf sock 'line)
sock)
(lambda args
(close-port sock)
#f))))
(define syslog-port
(let ((port #f))
(lambda ()
"Return an output port to syslog."
(unless port
(set! port (open-syslog-port)))
(or port (%make-void-port "w")))))
(define-syntax syslog
(lambda (s)
"Like 'format', but write to syslog."
(syntax-case s ()
((_ fmt args ...)
(string? (syntax->datum #'fmt))
(with-syntax ((fmt (string-append "installer[~d]: "
(syntax->datum #'fmt))))
#'(format (syslog-port) fmt (getpid) args ...))))))

View file

@ -622,6 +622,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests.scm \ %D%/tests.scm \
%D%/tests/audio.scm \ %D%/tests/audio.scm \
%D%/tests/base.scm \ %D%/tests/base.scm \
%D%/tests/cups.scm \
%D%/tests/databases.scm \ %D%/tests/databases.scm \
%D%/tests/desktop.scm \ %D%/tests/desktop.scm \
%D%/tests/dict.scm \ %D%/tests/dict.scm \
@ -719,7 +720,6 @@ dist_patch_DATA = \
%D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
%D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
%D%/packages/patches/appstream-glib-2020.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \ %D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \
@ -771,11 +771,8 @@ dist_patch_DATA = \
%D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \
%D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdparanoia-fpic.patch \
%D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
%D%/packages/patches/ceph-boost-compat.patch \
%D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \
%D%/packages/patches/ceph-volume-respect-PATH.patch \
%D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/choqok-Fix-building-under-Qt-5.13.patch \
%D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \
%D%/packages/patches/clamav-system-tomsfastmath.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \
%D%/packages/patches/clang-3.5-libc-search-path.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \
@ -783,6 +780,7 @@ dist_patch_DATA = \
%D%/packages/patches/clang-3.8-libc-search-path.patch \ %D%/packages/patches/clang-3.8-libc-search-path.patch \
%D%/packages/patches/clang-6.0-libc-search-path.patch \ %D%/packages/patches/clang-6.0-libc-search-path.patch \
%D%/packages/patches/clang-7.0-libc-search-path.patch \ %D%/packages/patches/clang-7.0-libc-search-path.patch \
%D%/packages/patches/clang-9.0-libc-search-path.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \
%D%/packages/patches/classpath-aarch64-support.patch \ %D%/packages/patches/classpath-aarch64-support.patch \
@ -795,6 +793,7 @@ dist_patch_DATA = \
%D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/coda-use-system-libs.patch \
%D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \
%D%/packages/patches/combinatorial-blas-io-fix.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \
%D%/packages/patches/containerd-test-with-go1.13.patch \
%D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \
%D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \
@ -814,6 +813,8 @@ dist_patch_DATA = \
%D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/desmume-gcc6-fixes.patch \
%D%/packages/patches/desmume-gcc7-fixes.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \
%D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \
@ -1102,7 +1103,6 @@ dist_patch_DATA = \
%D%/packages/patches/libexif-CVE-2018-20030.patch \ %D%/packages/patches/libexif-CVE-2018-20030.patch \
%D%/packages/patches/libextractor-exiv2.patch \ %D%/packages/patches/libextractor-exiv2.patch \
%D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \
%D%/packages/patches/libgit2-avoid-python.patch \
%D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgit2-mtime-0.patch \
%D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnome-encoding.patch \
%D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libgnomeui-utf8.patch \
@ -1357,6 +1357,7 @@ dist_patch_DATA = \
%D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \
%D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \
%D%/packages/patches/qtbase-QTBUG-81715.patch \
%D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quagga-reproducible-build.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \
@ -1468,7 +1469,6 @@ dist_patch_DATA = \
%D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \
%D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/util-linux-tests.patch \
%D%/packages/patches/upower-builddir.patch \ %D%/packages/patches/upower-builddir.patch \
%D%/packages/patches/upx-fix-CVE-2017-15056.patch \
%D%/packages/patches/valgrind-enable-arm.patch \ %D%/packages/patches/valgrind-enable-arm.patch \
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
@ -1514,7 +1514,9 @@ dist_patch_DATA = \
%D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \
%D%/packages/patches/xsane-support-ipv6.patch \ %D%/packages/patches/xsane-support-ipv6.patch \
%D%/packages/patches/xsane-tighten-default-umask.patch %D%/packages/patches/xsane-tighten-default-umask.patch \
%D%/packages/patches/zziplib-CVE-2018-16548.patch
MISC_DISTRO_FILES = \ MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in %D%/packages/ld-wrapper.in \
%D%/packages/ld-wrapper-next.in

View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -29,7 +30,7 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://www.brain-dump.org/projects/abduco/abduco-" "https://www.brain-dump.org/projects/abduco/abduco-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
@ -45,5 +46,5 @@
(description "abduco provides session management i.e. it allows programs to (description "abduco provides session management i.e. it allows programs to
be run independently from their controlling terminal. That is, programs can be run independently from their controlling terminal. That is, programs can
be detached---run in the background---and then later reattached.") be detached---run in the background---and then later reattached.")
(home-page "http://www.brain-dump.org/projects/abduco/") (home-page "https://www.brain-dump.org/projects/abduco/")
(license isc))) (license isc)))

View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -35,7 +36,7 @@
(base32 (base32
"0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac")))) "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://gnu.org/software/acct/") (home-page "https://www.gnu.org/software/acct/")
(synopsis "Standard login and process accounting utilities") (synopsis "Standard login and process accounting utilities")
(description (description
"GNU acct provides a means for system administrators to determine "GNU acct provides a means for system administrators to determine

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015, 2016, 2018, 2019 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2018, 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org>
@ -24,7 +24,7 @@
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2019,2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
@ -196,14 +196,14 @@ and provides a \"top-like\" mode (monitoring).")
(define-public shepherd (define-public shepherd
(package (package
(name "shepherd") (name "shepherd")
(version "0.6.1") (version "0.7.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-" (uri (string-append "mirror://gnu/shepherd/shepherd-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1xn6mb5bh8bpfgdrh09ja31jk0ln7bmxbbf0vjcqxkkixs2wl6sk")))) "07j3vd0y8zab2nwbrwj0ahrfif1ldm5sjssn7m3dw4s307fsrfzx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--localstatedir=/var"))) '(#:configure-flags '("--localstatedir=/var")))
@ -228,6 +228,16 @@ interface and is based on GNU Guile.")
(license license:gpl3+) (license license:gpl3+)
(home-page "https://www.gnu.org/software/shepherd/"))) (home-page "https://www.gnu.org/software/shepherd/")))
(define-public guile3.0-shepherd
(package
(inherit shepherd)
(name "guile3.0-shepherd")
(native-inputs
`(("pkg-config" ,pkg-config)
("guile" ,guile-next)))
(inputs
`(("guile" ,guile-next)))))
(define-public cloud-utils (define-public cloud-utils
(package (package
(name "cloud-utils") (name "cloud-utils")
@ -405,7 +415,7 @@ application (for console or X terminals) and requires ncurses.")
(("\"/bin/sh\"") (("\"/bin/sh\"")
(string-append "\"" bash "/bin/sh\""))) (string-append "\"" bash "/bin/sh\"")))
#t)))))) #t))))))
(home-page "https://www.gnu.org/software/pies/") (home-page "https://www.gnu.org.ua/software/pies/")
(synopsis "Program invocation and execution supervisor") (synopsis "Program invocation and execution supervisor")
(description (description
"GNU pies is a program that supervises the invocation and execution of "GNU pies is a program that supervises the invocation and execution of
@ -1571,7 +1581,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica (define-public acpica
(package (package
(name "acpica") (name "acpica")
(version "20200110") (version "20200214")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1579,7 +1589,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1hb4g6r7w8s4bhlkk36fmb4qxghnrwvad7f18cpn6zz0b4sjs7za")))) "0jdasziq184l3iqyp5vhrsbi6g89n10wr0ssliiz0xi3dqwsxcqk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("flex" ,flex) (native-inputs `(("flex" ,flex)
("bison" ,bison))) ("bison" ,bison)))
@ -1774,7 +1784,7 @@ environment variable is set and output is to tty.")
(string-append "SHELL=" bash "/bin/sh"))) (string-append "SHELL=" bash "/bin/sh")))
#t)))))) #t))))))
(home-page "https://www.gnu.org/software/direvent/") (home-page "https://www.gnu.org.ua/software/direvent/")
(synopsis "Daemon to monitor directories for events such as file removal") (synopsis "Daemon to monitor directories for events such as file removal")
(description (description
"A daemon that monitors directories for events, such as creating, "A daemon that monitors directories for events, such as creating,
@ -1905,13 +1915,13 @@ of supported upstream metrics systems simultaneously.")
(define-public ansible (define-public ansible
(package (package
(name "ansible") (name "ansible")
(version "2.8.5") (version "2.9.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ansible" version)) (uri (pypi-uri "ansible" version))
(sha256 (sha256
(base32 "11k94ifp42psivzx147xwbmq1ak7qnjdgkb6c1xz53nfapkh754f")))) (base32 "19fav6rs58zdc3gfhh1lxhki36jn4252183rrd769sv46b9m1bji"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-bcrypt" ,python-bcrypt) `(("python-bcrypt" ,python-bcrypt)
@ -2230,7 +2240,7 @@ displays a table of current bandwidth usage by pairs of hosts.")
(define-public munge (define-public munge
(package (package
(name "munge") (name "munge")
(version "0.5.13") (version "0.5.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/dun/munge/releases/" (uri (string-append "https://github.com/dun/munge/releases/"
@ -2238,20 +2248,45 @@ displays a table of current bandwidth usage by pairs of hosts.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1nj486bbg1adfg298zck96vgx57kchcypc1zdz1n7w540vyksxcr")) "0h06sghb4rqvv1ywyd6mzsmbcgh712v6ygrff0gzm440y4ca41k6"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Don't insist on write access to /var. ;; Don't insist on write access to /var.
(substitute* "src/etc/Makefile.in" (substitute* "src/etc/Makefile.in"
(("\\$\\(INSTALL\\)(.*)localstatedir" _ middle) (("\\$\\(INSTALL\\)(.*)localstatedir" _ middle)
(string-append "-$(INSTALL)" middle "localstatedir"))) (string-append "-$(INSTALL)" middle "localstatedir"))
(("\\$\\(MKDIR_P\\) .*(local|run)statedir.*")
""))
#t)))) #t))))
(inputs (inputs
`(("openssl" ,openssl) `(("openssl" ,openssl)
("libgcrypt" ,libgcrypt))) ("libgcrypt" ,libgcrypt)))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:configure-flags '("--localstatedir=/var"))) (arguments
'(#:configure-flags
(list "--localstatedir=/var"
(string-append "--with-pkgconfigdir="
(assoc-ref %outputs "out") "/lib/pkgconfig"))
#:phases
(modify-phases %standard-phases
;; XXX Many test series fail. Some might be fixable, others do no-no
;; things like invoking sudo.
(add-after 'unpack 'skip-failing-tests
(lambda _
(for-each (lambda (test)
(substitute* "t/Makefile.in"
(((string-append test "\\.t ")) "")))
(list "0100-munged-lock"
"0010-basic"
"0011-munged-cmdline"
"0012-munge-cmdline"
"0013-unmunge-cmdline"
"0101-munged-security-socket"
"0102-munged-security-keyfile"
"0103-munged-security-logfile"
"0110-munged-origin-addr"))
#t)))))
(home-page "https://dun.github.io/munge/") (home-page "https://dun.github.io/munge/")
(synopsis "Cluster computing authentication service") (synopsis "Cluster computing authentication service")
(description (description
@ -2500,7 +2535,7 @@ a new command using the matched rule, and runs it.")
(setenv "prefix" (assoc-ref outputs "out")) (setenv "prefix" (assoc-ref outputs "out"))
#t))) #t)))
#:make-flags (list "--environment-overrides"))) #:make-flags (list "--environment-overrides")))
(home-page "https://www.gentoo.com/di/") (home-page "https://gentoo.com/di/")
(synopsis "Advanced df like disk information utility") (synopsis "Advanced df like disk information utility")
(description (description
"@code{di} is a disk information utility, displaying everything that your "@code{di} is a disk information utility, displaying everything that your
@ -2840,14 +2875,14 @@ Intel DRM Driver.")
(define-public fabric (define-public fabric
(package (package
(name "fabric") (name "fabric")
(version "1.14.0") (version "1.14.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Fabric" version)) (uri (pypi-uri "Fabric" version))
(sha256 (sha256
(base32 (base32
"13r0b0hllgf8j9rh6x1knmbgvingbdmx046aazv6vck2ll120mw1")))) "1a3ndlpdw6bhn8fcw1jgznl117a8pnr84az9rb5fwnrypf1ph2b6"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 ; Python 2 only `(#:python ,python-2 ; Python 2 only
@ -2871,7 +2906,7 @@ Intel DRM Driver.")
("python2-bcrypt" ,python2-bcrypt))) ("python2-bcrypt" ,python2-bcrypt)))
(propagated-inputs (propagated-inputs
`(("python2-paramiko" ,python2-paramiko))) `(("python2-paramiko" ,python2-paramiko)))
(home-page "http://fabfile.org") (home-page "https://www.fabfile.org/")
(synopsis "Simple Pythonic remote execution and deployment tool") (synopsis "Simple Pythonic remote execution and deployment tool")
(description (description
"Fabric is designed to upload files and run shell commands on a number of "Fabric is designed to upload files and run shell commands on a number of
@ -3320,14 +3355,14 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
(define-public python-pyudev (define-public python-pyudev
(package (package
(name "python-pyudev") (name "python-pyudev")
(version "0.21.0") (version "0.22.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyudev" version)) (uri (pypi-uri "pyudev" version))
(sha256 (sha256
(base32 (base32
"0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9")))) "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; Tests require /sys `(#:tests? #f ; Tests require /sys
@ -3353,7 +3388,7 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
("python-mock" ,python-mock) ("python-mock" ,python-mock)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-sphinx" ,python-sphinx))) ("python-sphinx" ,python-sphinx)))
(home-page "http://pyudev.readthedocs.org/") (home-page "https://pyudev.readthedocs.io/")
(synopsis "Python udev binding") (synopsis "Python udev binding")
(description "This package provides @code{udev} bindings for Python.") (description "This package provides @code{udev} bindings for Python.")
(license license:lgpl2.1))) (license license:lgpl2.1)))

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
@ -92,7 +92,7 @@ implement the floating point approach to complex multiplication are
implemented. On the other hand, these comprise asymptotically fast implemented. On the other hand, these comprise asymptotically fast
multiplication routines such as ToomCook and the FFT.") multiplication routines such as ToomCook and the FFT.")
(license license:lgpl3+) (license license:lgpl3+)
(home-page "http://mpfrcx.multiprecision.org/"))) (home-page "http://www.multiprecision.org/mpfrcx/")))
(define-public gf2x (define-public gf2x
(package (package
@ -141,7 +141,7 @@ multiplication via floating point approximations. It consists of libraries
that can be called from within a C program and of executable command that can be called from within a C program and of executable command
line applications.") line applications.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://cm.multiprecision.org/"))) (home-page "http://www.multiprecision.org/cm/")))
(define-public fplll (define-public fplll
(package (package
@ -346,19 +346,19 @@ precision.")
(define-public giac (define-public giac
(package (package
(name "giac") (name "giac")
(version "1.5.0-85") (version "1.5.0-87")
(source (origin (source
(method url-fetch) (origin
;; "~parisse/giac" is not used because the maintainer regularly (method url-fetch)
;; overwrites the release tarball there, introducing a checksum ;; "~parisse/giac" is not used because the maintainer regularly
;; mismatch every time. See ;; overwrites the release tarball there, introducing a checksum
;; <https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/README> ;; mismatch every time. See
(uri (string-append "https://www-fourier.ujf-grenoble.fr/" ;; <https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/README>
"~parisse/debian/dists/stable/main/" (uri (string-append "https://www-fourier.ujf-grenoble.fr/"
"source/giac_" version ".tar.gz")) "~parisse/debian/dists/stable/main/source/"
(sha256 "giac_" version ".tar.gz"))
(base32 (sha256
"03icgrfhb1xiy95cqmfgmcb1lw3775mr2ybnzandmyn44iycs6rh")))) (base32 "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
@ -1481,7 +1481,7 @@ cohomology ring of a Grassmann variety. The software package also includes
a program that performs fast computation of the more general multiplicative a program that performs fast computation of the more general multiplicative
structure constants of Schubert polynomials.") structure constants of Schubert polynomials.")
(license license:gpl2+) (license license:gpl2+)
(home-page "http://sites.math.rutgers.edu/~asbuch/lrcalc/"))) (home-page "https://sites.math.rutgers.edu/~asbuch/lrcalc/")))
(define-public iml (define-public iml
(package (package

View file

@ -9,6 +9,7 @@
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -716,7 +717,7 @@ to be passed to the @code{udev} service.")
(define-public git-repo (define-public git-repo
(package (package
(name "git-repo") (name "git-repo")
(version "1.12.37") (version "2.4.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -725,61 +726,66 @@ to be passed to the @code{udev} service.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append "git-repo-" version "-checkout")) (file-name (string-append "git-repo-" version "-checkout"))
(sha256 (sha256
(base32 "0qp7jqhblv7xblfgpcq4n18dyjdv8shz7r60c3vnjxx2fngkj2jd")))) (base32 "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 ; code says: "Python 3 support is … experimental." `(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'set-executable-paths (add-before 'build 'set-executable-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(git (assoc-ref inputs "git")) (git (assoc-ref inputs "git"))
(gpg (assoc-ref inputs "gnupg"))
(ssh (assoc-ref inputs "ssh"))) (ssh (assoc-ref inputs "ssh")))
(substitute* '("repo" "git_command.py") (substitute* '("repo" "git_command.py")
(("^GIT = 'git' ") (("^GIT = 'git'")
(string-append "GIT = '" git "/bin/git' "))) (string-append "GIT = '" git "/bin/git'")))
(substitute* "repo"
((" cmd = \\['gpg',")
(string-append " cmd = ['" gpg "/bin/gpg',")))
(substitute* "git_config.py" (substitute* "git_config.py"
((" command_base = \\['ssh',") ((" command_base = \\['ssh',")
(string-append " command_base = ['" ssh "/bin/ssh',"))) (string-append " command_base = ['" ssh "/bin/ssh',")))
#t))) #t)))
(add-before 'build 'do-not-clone-this-source (add-before 'build 'do-not-self-update
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) ;; Setting the REPO_MAIN variable to an absolute file name is
(repo-dir (string-append out "/share/" ,name))) ;; enough to have _FindRepo return the store main.py file. The
(substitute* "repo" ;; self update mechanism is activated with the call to _Init() in
(("^def _FindRepo\\(\\):.*") ;; main(), so we bypass it.
(format #f "
def _FindRepo():
'''Look for a repo installation, starting at the current directory.'''
# Use the installed version of git-repo.
repo_main = '~a/main.py'
curdir = os.getcwd()
olddir = None
while curdir != '/' and curdir != olddir:
dot_repo = os.path.join(curdir, repodir)
if os.path.isdir(dot_repo):
return (repo_main, dot_repo)
else:
olddir = curdir
curdir = os.path.dirname(curdir)
return None, ''
# The remaining of this function is dead code. It was used to ;; Ticket requesting upstream to provide a mean to disable the
# find a git-checked-out version in the local project.\n" repo-dir)) ;; self update mechanism:
;; Neither clone, check out, nor verify the git repository ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=12407.
(("(^\\s+)_Clone\\(.*\\)") "") (let* ((out (assoc-ref outputs "out"))
(("(^\\s+)_Checkout\\(.*\\)") "") (repo-main (string-append out "/share/git-repo/main.py")))
((" rev = _Verify\\(.*\\)") " rev = None")) (substitute* "repo"
#t))) (("^REPO_MAIN = .*")
(format #f "REPO_MAIN = ~s~%" repo-main))
((" _Init\\(args, gitc_init=\\(cmd ==.*" all)
(string-append "True #" all)))
;; Prevent repo from trying to git describe its version from
;; the (disabled) self updated copy.
(substitute* "git_command.py"
(("ver = getattr\\(RepoSourceVersion.*")
(format #f "ver = ~s~%" ,version)))
(substitute* "subcmds/version.py"
(("rp_ver = .*")
(format #f "rp_ver = ~s~%" ,version)))
;; Prevent repo from adding its (disabled) self update copy to
;; the list of projects to fetch when using 'repo sync'.
(substitute* "subcmds/sync.py"
(("to_fetch\\.extend\\(all_projects\\).*" all)
(string-append "#" all))
(("self\\._Fetch\\(to_fetch")
"self._Fetch(all_projects")
(("_PostRepoFetch\\(rp, opt\\.repo_verify).*" all)
(string-append "#" all))))))
(delete 'build) ; nothing to build (delete 'build) ; nothing to build
(add-before 'check 'configure-git
(lambda _
(setenv "HOME" (getcwd))
(invoke "git" "config" "--global" "user.email" "you@example.com")
(invoke "git" "config" "--global" "user.name" "Your Name")))
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "python" "-m" "nose"))) (invoke "./run_tests")))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -795,10 +801,9 @@ def _FindRepo():
(inputs (inputs
;; TODO: Add git-remote-persistent-https once it is available in guix ;; TODO: Add git-remote-persistent-https once it is available in guix
`(("git" ,git) `(("git" ,git)
("gnupg" ,gnupg)
("ssh" ,openssh))) ("ssh" ,openssh)))
(native-inputs (native-inputs
`(("nose" ,python2-nose))) `(("pytest" ,python-pytest)))
(home-page "https://code.google.com/p/git-repo/") (home-page "https://code.google.com/p/git-repo/")
(synopsis "Helps to manage many Git repositories.") (synopsis "Helps to manage many Git repositories.")
(description "Repo is a tool built on top of Git. Repo helps manage many (description "Repo is a tool built on top of Git. Repo helps manage many

View file

@ -49,7 +49,7 @@
(lambda _ (lambda _
(with-directory-excursion "test" (with-directory-excursion "test"
(invoke "./anthy" "--all"))))))) (invoke "./anthy" "--all")))))))
(home-page "http://anthy.osdn.jp/") (home-page "https://anthy.osdn.jp/")
(synopsis "Japanese input method") (synopsis "Japanese input method")
(description "Anthy is a Japanese input method for converting (description "Anthy is a Japanese input method for converting
hiragana text to mixed kana and kanji. It is written in the C hiragana text to mixed kana and kanji. It is written in the C

View file

@ -174,11 +174,10 @@ dictionaries, including personal ones.")
(define-public aspell-dict-da (define-public aspell-dict-da
(aspell-dictionary "da" "Danish" (aspell-dictionary "da" "Danish"
#:version "1.4.42-1" #:version "1.6.36-11-0"
#:prefix "aspell5-"
#:sha256 #:sha256
(base32 (base32
"1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"))) "1xz2haayvwlxgss9jf1x2311a1ixbk75q2vgfprjhibsmb7cpinv")))
(define-public aspell-dict-el (define-public aspell-dict-el
(aspell-dictionary "el" "Greek" (aspell-dictionary "el" "Greek"

View file

@ -148,14 +148,14 @@ to the clients.")
(define-public fasm (define-public fasm
(package (package
(name "fasm") (name "fasm")
(version "1.73.21") (version "1.73.22")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://flatassembler.net/fasm-" (uri (string-append "https://flatassembler.net/fasm-"
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 "143zh7x3q0r2kclshh8n5w4i5pw4lh60si7rspvc725xxjpjkvcv")))) (base32 "1pb0rcfdsb0h89khjjrbikz5wjdllavj3ajim0rcyh7x12xr1hw5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests exist `(#:tests? #f ; no tests exist
@ -232,7 +232,7 @@ assembler, a C compiler and a linker. The assembler uses Intel syntax
(uri (git-reference (uri (git-reference
(url "https://git.savannah.gnu.org/r/libjit.git") (url "https://git.savannah.gnu.org/r/libjit.git")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0p6wklslkkp3s4aisj3w5a53bagqn5fy4m6088ppd4fcfxgqkrcd")))) "0p6wklslkkp3s4aisj3w5a53bagqn5fy4m6088ppd4fcfxgqkrcd"))))

View file

@ -322,7 +322,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }"))
("itstool" ,itstool) ("itstool" ,itstool)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://ardour.org") (home-page "https://ardour.org")
(synopsis "Digital audio workstation") (synopsis "Digital audio workstation")
(description (description
"Ardour is a multi-channel digital audio workstation, allowing users to "Ardour is a multi-channel digital audio workstation, allowing users to
@ -1193,7 +1193,7 @@ follower.")
(define-public fluidsynth (define-public fluidsynth
(package (package
(name "fluidsynth") (name "fluidsynth")
(version "2.1.0") (version "2.1.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1202,7 +1202,7 @@ follower.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0jhla1641rx77va4b6n4shn8srj87rpwvp170byj1bg8z8g89ji1")))) "09jq04hrasidf6b5gkk4aba13fq55z3bmn7bq35rdaikz26xiij4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
@ -1812,14 +1812,14 @@ essential distortions.")
(define-public liblo (define-public liblo
(package (package
(name "liblo") (name "liblo")
(version "0.30") (version "0.31")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/liblo/liblo/" version (uri (string-append "mirror://sourceforge/liblo/liblo/" version
"/liblo-" version ".tar.gz")) "/liblo-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh")))) "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; liblo test FAILED `(;; liblo test FAILED
@ -1988,7 +1988,7 @@ software.")
(list (search-path-specification (list (search-path-specification
(variable "LV2_PATH") (variable "LV2_PATH")
(files '("lib/lv2"))))) (files '("lib/lv2")))))
(home-page "http://elephly.net/lv2/mdapiano.html") (home-page "https://elephly.net/lv2/mdapiano.html")
(synopsis "LV2 port of the mda Piano plugin") (synopsis "LV2 port of the mda Piano plugin")
(description "An LV2 port of the mda Piano VSTi.") (description "An LV2 port of the mda Piano VSTi.")
(license license:gpl3+))) (license license:gpl3+)))
@ -2002,7 +2002,7 @@ software.")
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases (modify-phases %standard-phases (delete 'configure)))) #:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "http://elephly.net/lv2/mdaepiano.html") (home-page "https://elephly.net/lv2/mdaepiano.html")
(synopsis "LV2 port of the mda EPiano plugin") (synopsis "LV2 port of the mda EPiano plugin")
(description "An LV2 port of the mda EPiano VSTi."))) (description "An LV2 port of the mda EPiano VSTi.")))
@ -3391,7 +3391,7 @@ code, used in @code{libtoxcore}.")
`(#:tests? #f)) ; tests require access to ALSA devices. `(#:tests? #f)) ; tests require access to ALSA devices.
(inputs (inputs
`(("alsa-lib" ,alsa-lib))) `(("alsa-lib" ,alsa-lib)))
(home-page "http://larsimmisch.github.io/pyalsaaudio/") (home-page "https://larsimmisch.github.io/pyalsaaudio/")
(synopsis "ALSA wrappers for Python") (synopsis "ALSA wrappers for Python")
(description (description
"This package contains wrappers for accessing the ALSA API from Python. "This package contains wrappers for accessing the ALSA API from Python.
@ -3516,7 +3516,7 @@ the Snd sources), Ruby, or Forth.")
(define-public noise-repellent (define-public noise-repellent
(package (package
(name "noise-repellent") (name "noise-repellent")
(version "0.1.4") (version "0.1.5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3525,16 +3525,12 @@ the Snd sources), Ruby, or Forth.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0rd3dlmk3vivjmcr6x2x860y0j1d49c2j95j6ny50v184mwvn11j")))) "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl"))))
(build-system gnu-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:make-flags `(#:configure-flags
(list "CC=gcc" (list (string-append "--prefix=" (assoc-ref %outputs "out")
(string-append "PREFIX=" (assoc-ref %outputs "out"))) "/lib/lv2"))))
#:tests? #f ; there are none
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(inputs (inputs
`(("lv2" ,lv2) `(("lv2" ,lv2)
("fftwf" ,fftwf))) ("fftwf" ,fftwf)))

View file

@ -61,8 +61,7 @@
;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It ;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It
;; should use our own "cpp" instead of "/lib/cpp". ;; should use our own "cpp" instead of "/lib/cpp".
(arguments `(#:tests? #f)) (arguments `(#:tests? #f))
(home-page (home-page "https://www.gnu.org/software/autoconf/")
"http://www.gnu.org/software/autoconf/")
(synopsis "Create source code configuration scripts") (synopsis "Create source code configuration scripts")
(description (description
"Autoconf offers the developer a robust set of M4 macros which expand "Autoconf offers the developer a robust set of M4 macros which expand

View file

@ -35,8 +35,9 @@
"Return a list of Emacs 'autoloads' files in DIRECTORY. "Return a list of Emacs 'autoloads' files in DIRECTORY.
The files in the list do not have extensions (.el, .elc)." The files in the list do not have extensions (.el, .elc)."
;; `directory-files' doesn't honor group in regexp. ;; `directory-files' doesn't honor group in regexp.
(mapcar #'file-name-sans-extension (delete-dups (mapcar #'file-name-sans-extension
(directory-files directory 'full-name guix-emacs-autoloads-regexp))) (directory-files directory 'full-name
guix-emacs-autoloads-regexp))))
;;;###autoload ;;;###autoload
(defun guix-emacs-autoload-packages () (defun guix-emacs-autoload-packages ()

View file

@ -63,7 +63,16 @@
`(delete "--disable-multilib" ,flags)))) `(delete "--disable-multilib" ,flags))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "CROSS_CPATH") (variable "CROSS_C_INCLUDE_PATH")
(files '("avr/include")))
(search-path-specification
(variable "CROSS_CPLUS_INCLUDE_PATH")
(files '("avr/include")))
(search-path-specification
(variable "CROSS_OBJC_INCLUDE_PATH")
(files '("avr/include")))
(search-path-specification
(variable "CROSS_OBJCPLUS_INCLUDE_PATH")
(files '("avr/include"))) (files '("avr/include")))
(search-path-specification (search-path-specification
(variable "CROSS_LIBRARY_PATH") (variable "CROSS_LIBRARY_PATH")
@ -76,7 +85,10 @@
(package (package
(inherit avr-gcc-4.9) (inherit avr-gcc-4.9)
(version (package-version gcc-5)) (version (package-version gcc-5))
(source (package-source gcc-5)))) (source (origin
(inherit (package-source gcc-5))
(patches (append (origin-patches (package-source gcc-5))
(search-patches "gcc-cross-environment-variables.patch")))))))
(define (avr-libc avr-gcc) (define (avr-libc avr-gcc)
(package (package

View file

@ -462,7 +462,7 @@ rdiff-backup is easy to use and settings have sensible defaults.")
(inputs (inputs
`(("perl" ,perl) `(("perl" ,perl)
("rsync" ,rsync))) ("rsync" ,rsync)))
(home-page "http://rsnapshot.org") (home-page "https://rsnapshot.org")
(synopsis "Deduplicating snapshot backup utility based on rsync") (synopsis "Deduplicating snapshot backup utility based on rsync")
(description "rsnapshot is a file system snapshot utility based on rsync. (description "rsnapshot is a file system snapshot utility based on rsync.
rsnapshot makes it easy to make periodic snapshots of local machines, and rsnapshot makes it easy to make periodic snapshots of local machines, and

View file

@ -87,13 +87,13 @@ simple collector interface.
Alternatively, the garbage collector may be used as a leak detector for Alternatively, the garbage collector may be used as a leak detector for
C or C++ programs, though that is not its primary goal.") C or C++ programs, though that is not its primary goal.")
(home-page "http://www.hboehm.info/gc/") (home-page "https://www.hboehm.info/gc/")
(license (x11-style (string-append home-page "license.txt"))))) (license (x11-style (string-append home-page "license.txt")))))
(define-public libgc-8.0 (define-public libgc-8.0
(package/inherit (package
libgc (inherit libgc)
(version "8.0.4") (version "8.0.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -104,8 +104,8 @@ C or C++ programs, though that is not its primary goal.")
"1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3")))))) "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"))))))
(define-public libgc/back-pointers (define-public libgc/back-pointers
(package (package/inherit
(inherit libgc) libgc
(name "libgc-back-pointers") (name "libgc-back-pointers")
(arguments (arguments
`(#:make-flags `(#:make-flags

View file

@ -6,6 +6,7 @@
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -35,6 +36,7 @@
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages perl)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-science) #:use-module (gnu packages python-science)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -44,14 +46,14 @@
(define-public fio (define-public fio
(package (package
(name "fio") (name "fio")
(version "3.17") (version "3.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/" (uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2")) "fio-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1hvh8syjz6l0q9bm5p7rf0yrmpkfcx5zj5d47mf6335w1i0h5gqf")))) "12wzi40hn0ylkdiqwjjljdjmiq78nhwsv3qqa0fad7h3x08w6w6b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:test-target "test" '(#:test-target "test"
@ -231,3 +233,28 @@ This can give a much better understanding of the command's performance.")
"Benchmark is a library to benchmark code snippets, "Benchmark is a library to benchmark code snippets,
similar to unit tests.") similar to unit tests.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public bonnie++
(package
(name "bonnie++")
(version "1.98")
(source (origin
(method url-fetch)
(uri (string-append "https://www.coker.com.au/bonnie++/bonnie++-"
version ".tgz"))
(sha256
(base32
"010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)))
(arguments '(#:tests? #f)) ; there are no tests
(home-page "https://doc.coker.com.au/projects/bonnie/")
(synopsis "Hard drive and file system benchmark suite")
(description
"Bonnie++ is a benchmark suite that is aimed at performing a number of
simple tests of hard drive and file system performance. Bonnie++ allows you to
benchmark how your file systems perform with respect to data read and write
speed, the number of seeks that can be performed per second, and the number of
file metadata operations that can be performed per second.")
(license license:gpl2))) ;GPL 2 only, see copyright.txt

View file

@ -224,6 +224,30 @@ Finder (TRF mask). Only the AGAPS and AMB masks are \"active\" by default.")
1000genomes phase2 reference genome sequence (hs37d5), based on NCBI GRCh37.") 1000genomes phase2 reference genome sequence (hs37d5), based on NCBI GRCh37.")
(license license:artistic2.0))) (license license:artistic2.0)))
(define-public r-bsgenome-hsapiens-ncbi-grch38
(package
(name "r-bsgenome-hsapiens-ncbi-grch38")
(version "1.3.1000")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "BSgenome.Hsapiens.NCBI.GRCh38"
version 'annotation))
(sha256
(base32
"0y75qdq578fh6420vbvsbwmdw8jvr3g06qli2h3vj3pxmjykh9c1"))))
(properties `((upstream-name . "BSgenome.Hsapiens.NCBI.GRCh38")))
(build-system r-build-system)
(propagated-inputs `(("r-bsgenome" ,r-bsgenome)))
(home-page
"https://bioconductor.org/packages/release/data/annotation/html/\
BSgenome.Hsapiens.NCBI.GRCh38.html")
(synopsis "Full genome sequences for Homo sapiens (GRCh38)")
(description
"This package provides full genome sequences for Homo sapiens (Human) as
provided by NCBI (GRCh38, 2013-12-17) and stored in Biostrings objects.")
(license license:artistic2.0)))
(define-public r-bsgenome-hsapiens-ucsc-hg19-masked (define-public r-bsgenome-hsapiens-ucsc-hg19-masked
(package (package
(name "r-bsgenome-hsapiens-ucsc-hg19-masked") (name "r-bsgenome-hsapiens-ucsc-hg19-masked")
@ -594,14 +618,14 @@ database is exposed as a @code{TxDb} object.")
(define-public r-txdb-mmusculus-ucsc-mm10-knowngene (define-public r-txdb-mmusculus-ucsc-mm10-knowngene
(package (package
(name "r-txdb-mmusculus-ucsc-mm10-knowngene") (name "r-txdb-mmusculus-ucsc-mm10-knowngene")
(version "3.4.7") (version "3.10.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "TxDb.Mmusculus.UCSC.mm10.knownGene" (uri (bioconductor-uri "TxDb.Mmusculus.UCSC.mm10.knownGene"
version 'annotation)) version 'annotation))
(sha256 (sha256
(base32 (base32
"04impkl8zh1gpwwrpbf19jqznsjrq2306yyhm6cmx6hr1401bd6b")))) "0xs9npnhbwll7p62hibs02y4ac23jchdcr25i6a7qwq1kms82qk9"))))
(properties (properties
`((upstream-name . "TxDb.Mmusculus.UCSC.mm10.knownGene"))) `((upstream-name . "TxDb.Mmusculus.UCSC.mm10.knownGene")))
(build-system r-build-system) (build-system r-build-system)
@ -722,6 +746,49 @@ the weighted combination of published signatures that, when summed, most
closely reconstructs the mutational profile.") closely reconstructs the mutational profile.")
(license license:gpl2+))) (license license:gpl2+)))
;; This is a CRAN package, but it depends on Bioconductor packages.
(define-public r-nmf
(package
(name "r-nmf")
(version "0.22.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "NMF" version))
(sha256
(base32
"0b2ls3x1nkrnam45hagpys624nzxj3v7kxnp0q216yakvx5h57cq"))))
(properties `((upstream-name . "NMF")))
(build-system r-build-system)
(propagated-inputs
`(("r-cluster" ,r-cluster)
("r-biobase" ,r-biobase)
("r-biocmanager" ,r-biocmanager)
("r-bigmemory" ,r-bigmemory) ; suggested
("r-synchronicity" ,r-synchronicity) ; suggested
("r-colorspace" ,r-colorspace)
("r-digest" ,r-digest)
("r-doparallel" ,r-doparallel)
("r-foreach" ,r-foreach)
("r-ggplot2" ,r-ggplot2)
("r-gridbase" ,r-gridbase)
("r-pkgmaker" ,r-pkgmaker)
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-registry" ,r-registry)
("r-reshape2" ,r-reshape2)
("r-rngtools" ,r-rngtools)
("r-stringr" ,r-stringr)))
(home-page "http://renozao.github.io/NMF")
(synopsis "Algorithms and framework for nonnegative matrix factorization")
(description
"This package provides a framework to perform Non-negative Matrix
Factorization (NMF). The package implements a set of already published
algorithms and seeding methods, and provides a framework to test, develop and
plug new or custom algorithms. Most of the built-in algorithms have been
optimized in C++, and the main interface function provides an easy way of
performing parallel computations on multicore machines.")
(license license:gpl2+)))
(define-public r-do-db (define-public r-do-db
(package (package
(name "r-do-db") (name "r-do-db")
@ -1526,6 +1593,30 @@ expressed genes in DNA microarray experiments.")
"This package implements some simple graph handling capabilities for R.") "This package implements some simple graph handling capabilities for R.")
(license license:artistic2.0))) (license license:artistic2.0)))
;; This is a CRAN package, but it depends on a Bioconductor package.
(define-public r-ggm
(package
(name "r-ggm")
(version "2.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggm" version))
(sha256
(base32
"11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di"))))
(properties `((upstream-name . "ggm")))
(build-system r-build-system)
(propagated-inputs
`(("r-graph" ,r-graph)
("r-igraph" ,r-igraph)))
(home-page "https://cran.r-project.org/package=ggm")
(synopsis "Functions for graphical Markov models")
(description
"This package provides functions and datasets for maximum likelihood
fitting of some classes of graphical Markov models.")
(license license:gpl2+)))
(define-public r-codedepends (define-public r-codedepends
(package (package
(name "r-codedepends") (name "r-codedepends")
@ -1557,14 +1648,14 @@ determining dependencies between variables, code improvement suggestions.")
(define-public r-chippeakanno (define-public r-chippeakanno
(package (package
(name "r-chippeakanno") (name "r-chippeakanno")
(version "3.20.0") (version "3.20.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ChIPpeakAnno" version)) (uri (bioconductor-uri "ChIPpeakAnno" version))
(sha256 (sha256
(base32 (base32
"0hp3s3shnrb55cxvx9wrdl67wqw9f55gdgx7262s4mahpxjswfsa")))) "0kmfha4vprbi0z6n7v9w28xfrqcx5qad7yfr0b316j5aj8v9f4hc"))))
(properties `((upstream-name . "ChIPpeakAnno"))) (properties `((upstream-name . "ChIPpeakAnno")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -1867,14 +1958,14 @@ experiments.")
(define-public r-genomicinteractions (define-public r-genomicinteractions
(package (package
(name "r-genomicinteractions") (name "r-genomicinteractions")
(version "1.20.0") (version "1.20.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicInteractions" version)) (uri (bioconductor-uri "GenomicInteractions" version))
(sha256 (sha256
(base32 (base32
"10kwb70c9aq0bfqpq48h186lsbwgrg18m14r9z8x6n8l7cds5azc")))) "140bp7c8p079xh5wwxmrq3a73pm6mdc9czq5w2gzjml7dgrca38a"))))
(properties (properties
`((upstream-name . "GenomicInteractions"))) `((upstream-name . "GenomicInteractions")))
(build-system r-build-system) (build-system r-build-system)
@ -2028,14 +2119,14 @@ genes or proteins in these datasets.")
(define-public r-inspect (define-public r-inspect
(package (package
(name "r-inspect") (name "r-inspect")
(version "1.16.2") (version "1.16.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "INSPEcT" version)) (uri (bioconductor-uri "INSPEcT" version))
(sha256 (sha256
(base32 (base32
"1g8la7k4pnyr2hvk4yjd1bwvjy6nqbbb0fwxrrh2ifgqf4h21x2p")))) "0y4gpvrbmcipdnyz9lz9ywn0317xnpcriiisqvxygin05vgcpilp"))))
(properties `((upstream-name . "INSPEcT"))) (properties `((upstream-name . "INSPEcT")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -2125,14 +2216,14 @@ samples.")
(define-public r-biocneighbors (define-public r-biocneighbors
(package (package
(name "r-biocneighbors") (name "r-biocneighbors")
(version "1.4.1") (version "1.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "BiocNeighbors" version)) (uri (bioconductor-uri "BiocNeighbors" version))
(sha256 (sha256
(base32 (base32
"05vi1cij37s8wgj92k3l6a3f3dwldj8jvijdp4695zczka6kypdf")))) "1bx7i5pifj8w89fnhfgcfgcar2ik2ad8wqs2rix7yks90vz185i6"))))
(properties `((upstream-name . "BiocNeighbors"))) (properties `((upstream-name . "BiocNeighbors")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -2156,14 +2247,14 @@ achieved for all methods using the BiocParallel framework.")
(define-public r-biocsingular (define-public r-biocsingular
(package (package
(name "r-biocsingular") (name "r-biocsingular")
(version "1.2.1") (version "1.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "BiocSingular" version)) (uri (bioconductor-uri "BiocSingular" version))
(sha256 (sha256
(base32 (base32
"0fjfmmpda7pszsck2hm7bp4509pl3xaz02q2q03d5vla62h1h81k")))) "1282fdwxrpga87y8xflr0sl8ajwawgn2i9i65my8mbg5vrixs407"))))
(properties `((upstream-name . "BiocSingular"))) (properties `((upstream-name . "BiocSingular")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3130,27 +3221,20 @@ surface of a flowcell.")
(define-public r-gkmsvm (define-public r-gkmsvm
(package (package
(name "r-gkmsvm") (name "r-gkmsvm")
(version "0.79.0") (version "0.80.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gkmSVM" version)) (uri (cran-uri "gkmSVM" version))
(sha256 (sha256
(base32 (base32
"04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3")))) "0ljcga246ad0ql8x3drvrdsyp0f20mgp3p6lnl79xb76qgfdnm0p"))))
(properties `((upstream-name . "gkmSVM"))) (properties `((upstream-name . "gkmSVM")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-biocgenerics" ,r-biocgenerics) `(("r-kernlab" ,r-kernlab)
("r-biostrings" ,r-biostrings)
("r-genomeinfodb" ,r-genomeinfodb)
("r-genomicranges" ,r-genomicranges)
("r-iranges" ,r-iranges)
("r-kernlab" ,r-kernlab)
("r-rcpp" ,r-rcpp) ("r-rcpp" ,r-rcpp)
("r-rocr" ,r-rocr) ("r-rocr" ,r-rocr)
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)
("r-seqinr" ,r-seqinr))) ("r-seqinr" ,r-seqinr)))
(home-page "https://cran.r-project.org/web/packages/gkmSVM") (home-page "https://cran.r-project.org/web/packages/gkmSVM")
(synopsis "Gapped-kmer support vector machine") (synopsis "Gapped-kmer support vector machine")
@ -3284,14 +3368,14 @@ gmapR.")
(define-public r-heatplus (define-public r-heatplus
(package (package
(name "r-heatplus") (name "r-heatplus")
(version "2.32.0") (version "2.32.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Heatplus" version)) (uri (bioconductor-uri "Heatplus" version))
(sha256 (sha256
(base32 (base32
"0hx5gqgh4xrkx37ccprq7azj9jziff137bdk0gvrixcx52ws6h89")))) "1ldxj2hasg6ysh70sc73mz2v4h3n8gf3lii09c3sqc4wmz5h7rp1"))))
(properties `((upstream-name . "Heatplus"))) (properties `((upstream-name . "Heatplus")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3521,14 +3605,14 @@ profiles (GO and KEGG) of gene and gene clusters.")
(define-public r-mlinterfaces (define-public r-mlinterfaces
(package (package
(name "r-mlinterfaces") (name "r-mlinterfaces")
(version "1.66.2") (version "1.66.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "MLInterfaces" version)) (uri (bioconductor-uri "MLInterfaces" version))
(sha256 (sha256
(base32 (base32
"1wc280iw9vllg6f58vsdj895yaqs8w42kl7jk8sgii009gwlaj8d")))) "19hlicdndy2p45y7w91gnwi3wgq5s465a646z3qqk8gmn5sn614q"))))
(properties `((upstream-name . "MLInterfaces"))) (properties `((upstream-name . "MLInterfaces")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3942,14 +4026,14 @@ position-specific scores within R and Bioconductor.")
(define-public r-atacseqqc (define-public r-atacseqqc
(package (package
(name "r-atacseqqc") (name "r-atacseqqc")
(version "1.10.1") (version "1.10.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ATACseqQC" version)) (uri (bioconductor-uri "ATACseqQC" version))
(sha256 (sha256
(base32 (base32
"12ix0bvwk50d48z85f3453k7szm1j27gk4qgw56az4fxra472rlh")))) "0dzrizacy3br8fiy1vnsl5zf242lg1hqv9dyv5ayqh2n480is57f"))))
(properties `((upstream-name . "ATACseqQC"))) (properties `((upstream-name . "ATACseqQC")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -5305,14 +5389,14 @@ annotations.")
(define-public r-rsubread (define-public r-rsubread
(package (package
(name "r-rsubread") (name "r-rsubread")
(version "2.0.0") (version "2.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Rsubread" version)) (uri (bioconductor-uri "Rsubread" version))
(sha256 (sha256
(base32 (base32
"0l8q9y2a4m1di0w5nlxhq9jgliinhgr2fwjpm5ixnqx5j3iprlwd")))) "0pdkx9mhvzw3a4ff725qvda9bxvs9vh2ppb29cc5jrivgjndv5cy"))))
(properties `((upstream-name . "Rsubread"))) (properties `((upstream-name . "Rsubread")))
(build-system r-build-system) (build-system r-build-system)
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
@ -5817,14 +5901,14 @@ self-organizing map clustering and minimal spanning trees.")
(define-public r-mixomics (define-public r-mixomics
(package (package
(name "r-mixomics") (name "r-mixomics")
(version "6.10.6") (version "6.10.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "mixOmics" version)) (uri (bioconductor-uri "mixOmics" version))
(sha256 (sha256
(base32 (base32
"18jwrdyc4pnx917y1kskxz3fqvlrkyy4ny0xqrfcidz0j7p0b7wr")))) "0307vhx9ck24rxqbvq15815ssxcc226sl2la060n204b51wi9jaa"))))
(properties `((upstream-name . "mixOmics"))) (properties `((upstream-name . "mixOmics")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -5859,14 +5943,14 @@ delete entire rows with missing data.")
(define-public r-depecher (define-public r-depecher
(package (package
(name "r-depecher") (name "r-depecher")
(version "1.2.0") (version "1.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DepecheR" version)) (uri (bioconductor-uri "DepecheR" version))
(sha256 (sha256
(base32 (base32
"1f6zbc0fq7xjflh3mkjx1n83mpppw663dj22rlpxzwp1kpmf6wm5")))) "08ja6ayvbax9m3x9w3xzi72z97miiha2nbsild1gp77n6sgn5i35"))))
(properties `((upstream-name . "DepecheR"))) (properties `((upstream-name . "DepecheR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -5937,14 +6021,14 @@ genes in the gene-set that are ranked above the leading edge).")
(define-public r-cicero (define-public r-cicero
(package (package
(name "r-cicero") (name "r-cicero")
(version "1.4.0") (version "1.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "cicero" version)) (uri (bioconductor-uri "cicero" version))
(sha256 (sha256
(base32 (base32
"0mmm7vvzq50b5fayid0bw82b5lar3xm9fwl2ya30q0p4db2y6wnz")))) "154djqd32w87814ycfmfz27ikp17bnampvmvw5hzi5p2x9l3h82r"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-assertthat" ,r-assertthat) `(("r-assertthat" ,r-assertthat)
@ -5966,6 +6050,7 @@ genes in the gene-set that are ranked above the leading edge).")
("r-s4vectors" ,r-s4vectors) ("r-s4vectors" ,r-s4vectors)
("r-stringr" ,r-stringr) ("r-stringr" ,r-stringr)
("r-tibble" ,r-tibble) ("r-tibble" ,r-tibble)
("r-tidyr" ,r-tidyr)
("r-vgam" ,r-vgam))) ("r-vgam" ,r-vgam)))
(home-page "https://bioconductor.org/packages/cicero/") (home-page "https://bioconductor.org/packages/cicero/")
(synopsis "Predict cis-co-accessibility from single-cell data") (synopsis "Predict cis-co-accessibility from single-cell data")
@ -7205,14 +7290,14 @@ access.")
(define-public r-multiassayexperiment (define-public r-multiassayexperiment
(package (package
(name "r-multiassayexperiment") (name "r-multiassayexperiment")
(version "1.12.2") (version "1.12.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "MultiAssayExperiment" version)) (uri (bioconductor-uri "MultiAssayExperiment" version))
(sha256 (sha256
(base32 (base32
"0722f3jl1xq8k8w7vrv986jd16bgysqp3n07pgmdn0hh1zh2mcqc")))) "1vf6l88j3n6109j6sd08wfqxqpj2k20dvr8ll9zl1szsn18b4gny"))))
(properties (properties
`((upstream-name . "MultiAssayExperiment"))) `((upstream-name . "MultiAssayExperiment")))
(build-system r-build-system) (build-system r-build-system)

View file

@ -410,7 +410,7 @@ computational cluster.")
(define-public bedtools (define-public bedtools
(package (package
(name "bedtools") (name "bedtools")
(version "2.27.1") (version "2.29.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/arq5x/bedtools2/releases/" (uri (string-append "https://github.com/arq5x/bedtools2/releases/"
@ -418,7 +418,7 @@ computational cluster.")
"bedtools-" version ".tar.gz")) "bedtools-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ndg5yknrxl4djx8ddzgk12rrbiidfpmkkg5z3f95jzryfxarhn8")))) "0m3hk6548846w83a9s5drsczvy67n2azx41kj71n03klb2gbzwg3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:test-target "test" '(#:test-target "test"
@ -427,7 +427,8 @@ computational cluster.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
(native-inputs `(("python" ,python-2))) (native-inputs
`(("python" ,python-wrapper)))
(inputs (inputs
`(("samtools" ,samtools) `(("samtools" ,samtools)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -440,7 +441,7 @@ genome arithmetic: that is, set theory on the genome. For example, bedtools
allows one to intersect, merge, count, complement, and shuffle genomic allows one to intersect, merge, count, complement, and shuffle genomic
intervals from multiple files in widely-used genomic file formats such as BAM, intervals from multiple files in widely-used genomic file formats such as BAM,
BED, GFF/GTF, VCF.") BED, GFF/GTF, VCF.")
(license license:gpl2))) (license license:expat)))
;; Later releases of bedtools produce files with more columns than ;; Later releases of bedtools produce files with more columns than
;; what Ribotaper expects. ;; what Ribotaper expects.
@ -2272,23 +2273,23 @@ time.")
(define-public crossmap (define-public crossmap
(package (package
(name "crossmap") (name "crossmap")
(version "0.2.9") (version "0.3.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "CrossMap" version)) (uri (pypi-uri "CrossMap" version))
(sha256 (sha256
(base32 (base32
"1byhclrqnqpvc1rqkfh4jwj6yhn0x9y7jk47i0qcjlhk0pjkw92p")))) "1sb2f2qbxya4fzw3yjl09vbrs8vfmw22zrygrvz004sf9gb1vkan"))))
(build-system python-build-system) (build-system python-build-system)
(arguments `(#:python ,python-2))
(inputs (inputs
`(("python-bx-python" ,python2-bx-python) `(("python-bx-python" ,python-bx-python)
("python-numpy" ,python2-numpy) ("python-numpy" ,python-numpy)
("python-pysam" ,python2-pysam) ("python-pybigwig" ,python-pybigwig)
("python-pysam" ,python-pysam)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("python-cython" ,python2-cython) `(("python-cython" ,python-cython)
("python-nose" ,python2-nose))) ("python-nose" ,python-nose)))
(home-page "http://crossmap.sourceforge.net/") (home-page "http://crossmap.sourceforge.net/")
(synopsis "Convert genome coordinates between assemblies") (synopsis "Convert genome coordinates between assemblies")
(description (description
@ -2578,7 +2579,7 @@ accurately delineate genomic rearrangements throughout the genome.")
(define-public diamond (define-public diamond
(package (package
(name "diamond") (name "diamond")
(version "0.9.22") (version "0.9.30")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2587,7 +2588,7 @@ accurately delineate genomic rearrangements throughout the genome.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0bky78v79g3wmdpsd706cscckgw1v09fg8vdd0z8z0d5b97aj9zl")))) "0k6f3kb6cniw11xw6763kkbs1sl0yack7xsy7q5fl5v170ssphq4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no "check" target '(#:tests? #f ; no "check" target
@ -2744,7 +2745,7 @@ quantitative phenotypes.")
(define-public edirect (define-public edirect
(package (package
(name "edirect") (name "edirect")
(version "12.1.20190819") (version "12.1.20190829")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect" (uri (string-append "ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect"
@ -2752,7 +2753,7 @@ quantitative phenotypes.")
"/edirect-" version ".tar.gz")) "/edirect-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1i9s9mppcfqd60pfywpm8vdyz5vpnyslw22nd7dv0bhykrdnkz9g")))) "1xb330z28dgp7slrvp8r7rgncsasv9lpcpqim571yg728dq7xdik"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -4274,19 +4275,30 @@ experiments.")
(define-public macs (define-public macs
(package (package
(name "macs") (name "macs")
(version "2.1.1.20160309") (version "2.2.6")
(source (origin (source (origin
(method url-fetch) ;; The PyPi tarball does not contain tests.
(uri (pypi-uri "MACS2" version)) (method git-fetch)
(uri (git-reference
(url "https://github.com/taoliu/MACS.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09ixspd1vcqmz1c81ih70xs4m7qml2iy5vyx1y74zww3iy1vl210")))) "1c5gxr0mk6hkd4vclf0k00wvyvzw2vrmk52c85338p7aqjwg6n15"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 ; only compatible with Python 2.7 `(#:phases
#:tests? #f)) ; no test target (modify-phases %standard-phases
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-v"))))))
(inputs (inputs
`(("python-numpy" ,python2-numpy))) `(("python-numpy" ,python-numpy)))
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "https://github.com/taoliu/MACS/") (home-page "https://github.com/taoliu/MACS/")
(synopsis "Model based analysis for ChIP-Seq data") (synopsis "Model based analysis for ChIP-Seq data")
(description (description
@ -4910,20 +4922,26 @@ predicts the locations of structural units in the sequences.")
(define-public proteinortho (define-public proteinortho
(package (package
(name "proteinortho") (name "proteinortho")
(version "5.16b") (version "6.0.14")
(source (source (origin
(origin (method git-fetch)
(method url-fetch) (uri (git-reference
(uri (url "https://gitlab.com/paulklemm_PHD/proteinortho.git")
(string-append (commit (string-append "v" version))))
"http://www.bioinf.uni-leipzig.de/Software/proteinortho/proteinortho_v" (file-name (git-file-name name version))
version "_src.tar.gz")) (sha256
(sha256 (base32
(base32 "0pmy617zy2z2w6hjqxjhf3rzikf5n3mpia80ysq8233vfr7wrzff"))
"1wl0dawpssqwfjvr651r4wlww8hhjin8nba6xh71ks7sbypx886j")))) (modules '((guix build utils)))
(snippet
'(begin
;; remove pre-built scripts
(delete-file-recursively "src/BUILD/")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:make-flags '("CC=gcc")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -4941,15 +4959,23 @@ predicts the locations of structural units in the sequences.")
#t)) #t))
(add-after 'install 'wrap-programs (add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((path (getenv "PATH")) (let ((path (getenv "PATH"))
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out")))
(binary (string-append out "/bin/proteinortho5.pl"))) (for-each (lambda (script)
(wrap-program binary `("PATH" ":" prefix (,path)))) (wrap-script script `("PATH" ":" prefix (,path))))
(cons (string-append out "/bin/proteinortho")
(find-files out "\\.(pl|py)$"))))
#t))))) #t)))))
(inputs (inputs
`(("perl" ,perl) `(("guile" ,guile-3.0) ; for wrap-script
("python" ,python-2) ("diamond" ,diamond)
("blast+" ,blast+))) ("perl" ,perl)
("python" ,python-wrapper)
("blast+" ,blast+)
("lapack" ,lapack)
("openblas" ,openblas)))
(native-inputs
`(("which" ,which)))
(home-page "http://www.bioinf.uni-leipzig.de/Software/proteinortho") (home-page "http://www.bioinf.uni-leipzig.de/Software/proteinortho")
(synopsis "Detect orthologous genes across species") (synopsis "Detect orthologous genes across species")
(description (description
@ -4957,7 +4983,7 @@ predicts the locations of structural units in the sequences.")
species. For doing so, it compares similarities of given gene sequences and species. For doing so, it compares similarities of given gene sequences and
clusters them to find significant groups. The algorithm was designed to handle clusters them to find significant groups. The algorithm was designed to handle
large-scale data and can be applied to hundreds of species at once.") large-scale data and can be applied to hundreds of species at once.")
(license license:gpl2+))) (license license:gpl3+)))
(define-public pyicoteo (define-public pyicoteo
(package (package
@ -5281,7 +5307,7 @@ BAM and Wiggle files in both transcript-coordinate and genomic-coordinate.")
(define-public rseqc (define-public rseqc
(package (package
(name "rseqc") (name "rseqc")
(version "2.6.1") (version "3.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5289,28 +5315,18 @@ BAM and Wiggle files in both transcript-coordinate and genomic-coordinate.")
(string-append "mirror://sourceforge/rseqc/" (string-append "mirror://sourceforge/rseqc/"
"RSeQC-" version ".tar.gz")) "RSeQC-" version ".tar.gz"))
(sha256 (sha256
(base32 "15ly0254yi032qzkdplg00q144qfdsd986gh62829rl5bkxhj330")) (base32
(modules '((guix build utils))) "0gbb9iyb7swiv5455fm5rg98r7l6qn27v564yllqjd574hncpx6m"))))
(snippet
'(begin
;; remove bundled copy of pysam
(delete-file-recursively "lib/pysam")
(substitute* "setup.py"
;; remove dependency on outdated "distribute" module
(("^from distribute_setup import use_setuptools") "")
(("^use_setuptools\\(\\)") "")
;; do not use bundled copy of pysam
(("^have_pysam = False") "have_pysam = True"))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments `(#:python ,python-2))
(inputs (inputs
`(("python-cython" ,python2-cython) `(("python-cython" ,python-cython)
("python-pysam" ,python2-pysam) ("python-bx-python" ,python-bx-python)
("python-numpy" ,python2-numpy) ("python-pybigwig" ,python-pybigwig)
("python-pysam" ,python-pysam)
("python-numpy" ,python-numpy)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("python-nose" ,python2-nose))) `(("python-nose" ,python-nose)))
(home-page "http://rseqc.sourceforge.net/") (home-page "http://rseqc.sourceforge.net/")
(synopsis "RNA-seq quality control package") (synopsis "RNA-seq quality control package")
(description (description
@ -6556,7 +6572,7 @@ profiles, and associated taxonomic information.")
(define-public vcftools (define-public vcftools
(package (package
(name "vcftools") (name "vcftools")
(version "0.1.15") (version "0.1.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -6564,7 +6580,7 @@ profiles, and associated taxonomic information.")
version "/vcftools-" version ".tar.gz")) version "/vcftools-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1qw30c45wihgy632rbz4rh3njnwj4msj46l1rsgdhyg6bgypmr1i")))) "1qqlx7flfv7axrjwkaz6njkscsl1d0jw98ns8d8bh1n1hd1pgz6v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
@ -6592,17 +6608,18 @@ data in the form of VCF files.")
(define-public infernal (define-public infernal
(package (package
(name "infernal") (name "infernal")
(version "1.1.2") (version "1.1.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://eddylab.org/software/infernal/" (uri (string-append "http://eddylab.org/software/infernal/"
"infernal-" version ".tar.gz")) "infernal-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sr2hiz3qxfwqpz3whxr6n82p3x27336v3f34iqznp10hks2935c")))) "0pm8bm3s6nfa0av4x6m6h27lsg12b3lz3jm0fyh1mc77l2isd61v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("perl" ,perl))) ; for tests `(("perl" ,perl)
("python" ,python))) ; for tests
(home-page "http://eddylab.org/infernal/") (home-page "http://eddylab.org/infernal/")
(synopsis "Inference of RNA alignments") (synopsis "Inference of RNA alignments")
(description "Infernal (\"INFERence of RNA ALignment\") is a tool for (description "Infernal (\"INFERence of RNA ALignment\") is a tool for
@ -6613,7 +6630,7 @@ profile, but it scores a combination of sequence consensus and RNA secondary
structure consensus, so in many cases, it is more capable of identifying RNA structure consensus, so in many cases, it is more capable of identifying RNA
homologs that conserve their secondary structure more than their primary homologs that conserve their secondary structure more than their primary
sequence.") sequence.")
;; Infernal 1.1.2 requires VMX or SSE capability for parallel instructions. ;; Infernal 1.1.3 requires VMX or SSE capability for parallel instructions.
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(license license:bsd-3))) (license license:bsd-3)))
@ -6935,14 +6952,14 @@ testing and other simple calculations.")
(define-public r-shortread (define-public r-shortread
(package (package
(name "r-shortread") (name "r-shortread")
(version "1.44.1") (version "1.44.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ShortRead" version)) (uri (bioconductor-uri "ShortRead" version))
(sha256 (sha256
(base32 (base32
"1dh3q83hmi4l72vpif6dn51dzbi9ljrjgkq2zxg4sqy2jxv4vwza")))) "0ykyrj4g6vc67d5s46sp4659qvar2iavflzhggm79w4p50hxia4s"))))
(properties `((upstream-name . "ShortRead"))) (properties `((upstream-name . "ShortRead")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -7465,13 +7482,13 @@ names in their natural, rather than lexicographic, order.")
(define-public r-edger (define-public r-edger
(package (package
(name "r-edger") (name "r-edger")
(version "3.28.0") (version "3.28.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "edgeR" version)) (uri (bioconductor-uri "edgeR" version))
(sha256 (sha256
(base32 (base32
"1m7l6fbyik1b79v0h9qkmpa39svij1yiw24gxahbdqjg7fzsavh3")))) "07dv99kl7jfa62nzcq705r56gcpb1hq7p4px48j71y2ddi1rqmr6"))))
(properties `((upstream-name . "edgeR"))) (properties `((upstream-name . "edgeR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -7532,13 +7549,13 @@ coding changes and predict coding outcomes.")
(define-public r-limma (define-public r-limma
(package (package
(name "r-limma") (name "r-limma")
(version "3.42.0") (version "3.42.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "limma" version)) (uri (bioconductor-uri "limma" version))
(sha256 (sha256
(base32 (base32
"0cfynv6qbnar5rl7vjh5lvddd381g9wqx1zd6a7l130hf59mwswn")))) "1nd01r7rd7jb5qz84vbgfnyrmgm9wiq7fsdji68537kjgvrzmm9z"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://bioinf.wehi.edu.au/limma") (home-page "http://bioinf.wehi.edu.au/limma")
(synopsis "Package for linear models for microarray and RNA-seq data") (synopsis "Package for linear models for microarray and RNA-seq data")
@ -7751,13 +7768,13 @@ biological sequences or sets of sequences.")
(define-public r-rsamtools (define-public r-rsamtools
(package (package
(name "r-rsamtools") (name "r-rsamtools")
(version "2.2.1") (version "2.2.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Rsamtools" version)) (uri (bioconductor-uri "Rsamtools" version))
(sha256 (sha256
(base32 (base32
"0hpdc88prpq1gcja89n5s1ndcg81523qrkbkm9gbhm7rm8wmi8cl")))) "1vj43acawqqkf9yval9fzxarpsf04fmn78m2hq4f083w1k0myhyr"))))
(properties (properties
`((upstream-name . "Rsamtools"))) `((upstream-name . "Rsamtools")))
(build-system r-build-system) (build-system r-build-system)
@ -7939,13 +7956,13 @@ as well as query and modify the browser state, such as the current viewport.")
(define-public r-genomicfeatures (define-public r-genomicfeatures
(package (package
(name "r-genomicfeatures") (name "r-genomicfeatures")
(version "1.38.1") (version "1.38.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicFeatures" version)) (uri (bioconductor-uri "GenomicFeatures" version))
(sha256 (sha256
(base32 (base32
"1c1x29f447dv0i1wi88paji645lfsgmg4ckn19hyhlra72smhzqc")))) "0dd226kgks50jdx5w35f3wmg95hy8aibi4kcn8p5kmqp5i8j580b"))))
(properties (properties
`((upstream-name . "GenomicFeatures"))) `((upstream-name . "GenomicFeatures")))
(build-system r-build-system) (build-system r-build-system)
@ -8236,7 +8253,7 @@ throughput genetic sequencing data sets using regression methods.")
(define-public r-qtl (define-public r-qtl
(package (package
(name "r-qtl") (name "r-qtl")
(version "1.44-9") (version "1.45-11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -8244,7 +8261,7 @@ throughput genetic sequencing data sets using regression methods.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"03lmvydln8b7666b6w46qbryhf83vsd11d4y2v95rfgvqgq66l1i")))) "1d6qgj602fm6zia3djl4hmca0ri4v57ffp3g93p2yc3cabx2hq90"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://rqtl.org/") (home-page "https://rqtl.org/")
(synopsis "R package for analyzing QTL experiments in genetics") (synopsis "R package for analyzing QTL experiments in genetics")
@ -8332,14 +8349,14 @@ secondary structure and comparative analysis in R.")
(define-public r-rhtslib (define-public r-rhtslib
(package (package
(name "r-rhtslib") (name "r-rhtslib")
(version "1.18.0") (version "1.18.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Rhtslib" version)) (uri (bioconductor-uri "Rhtslib" version))
(sha256 (sha256
(base32 (base32
"04inkq44lxwymqv51mxgaphasqjcdc9rl5p58imnrdm0kszs8prm")))) "0gkbrmrcg55c9s5166ifljlx0v25rv4ijdyp4wf4c292xd6chy2l"))))
(properties `((upstream-name . "Rhtslib"))) (properties `((upstream-name . "Rhtslib")))
(build-system r-build-system) (build-system r-build-system)
;; Without this a temporary directory ends up in the Rhtslib.so binary, ;; Without this a temporary directory ends up in the Rhtslib.so binary,
@ -9122,14 +9139,14 @@ unmodeled, or latent sources of noise.")
(define-public r-seqminer (define-public r-seqminer
(package (package
(name "r-seqminer") (name "r-seqminer")
(version "7.1") (version "8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "seqminer" version)) (uri (cran-uri "seqminer" version))
(sha256 (sha256
(base32 (base32
"1jydcpkw4rwfp983j83kipvsvr10as9pb49zzn3c2v09k1gh3ymy")))) "00jzj8mwb0zaiwlifd41b26mrq9mzigj18nc29dydi0r42hxg16i"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("zlib" ,zlib))) `(("zlib" ,zlib)))
@ -9504,13 +9521,13 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
(define-public r-seurat (define-public r-seurat
(package (package
(name "r-seurat") (name "r-seurat")
(version "3.1.2") (version "3.1.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "Seurat" version)) (uri (cran-uri "Seurat" version))
(sha256 (sha256
(base32 (base32
"0m1qi39snbmkkv1p07bzg1r7snc9x6a1y0dghvpk1nzgcfpmnsj4")))) "0lhjbjhv1hnx5i3gkx41k68i8ykay3f24708h30wx9xywww9lsvi"))))
(properties `((upstream-name . "Seurat"))) (properties `((upstream-name . "Seurat")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -9533,6 +9550,7 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
("r-mass" ,r-mass) ("r-mass" ,r-mass)
("r-matrix" ,r-matrix) ("r-matrix" ,r-matrix)
("r-metap" ,r-metap) ("r-metap" ,r-metap)
("r-patchwork" ,r-patchwork)
("r-pbapply" ,r-pbapply) ("r-pbapply" ,r-pbapply)
("r-plotly" ,r-plotly) ("r-plotly" ,r-plotly)
("r-png" ,r-png) ("r-png" ,r-png)
@ -9549,7 +9567,6 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
("r-rtsne" ,r-rtsne) ("r-rtsne" ,r-rtsne)
("r-scales" ,r-scales) ("r-scales" ,r-scales)
("r-sctransform" ,r-sctransform) ("r-sctransform" ,r-sctransform)
("r-sdmtools" ,r-sdmtools)
("r-tsne" ,r-tsne) ("r-tsne" ,r-tsne)
("r-uwot" ,r-uwot))) ("r-uwot" ,r-uwot)))
(home-page "http://www.satijalab.org/seurat") (home-page "http://www.satijalab.org/seurat")
@ -10326,14 +10343,14 @@ family of feature/genome hypotheses.")
(define-public r-gviz (define-public r-gviz
(package (package
(name "r-gviz") (name "r-gviz")
(version "1.30.1") (version "1.30.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "Gviz" version)) (uri (bioconductor-uri "Gviz" version))
(sha256 (sha256
(base32 (base32
"03jj193fzmhvkjw8f5zk6wgflkvm3phny0q38scawcplfsyb8z64")))) "0c9i26h5czm60n1bxzmdxxpywcj0sig6wcj913pb41mr83bbgra3"))))
(properties `((upstream-name . "Gviz"))) (properties `((upstream-name . "Gviz")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -10478,14 +10495,14 @@ provided.")
(define-public r-hdf5array (define-public r-hdf5array
(package (package
(name "r-hdf5array") (name "r-hdf5array")
(version "1.14.1") (version "1.14.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "HDF5Array" version)) (uri (bioconductor-uri "HDF5Array" version))
(sha256 (sha256
(base32 (base32
"04hd02zd5jix5p2zg10asmwjg1fynqgmclbhbmk7fb6arx5hm11f")))) "1z153a7nxmlml72pl1saasj2il9g5ahpynkpv3mkhhsvl5kbwbh6"))))
(properties `((upstream-name . "HDF5Array"))) (properties `((upstream-name . "HDF5Array")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -10675,14 +10692,14 @@ quality control.")
(define-public r-scran (define-public r-scran
(package (package
(name "r-scran") (name "r-scran")
(version "1.14.5") (version "1.14.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "scran" version)) (uri (bioconductor-uri "scran" version))
(sha256 (sha256
(base32 (base32
"0ydy6gvpgpvrs4ryk1qvmmxp6cpaizs294jwg42jawxndkds1l3y")))) "1y8wlgk5zbv7c7gcp0ahfpbh9lifab7y3zwf0093fzaw7vr1y6cr"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-beachmat" ,r-beachmat) `(("r-beachmat" ,r-beachmat)
@ -11072,8 +11089,8 @@ import matplotlib
matplotlib.use('Agg') matplotlib.use('Agg')
" line))) " line)))
;; Make sure GESS has all modules in its path ;; Make sure GESS has all modules in its path
(wrap-program (string-append target "GESS.py") (wrap-script (string-append target "GESS.py")
`("PYTHONPATH" ":" prefix (,target ,(getenv "PYTHONPATH")))) `("PYTHONPATH" ":" = (,target ,(getenv "PYTHONPATH"))))
(mkdir-p bin) (mkdir-p bin)
(symlink (string-append target "GESS.py") (symlink (string-append target "GESS.py")
(string-append bin "GESS.py")) (string-append bin "GESS.py"))
@ -11084,7 +11101,8 @@ matplotlib.use('Agg')
("python2-scipy" ,python2-scipy) ("python2-scipy" ,python2-scipy)
("python2-numpy" ,python2-numpy) ("python2-numpy" ,python2-numpy)
("python2-networkx" ,python2-networkx) ("python2-networkx" ,python2-networkx)
("python2-biopython" ,python2-biopython))) ("python2-biopython" ,python2-biopython)
("guile" ,guile-3.0))) ; for the script wrapper
(home-page "https://compbio.uthscsa.edu/GESS_Web/") (home-page "https://compbio.uthscsa.edu/GESS_Web/")
(synopsis "Detect exon-skipping events from raw RNA-seq data") (synopsis "Detect exon-skipping events from raw RNA-seq data")
(description (description
@ -12011,23 +12029,6 @@ graphs. This library makes it easy to work with @file{.loom} files for
single-cell RNA-seq data.") single-cell RNA-seq data.")
(license license:bsd-3))) (license license:bsd-3)))
;; pigx-scrnaseq does not work with the latest version of loompy.
(define-public python-loompy-for-pigx-scrnaseq
(package (inherit python-loompy)
(name "python-loompy")
(version "2.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/linnarsson-lab/loompy.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0pjyl532pl8sbv71yci6h0agchn0naw2qjcwj50n6afrsahbsag3"))))
;; There are none.
(arguments '(#:tests? #f))))
;; We cannot use the latest commit because it requires Java 9. ;; We cannot use the latest commit because it requires Java 9.
(define-public java-forester (define-public java-forester
(let ((commit "86b07efe302d5094b42deed9260f719a4c4ac2e6") (let ((commit "86b07efe302d5094b42deed9260f719a4c4ac2e6")
@ -12771,7 +12772,7 @@ methylation and segmentation.")
(define-public pigx-scrnaseq (define-public pigx-scrnaseq
(package (package
(name "pigx-scrnaseq") (name "pigx-scrnaseq")
(version "0.0.8") (version "1.1.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_scrnaseq/" (uri (string-append "https://github.com/BIMSBbioinfo/pigx_scrnaseq/"
@ -12779,27 +12780,21 @@ methylation and segmentation.")
"/pigx_scrnaseq-" version ".tar.gz")) "/pigx_scrnaseq-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zv0sc5amivxhb95vx2gfx6l9bh7n80fh7h47dalnwxxnfvnzai4")))) "0ga2jr4968qzwml6aycky4603q64lny3y7lzw6dmafch5pydl1qi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:configure-flags
(list (string-append "PICARDJAR=" (assoc-ref %build-inputs "java-picard")
"/share/java/picard.jar")
(string-append "DROPSEQJAR=" (assoc-ref %build-inputs "dropseq-tools")
"/share/java/dropseq.jar"))))
(inputs (inputs
`(("coreutils" ,coreutils) `(("coreutils" ,coreutils)
("perl" ,perl) ("perl" ,perl)
("dropseq-tools" ,dropseq-tools)
("fastqc" ,fastqc) ("fastqc" ,fastqc)
("java-picard" ,java-picard-2.10.3) ; same as for dropseq ("flexbar" ,flexbar)
("java" ,icedtea-8) ("java" ,icedtea-8)
("jellyfish" ,jellyfish)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("python-pyyaml" ,python-pyyaml) ("python-pyyaml" ,python-pyyaml)
("python-pandas" ,python-pandas) ("python-pandas" ,python-pandas)
("python-magic" ,python-magic) ("python-magic" ,python-magic)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
("python-loompy" ,python-loompy-for-pigx-scrnaseq) ("python-loompy" ,python-loompy)
("ghc-pandoc" ,ghc-pandoc) ("ghc-pandoc" ,ghc-pandoc)
("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc)
("samtools" ,samtools) ("samtools" ,samtools)
@ -12826,6 +12821,7 @@ methylation and segmentation.")
("r-rtsne" ,r-rtsne) ("r-rtsne" ,r-rtsne)
("r-scater" ,r-scater) ("r-scater" ,r-scater)
("r-scran" ,r-scran) ("r-scran" ,r-scran)
("r-seurat" ,r-seurat)
("r-singlecellexperiment" ,r-singlecellexperiment) ("r-singlecellexperiment" ,r-singlecellexperiment)
("r-stringr" ,r-stringr) ("r-stringr" ,r-stringr)
("r-yaml" ,r-yaml))) ("r-yaml" ,r-yaml)))
@ -13883,7 +13879,7 @@ absolute GSEA.")
(define-public jamm (define-public jamm
(package (package
(name "jamm") (name "jamm")
(version "1.0.7.5") (version "1.0.7.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -13893,7 +13889,7 @@ absolute GSEA.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ls889jcma1ch9h21jjhnkadgszgqj41842hhcjh6cg88f85qf3i")))) "0bsa5mf9n9q5jz7mmacrra41l7r8rac5vgsn6wv1fb52ya58b970"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are none `(#:tests? #f ; there are none

View file

@ -380,7 +380,7 @@ and will take advantage of multiple processor cores where possible.")
(define-public libtorrent-rasterbar (define-public libtorrent-rasterbar
(package (package
(name "libtorrent-rasterbar") (name "libtorrent-rasterbar")
(version "1.1.13") (version "1.1.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -390,7 +390,7 @@ and will take advantage of multiple processor cores where possible.")
"/libtorrent-rasterbar-" version ".tar.gz")) "/libtorrent-rasterbar-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1mza92ljjqvlz9582pmls3n45srqhxvw3q348xihcg4fhlchf11h")))) "0sn3ingmk1lk9p56f9ifgdwhjg0qizcfgv15wyc9s71nm5fya7sc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

View file

@ -670,7 +670,20 @@ it fits within common partitioning schemes.")
(make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu")) (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"))
(define-public u-boot-pinebook (define-public u-boot-pinebook
(make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu")) (let ((base (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu")))
(package
(inherit base)
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-pinebook-config
;; Fix regression with LCD video output introduced in 2020.01
;; https://patchwork.ozlabs.org/patch/1225130/
(lambda _
(substitute* "configs/pinebook_defconfig"
(("CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y") "CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y\nCONFIG_VIDEO_BPP32=y"))
#t)))))))))
(define-public u-boot-bananapi-m2-ultra (define-public u-boot-bananapi-m2-ultra
(make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf"))

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Corentin Bocquillon <corentin@nybble.fr> ;;; Copyright © 2017 Corentin Bocquillon <corentin@nybble.fr>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
@ -80,7 +80,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public bear (define-public bear
(package (package
(name "bear") (name "bear")
(version "2.4.2") (version "2.4.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -89,7 +89,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1")))) "19fk4flfykbzhb89ppmzqf0zlrkbjm6ajl9fsayndj9km5ys0041"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("python" ,python-wrapper))) `(("python" ,python-wrapper)))

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@ -132,7 +132,7 @@ compiler while still keeping it small, simple, fast and understandable.")
(define-public libbytesize (define-public libbytesize
(package (package
(name "libbytesize") (name "libbytesize")
(version "2.1") (version "2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -140,7 +140,7 @@ compiler while still keeping it small, simple, fast and understandable.")
"download/" version "/libbytesize-" version ".tar.gz")) "download/" version "/libbytesize-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1bpz9cpb8s47kqplkkiz6ryfahas2ma95g9rh2axnfjp6w1d9ixc")))) "1aivwypmnqcaj2230pifvf3jcgl5chja8rspkxf0j3480asm8g5r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) `(#:tests? #f))

View file

@ -30,7 +30,7 @@
(define-public cedille (define-public cedille
(package (package
(name "cedille") (name "cedille")
(version "1.1.1") (version "1.1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -40,7 +40,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"07kv9wncyipfjf5w4ax8h2p35g70zb1qw6zc4afd7c225xia55wp")))) "1h5s6ayh3s76z184jai3jidcs4cjk8s4nvkkv2am8dg4gfsybq22"))))
(inputs (inputs
`(("agda" ,agda) `(("agda" ,agda)
("agda-ial" ,agda-ial) ("agda-ial" ,agda-ial)

View file

@ -185,7 +185,7 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
(uri "https://letsencrypt.org/certs/isrgrootx1.pem") (uri "https://letsencrypt.org/certs/isrgrootx1.pem")
(sha256 (sha256
(base32 (base32
"0zycy85ff9ga53z1q03df89ka9iihb9p8bjhw056rq2y4rn3b6ac")))) "1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92"))))
;; "Lets Encrypt Authority X3", the active Let's Encrypt intermediate ;; "Lets Encrypt Authority X3", the active Let's Encrypt intermediate
;; certificate. ;; certificate.
("letsencryptauthorityx3.pem" ("letsencryptauthorityx3.pem"
@ -194,7 +194,7 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
(uri "https://letsencrypt.org/certs/letsencryptauthorityx3.pem") (uri "https://letsencrypt.org/certs/letsencryptauthorityx3.pem")
(sha256 (sha256
(base32 (base32
"1kvac1dhm1d02bhrfj6l1cz1dpldz6ishb78zzvy8245zgvh7pdn")))) "100lxxvqv4fj563bm03zzk5r36hq5jx9nnrajzs38g825c5k0cg2"))))
;; "Lets Encrypt Authority X4", the backup Let's Encrypt intermediate ;; "Lets Encrypt Authority X4", the backup Let's Encrypt intermediate
;; certificate. This will be used for disaster recovery and will only be ;; certificate. This will be used for disaster recovery and will only be
;; used should Let's Encrypt lose the ability to issue with "Lets ;; used should Let's Encrypt lose the ability to issue with "Lets
@ -205,7 +205,7 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
(uri "https://letsencrypt.org/certs/letsencryptauthorityx4.pem") (uri "https://letsencrypt.org/certs/letsencryptauthorityx4.pem")
(sha256 (sha256
(base32 (base32
"0giiixknr0mls2ir6qqzb42mq7x9a7vz79gbn7fjszbf87pqhpzm")))))) "0d5256gwf73drq6q6jala28rfzhrgbk5pjfq27vc40ly91pdyh8m"))))))
(home-page "https://letsencrypt.org/certificates/") (home-page "https://letsencrypt.org/certificates/")
(synopsis "Let's Encrypt root and intermediate certificates") (synopsis "Let's Encrypt root and intermediate certificates")
(description "This package provides a certificate store containing only the (description "This package provides a certificate store containing only the

View file

@ -751,7 +751,7 @@ interfaces and processes.")
(propagated-inputs (propagated-inputs
`(("python-six" ,python-six) `(("python-six" ,python-six)
("python-traceback2" ,python-traceback2))) ("python-traceback2" ,python-traceback2)))
(home-page "http://pypi.python.org/pypi/unittest2") (home-page "https://pypi.org/project/unittest2/")
(synopsis "Python unit testing library") (synopsis "Python unit testing library")
(description (description
"Unittest2 is a replacement for the unittest module in the Python "Unittest2 is a replacement for the unittest module in the Python
@ -1590,7 +1590,7 @@ the last py.test invocation.")
(synopsis "Py.test plugin to test server connections locally") (synopsis "Py.test plugin to test server connections locally")
(description "Pytest-localserver is a plugin for the pytest testing (description "Pytest-localserver is a plugin for the pytest testing
framework which enables you to test server connections locally.") framework which enables you to test server connections locally.")
(home-page "https://pypi.python.org/pypi/pytest-localserver") (home-page "https://pypi.org/project/pytest-localserver/")
(license license:expat))) (license license:expat)))
(define-public python-pytest-xprocess (define-public python-pytest-xprocess
@ -2052,7 +2052,7 @@ especially -cover-package.")
(base32 (base32
"0y8d0zwiqar51kxj8lzmkvwc3b8kazb04gk5zcb4nzg5k68zmhq5")))) "0y8d0zwiqar51kxj8lzmkvwc3b8kazb04gk5zcb4nzg5k68zmhq5"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "http://pypi.python.org/pypi/discover/") (home-page "https://pypi.org/project/discover/")
(synopsis (synopsis
"Python test discovery for unittest") "Python test discovery for unittest")
(description (description

View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 Evan Hanson <evhan@foldling.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,14 +29,14 @@
(define-public chicken (define-public chicken
(package (package
(name "chicken") (name "chicken")
(version "5.1.0") (version "5.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://code.call-cc.org/releases/" (uri (string-append "https://code.call-cc.org/releases/"
version "/chicken-" version ".tar.gz")) version "/chicken-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw")))) "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -59,7 +60,7 @@
;; Parallel builds are not supported, as noted in README. ;; Parallel builds are not supported, as noted in README.
#:parallel-build? #f)) #:parallel-build? #f))
(propagated-inputs `(("gcc-toolchain", gcc-toolchain))) (propagated-inputs `(("gcc-toolchain", gcc-toolchain)))
(home-page "http://www.call-cc.org/") (home-page "https://www.call-cc.org/")
(synopsis "R5RS Scheme implementation that compiles native code via C") (synopsis "R5RS Scheme implementation that compiles native code via C")
(description (description
"CHICKEN is a compiler for the Scheme programming language. CHICKEN "CHICKEN is a compiler for the Scheme programming language. CHICKEN

View file

@ -37,7 +37,6 @@
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -49,6 +48,7 @@
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages ninja) #:use-module (gnu packages ninja)
#:use-module (gnu packages node) #:use-module (gnu packages node)
@ -70,7 +70,8 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (ice-9 match)) #:use-module (ice-9 match)
#:use-module (srfi srfi-1))
(define %preserved-third-party-files (define %preserved-third-party-files
'("base/third_party/cityhash" ;Expat '("base/third_party/cityhash" ;Expat
@ -106,10 +107,6 @@
"third_party/blink" ;BSD-3, LGPL2+ "third_party/blink" ;BSD-3, LGPL2+
"third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC) "third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC)
"third_party/boringssl/src/third_party/fiat" ;Expat "third_party/boringssl/src/third_party/fiat" ;Expat
"third_party/boringssl/src/third_party/sike" ;Expat
;; XXX: these files are generated by fp-$arch.pl in the above directory.
"third_party/boringssl/linux-aarch64/crypto/third_party/sike/asm/fp-armv8.S"
"third_party/boringssl/linux-x86_64/crypto/third_party/sike/asm/fp-x86_64.S"
"third_party/breakpad" ;BSD-3 "third_party/breakpad" ;BSD-3
"third_party/brotli" ;Expat "third_party/brotli" ;Expat
"third_party/cacheinvalidation" ;ASL2.0 "third_party/cacheinvalidation" ;ASL2.0
@ -117,11 +114,14 @@
"third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0 "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
"third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0 "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
"third_party/catapult/third_party/polymer" ;BSD-3 "third_party/catapult/third_party/polymer" ;BSD-3
;; XXX: This is a minified version of <https://d3js.org/>.
"third_party/catapult/tracing/third_party/d3" ;BSD-3 "third_party/catapult/tracing/third_party/d3" ;BSD-3
"third_party/catapult/tracing/third_party/gl-matrix" ;Expat "third_party/catapult/tracing/third_party/gl-matrix" ;Expat
;; XXX: Minified version of <https://github.com/Stuk/jszip>.
"third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3 "third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3
"third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat "third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat
"third_party/catapult/tracing/third_party/oboe" ;BSD-2 "third_party/catapult/tracing/third_party/oboe" ;BSD-2
;; XXX: Minified version of <https://github.com/nodeca/pako>.
"third_party/catapult/tracing/third_party/pako" ;Expat "third_party/catapult/tracing/third_party/pako" ;Expat
"third_party/ced" ;BSD-3 "third_party/ced" ;BSD-3
"third_party/cld_3" ;ASL2.0 "third_party/cld_3" ;ASL2.0
@ -134,6 +134,9 @@
"third_party/dav1d" ;BSD-2 "third_party/dav1d" ;BSD-2
"third_party/dawn" ;ASL2.0 "third_party/dawn" ;ASL2.0
"third_party/depot_tools/owners.py" ;BSD-3 "third_party/depot_tools/owners.py" ;BSD-3
"third_party/devtools-frontend" ;BSD-3
"third_party/devtools-frontend/src/third_party/axe-core" ;MPL2.0
"third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0
"third_party/dom_distiller_js" ;BSD-3 "third_party/dom_distiller_js" ;BSD-3
"third_party/emoji-segmenter" ;ASL2.0 "third_party/emoji-segmenter" ;ASL2.0
"third_party/flatbuffers" ;ASL2.0 "third_party/flatbuffers" ;ASL2.0
@ -154,6 +157,7 @@
"third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0" "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
"third_party/libaom/source/libaom/third_party/vector" ;Expat "third_party/libaom/source/libaom/third_party/vector" ;Expat
"third_party/libaom/source/libaom/third_party/x86inc" ;ISC "third_party/libaom/source/libaom/third_party/x86inc" ;ISC
"third_party/libgifcodec" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3, BSD-2
"third_party/libjingle_xmpp" ;BSD-3 "third_party/libjingle_xmpp" ;BSD-3
"third_party/libphonenumber" ;ASL2.0 "third_party/libphonenumber" ;ASL2.0
"third_party/libsecret" ;LGPL2.1+ "third_party/libsecret" ;LGPL2.1+
@ -181,6 +185,7 @@
"third_party/pdfium/third_party/bigint" ;Public domain, BSD-3 "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
"third_party/pdfium/third_party/skia_shared" ;BSD-3 "third_party/pdfium/third_party/skia_shared" ;BSD-3
"third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
"third_party/perfetto" ;ASL2.0
"third_party/pffft" ;the "FFTPACK" license, similar to BSD-3 "third_party/pffft" ;the "FFTPACK" license, similar to BSD-3
"third_party/ply" ;BSD-3 "third_party/ply" ;BSD-3
"third_party/polymer" ;BSD-3 "third_party/polymer" ;BSD-3
@ -194,7 +199,6 @@
"third_party/sfntly" ;ASL2.0 "third_party/sfntly" ;ASL2.0
"third_party/skia" ;BSD-3 "third_party/skia" ;BSD-3
"third_party/skia/include/third_party/skcms" ;BSD-3 "third_party/skia/include/third_party/skcms" ;BSD-3
"third_party/skia/third_party/gif" ;MPL1.1/GPL2+/LGPL2.1+
"third_party/skia/third_party/skcms" ;BSD-3 "third_party/skia/third_party/skcms" ;BSD-3
"third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
"third_party/smhasher" ;Expat, public domain "third_party/smhasher" ;Expat, public domain
@ -243,9 +247,9 @@ from forcing GEXP-PROMISE."
#:system system #:system system
#:guile-for-build guile))) #:guile-for-build guile)))
(define %chromium-version "79.0.3945.130") (define %chromium-version "80.0.3987.132")
(define %ungoogled-revision "e2fae994d786b6716fb473a47b0c880bcfdc2497") (define %ungoogled-revision "7e68f18f1d16a132fe7d913a176daf79897eaa58")
(define %debian-revision "debian/79.0.3945.130-2") (define %debian-revision "debian/80.0.3987.116-1")
(define package-revision "0") (define package-revision "0")
(define %package-version (string-append %chromium-version "-" (define %package-version (string-append %chromium-version "-"
package-revision "." package-revision "."
@ -259,7 +263,7 @@ from forcing GEXP-PROMISE."
%chromium-version ".tar.xz")) %chromium-version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"183vz3lf1588cr9s5vlnj65qvbmz36s8cg8k7dvr64cxmcqk86an")))) "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c"))))
(define %ungoogled-origin (define %ungoogled-origin
(origin (origin
@ -270,7 +274,7 @@ from forcing GEXP-PROMISE."
(string-take %ungoogled-revision 7))) (string-take %ungoogled-revision 7)))
(sha256 (sha256
(base32 (base32
"15vmc07iba1zmzn4j7c5n2hyvyxzwwf9hc3kyym0m4jajlsyxr5f")))) "196rr3nly42pzl2bap22vzw4d8x87yl3zy1wq2fla5z8iy4x8ym1"))))
(define %debian-origin (define %debian-origin
(origin (origin
@ -284,7 +288,7 @@ from forcing GEXP-PROMISE."
(_ (string-take %debian-revision 7))))) (_ (string-take %debian-revision 7)))))
(sha256 (sha256
(base32 (base32
"1rbzxcwfp7v0c6rkvn9jl9by7p363cnbdyqazwiak1z03kmw3nkz")))) "1cc5sp566dd8f2grgr770xwbxgxf58dk1w7q3s8pmv4js5h3pwq8"))))
;; This is a "computed" origin that does the following: ;; This is a "computed" origin that does the following:
;; *) Runs the Ungoogled scripts on a pristine Chromium tarball. ;; *) Runs the Ungoogled scripts on a pristine Chromium tarball.
@ -344,7 +348,7 @@ from forcing GEXP-PROMISE."
(with-directory-excursion chromium-dir (with-directory-excursion chromium-dir
(format #t "applying Debian patches...~%") (format #t "Applying Debian patches...~%")
(force-output) (force-output)
(let* ((debian #+debian-source) (let* ((debian #+debian-source)
(patches (string-append debian "/debian/patches")) (patches (string-append debian "/debian/patches"))
@ -423,6 +427,18 @@ from forcing GEXP-PROMISE."
`(cons "--enable-custom-modes" `(cons "--enable-custom-modes"
,flags)))))) ,flags))))))
;; Add a custom ld wrapper that supports quoted strings in response files.
;; To be merged with 'ld-wrapper' in a future rebuild cycle.
(define-public ld-wrapper-next
(let ((orig (car (assoc-ref (%final-inputs) "ld-wrapper"))))
(package
(inherit orig)
(name "ld-wrapper-next")
(inputs
`(("wrapper" ,(search-path %load-path
"gnu/packages/ld-wrapper-next.in"))
,@(alist-delete "wrapper" (package-inputs orig)))))))
(define-public ungoogled-chromium (define-public ungoogled-chromium
(package (package
(name "ungoogled-chromium") (name "ungoogled-chromium")
@ -446,8 +462,10 @@ from forcing GEXP-PROMISE."
;; directory for an exhaustive list of supported flags. ;; directory for an exhaustive list of supported flags.
;; (Note: The 'configure' phase will do that for you.) ;; (Note: The 'configure' phase will do that for you.)
(list "is_debug=false" (list "is_debug=false"
"is_cfi=false"
"use_gold=false" "use_gold=false"
"use_lld=false" "use_lld=false"
"clang_use_chrome_plugins=false"
"linux_use_bundled_binutils=false" "linux_use_bundled_binutils=false"
"use_custom_libcxx=false" "use_custom_libcxx=false"
"use_sysroot=false" "use_sysroot=false"
@ -477,18 +495,6 @@ from forcing GEXP-PROMISE."
;; friends from the environment. ;; friends from the environment.
"custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" "custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
"host_toolchain=\"//build/toolchain/linux/unbundle:default\"" "host_toolchain=\"//build/toolchain/linux/unbundle:default\""
;; Don't assume it's clang.
"is_clang=false"
;; Disable debugging features to save space. These are normally
;; pulled in by "is_official_build", but that requires "is_clang".
"enable_iterator_debugging=false"
"exclude_unwind_tables=true"
;; Optimize for building everything at once, as opposed to
;; incrementally for development. See "docs/jumbo.md".
"use_jumbo_build=true"
;; The default file merge limit of 50 requires huge amounts of RAM.
;; Cap it to make sure the build succeeds on commodity hardware.
"jumbo_file_merge_limit=8"
;; Prefer system libraries. ;; Prefer system libraries.
"use_system_freetype=true" "use_system_freetype=true"
@ -584,6 +590,10 @@ from forcing GEXP-PROMISE."
(substitute* "third_party/webrtc/rtc_base/strings/json.h" (substitute* "third_party/webrtc/rtc_base/strings/json.h"
(("#include \"third_party/jsoncpp/") "#include \"json/")) (("#include \"third_party/jsoncpp/") "#include \"json/"))
(substitute* "gpu/config/gpu_util.cc"
(("third_party/vulkan/include/")
""))
(substitute* '("components/viz/common/gpu/vulkan_context_provider.h" (substitute* '("components/viz/common/gpu/vulkan_context_provider.h"
"components/viz/common/resources/resource_format_utils.h") "components/viz/common/resources/resource_format_utils.h")
(("third_party/vulkan/include/") "")) (("third_party/vulkan/include/") ""))
@ -636,14 +646,19 @@ from forcing GEXP-PROMISE."
;; Make sure the right build tools are used. ;; Make sure the right build tools are used.
(setenv "AR" "ar") (setenv "NM" "nm") (setenv "AR" "ar") (setenv "NM" "nm")
(setenv "CC" "gcc") (setenv "CXX" "g++") (setenv "CC" "clang") (setenv "CXX" "clang++")
;; Prevent GCC from optimizing away null pointer safety checks. ;; Do not optimize away null pointer safety checks.
(setenv "CXXFLAGS" "-fno-delete-null-pointer-checks") (setenv "CXXFLAGS" "-fno-delete-null-pointer-checks")
;; TODO: pre-compile instead. Avoids a race condition. ;; TODO: pre-compile instead. Avoids a race condition.
(setenv "PYTHONDONTWRITEBYTECODE" "1") (setenv "PYTHONDONTWRITEBYTECODE" "1")
(substitute*
;; From Debians 'system/node.patch'.
"third_party/devtools-frontend/src/scripts/devtools_paths.py"
(("/usr/bin/nodejs") (which "node")))
;; XXX: How portable is this. ;; XXX: How portable is this.
(mkdir-p "third_party/node/linux/node-linux-x64") (mkdir-p "third_party/node/linux/node-linux-x64")
(symlink (string-append (assoc-ref inputs "node") "/bin") (symlink (string-append (assoc-ref inputs "node") "/bin")
@ -748,9 +763,10 @@ from forcing GEXP-PROMISE."
#t)))))) #t))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("gcc" ,gcc-8) ("clang" ,clang-9)
("gn" ,gn) ("gn" ,gn)
("gperf" ,gperf) ("gperf" ,gperf)
("ld-wrapper" ,ld-wrapper-next)
("ninja" ,ninja) ("ninja" ,ninja)
("node" ,node) ("node" ,node)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
@ -852,6 +868,16 @@ disabled in order to protect the users privacy.")
,@(package-inputs ungoogled-chromium))) ,@(package-inputs ungoogled-chromium)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ungoogled-chromium) (substitute-keyword-arguments (package-arguments ungoogled-chromium)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'add-ozone-patch
(lambda _
;; Add missing include statement required when using libstdc++,
;; Clang and Ozone. Fixed in M81.
(substitute* "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc"
(("#include \"base/logging\\.h" all)
(string-append "#include <algorithm>\n" all)))
#t))))
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list "use_ozone=true" `(append (list "use_ozone=true"
"ozone_platform_wayland=true" "ozone_platform_wayland=true"

View file

@ -1580,6 +1580,7 @@ recreates the stored directory structure by default.")
(package (package
(name "zziplib") (name "zziplib")
(version "0.13.69") (version "0.13.69")
(replacement zziplib/fixed)
(home-page "https://github.com/gdraheim/zziplib") (home-page "https://github.com/gdraheim/zziplib")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -1617,21 +1618,29 @@ recreates the stored directory structure by default.")
;; files carry the Zlib license; see "docs/copying.html" for details. ;; files carry the Zlib license; see "docs/copying.html" for details.
(license (list license:lgpl2.0+ license:mpl1.1)))) (license (list license:lgpl2.0+ license:mpl1.1))))
(define zziplib/fixed
(package
(inherit zziplib)
(source (origin
(inherit (package-source zziplib))
(patches (search-patches "zziplib-CVE-2018-16548.patch"))))))
(define-public libzip (define-public libzip
(package (package
(name "libzip") (name "libzip")
(version "1.5.2") (version "1.6.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://libzip.org/download/libzip-" version ".tar.xz")) "https://libzip.org/download/libzip-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1d53shcy7nvls5db573bbdlm25lfz1iw2zshng5f00cssi5lvpmk")))) "0h9nsgkw0dk4srsvmz6xy6f9l4h815xn07j8h40l8gqvcxxaqpbh"))))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(inputs (inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
("liblzma" ,xz)
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(build-system cmake-build-system) (build-system cmake-build-system)
@ -1899,15 +1908,14 @@ decompression is a little bit slower.")
(define-public upx (define-public upx
(package (package
(name "upx") (name "upx")
(version "3.94") (version "3.96")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/upx/upx/releases/download/v" (uri (string-append "https://github.com/upx/upx/releases/download/v"
version "/" name "-" version "-src.tar.xz")) version "/upx-" version "-src.tar.xz"))
(sha256 (sha256
(base32 (base32
"08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1")) "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7"))))
(patches (search-patches "upx-fix-CVE-2017-15056.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
@ -1916,36 +1924,25 @@ decompression is a little bit slower.")
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:make-flags `(#:make-flags
(list "all" (list "all")
;; CHECK_WHITESPACE does not seem to work.
;; See https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/upx.
"CHECK_WHITESPACE=true")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure) ; no configure script
(delete 'check) (delete 'check) ; no test suite
(delete 'install)
(add-before 'build 'patch-exec-bin-sh (add-before 'build 'patch-exec-bin-sh
(lambda _ (lambda _
(substitute* (find-files "Makefile") (substitute* (list "Makefile"
(("/bin/sh") (which "sh"))) "src/Makefile")
(substitute* "src/Makefile"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
#t)) #t))
(add-after 'build 'install-upx (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))) (bin (string-append out "/bin")))
(mkdir-p bin) (mkdir-p bin)
(copy-file "src/upx.out" (string-append bin "/upx"))) (copy-file "src/upx.out" (string-append bin "/upx")))
#t)) #t)))))
)))
(home-page "https://upx.github.io/") (home-page "https://upx.github.io/")
;; CVE-2017-16869 is about Mach-O files which is not of a big concern for Guix.
;; See https://github.com/upx/upx/issues/146 and
;; https://nvd.nist.gov/vuln/detail?vulnId=CVE-2017-16869.
;; The issue will be fixed after version 3.94.
(properties `((lint-hidden-cve . ("CVE-2017-16869"))))
(synopsis "Compression tool for executables") (synopsis "Compression tool for executables")
(description (description
"The Ultimate Packer for eXecutables (UPX) is an executable file "The Ultimate Packer for eXecutables (UPX) is an executable file

View file

@ -3,7 +3,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -44,14 +44,14 @@
(define-public connman (define-public connman
(package (package
(name "connman") (name "connman")
(version "1.37") (version "1.38")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/network/connman/" (uri (string-append "mirror://kernel.org/linux/network/connman/"
"connman-" version ".tar.xz")) "connman-" version ".tar.xz"))
(sha256 (sha256
(base32 "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc")))) (base32 "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -74,6 +74,7 @@
("glib" ,glib) ("glib" ,glib)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("iptables" ,iptables) ("iptables" ,iptables)
("libmnl" ,libmnl)
("readline" ,readline) ("readline" ,readline)
;; These inputs are needed for connman to include the interface to ;; These inputs are needed for connman to include the interface to
;; these technologies so IF they are installed they can be used. ;; these technologies so IF they are installed they can be used.

View file

@ -6,6 +6,8 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -410,3 +412,75 @@ SObjectizer supports not only the Actor Model but also the Publish-Subscribe
Model and CSP-like channels. The goal of SObjectizer is to simplify Model and CSP-like channels. The goal of SObjectizer is to simplify
development of concurrent and multithreaded applications in C++.") development of concurrent and multithreaded applications in C++.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public tweeny
(package
(name "tweeny")
(version "3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mobius3/tweeny.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1adm4c17pi7xf3kf6sjyxibz5rdg1ka236p72xsm6js4j9gzlbp4"))))
(arguments
'(#:tests? #f)) ;no check target
(build-system cmake-build-system)
(home-page "https://mobius3.github.io/tweeny/")
(synopsis "Modern C++ tweening library")
(description "@code{Tweeny} is an inbetweening library designed for the
creation of complex animations for games and other beautiful interactive
software. It leverages features of modern @code{C++} to empower developers with
an intuitive API for declaring tweenings of any type of value, as long as they
support arithmetic operations. The goal of @code{Tweeny} is to provide means to
create fluid interpolations when animating position, scale, rotation, frames or
other values of screen objects, by setting their values as the tween starting
point and then, after each tween step, plugging back the result.")
(license license:expat)))
(define-public abseil-cpp
(package
(name "abseil-cpp")
(version "20200225")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/abseil/abseil-cpp.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0wb04pszzrl39ny1pz9jvvq8lbbm355dd60jspcyqfwxnk6njgd1"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
"-DABSL_RUN_TESTS=ON"
;; Needed, else we get errors like:
;;
;; ld: CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o:
;; undefined reference to symbol '_ZN7testing4Mock16UnregisterLockedEPNS_8internal25UntypedFunctionMockerBaseE'
;; ld: /gnu/store/bxapb1f1l8frjpbjckk3zdxhmcig3xzk-googletest-1.10.0/lib/libgmock.so:
;; error adding symbols: DSO missing from command line
;; collect2: error: ld returned 1 exit status
"-DCMAKE_EXE_LINKER_FLAGS=-lgtest -lpthread -lgmock")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'remove-gtest-check
;; The CMakeLists fails to find our googletest for some reason, but
;; it works nonetheless.
(lambda _
(substitute* "CMakeLists.txt"
(("check_target\\(gtest\\)") "")
(("check_target\\(gtest_main\\)") "")
(("check_target\\(gmock\\)") "")))))))
(native-inputs
`(("googletest" ,googletest)))
(home-page "https://abseil.io")
(synopsis "Augmented C++ standard library")
(description "Abseil is a collection of C++ library code designed to
augment the C++ standard library. The Abseil library code is collected from
Google's C++ code base.")
(license license:asl2.0)))

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -71,6 +71,7 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix utils)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)) #:use-module (srfi srfi-26))
@ -601,7 +602,7 @@ data on your platform, so the seed itself will be as random as possible.
(define-public crypto++ (define-public crypto++
(package (package
(name "crypto++") (name "crypto++")
(version "8.0.0") (version "8.2.0")
(source (origin (source (origin
(method url-fetch/zipbomb) (method url-fetch/zipbomb)
(uri (string-append "https://cryptopp.com/cryptopp" (uri (string-append "https://cryptopp.com/cryptopp"
@ -609,7 +610,7 @@ data on your platform, so the seed itself will be as random as possible.
".zip")) ".zip"))
(sha256 (sha256
(base32 (base32
"0b5qrsm4jhy4nzxgrm13nixhvbswr242plx1jw6r4sw492rqkzdv")))) "0n40hlz5jkvlcp9vxrj0fsrcfp7dm0zmmv6h52dx3f8i5qjf5w03"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -627,19 +628,25 @@ data on your platform, so the seed itself will be as random as possible.
((" -march=native") "")) ((" -march=native") ""))
#t)) #t))
(delete 'configure) (delete 'configure)
(add-after 'build 'build-shared (replace 'build
(lambda _ ;; By default, only the static library is built.
;; By default, only the static library is built. (lambda* (#:key (make-flags '()) #:allow-other-keys)
(invoke "make" "shared"))) (apply invoke "make" "shared"
"-j" (number->string (parallel-job-count))
make-flags)))
(add-after 'install 'install-shared-library-links (add-after 'install 'install-shared-library-links
;; By default, only .so and .so.x.y.z are installed. ;; By default, only .so and .so.x.y.z are installed.
;; Create all the intermediates expected by dependent packages. ;; Create all the intermediates expected by dependent packages.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))) (lib (string-append out "/lib"))
(prefix "libcryptopp.so.")
(target (string-append prefix ,version)))
(with-directory-excursion lib (with-directory-excursion lib
(symlink "libcryptopp.so.8.0.0" "libcryptopp.so.8.0") (symlink target
(symlink "libcryptopp.so.8.0.0" "libcryptopp.so.8") (string-append prefix ,(version-major+minor version)))
(symlink target
(string-append prefix ,(version-major version)))
#t)))) #t))))
(add-after 'install 'install-pkg-config (add-after 'install 'install-pkg-config
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -657,7 +664,8 @@ data on your platform, so the seed itself will be as random as possible.
"Description: Class library of cryptographic schemes" "Description: Class library of cryptographic schemes"
"Version: " ,version "\n" "Version: " ,version "\n"
"Libs: -L${libdir} -lcryptopp\n" "Libs: -L${libdir} -lcryptopp\n"
"Cflags: -I${includedir}\n")))))))))) "Cflags: -I${includedir}\n"))
#t))))))))
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
(home-page "https://cryptopp.com/") (home-page "https://cryptopp.com/")

View file

@ -19,7 +19,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017, 2020 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@ -39,6 +39,7 @@
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1060,9 +1061,10 @@ Most public APIs are compatible with @command{mysqlclient} and MySQLdb.")
"0gmpvhn02pkq280ffmn4da1g4mdr1xxz7l80b7y4n7km1mrzwrml")))) "0gmpvhn02pkq280ffmn4da1g4mdr1xxz7l80b7y4n7km1mrzwrml"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`( #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib")))) "/lib"))
#:make-flags (list "CFLAGS=-fPIC")))
(home-page "http://fallabs.com/qdbm") (home-page "http://fallabs.com/qdbm")
(synopsis "Key-value database") (synopsis "Key-value database")
(description "QDBM is a library of routines for managing a (description "QDBM is a library of routines for managing a
@ -2105,6 +2107,35 @@ multiple cores. The size of each database is limited only by the size of the
virtual address space not physical RAM.") virtual address space not physical RAM.")
(license license:openldap2.8))) (license license:openldap2.8)))
(define-public lmdbxx
(package
(name "lmdbxx")
(version "0.9.14.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/drycpp/lmdbxx.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6"))))
(arguments
`(#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(build-system gnu-build-system)
(inputs `(("lmdb" ,lmdb)))
(home-page "http://lmdbxx.sourceforge.net")
(synopsis "C++11 wrapper for the LMDB embedded B+ tree database library")
(description "@code{lmdbxx} is a comprehensive @code{C++} wrapper for the
@code{LMDB} embedded database library, offering both an error-checked
procedural interface and an object-oriented resource interface with RAII
semantics.")
(license license:unlicense)))
(define-public libpqxx (define-public libpqxx
(package (package
(name "libpqxx") (name "libpqxx")
@ -2248,13 +2279,13 @@ for ODBC.")
(define-public python-pyodbc (define-public python-pyodbc
(package (package
(name "python-pyodbc") (name "python-pyodbc")
(version "4.0.27") (version "4.0.30")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyodbc" version)) (uri (pypi-uri "pyodbc" version))
(sha256 (sha256
(base32 "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib")) (base32 "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5"))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
@ -2721,7 +2752,7 @@ being idiomatic to Python.")
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2)) `(#:python ,python-2))
(home-page "http://py2neo.org") (home-page "https://py2neo.org")
(synopsis "Library and toolkit for working with Neo4j in Python") (synopsis "Library and toolkit for working with Neo4j in Python")
(description "This package provides a client library and toolkit for (description "This package provides a client library and toolkit for
working with Neo4j from within Python applications and from the command working with Neo4j from within Python applications and from the command
@ -2911,7 +2942,7 @@ reasonable substitute.")
(propagated-inputs (propagated-inputs
`(("python-click" ,python-click) `(("python-click" ,python-click)
("python-redis" ,python-redis))) ("python-redis" ,python-redis)))
(home-page "http://python-rq.org/") (home-page "https://python-rq.org/")
(synopsis "Simple job queues for Python") (synopsis "Simple job queues for Python")
(description (description
"RQ (Redis Queue) is a simple Python library for queueing jobs and "RQ (Redis Queue) is a simple Python library for queueing jobs and

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -29,7 +29,7 @@
(define-public datamash (define-public datamash
(package (package
(name "datamash") (name "datamash")
(version "1.5") (version "1.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -37,7 +37,7 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2")))) "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr"))))
(native-inputs (native-inputs
`(("which" ,which) ;for tests `(("which" ,which) ;for tests
("perl" ,perl))) ;for help2man ("perl" ,perl))) ;for help2man

View file

@ -54,7 +54,7 @@ and edited by calendar and contact clients on mobile phones or computers.
Radicale intentionally does not fully comply with the CalDAV and CardDAV RFCs. Radicale intentionally does not fully comply with the CalDAV and CardDAV RFCs.
Instead, it supports the CalDAV and CardDAV implementations of popular Instead, it supports the CalDAV and CardDAV implementations of popular
clients.") clients.")
(home-page "http://radicale.org/") (home-page "https://radicale.org/")
(license gpl3+))) (license gpl3+)))
(define-public vdirsyncer (define-public vdirsyncer

View file

@ -117,7 +117,7 @@ contains the archive keys used for that.")
(define-public debootstrap (define-public debootstrap
(package (package
(name "debootstrap") (name "debootstrap")
(version "1.0.114") (version "1.0.119")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -127,7 +127,7 @@ contains the archive keys used for that.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"147308flz9y8g6f972izi3szmsywf5f8xm64z2smy1cayd340i63")))) "0p0p8qmlsbvpfa0r7ifghr67zrrc96d83r9qwahzaxyxkvnhr4x4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

View file

@ -3,7 +3,7 @@
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
@ -31,6 +31,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system copy)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
@ -109,25 +110,10 @@ acronyms distributed as an info document.")
(sha256 (sha256
(base32 (base32
"1n3bp91sik66z3ca7mjqbr9nck3hg5ck0c8g84xc0qnfpx5vznh2")))) "1n3bp91sik66z3ca7mjqbr9nck3hg5ck0c8g84xc0qnfpx5vznh2"))))
(build-system trivial-build-system) (build-system copy-build-system)
(arguments (arguments
'(#:builder (begin '(#:install-plan
(use-modules (guix build utils)) '(("." "share/gcide/" #:exclude ("COPYING")))))
(let* ((src (assoc-ref %build-inputs "source"))
(tar (assoc-ref %build-inputs "tar"))
(xz (assoc-ref %build-inputs "xz"))
(out (assoc-ref %outputs "out"))
(datadir (string-append out "/share/gcide")))
(set-path-environment-variable "PATH" '("bin")
(list tar xz))
(mkdir-p datadir)
(invoke "tar" "-C" datadir
"--strip-components=1"
"-xvf" src)))
#:modules ((guix build utils))))
(native-inputs
`(("tar" ,tar)
("xz" ,xz)))
(synopsis "GNU Collaborative International Dictionary of English") (synopsis "GNU Collaborative International Dictionary of English")
(description (description
"GCIDE is a free dictionary based on a combination of sources. It can "GCIDE is a free dictionary based on a combination of sources. It can
@ -140,14 +126,14 @@ http://gcide.gnu.org.ua/")
;; Not quite a dictionary, not quite a spell checker either… ;; Not quite a dictionary, not quite a spell checker either…
(package (package
(name "diction") (name "diction")
(version "1.11") (version "1.14")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "mirror://gnu/diction/diction-" (method url-fetch)
version ".tar.gz")) (uri (string-append "http://www.moria.de/~michael/diction/diction-"
(sha256 version ".tar.gz"))
(base32 (sha256
"1xi4l1x1vvzmzmbhpx0ghmfnwwrhabjwizrpyylmy3fzinzz3him")))) (base32 "1z6p5x3l1a00h4v4s33qa82fznzc1jdqdnlc4dnmd9nblnrjy0fs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Identifies wordy and commonly misused phrases") (synopsis "Identifies wordy and commonly misused phrases")
(description (description
@ -312,7 +298,7 @@ translation engines from your terminal.")
(define-public lttoolbox (define-public lttoolbox
(package (package
(name "lttoolbox") (name "lttoolbox")
(version "3.5.0") (version "3.5.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -320,14 +306,23 @@ translation engines from your terminal.")
"https://github.com/apertium/lttoolbox/releases/download/v" "https://github.com/apertium/lttoolbox/releases/download/v"
version "/lttoolbox-" version ".tar.gz")) version "/lttoolbox-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "14yyrkzyqlsrii3v3ggg4dyvwlrcqcqc0aprphz5781a44jsrcwz"))))
"08y6pf1hl7prwygy1g8h6ndqww18pmb9f3r5988q0pcrp8w6xz6b"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'bootstrap
;; The included ./autogen.sh unconditionally runs ./configure before
;; its shebangs have been patched.
(lambda _
(invoke "autoreconf" "-vfi"))))))
(inputs (inputs
`(("libxml2" ,libxml2))) `(("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(home-page "http://wiki.apertium.org/wiki/Lttoolbox") (home-page "http://wiki.apertium.org/wiki/Lttoolbox")
(synopsis "Lexical processing toolbox") (synopsis "Lexical processing toolbox")
(description "Lttoolbox is a toolbox for lexical processing, morphological (description "Lttoolbox is a toolbox for lexical processing, morphological

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@reproducible-builds.org> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@reproducible-builds.org>
@ -68,7 +68,7 @@
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public diffoscope (define-public diffoscope
(let ((version "136")) (let ((version "137"))
(package (package
(name "diffoscope") (name "diffoscope")
(version version) (version version)
@ -80,7 +80,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1wp4fnmwcsgv17dmvk9xr3h63gp4nmmpysr248qvxs8s5qy5xlyk")))) "11llnh2h2mx3xygj4482ld1rnjnhszk4828pmcbi75kanxfrqzq6"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

View file

@ -3,7 +3,7 @@
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
@ -163,15 +163,14 @@ tables, and it understands a variety of different formats.")
(define-public gptfdisk (define-public gptfdisk
(package (package
(name "gptfdisk") (name "gptfdisk")
(version "1.0.4") (version "1.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/" (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
version "/" name "-" version ".tar.gz")) version "/gptfdisk-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f"))))
"13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -182,10 +181,14 @@ tables, and it understands a variety of different formats.")
`(#:test-target "test" `(#:test-target "test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; no configure script (add-after 'unpack 'fix-include-directory
(delete 'configure) (lambda _
;; no install target (substitute* "gptcurses.cc"
(("ncursesw/ncurses.h") "ncurses.h"))
#t))
(delete 'configure) ; no configure script
(replace 'install (replace 'install
;; There's no make install target.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
@ -209,14 +212,14 @@ scheme.")
(define-public ddrescue (define-public ddrescue
(package (package
(name "ddrescue") (name "ddrescue")
(version "1.24") (version "1.25")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/ddrescue/ddrescue-" (uri (string-append "mirror://gnu/ddrescue/ddrescue-"
version ".tar.lz")) version ".tar.lz"))
(sha256 (sha256
(base32 "11qh0bbzf00mfb4yq35gnv5m260k4d7q9ixklry6bqvhvvp3ypab")))) (base32 "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.gnu.org/software/ddrescue/ddrescue.html") (home-page "https://www.gnu.org/software/ddrescue/ddrescue.html")
(synopsis "Data recovery utility") (synopsis "Data recovery utility")

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Brant Gardner <brantcgardner@brantware.com> ;;; Copyright © 2019 Brant Gardner <brantcgardner@brantware.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -43,7 +43,7 @@
(define-public boinc-client (define-public boinc-client
(package (package
(name "boinc-client") (name "boinc-client")
(version "7.16.3") (version "7.16.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -54,7 +54,7 @@
(file-name (git-file-name "boinc" version)) (file-name (git-file-name "boinc" version))
(sha256 (sha256
(base32 (base32
"1l181s7wnx0xd7m62qjixdjw4ri87q47xi0x662m2jsh9lzb8khf")))) "08xx2kzb7c46k1zb91w74kyig3b5kilxdw5ilfs67r8p55mxk0g1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:configure-flags '("--disable-server"))) (arguments '(#:configure-flags '("--disable-server")))
(inputs `(("openssl" ,openssl) (inputs `(("openssl" ,openssl)
@ -71,7 +71,7 @@
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(synopsis "BOINC lets you help cutting-edge science research using your computer") (synopsis "Help cutting-edge science research using your computer")
(description "BOINC is a platform for high-throughput computing on a large (description "BOINC is a platform for high-throughput computing on a large
scale (thousands or millions of computers). It can be used for volunteer scale (thousands or millions of computers). It can be used for volunteer
computing (using consumer devices) or grid computing (using organizational computing (using consumer devices) or grid computing (using organizational

View file

@ -42,13 +42,13 @@
(define-public python-django (define-public python-django
(package (package
(name "python-django") (name "python-django")
(version "1.11.25") (version "1.11.28")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"0rpgx212n8gh61nwizkyldvskna808xpcvawmavk5mc5c9cfh52k")))) "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:modules ((srfi srfi-1) '(#:modules ((srfi srfi-1)
@ -248,7 +248,7 @@ with arguments to the field constructor.")
("python-setuptools-scm" ,python-setuptools-scm))) ("python-setuptools-scm" ,python-setuptools-scm)))
(propagated-inputs (propagated-inputs
`(("python-pytest" ,python-pytest))) `(("python-pytest" ,python-pytest)))
(home-page "http://pytest-django.readthedocs.org/") (home-page "https://pytest-django.readthedocs.org/")
(synopsis "Django plugin for py.test") (synopsis "Django plugin for py.test")
(description "Pytest-django is a plugin for py.test that provides a set of (description "Pytest-django is a plugin for py.test that provides a set of
useful tools for testing Django applications and projects.") useful tools for testing Django applications and projects.")
@ -930,7 +930,7 @@ static files.")
("python2-pytest-catchlog" ,python2-pytest-catchlog) ("python2-pytest-catchlog" ,python2-pytest-catchlog)
("python2-pytest-cov" ,python2-pytest-cov) ("python2-pytest-cov" ,python2-pytest-cov)
("python2-factory-boy" ,python2-factory-boy))) ("python2-factory-boy" ,python2-factory-boy)))
(home-page "http://pootle.translatehouse.org/") (home-page "https://pootle.translatehouse.org/")
(synopsis "Community localization server") (synopsis "Community localization server")
(description (description
"Pootle is an online translation and localization tool. It works to "Pootle is an online translation and localization tool. It works to

View file

@ -124,32 +124,32 @@ and BOOTP/TFTP for network booting of diskless machines.")
(define-public isc-bind (define-public isc-bind
(package (package
(name "bind") (name "bind")
(version "9.14.10") (version "9.16.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://ftp.isc.org/isc/bind9/" version "https://ftp.isc.org/isc/bind9/" version
"/bind-" version ".tar.gz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0nkkc2phkkzwgl922xg41gx5pc5f4safabqslaw3880hwdf8vfaa")))) "0a1f1wrlbnmq79q6s15fny36ip81malg6wlr8acp7amimsyxjjxg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs `("out" "utils")) (outputs `("out" "utils"))
(inputs (inputs
;; It would be nice to add GeoIP and gssapi once there are packages. ;; It would be nice to add GeoIP and gssapi once there are packages.
`(("libcap" ,libcap) `(("libcap" ,libcap)
("libuv" ,libuv)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("openssl" ,openssl) ("openssl" ,openssl)
("p11-kit" ,p11-kit) ("p11-kit" ,p11-kit)
("python" ,python) ("python" ,python)
("python-ply" ,python-ply))) ("python-ply" ,python-ply)))
(native-inputs `(("perl" ,perl) (native-inputs
("net-tools" ,net-tools))) `(("perl" ,perl)
("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-openssl=" (list (string-append "--with-pkcs11="
(assoc-ref %build-inputs "openssl"))
(string-append "--with-pkcs11="
(assoc-ref %build-inputs "p11-kit"))) (assoc-ref %build-inputs "p11-kit")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -288,22 +288,18 @@ the two.")
(define-public libasr (define-public libasr
(package (package
(name "libasr") (name "libasr")
(version "1.0.3") (version "1.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.opensmtpd.org/archives/" (uri (string-append "https://www.opensmtpd.org/archives/"
"libasr-" version ".tar.gz")) "libasr-" version ".tar.gz"))
(sha256 (sha256
(base32 "13fn4sr4vlcx1xijpl26nmnxawyls4lr5q3mi11jdm76f80qxn4w")))) (base32 "1d6s8njqhvayx2gp47409sp1fn8m608ws26hr1srfp6i23nnpyqr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'bootstrap
;; GNU build system bootstrapping not needed, the default lies.
(lambda _
(invoke "sh" "./bootstrap")))
(add-after 'install 'install-documentation (add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -400,14 +396,14 @@ to result in system-wide compromise.")
(define-public unbound (define-public unbound
(package (package
(name "unbound") (name "unbound")
(version "1.9.5") (version "1.9.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.unbound.net/downloads/unbound-" (uri (string-append "https://www.unbound.net/downloads/unbound-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca")))) (base32 "1w5aylh2gfvfvqkgrq46aw427x9c0a3hwm0f985s55wim5pgr60x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "python")) (outputs '("out" "python"))
(native-inputs (native-inputs
@ -592,7 +588,7 @@ served by AS112. Stub and forward zones are supported.")
"--enable-nsec" "--enable-nsec"
"--enable-nsec3" "--enable-nsec3"
"--enable-tsig"))) "--enable-tsig")))
(home-page "http://www.yadifa.eu/") (home-page "https://www.yadifa.eu/")
(synopsis "Authoritative DNS name server") (synopsis "Authoritative DNS name server")
(description "YADIFA is an authoritative name server for the @dfn{Domain (description "YADIFA is an authoritative name server for the @dfn{Domain
Name System} (DNS). It aims for both higher performance and a smaller memory Name System} (DNS). It aims for both higher performance and a smaller memory
@ -751,20 +747,20 @@ LuaJIT, both a resolver library and a daemon.")
(define-public ddclient (define-public ddclient
(package (package
(name "ddclient") (name "ddclient")
(version "3.9.0") (version "3.9.1")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "mirror://sourceforge/ddclient/ddclient/ddclient-" (method git-fetch)
version "/ddclient-" version ".tar.gz")) (uri (git-reference
(sha256 (url "https://github.com/ddclient/ddclient.git")
(base32 (commit (string-append "v" version))))
"0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw")))) (file-name (git-file-name name version))
(sha256
(base32 "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w"))))
(build-system trivial-build-system) ; no Makefile.PL (build-system trivial-build-system) ; no Makefile.PL
(native-inputs (native-inputs
`(("bash" ,bash) `(("bash" ,bash)
("gzip" ,gzip) ("perl" ,perl)))
("perl" ,perl)
("tar" ,tar)))
(inputs (inputs
`(("inetutils" ,inetutils) ; logger `(("inetutils" ,inetutils) ; logger
("net-tools" ,net-tools) ("net-tools" ,net-tools)
@ -780,48 +776,46 @@ LuaJIT, both a resolver library and a daemon.")
(use-modules (guix build utils) (use-modules (guix build utils)
(ice-9 match) (ice-9 match)
(srfi srfi-26)) (srfi srfi-26))
;; bootstrap
(setenv "PATH" (string-append (setenv "PATH" (string-append
(assoc-ref %build-inputs "bash") "/bin" ":" (assoc-ref %build-inputs "bash") "/bin" ":"
(assoc-ref %build-inputs "tar") "/bin" ":"
(assoc-ref %build-inputs "gzip") "/bin" ":"
(assoc-ref %build-inputs "perl") "/bin")) (assoc-ref %build-inputs "perl") "/bin"))
;; extract source
(invoke "tar" "xvf" (assoc-ref %build-inputs "source")) ;; Copy the (read-only) source into the (writable) build directory.
;; package (copy-recursively (assoc-ref %build-inputs "source") ".")
(with-directory-excursion (string-append ,name "-" ,version)
(let* ((out (assoc-ref %outputs "out")) ;; Install.
(bin (string-append out "/bin"))) (let* ((out (assoc-ref %outputs "out"))
(let ((file "ddclient")) (bin (string-append out "/bin")))
(substitute* file (let ((file "ddclient"))
(("/usr/bin/perl") (which "perl")) (substitute* file
;; Strictly use /etc/ddclient/ddclient.conf. (("/usr/bin/perl") (which "perl"))
(("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf") ;; Strictly use /etc/ddclient/ddclient.conf.
(("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf") (("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf")
;; Strictly use /var/cache/ddclient/ddclient.cache (("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf")
(("\\$cachedir\\$program\\.cache") ;; Strictly use /var/cache/ddclient/ddclient.cache
"/var/cache/ddclient/ddclient.cache")) (("\\$cachedir\\$program\\.cache")
(install-file file bin) "/var/cache/ddclient/ddclient.cache"))
(wrap-program (string-append bin "/" file) (install-file file bin)
`("PATH" ":" = (wrap-program (string-append bin "/" file)
("$PATH" `("PATH" ":" =
,@(map (lambda (input) ("$PATH"
(match input ,@(map (lambda (input)
((name . store) (match input
(string-append store "/bin")))) ((name . store)
%build-inputs))) (string-append store "/bin"))))
`("PERL5LIB" ":" = %build-inputs)))
,(delete `("PERL5LIB" ":" =
"" ,(delete
(map (match-lambda ""
(((? (cut string-prefix? "perl-" <>) name) . dir) (map (match-lambda
(string-append dir "/lib/perl5/site_perl")) (((? (cut string-prefix? "perl-" <>) name) . dir)
(_ "")) (string-append dir "/lib/perl5/site_perl"))
%build-inputs))))) (_ ""))
(for-each (cut install-file <> (string-append out %build-inputs)))))
"/share/ddclient")) (for-each (cut install-file <> (string-append out
(find-files "." "sample.*$"))))))) "/share/ddclient"))
(home-page "https://sourceforge.net/projects/ddclient/") (find-files "." "sample.*$"))))))
(home-page "https://ddclient.net/")
(synopsis "Address updating utility for dynamic DNS services") (synopsis "Address updating utility for dynamic DNS services")
(description "This package provides a client to update dynamic IP (description "This package provides a client to update dynamic IP
addresses with several dynamic DNS service providers, such as addresses with several dynamic DNS service providers, such as

View file

@ -183,7 +183,9 @@ Python without keeping their credentials in a Docker configuration file.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0")))) (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"))
(patches
(search-patches "containerd-test-with-go1.13.patch"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/containerd/containerd" `(#:import-path "github.com/containerd/containerd"
@ -236,7 +238,7 @@ Python without keeping their credentials in a Docker configuration file.")
(description "This package provides the container daemon for Docker. (description "This package provides the container daemon for Docker.
It includes image transfer and storage, container execution and supervision, It includes image transfer and storage, container execution and supervision,
network attachments.") network attachments.")
(home-page "http://containerd.io/") (home-page "https://containerd.io/")
(license license:asl2.0))) (license license:asl2.0)))
;;; Private package that shouldn't be used directly; its purposes is to be ;;; Private package that shouldn't be used directly; its purposes is to be

View file

@ -8,6 +8,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,6 +29,7 @@
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -122,6 +124,29 @@ the backend output markups (which can be almost any type of SGML/XML
markup) can be customized and extended by the user.") markup) can be customized and extended by the user.")
(license gpl2+))) (license gpl2+)))
(define-public asciidoc-py3
(package (inherit asciidoc)
(name "asciidoc-py3")
(version "9.0.0rc1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/asciidoc/asciidoc-py3/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1v815dgab62970m9cr2crwbh4kvlzk6pv3hk4bzv6gfa4lbwfkfl"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)))
(inputs
`(("python" ,python)
("docbook-xml" ,docbook-xml)
("docbook-xsl" ,docbook-xsl)
("libxml2" ,libxml2)
("libxslt" ,libxslt)))))
(define-public doxygen (define-public doxygen
(package (package
(name "doxygen") (name "doxygen")

View file

@ -227,7 +227,7 @@
(delete-file-recursively font-dest) (delete-file-recursively font-dest)
(symlink font-src font-dest)) (symlink font-src font-dest))
#t))))) #t)))))
(home-page "http://calibre-ebook.com/") (home-page "https://calibre-ebook.com/")
(synopsis "E-book library management software") (synopsis "E-book library management software")
(description "Calibre is an e-book library manager. It can view, convert (description "Calibre is an e-book library manager. It can view, convert
and catalog e-books in most of the major e-book formats. It can also talk and catalog e-books in most of the major e-book formats. It can also talk

View file

@ -3,7 +3,7 @@
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net> ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;; ;;;
@ -132,7 +132,7 @@ of categories with some of the activities available in that category.
(define-public gcompris-qt (define-public gcompris-qt
(package (package
(name "gcompris-qt") (name "gcompris-qt")
(version "0.97") (version "0.98")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -140,7 +140,7 @@ of categories with some of the activities available in that category.
"https://gcompris.net/download/qt/src/gcompris-qt-" "https://gcompris.net/download/qt/src/gcompris-qt-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "0hl3a1jjnrpnbqkpx3rl3fl86yfv503lh48djb888hplvr4nf747")))) (base32 "1jmjykn0lpk0v6hs2flmch8v4da5bgxl891nav7szxw9l7aqnf4y"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -602,14 +602,14 @@ Portuguese, Spanish and Italian.")
(define-public fet (define-public fet
(package (package
(name "fet") (name "fet")
(version "5.42.3") (version "5.43.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.lalescu.ro/liviu/fet/download/" (uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
"fet-" version ".tar.bz2")) "fet-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0z31i8kwd59c3hlq35qll61qhc3x63w330ss92glhp12iy0aja1y")))) (base32 "111ijwdpdnavi2jjp8jqnwkgi1b9n79svkfw68fmga0z7d3nd62g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -64,7 +64,7 @@ environment presented by Intel's EFI.")
(define-public sbsigntools (define-public sbsigntools
(package (package
(name "sbsigntools") (name "sbsigntools")
(version "0.9.2") (version "0.9.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -75,8 +75,7 @@ environment presented by Intel's EFI.")
(recursive? #t))) (recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "0gc3xmp73xl7z4nkwz4qy960rdflmx7k4ksgyblcnia9smvsir6y"))))
"116649ixr6gvw9fqiljfflxsv4293hgm73bmba5ilxrzn4kpbzvb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

View file

@ -33,7 +33,7 @@
(define-public elixir (define-public elixir
(package (package
(name "elixir") (name "elixir")
(version "1.9.4") (version "1.10.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -42,7 +42,7 @@
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1l4318g35y4h0vi2w07ayc3jizw1xc3s7hdb47w6j3iw33y06g6b")) (base32 "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6"))
(patches (search-patches "elixir-path-length.patch")))) (patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

View file

@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017, 2018, 2019 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016, 2017, 2018, 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2015, 2016, 2018 Christopher Lemmer Webber <cwebber@dustycloud.org> ;;; Copyright © 2015, 2016, 2018 Christopher Lemmer Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2016 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
@ -16,7 +16,7 @@
;;; Copyright © 2016, 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org>
@ -58,6 +58,8 @@
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 David Wilson <david@daviwil.com> ;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -134,6 +136,7 @@
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pdf) #:use-module (gnu packages pdf)
#:use-module (gnu packages rust-apps)
#:use-module (gnu packages scheme) #:use-module (gnu packages scheme)
#:use-module (gnu packages speech) #:use-module (gnu packages speech)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
@ -152,6 +155,7 @@
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages wordnet) #:use-module (gnu packages wordnet)
#:use-module (gnu packages photo)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
@ -163,7 +167,7 @@
(define-public emacs-geiser (define-public emacs-geiser
(package (package
(name "emacs-geiser") (name "emacs-geiser")
(version "0.11") (version "0.11.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -172,7 +176,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0fb2h984hn7bnyiziplp7kgk29zdzc9yainsv0k1li436irlp9dd")))) "1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -966,13 +970,13 @@ in certain cases. It also enables recursion for anonymous functions.")
(define-public emacs-xr (define-public emacs-xr
(package (package
(name "emacs-xr") (name "emacs-xr")
(version "1.15") (version "1.16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar")) (uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar"))
(sha256 (sha256
(base32 "0pxzr6n0qa29ly8j3cl46rv9a65ajfcgahrhdylg4yfb9gh1x4ly")))) (base32 "1s6pkbr7gkan0r9gfmix75m587d8cg6l11722v70zzgf2z9w2xg9"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/xr.html") (home-page "https://elpa.gnu.org/packages/xr.html")
(synopsis "Convert string regexp to rx notation") (synopsis "Convert string regexp to rx notation")
@ -1070,14 +1074,14 @@ optional minor mode which can apply this command automatically on save.")
(define-public emacs-relint (define-public emacs-relint
(package (package
(name "emacs-relint") (name "emacs-relint")
(version "1.13") (version "1.14")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://elpa.gnu.org/packages/relint-" version ".tar")) "https://elpa.gnu.org/packages/relint-" version ".tar"))
(sha256 (sha256
(base32 "1kzzlixhd6kp0mkmgn02b7pqv6m55g708xsys7vjskdxbfb6jjib")))) (base32 "0hjzhxcygb2r2s3g2pk3z9x3appy1y8gkw8gpg9cpkl6lpwcsh2f"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs `(("emacs-xr" ,emacs-xr))) (propagated-inputs `(("emacs-xr" ,emacs-xr)))
(home-page "https://github.com/mattiase/relint") (home-page "https://github.com/mattiase/relint")
@ -1659,9 +1663,24 @@ as a library for other Emacs packages.")
(arguments (arguments
`(#:emacs ,emacs `(#:emacs ,emacs
#:include '("\\.el$" "^images/" "^latex/" "\\.info$") #:include '("\\.el$" "^images/" "^latex/" "\\.info$")
#:exclude '("^tests/" "^latex/README"))) #:exclude '("^tests/" "^latex/README")
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(etc-dir (string-append out "/share/" ,name "/"
,version "/etc")))
(with-directory-excursion "doc"
(setenv "HOME" (getenv "TMPDIR")) ; for mktextfm
(invoke "pdftex" "tex-ref")
(install-file "tex-ref.pdf" (string-append etc-dir
"/refcards")))
#t))))))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(inputs
`(("texlive" ,(texlive-union (list texlive-amsfonts)))))
(home-page "https://www.gnu.org/software/auctex/") (home-page "https://www.gnu.org/software/auctex/")
(synopsis "Integrated environment for TeX") (synopsis "Integrated environment for TeX")
(description (description
@ -2778,6 +2797,43 @@ column by drawing a thin line down the length of the editing window.")
"This Emacs package allows managing multiple grep buffers.") "This Emacs package allows managing multiple grep buffers.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-rg
(package
(name "emacs-rg")
(version "1.8.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dajva/rg.el.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0k7x5z7mh9flwih35cqy8chs54rack3nswdcpw5wcpgv6xim227y"))))
(build-system emacs-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'hardcode-rg-path
;; Hardcode the path to ripgrep.
(lambda _
(let ((file "rg.el"))
(chmod file #o644)
(emacs-substitute-sexps file
("(defcustom rg-executable" (which "rg")))))))))
(propagated-inputs
`(("emacs-s" ,emacs-s)
("emacs-wgrep" ,emacs-wgrep)))
(inputs
`(("ripgrep" ,ripgrep)))
(home-page "https://rgel.readthedocs.io/en/latest/")
(synopsis "Search tool based on @code{ripgrep}")
(description
"@code{rg} is an Emacs search package based on the @code{ripgrep} command
line tool. It allows one to interactively search based on the editing context
then refine or modify the search results.")
(license license:gpl3+)))
(define-public emacs-inf-ruby (define-public emacs-inf-ruby
(package (package
(name "emacs-inf-ruby") (name "emacs-inf-ruby")
@ -3394,9 +3450,7 @@ for Flow files.")
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out"))
(version ,(version-major+minor (package-version python)))) (version ,(version-major+minor (package-version python))))
(with-directory-excursion (with-directory-excursion
(string-append out (string-append out "/share/emacs/site-lisp")
"/share/emacs/site-lisp/guix.d/"
"flycheck-grammalecte-" ,version)
(symlink (string-append grammalecte "/lib/" (symlink (string-append grammalecte "/lib/"
"python" version "/site-packages/" "python" version "/site-packages/"
"grammalecte") "grammalecte")
@ -4671,6 +4725,47 @@ number.")
@code{org-mode} to be rendered as UTF-8 characters.") @code{org-mode} to be rendered as UTF-8 characters.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-org-superstar
(package
(name "emacs-org-superstar")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/integral-dw/org-superstar-mode.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-org" ,emacs-org)))
(home-page "https://github.com/integral-dw/org-superstar-mode")
(synopsis "Prettify headings and plain lists in Org mode")
(description "This package prettifies headings and plain lists in
Org mode. It is a direct descendant of @code{org-bullets}, with most
of the code base completely rewritten.
Currently, this package prettifies Org heading lines by:
@itemize
@item replacing trailing bullets by UTF-8 bullets,
@item hiding leading stars, customizing their look or removing them from vision,
@item applying a custom face to the header bullet,
@item applying a custom face to the leading bullets,
@item using double-bullets for inline tasks,
@item (optional) using special bullets for TODO keywords.
@end itemize
It also prettifies Org plain list bullets by:
@itemize
@item replacing each bullet type (*, + and -) with UTF-8 bullets,
@item applying a custom face to item bullets.
@end itemize
Features degrade gracefully when viewed from terminal.")
(license license:gpl3+)))
(define-public emacs-org-pomodoro (define-public emacs-org-pomodoro
;; Last release version was from 2016. ;; Last release version was from 2016.
(let ((commit "aa07c11318f91219336197e62c47bc7a3d090479") (let ((commit "aa07c11318f91219336197e62c47bc7a3d090479")
@ -4902,16 +4997,16 @@ variants.")
(define-public emacs-solarized-theme (define-public emacs-solarized-theme
(package (package
(name "emacs-solarized-theme") (name "emacs-solarized-theme")
(version "1.2.2") (version "1.3.1")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/bbatsov/solarized-emacs/") (uri (git-reference
(commit (string-append "v" version)))) (url "https://github.com/bbatsov/solarized-emacs/")
(file-name (git-file-name name version)) (commit (string-append "v" version))))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3")))) (base32 "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash))) `(("emacs-dash" ,emacs-dash)))
@ -5258,6 +5353,28 @@ perspective only its buffers are available by default.")
;; the Expat license. ;; the Expat license.
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-persp-mode
(package
(name "emacs-persp-mode")
(version "2.9.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Bad-ptr/persp-mode.el.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g"))))
(build-system emacs-build-system)
(home-page "https://github.com/Bad-ptr/persp-mode.el")
(synopsis "Switch between named \"perspectives\" shared among frames")
(description
"This package extends @code{perspective.el} to enable perspectives that
can be saved to and restored from a file.")
(license license:gpl2+)))
(define-public emacs-test-simple (define-public emacs-test-simple
(package (package
(name "emacs-test-simple") (name "emacs-test-simple")
@ -6308,7 +6425,7 @@ provides the following features:
(base32 (base32
"1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7")))) "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "http://jblevins.org/projects/markdown-mode/") (home-page "https://jblevins.org/projects/markdown-mode/")
(synopsis "Emacs Major mode for Markdown files") (synopsis "Emacs Major mode for Markdown files")
(description (description
"Markdown-mode is a major mode for editing Markdown-formatted text files "Markdown-mode is a major mode for editing Markdown-formatted text files
@ -7372,7 +7489,8 @@ xref, etc...) are still available, but with better integration.")
#:phases #:phases
;; The package provides autoloads. ;; The package provides autoloads.
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'make-autoloads)))) (delete 'make-autoloads)
(delete 'enable-autoloads-compilation))))
(synopsis "Quicklisp support for SLY") (synopsis "Quicklisp support for SLY")
(description (description
"@command{sly-quicklisp} is an external contrib for SLY that provides a "@command{sly-quicklisp} is an external contrib for SLY that provides a
@ -7429,7 +7547,10 @@ additional support for working with ASDF projects.")
(propagated-inputs (propagated-inputs
`(("emacs-sly" ,emacs-sly))) `(("emacs-sly" ,emacs-sly)))
(arguments (arguments
'(#:include (cons* "\\.lisp$" "\\.asd$" %default-include))) '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)
#:phases (modify-phases %standard-phases
;; Byte compilation of the autoload file fails.
(delete 'enable-autoloads-compilation))))
(synopsis "Named-readtables support for SLY") (synopsis "Named-readtables support for SLY")
(description (description
"@command{sly-named-readtables} is an external contrib for SLY that "@command{sly-named-readtables} is an external contrib for SLY that
@ -7463,7 +7584,8 @@ file.")
#:phases #:phases
;; The package provides autoloads. ;; The package provides autoloads.
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'make-autoloads)))) (delete 'make-autoloads)
(delete 'enable-autoloads-compilation))))
(synopsis "Expand Common Lisp macros inside source files with SLY") (synopsis "Expand Common Lisp macros inside source files with SLY")
(description (description
"@command{sly-macrostep} is a SLY contrib for expanding CL macros right "@command{sly-macrostep} is a SLY contrib for expanding CL macros right
@ -7579,7 +7701,7 @@ extensions.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-evil-collection (define-public emacs-evil-collection
(let ((commit "eb36c82a84d313e961777dc78fd4ff1d718efdf6") (let ((commit "a478a95a8a3665e40bdae3bab2a0519db6c1f29c")
(revision "13")) (revision "13"))
(package (package
(name "emacs-evil-collection") (name "emacs-evil-collection")
@ -7592,7 +7714,7 @@ extensions.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0wi84x9176y4xjl7zpn882achfamx3a2ixlj4nvflxfh6q1qg7bz")))) "15ii5lw6hs4yyl22yyzfwzagdma2sman4rm5gq4m9773g4ava515"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil) `(("emacs-evil" ,emacs-evil)
@ -8078,13 +8200,13 @@ passive voice.")
(name "emacs-org") (name "emacs-org")
;; emacs-org-contrib inherits from this package. Please update it as ;; emacs-org-contrib inherits from this package. Please update it as
;; well. ;; well.
(version "9.3.3") (version "9.3.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar"))
(sha256 (sha256
(base32 "0yafckcx5ka2rpmv24x7ns6f3s1h216x2lbgaxsf1dmklbjcfvwv")))) (base32 "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://orgmode.org/") (home-page "https://orgmode.org/")
(synopsis "Outline-based notes management and organizer") (synopsis "Outline-based notes management and organizer")
@ -8098,14 +8220,14 @@ programming and reproducible research.")
(package (package
(inherit emacs-org) (inherit emacs-org)
(name "emacs-org-contrib") (name "emacs-org-contrib")
(version "20200206") (version "20200213")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://orgmode.org/elpa/" (uri (string-append "https://orgmode.org/elpa/"
"org-plus-contrib-" version ".tar")) "org-plus-contrib-" version ".tar"))
(sha256 (sha256
(base32 "1fdxh8zgjnb500wkcl0bc0fdzbsln6p044b4s4nz85wkfw0jkfs5")))) (base32 "0g6rrrwplrifz4ip0jg638m4kvpvdg03hwnyghd813w0lm935mh5"))))
(arguments (arguments
`(#:modules ((guix build emacs-build-system) `(#:modules ((guix build emacs-build-system)
(guix build utils) (guix build utils)
@ -9759,8 +9881,7 @@ and supports the use of a mouse.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(arguments (arguments
(let ((elisp-dir (string-append "/share/emacs/site-lisp/guix.d" (let ((elisp-dir "/share/emacs/site-lisp"))
"/gnuplot-" version)))
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
@ -10953,8 +11074,8 @@ through them using @key{C-c C-SPC}.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-slack (define-public emacs-slack
(let ((commit "10fbb81f567b44647ad125a48ecd72df106fb624") (let ((commit "b7b9eada0bf62d40dfe764b00f55913a2d3d742e")
(revision "6")) (revision "7"))
(package (package
(name "emacs-slack") (name "emacs-slack")
(version (git-version "0.0.2" revision commit)) (version (git-version "0.0.2" revision commit))
@ -10966,7 +11087,7 @@ through them using @key{C-c C-SPC}.")
(file-name (git-file-name name commit)) (file-name (git-file-name name commit))
(sha256 (sha256
(base32 (base32
"01ln9rbalgpxw6rbr4czhy6bd8wrrpyf0qgn2chcq3zmmrn4sy1z")))) "0cqr7jnfxzb0z2wy79pdwpv9cvmawjif1kin3zbp8q7zhwrq09v0"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -11960,6 +12081,10 @@ match and total match information in the mode-line in various search modes.")
(base32 (base32
"0vb338bhjpsnrf60qgxny4z5rjrnifahnrv9axd4shay89d894zq")))) "0vb338bhjpsnrf60qgxny4z5rjrnifahnrv9axd4shay89d894zq"))))
(build-system emacs-build-system) (build-system emacs-build-system)
;; Byte compilation of the autoload file fails.
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'enable-autoloads-compilation))))
(home-page "https://elpa.gnu.org/packages/seq.html") (home-page "https://elpa.gnu.org/packages/seq.html")
(synopsis (synopsis
"Forward @code{cl-generic} compatibility for Emacs before version 25") "Forward @code{cl-generic} compatibility for Emacs before version 25")
@ -14296,8 +14421,8 @@ perform regression test for packages that provide font-lock rules.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-racket-mode (define-public emacs-racket-mode
(let ((commit "2a9a102a097d04fbcd2a443fec84078036c2e277") (let ((commit "5f396fa91fc22310f5c519aa658436a1a5251846")
(revision "4")) (revision "5"))
(package (package
(name "emacs-racket-mode") (name "emacs-racket-mode")
(version (git-version "0.0.2" revision commit)) (version (git-version "0.0.2" revision commit))
@ -14310,15 +14435,15 @@ perform regression test for packages that provide font-lock rules.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1n71dxxh62jixq20b5haapv651dxc0zyrxpl1d0yqsg8ncp726bl")))) "1214y08i0c51d1vzw9jzyf79vyfqizdy6m0980qs13qbdwsj32v0"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:include '("\\.el$" "\\.rkt$"))) `(#:include '("\\.el$" "\\.rkt$")))
(propagated-inputs (propagated-inputs
`(("emacs-faceup" ,emacs-faceup) `(("emacs-faceup" ,emacs-faceup)
("emacs-s" ,emacs-s))) ("emacs-s" ,emacs-s)))
(home-page "https://github.com/greghendershott/racket-mode") (home-page "https://www.racket-mode.com/")
(synopsis "Major mode for Racket language") (synopsis "Major mode for the Racket language")
(description "@code{racket-mode} provides: (description "@code{racket-mode} provides:
@itemize @itemize
@ -14682,14 +14807,14 @@ modes of SLIME.")
(define-public emacs-sml-mode (define-public emacs-sml-mode
(package (package
(name "emacs-sml-mode") (name "emacs-sml-mode")
(version "6.9") (version "6.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/sml-mode-" (uri (string-append "https://elpa.gnu.org/packages/sml-mode-"
version ".el")) version ".el"))
(sha256 (sha256
(base32 "1bdg9ywpvj85hxqah9w1raxlcrhkyx67nw22jwd1bd5j0fhmgqij")))) (base32 "01yf0s474r9xhj6nbs14ljn9ccxb5yy758i17c8nmgmqvm8fx7sb"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/sml-mode.html") (home-page "https://elpa.gnu.org/packages/sml-mode.html")
(synopsis "Major mode for editing (Standard) ML") (synopsis "Major mode for editing (Standard) ML")
@ -16052,7 +16177,7 @@ wiki.")
(revision "1")) (revision "1"))
(package (package
(name "emacs-recent-addresses") (name "emacs-recent-addresses")
(home-page "http://nschum.de/src/emacs/recent-addresses/") (home-page "https://nschum.de/src/emacs/recent-addresses/")
(version (git-version "0.1" revision commit)) (version (git-version "0.1" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -17301,8 +17426,7 @@ asynchronous communications, the RPC response is fairly good.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((perl (assoc-ref inputs "perl")) (let ((perl (assoc-ref inputs "perl"))
(dir (string-append (assoc-ref outputs "out") (dir (string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp/guix.d/edbi-" "/share/emacs/site-lisp")))
,version)))
(substitute* (string-append dir "/edbi.el") (substitute* (string-append dir "/edbi.el")
(("\"perl\"") (string-append "\"" perl "/bin/perl\""))) (("\"perl\"") (string-append "\"" perl "/bin/perl\"")))
(chmod (string-append dir "/edbi-bridge.pl") #o555) (chmod (string-append dir "/edbi-bridge.pl") #o555)
@ -17717,25 +17841,26 @@ Later you can insert it into an Org buffer using the command
(define-public emacs-amx (define-public emacs-amx
(package (package
(name "emacs-amx") (name "emacs-amx")
(version "3.2") (version "3.3")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/DarwinAwardWinner/amx") (uri (git-reference
(commit (string-append "v" version)))) (url "https://github.com/DarwinAwardWinner/amx")
(file-name (git-file-name name version)) (commit (string-append "v" version))))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"0bb8y1dmzyqkrb4mg6zndcsxppby3glridv2aap2pv05gv8kx7mj")))) (base32 "0ikjzs119g57cwh2v3jmy63lggqc0ib99q5gsl93slkk4y2ihavw"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs `(("emacs-s" ,emacs-s))) (propagated-inputs
`(("emacs-s" ,emacs-s)))
(home-page "https://github.com/DarwinAwardWinner/amx") (home-page "https://github.com/DarwinAwardWinner/amx")
(synopsis "Alternative interface for M-x") (synopsis "Alternative M-x interface for Emacs")
(description "Amx is an alternative interface for M-x in Emacs. It (description "Amx is an alternative interface for M-x in Emacs. It
provides several enhancements over the ordinary provides several enhancements over the ordinary
@code{execute-extended-command}, such as prioritizing your most-used commands @code{execute-extended-command}, such as prioritizing your most-used commands
in the completion list and showing keyboard shortcuts, and it supports several in the completion list and showing keyboard shortcuts, and it supports several
completion systems for selecting commands, such as ido and ivy.") completion systems for selecting commands, such as Ido and Ivy.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-lorem-ipsum (define-public emacs-lorem-ipsum
@ -19297,7 +19422,7 @@ with passwords for paths matching regexps.")
`(("emacs-ivy" ,emacs-ivy))) `(("emacs-ivy" ,emacs-ivy)))
(home-page "https://github.com/redguardtoo/eacl") (home-page "https://github.com/redguardtoo/eacl")
(synopsis "Auto-complete lines by using @code{grep} on a project") (synopsis "Auto-complete lines by using @code{grep} on a project")
(description "This package provides auto-completion cammands for single (description "This package provides auto-completion commands for single
and multiple lines of code in a project.") and multiple lines of code in a project.")
(license license:gpl3+))) (license license:gpl3+)))
@ -19468,7 +19593,7 @@ It is a fork of https://github.com/cofi/evil-numbers, which is unmaintained.")
(base32 (base32
"1cgxv4aibkvv6lnssynn0438a615fz3zq8hg9sb0lhfgsr99pxln")))) "1cgxv4aibkvv6lnssynn0438a615fz3zq8hg9sb0lhfgsr99pxln"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "http://nschum.de/src/emacs/rotate-text/") (home-page "https://nschum.de/src/emacs/rotate-text/")
(synopsis "Cycle through words, symbols and patterns in Emacs") (synopsis "Cycle through words, symbols and patterns in Emacs")
(description "@code{rotate-text} allows you rotate to commonly (description "@code{rotate-text} allows you rotate to commonly
interchanged text with a single keystroke. For example, you can toggle interchanged text with a single keystroke. For example, you can toggle
@ -20240,7 +20365,7 @@ Emacs that integrate with major modes like Org-mode.")
(define-public emacs-modus-themes (define-public emacs-modus-themes
(package (package
(name "emacs-modus-themes") (name "emacs-modus-themes")
(version "0.4.0") (version "0.6.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -20249,7 +20374,7 @@ Emacs that integrate with major modes like Org-mode.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0c4y3y9mjf6x2b9087fk6nkxvgvm9f5l1p2vdwqny80vp4krsb8r")))) (base32 "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://gitlab.com/protesilaos/modus-themes") (home-page "https://gitlab.com/protesilaos/modus-themes")
(synopsis "Emacs themes designed for colour-contrast accessibility") (synopsis "Emacs themes designed for colour-contrast accessibility")
@ -20287,6 +20412,31 @@ displayed against a dark background (Modus Vivendi).")
color. Designed for 256-color terminals. Comes in light and dark!") color. Designed for 256-color terminals. Comes in light and dark!")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-spacemacs-theme
(let ((commit "e088bff4f190495615c29de93079aaa823e2300c")
(revision "0"))
(package
(name "emacs-spacemacs-theme")
(version (git-version "0" revision commit)) ;no release yet
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nashamri/spacemacs-theme.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "09p5pzy3ibrl8dxmg10v8j16wxdn1fkdqpbi8l9pgfib2azmnvnc"))))
(build-system emacs-build-system)
(home-page "https://github.com/nashamri/spacemacs-theme")
(synopsis
"Light and dark theme for spacemacs that supports GUI and terminal")
(description
"Spacemacs theme is an Emacs color theme that started as
a theme for Spacemacs. The theme comes with dark and light variants
and it should work well with 256 color terminals.")
(license license:gpl3+))))
(define-public emacs-elixir-mode (define-public emacs-elixir-mode
(package (package
(name "emacs-elixir-mode") (name "emacs-elixir-mode")
@ -20307,7 +20457,7 @@ color. Designed for 256-color terminals. Comes in light and dark!")
"https://github.com/elixir-editors/emacs-elixir") "https://github.com/elixir-editors/emacs-elixir")
(synopsis "Major mode for editing Elixir files") (synopsis "Major mode for editing Elixir files")
(description (description
"Elixir-Mode Provides font-locking, indentation and navigation support "Elixir-Mode provides font-locking, indentation and navigation support
for the Elixir programming language.") for the Elixir programming language.")
(license license:gpl3+))) (license license:gpl3+)))
@ -20447,12 +20597,12 @@ commands that bear resemblance to the input command.")
such as: such as:
@itemize @itemize
- switch to last buffer, @item switch to last buffer,
- toggle single window display, @item toggle single window display,
- toggle between horizontal and vertical splits, @item toggle between horizontal and vertical splits,
- move borders more naturally, @item move borders more naturally,
- swap windows à-la @code{windmove}. @item swap windows à-la @code{windmove}.
@end itemize\n") @end itemize")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-flycheck-cpplint (define-public emacs-flycheck-cpplint
@ -21452,3 +21602,128 @@ Flyspell's on-the-fly spell checking and extends these checks to also detect
language. Auto-dictionary then sets @code{ispell-dictionary} to use the language. Auto-dictionary then sets @code{ispell-dictionary} to use the
detected language.") detected language.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-persist
(package
(name "emacs-persist")
(version "0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"persist-" version ".tar"))
(sha256
(base32 "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/persist.html")
(synopsis "Persist variables between Emacs sessions")
(description
"This package provides variables which persist across sessions.
Values are stored in a directory in @code{user-emacs-directory}, using
one file per value. This makes it easy to delete or remove unused
variables.")
(license license:gpl3+)))
(define-public emacs-company-emoji
(package
(name "emacs-company-emoji")
(version "2.5.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dunn/company-emoji/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-company" ,emacs-company)))
(home-page "https://github.com/dunn/company-emoji/")
(synopsis "Company completion back-end for emoji")
(description
"This library is a Company back-end providing auto-completion for
emoji.")
(license license:gpl3+)))
(define-public emacs-exiftool
(package
(name "emacs-exiftool")
(version "0.3.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.systemreboot.net/exiftool.el/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0bv58is66cz21yhc0qqkp1z4nk13zfi2l7i6pjbhyi0g1n88qqyv"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("make" "-C" "tests")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
(make-file-writable "exiftool.el")
(emacs-substitute-variables "exiftool.el"
("exiftool-executable"
(string-append (assoc-ref inputs "perl-image-exiftool")
"/bin/exiftool")))
#t)))))
(inputs
`(("perl-image-exiftool" ,perl-image-exiftool)))
(home-page "https://git.systemreboot.net/exiftool.el/about/")
(synopsis "Elisp wrapper around ExifTool")
(description "@code{emacs-exiftool} is an Elisp wrapper around ExifTool.
ExifTool supports reading and writing metadata in various formats including
EXIF, XMP and IPTC.")
(license license:gpl3+)))
(define-public emacs-password-generator
(package
(name "emacs-password-generator")
(version "1.01")
(home-page "https://github.com/zargener/emacs-password-genarator")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit "904cdb591a04305ba882ce19e1d117f5fa60f7d3")))
(file-name (git-file-name name version))
(sha256
(base32
"1qgvn79qz1h8ykm5i1qv2fja4v2y0g2i0n5sf7byhnqhqlwn63nv"))))
(build-system emacs-build-system)
(synopsis "Generate passwords inside Emacs")
(description "@code{emacs-password-generator} provides simple functions to
generate random passwords and insert them into the current buffer. It also
supports generation of phonetic and numeric passwords.")
(license license:artistic2.0)))
(define-public emacs-csv
(package
(name "emacs-csv")
(version "2.1")
(home-page "https://gitlab.com/u11/csv.el")
(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
"1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa"))))
(build-system emacs-build-system)
(synopsis "Elisp functions for reading and parsing CSV files")
(description "@code{csv.el} provides functions for reading and parsing CSV (Comma
Separated Value) files. It follows the format as defined in RFC 4180 \"Common
Format and MIME Type for CSV Files\" (@url{http://tools.ietf.org/html/rfc4180}).")
(license license:gpl3+)))

View file

@ -129,6 +129,11 @@
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:configure-flags (list "--with-modules" #:configure-flags (list "--with-modules"
"--disable-build-details") "--disable-build-details")
#:modules ((guix build emacs-utils)
(guix build glib-or-gtk-build-system)
(guix build utils))
#:imported-modules ((guix build emacs-utils)
,@%glib-or-gtk-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-/bin/pwd (add-before 'configure 'fix-/bin/pwd
@ -139,13 +144,12 @@
"pwd")) "pwd"))
#t)) #t))
(add-after 'install 'install-site-start (add-after 'install 'install-site-start
;; Use 'guix-emacs' in "site-start.el". This way, Emacs packages ;; Use 'guix-emacs' in "site-start.el", which is used autoload the
;; provided by Guix and installed in ;; Elisp packages found in EMACSLOADPATH.
;; ~/.guix-profile/share/emacs/site-lisp/guix.d/PACKAGE-VERSION are
;; automatically found.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lisp-dir (string-append out "/share/emacs/site-lisp"))) (lisp-dir (string-append out "/share/emacs/site-lisp"))
(emacs (string-append out "/bin/emacs")))
(copy-file (assoc-ref inputs "guix-emacs.el") (copy-file (assoc-ref inputs "guix-emacs.el")
(string-append lisp-dir "/guix-emacs.el")) (string-append lisp-dir "/guix-emacs.el"))
(with-output-to-file (string-append lisp-dir "/site-start.el") (with-output-to-file (string-append lisp-dir "/site-start.el")
@ -158,6 +162,9 @@
;; share/emacs/site-lisp union when added to EMACSLOADPATH, ;; share/emacs/site-lisp union when added to EMACSLOADPATH,
;; which leads to conflicts. ;; which leads to conflicts.
(delete-file (string-append lisp-dir "/subdirs.el")) (delete-file (string-append lisp-dir "/subdirs.el"))
;; Byte compile the site-start files.
(parameterize ((%emacs emacs))
(emacs-byte-compile-directory lisp-dir))
#t)))))) #t))))))
(inputs (inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
@ -326,6 +333,12 @@ languages.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(substitute-keyword-arguments (package-arguments emacs) (substitute-keyword-arguments (package-arguments emacs)
((#:modules _)
`((guix build emacs-utils)
,@%gnu-build-system-modules))
((#:imported-modules _)
`((guix build emacs-utils)
,@%gnu-build-system-modules))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'install-site-start))) (delete 'install-site-start)))
@ -345,6 +358,12 @@ editor (with xwidgets support)")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(substitute-keyword-arguments (package-arguments emacs) (substitute-keyword-arguments (package-arguments emacs)
((#:modules _)
`((guix build emacs-utils)
,@%gnu-build-system-modules))
((#:imported-modules _)
`((guix build emacs-utils)
,@%gnu-build-system-modules))
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
`(cons "--with-xwidgets" ,flags)))) `(cons "--with-xwidgets" ,flags))))
(inputs (inputs
@ -358,6 +377,14 @@ editor (with xwidgets support)")
(synopsis "The extensible, customizable, self-documenting text (synopsis "The extensible, customizable, self-documenting text
editor (console only)") editor (console only)")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments emacs)
((#:modules _)
`((guix build emacs-utils)
,@%gnu-build-system-modules))
((#:imported-modules _)
`((guix build emacs-utils)
,@%gnu-build-system-modules))))
(inputs (fold alist-delete (inputs (fold alist-delete
(package-inputs emacs) (package-inputs emacs)
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" '("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
@ -376,9 +403,15 @@ editor (without an X toolkit)" )
(inputs (append `(("inotify-tools" ,inotify-tools)) (inputs (append `(("inotify-tools" ,inotify-tools))
(alist-delete "gtk+" (package-inputs emacs)))) (alist-delete "gtk+" (package-inputs emacs))))
(arguments (arguments
`(,@(substitute-keyword-arguments (package-arguments emacs) (substitute-keyword-arguments (package-arguments emacs)
((#:configure-flags cf) ((#:modules _)
`(cons "--with-x-toolkit=no" ,cf))))))) `((guix build emacs-utils)
,@%gnu-build-system-modules))
((#:imported-modules _)
`((guix build emacs-utils)
,@%gnu-build-system-modules))
((#:configure-flags cf)
`(cons "--with-x-toolkit=no" ,cf))))))
(define-public guile-emacs (define-public guile-emacs
(let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")

View file

@ -175,7 +175,7 @@
`(("xbinutils" ,(cross-binutils "arm-none-eabi")) `(("xbinutils" ,(cross-binutils "arm-none-eabi"))
("xgcc" ,gcc-arm-none-eabi-4.9) ("xgcc" ,gcc-arm-none-eabi-4.9)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(home-page "http://www.sourceware.org/newlib/") (home-page "https://www.sourceware.org/newlib/")
(synopsis "C library for use on embedded systems") (synopsis "C library for use on embedded systems")
(description "Newlib is a C library intended for use on embedded (description "Newlib is a C library intended for use on embedded
systems. It is a conglomeration of several library parts that are easily systems. It is a conglomeration of several library parts that are easily

View file

@ -102,7 +102,9 @@
version "/desmume-" version ".tar.gz")) version "/desmume-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs")))) "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs"))
(patches (search-patches "desmume-gcc6-fixes.patch"
"desmume-gcc7-fixes.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; Enable support for WiFi and microphone. ;; Enable support for WiFi and microphone.
@ -274,19 +276,21 @@ older games.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emulation-station (define-public emulation-station
(let ((commit "646bede3d9ec0acf0ae378415edac136774a66c5")) ;; No release for a long time, new commits fix build issues
(let ((commit "9cc42adff67946175d2b7e25c6ae69cc374e98a0")
(revision "1"))
(package (package
(name "emulation-station") (name "emulation-station")
(version "2.0.1") (version (git-version "2.0.1" revision commit))
(source (origin (source (origin
(method git-fetch) ; no tarball available (method git-fetch) ; no tarball available
(uri (git-reference (uri (git-reference
(url "https://github.com/Aloshi/EmulationStation.git") (url "https://github.com/Aloshi/EmulationStation.git")
(commit commit))) ; no version tag (commit commit))) ; no version tag
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v")))) "1cva0ns650v17lfn8in095zci6lc43d23f1x3mlzc41qfqa6mbd1"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f)) ; no tests '(#:tests? #f)) ; no tests
@ -307,19 +311,27 @@ and a game metadata scraper.")
(home-page "http://www.emulationstation.org") (home-page "http://www.emulationstation.org")
(license license:expat)))) (license license:expat))))
;; Note: higan v107 has been released, but as explained by the dialog that
;; appears after starting the new version, it's an experimental release. The
;; author recommends v106 for general use.
;;
;; When updating to v107 (or probably beyond), sdl will have to be replaced
;; with sdl2, and libxrandr will need to be added to inputs. The patch
;; `higan-remove-march-native-flag.patch' will not be necessary, since the flag
;; is now being added only for `platform=local', which is not the default.
(define-public higan (define-public higan
(package (package
(name "higan") (name "higan")
(version "106") (version "106")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://gitlab.com/higan/higan/repository/archive.tar.gz?ref=v" (url "https://github.com/byuu/higan/")
version)) (commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0y42pra0dxzlbkyzcp3r8a39pji2bj3p9fl40425f60af2igr4rw")) (base32 "1mxivf8124vz4hl0b0xa1yqv0z9m3i12v9psmbpqkprrbq0wbgn1"))
(patches (search-patches "higan-remove-march-native-flag.patch")))) (patches (search-patches "higan-remove-march-native-flag.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -344,15 +356,18 @@ and a game metadata scraper.")
(delete 'configure) (delete 'configure)
(add-before 'build 'chdir-to-higan (add-before 'build 'chdir-to-higan
(lambda _ (lambda _
(chdir "higan"))) (chdir "higan")
#t))
(add-before 'install 'create-/share/applications (add-before 'install 'create-/share/applications
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; It seems the author forgot to do this in the Makefile. ;; It seems the author forgot to do this in the Makefile.
(mkdir-p (string-append out "/share/applications"))))) (mkdir-p (string-append out "/share/applications"))
#t)))
(add-after 'install 'chdir-to-icarus (add-after 'install 'chdir-to-icarus
(lambda _ (lambda _
(chdir "../icarus"))) (chdir "../icarus")
#t))
(add-after 'chdir-to-icarus 'build-icarus build-phase) (add-after 'chdir-to-icarus 'build-icarus build-phase)
(add-after 'build-icarus 'install-icarus install-phase) (add-after 'build-icarus 'install-icarus install-phase)
(add-after 'install-icarus 'wrap-higan-executable (add-after 'install-icarus 'wrap-higan-executable
@ -383,13 +398,14 @@ and a game metadata scraper.")
(chmod higan #o555) (chmod higan #o555)
;; Second, make sure higan will find icarus in PATH. ;; Second, make sure higan will find icarus in PATH.
(wrap-program higan (wrap-program higan
`("PATH" ":" prefix (,bin)))))))) `("PATH" ":" prefix (,bin)))
#t)))))
#:make-flags #:make-flags
(list "compiler=g++" (list "compiler=g++"
(string-append "prefix=" (assoc-ref %outputs "out"))) (string-append "prefix=" (assoc-ref %outputs "out")))
;; There is no test suite. ;; There is no test suite.
#:tests? #f)) #:tests? #f))
(home-page "http://byuu.org/emulation/higan/") (home-page "https://byuu.org/higan")
(synopsis "Nintendo multi-system emulator") (synopsis "Nintendo multi-system emulator")
(description (description
"higan (formerly bsnes) is an emulator for multiple Nintendo video game "higan (formerly bsnes) is an emulator for multiple Nintendo video game
@ -405,7 +421,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
(define-public mgba (define-public mgba
(package (package
(name "mgba") (name "mgba")
(version "0.8.0") (version "0.8.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -414,7 +430,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0m3rgcdv32ms98j7rrmk2hphvn462bwsd6xfz2ssy05398pj4ljh")) (base32 "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make sure we don't use the bundled software. ;; Make sure we don't use the bundled software.
@ -431,7 +447,8 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
#:configure-flags #:configure-flags
(list "-DUSE_LZMA=OFF" ;do not use bundled LZMA (list "-DUSE_LZMA=OFF" ;do not use bundled LZMA
"-DUSE_LIBZIP=OFF"))) ;use "zlib" instead "-DUSE_LIBZIP=OFF"))) ;use "zlib" instead
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs `(("ffmpeg" ,ffmpeg) (inputs `(("ffmpeg" ,ffmpeg)
("imagemagick" ,imagemagick) ("imagemagick" ,imagemagick)
("libedit" ,libedit) ("libedit" ,libedit)
@ -443,7 +460,6 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia) ("qtmultimedia" ,qtmultimedia)
("qttools" ,qttools)
("sdl2" ,sdl2) ("sdl2" ,sdl2)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -454,9 +470,9 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
faster and more accurate than many existing Game Boy Advance emulators, as faster and more accurate than many existing Game Boy Advance emulators, as
well as adding features that other emulators lack. It also supports Game Boy well as adding features that other emulators lack. It also supports Game Boy
and Game Boy Color games.") and Game Boy Color games.")
;; Code is mainly MPL 2.0. "blip_buf.c" is LGPL 2.1+ and "inih.c" is ;; Code is mainly MPL 2.0. "blip_buf.c" is LGPL 2.1+, "inih.c" is
;; BSD-3. ;; BSD-3, and "discord-rpc" is Expat.
(license (list license:mpl2.0 license:lgpl2.1+ license:bsd-3)))) (license (list license:mpl2.0 license:lgpl2.1+ license:bsd-3 license:expat))))
(define-public sameboy (define-public sameboy
(package (package
@ -1264,7 +1280,7 @@ play them on systems for which they were never designed!")
(define-public mame (define-public mame
(package (package
(name "mame") (name "mame")
(version "0.218") (version "0.219")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1273,7 +1289,7 @@ play them on systems for which they were never designed!")
(commit (apply string-append "mame" (string-split version #\.))))) (commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1c43hqfabc7spkyk5ma4bjdb0yqm93sdg5g13ka8mvi462snrfd7")) (base32 "0s3nhkfa5c17ar1lzgvm20ndqain9llgqkab0ji5ycv2c85f06fl"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.
@ -1449,6 +1465,69 @@ functions. The source code to MAME serves as this documentation.")
;; keymaps, languages and samples are under CC0. ;; keymaps, languages and samples are under CC0.
(license (list license:gpl2+ license:expat license:cc0)))) (license (list license:gpl2+ license:expat license:cc0))))
(define-public gnome-arcade
(package
(name "gnome-arcade")
(version "0.218.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/strippato/gnome-arcade")
(commit (string-append "v." version))))
(file-name (git-file-name name version))
(sha256
(base32
"1qc01a62p65qb6mwjfmxqsd6n3rglsfwrjhsp25nr7q54107n55l"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No tests.
#:configure-flags (list
(string-append "-DMAME_BIN=\""
(assoc-ref %build-inputs "mame")
"/bin/mame\"")
(string-append "-DAPP_RES=\""
(assoc-ref %outputs "out")
"/share/gnome-arcade/\""))
#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-paths
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(pk 'cwd (getcwd))
(substitute* "../source/src/config.c"
(("/usr/share") (string-append out "/share"))))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(rom (string-append out "/share/gnome-arcade/data/rom"))
(tile (string-append out "/share/gnome-arcade/data/tile")))
(mkdir-p bin)
(install-file "../gnome-arcade" bin)
(copy-recursively "../source/res"
(string-append out "/share/gnome-arcade/res"))
(mkdir-p rom)
(install-file "../source/data/rom/ROM.TXT" rom)
(mkdir-p tile)
(install-file "../source/data/tile/TILE.TXT" tile))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("mame" ,mame)
("gtk" ,gtk+)
("libevdev" ,libevdev)
("libvlc" ,vlc)
("libarchive" ,libarchive)))
(home-page "https://github.com/strippato/gnome-arcade")
(synopsis "Minimal MAME frontend")
(description
"A minimal GTK+ frontend for MAME, the multi-purpose arcade and console
emulator.")
(license license:gpl3+)))
(define-public pcsxr (define-public pcsxr
;; No release since 2017. ;; No release since 2017.
(let ((commit "6484236cb0281e8040ff6c8078c87899a3407534")) (let ((commit "6484236cb0281e8040ff6c8078c87899a3407534"))

View file

@ -36,7 +36,7 @@
(define-public enchant (define-public enchant
(package (package
(name "enchant") (name "enchant")
(version "2.2.7") (version "2.2.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/AbiWord/enchant/releases" (uri (string-append "https://github.com/AbiWord/enchant/releases"
@ -44,7 +44,7 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"029smcna98hllgkm2gy94qa7qphxs4xaa8cdbg5kaaw16mhrf8hv")))) "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-static" '(#:configure-flags '("--disable-static"

View file

@ -14,6 +14,7 @@
;;; Copyright © 2019 Jovany Leandro G.C <bit4bit@riseup.net> ;;; Copyright © 2019 Jovany Leandro G.C <bit4bit@riseup.net>
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com> ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu> ;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -44,6 +45,7 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -792,138 +794,123 @@ language.")
(define-public ao (define-public ao
(deprecated-package "ao-cad" libfive)) (deprecated-package "ao-cad" libfive))
;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master
(define-public kicad (define-public kicad
(package (package
(name "kicad") (name "kicad")
(version "5.1.5") (version "5.1.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(file-name (string-append name "-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz"))
(uri (string-append (uri (string-append
"https://launchpad.net/kicad/" (version-major version) "https://launchpad.net/kicad/" (version-major version)
".0/" version "/+download/kicad-" version ".tar.xz")) ".0/" version "/+download/kicad-" version ".tar.xz"))
(sha256 (sha256
(base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) (base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:out-of-source? #t `(#:out-of-source? #t
#:tests? #f ; no tests #:tests? #f ; no tests
#:build-type "Release" #:build-type "Release"
#:configure-flags #:configure-flags
(list "-DKICAD_SCRIPTING_PYTHON3=ON" (list "-DKICAD_SCRIPTING_PYTHON3=ON"
"-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'wrap-program (add-after 'install 'install-translations
;; Ensure correct Python at runtime. (lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key inputs outputs #:allow-other-keys) (copy-recursively (assoc-ref inputs "kicad-i18l")
(let* ((out (assoc-ref outputs "out")) (assoc-ref outputs "out"))
(python (assoc-ref inputs "python")) #t))
(file (string-append out "/bin/kicad")) (add-after 'install 'wrap-program
(path (string-append ;; Ensure correct Python at runtime.
out (lambda* (#:key inputs outputs #:allow-other-keys)
"/lib/python" (let* ((out (assoc-ref outputs "out"))
,(version-major+minor (python (assoc-ref inputs "python"))
(package-version python)) (file (string-append out "/bin/kicad"))
"/site-packages:" (path (string-append
(getenv "PYTHONPATH")))) out
(wrap-program file "/lib/python"
`("PYTHONPATH" ":" prefix (,path)) ,(version-major+minor
`("PATH" ":" prefix (package-version python))
(,(string-append python "/bin:"))))) "/site-packages:"
#t))))) (getenv "PYTHONPATH"))))
(native-inputs (wrap-program file
`(("boost" ,boost) `("PYTHONPATH" ":" prefix (,path))
("gettext" ,gnu-gettext) `("PATH" ":" prefix
("pkg-config" ,pkg-config) (,(string-append python "/bin:")))))
("swig" ,swig) #t)))))
("zlib" ,zlib))) (native-search-paths
(inputs (list (search-path-specification
`(("cairo" ,cairo) (variable "KICAD_TEMPLATE_DIR")
("curl" ,curl) (files '("share/kicad/template")))
("desktop-file-utils" ,desktop-file-utils) (search-path-specification
("glew" ,glew) (variable "KICAD_SYMBOL_DIR") ; symbol path
("glm" ,glm) (files '("share/kicad/library")))
("hicolor-icon-theme" ,hicolor-icon-theme) (search-path-specification
("libngspice" ,libngspice) (variable "KISYSMOD") ; footprint path
("libsm" ,libsm) (files '("share/kicad/modules")))
("mesa" ,mesa) (search-path-specification
("opencascade-oce" ,opencascade-oce) (variable "KISYS3DMOD") ; 3D model path
("openssl" ,openssl) (files '("share/kicad/modules/packages3d")))))
("python" ,python) (native-inputs
("wxwidgets" ,wxwidgets) `(("boost" ,boost)
("wxpython" ,python-wxpython))) ("desktop-file-utils" ,desktop-file-utils)
(home-page "https://kicad-pcb.org/") ("gettext" ,gnu-gettext)
(synopsis "Electronics Design Automation Suite") ("kicad-i18l" ,kicad-i18l)
(description "Kicad is a program for the formation of printed circuit ("pkg-config" ,pkg-config)
("swig" ,swig)
("zlib" ,zlib)))
(inputs
`(("cairo" ,cairo)
("curl" ,curl)
("glew" ,glew)
("glm" ,glm)
("hicolor-icon-theme" ,hicolor-icon-theme)
("libngspice" ,libngspice)
("libsm" ,libsm)
("mesa" ,mesa)
("opencascade-oce" ,opencascade-oce)
("openssl" ,openssl)
("python" ,python-wrapper)
("wxwidgets" ,wxwidgets)
("wxpython" ,python-wxpython)))
(home-page "https://kicad-pcb.org/")
(synopsis "Electronics Design Automation Suite")
(description "Kicad is a program for the formation of printed circuit
boards and electrical circuits. The software has a number of programs that boards and electrical circuits. The software has a number of programs that
perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
electrical diagrams), gerbview (viewing Gerber files) and others.") electrical diagrams), gerbview (viewing Gerber files) and others.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public kicad-library (define kicad-i18l
(let ((version "4.0.7")) (package
(package (name "kicad-i18l")
(name "kicad-library") (version "5.1.5")
(version version) (source (origin
(source (method git-fetch)
(origin (uri (git-reference
(method url-fetch) (url "https://gitlab.com/kicad/code/kicad-i18n.git")
(uri (string-append (commit version)))
"https://kicad-downloads.s3.cern.ch/libraries/kicad-library-" (file-name (git-file-name name version))
version ".tar.gz")) (sha256
(sha256 (base32
(base32 "1azb7v1y3l6j329r9gg7f4zlg0wz8nh4s4i5i0l9s4yh9r6i9zmv")))) "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:out-of-source? #t `(#:phases
#:tests? #f ; no tests (modify-phases %standard-phases
#:phases (delete 'build)
(modify-phases %standard-phases (delete 'check))))
(add-after 'install 'install-footprints ; from footprints tarball (native-inputs
(lambda* (#:key inputs outputs #:allow-other-keys) `(("gettext" ,gnu-gettext)))
(invoke "tar" "xvf" (home-page "https://kicad-pcb.org/")
(assoc-ref inputs "kicad-footprints") (synopsis "KiCad GUI translations")
"-C" (string-append (assoc-ref outputs "out") (description "This package contains the po files that are used for the GUI
"/share/kicad/modules") translations for KiCad.")
"--strip-components=1"))) (license license:gpl3+)))
;; We change the default global footprint file, which is generated if
;; it doesn't exist in user's home directory, from the one using the
;; github plugin, to the one using the KISYSMOD environment path.
(add-after 'install-footprints 'use-pretty-footprint-table
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(template-dir (string-append out "/share/kicad/template"))
(fp-lib-table (string-append template-dir "/fp-lib-table")))
(delete-file fp-lib-table)
(copy-file (string-append fp-lib-table ".for-pretty")
fp-lib-table))
#t)))))
(native-search-paths
(list (search-path-specification
(variable "KISYSMOD") ; footprint path
(files '("share/kicad/modules")))
(search-path-specification
(variable "KISYS3DMOD") ; 3D model path
(files '("share/kicad/modules/packages3d")))))
;; Kicad distributes footprints in a separate tarball.
(native-inputs
`(("kicad-footprints"
,(origin
(method url-fetch)
(uri (string-append
"http://downloads.kicad-pcb.org/libraries/kicad-footprints-"
version ".tar.gz"))
(sha256
(base32
"08qrz5zzsb5127jlnv24j0sgiryd5nqwg3lfnwi8j9a25agqk13j"))))))
(home-page "https://kicad-pcb.org/")
(synopsis "Libraries for kicad")
(description "This package provides Kicad component, footprint and 3D
render model libraries.")
(license license:lgpl2.0+))))
(define-public kicad-symbols (define-public kicad-symbols
(package (package
@ -942,9 +929,9 @@ render model libraries.")
(arguments (arguments
`(#:tests? #f)) ; no tests exist `(#:tests? #f)) ; no tests exist
(home-page "https://kicad-pcb.org/") (home-page "https://kicad-pcb.org/")
(synopsis "Official KiCad schematic symbol libraries for KiCad 5") (synopsis "Official KiCad schematic symbol libraries")
(description "This package contains the official KiCad schematic symbol (description "This package contains the official KiCad schematic symbol
libraries for KiCad 5.") libraries.")
;; TODO: Exception: "To the extent that the creation of electronic designs ;; TODO: Exception: "To the extent that the creation of electronic designs
;; that use 'Licensed Material' can be considered to be 'Adapted Material', ;; that use 'Licensed Material' can be considered to be 'Adapted Material',
;; then the copyright holder waives article 3 of the license with respect to ;; then the copyright holder waives article 3 of the license with respect to
@ -953,6 +940,58 @@ libraries for KiCad 5.")
;; See <https://github.com/KiCad/kicad-symbols/blob/master/LICENSE.md>. ;; See <https://github.com/KiCad/kicad-symbols/blob/master/LICENSE.md>.
(license license:cc-by-sa4.0))) (license license:cc-by-sa4.0)))
(define-public kicad-footprints
(package
(inherit kicad-symbols)
(name "kicad-footprints")
(version "5.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KiCad/kicad-footprints.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j"))))
(synopsis "Official KiCad footprint libraries")
(description "This package contains the official KiCad footprint libraries.")))
(define-public kicad-packages3d
(package
(inherit kicad-symbols)
(name "kicad-packages3d")
(version "5.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KiCad/kicad-packages3d.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz"))))
(synopsis "Official KiCad 3D model libraries")
(description "This package contains the official KiCad 3D model libraries.")))
(define-public kicad-templates
(package
(inherit kicad-symbols)
(name "kicad-templates")
(version "5.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KiCad/kicad-templates.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"))))
(synopsis "Official KiCad project and worksheet templates")
(description "This package contains the official KiCad project and
worksheet templates.")))
(define-public linsmith (define-public linsmith
(package (package
(name "linsmith") (name "linsmith")
@ -1310,12 +1349,20 @@ bindings for Python, Java, OCaml and more.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "https://radare.org/") (home-page "https://radare.org/")
(synopsis "Portable reversing framework") (synopsis "Reverse engineering framework")
(description (description
"Radare project started as a forensics tool, a scriptable commandline "Radare2 is a complete framework for reverse-engineering, debugging, and
hexadecimal editor able to open disk files, but later support for analyzing analyzing binaries. It is composed of a set of small utilities that can be
binaries, disassembling code, debugging programs, attaching to remote gdb used together or independently from the command line.
servers, ...")
Radare2 is built around a scriptable disassembler and hexadecimal editor that
support a variety of executable formats for different processors and operating
systems, through multiple back ends for local and remote files and disk
images.
It can also compare (@dfn{diff}) binaries with graphs and extract information
like relocation symbols. It is able to deal with malformed binaries, making
it suitable for security research and analysis.")
(license license:lgpl3))) (license license:lgpl3)))
(define-public asco (define-public asco
@ -2248,7 +2295,7 @@ full programmatic control over your models.")
(sha256 (sha256
(base32 (base32
"170hk1kgrvsddrwykp24wyj0cha78zzmzbf50gn98x7ngqqs395s")))) "170hk1kgrvsddrwykp24wyj0cha78zzmzbf50gn98x7ngqqs395s"))))
(build-system cmake-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
("graphviz" ,graphviz) ("graphviz" ,graphviz)
@ -2274,7 +2321,7 @@ full programmatic control over your models.")
("python-pyside-2-tools" ,python-pyside-2-tools) ("python-pyside-2-tools" ,python-pyside-2-tools)
("python-shiboken-2" ,python-shiboken-2) ("python-shiboken-2" ,python-shiboken-2)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("qtbase" ,qtbase) ("qtbase" ,qtbase-patched)
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras) ("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns) ("qtxmlpatterns" ,qtxmlpatterns)

View file

@ -40,7 +40,7 @@
(define-public erlang (define-public erlang
(package (package
(name "erlang") (name "erlang")
(version "21.0.5") (version "21.3.8.13")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
;; The tarball from http://erlang.org/download contains many ;; The tarball from http://erlang.org/download contains many
@ -52,7 +52,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0gv83i5ybj1z3ykbbldjzf7dbfjszp84c0yzrpshj611b9wp0176")) "1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj"))
(patches (search-patches "erlang-man-path.patch")))) (patches (search-patches "erlang-man-path.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -68,7 +68,7 @@
(version-major+minor version) ".tar.gz")) (version-major+minor version) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0cgv23q0215f6lvmhj4w9skx5m29khjs9mb890635s3yp520xgqh")))))) "0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm"))))))
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)
("openssl" ,openssl) ("openssl" ,openssl)

View file

@ -573,7 +573,11 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
;; Only try tests that don't need access to network or system ;; Only try tests that don't need access to network or system
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test"))) ;; Core tests sometimes fail, at least on i686-linux.
;; Let's disable them for now and just try hash tests
;; and unit tests.
;; (invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test")))
(invoke "make" "ARGS=-R 'hash' --verbose" "test")))
(add-after 'check 'unit-tests (add-after 'check 'unit-tests
(lambda _ (lambda _
(let ((excluded-unit-tests (let ((excluded-unit-tests
@ -1122,7 +1126,7 @@ Grisbi can manage multiple accounts, currencies and users. It manages
third party, expenditure and receipt categories, budgetary lines, third party, expenditure and receipt categories, budgetary lines,
financial years, budget estimates, bankcard management and other financial years, budget estimates, bankcard management and other
information.") information.")
(home-page "http://grisbi.org") (home-page "https://grisbi.org")
(license license:gpl2+))) (license license:gpl2+)))
(define-public trezord (define-public trezord

View file

@ -55,7 +55,7 @@
(sha256 (sha256
(base32 (base32
"16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23")) "16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23"))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(patches (search-patches "ath9k-htc-firmware-objcopy.patch")))) (patches (search-patches "ath9k-htc-firmware-objcopy.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -112,7 +112,7 @@ Linux-libre.")
(uri (git-reference (uri (git-reference
(url "http://git.bues.ch/git/b43-tools.git") (url "http://git.bues.ch/git/b43-tools.git")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1wgmj4d65izbhprwb5bcwimc2ryv19b9066lqzy4sa5m6wncm9cn")))) "1wgmj4d65izbhprwb5bcwimc2ryv19b9066lqzy4sa5m6wncm9cn"))))
@ -194,7 +194,7 @@ by the b43-open driver of Linux-libre.")
(name (string-replace-substring (name (string-replace-substring
(string-append "opensbi-" platform "-" variant) (string-append "opensbi-" platform "-" variant)
"_" "-")) "_" "-"))
(version "0.5") (version "0.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -203,7 +203,7 @@ by the b43-open driver of Linux-libre.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0qc73xbiy79qqkwxmp4mg15q8n8k26njkyqb6n0jw5dyibd6hb85")))) (base32 "129ypdga0fzn657n2f42g2a1vx3hf8x7sd78h06d35pgkry0jkl7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(,@(if (and (not (string-prefix? "riscv64" (%current-system))) `(,@(if (and (not (string-prefix? "riscv64" (%current-system)))
@ -246,12 +246,14 @@ for platform-specific firmwares executing in M-mode.")
(define-public opensbi-qemu-virt (define-public opensbi-qemu-virt
(make-opensbi-package "qemu" "virt")) (make-opensbi-package "qemu" "virt"))
(define-public opensbi-qemu-sifive-u
(make-opensbi-package "qemu" "sifive_u"))
(define-public opensbi-sifive-fu540 (define-public opensbi-sifive-fu540
(make-opensbi-package "sifive" "fu540")) (make-opensbi-package "sifive" "fu540"))
(define-public opensbi-qemu-sifive-u
;; Dropped upstream, as all functionality is present in the sifive-fu540
;; target for recent versions of qemu, u-boot and linux.
(deprecated-package "opensbi-qemu-sifive-u" opensbi-sifive-fu540))
(define-public seabios (define-public seabios
(package (package
(name "seabios") (name "seabios")

View file

@ -6,7 +6,7 @@
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -48,7 +48,7 @@
(define-public flashrom (define-public flashrom
(package (package
(name "flashrom") (name "flashrom")
(version "1.1") (version "1.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -56,7 +56,7 @@
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"06afq680n9p34hi3vrkn12vd1pfyq2062db9qqbi4hi21k3skbdf")))) "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("dmidecode" ,dmidecode) (inputs `(("dmidecode" ,dmidecode)
("pciutils" ,pciutils) ("pciutils" ,pciutils)
@ -447,7 +447,7 @@ ME as far as possible (it only edits ME firmware image files).")
(define-public uefitool (define-public uefitool
(package (package
(name "uefitool") (name "uefitool")
(version "0.26.0") (version "0.27.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -455,7 +455,7 @@ ME as far as possible (it only edits ME firmware image files).")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"1ka7i12swm9r5bmyz5vjr82abd2f3lj8p35f4208byalfbx51yq7")) "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

View file

@ -109,7 +109,7 @@ UI builder called FLUID that can be used to create applications in minutes.")
(sha256 (sha256
(base32 (base32
"0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0")) "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"))
(file-name (string-append name "-" version "-checkout")))) (file-name (git-file-name name version))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ;no "check" target `(#:tests? #f ;no "check" target

View file

@ -29,6 +29,7 @@
;;; Copyright © 2019 Alva <alva@skogen.is> ;;; Copyright © 2019 Alva <alva@skogen.is>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Damien Cassou <damien@cassou.me> ;;; Copyright © 2020 Damien Cassou <damien@cassou.me>
;;; Copyright © 2020 Amin Bandali <mab@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -780,7 +781,7 @@ It contains the following fonts and styles:
(define-public font-fantasque-sans (define-public font-fantasque-sans
(package (package
(name "font-fantasque-sans") (name "font-fantasque-sans")
(version "1.7.2") (version "1.8.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -789,26 +790,27 @@ It contains the following fonts and styles:
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "17l18488qyl9gdj80r8pcym3gp3jkgsdikwalnrp5rgvwidqx507"))))
"1gjranq7qf20rfxnpxsckv1hl35nzsal0rjs475nhfbpqy5wmly6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("ttfautohint" ,ttfautohint) `(("ttfautohint" ,ttfautohint)
("woff-tools" ,woff-tools) ("woff-tools" ,woff-tools)
("fontforge" ,fontforge) ("fontforge" ,fontforge)
("woff2" ,woff2) ("woff2" ,woff2)
("ttf2eot" ,ttf2eot)
("zip" ,zip))) ("zip" ,zip)))
(arguments (arguments
`(#:tests? #f ;test target intended for visual inspection `(#:tests? #f ;test target intended for visual inspection
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure) ;no configuration (delete 'configure) ;no configuration
(add-before 'build 'xrange->range (add-before 'build 'support-python@3
;; Rather than use a python2 fontforge, just replace the ;; Rather than use a Python 2 fontforge, replace Python-2-
;; offending function. ;; specific code with a passable Python 3 equivalent.
(lambda _ (lambda _
(substitute* "Scripts/fontbuilder.py" (substitute* "Scripts/fontbuilder.py"
(("xrange") "range")) (("xrange") "range"))
(substitute* "Scripts/features.py"
(("f\\.write\\(fea_code\\)")
"f.write(str.encode(fea_code))"))
#t)) #t))
(replace 'install (replace 'install
;; 'make install' wants to install to ~/.fonts, install to ;; 'make install' wants to install to ~/.fonts, install to
@ -1221,7 +1223,7 @@ monospace, slab-serif fonts.")
(base32 (base32
"17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0")))) "17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0"))))
(build-system font-build-system) (build-system font-build-system)
(home-page "http://google.github.io/material-design-icons") (home-page "https://google.github.io/material-design-icons")
(synopsis "Icon font of Google Material Design icons") (synopsis "Icon font of Google Material Design icons")
(description (description
"Material design system icons are simple, modern, friendly, and sometimes "Material design system icons are simple, modern, friendly, and sometimes
@ -1585,3 +1587,42 @@ This package provides the TrueType fonts.")
Monos typeface forms are simple and free from unnecessary details. Rendered Monos typeface forms are simple and free from unnecessary details. Rendered
in small sizes, the text looks crisper.") in small sizes, the text looks crisper.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public font-vazir
(package
(name "font-vazir")
(version "22.1.0")
(source
(origin
(method url-fetch/zipbomb)
(uri
(string-append "https://github.com/rastikerdar/vazir-font/"
"releases/download/v" version
"/vazir-font-v" version ".zip"))
(sha256
(base32
"0w3gwb5q33x5llw7cfs8qhaxr4ssg6rsx4b9day3993zn24xq031"))))
(build-system font-build-system)
(home-page "https://rastikerdar.github.io/vazir-font/")
(synopsis "Vazir Persian typeface")
(description
"Vazir is a beautiful and elegant Persian typeface originally based on
DejaVu, and comes in six variants: Thin, Light, Normal, Medium, Bold, and
Black. This package provides four versions of Vazir:
@itemize
@item @code{Vazir}: The main version; includes Latin glyphs from Roboto.
@item @code{Vazir-FD}: Like @code{Vazir}, but (always) uses Farsi digit glyphs
instead of Latin ones.
@item @code{Vazir-WOL}: Like @code{Vazir}, but without Roboto's Latin glyphs.
@item @code{Vazir-FD-WOL}: Combination of @code{Vazir-FD} and @code{Vazir-WOL}:
always uses Farsi digits, and does not include Latin glyphs from Roboto.
@end itemize\n")
(license
;; See https://github.com/rastikerdar/vazir-font/blob/master/LICENSE for
;; details.
(list license:public-domain ; the Vazir modifications to DejaVu
; and the DejaVu modifications to...
(license:x11-style ; ...the Bitstream Vera typeface
"file://LICENSE" "Bitstream Vera License")
license:asl2.0)))) ; Latin glyphs from Roboto

View file

@ -10,6 +10,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -698,7 +699,7 @@ files. UFO is a file format that stores fonts source files.")
(propagated-inputs (propagated-inputs
`(("python2-fonttools" ,python2-fonttools) `(("python2-fonttools" ,python2-fonttools)
("python2-ufolib" ,python2-ufolib))) ("python2-ufolib" ,python2-ufolib)))
(home-page "https://pypi.python.org/pypi/defcon") (home-page "https://pypi.org/project/defcon/")
(synopsis "Flexible objects for representing @acronym{UFO, unified font object} data") (synopsis "Flexible objects for representing @acronym{UFO, unified font object} data")
(description (description
"Defcon is a set of @acronym{UFO, unified font object} based objects "Defcon is a set of @acronym{UFO, unified font object} based objects
@ -795,3 +796,64 @@ tools or editing configuration files by hand.
While designed primarily with the GNOME Desktop Environment in mind, it should While designed primarily with the GNOME Desktop Environment in mind, it should
work well with other GTK+ desktop environments.") work well with other GTK+ desktop environments.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public fntsample
(package
(name "fntsample")
(version "5.3")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/eugmes/fntsample/archive/release/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0awp4dh1g40ivzvm5xqlvcpcdw1vplrx3drjmbylr62y185vbs74"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; There are no tests.
#:configure-flags
(list (string-append
"-DUNICODE_BLOCKS=" (assoc-ref %build-inputs "unicode-blocks")))
#:phases
(modify-phases %standard-phases
(add-after 'install 'set-library-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(pdf-api2 (assoc-ref inputs "perl-pdf-api2"))
(intl (assoc-ref inputs "perl-libintl-perl"))
(perllib (string-append pdf-api2
"/lib/perl5/site_perl/"
,(package-version perl)
":" intl
"/lib/perl5/site_perl/"
,(package-version perl))))
(wrap-program (string-append out "/bin/pdfoutline")
`("PERL5LIB" ":" prefix (,perllib)))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)))
(inputs
`(("cairo" ,cairo)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glib" ,glib)
("pango" ,pango)
("perl-pdf-api2" ,perl-pdf-api2)
("perl-libintl-perl" ,perl-libintl-perl)
("unicode-blocks"
,(origin
(method url-fetch)
(uri "https://unicode.org/Public/UNIDATA/Blocks.txt")
(file-name "unicode-blocks.txt")
(sha256
(base32
"1xs8fnhh48gs41wg004r7m4r2azh9khmyjjlnvyzy9c6zrd212x2"))))))
(home-page "https://github.com/eugmes/fntsample")
(synopsis "PDF and PostScript font samples generator")
(description "This package provides a tool that can be used to make font
samples that show coverage of the font and are similar in appearance to
Unicode Charts. It was developed for use with DejaVu Fonts project.")
(license license:gpl3+)))

View file

@ -51,15 +51,15 @@
(revision "1")) (revision "1"))
(package (package
(name "abc") (name "abc")
(version (string-append "0.0-" revision "-" (string-take commit 9))) (version (git-version "0.0" revision commit))
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append "https://bitbucket.org/alanmi/abc/get/" commit ".zip")) (string-append "https://bitbucket.org/alanmi/abc/get/" commit ".zip"))
(file-name (string-append name "-" version "-checkout.zip")) (file-name (string-append name "-" version "-checkout.zip"))
(sha256 (sha256
(base32 (base32
"1syygi1x40rdryih3galr4q8yg1w5bvdzl75hd27v1xq0l5bz3d0")))) "1syygi1x40rdryih3galr4q8yg1w5bvdzl75hd27v1xq0l5bz3d0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
@ -75,7 +75,7 @@
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(out-bin (string-append out "/bin"))) (out-bin (string-append out "/bin")))
(install-file "abc" out-bin))))))) (install-file "abc" out-bin)))))))
(home-page "http://people.eecs.berkeley.edu/~alanmi/abc/") (home-page "https://people.eecs.berkeley.edu/~alanmi/abc/")
(synopsis "Sequential logic synthesis and formal verification") (synopsis "Sequential logic synthesis and formal verification")
(description "ABC is a program for sequential logic synthesis and (description "ABC is a program for sequential logic synthesis and
formal verification.") formal verification.")
@ -216,13 +216,13 @@ For synthesis, the compiler generates netlists in the desired format.")
(revision "2")) (revision "2"))
(package (package
(name "icestorm") (name "icestorm")
(version (string-append "0.0-" revision "-" (string-take commit 9))) (version (git-version "0.0" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cliffordwolf/icestorm.git") (url "https://github.com/cliffordwolf/icestorm.git")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya")))) "0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya"))))
@ -267,7 +267,7 @@ Includes the actual FTDI connector.")
(uri (git-reference (uri (git-reference
(url "https://github.com/YosysHQ/arachne-pnr.git") (url "https://github.com/YosysHQ/arachne-pnr.git")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl")))) "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl"))))

View file

@ -8,15 +8,16 @@
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2017 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> ;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
;;; Copyright © 2019 Reza Alizadeh Majd <r.majd@pantherx.org> ;;; Copyright © 2019 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -305,7 +306,6 @@ the freedesktop.org XDG Base Directory specification.")
"-Dcgroup-controller=elogind" "-Dcgroup-controller=elogind"
"-Dman=true" "-Dman=true"
;; Disable some tests. ;; Disable some tests.
"-Dtests=false"
"-Dslow-tests=false")) "-Dslow-tests=false"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -323,6 +323,46 @@ the freedesktop.org XDG Base Directory specification.")
(("=/run/dbus/system_bus_socket") (("=/run/dbus/system_bus_socket")
"=/var/run/dbus/system_bus_socket")) "=/var/run/dbus/system_bus_socket"))
#t)) #t))
(add-after 'unpack 'adjust-tests
(lambda _
;; This test tries to copy some bytes from /usr/lib/os-release,
;; which does not exist in the build container. Choose something
;; more likely to be available.
(substitute* "src/test/test-copy.c"
(("/usr/lib/os-release")
"/etc/passwd"))
;; Use a shebang that works in the build container.
(substitute* "src/test/test-exec-util.c"
(("#!/bin/sh")
(string-append "#!" (which "sh"))))
;; Do not look for files or directories that do not exist.
(substitute* "src/test/test-fs-util.c"
(("usr") "etc")
(("/etc/machine-id") "/etc/passwd"))
;; FIXME: Why is sd_id128_get_machine_app_specific failing.
;; Disable for now by hooking into the kernel support check.
(substitute* "src/test/test-id128.c"
(("if \\(r == -EOPNOTSUPP\\)")
"if (1)"))
;; This test expects that /sys is available.
(substitute* "src/test/test-mountpoint-util.c"
(("assert_se\\(path_is_mount_point\\(\"/sys.*")
""))
;; /bin/sh does not exist in the build container.
(substitute* "src/test/test-path-util.c"
(("/bin/sh") (which "sh")))
;; This test uses sd_device_new_from_syspath to allocate a
;; loopback device, but that fails because /sys is unavailable.
(substitute* "src/libelogind/sd-device/test-sd-device-thread.c"
((".*sd_device_new_from_syspath.*/sys/class/net/lo.*")
"return 77;"))
;; Most of these tests require cgroups or an actual live
;; logind system so that it can flicker the monitor, etc.
;; Just skip it until a more narrow selection can be made.
(substitute* "src/libelogind/sd-login/test-login.c"
(("r = sd_pid_get_slice.*")
"return 77;"))
#t))
(add-after 'unpack 'change-pid-file-path (add-after 'unpack 'change-pid-file-path
(lambda _ (lambda _
(substitute* "src/login/elogind.c" (substitute* "src/login/elogind.c"
@ -505,7 +545,7 @@ with localed. This package is extracted from the broader systemd package.")
(define-public packagekit (define-public packagekit
(package (package
(name "packagekit") (name "packagekit")
(version "1.1.12") (version "1.1.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -514,7 +554,7 @@ with localed. This package is extracted from the broader systemd package.")
"PackageKit-" version ".tar.xz")) "PackageKit-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"00css16dv3asaxrklvyxy9dyjzhw82wmfrqxqpca9w2xryz58i8z")))) "1dr1laic65ld95abp2yxbwvijnngh0dwyb1x49x4wjm5rhq43dl8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
@ -934,6 +974,11 @@ message bus.")
"--enable-elogind") "--enable-elogind")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-/bin/cat
(lambda _
(substitute* "src/user.c"
(("/bin/cat") (which "cat")))
#t))
(add-before (add-before
'configure 'pre-configure 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -1205,28 +1250,36 @@ wish to perform colour calibration.")
(define-public libfprint (define-public libfprint
(package (package
(name "libfprint") (name "libfprint")
(version "0.6.0") (version "1.90.1")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://people.freedesktop.org/~hadess/" (method git-fetch)
name "-" version ".tar.xz")) (uri (git-reference
(sha256 (url "https://gitlab.freedesktop.org/libfprint/libfprint")
(base32 (commit (string-append "v" version))))
"1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5")))) (file-name (git-file-name name version))
(build-system gnu-build-system) (sha256
(base32 "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a"))))
(build-system meson-build-system)
(arguments (arguments
'(#:configure-flags (list (string-append "--with-udev-rules-dir=" '(#:configure-flags
(assoc-ref %outputs "out") (list (string-append "-Dudev_rules_dir=" (assoc-ref %outputs "out")
"/lib/udev/rules.d")))) "/lib/udev/rules.d"))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("eudev" ,eudev)
("glib:bin" ,glib "bin") ; for {glib-,}mkenums
("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc) ; for 88 KiB of API documentation
("pkg-config" ,pkg-config)))
(inputs (inputs
`(("libusb" ,libusb) `(("glib" ,glib)
("nss" ,nss) ("gusb" ,gusb)
("glib" ,glib) ("nss" ,nss) ; for the URU4x00 driver
("eudev" ,eudev)
;; Replacing this with cairo works but just results in a reference
;; (only) to pixman in the end.
("pixman" ,pixman))) ("pixman" ,pixman)))
(home-page "https://www.freedesktop.org/wiki/Software/fprint/libfprint/") (home-page "https://fprint.freedesktop.org/")
(synopsis "Library to access fingerprint readers") (synopsis "Library to access fingerprint readers")
(description (description
"libfprint is a library designed to make it easy for application "libfprint is a library designed to make it easy for application
@ -1237,37 +1290,90 @@ software.")
(define-public fprintd (define-public fprintd
(package (package
(name "fprintd") (name "fprintd")
(version "0.7.0") (version "1.90.1")
(source (origin (source
(method url-fetch) (origin
(uri (string-append (method git-fetch)
"https://people.freedesktop.org/~hadess/fprintd-" (uri (git-reference
version ".tar.xz")) (url "https://gitlab.freedesktop.org/libfprint/fprintd")
(sha256 (commit version)))
(base32 (file-name (git-file-name name version))
"05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5")))) (sha256
(build-system gnu-build-system) (base32 "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg"))))
(build-system meson-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases `(#:configure-flags
(add-before 'build 'set-sysconfdir (list "-Dsystemd_system_unit_dir=/tmp"
(lambda* (#:key outputs #:allow-other-keys) (string-append "-Ddbus_service_dir=" (assoc-ref %outputs "out")
;; Work around a bug whereby the 'SYSCONFDIR' macro "/share/dbus-1/system-services")
;; expands literally to '${prefix}/etc'. (string-append "-Dpam_modules_dir=" (assoc-ref %outputs "out")
(let ((out (assoc-ref outputs "out"))) "/lib/security"))
(substitute* "src/main.c" #:phases
(("SYSCONFDIR, \"fprintd.conf\"") (modify-phases %standard-phases
(string-append "\"" out "/etc\", " (add-before 'configure 'patch-output-directories
"\"fprintd.conf\""))) ;; Install files to our output, not that of the owner package.
#t)))))) ;; These are not exposed as Meson options and must be patched.
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "meson.build"
(("(dbus_interfaces_dir = ).*" _ set)
(string-append set "'" out "/share/dbus-1/interfaces'\n"))
(("(polkit_policy_directory = ).*" _ set)
(string-append set "'" out "/share/polkit-1/actions/'\n"))
(("(dbus_data_dir = ).*" _ set)
(string-append set "get_option('prefix')"
" / get_option('datadir')\n")))
#t)))
(add-before 'configure 'patch-mistake
(lambda _
(substitute* "meson.build"
(("(storage_path = )(get_option\\('prefix'\\))(.*)"
_ set mistake value)
(string-append set "''" value "\n")))
#t))
(add-before 'configure 'patch-systemd-dependencies
(lambda _
(substitute* "meson.build"
(("'(libsystemd|systemd)'") "'libelogind'"))
#t))
(add-before 'configure 'ignore-test-dependencies
(lambda _
(substitute* "meson.build"
(("pam_wrapper_dep .*") "")
((".*'(cairo|dbus|dbusmock|gi|pypamtest)': .*,.*") ""))
#t))
(add-before 'install 'no-polkit-magic
;; Meson magically invokes pkexec, which fails (not setuid).
(lambda _
(setenv "PKEXEC_UID" "something")
#t)))
#:tests? #f)) ; XXX depend on unpackaged packages
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("gettext" ,gettext-minimal)
("intltool" ,intltool))) ("glib:bin" ,glib "bin") ; for glib-genmarshal
("libxslt" ,libxslt) ; for xsltproc
("perl" ,perl) ; for pod2man
("pkg-config" ,pkg-config)))
;; For tests.
;;("pam_wrapper" ,pam_wrapper)
;;("python-pycairo" ,python-pycairo)
;;("python-dbus" ,python-dbus)
;;("python-dbusmock" ,python-dbusmock)
;;("python-pygobject" ,python-pygobject)
;;("python-pypamtest" ,python-pypamtest)
(inputs (inputs
`(("libfprint" ,libfprint) `(("dbus-glib" ,dbus-glib)
("dbus-glib" ,dbus-glib) ("elogind" ,elogind)
("libfprint" ,libfprint)
("linux-pam" ,linux-pam)
("polkit" ,polkit) ("polkit" ,polkit)
("linux-pam" ,linux-pam))) ;for pam_fprintd
(home-page "https://www.freedesktop.org/wiki/Software/fprint/fprintd/") ;; XXX These are in libfprint's Requires.private. Meson refuses to grant
;; the libfprint-2 dependency if they are not provided here.
("gusb" ,gusb)
("nss" ,nss)
("pixman" ,pixman)))
(home-page "https://fprint.freedesktop.org/")
(synopsis "D-Bus daemon that exposes fingerprint reader functionality") (synopsis "D-Bus daemon that exposes fingerprint reader functionality")
(description (description
"fprintd is a D-Bus daemon that offers functionality of libfprint, a "fprintd is a D-Bus daemon that offers functionality of libfprint, a

View file

@ -19,6 +19,7 @@
;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com> ;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -88,6 +89,7 @@
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages stb) #:use-module (gnu packages stb)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages web) #:use-module (gnu packages web)
@ -585,6 +587,34 @@ sounds from presets such as \"explosion\" or \"powerup\".")
(home-page "http://www.drpetter.se/project_sfxr.html") (home-page "http://www.drpetter.se/project_sfxr.html")
(license license:expat))) (license license:expat)))
(define-public surgescript
(package
(name "surgescript")
(version "0.5.4.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alemart/surgescript.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "13q81439zg1bn7gskligskjgcfq0rdapp6f3llmrlk48vnyq49s0"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
(let ((share (string-append (assoc-ref %outputs "out") "/share")))
(list (string-append "-DICON_PATH=" share "/pixmaps")
(string-append "-DMETAINFO_PATH=" share "/metainfo")))
#:tests? #f))
(home-page "https://docs.opensurge2d.org")
(synopsis "Scripting language for games")
(description "@code{SurgeScript} is a dynamically typed object-oriented
scripting language designed for games. Each object is a state machine that
can be customized by attaching other objects. The language supports automatic
garbage collection and can be extended with plugins.")
(license license:asl2.0)))
(define-public physfs (define-public physfs
(package (package
(name "physfs") (name "physfs")
@ -2016,14 +2046,14 @@ a.k.a. XenoCollide) as described in Game Programming Gems 7.")
(define-public ode (define-public ode
(package (package
(name "ode") (name "ode")
(version "0.16") (version "0.16.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://bitbucket.org/odedevs/ode/downloads/" (uri (string-append "https://bitbucket.org/odedevs/ode/downloads/"
"ode-" version ".tar.gz")) "ode-" version ".tar.gz"))
(sha256 (sha256
(base32 "09xzrarxwxcf6rdv5jsjfjh454jnn29dpcw3wh6ic50kkipvg8sb")) (base32 "1flfdqgdbcn1bx8nrrd4qnp6cvsxrhvk8cdg7vaq2dzkh6nsqa5j"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -2031,7 +2061,8 @@ a.k.a. XenoCollide) as described in Game Programming Gems 7.")
#t)))) #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; Tests fail on all systems but x86_64. ;; Tests fail on all systems but x86_64. This is fixed upstream and can
;; be removed in 0.16.2+.
`(#:tests? ,(string-prefix? "x86_64-" `(#:tests? ,(string-prefix? "x86_64-"
(or (%current-target-system) (or (%current-target-system)
(%current-system))) (%current-system)))
@ -2086,3 +2117,75 @@ computer games, 3D authoring tools and simulation tools.")
(description "Chipmunk is a simple, lightweight, fast and portable 2D (description "Chipmunk is a simple, lightweight, fast and portable 2D
rigid body physics library written in C.") rigid body physics library written in C.")
(license license:expat))) (license license:expat)))
(define-public libtcod
(package
(name "libtcod")
(version "1.15.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/libtcod/libtcod.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0pzr8ajmbqvh43ldjajx962xirj3rf8ayh344p6mqlrmb8gxrfr5"))
(modules '((guix build utils)))
(snippet '(begin
(delete-file-recursively "src/vendor/utf8proc")
(delete-file-recursively "src/vendor/zlib")
(delete-file "src/vendor/stb_truetype.h")
(delete-file "src/vendor/stb_sprintf.h")
(delete-file "src/vendor/lodepng.cpp")
(delete-file "src/vendor/lodepng.h")
(substitute* "buildsys/autotools/sources.am"
(("\\.\\./\\.\\./src/vendor/lodepng\\.cpp \\\\\n") "")
(("\\.\\./\\.\\./src/vendor/stb\\.c \\\\")
"../../src/vendor/stb.c")
(("\\.\\./\\.\\./src/vendor/utf8proc/utf8proc\\.c") ""))
(substitute* "src/libtcod/sys_sdl_img_png.cpp"
(("\\.\\./vendor/") ""))
(substitute* '("src/libtcod/color/canvas.cpp"
"src/libtcod/sys_sdl_img_png.cpp"
"src/libtcod/tileset/truetype.cpp"
"src/libtcod/tileset/tilesheet.cpp")
(("\\.\\./\\.\\./vendor/") ""))
(substitute* "src/libtcod/console/printing.cpp"
(("\\.\\./\\.\\./vendor/utf8proc/") ""))
#t))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-gnu-ld"
"LIBS=-lutf8proc -llodepng")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'change-to-build-dir
(lambda _
(chdir "buildsys/autotools")
(patch-shebang "get_version.py")
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("python" ,python)
("pkg-config" ,pkg-config)
("stb-sprintf" ,stb-sprintf)
("stb-truetype" ,stb-truetype)))
(inputs
`(("lodepng" ,lodepng)
("sdl2" ,sdl2)
("utf8proc" ,utf8proc)
("zlib" ,zlib)))
(home-page "https://github.com/libtcod/libtcod")
(synopsis "Library specifically designed for writing roguelikes")
(description
"libtcod is a fast, portable and uncomplicated API for roguelike
developers providing an advanced true color console, input, and lots of other
utilities frequently used in roguelikes.")
(license license:bsd-3)))

View file

@ -798,7 +798,7 @@ automata. The following features are available:
(define-public julius (define-public julius
(package (package
(name "julius") (name "julius")
(version "1.2.0") (version "1.3.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -807,7 +807,7 @@ automata. The following features are available:
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0kgyzfjii4dhpy2h05977alwdmxyxb4jxznnrhlgb21m0ybncmvp")))) (base32 "1ws5lmwdhla73676fj0w26v859n47s0wyxa0mgd0dmkx0x91qriy"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("sdl2" ,sdl2) `(("sdl2" ,sdl2)
@ -856,6 +856,74 @@ and much more stand between you and the exit. Record your moves and let your
shadow mimic them to reach blocks you couldn't reach alone.") shadow mimic them to reach blocks you couldn't reach alone.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public opensurge
(package
(name "opensurge")
(version "0.5.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alemart/opensurge.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ih7hlqjnp9rv0m4lqf7c0s1ai532way5i4pk45jq1gqm8325dbv"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;there are no tests
#:configure-flags
(let* ((out (assoc-ref %outputs "out"))
(share (string-append out "/share")))
(list (string-append "-DCMAKE_INSTALL_PREFIX=" out "/bin")
(string-append "-DGAME_DATADIR=" share "/" ,name)
(string-append "-DDESKTOP_ENTRY_PATH=" share "/applications")
(string-append "-DDESKTOP_ICON_PATH=" share "/pixmaps")
(string-append "-DDESKTOP_METAINFO_PATH=" share "/metainfo")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-xdg-open-path
(lambda* (#:key inputs #:allow-other-keys)
;; Look for xdg-open in the store.
(substitute* "src/core/web.c"
(("/usr(/bin/xdg-open)" _ bin)
(string-append (assoc-ref inputs "xdg-utils") bin)))
#t))
(add-after 'unpack 'unbundle-fonts
(lambda* (#:key inputs #:allow-other-keys)
;; Replace bundled Roboto fonts with links to the store.
(with-directory-excursion "fonts"
(let ((roboto-dir (string-append
(assoc-ref inputs "font-google-roboto")
"/share/fonts/truetype/")))
(for-each
(lambda (font)
(delete-file font)
(symlink (string-append roboto-dir font) font))
'("Roboto-Black.ttf" "Roboto-Bold.ttf" "Roboto-Medium.ttf")))
#t))))))
(inputs
`(("allegro" ,allegro)
("font-google-roboto" ,font-google-roboto)
("surgescript" ,surgescript)
("xdg-utils" ,xdg-utils)))
(home-page "https://opensurge2d.org")
(synopsis "2D retro side-scrolling game")
(description "@code{Open Surge} is a 2D retro side-scrolling platformer
inspired by the Sonic games. The player runs at high speeds through each
level while collecting items and avoiding obstacles. The game includes a
built-in level editor.")
(license
;; Code is under GPL 3+, assets are under various licenses.
;; See src/misc/credits.c for details.
(list license:gpl3+
license:cc0
license:cc-by3.0
license:cc-by-sa3.0
license:expat
license:public-domain
license:silofl1.1))))
(define-public knights (define-public knights
(package (package
(name "knights") (name "knights")
@ -1050,7 +1118,7 @@ watch your CPU playing while enjoying a cup of tea!")
(define-public nethack (define-public nethack
(package (package
(name "nethack") (name "nethack")
(version "3.6.4") (version "3.6.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1058,7 +1126,7 @@ watch your CPU playing while enjoying a cup of tea!")
(string-append "https://www.nethack.org/download/" version "/nethack-" (string-append "https://www.nethack.org/download/" version "/nethack-"
(string-join (string-split version #\.) "") "-src.tgz")) (string-join (string-split version #\.) "") "-src.tgz"))
(sha256 (sha256
(base32 "0ndxgnsprwgjnk0qb24iljkpijnfncgvfb3h3zb129h3cs2anc85")))) (base32 "0xifs8pqfffnmkbpmrcd1xf14yakcj06nl2bbhy4dyacg8myysmv"))))
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)
("bison" ,bison) ("bison" ,bison)
@ -1320,7 +1388,7 @@ utilizing the art assets from the @code{SuperTux} project.")
(define-public roguebox-adventures (define-public roguebox-adventures
(package (package
(name "roguebox-adventures") (name "roguebox-adventures")
(version "2.2.1") (version "3.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1330,7 +1398,7 @@ utilizing the art assets from the @code{SuperTux} project.")
(file-name (string-append name "-" version ".zip")) (file-name (string-append name "-" version ".zip"))
(sha256 (sha256
(base32 (base32
"0kmzdgnik8fsf3bg55546l77p3mfxn2awkzfzzdn20n82rd2babw")))) "05zd03s5w9kcpklfgcggbaa6rwf59nm0q9vcj6gh9v2lh402k067"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -1356,6 +1424,9 @@ utilizing the art assets from the @code{SuperTux} project.")
(string-append "'" data "'")) (string-append "'" data "'"))
(("^basic_path.*$") (("^basic_path.*$")
(string-append "basic_path ='" data "'\n"))) (string-append "basic_path ='" data "'\n")))
(substitute* "LIB/dialog.py"
(("d_path = os\\.path\\.dirname\\(.*\\)\\)")
(string-append "d_path = '" data "'")))
(substitute* "LIB/gra_files.py" (substitute* "LIB/gra_files.py"
(("basic_path = b_path\\.replace\\('/LIB',''\\)") (("basic_path = b_path\\.replace\\('/LIB',''\\)")
(string-append "basic_path ='" data "'\n"))) (string-append "basic_path ='" data "'\n")))
@ -2582,7 +2653,7 @@ falling, themeable graphics and sounds, and replays.")
(define-public wesnoth (define-public wesnoth
(package (package
(name "wesnoth") (name "wesnoth")
(version "1.14.9") (version "1.14.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-"
@ -2591,7 +2662,7 @@ falling, themeable graphics and sounds, and replays.")
"wesnoth-" version ".tar.bz2")) "wesnoth-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1mhdrlflxxyknf54lwdbvs7fazlc1scf7z6vxxa3j746fks533ga")))) "1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;no check target `(#:tests? #f ;no check target
@ -3535,7 +3606,7 @@ fullscreen, use F5 or Alt+Enter.")
("qtscript" ,qtscript) ("qtscript" ,qtscript)
("openssl" ,openssl) ("openssl" ,openssl)
("sdl2" ,sdl2))) ("sdl2" ,sdl2)))
(home-page "http://wz2100.net") (home-page "https://wz2100.net")
(synopsis "3D Real-time strategy and real-time tactics game") (synopsis "3D Real-time strategy and real-time tactics game")
(description (description
"Warzone 2100 offers campaign, multi-player, and single-player skirmish "Warzone 2100 offers campaign, multi-player, and single-player skirmish
@ -4020,7 +4091,7 @@ colors, pictures, and sounds.")
(inputs (inputs
`(("bash" ,bash) `(("bash" ,bash)
("love" ,love))) ("love" ,love)))
(home-page "http://tangramgames.dk/games/mrrescue") (home-page "https://tangramgames.dk/games/mrrescue")
(synopsis "Arcade-style fire fighting game") (synopsis "Arcade-style fire fighting game")
(description (description
"Mr. Rescue is an arcade styled 2d action game centered around evacuating "Mr. Rescue is an arcade styled 2d action game centered around evacuating
@ -4190,7 +4261,7 @@ for Un*x systems with X11.")
(define-public freeciv (define-public freeciv
(package (package
(name "freeciv") (name "freeciv")
(version "2.6.1") (version "2.6.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4202,7 +4273,7 @@ for Un*x systems with X11.")
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/freeciv-" version ".tar.bz2"))) "/freeciv-" version ".tar.bz2")))
(sha256 (sha256
(base32 "1qmrhrwm0ryvsh1zsxcxj128lhyvaxap7k39sam3hh8rl0fq9rnc")))) (base32 "13vc2xg1cf19rhbnr7k38b56b2hdapqymq5vma1l69kn7hyyz0b1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
@ -4723,10 +4794,10 @@ with the mouse isnt always trivial.")
(synopsis "Abstract puzzle game") (synopsis "Abstract puzzle game")
(description "Chroma is an abstract puzzle game. A variety of colourful (description "Chroma is an abstract puzzle game. A variety of colourful
shapes are arranged in a series of increasingly complex patterns, forming shapes are arranged in a series of increasingly complex patterns, forming
fiendish traps that must be disarmed and mysterious puzzles that must be fiendish traps that must be disarmed and mysterious puzzles that must be
manipulated in order to give up their subtle secrets. Initially so manipulated in order to give up their subtle secrets. Initially so
straightforward that anyone can pick it up and begin to play, yet gradually straightforward that anyone can pick it up and begin to play, yet gradually
becoming difficult enough to tax even the brightest of minds.") becoming difficult enough to tax even the brightest of minds.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public fillets-ng (define-public fillets-ng
@ -5207,7 +5278,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as
(define-public tome4 (define-public tome4
(package (package
(name "tome4") (name "tome4")
(version "1.6.6") (version "1.6.7")
(synopsis "Single-player, RPG roguelike game set in the world of Eyal") (synopsis "Single-player, RPG roguelike game set in the world of Eyal")
(source (source
(origin (origin
@ -5215,8 +5286,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as
(uri (string-append "https://te4.org/dl/t-engine/t-engine4-src-" (uri (string-append "https://te4.org/dl/t-engine/t-engine4-src-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32 "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68"))
"1amx0y49scy9hq71wjvkdzvgclwa2g54vkv4bf40mxyp4pl0bq7m"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -5865,7 +5935,7 @@ affect gameplay).")
(package (package
(inherit chocolate-doom) (inherit chocolate-doom)
(name "crispy-doom") (name "crispy-doom")
(version "5.6.4") (version "5.7.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -5873,7 +5943,7 @@ affect gameplay).")
(commit (string-append "crispy-doom-" version)))) (commit (string-append "crispy-doom-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2")))) (base32 "1gqivy4pxasy7phyznixsagylf9f70bk33b0knpfzzlks6cc6zzj"))))
(native-inputs (native-inputs
(append (append
(package-native-inputs chocolate-doom) (package-native-inputs chocolate-doom)
@ -8136,23 +8206,15 @@ win.")
(define-public freeorion (define-public freeorion
(package (package
(name "freeorion") (name "freeorion")
(version "0.4.8") (version "0.4.9")
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append "https://github.com/freeorion/freeorion/releases/"
(url "https://github.com/freeorion/freeorion.git") "download/v" version "/FreeOrion_v" version
;; Most recent stable release uses boost_signals (v1) which was "_2020-02-02.db53471_Source.tar.gz"))
;; later replaced with boost-signals2 and no longer exists. This
;; commit builds and runs.
;;
;; TODO: Update this when the next stable release when it is
;; available.
(commit "470d0711537804df3c2ca25532f674ab4bec58af")))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "1qfnqkysagh8dw26plk229qh17mv4prjxs6qhfyczrmrrakb72an"))
"1wsw632l1cj17px6i88nqjzs0dngp5rsr67n6qkkjlfjfxi69j0f"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

View file

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com> ;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
@ -505,14 +505,14 @@ It also includes runtime support libraries for these languages.")))
(define-public gcc-8 (define-public gcc-8
(package (package
(inherit gcc-7) (inherit gcc-7)
(version "8.3.0") (version "8.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-" (uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz")) version "/gcc-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4")) "1m1d3gfix56w4aq8myazzfffkl8bqcrx4jhhapnjf7qfs596w2p3"))
(patches (search-patches "gcc-8-strmov-store-file-names.patch" (patches (search-patches "gcc-8-strmov-store-file-names.patch"
"gcc-8-libsanitizer-mode-size.patch" "gcc-8-libsanitizer-mode-size.patch"
"gcc-5.0-libvtv-runpath.patch")))))) "gcc-5.0-libvtv-runpath.patch"))))))

View file

@ -393,7 +393,7 @@ functionality of proj in their own software.")
#t))))) #t)))))
(inputs (inputs
`(("glib" ,glib))) `(("glib" ,glib)))
(home-page "http://proj4.org/") (home-page "https://proj.org/")
(synopsis "Cartographic Projections Library") (synopsis "Cartographic Projections Library")
(description (description
"Proj.4 is a library for converting coordinates between cartographic "Proj.4 is a library for converting coordinates between cartographic
@ -443,7 +443,7 @@ projections.")
(list "CC=gcc" (list "CC=gcc"
(string-append "PREFIX=" %output) (string-append "PREFIX=" %output)
(string-append "CUSTOM_LDFLAGS=-Wl,-rpath=" %output "/lib")))) (string-append "CUSTOM_LDFLAGS=-Wl,-rpath=" %output "/lib"))))
(home-page "http://mapnik.org/") (home-page "https://mapnik.org/")
(synopsis "Toolkit for developing mapping applications") (synopsis "Toolkit for developing mapping applications")
(description "Mapnik is a toolkit for developing mapping applications. It (description "Mapnik is a toolkit for developing mapping applications. It
is basically a collection of geographic objects like maps, layers, is basically a collection of geographic objects like maps, layers,
@ -1092,7 +1092,7 @@ persisted.
(define-public java-jmapviewer (define-public java-jmapviewer
(package (package
(name "java-jmapviewer") (name "java-jmapviewer")
(version "2.12") (version "2.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://svn.openstreetmap.org/applications/" (uri (string-append "https://svn.openstreetmap.org/applications/"
@ -1100,7 +1100,7 @@ persisted.
"/JMapViewer-" version "-Source.zip")) "/JMapViewer-" version "-Source.zip"))
(sha256 (sha256
(base32 (base32
"08hbqsbs859v4m5d90560fdifavd1apnpz9v9iry1v31dsvy5707")))) "0sy6r5fkbb9bclw0is6gwnbzz627m7pjfnsqydxz58pbndakkhrv"))))
(build-system ant-build-system) (build-system ant-build-system)
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
@ -1127,7 +1127,7 @@ an independent project by the JOSM team.")
(define-public josm (define-public josm
(package (package
(name "josm") (name "josm")
(version "15553") (version "15937")
(source (origin (source (origin
(method svn-fetch) (method svn-fetch)
(uri (svn-reference (uri (svn-reference
@ -1136,7 +1136,7 @@ an independent project by the JOSM team.")
(recursive? #f))) (recursive? #f)))
(sha256 (sha256
(base32 (base32
"091pbcn4fnmk42fmxplhis3nw5dbljf6ws8acyhx5dflyn49xzmx")) "00b8sw0wgkcf7xknmdpn5s521ax8x2660figidcrry37sgq3x946"))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet

View file

@ -268,7 +268,7 @@ also known as DXTn or DXTC) for Mesa.")
("libxvmc" ,libxvmc) ("libxvmc" ,libxvmc)
,@(match (%current-system) ,@(match (%current-system)
((or "x86_64-linux" "i686-linux") ((or "x86_64-linux" "i686-linux")
`(("llvm" ,llvm))) `(("llvm" ,llvm-8)))
(_ (_
`())) `()))
("makedepend" ,makedepend) ("makedepend" ,makedepend)
@ -453,7 +453,7 @@ from software emulation to complete hardware acceleration for modern GPUs.")
`(("libclc" ,libclc) `(("libclc" ,libclc)
,@(package-inputs mesa))) ,@(package-inputs mesa)))
(native-inputs (native-inputs
`(("clang" ,clang) `(("clang" ,clang-8)
,@(package-native-inputs mesa))))) ,@(package-native-inputs mesa)))))
(define-public mesa-opencl-icd (define-public mesa-opencl-icd

View file

@ -683,7 +683,7 @@ useful for C++.")
(arguments (arguments
`(#:tests? #f ;segfaults during tests `(#:tests? #f ;segfaults during tests
#:configure-flags '("LIBS=-lcairo-gobject"))) #:configure-flags '("LIBS=-lcairo-gobject")))
(home-page "https://pypi.python.org/pypi/PyGObject") (home-page "https://pypi.org/project/PyGObject/")
(synopsis "Python bindings for GObject") (synopsis "Python bindings for GObject")
(description (description
"Python bindings for GLib, GObject, and GIO.") "Python bindings for GLib, GObject, and GIO.")
@ -894,16 +894,15 @@ programming language. It also contains the utility
(define-public appstream-glib (define-public appstream-glib
(package (package
(name "appstream-glib") (name "appstream-glib")
(version "0.7.16") (version "0.7.17")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://people.freedesktop.org/~hughsient/" (uri (string-append "https://people.freedesktop.org/~hughsient/"
"appstream-glib/releases/" "appstream-glib/releases/"
"appstream-glib-" version ".tar.xz")) "appstream-glib-" version ".tar.xz"))
(patches (search-patches "appstream-glib-2020.patch"))
(sha256 (sha256
(base32 (base32
"14jr1psx5kxywdprgbqn79w309yz8lrqlsq7288hfrf87gbr1wh4")))) "0jg58m1p5xfrh8zkpqhhg00nqs727z5i1qy6sb0a3vyc98fyk9vw"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)

View file

@ -2,6 +2,8 @@
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -21,15 +23,21 @@
(define-module (gnu packages gnome-xyz) (define-module (gnu packages gnome-xyz)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system copy)
#:use-module (guix build-system meson)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages ssh)
#:use-module (gnu packages tls)
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
@ -82,7 +90,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
(define-public delft-icon-theme (define-public delft-icon-theme
(package (package
(name "delft-icon-theme") (name "delft-icon-theme")
(version "1.10") (version "1.11")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -91,21 +99,19 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0vw3yw9f9ygzfd2k3zrfih3r0vkzlhk1bmsk8sapvk7np24i1z9s")) "1m3r4i4m3y3xsjb5f4bik0ylmi64amkfyr0y8pjbvv6gyj492mi6"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system trivial-build-system) (build-system copy-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) `(#:install-plan
#:builder `(("." "share/icons" #:exclude ("README.md" "LICENSE" "logo.jpg")))
(begin #:phases
(use-modules (guix build utils)) (modify-phases %standard-phases
(copy-recursively (assoc-ref %build-inputs "source") "icons") (add-after 'unpack 'patch-index.theme
(substitute* "icons/Delft/index.theme" (lambda _
(("gnome") "Adwaita")) (substitute* "Delft/index.theme"
(delete-file "icons/README.md") (("gnome") "Adwaita"))
(delete-file "icons/LICENSE") #t)))))
(delete-file "icons/logo.jpg")
(copy-recursively "icons" (string-append %output "/share/icons")))))
(home-page "https://www.gnome-look.org/p/1199881/") (home-page "https://www.gnome-look.org/p/1199881/")
(synopsis "Continuation of Faenza icon theme with up to date app icons") (synopsis "Continuation of Faenza icon theme with up to date app icons")
(description "Delft is a fork of the popular icon theme Faenza with up to (description "Delft is a fork of the popular icon theme Faenza with up to
@ -128,19 +134,11 @@ the Obsidian icon theme.")
(base32 (base32
"1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8")) "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system trivial-build-system) (build-system copy-build-system)
(arguments (arguments
'(#:modules ((guix build utils)) `(#:install-plan
#:builder '(("." ,(string-append "share/gnome-shell/extensions/"
(begin "appindicatorsupport@rgcjonas.gmail.com")))))
(use-modules (guix build utils))
(let* ((source (assoc-ref %build-inputs "source"))
(install-dir (string-append (assoc-ref %outputs "out")
"/share/gnome-shell/extensions"
"/appindicatorsupport@rgcjonas.gmail.com")))
(mkdir-p install-dir)
(copy-recursively source install-dir)
#t))))
(synopsis "Adds KStatusNotifierItem support to GNOME Shell") (synopsis "Adds KStatusNotifierItem support to GNOME Shell")
(description "This extension integrates Ubuntu AppIndicators (description "This extension integrates Ubuntu AppIndicators
and KStatusNotifierItems (KDE's successor of the systray) into and KStatusNotifierItems (KDE's successor of the systray) into
@ -185,6 +183,100 @@ faster window switching.")
(home-page "https://micheleg.github.io/dash-to-dock/") (home-page "https://micheleg.github.io/dash-to-dock/")
(license license:gpl2+))) (license license:gpl2+)))
(define-public gnome-shell-extension-gsconnect
(package
(name "gnome-shell-extension-gsconnect")
;; v28 is the last version to support GNOME 3.32
(version "28")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/andyholmes"
"/gnome-shell-extension-gsconnect.git"))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0grqkzqm7mlkbzin4nx9w7bh5cgygph8pn0cvim4a4gg99nfcp5z"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
(let* ((out (assoc-ref %outputs "out"))
(name+version (strip-store-file-name out))
(gschema-dir (string-append out
"/share/gsettings-schemas/"
name+version
"/glib-2.0/schemas"))
(gnome-shell (assoc-ref %build-inputs "gnome-shell"))
(openssh (assoc-ref %build-inputs "openssh"))
(openssl (assoc-ref %build-inputs "openssl")))
(list
(string-append "-Dgnome_shell_libdir=" gnome-shell "/lib")
(string-append "-Dgsettings_schemadir=" gschema-dir)
(string-append "-Dopenssl_path=" openssl "/bin/openssl")
(string-append "-Dsshadd_path=" openssh "/bin/ssh-add")
(string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen")
(string-append "-Dsession_bus_services_dir=" out "/share/dbus-1/services")
"-Dpost_install=true"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(let* ((glib (assoc-ref inputs "glib:bin"))
(gapplication (string-append glib "/bin/gapplication"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop"
(("gapplication") gapplication))
(for-each
(lambda (file)
(substitute* file
(("'use strict';")
(string-append "'use strict';\n\n"
"'" gi-typelib-path "'.split(':').forEach("
"path => imports.gi.GIRepository.Repository."
"prepend_search_path(path));"))))
'("src/extension.js" "src/prefs.js"))
#t)))
(add-after 'install 'wrap-daemons
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(service-dir
(string-append out "/share/gnome-shell/extensions"
"/gsconnect@andyholmes.github.io/service"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(wrap-program (string-append service-dir "/daemon.js")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
#t))))))
(inputs
`(("at-spi2-core" ,at-spi2-core)
("caribou" ,caribou)
("evolution-data-server" ,evolution-data-server)
("folks" ,folks)
("gjs" ,gjs)
("glib" ,glib)
("glib:bin" ,glib "bin")
("gsound" ,gsound)
("gnome-shell" ,gnome-shell)
("gtk+" ,gtk+)
("nautilus" ,nautilus)
("openssh" ,openssh)
("openssl" ,openssl)
("python-nautilus" ,python-nautilus)
("python-pygobject" ,python-pygobject)
("upower" ,upower)))
(native-inputs
`(("gettext" ,gettext-minimal)
("gobject-introspection" ,gobject-introspection)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki")
(synopsis "Connect GNOME Shell with your Android phone")
(description "GSConnect is a complete implementation of KDE Connect
especially for GNOME Shell, allowing devices to securely share content, like
notifications or files, and other features like SMS messaging and remote
control.")
(license license:gpl2)))
(define-public gnome-shell-extension-hide-app-icon (define-public gnome-shell-extension-hide-app-icon
(let ((commit "4188aa5f4ba24901a053a0c3eb0d83baa8625eab") (let ((commit "4188aa5f4ba24901a053a0c3eb0d83baa8625eab")
(revision "0")) (revision "0"))
@ -286,24 +378,53 @@ into a single panel, similar to that found in KDE Plasma and Windows 7+.")
(base32 (base32
"0fa8l3xlh8kbq07y4385wpb908zm6x53z81q16xlmin97dln32hh")) "0fa8l3xlh8kbq07y4385wpb908zm6x53z81q16xlmin97dln32hh"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system trivial-build-system) (build-system copy-build-system)
(arguments (arguments
'(#:modules ((guix build utils)) '(#:install-plan
#:builder '(("." "share/gnome-shell/extensions/noannoyance@daase.net"))))
(begin (synopsis "Remove 'Window is ready' annotation")
(use-modules (guix build utils)) (description "One of the many extensions that remove this message.
(let ((dst (string-append
(assoc-ref %outputs "out")
"/share/gnome-shell/extensions/"
"noannoyance@daase.net")))
(mkdir-p dst)
(copy-recursively (assoc-ref %build-inputs "source") dst)))))
(synopsis "Removes 'Window is ready' annotation")
(description "One of the many extensions, that remove this message.
It uses ES6 syntax and claims to be more actively maintained than others.") It uses ES6 syntax and claims to be more actively maintained than others.")
(home-page "https://extensions.gnome.org/extension/2182/noannoyance/") (home-page "https://extensions.gnome.org/extension/2182/noannoyance/")
(license license:gpl2))) (license license:gpl2)))
(define-public gnome-shell-extension-paperwm
(package
(name "gnome-shell-extension-paperwm")
(version "34.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/paperwm/PaperWM.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1qry75f696pgmd9yzqvwhq5h6cipin2fvk7h881g29cjcpxim37a"))
(snippet
'(begin (delete-file "schemas/gschemas.compiled")))))
(build-system copy-build-system)
(arguments
'(#:install-plan
'(("." "share/gnome-shell/extensions/paperwm@hedning:matrix.org"
#:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$"
"\\.xml$" "\\.compiled$")))
#:phases
(modify-phases %standard-phases
(add-before 'install 'compile-schemas
(lambda _
(with-directory-excursion "schemas"
(invoke "make"))
#t)))))
(native-inputs
`(("glib:bin" ,glib "bin"))) ; for glib-compile-schemas
(home-page "https://github.com/paperwm/PaperWM")
(synopsis "Tiled scrollable window management for GNOME Shell")
(description "PaperWM is an experimental GNOME Shell extension providing
scrollable tiling of windows and per monitor workspaces. It's inspired by paper
notebooks and tiling window managers.")
(license license:gpl3)))
(define-public numix-theme (define-public numix-theme
(package (package
(name "numix-theme") (name "numix-theme")

View file

@ -2057,6 +2057,7 @@ dealing with different structured file formats.")
(define-public librsvg (define-public librsvg
(package (package
(replacement librsvg/fixed)
(name "librsvg") (name "librsvg")
(version "2.40.20") (version "2.40.20")
(source (origin (source (origin
@ -2123,6 +2124,20 @@ dealing with different structured file formats.")
library.") library.")
(license license:lgpl2.0+))) (license license:lgpl2.0+)))
(define librsvg/fixed
(package
(inherit librsvg)
(name "librsvg")
(version "2.40.21")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))))
(define* (computed-origin-method gexp-promise hash-algo hash (define* (computed-origin-method gexp-promise hash-algo hash
#:optional (name "source") #:optional (name "source")
#:key (system (%current-system)) #:key (system (%current-system))
@ -2137,7 +2152,7 @@ from forcing GEXP-PROMISE."
#:guile-for-build guile))) #:guile-for-build guile)))
(define librsvg-next-source (define librsvg-next-source
(let* ((version "2.46.3") (let* ((version "2.46.4")
(upstream-source (origin (upstream-source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/librsvg/" (uri (string-append "mirror://gnome/sources/librsvg/"
@ -2145,7 +2160,7 @@ from forcing GEXP-PROMISE."
"librsvg-" version ".tar.xz")) "librsvg-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1s3a96i7f4pynjwxxvhysp4b6r7kyi8nasdxfyi62hc7gm34d3kn"))))) "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl")))))
(origin (origin
(method computed-origin-method) (method computed-origin-method)
(file-name (string-append "librsvg-" version ".tar.xz")) (file-name (string-append "librsvg-" version ".tar.xz"))
@ -2166,7 +2181,15 @@ from forcing GEXP-PROMISE."
;; The following crate(s) are needed in addition to the ones replaced: ;; The following crate(s) are needed in addition to the ones replaced:
(begin (begin
(invoke (invoke
"tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor")) "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor")
(invoke
"tar" "xvf" #+(package-source rust-proc-macro2-0.4) "-C" "vendor")
(invoke
"tar" "xvf" #+(package-source rust-quote-0.6) "-C" "vendor")
(invoke
"tar" "xvf" #+(package-source rust-unicode-xid-0.1) "-C" "vendor")
(invoke
"tar" "xvf" #+(package-source rust-maybe-uninit-2.0) "-C" "vendor"))
(for-each (for-each
(lambda (crate) (lambda (crate)
(delete-file-recursively (string-append "vendor/" (car crate))) (delete-file-recursively (string-append "vendor/" (car crate)))
@ -2217,10 +2240,10 @@ from forcing GEXP-PROMISE."
;; gdk-pixbuf-sys 0.9 ;; gdk-pixbuf-sys 0.9
("generic-array" . #+(package-source rust-generic-array-0.12)) ("generic-array" . #+(package-source rust-generic-array-0.12))
;; gio 0.7 ;; gio 0.7
;; gio-sys 0.9 ("gio-sys" . #+(package-source rust-gio-sys-0.9))
;; glib 0.8 ;; glib 0.8
;; glib-sys 0.9 ("glib-sys" . #+(package-source rust-glib-sys-0.9))
;; gobject-sys 0.9 ("gobject-sys" . #+(package-source rust-gobject-sys-0.9))
("idna" . #+(package-source rust-idna-0.2)) ("idna" . #+(package-source rust-idna-0.2))
("itertools" . #+(package-source rust-itertools-0.8)) ("itertools" . #+(package-source rust-itertools-0.8))
("itoa" . #+(package-source rust-itoa-0.4)) ("itoa" . #+(package-source rust-itoa-0.4))
@ -2228,10 +2251,10 @@ from forcing GEXP-PROMISE."
("lazy_static" . #+(package-source rust-lazy-static-1)) ("lazy_static" . #+(package-source rust-lazy-static-1))
("libc" . #+(package-source rust-libc-0.2)) ("libc" . #+(package-source rust-libc-0.2))
("libm" . #+(package-source rust-libm-0.1)) ("libm" . #+(package-source rust-libm-0.1))
;; locale_config 0.3 ("locale_config" . #+(package-source rust-locale-config-0.3))
("log" . #+(package-source rust-log-0.4)) ("log" . #+(package-source rust-log-0.4))
("mac" . #+(package-source rust-mac-0.1)) ("mac" . #+(package-source rust-mac-0.1))
;; malloc_buf 0.0 ("malloc_buf" . #+(package-source rust-malloc-buf-0.0))
;; markup5ever 0.9 ;; markup5ever 0.9
("matches" . #+(package-source rust-matches-0.1)) ("matches" . #+(package-source rust-matches-0.1))
;; matrixmultiply 0.2 ;; matrixmultiply 0.2
@ -2242,12 +2265,12 @@ from forcing GEXP-PROMISE."
("nodrop" . #+(package-source rust-nodrop-0.1)) ("nodrop" . #+(package-source rust-nodrop-0.1))
("num-complex" . #+(package-source rust-num-complex-0.2)) ("num-complex" . #+(package-source rust-num-complex-0.2))
("num-integer" . #+(package-source rust-num-integer-0.1)) ("num-integer" . #+(package-source rust-num-integer-0.1))
;; num-rational 0.2 ("num-rational" . #+(package-source rust-num-rational-0.2))
("num-traits" . #+(package-source rust-num-traits-0.2)) ("num-traits" . #+(package-source rust-num-traits-0.2))
("num_cpus" . #+(package-source rust-num-cpus-1.10)) ("num_cpus" . #+(package-source rust-num-cpus-1.10))
;; objc 0.2 ("objc" . #+(package-source rust-objc-0.2))
;; objc-foundation 0.1 ("objc-foundation" . #+(package-source rust-objc-foundation-0.1))
;; objc_id 0.1 ("objc_id" . #+(package-source rust-objc-id-0.1))
;; pango 0.7 ;; pango 0.7
;; pango-sys 0.9 ;; pango-sys 0.9
;; pangocairo 0.8 ;; pangocairo 0.8
@ -2293,7 +2316,7 @@ from forcing GEXP-PROMISE."
("siphasher" . #+(package-source rust-siphasher-0.2)) ("siphasher" . #+(package-source rust-siphasher-0.2))
("smallvec" . #+(package-source rust-smallvec-0.6)) ("smallvec" . #+(package-source rust-smallvec-0.6))
("string_cache" . #+(package-source rust-string-cache-0.7)) ("string_cache" . #+(package-source rust-string-cache-0.7))
;("string_cache_codegen" . #+(package-source rust-string-cache-codegen-0.4)) ("string_cache_codegen" . #+(package-source rust-string-cache-codegen-0.4))
("string_cache_shared" . #+(package-source rust-string-cache-shared-0.3)) ("string_cache_shared" . #+(package-source rust-string-cache-shared-0.3))
("syn" . #+(package-source rust-syn-1.0)) ("syn" . #+(package-source rust-syn-1.0))
("tendril" . #+(package-source rust-tendril-0.4)) ("tendril" . #+(package-source rust-tendril-0.4))
@ -2312,8 +2335,7 @@ from forcing GEXP-PROMISE."
("winapi-i686-pc-windows-gnu" . #+(package-source rust-winapi-i686-pc-windows-gnu-0.4)) ("winapi-i686-pc-windows-gnu" . #+(package-source rust-winapi-i686-pc-windows-gnu-0.4))
("winapi-util" . #+(package-source rust-winapi-util-0.1)) ("winapi-util" . #+(package-source rust-winapi-util-0.1))
("winapi-x86_64-pc-windows-gnu" . #+(package-source rust-winapi-x86-64-pc-windows-gnu-0.4)) ("winapi-x86_64-pc-windows-gnu" . #+(package-source rust-winapi-x86-64-pc-windows-gnu-0.4))
;; xml-rs 0.8 ("xml-rs" . #+(package-source rust-xml-rs-0.8)))))
)))
(format #t "Replacing vendored crates in the tarball and repacking ...~%") (format #t "Replacing vendored crates in the tarball and repacking ...~%")
(force-output) (force-output)
(invoke "tar" "cfa" #$output (invoke "tar" "cfa" #$output
@ -2332,7 +2354,7 @@ from forcing GEXP-PROMISE."
(define-public librsvg-next (define-public librsvg-next
(package (package
(name "librsvg") (name "librsvg")
(version "2.46.3") (version "2.46.4")
(source librsvg-next-source) (source librsvg-next-source)
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -2348,6 +2370,8 @@ from forcing GEXP-PROMISE."
(use-modules (guix build cargo-utils)) (use-modules (guix build cargo-utils))
(substitute* "librsvg/Cargo.toml" (substitute* "librsvg/Cargo.toml"
(("bitflags .*") "bitflags = \"1\"\n")) ; 1.2 is vendored (("bitflags .*") "bitflags = \"1\"\n")) ; 1.2 is vendored
(substitute* "rsvg_internals/Cargo.toml"
(("\"=") "\""))
(generate-all-checksums "vendor") (generate-all-checksums "vendor")
(delete-file "Cargo.lock") (delete-file "Cargo.lock")
(invoke "cargo" "generate-lockfile"))) (invoke "cargo" "generate-lockfile")))
@ -3629,7 +3653,7 @@ libxml to ease remote use of the RESTful API.")
(define-public libsoup (define-public libsoup
(package (package
(name "libsoup") (name "libsoup")
(version "2.68.3") (version "2.68.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/libsoup/" (uri (string-append "mirror://gnome/sources/libsoup/"
@ -3637,7 +3661,7 @@ libxml to ease remote use of the RESTful API.")
"libsoup-" version ".tar.xz")) "libsoup-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1yxs0ax4rq3g0lgkbv7mz497rqj16iyyizddyc13gzxh6n7b0jsk")))) "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d"))))
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
@ -4385,7 +4409,7 @@ which are easy to play with the aid of a mouse.")
(define-public amtk (define-public amtk
(package (package
(name "amtk") (name "amtk")
(version "5.0.1") (version "5.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/amtk/" (uri (string-append "mirror://gnome/sources/amtk/"
@ -4393,7 +4417,7 @@ which are easy to play with the aid of a mouse.")
"amtk-" version ".tar.xz")) "amtk-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d")))) "11jgz2i9wjzv4alrxl1qyxiapb52w7vs5ygfgsw0qgdap8gqkk3i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--enable-gtk-doc"))) '(#:configure-flags '("--enable-gtk-doc")))
@ -5312,7 +5336,7 @@ USB transfers with your high-level application or system daemon.")
(define-public simple-scan (define-public simple-scan
(package (package
(name "simple-scan") (name "simple-scan")
(version "3.34.2") (version "3.34.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5320,7 +5344,7 @@ USB transfers with your high-level application or system daemon.")
(version-major+minor version) "/" (version-major+minor version) "/"
"simple-scan-" version ".tar.xz")) "simple-scan-" version ".tar.xz"))
(sha256 (sha256
(base32 "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp")))) (base32 "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z"))))
(build-system meson-build-system) (build-system meson-build-system)
;; TODO: Fix icons in home screen, About dialogue, and scan menu. ;; TODO: Fix icons in home screen, About dialogue, and scan menu.
(arguments (arguments
@ -5635,7 +5659,7 @@ wraps things up in a developer-friendly way.")
(define-public libgee (define-public libgee
(package (package
(name "libgee") (name "libgee")
(version "0.20.2") (version "0.20.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/libgee/" (uri (string-append "mirror://gnome/sources/libgee/"
@ -5643,7 +5667,7 @@ wraps things up in a developer-friendly way.")
"libgee-" version ".tar.xz")) "libgee-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy")))) "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -5704,7 +5728,7 @@ metadata in photo and video files of various formats.")
(define-public shotwell (define-public shotwell
(package (package
(name "shotwell") (name "shotwell")
(version "0.30.7") (version "0.30.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/shotwell/" (uri (string-append "mirror://gnome/sources/shotwell/"
@ -5712,7 +5736,7 @@ metadata in photo and video files of various formats.")
"shotwell-" version ".tar.xz")) "shotwell-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1m9i8r4gyd2hzlxjjwfyck4kz7gdg2vz2k6l6d0ga9hdfq2l4p9l")))) "1f7m007g6w1sz8s60w6x81ghp2rrjmik8phd958b2hy8zz92wbbj"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t '(#:glib-or-gtk? #t
@ -7881,7 +7905,29 @@ world.")
("yelp" ,yelp) ("yelp" ,yelp)
;; Others ;; Others
("hicolor-icon-theme" ,hicolor-icon-theme) ("hicolor-icon-theme" ,hicolor-icon-theme)
("gnome-online-accounts" ,gnome-online-accounts))) ("gnome-online-accounts" ,gnome-online-accounts)
;; Packages not part of GNOME proper but that are needed for a good
;; experience. See <https://bugs.gnu.org/39646>.
;; XXX: Find out exactly which ones are needed and why.
("font-cantarell" ,font-cantarell)
("font-dejavu" ,font-dejavu)
("at-spi2-core" ,at-spi2-core)
("dbus" ,dbus)
("dconf" ,dconf)
("desktop-file-utils" ,desktop-file-utils)
("gnome-default-applications" ,gnome-default-applications)
("gnome-themes-standard" ,gnome-themes-standard)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gucharmap" ,gucharmap)
("pinentry-gnome3" ,pinentry-gnome3)
("pulseaudio" ,pulseaudio)
("shared-mime-info" ,shared-mime-info)
("system-config-printer" ,system-config-printer)
("xdg-user-dirs" ,xdg-user-dirs)
("yelp" ,yelp)
("zenity" ,zenity)))
(synopsis "The GNU desktop environment") (synopsis "The GNU desktop environment")
(home-page "https://www.gnome.org/") (home-page "https://www.gnome.org/")
(description (description

View file

@ -6,7 +6,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2018, 2019 ng0 <ng0@n0.is> ;;; Copyright © 2016, 2017, 2018, 2019 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; ;;;
@ -150,14 +150,14 @@ tool to extract metadata from a file and print the results.")
(define-public libmicrohttpd (define-public libmicrohttpd
(package (package
(name "libmicrohttpd") (name "libmicrohttpd")
(version "0.9.69") (version "0.9.70")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv")))) "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)

View file

@ -470,7 +470,7 @@ gpgpme starting with version 1.7.")
(sha256 (sha256
(base32 (base32
"0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c")) "0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c"))
(file-name (string-append name "-" version "-checkout")))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; When cross-compiling, the bash script libgcrypt-config provided by ;; When cross-compiling, the bash script libgcrypt-config provided by
@ -1115,15 +1115,17 @@ over.")
(define-public jetring (define-public jetring
(package (package
(name "jetring") (name "jetring")
(version "0.27") (version "0.29")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "mirror://debian/pool/main/j/" name "/" (uri (git-reference
name "_" version ".tar.xz")) (url "https://salsa.debian.org/debian/jetring")
(commit (string-append "debian/" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0jy0x5zj7v87xgyldlsx1knzp0mv10wzamblrw1b61i2m1ii4pxz")))) "1acbx2vnbkms1c0wgcnh05d4g359sg5z0aiw541vx2qq9sgdhlv6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

View file

@ -179,7 +179,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.")
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://www.dockapps.net/wmbattery") (home-page "https://www.dockapps.net/wmbattery")
(synopsis "Display laptop battery info") (synopsis "Display laptop battery info")
(description (description
"Wmbattery displays the status of your laptop's battery in a small icon. "Wmbattery displays the status of your laptop's battery in a small icon.
@ -233,7 +233,7 @@ other compatible window managers.")
("libxpm" ,libxpm))) ("libxpm" ,libxpm)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "http://www.dockapps.net/wmcpuload") (home-page "https://www.dockapps.net/wmcpuload")
(synopsis "Monitor CPU usage") (synopsis "Monitor CPU usage")
(description (description
"Wmcpuload displays the current CPU usage, expressed as a percentile and a "Wmcpuload displays the current CPU usage, expressed as a percentile and a
@ -265,7 +265,7 @@ on.")
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://www.dockapps.net/wmclock") (home-page "https://www.dockapps.net/wmclock")
(synopsis "Display the date and time") (synopsis "Display the date and time")
(description (description
"wmclock is an applet for Window Maker which displays the date and time in "wmclock is an applet for Window Maker which displays the date and time in

View file

@ -7,10 +7,11 @@
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 ng0 <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -115,6 +116,7 @@
`(;; XXX: parallel build fails, lacking: `(;; XXX: parallel build fails, lacking:
;; mkdir -p "system_wrapper_js/" ;; mkdir -p "system_wrapper_js/"
#:parallel-build? #f #:parallel-build? #f
#:make-flags '("CXXFLAGS=-fpermissive")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'delete-timedout-test (add-after 'unpack 'delete-timedout-test
@ -882,6 +884,7 @@ from forcing GEXP-PROMISE."
#:modules ((ice-9 ftw) #:modules ((ice-9 ftw)
(ice-9 rdelim) (ice-9 rdelim)
(ice-9 regex)
(ice-9 match) (ice-9 match)
(srfi srfi-34) (srfi srfi-34)
(srfi srfi-35) (srfi srfi-35)
@ -1067,6 +1070,20 @@ from forcing GEXP-PROMISE."
(force-output) (force-output)
(retry (- remaining-attempts 1)))) (retry (- remaining-attempts 1))))
(apply build args))))))) (apply build args)))))))
(add-after 'build 'neutralise-store-references
(lambda _
;; Mangle the store references to compilers & other build tools in
;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64.
(substitute*
"dist/bin/chrome/toolkit/content/global/buildconfig.html"
(((format #f "(~a/)([0-9a-df-np-sv-z]{32})"
(regexp-quote (%store-directory)))
_ store hash)
(string-append store
(string-take hash 8)
"<!-- Guix: not a runtime dependency -->"
(string-drop hash 8))))
#t))
(add-before 'configure 'install-desktop-entry (add-before 'configure 'install-desktop-entry
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Install the '.desktop' file. ;; Install the '.desktop' file.

View file

@ -221,7 +221,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(package (package
(inherit go-1.4) (inherit go-1.4)
(name "go") (name "go")
(version "1.13.7") (version "1.13.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -229,7 +229,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
name version ".src.tar.gz")) name version ".src.tar.gz"))
(sha256 (sha256
(base32 (base32
"1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4")))) "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments go-1.4) (substitute-keyword-arguments (package-arguments go-1.4)
((#:phases phases) ((#:phases phases)

View file

@ -3,6 +3,7 @@
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,17 +25,23 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system scons)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages image) #:use-module (gnu packages glib)
#:use-module (gnu packages xml)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages sqlite)) #:use-module (gnu packages sqlite)
#:use-module (gnu packages xml))
(define-public gpsbabel (define-public gpsbabel
(package (package
@ -204,3 +211,84 @@ coordinates as well as partial support for adjustments in global coordinate syst
"GPXSee is a Qt-based GPS log file viewer and analyzer that supports "GPXSee is a Qt-based GPS log file viewer and analyzer that supports
all common GPS log file formats.") all common GPS log file formats.")
(license license:gpl3))) (license license:gpl3)))
(define-public gpsd
(package
(name "gpsd")
(version "3.19")
(source
(origin
(method url-fetch)
(uri (string-append "https://download-mirror.savannah.gnu.org"
"/releases/gpsd/gpsd-" version ".tar.gz"))
(sha256
(base32 "0faz2mvk82hi7ispxxih07lhpyz5dazs4gcknym9piiabga29p97"))))
(build-system scons-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python)))
(inputs
`(("bluez" ,bluez)
("dbus" ,dbus)
("libcap" ,libcap)
("libusb" ,libusb)
("ncurses" ,ncurses)))
(arguments
`(#:scons-flags (list (string-append "prefix=" %output)
;; TODO: Install python bindings.
"python=no")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((python3 (string-append (assoc-ref inputs "python")
"/bin/python3")))
(substitute* '("contrib/gpsData.py"
"contrib/ntpshmviz"
"contrib/skyview2svg"
"contrib/webgps.py"
"devtools/ais.py"
"devtools/aivdmtable"
"devtools/cycle_analyzer"
"devtools/flocktest"
"devtools/identify_failing_build_options.py"
"devtools/regress-builder"
"devtools/regressdiff"
"devtools/sizes"
"devtools/striplog"
"devtools/tablegen.py"
"devtools/test_json_validity.py"
"devtools/uninstall_cleanup.py"
"gegps"
"gps/gps.py"
"gpscat"
"gpsfake"
"gpsprof"
"jsongen.py"
"leapsecond.py"
"maskaudit.py"
"test_maidenhead.py"
"test_misc.py"
"test_xgps_deps.py"
"ubxtool"
"valgrind-audit.py"
"xgps"
"xgpsspeed"
"zerk")
(("/usr/bin/python") python3)
(("/usr/bin/env python") python3)))
#t))
(add-after 'fix-paths 'fix-build
(lambda _
(substitute* "SConstruct"
(("'PATH'")
"'PATH','CPATH','LIBRARY_PATH'"))
#t)))))
(synopsis "GPS service daemon")
(description
"@code{gpsd} is a service daemon that monitors one or more GPSes or AIS
receivers attached to a host computer through serial or USB ports, making all
data on the location/course/velocity of the sensors available to be queried on
TCP port 2947 of the host computer.")
(home-page "https://gpsd.gitlab.io/gpsd/")
(license license:bsd-2)))

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
@ -56,15 +56,15 @@
(define-public igraph (define-public igraph
(package (package
(name "igraph") (name "igraph")
(version "0.7.1") (version "0.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://igraph.org/nightly/get/c/igraph-" (uri (string-append "https://github.com/igraph/igraph/releases/"
version ".tar.gz")) "download/" version "/igraph-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1pxh8sdlirgvbvsw8v65h6prn7hlm45bfsl1yfcgd6rn4w706y6r")))) "0jcnfvahrlj08y46vnax5y5bb294v4b9n00qsy7pbx0cc0sp6qvj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -90,21 +90,36 @@ more.")
(define-public python-igraph (define-public python-igraph
(package (inherit igraph) (package (inherit igraph)
(name "python-igraph") (name "python-igraph")
(version "0.7.1.post6") (version "0.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "python-igraph" version)) (uri (pypi-uri "python-igraph" version))
(sha256 (sha256
(base32 (base32
"0xp61zz710qlzhmzbfr65d5flvsi8zf2xy78s6rsszh719wl5sm5")))) "13mbrlmnbgbzw6y8ws7wj0a3ly3in8j4l1ngi6yxvgvxxi4bprj7"))))
(build-system python-build-system) (build-system python-build-system)
(arguments '()) (arguments
'(#:configure-flags
(list "--use-pkg-config")
#:phases
(modify-phases %standard-phases
(replace 'build
(lambda _
(invoke "python" "./setup.py" "build" "--use-pkg-config")))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-v"))))))
(inputs (inputs
`(("igraph" ,igraph))) `(("igraph" ,igraph)))
(propagated-inputs
`(("python-texttable" ,python-texttable)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
(home-page "http://pypi.python.org/pypi/python-igraph") ("python-pytest" ,python-pytest)))
(home-page "https://pypi.org/project/python-igraph/")
(synopsis "Python bindings for the igraph network analysis library"))) (synopsis "Python bindings for the igraph network analysis library")))
(define-public r-igraph (define-public r-igraph

View file

@ -88,14 +88,14 @@
(define-public blender (define-public blender
(package (package
(name "blender") (name "blender")
(version "2.81a") (version "2.82")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.blender.org/source/" (uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.xz")) "blender-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zl0ar95qkxsrbqw9miz2hrjijlqjl06vg3clfk9rm7krr2l3b2j")))) "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(let ((python-version (version-major+minor (package-version python)))) (let ((python-version (version-major+minor (package-version python))))
@ -127,11 +127,11 @@
(modify-phases %standard-phases (modify-phases %standard-phases
;; XXX This file doesn't exist in the Git sources but will probably ;; XXX This file doesn't exist in the Git sources but will probably
;; exist in the eventual 2.80 source tarball. ;; exist in the eventual 2.80 source tarball.
; (add-after 'unpack 'fix-broken-import (add-after 'unpack 'fix-broken-import
; (lambda _ (lambda _
; (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
; (("import encode_bin") "from . import encode_bin")) (("import encode_bin") "from . import encode_bin"))
; #t)) #t))
(add-after 'set-paths 'add-ilmbase-include-path (add-after 'set-paths 'add-ilmbase-include-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; OpenEXR propagates ilmbase, but its include files do not appear ;; OpenEXR propagates ilmbase, but its include files do not appear
@ -176,95 +176,6 @@ compositing and motion tracking, even video editing and game creation. The
application can be customized via its API for Python scripting.") application can be customized via its API for Python scripting.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public blender-2.79
(package
(name "blender")
(version "2.79b")
(source (origin
(method url-fetch)
(uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.gz"))
(sha256
(base32
"1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"))
(patches (search-patches "blender-2.79-newer-ffmpeg.patch"
"blender-2.79-python-3.7-fix.patch"))))
(build-system cmake-build-system)
(arguments
(let ((python-version (version-major+minor (package-version python))))
`(;; Test files are very large and not included in the release tarball.
#:tests? #f
#:configure-flags
(list "-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
"-DWITH_CYCLES=ON"
"-DWITH_DOC_MANPAGE=ON"
"-DWITH_FFTW3=ON"
"-DWITH_GAMEENGINE=ON"
"-DWITH_IMAGE_OPENJPEG=ON"
"-DWITH_INPUT_NDOF=ON"
"-DWITH_INSTALL_PORTABLE=OFF"
"-DWITH_JACK=ON"
"-DWITH_MOD_OCEANSIM=ON"
"-DWITH_PLAYER=ON"
"-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_SYSTEM_OPENJPEG=ON"
(string-append "-DPYTHON_LIBRARY=python" ,python-version "m")
(string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python")
"/lib")
(string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python")
"/include/python" ,python-version "m")
(string-append "-DPYTHON_VERSION=" ,python-version))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-broken-import
(lambda _
(substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
(("import encode_bin") "from . import encode_bin"))
#t))
(add-after 'set-paths 'add-ilmbase-include-path
(lambda* (#:key inputs #:allow-other-keys)
;; OpenEXR propagates ilmbase, but its include files do not appear
;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
;; the CPATH to satisfy the dependency on "half.h".
(setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase")
"/include/OpenEXR"
":" (or (getenv "CPATH") "")))
#t))))))
(inputs
`(("boost" ,boost)
("jemalloc" ,jemalloc)
("libx11" ,libx11)
("openimageio" ,openimageio-1.7)
("openexr" ,openexr)
("ilmbase" ,ilmbase)
("openjpeg" ,openjpeg-1)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("ffmpeg" ,ffmpeg)
("fftw" ,fftw)
("jack" ,jack-1)
("libsndfile" ,libsndfile)
("freetype" ,freetype)
("glew" ,glew)
("openal" ,openal)
("python" ,python)
("zlib" ,zlib)))
(home-page "https://blender.org/")
(synopsis "3D graphics creation suite")
(description
"Blender is a 3D graphics creation suite. It supports the entirety of
the 3D pipelinemodeling, rigging, animation, simulation, rendering,
compositing and motion tracking, even video editing and game creation. The
application can be customized via its API for Python scripting.
NOTE: This older version of Blender is the last release that does not require
OpenGL 3. It is retained for use with older computers.")
(license license:gpl2+)))
(define-public assimp (define-public assimp
(package (package
(name "assimp") (name "assimp")
@ -530,7 +441,7 @@ visual effects work for film.")
(define-public openscenegraph (define-public openscenegraph
(package (package
(name "openscenegraph") (name "openscenegraph")
(version "3.6.4") (version "3.6.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -538,14 +449,13 @@ visual effects work for film.")
(url "https://github.com/openscenegraph/OpenSceneGraph") (url "https://github.com/openscenegraph/OpenSceneGraph")
(commit (string-append "OpenSceneGraph-" version)))) (commit (string-append "OpenSceneGraph-" version))))
(sha256 (sha256
(base32 (base32 "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1"))
"0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(properties (properties
`((upstream-name . "OpenSceneGraph"))) `((upstream-name . "OpenSceneGraph")))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no test target available `(#:tests? #f ; no test target available
;; Without this flag, 'rd' will be added to the name of the ;; Without this flag, 'rd' will be added to the name of the
;; library binaries and break linking with other programs. ;; library binaries and break linking with other programs.
#:build-type "Release" #:build-type "Release"
@ -558,15 +468,15 @@ visual effects work for film.")
("unzip" ,unzip))) ("unzip" ,unzip)))
(inputs (inputs
`(("giflib" ,giflib) `(("giflib" ,giflib)
("libjpeg" ,libjpeg-turbo) ; Required for the JPEG texture plugin. ("libjpeg" ,libjpeg-turbo) ; required for the JPEG texture plugin.
("jasper" ,jasper) ("jasper" ,jasper)
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
("mesa" ,mesa))) ("mesa" ,mesa)))
(synopsis "High performance real-time graphics toolkit") (synopsis "High-performance real-time graphics toolkit")
(description (description
"The OpenSceneGraph is a high performance 3D graphics toolkit "The OpenSceneGraph is a high-performance 3D graphics toolkit
used by application developers in fields such as visual simulation, games, used by application developers in fields such as visual simulation, games,
virtual reality, scientific visualization and modeling.") virtual reality, scientific visualization and modeling.")
(home-page "http://www.openscenegraph.org") (home-page "http://www.openscenegraph.org")

View file

@ -308,7 +308,7 @@ structure and layout algorithms.")
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("python-pycairo" ,python-pycairo) ("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject))) ("python-pygobject" ,python-pygobject)))
(home-page "https://pypi.python.org/pypi/xdot") (home-page "https://pypi.org/project/xdot/")
(synopsis "Interactive viewer for graphviz dot files") (synopsis "Interactive viewer for graphviz dot files")
(description "Xdot is an interactive viewer for graphs written in (description "Xdot is an interactive viewer for graphs written in
@code{graphviz}s dot language. Internally, it uses the xdot output format as @code{graphviz}s dot language. Internally, it uses the xdot output format as

View file

@ -15,7 +15,7 @@
;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org> ;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
;;; Copyright © 2016 ng0 <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -1019,7 +1019,7 @@ images onto Cairo surfaces.")
`(("guile-lib" ,guile-lib) `(("guile-lib" ,guile-lib)
("guile-cairo" ,guile-cairo) ("guile-cairo" ,guile-cairo)
("guile-rsvg" ,guile-rsvg))) ("guile-rsvg" ,guile-rsvg)))
(home-page "http://wingolog.org/software/guile-present/") (home-page "https://wingolog.org/software/guile-present/")
(synopsis "Create SVG or PDF presentations in Guile") (synopsis "Create SVG or PDF presentations in Guile")
(description (description
"Guile-Present defines a declarative vocabulary for presentations, "Guile-Present defines a declarative vocabulary for presentations,
@ -1491,7 +1491,7 @@ and routines to assist in editing internationalized text.")
(define-public girara (define-public girara
(package (package
(name "girara") (name "girara")
(version "0.3.3") (version "0.3.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1500,7 +1500,7 @@ and routines to assist in editing internationalized text.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0q0yfv2777s72p473lw0ll435n7vz4v204cmp9naq8am7a6i6avn")))) (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("check" ,check) ("check" ,check)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)

View file

@ -667,6 +667,14 @@ It has a nice, simple s-expression based syntax.")
using Guile's foreign function interface.") using Guile's foreign function interface.")
(license license:lgpl3+)))) (license license:lgpl3+))))
(define-public guile3.0-squee
(package
(inherit guile-squee)
(name "guile3.0-squee")
(native-inputs `(("guile" ,guile-next)
,@(alist-delete "guile"
(package-native-inputs guile-squee))))))
(define-public guile-colorized (define-public guile-colorized
(package (package
(name "guile-colorized") (name "guile-colorized")
@ -970,20 +978,17 @@ using S-expressions.")
(define-public guile-debbugs (define-public guile-debbugs
(package (package
(name "guile-debbugs") (name "guile-debbugs")
(version "0.0.2") (version "0.0.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-" (uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i")) "1cc63nw3xdfjrfk8c58r6d5lidmfq5cpqcy32yd5xp81yccprvn9"))))
(modules '((guix build utils)))
(snippet
'(substitute* "Makefile.in"
(("^godir = (.*)/ccache" _ prefix)
(string-append "godir = " prefix "/site-ccache"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs
`(("guile-email" ,guile-email)))
(native-inputs (native-inputs
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
@ -1023,30 +1028,12 @@ Extensions) compliant email messages and reading emails from the mbox
format.") format.")
(license license:agpl3+))) (license license:agpl3+)))
(define-public guile-debbugs-next (define-public guile3.0-email
(let ((commit "fb0ae064037a38a0d526e08b4ad24c52e205edb9") (package
(revision "2")) (inherit guile-email)
(package (inherit guile-debbugs) (name "guile3.0-email")
(name "guile-debbugs") (inputs `(("guile" ,guile-next)
(version (git-version "0.0.3" revision commit)) ,@(alist-delete "guile" (package-inputs guile-email))))))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/guile-debbugs.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"195sacx2xc1mzzfljj62nfpi8mxn0rc6dabxckizjksnhb5irfwy"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)))
(inputs
`(("guile" ,guile-2.2)
("guile-email" ,guile-email))))))
(define-public guile-newt (define-public guile-newt
(package (package
@ -2960,18 +2947,17 @@ tests being run, resulting clearer and more specific output.")
(define-public guile-semver (define-public guile-semver
(package (package
(name "guile-semver") (name "guile-semver")
(version "0.1.0") (version "0.1.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://files.ngyro.com/guile-semver/" (uri (string-append "https://files.ngyro.com/guile-semver/"
"guile-semver-" version ".tar.gz")) "guile-semver-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06b66rj7nyhr6i3dpkwvfw1xb10w2pngrsw2hxfxkznwsbh9byfz")))) "109p4n39ln44cxvwdccf9kgb96qx54makvd2ir521ssz6wchjyag"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)))
("srfi-64-driver" ,srfi-64-driver)))
(inputs (inputs
`(("guile" ,guile-2.2))) `(("guile" ,guile-2.2)))
(home-page "https://ngyro.com/software/guile-semver.html") (home-page "https://ngyro.com/software/guile-semver.html")
@ -3038,3 +3024,75 @@ SHA-512).")
(name "guile3.0-hashing") (name "guile3.0-hashing")
(native-inputs (native-inputs
`(("guile" ,guile-next))))) `(("guile" ,guile-next)))))
(define-public guile-webutils
(let ((commit "8541904f761066dc9c27b1153e9a838be9a55299")
(revision "0"))
(package
(name "guile-webutils")
(version (git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://notabug.org/cwebber/guile-webutils.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1s9n3hbxd7lfpdi0x8wr0cfvlsf6g62ird9gbspxdrp5p05rbi64"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs
`(("guile" ,guile-2.2)))
(propagated-inputs
`(("guile-irregex" ,guile-irregex)
("guile-gcrypt" ,guile-gcrypt)))
(home-page "https://notabug.org/cwebber/guile-webutils")
(synopsis "Web application authoring utilities for Guile")
(description
"This package provides tooling to write web applications in Guile, such
as signed sessions, multipart message support, etc.")
(license license:gpl3+))))
(define-public guile-lens
(let ((commit "14b15d07255f9d3f55d40a3b750d13c9ee3a154f")
(revision "0"))
(package
(name "guile-lens")
(version (git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/a-sassmannshausen/guile-lens.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0w8jzqyla56yrgj7acsgd4nspyir6zgp3vgxid4xmwhg9wmf1ida"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'run-hall
(lambda _
(setenv "HOME" "/tmp") ; for ~/.hall
(invoke "hall" "dist" "-x"))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("guile" ,guile-2.2)
("guile-hall" ,guile-hall)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(home-page "https://gitlab.com/a-sassmannshausen/guile-lens.git")
(synopsis "Composable lenses for data structures in Guile")
(description
"Guile-Lens is a library implementing lenses in Guile. The library is
currently a re-implementation of the lentes library for Clojure. Lenses
provide composable procedures, which can be used to focus, apply functions
over, or update a value in arbitrary data structures.")
(license license:gpl3+))))

View file

@ -113,8 +113,7 @@ installation of Haskell libraries and programs.")
(uri (git-reference (uri (git-reference
(url "https://github.com/jameysharp/corrode.git") (url "https://github.com/jameysharp/corrode.git")
(commit "b6699fb2fa552a07c6091276285a44133e5c9789"))) (commit "b6699fb2fa552a07c6091276285a44133e5c9789")))
(file-name (file-name (git-file-name name version))
(string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 "02v0yyj6sk4gpg2222wzsdqjxn8w66scbnf6b20x0kbmc69qcz4r")))) (base32 "02v0yyj6sk4gpg2222wzsdqjxn8w66scbnf6b20x0kbmc69qcz4r"))))
(build-system haskell-build-system) (build-system haskell-build-system)
@ -270,14 +269,14 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
(define-public git-annex (define-public git-annex
(package (package
(name "git-annex") (name "git-annex")
(version "7.20200202.7") (version "8.20200226")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"git-annex/git-annex-" version ".tar.gz")) "git-annex/git-annex-" version ".tar.gz"))
(sha256 (sha256
(base32 "1dj1ss7kp82wa0ybilhl88q6w49rj70qh61k2q8qfyx4ghliiigh")))) (base32 "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -442,7 +441,7 @@ used to keep a folder in sync between computers.")
("ghc-aeson" ,ghc-aeson) ("ghc-aeson" ,ghc-aeson)
("ghc-lib-parser" ,ghc-lib-parser) ("ghc-lib-parser" ,ghc-lib-parser)
("hscolour" ,hscolour))) ("hscolour" ,hscolour)))
(home-page "http://community.haskell.org/~ndm/hlint/") (home-page "https://github.com/ndmitchell/hlint")
(synopsis "Suggest improvements for Haskell source code") (synopsis "Suggest improvements for Haskell source code")
(description "HLint reads Haskell programs and suggests changes that (description "HLint reads Haskell programs and suggests changes that
hopefully make them easier to read. HLint also makes it easy to disable hopefully make them easier to read. HLint also makes it easy to disable

View file

@ -827,7 +827,7 @@ implementation of SSL.")
`(("ghc-hunit" ,ghc-hunit) `(("ghc-hunit" ,ghc-hunit)
("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit)))
(home-page "http://hackage.haskell.org/package/openssl-streams") (home-page "https://hackage.haskell.org/package/openssl-streams")
(synopsis "OpenSSL network support for io-streams") (synopsis "OpenSSL network support for io-streams")
(description "This library contains io-streams routines for secure (description "This library contains io-streams routines for secure
networking using OpenSSL (by way of HsOpenSSL).") networking using OpenSSL (by way of HsOpenSSL).")

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