Merge branch 'core-updates' into core-updates-next
This commit is contained in:
commit
cf7658f7cb
|
@ -45,6 +45,7 @@
|
|||
(eval . (put 'manifest-pattern 'scheme-indent-function 0))
|
||||
(eval . (put 'substitute-keyword-arguments 'scheme-indent-function 1))
|
||||
(eval . (put 'with-store 'scheme-indent-function 1))
|
||||
(eval . (put 'with-external-store 'scheme-indent-function 1))
|
||||
(eval . (put 'with-error-handling 'scheme-indent-function 0))
|
||||
(eval . (put 'with-mutex 'scheme-indent-function 1))
|
||||
(eval . (put 'with-atomic-file-output 'scheme-indent-function 1))
|
||||
|
@ -59,6 +60,7 @@
|
|||
(eval . (put 'emacs-substitute-variables 'scheme-indent-function 1))
|
||||
(eval . (put 'with-derivation-narinfo 'scheme-indent-function 1))
|
||||
(eval . (put 'with-derivation-substitute 'scheme-indent-function 2))
|
||||
(eval . (put 'with-status-report 'scheme-indent-function 1))
|
||||
|
||||
(eval . (put 'mlambda 'scheme-indent-function 1))
|
||||
(eval . (put 'mlambdaq 'scheme-indent-function 1))
|
||||
|
|
|
@ -131,6 +131,7 @@ MODULES = \
|
|||
guix/svn-download.scm \
|
||||
guix/i18n.scm \
|
||||
guix/ui.scm \
|
||||
guix/status.scm \
|
||||
guix/build/android-ndk-build-system.scm \
|
||||
guix/build/ant-build-system.scm \
|
||||
guix/build/download.scm \
|
||||
|
@ -340,6 +341,7 @@ SCM_TESTS = \
|
|||
tests/glob.scm \
|
||||
tests/grafts.scm \
|
||||
tests/ui.scm \
|
||||
tests/status.scm \
|
||||
tests/records.scm \
|
||||
tests/upstream.scm \
|
||||
tests/combinators.scm \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -19,6 +19,7 @@
|
|||
(define-module (run-system-tests)
|
||||
#:use-module (gnu tests)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix status)
|
||||
#:use-module (guix monads)
|
||||
#:use-module (guix derivations)
|
||||
#:use-module (guix ui)
|
||||
|
@ -63,25 +64,27 @@
|
|||
(length tests))
|
||||
|
||||
(with-store store
|
||||
(run-with-store store
|
||||
(mlet* %store-monad ((drv (mapm %store-monad system-test-value tests))
|
||||
(out -> (map derivation->output-path drv)))
|
||||
(mbegin %store-monad
|
||||
(show-what-to-build* drv)
|
||||
(set-build-options* #:keep-going? #t #:keep-failed? #t
|
||||
#:print-build-trace #t
|
||||
#:fallback? #t)
|
||||
(built-derivations* drv)
|
||||
(mlet %store-monad ((valid (filterm (store-lift valid-path?)
|
||||
out))
|
||||
(failed (filterm (store-lift
|
||||
(negate valid-path?))
|
||||
out)))
|
||||
(format #t "TOTAL: ~a\n" (length drv))
|
||||
(for-each (lambda (item)
|
||||
(format #t "PASS: ~a~%" item))
|
||||
valid)
|
||||
(for-each (lambda (item)
|
||||
(format #t "FAIL: ~a~%" item))
|
||||
failed)
|
||||
(exit (null? failed))))))))
|
||||
(with-status-report print-build-event
|
||||
(run-with-store store
|
||||
(mlet* %store-monad ((drv (mapm %store-monad system-test-value tests))
|
||||
(out -> (map derivation->output-path drv)))
|
||||
(mbegin %store-monad
|
||||
(show-what-to-build* drv)
|
||||
(set-build-options* #:keep-going? #t #:keep-failed? #t
|
||||
#:print-build-trace #t
|
||||
#:print-extended-build-trace? #t
|
||||
#:fallback? #t)
|
||||
(built-derivations* drv)
|
||||
(mlet %store-monad ((valid (filterm (store-lift valid-path?)
|
||||
out))
|
||||
(failed (filterm (store-lift
|
||||
(negate valid-path?))
|
||||
out)))
|
||||
(format #t "TOTAL: ~a\n" (length drv))
|
||||
(for-each (lambda (item)
|
||||
(format #t "PASS: ~a~%" item))
|
||||
valid)
|
||||
(for-each (lambda (item)
|
||||
(format #t "FAIL: ~a~%" item))
|
||||
failed)
|
||||
(exit (null? failed)))))))))
|
||||
|
|
|
@ -87,7 +87,9 @@ dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.)
|
|||
dnl Make sure they are available.
|
||||
m4_pattern_forbid([PKG_CHECK_MODULES])
|
||||
m4_pattern_forbid([GUILE_MODULE_AVAILABLE])
|
||||
m4_pattern_forbid([^GUILE_P$])
|
||||
m4_pattern_forbid([^GUILE_P])
|
||||
m4_pattern_allow([^GUILE_PKG_ERRORS])
|
||||
m4_pattern_forbid([^GUIX_])
|
||||
|
||||
dnl Search for 'guile' and 'guild'. This macro defines
|
||||
dnl 'GUILE_EFFECTIVE_VERSION'.
|
||||
|
@ -232,8 +234,6 @@ AC_SUBST([LIBGCRYPT])
|
|||
AC_SUBST([LIBGCRYPT_PREFIX])
|
||||
AC_SUBST([LIBGCRYPT_LIBDIR])
|
||||
|
||||
GUIX_ASSERT_LIBGCRYPT_USABLE
|
||||
|
||||
dnl Library name of zlib suitable for 'dynamic-link'.
|
||||
GUIX_LIBZ_LIBDIR([libz_libdir])
|
||||
if test "x$libz_libdir" = "x"; then
|
||||
|
|
|
@ -468,6 +468,14 @@ Please follow our code formatting rules, possibly running the
|
|||
@command{etc/indent-code.el} script to do that automatically for you
|
||||
(@pxref{Formatting Code}).
|
||||
|
||||
@item
|
||||
When possible, use mirrors in the source URL (@pxref{Invoking guix download}).
|
||||
Use reliable URLs, not generated ones. For instance, GitHub archives are not
|
||||
necessarily identical from one generation to the next, so in this case it's
|
||||
often better to clone the repository. Don't use the @command{name} field in
|
||||
the URL: it is not very useful and if the name changes, the URL will probably
|
||||
be wrong.
|
||||
|
||||
@end enumerate
|
||||
|
||||
When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as
|
||||
|
|
428
doc/guix.texi
428
doc/guix.texi
|
@ -33,7 +33,7 @@ Copyright @copyright{} 2016 Alex ter Weele@*
|
|||
Copyright @copyright{} 2017, 2018 Clément Lassieur@*
|
||||
Copyright @copyright{} 2017 Mathieu Othacehe@*
|
||||
Copyright @copyright{} 2017 Federico Beffa@*
|
||||
Copyright @copyright{} 2017 Carlo Zancanaro@*
|
||||
Copyright @copyright{} 2017, 2018 Carlo Zancanaro@*
|
||||
Copyright @copyright{} 2017 Thomas Danckaert@*
|
||||
Copyright @copyright{} 2017 humanitiesNerd@*
|
||||
Copyright @copyright{} 2017 Christopher Allan Webber@*
|
||||
|
@ -147,6 +147,7 @@ Package Management
|
|||
* Invoking guix gc:: Running the garbage collector.
|
||||
* Invoking guix pull:: Fetching the latest Guix and distribution.
|
||||
* Channels:: Customizing the package collection.
|
||||
* Inferiors:: Interacting with another revision of Guix.
|
||||
* Invoking guix describe:: Display information about your Guix revision.
|
||||
* Invoking guix pack:: Creating software bundles.
|
||||
* Invoking guix archive:: Exporting and importing store files.
|
||||
|
@ -1700,6 +1701,7 @@ guix package -i emacs-guix
|
|||
* Invoking guix gc:: Running the garbage collector.
|
||||
* Invoking guix pull:: Fetching the latest Guix and distribution.
|
||||
* Channels:: Customizing the package collection.
|
||||
* Inferiors:: Interacting with another revision of Guix.
|
||||
* Invoking guix describe:: Display information about your Guix revision.
|
||||
* Invoking guix pack:: Creating software bundles.
|
||||
* Invoking guix archive:: Exporting and importing store files.
|
||||
|
@ -2830,7 +2832,7 @@ generation---i.e., the previous Guix---and so on:
|
|||
$ guix package -p ~/.config/guix/current --roll-back
|
||||
switched from generation 3 to 2
|
||||
$ guix package -p ~/.config/guix/current --delete-generations=1
|
||||
deleting /home/charlie/.config/guix/current-1-link
|
||||
deleting /var/guix/profiles/per-user/charlie/current-guix-1-link
|
||||
@end example
|
||||
|
||||
The @command{guix pull} command is usually invoked with no arguments,
|
||||
|
@ -3054,6 +3056,135 @@ package it defines.
|
|||
This gives you super powers, allowing you to track the provenance of binary
|
||||
artifacts with very fine grain, and to reproduce software environments at
|
||||
will---some sort of ``meta reproducibility'' capabilities, if you will.
|
||||
@xref{Inferiors}, for another way to take advantage of these super powers.
|
||||
|
||||
@node Inferiors
|
||||
@section Inferiors
|
||||
|
||||
@c TODO: Remove this once we're more confident about API stability.
|
||||
@quotation Note
|
||||
The functionality described here is a ``technology preview'' as of version
|
||||
@value{VERSION}. As such, the interface is subject to change.
|
||||
@end quotation
|
||||
|
||||
@cindex inferiors
|
||||
@cindex composition of Guix revisions
|
||||
Sometimes you might need to mix packages from the revision of Guix you're
|
||||
currently running with packages available in a different revision of Guix.
|
||||
Guix @dfn{inferiors} allow you to achieve that by composing different Guix
|
||||
revisions in arbitrary ways.
|
||||
|
||||
@cindex inferior packages
|
||||
Technically, an ``inferior'' is essentially a separate Guix process connected
|
||||
to your main Guix process through a REPL (@pxref{Invoking guix repl}). The
|
||||
@code{(guix inferior)} module allows you to create inferiors and to
|
||||
communicate with them. It also provides a high-level interface to browse and
|
||||
manipulate the packages that an inferior provides---@dfn{inferior packages}.
|
||||
|
||||
When combined with channels (@pxref{Channels}), inferiors provide a simple way
|
||||
to interact with a separate revision of Guix. For example, let's assume you
|
||||
want to install in your profile the current @code{guile} package, along with
|
||||
the @code{guile-json} as it existed in an older revision of Guix---perhaps
|
||||
because the newer @code{guile-json} has an incompatible API and you want to
|
||||
run your code against the old API@. To do that, you could write a manifest for
|
||||
use by @code{guix package --manifest} (@pxref{Invoking guix package}); in that
|
||||
manifest, you would create an inferior for that old Guix revision you care
|
||||
about, and you would look up the @code{guile-json} package in the inferior:
|
||||
|
||||
@lisp
|
||||
(use-modules (guix inferior) (guix channels)
|
||||
(srfi srfi-1)) ;for 'first'
|
||||
|
||||
(define channels
|
||||
;; This is the old revision from which we want to
|
||||
;; extract guile-json.
|
||||
(list (channel
|
||||
(name 'guix)
|
||||
(url "https://git.savannah.gnu.org/git/guix.git")
|
||||
(commit
|
||||
"65956ad3526ba09e1f7a40722c96c6ef7c0936fe"))))
|
||||
|
||||
(define inferior
|
||||
;; An inferior representing the above revision.
|
||||
(inferior-for-channels channels))
|
||||
|
||||
;; Now create a manifest with the current "guile" package
|
||||
;; and the old "guile-json" package.
|
||||
(packages->manifest
|
||||
(list (first (lookup-inferior-packages inferior "guile-json"))
|
||||
(specification->package "guile")))
|
||||
@end lisp
|
||||
|
||||
On its first run, @command{guix package --manifest} might have to build the
|
||||
channel you specified before it can create the inferior; subsequent runs will
|
||||
be much faster because the Guix revision will be cached.
|
||||
|
||||
The @code{(guix inferior)} module provides the following procedures to open an
|
||||
inferior:
|
||||
|
||||
@deffn {Scheme Procedure} inferior-for-channels @var{channels} @
|
||||
[#:cache-directory] [#:ttl]
|
||||
Return an inferior for @var{channels}, a list of channels. Use the cache at
|
||||
@var{cache-directory}, where entries can be reclaimed after @var{ttl} seconds.
|
||||
This procedure opens a new connection to the build daemon.
|
||||
|
||||
As a side effect, this procedure may build or substitute binaries for
|
||||
@var{channels}, which can take time.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Procedure} open-inferior @var{directory} @
|
||||
[#:command "bin/guix"]
|
||||
Open the inferior Guix in @var{directory}, running
|
||||
@code{@var{directory}/@var{command} repl} or equivalent. Return @code{#f} if
|
||||
the inferior could not be launched.
|
||||
@end deffn
|
||||
|
||||
@cindex inferior packages
|
||||
The procedures listed below allow you to obtain and manipulate inferior
|
||||
packages.
|
||||
|
||||
@deffn {Scheme Procedure} inferior-packages @var{inferior}
|
||||
Return the list of packages known to @var{inferior}.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Procedure} lookup-inferior-packages @var{inferior} @var{name} @
|
||||
[@var{version}]
|
||||
Return the sorted list of inferior packages matching @var{name} in
|
||||
@var{inferior}, with highest version numbers first. If @var{version} is true,
|
||||
return only packages with a version number prefixed by @var{version}.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Procedure} inferior-package? @var{obj}
|
||||
Return true if @var{obj} is an inferior package.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Procedure} inferior-package-name @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-version @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-synopsis @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-description @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-home-page @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-location @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-inputs @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-native-inputs @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-propagated-inputs @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-transitive-propagated-inputs @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-native-search-paths @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-transitive-native-search-paths @var{package}
|
||||
@deffnx {Scheme Procedure} inferior-package-search-paths @var{package}
|
||||
These procedures are the counterpart of package record accessors
|
||||
(@pxref{package Reference}). Most of them work by querying the inferior
|
||||
@var{package} comes from, so the inferior must still be live when you call
|
||||
these procedures.
|
||||
@end deffn
|
||||
|
||||
Inferior packages can be used transparently like any other package or
|
||||
file-like object in G-expressions (@pxref{G-Expressions}). They are also
|
||||
transparently handled by the @code{packages->manifest} procedure, which is
|
||||
commonly use in manifests (@pxref{Invoking guix package, the
|
||||
@option{--manifest} option of @command{guix package}}). Thus you can insert
|
||||
an inferior package pretty much anywhere you would insert a regular package:
|
||||
in manifests, in the @code{packages} field of your @code{operating-system}
|
||||
declaration, and so on.
|
||||
|
||||
@node Invoking guix describe
|
||||
@section Invoking @command{guix describe}
|
||||
|
@ -6235,9 +6366,8 @@ retrieved using the @option{--log-file} option.
|
|||
|
||||
@item --file=@var{file}
|
||||
@itemx -f @var{file}
|
||||
|
||||
Build the package or derivation that the code within @var{file}
|
||||
evaluates to.
|
||||
Build the package, derivation, or other file-like object that the code within
|
||||
@var{file} evaluates to (@pxref{G-Expressions, file-like objects}).
|
||||
|
||||
As an example, @var{file} might contain a package definition like this
|
||||
(@pxref{Defining Packages}):
|
||||
|
@ -10872,6 +11002,12 @@ Return a service that runs a syslog daemon according to @var{config}.
|
|||
information on the configuration file syntax.
|
||||
@end deffn
|
||||
|
||||
@defvr {Scheme Variable} guix-service-type
|
||||
This is the type of the service that runs the build daemon,
|
||||
@command{guix-daemon} (@pxref{Invoking guix-daemon}). Its value must be a
|
||||
@code{guix-configuration} record as described below.
|
||||
@end defvr
|
||||
|
||||
@anchor{guix-configuration-type}
|
||||
@deftp {Data Type} guix-configuration
|
||||
This data type represents the configuration of the Guix build daemon.
|
||||
|
@ -10932,11 +11068,6 @@ A directory path where the @command{guix-daemon} will perform builds.
|
|||
@end table
|
||||
@end deftp
|
||||
|
||||
@deffn {Scheme Procedure} guix-service @var{config}
|
||||
Return a service that runs the Guix build daemon according to
|
||||
@var{config}.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}]
|
||||
Run @var{udev}, which populates the @file{/dev} directory dynamically.
|
||||
udev rules can be provided as a list of files through the @var{rules}
|
||||
|
@ -11417,10 +11548,11 @@ The @code{(gnu services networking)} module provides services to configure
|
|||
the network interface.
|
||||
|
||||
@cindex DHCP, networking service
|
||||
@deffn {Scheme Procedure} dhcp-client-service [#:dhcp @var{isc-dhcp}]
|
||||
Return a service that runs @var{dhcp}, a Dynamic Host Configuration
|
||||
Protocol (DHCP) client, on all the non-loopback network interfaces.
|
||||
@end deffn
|
||||
@defvr {Scheme Variable} dhcp-client-service-type
|
||||
This is the type of services that run @var{dhcp}, a Dynamic Host Configuration
|
||||
Protocol (DHCP) client, on all the non-loopback network interfaces. Its value
|
||||
is the DHCP client package to use, @code{isc-dhcp} by default.
|
||||
@end defvr
|
||||
|
||||
@deffn {Scheme Procedure} dhcpd-service-type
|
||||
This type defines a service that runs a DHCP daemon. To create a
|
||||
|
@ -11485,6 +11617,14 @@ This procedure can be called several times, one for each network
|
|||
interface of interest. Behind the scenes what it does is extend
|
||||
@code{static-networking-service-type} with additional network interfaces
|
||||
to handle.
|
||||
|
||||
For example:
|
||||
|
||||
@example
|
||||
(static-networking-service "eno1" "192.168.1.82"
|
||||
#:gateway "192.168.1.2"
|
||||
#:name-servers '("192.168.1.2"))
|
||||
@end example
|
||||
@end deffn
|
||||
|
||||
@cindex wicd
|
||||
|
@ -11601,19 +11741,36 @@ When true, enable connman's vpn plugin.
|
|||
@defvr {Scheme Variable} wpa-supplicant-service-type
|
||||
This is the service type to run @url{https://w1.fi/wpa_supplicant/,WPA
|
||||
supplicant}, an authentication daemon required to authenticate against
|
||||
encrypted WiFi or ethernet networks. It is configured to listen for
|
||||
requests on D-Bus.
|
||||
|
||||
The value of this service is the @code{wpa-supplicant} package to use.
|
||||
Thus, it can be instantiated like this:
|
||||
|
||||
@lisp
|
||||
(use-modules (gnu services networking))
|
||||
|
||||
(service wpa-supplicant-service-type)
|
||||
@end lisp
|
||||
encrypted WiFi or ethernet networks.
|
||||
@end defvr
|
||||
|
||||
@deftp {Data Type} wpa-supplicant-configuration
|
||||
Data type representing the configuration of WPA Supplicant.
|
||||
|
||||
It takes the following parameters:
|
||||
|
||||
@table @asis
|
||||
@item @code{wpa-supplicant} (default: @code{wpa-supplicant})
|
||||
The WPA Supplicant package to use.
|
||||
|
||||
@item @code{dbus?} (default: @code{#t})
|
||||
Whether to listen for requests on D-Bus.
|
||||
|
||||
@item @code{pid-file} (default: @code{"/var/run/wpa_supplicant.pid"})
|
||||
Where to store the PID file.
|
||||
|
||||
@item @code{interface} (default: @code{#f})
|
||||
If this is set, it must specify the name of a network interface that
|
||||
WPA supplicant will control.
|
||||
|
||||
@item @code{config-file} (default: @code{#f})
|
||||
Optional configuration file to use.
|
||||
|
||||
@item @code{extra-options} (default: @code{'()})
|
||||
List of additional command-line arguments to pass to the daemon.
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@cindex iptables
|
||||
@defvr {Scheme Variable} iptables-service-type
|
||||
This is the service type to set up an iptables configuration. iptables is a
|
||||
|
@ -11662,20 +11819,37 @@ objects}).
|
|||
@end table
|
||||
@end deftp
|
||||
|
||||
@cindex NTP
|
||||
@cindex NTP (Network Time Protocol), service
|
||||
@cindex real time clock
|
||||
@deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @
|
||||
[#:servers @var{%ntp-servers}] @
|
||||
[#:allow-large-adjustment? #f]
|
||||
Return a service that runs the daemon from @var{ntp}, the
|
||||
@uref{http://www.ntp.org, Network Time Protocol package}. The daemon will
|
||||
keep the system clock synchronized with that of @var{servers}.
|
||||
@var{allow-large-adjustment?} determines whether @command{ntpd} is allowed to
|
||||
make an initial adjustment of more than 1,000 seconds.
|
||||
@end deffn
|
||||
@defvr {Scheme Variable} ntp-service-type
|
||||
This is the type of the service running the the @uref{http://www.ntp.org,
|
||||
Network Time Protocol (NTP)} daemon, @command{ntpd}. The daemon will keep the
|
||||
system clock synchronized with that of the specified NTP servers.
|
||||
|
||||
The value of this service is an @code{ntpd-configuration} object, as described
|
||||
below.
|
||||
@end defvr
|
||||
|
||||
@deftp {Data Type} ntp-configuration
|
||||
This is the data type for the NTP service configuration.
|
||||
|
||||
@table @asis
|
||||
@item @code{servers} (default: @code{%ntp-servers})
|
||||
This is the list of servers (host names) with which @command{ntpd} will be
|
||||
synchronized.
|
||||
|
||||
@item @code{allow-large-adjustment?} (default: @code{#f})
|
||||
This determines whether @command{ntpd} is allowed to make an initial
|
||||
adjustment of more than 1,000 seconds.
|
||||
|
||||
@item @code{ntp} (default: @code{ntp})
|
||||
The NTP package to use.
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@defvr {Scheme Variable} %ntp-servers
|
||||
List of host names used as the default NTP servers.
|
||||
List of host names used as the default NTP servers. These are servers of the
|
||||
@uref{https://www.ntppool.org/en/, NTP Pool Project}.
|
||||
@end defvr
|
||||
|
||||
@cindex OpenNTPD
|
||||
|
@ -16759,6 +16933,86 @@ body of a named location block cannot contain location blocks.
|
|||
@end table
|
||||
@end deftp
|
||||
|
||||
@subsubheading Varnish Cache
|
||||
@cindex Varnish
|
||||
Varnish is a fast cache server that sits in between web applications
|
||||
and end users. It proxies requests from clients and caches the
|
||||
accessed URLs such that multiple requests for the same resource only
|
||||
creates one request to the back-end.
|
||||
|
||||
@defvr {Scheme Variable} varnish-service-type
|
||||
Service type for the Varnish daemon.
|
||||
@end defvr
|
||||
|
||||
@deftp {Data Type} varnish-configuration
|
||||
Data type representing the @code{varnish} service configuration.
|
||||
This type has the following parameters:
|
||||
|
||||
@table @asis
|
||||
@item @code{package} (default: @code{varnish})
|
||||
The Varnish package to use.
|
||||
|
||||
@item @code{name} (default: @code{"default"})
|
||||
A name for this Varnish instance. Varnish will create a directory in
|
||||
@file{/var/varnish/} with this name and keep temporary files there. If
|
||||
the name starts with a forward slash, it is interpreted as an absolute
|
||||
directory name.
|
||||
|
||||
Pass the @code{-n} argument to other Varnish programs to connect to the
|
||||
named instance, e.g. @command{varnishncsa -n default}.
|
||||
|
||||
@item @code{backend} (default: @code{"localhost:8080"})
|
||||
The backend to use. This option has no effect if @code{vcl} is set.
|
||||
|
||||
@item @code{vcl} (default: #f)
|
||||
The @dfn{VCL} (Varnish Configuration Language) program to run. If this
|
||||
is @code{#f}, Varnish will proxy @code{backend} using the default
|
||||
configuration. Otherwise this must be a file-like object with valid
|
||||
VCL syntax.
|
||||
|
||||
@c Varnish does not support HTTPS, so keep this URL to avoid confusion.
|
||||
For example, to mirror @url{http://www.gnu.org,www.gnu.org} with VCL you
|
||||
can do something along these lines:
|
||||
|
||||
@example
|
||||
(define %gnu-mirror
|
||||
(plain-file
|
||||
"gnu.vcl"
|
||||
"vcl 4.1;
|
||||
backend gnu @{ .host = "www.gnu.org"; @}"))
|
||||
|
||||
(operating-system
|
||||
...
|
||||
(services (cons (service varnish-service-type
|
||||
(varnish-configuration
|
||||
(listen '(":80"))
|
||||
(vcl %gnu-mirror)))
|
||||
%base-services)))
|
||||
@end example
|
||||
|
||||
The configuration of an already running Varnish instance can be inspected
|
||||
and changed using the @command{varnishadm} program.
|
||||
|
||||
Consult the @url{https://varnish-cache.org/docs/,Varnish User Guide} and
|
||||
@url{https://book.varnish-software.com/4.0/,Varnish Book} for
|
||||
comprehensive documentation on Varnish and its configuration language.
|
||||
|
||||
@item @code{listen} (default: @code{'("localhost:80")})
|
||||
List of addresses Varnish will listen on.
|
||||
|
||||
@item @code{storage} (default: @code{'("malloc,128m")})
|
||||
List of storage backends that will be available in VCL.
|
||||
|
||||
@item @code{parameters} (default: @code{'()})
|
||||
List of run-time parameters in the form @code{'(("parameter" . "value"))}.
|
||||
|
||||
@item @code{extra-options} (default: @code{'()})
|
||||
Additional arguments to pass to the @command{varnishd} process.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@subsubheading FastCGI
|
||||
@cindex fastcgi
|
||||
@cindex fcgiwrap
|
||||
FastCGI is an interface between the front-end and the back-end of a web
|
||||
|
@ -16934,7 +17188,7 @@ A helper function to quickly add php to an @code{nginx-server-configuration}.
|
|||
|
||||
A simple services setup for nginx with php can look like this:
|
||||
@example
|
||||
(services (cons* (dhcp-client-service)
|
||||
(services (cons* (service dhcp-client-service-type)
|
||||
(service php-fpm-service-type)
|
||||
(service nginx-service-type
|
||||
(nginx-server-configuration
|
||||
|
@ -20819,6 +21073,100 @@ could instantiate a cgit service like this:
|
|||
(cgitrc "")))
|
||||
@end example
|
||||
|
||||
@subsubheading Gitolite Service
|
||||
|
||||
@cindex Gitolite service
|
||||
@cindex Git, hosting
|
||||
@uref{http://gitolite.com/gitolite/, Gitolite} is a tool for hosting Git
|
||||
repositories on a central server.
|
||||
|
||||
Gitolite can handle multiple repositories and users, and supports flexible
|
||||
configuration of the permissions for the users on the repositories.
|
||||
|
||||
The following example will configure Gitolite using the default @code{git}
|
||||
user, and the provided SSH public key.
|
||||
|
||||
@example
|
||||
(service gitolite-service-type
|
||||
(gitolite-configuration
|
||||
(admin-pubkey (plain-file
|
||||
"yourname.pub"
|
||||
"ssh-rsa AAAA... guix@@example.com"))))
|
||||
@end example
|
||||
|
||||
Gitolite is configured through a special admin repository which you can clone,
|
||||
for example, if you setup Gitolite on @code{example.com}, you would run the
|
||||
following command to clone the admin repository.
|
||||
|
||||
@example
|
||||
git clone git@@example.com:gitolite-admin
|
||||
@end example
|
||||
|
||||
When the Gitolite service is activated, the provided @code{admin-pubkey} will
|
||||
be inserted in to the @file{keydir} directory in the gitolite-admin
|
||||
repository. If this results in a change in the repository, it will be
|
||||
committed using the message ``gitolite setup by GNU Guix''.
|
||||
|
||||
@deftp {Data Type} gitolite-configuration
|
||||
Data type representing the configuration for @code{gitolite-service-type}.
|
||||
|
||||
@table @asis
|
||||
@item @code{package} (default: @var{gitolite})
|
||||
Gitolite package to use.
|
||||
|
||||
@item @code{user} (default: @var{git})
|
||||
User to use for Gitolite. This will be user that you use when accessing
|
||||
Gitolite over SSH.
|
||||
|
||||
@item @code{group} (default: @var{git})
|
||||
Group to use for Gitolite.
|
||||
|
||||
@item @code{home-directory} (default: @var{"/var/lib/gitolite"})
|
||||
Directory in which to store the Gitolite configuration and repositories.
|
||||
|
||||
@item @code{rc-file} (default: @var{(gitolite-rc-file)})
|
||||
A ``file-like'' object (@pxref{G-Expressions, file-like objects}),
|
||||
representing the configuration for Gitolite.
|
||||
|
||||
@item @code{admin-pubkey} (default: @var{#f})
|
||||
A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to
|
||||
setup Gitolite. This will be inserted in to the @file{keydir} directory
|
||||
within the gitolite-admin repository.
|
||||
|
||||
To specify the SSH key as a string, use the @code{plain-file} function.
|
||||
|
||||
@example
|
||||
(plain-file "yourname.pub" "ssh-rsa AAAA... guix@@example.com")
|
||||
@end example
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@deftp {Data Type} gitolite-rc-file
|
||||
Data type representing the Gitolite RC file.
|
||||
|
||||
@table @asis
|
||||
@item @code{umask} (default: @code{#o0077})
|
||||
This controls the permissions Gitolite sets on the repositories and their
|
||||
contents.
|
||||
|
||||
A value like @code{#o0027} will give read access to the group used by Gitolite
|
||||
(by default: @code{git}). This is necessary when using Gitolite with software
|
||||
like cgit or gitweb.
|
||||
|
||||
@item @code{git-config-keys} (default: @code{""})
|
||||
Gitolite allows you to set git config values using the "config" keyword. This
|
||||
setting allows control over the config keys to accept.
|
||||
|
||||
@item @code{roles} (default: @code{'(("READERS" . 1) ("WRITERS" . ))})
|
||||
Set the role names allowed to be used by users running the perms command.
|
||||
|
||||
@item @code{enable} (default: @code{'("help" "desc" "info" "perms" "writable" "ssh-authkeys" "git-config" "daemon" "gitweb")})
|
||||
This setting controls the commands and features to enable within Gitolite.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
|
||||
@node Game Services
|
||||
@subsubsection Game Services
|
||||
|
@ -21711,9 +22059,9 @@ systems already running GuixSD.}.
|
|||
This effects all the configuration specified in @var{file}: user
|
||||
accounts, system services, global package list, setuid programs, etc.
|
||||
The command starts system services specified in @var{file} that are not
|
||||
currently running; if a service is currently running, it does not
|
||||
attempt to upgrade it since this would not be possible without stopping it
|
||||
first.
|
||||
currently running; if a service is currently running this command will
|
||||
arrange for it to be upgraded the next time it is stopped (eg. by
|
||||
@code{herd stop X} or @code{herd restart X}).
|
||||
|
||||
This command creates a new generation whose number is one greater than
|
||||
the current generation (as reported by @command{guix system
|
||||
|
|
|
@ -160,6 +160,9 @@ chk_sys_arch()
|
|||
aarch64)
|
||||
local arch=aarch64
|
||||
;;
|
||||
armv7l)
|
||||
local arch=armhf
|
||||
;;
|
||||
*)
|
||||
_err "${ERR}Unsupported CPU type: ${arch}"
|
||||
exit 1
|
||||
|
|
|
@ -15,7 +15,9 @@
|
|||
((equal yas-text "hg-fetch") "hg-reference...")
|
||||
((equal yas-text "cvs-fetch") "cvs-reference...")
|
||||
(t "(string-append \\"https://\\" version \\".tar.gz\\")"))}$0)
|
||||
${1:$(cond ((member yas-text '("git-fetch" "svn-fetch" "hg-fetch" "cvs-fetch"))
|
||||
${1:$(cond ((equal yas-text "git-fetch")
|
||||
"(file-name (git-file-name name version))")
|
||||
((member yas-text '("svn-fetch" "hg-fetch" "cvs-fetch"))
|
||||
"(file-name (string-append name \\"-\\" version \\"-checkout\\"))")
|
||||
(t ""))}
|
||||
(sha256
|
||||
|
|
34
gnu/local.mk
34
gnu/local.mk
|
@ -77,6 +77,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/backup.scm \
|
||||
%D%/packages/base.scm \
|
||||
%D%/packages/bash.scm \
|
||||
%D%/packages/batik.scm \
|
||||
%D%/packages/bdw-gc.scm \
|
||||
%D%/packages/benchmark.scm \
|
||||
%D%/packages/bioconductor.scm \
|
||||
|
@ -591,12 +592,14 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/awesome-reproducible-png.patch \
|
||||
%D%/packages/patches/azr3.patch \
|
||||
%D%/packages/patches/bash-completion-directories.patch \
|
||||
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
|
||||
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
|
||||
%D%/packages/patches/beignet-correct-file-names.patch \
|
||||
%D%/packages/patches/binutils-boot-2.20.1a.patch \
|
||||
%D%/packages/patches/binutils-loongson-workaround.patch \
|
||||
%D%/packages/patches/blast+-fix-makefile.patch \
|
||||
%D%/packages/patches/boost-fix-icu-build.patch \
|
||||
%D%/packages/patches/borg-respect-storage-quota.patch \
|
||||
%D%/packages/patches/byobu-writable-status.patch \
|
||||
%D%/packages/patches/cairo-CVE-2016-9082.patch \
|
||||
%D%/packages/patches/cairo-setjmp-wrapper.patch \
|
||||
|
@ -611,6 +614,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ceph-skip-unittest_blockdev.patch \
|
||||
%D%/packages/patches/chmlib-inttypes.patch \
|
||||
%D%/packages/patches/clang-3.5-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.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-runtime-asan-build-fixes.patch \
|
||||
|
@ -619,7 +623,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/clementine-fix-sqlite.patch \
|
||||
%D%/packages/patches/clementine-remove-crypto++-dependency.patch \
|
||||
%D%/packages/patches/clementine-use-openssl.patch \
|
||||
%D%/packages/patches/clisp-glibc-2.26.patch \
|
||||
%D%/packages/patches/clisp-remove-failing-test.patch \
|
||||
%D%/packages/patches/clucene-pkgconfig.patch \
|
||||
%D%/packages/patches/clx-remove-demo.patch \
|
||||
|
@ -657,7 +660,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/elogind-glibc-2.27.patch \
|
||||
%D%/packages/patches/einstein-build.patch \
|
||||
%D%/packages/patches/emacs-exec-path.patch \
|
||||
%D%/packages/patches/emacs-exwm-fix-fullscreen-issue.patch \
|
||||
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
|
||||
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
|
||||
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
|
||||
|
@ -768,6 +770,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gnome-todo-libical-compat.patch \
|
||||
%D%/packages/patches/gnome-tweak-tool-search-paths.patch \
|
||||
%D%/packages/patches/gnucash-price-quotes-perl.patch \
|
||||
%D%/packages/patches/gnucash-disable-failing-tests.patch \
|
||||
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
|
||||
%D%/packages/patches/gnutls-skip-pkgconfig-test.patch \
|
||||
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
|
||||
|
@ -813,16 +816,14 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/hdf-eos5-remove-gctp.patch \
|
||||
%D%/packages/patches/hdf-eos5-fix-szip.patch \
|
||||
%D%/packages/patches/hdf-eos5-fortrantests.patch \
|
||||
%D%/packages/patches/hmmer-remove-cpu-specificity.patch \
|
||||
%D%/packages/patches/higan-remove-march-native-flag.patch \
|
||||
%D%/packages/patches/hubbub-sort-entities.patch \
|
||||
%D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \
|
||||
%D%/packages/patches/hydra-disable-darcs-test.patch \
|
||||
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
|
||||
%D%/packages/patches/icecat-bug-1413868-pt1.patch \
|
||||
%D%/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch \
|
||||
%D%/packages/patches/icecat-use-system-graphite2.patch \
|
||||
%D%/packages/patches/icecat-use-system-harfbuzz.patch \
|
||||
%D%/packages/patches/icecat-CVE-2018-12383.patch \
|
||||
%D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \
|
||||
%D%/packages/patches/icecat-use-system-media-libs.patch \
|
||||
%D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \
|
||||
%D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \
|
||||
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
|
||||
|
@ -890,7 +891,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libgdata-glib-duplicate-tests.patch \
|
||||
%D%/packages/patches/libgnome-encoding.patch \
|
||||
%D%/packages/patches/libgnomeui-utf8.patch \
|
||||
%D%/packages/patches/libgxps-CVE-2017-11590.patch \
|
||||
%D%/packages/patches/libffi-3.2.1-complex-alpha.patch \
|
||||
%D%/packages/patches/libjxr-fix-function-signature.patch \
|
||||
%D%/packages/patches/libjxr-fix-typos.patch \
|
||||
|
@ -923,6 +923,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libutils-remove-damaging-includes.patch \
|
||||
%D%/packages/patches/libvdpau-va-gl-unbundle.patch \
|
||||
%D%/packages/patches/libvpx-CVE-2016-2818.patch \
|
||||
%D%/packages/patches/libvpx-use-after-free-in-postproc.patch \
|
||||
%D%/packages/patches/libxslt-generated-ids.patch \
|
||||
%D%/packages/patches/libxt-guix-search-paths.patch \
|
||||
%D%/packages/patches/lierolibre-check-unaligned-access.patch \
|
||||
|
@ -1072,6 +1073,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/pygpgme-disable-problematic-tests.patch \
|
||||
%D%/packages/patches/pyqt-configure.patch \
|
||||
%D%/packages/patches/pyqt-public-sip.patch \
|
||||
%D%/packages/patches/python2-CVE-2018-14647.patch \
|
||||
%D%/packages/patches/python2-CVE-2018-1000802.patch \
|
||||
%D%/packages/patches/python-2-deterministic-build-info.patch \
|
||||
%D%/packages/patches/python-2.7-adjust-tests.patch \
|
||||
%D%/packages/patches/python-2.7-search-paths.patch \
|
||||
|
@ -1080,6 +1083,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-3-deterministic-build-info.patch \
|
||||
%D%/packages/patches/python-3-search-paths.patch \
|
||||
%D%/packages/patches/python-3-fix-tests.patch \
|
||||
%D%/packages/patches/python-CVE-2018-14647.patch \
|
||||
%D%/packages/patches/python-axolotl-AES-fix.patch \
|
||||
%D%/packages/patches/python-cairocffi-dlopen-path.patch \
|
||||
%D%/packages/patches/python-fix-tests.patch \
|
||||
|
@ -1090,6 +1094,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-configobj-setuptools.patch \
|
||||
%D%/packages/patches/python-faker-fix-build-32bit.patch \
|
||||
%D%/packages/patches/python-mox3-python3.6-compat.patch \
|
||||
%D%/packages/patches/python-testtools.patch \
|
||||
%D%/packages/patches/python-paste-remove-website-test.patch \
|
||||
%D%/packages/patches/python-paste-remove-timing-test.patch \
|
||||
%D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
|
||||
|
@ -1106,6 +1111,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/qtscript-disable-tests.patch \
|
||||
%D%/packages/patches/quagga-reproducible-build.patch \
|
||||
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
|
||||
%D%/packages/patches/quilt-test-fix-regex.patch \
|
||||
%D%/packages/patches/quilt-compat-getopt-fix-second-separator.patch \
|
||||
%D%/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch \
|
||||
%D%/packages/patches/qtwebkit-pbutils-include.patch \
|
||||
%D%/packages/patches/rapicorn-isnan.patch \
|
||||
%D%/packages/patches/raptor2-heap-overflow.patch \
|
||||
|
@ -1119,7 +1127,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/reptyr-fix-gcc-7.patch \
|
||||
%D%/packages/patches/ripperx-missing-file.patch \
|
||||
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
|
||||
%D%/packages/patches/rsem-makefile.patch \
|
||||
%D%/packages/patches/rtags-separate-rct.patch \
|
||||
%D%/packages/patches/racket-store-checksum-override.patch \
|
||||
%D%/packages/patches/ruby-rubygems-276-for-ruby24.patch \
|
||||
|
@ -1148,10 +1155,12 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/slim-login.patch \
|
||||
%D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \
|
||||
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \
|
||||
%D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
|
||||
%D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \
|
||||
%D%/packages/patches/soundtouch-CVE-2018-1000223.patch \
|
||||
%D%/packages/patches/steghide-fixes.patch \
|
||||
%D%/packages/patches/superlu-dist-scotchmetis.patch \
|
||||
%D%/packages/patches/swig-guile-gc.patch \
|
||||
%D%/packages/patches/swish-e-search.patch \
|
||||
%D%/packages/patches/swish-e-format-security.patch \
|
||||
%D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \
|
||||
|
@ -1232,8 +1241,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \
|
||||
%D%/packages/patches/wpa-supplicant-krack-followups.patch \
|
||||
%D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \
|
||||
%D%/packages/patches/x265-arm-asm-primitives.patch \
|
||||
%D%/packages/patches/x265-fix-ppc64le-build.patch \
|
||||
%D%/packages/patches/x265-detect512-all-arches.patch \
|
||||
%D%/packages/patches/xapian-revert-5489fb2f8.patch \
|
||||
%D%/packages/patches/xboing-CVE-2004-0149.patch \
|
||||
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
|
||||
|
@ -1251,9 +1259,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
|
||||
%D%/packages/patches/xmodmap-asprintf.patch \
|
||||
%D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \
|
||||
%D%/packages/patches/zathura-plugindir-environment-variable.patch \
|
||||
%D%/packages/patches/zstd-fix-stdin-list-without-tty.patch \
|
||||
%D%/packages/patches/zstd-fix-stdin-list-test.patch
|
||||
%D%/packages/patches/zathura-plugindir-environment-variable.patch
|
||||
|
||||
MISC_DISTRO_FILES = \
|
||||
%D%/packages/ld-wrapper.in
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
|
@ -62,7 +62,7 @@
|
|||
(build-system glib-or-gtk-build-system)
|
||||
(arguments ;; NOTE: rsvg is disabled, since Abiword
|
||||
`(#:configure-flags ;; supports it directly, and its BS is broken.
|
||||
(list
|
||||
(list ;; wmf was removed from Guix for security.
|
||||
"--enable-clipart" ;; TODO: The following plugins have unresolved
|
||||
"--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda,
|
||||
(string-append ;; wordperfect, psion, mathview.
|
||||
|
@ -73,7 +73,7 @@
|
|||
"latex " "loadbindings " "mht " "mif " "mswrite " "opendocument "
|
||||
"openwriter " "openxml " "opml " "ots " "paint " "passepartout "
|
||||
"pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
|
||||
"wikipedia " "wmf " "wml " "xslfo"))
|
||||
"wikipedia " "wml " "xslfo"))
|
||||
;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen:
|
||||
;; assertion 'GDK_IS_SCREEN (screen)' failed
|
||||
;; GLib-GObject-CRITICAL **: g_object_get_qdata:
|
||||
|
|
|
@ -173,14 +173,14 @@ and provides a \"top-like\" mode (monitoring).")
|
|||
(define-public shepherd
|
||||
(package
|
||||
(name "shepherd")
|
||||
(version "0.4.0")
|
||||
(version "0.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://alpha.gnu.org/gnu/shepherd/shepherd-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lgmsbxn8i8xdasxzkdp2cml75n128pplw6icvmspl6s0n9xmw8n"))))
|
||||
"1wmciqml9yplnx1s4ynn00giqyk06rbrcsgvpjj2df47sawk2jp8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--localstatedir=/var")))
|
||||
|
@ -613,7 +613,7 @@ connection alive.")
|
|||
(bind-minor-version "11")
|
||||
(bind-patch-version "4")
|
||||
(bind-release-type "-P") ; for patch release, use "-P"
|
||||
(bind-release-version "1") ; for patch release, e.g. "6"
|
||||
(bind-release-version "2") ; for patch release, e.g. "6"
|
||||
(bind-version (string-append bind-major-version
|
||||
"."
|
||||
bind-minor-version
|
||||
|
@ -730,7 +730,7 @@ connection alive.")
|
|||
"/bind-" bind-version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08zyy13b8ydfbg26b3y6mw299qs89ba90gymraqqjsgjicydrq5h"))))
|
||||
"04fq17zksd2b3w6w6padps5n7b6s2lasxpksbhl4378h56vgfnm8"))))
|
||||
|
||||
;; When cross-compiling, we need the cross Coreutils and sed.
|
||||
;; Otherwise just use those from %FINAL-INPUTS.
|
||||
|
@ -869,7 +869,7 @@ over ssh connections.")
|
|||
(define-public rename
|
||||
(package
|
||||
(name "rename")
|
||||
(version "0.35")
|
||||
(version "1.00")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -877,8 +877,24 @@ over ssh connections.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"052iqmn7ya3w1nadpiyavmr3rx566r0lbflx94y8b5wx9q5c16rq"))))
|
||||
"03yhf8nmqsb0zyliv501fdvwlp589jqfn44yqkrflmpzrbik3zxl"))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'find-itself
|
||||
;; Fix run-time 'Can't locate File/Rename.pm in @INC' failure.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(with-directory-excursion bin
|
||||
(for-each
|
||||
(lambda (program)
|
||||
(wrap-program program
|
||||
`("PERL5LIB" ":" prefix
|
||||
(,(string-append out "/lib/perl5/site_perl")))))
|
||||
(find-files "." ".*")))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("perl-module-build" ,perl-module-build)
|
||||
("perl-test-pod" ,perl-test-pod)
|
||||
|
@ -1178,9 +1194,6 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
|
|||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(qt '("qtbase" "qtsvg")))
|
||||
(substitute* "wpa_gui.desktop"
|
||||
(("Exec=wpa_gui")
|
||||
(string-append "Exec=" out "/bin/wpa_gui")))
|
||||
(install-file "wpa_gui" (string-append out "/bin"))
|
||||
(install-file "wpa_gui.desktop"
|
||||
(string-append out "/share/applications"))
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -30,7 +32,7 @@
|
|||
(define-public agda
|
||||
(package
|
||||
(name "agda")
|
||||
(version "2.5.3")
|
||||
(version "2.5.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -39,7 +41,7 @@
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a"))))
|
||||
"0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("cpphs" ,cpphs)
|
||||
|
@ -51,14 +53,13 @@
|
|||
("ghc-edisoncore" ,ghc-edisoncore)
|
||||
("ghc-edit-distance" ,ghc-edit-distance)
|
||||
("ghc-equivalence" ,ghc-equivalence)
|
||||
("ghc-filemanip" ,ghc-filemanip)
|
||||
("ghc-geniplate-mirror" ,ghc-geniplate-mirror)
|
||||
("ghc-gitrev" ,ghc-gitrev)
|
||||
("ghc-happy" ,ghc-happy)
|
||||
("ghc-hashable" ,ghc-hashable)
|
||||
("ghc-hashtables" ,ghc-hashtables)
|
||||
("ghc-ieee754" ,ghc-ieee754)
|
||||
("ghc-monadplus" ,ghc-monadplus)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-murmur-hash" ,ghc-murmur-hash)
|
||||
("ghc-uri-encode" ,ghc-uri-encode)
|
||||
("ghc-parallel" ,ghc-parallel)
|
||||
|
@ -71,9 +72,50 @@
|
|||
(arguments
|
||||
`(#:modules ((guix build haskell-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26))
|
||||
(srfi srfi-26)
|
||||
(ice-9 match))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; FIXME: This is a copy of the standard configure phase with a tiny
|
||||
;; difference: this package needs the -package-db flag to be passed
|
||||
;; to "runhaskell" in addition to the "configure" action, because
|
||||
;; Setup.hs depends on filemanip. Without this option the Setup.hs
|
||||
;; file cannot be evaluated. The haskell-build-system should be
|
||||
;; changed to pass "-package-db" to "runhaskell" in any case.
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs inputs tests? (configure-flags '())
|
||||
#:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(name-version (strip-store-file-name out))
|
||||
(input-dirs (match inputs
|
||||
(((_ . dir) ...)
|
||||
dir)
|
||||
(_ '())))
|
||||
(ghc-path (getenv "GHC_PACKAGE_PATH"))
|
||||
(params (append `(,(string-append "--prefix=" out))
|
||||
`(,(string-append "--libdir=" out "/lib"))
|
||||
`(,(string-append "--bindir=" out "/bin"))
|
||||
`(,(string-append
|
||||
"--docdir=" out
|
||||
"/share/doc/" name-version))
|
||||
'("--libsubdir=$compiler/$pkg-$version")
|
||||
'("--package-db=../package.conf.d")
|
||||
'("--global")
|
||||
`(,@(map
|
||||
(cut string-append "--extra-include-dirs=" <>)
|
||||
(search-path-as-list '("include") input-dirs)))
|
||||
`(,@(map
|
||||
(cut string-append "--extra-lib-dirs=" <>)
|
||||
(search-path-as-list '("lib") input-dirs)))
|
||||
(if tests?
|
||||
'("--enable-tests")
|
||||
'())
|
||||
configure-flags)))
|
||||
(unsetenv "GHC_PACKAGE_PATH")
|
||||
(apply invoke "runhaskell" "-package-db=../package.conf.d"
|
||||
"Setup.hs" "configure" params)
|
||||
(setenv "GHC_PACKAGE_PATH" ghc-path)
|
||||
#t)))
|
||||
(add-after 'compile 'agda-compile
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
|
|
@ -863,14 +863,14 @@ useful for reverse engineering, analysis of Android applications and more.")
|
|||
(define-public fdroidserver
|
||||
(package
|
||||
(name "fdroidserver")
|
||||
(version "1.0.9")
|
||||
(version "1.0.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "fdroidserver" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cwb1fmindw6v9jkiim9yn3496rk1pvnk94s1r0vz2hxgz16xp7n"))))
|
||||
"0n6kkby65qzqdx1jn72grfffvr1w1j1rby5pwm9z8rymmsh8s0pm"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -68,7 +68,7 @@ in FITS files.")
|
|||
(define-public wcslib
|
||||
(package
|
||||
(name "wcslib")
|
||||
(version "5.18")
|
||||
(version "5.20")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -76,7 +76,7 @@ in FITS files.")
|
|||
"ftp://ftp.atnf.csiro.au/pub/software/wcslib/" name "-" version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "16jh568k99c9p0y3qzcgps2rii933x9wlay7q1xm0lr59zqzp4xn"))))
|
||||
(base32 "1c8g9kv4dxrnawnqi4spi2p10s2xs7x75pdfxhbqxgcc97dkgh0b"))))
|
||||
(inputs
|
||||
`(("cfitsio" ,cfitsio)))
|
||||
(build-system gnu-build-system)
|
||||
|
@ -89,8 +89,7 @@ in FITS files.")
|
|||
(("/bin/sh") "sh"))
|
||||
#t))
|
||||
(delete 'install-license-files)) ; installed by ‘make install’
|
||||
;; Both the build and tests fail randomly when run in parallel.
|
||||
#:parallel-build? #f
|
||||
;; Parallel execution of the test suite is not supported.
|
||||
#:parallel-tests? #f))
|
||||
(home-page "https://www.atnf.csiro.au/people/mcalabre/WCS")
|
||||
(synopsis "Library which implements the FITS WCS standard")
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
;;; Copyright © 2018 okapi <okapi@firemail.cc>
|
||||
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2018 Brett Gilio <brettg@posteo.net>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -291,12 +293,14 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
(version "2.2.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/audacity/audacity/archive"
|
||||
"/Audacity-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/audacity/audacity.git")
|
||||
(commit (string-append "Audacity-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km"))
|
||||
"10maxmjxbmjybj7n4m7a9bbm7g8xxw8f8vbsf7c9ih5j2gr15ihs"))
|
||||
(patches (search-patches "audacity-build-with-system-portaudio.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -321,7 +325,7 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
;; "sbsms"
|
||||
))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(inputs
|
||||
`(("wxwidgets" ,wxwidgets)
|
||||
("gtk+" ,gtk+)
|
||||
|
@ -410,21 +414,12 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
(("../lib-src/portmidi/porttime/porttime.h") "porttime.h"))
|
||||
(substitute* "src/prefs/MidiIOPrefs.cpp"
|
||||
(("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h"))
|
||||
#t))
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(wrap-program (string-append (assoc-ref outputs "out")
|
||||
"/bin/audacity")
|
||||
;; For GtkFileChooserDialog.
|
||||
`("GSETTINGS_SCHEMA_DIR" =
|
||||
(,(string-append (assoc-ref inputs "gtk+")
|
||||
"/share/glib-2.0/schemas"))))
|
||||
#t)))
|
||||
;; The test suite is not "well exercised" according to the developers,
|
||||
;; and fails with various errors. See
|
||||
;; <http://sourceforge.net/p/audacity/mailman/message/33524292/>.
|
||||
#:tests? #f))
|
||||
(home-page "http://audacity.sourceforge.net/")
|
||||
(home-page "https://www.audacityteam.org/")
|
||||
(synopsis "Software for recording and editing sounds")
|
||||
(description
|
||||
"Audacity is a multi-track audio editor designed for recording, playing
|
||||
|
@ -453,7 +448,14 @@ tools.")
|
|||
"CXXFLAGS=-std=gnu++11"
|
||||
"CFLAGS=-std=gnu++11"
|
||||
(string-append "prefix=" %output)
|
||||
(string-append "pkgdatadir=" %output "/share/azr3-jack"))))
|
||||
(string-append "pkgdatadir=" %output "/share/azr3-jack"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'install 'fix-timestamp
|
||||
(lambda _
|
||||
(let ((early-1980 315619200)) ; 1980-01-02 UTC
|
||||
(utime "azr3.1" early-1980 early-1980))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("gtkmm" ,gtkmm-2)
|
||||
("lvtk" ,lvtk)
|
||||
|
@ -650,7 +652,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
|
|||
(define-public csound
|
||||
(package
|
||||
(name "csound")
|
||||
(version "6.09.1")
|
||||
(version "6.11.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -659,7 +661,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xqpqws4jsv7fyawcjzwaw544qbfh29xq164kdf30a9v1n3yklp4"))))
|
||||
"072pk5h9w0vhw0ncc9dn90haw1yv18v04iwwjn8nsp6930w7dvxd"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
|
@ -674,7 +676,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
|
|||
`(("bison" ,bison)
|
||||
("flex" ,flex)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "http://csound.github.io/")
|
||||
(home-page "https://csound.com/")
|
||||
(synopsis "Sound and music computing system")
|
||||
(description
|
||||
"Csound is a user-programmable and user-extensible sound processing
|
||||
|
@ -1040,7 +1042,7 @@ follower.")
|
|||
(define-public fluidsynth
|
||||
(package
|
||||
(name "fluidsynth")
|
||||
(version "1.1.11")
|
||||
(version "2.0.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -1049,7 +1051,7 @@ follower.")
|
|||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"))))
|
||||
"1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no check target
|
||||
|
@ -1081,6 +1083,22 @@ device. It is the software analogue of a MIDI synthesizer. FluidSynth can
|
|||
also play midifiles using a Soundfont.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
;; gzdoom@3.3.0 and lmms@1.1.3 requires this version. Remove once no longer
|
||||
;; needed.
|
||||
(define-public fluidsynth-1
|
||||
(package
|
||||
(inherit fluidsynth)
|
||||
(version "1.1.11")
|
||||
(source (origin
|
||||
(inherit (package-source fluidsynth))
|
||||
(uri (git-reference
|
||||
(url "https://github.com/FluidSynth/fluidsynth")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "fluidsynth" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"))))))
|
||||
|
||||
(define-public faad2
|
||||
(package
|
||||
(name "faad2")
|
||||
|
@ -1911,15 +1929,15 @@ lv2-c++-tools.")
|
|||
(define-public openal
|
||||
(package
|
||||
(name "openal")
|
||||
(version "1.19.0")
|
||||
(version "1.19.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://kcat.strangesoft.net/openal-releases/openal-soft-"
|
||||
"http://openal-soft.org/openal-releases/openal-soft-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi"))))
|
||||
"1sdjhkz2gd6lbnwphi1b6aw3br4wv2lik5vnqh6mxfc8a7zqfbsw"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
@ -1952,7 +1970,7 @@ emitters are among the features handled by the API. More advanced effects,
|
|||
including air absorption, occlusion, and environmental reverb, are available
|
||||
through the EFX extension. It also facilitates streaming audio, multi-channel
|
||||
buffers, and audio capture.")
|
||||
(home-page "http://kcat.strangesoft.net/openal.html")
|
||||
(home-page "http://openal-soft.org/")
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public freealut
|
||||
|
@ -2015,14 +2033,14 @@ and ALSA.")
|
|||
(define-public qjackctl
|
||||
(package
|
||||
(name "qjackctl")
|
||||
(version "0.5.3")
|
||||
(version "0.5.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
|
||||
version "/qjackctl-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1"))))
|
||||
"0qr71nb93gkz5q53nfcl5g168z173wc6s8w1yjs3rfn3m4hg0bcq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no check target
|
||||
|
@ -2244,7 +2262,7 @@ aimed at audio/musical applications.")
|
|||
("vamp" ,vamp)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "http://breakfastquay.com/rubberband/")
|
||||
(home-page "https://breakfastquay.com/rubberband/")
|
||||
(synopsis "Audio time-stretching and pitch-shifting library")
|
||||
(description
|
||||
"Rubber Band is a library and utility program that permits changing the
|
||||
|
@ -2760,7 +2778,7 @@ interface.")
|
|||
(define-public qsynth
|
||||
(package
|
||||
(name "qsynth")
|
||||
(version "0.5.2")
|
||||
(version "0.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2768,7 +2786,7 @@ interface.")
|
|||
"/qsynth-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rfkaxq1pyc4hv3l0i6wicianbcbm1wp53kh9i5d4jsljgisd1dv"))))
|
||||
"1jghczmmva7cyavg1q0j8nr3hmjpzzglzi5ckg92ax4ji8gpks9c"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no "check" phase
|
||||
|
@ -3089,7 +3107,7 @@ with support for HD extensions.")
|
|||
(define-public bs1770gain
|
||||
(package
|
||||
(name "bs1770gain")
|
||||
(version "0.4.12")
|
||||
(version "0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3097,7 +3115,7 @@ with support for HD extensions.")
|
|||
version "/bs1770gain-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n9skdap1vnl6w52fx0gsrjlk7w3xgdwi62ycyf96h29rx059z6a"))))
|
||||
"0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("ffmpeg" ,ffmpeg)
|
||||
("sox" ,sox)))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -32,24 +32,14 @@
|
|||
(define-public augeas
|
||||
(package
|
||||
(name "augeas")
|
||||
(version "1.10.1")
|
||||
(version "1.11.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.augeas.net/augeas-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0k9nssn7lk58cl5zv3c8kv2zx9cm2yks3sj7q4fd6qdjz9m2bnsj"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; The gnulib test-lock test is prone to writer starvation
|
||||
;; with our glibc@2.25, which prefers readers, so disable it.
|
||||
;; The gnulib commit b20e8afb0b2 should fix this once
|
||||
;; incorporated here.
|
||||
(substitute* "gnulib/tests/Makefile.in"
|
||||
(("test-lock\\$\\(EXEEXT\\) ") ""))
|
||||
#t))))
|
||||
"1c507qj6dfn2dnsl27w94zs9r45xrgm07y8bqba9ry2s0psfhg1r"))))
|
||||
(build-system gnu-build-system)
|
||||
;; Marked as "required" in augeas.pc
|
||||
(propagated-inputs
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 4.18.0-gnu Kernel Configuration
|
||||
# Linux/arm64 4.18.14-gnu Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM64=y
|
||||
CONFIG_64BIT=y
|
||||
|
@ -481,7 +481,7 @@ CONFIG_HOTPLUG_PCI=y
|
|||
CONFIG_HOTPLUG_PCI_ACPI=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI=y
|
||||
# CONFIG_HOTPLUG_PCI_SHPC is not set
|
||||
CONFIG_HOTPLUG_PCI_SHPC=y
|
||||
|
||||
#
|
||||
# PCI controller drivers
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.18.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.18.9-gnu Kernel Configuration
|
||||
#
|
||||
|
||||
#
|
||||
|
@ -255,6 +255,7 @@ CONFIG_PROFILING=y
|
|||
CONFIG_TRACEPOINTS=y
|
||||
CONFIG_CRASH_CORE=y
|
||||
CONFIG_KEXEC_CORE=y
|
||||
CONFIG_HOTPLUG_SMT=y
|
||||
CONFIG_OPROFILE=m
|
||||
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
|
@ -294,6 +295,7 @@ CONFIG_HAVE_PERF_REGS=y
|
|||
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
|
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
||||
CONFIG_HAVE_RCU_TABLE_FREE=y
|
||||
CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
|
||||
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
|
||||
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
|
||||
CONFIG_HAVE_CMPXCHG_LOCAL=y
|
||||
|
@ -853,7 +855,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
|
|||
CONFIG_HOTPLUG_PCI_CPCI=y
|
||||
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
||||
# CONFIG_HOTPLUG_PCI_SHPC is not set
|
||||
CONFIG_HOTPLUG_PCI_SHPC=y
|
||||
|
||||
#
|
||||
# PCI controller drivers
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.18.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.18.9-gnu Kernel Configuration
|
||||
#
|
||||
|
||||
#
|
||||
|
@ -265,6 +265,7 @@ CONFIG_PROFILING=y
|
|||
CONFIG_TRACEPOINTS=y
|
||||
CONFIG_CRASH_CORE=y
|
||||
CONFIG_KEXEC_CORE=y
|
||||
CONFIG_HOTPLUG_SMT=y
|
||||
CONFIG_OPROFILE=m
|
||||
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
|
@ -304,6 +305,7 @@ CONFIG_HAVE_PERF_REGS=y
|
|||
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
|
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
||||
CONFIG_HAVE_RCU_TABLE_FREE=y
|
||||
CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
|
||||
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
|
||||
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
|
||||
CONFIG_HAVE_CMPXCHG_LOCAL=y
|
||||
|
@ -869,7 +871,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
|
|||
CONFIG_HOTPLUG_PCI_CPCI=y
|
||||
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
||||
# CONFIG_HOTPLUG_PCI_SHPC is not set
|
||||
CONFIG_HOTPLUG_PCI_SHPC=y
|
||||
|
||||
#
|
||||
# PCI controller drivers
|
||||
|
|
|
@ -498,6 +498,7 @@ detection, and lossless compression.")
|
|||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "borgbackup" version))
|
||||
(patches (search-patches "borg-respect-storage-quota.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p3zia62vyg9vadkdjzzkzbj4dmgijr7ix5lmhfbxpwy5q9imdgp"))
|
||||
|
@ -861,7 +862,7 @@ is like a time machine for your data. ")
|
|||
(define-public restic
|
||||
(package
|
||||
(name "restic")
|
||||
(version "0.9.2")
|
||||
(version "0.9.3")
|
||||
;; TODO Try packaging the bundled / vendored dependencies in the 'vendor/'
|
||||
;; directory.
|
||||
(source (origin
|
||||
|
@ -872,7 +873,7 @@ is like a time machine for your data. ")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15bwkydxcg4xhrnqxvxji8wacrsndb1a6frj98wggfaijqzfx3lg"))))
|
||||
"1l1ddnf61pfsrry97qwhhdzywin2mgnbrkhcc9pabsdfk602anmr"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "github.com/restic/restic"
|
||||
|
@ -886,6 +887,8 @@ is like a time machine for your data. ")
|
|||
(with-directory-excursion (string-append
|
||||
"src/github.com/restic/restic-"
|
||||
,version)
|
||||
;; Disable 'restic self-update'. It makes little sense in Guix.
|
||||
(substitute* "build.go" (("selfupdate") ""))
|
||||
(invoke "go" "run" "build.go"))))
|
||||
|
||||
(replace 'check
|
||||
|
|
|
@ -0,0 +1,258 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;;
|
||||
;;; 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 GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages batik)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix build-system ant)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages java)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public java-w3c-smil-3.0
|
||||
(package
|
||||
(name "java-w3c-smil")
|
||||
(version "3.0")
|
||||
(source #f)
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:jar-name "w3c-smil.jar"
|
||||
#:source-dir "."
|
||||
#:tests? #f ; No tests exist.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda* (#:key source #:allow-other-keys)
|
||||
;; https://www.w3.org/TR/SMIL3/smil-timing.html#q142
|
||||
(mkdir-p "org/w3c/dom/smil")
|
||||
(call-with-output-file "org/w3c/dom/smil/ElementTimeControl.java"
|
||||
(lambda (port)
|
||||
(format port "
|
||||
package org.w3c.dom.smil;
|
||||
|
||||
import org.w3c.dom.DOMException;
|
||||
|
||||
public interface ElementTimeControl {
|
||||
public boolean beginElement();
|
||||
|
||||
public boolean beginElementAt(float offset);
|
||||
|
||||
public boolean endElement();
|
||||
|
||||
public boolean endElementAt(float offset);
|
||||
}
|
||||
")))
|
||||
(call-with-output-file "org/w3c/dom/smil/TimeEvent.java"
|
||||
(lambda (port)
|
||||
(format port "
|
||||
package org.w3c.dom.smil;
|
||||
|
||||
import org.w3c.dom.events.Event;
|
||||
import org.w3c.dom.views.AbstractView;
|
||||
|
||||
public interface TimeEvent extends Event {
|
||||
public AbstractView getView();
|
||||
|
||||
public int getDetail();
|
||||
|
||||
public void initTimeEvent(String typeArg,
|
||||
AbstractView viewArg,
|
||||
int detailArg);
|
||||
|
||||
}
|
||||
")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)))
|
||||
(home-page "https://www.w3.org/Style/CSS/SAC/")
|
||||
(synopsis "W3C SAC interface for CSS parsers in Java")
|
||||
(description "This package provides a SAC interface by the W3C.
|
||||
SAC is an interface for CSS parsers.")
|
||||
(license license:w3c)))
|
||||
|
||||
(define-public java-w3c-svg-1.0
|
||||
(package
|
||||
(name "java-w3c-svg")
|
||||
(version "20010904")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.w3.org/TR/2001/REC-SVG-" version
|
||||
"/java-binding.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gnxvx51bg6ijplf6l2q0i1m07101f7fickawshfygnsdjqfdnbp"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:jar-name "w3c-svg.jar"
|
||||
#:source-dir "."
|
||||
#:tests? #f ; No tests exist.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda* (#:key source #:allow-other-keys)
|
||||
(invoke "unzip" source)))
|
||||
(add-after 'unpack 'patch-interface
|
||||
(lambda _
|
||||
;; Make it compatible with batik.
|
||||
;; This is equivalent to usingxml commons externals'
|
||||
;; "externals" part from https://xerces.apache.org/mirrors.cgi
|
||||
(substitute* "SVGFEConvolveMatrixElement.java"
|
||||
(("public SVGAnimatedLength[ ]*getKernelUnitLength")
|
||||
"public SVGAnimatedNumber getKernelUnitLength"))
|
||||
(substitute* "SVGFEMorphologyElement.java"
|
||||
(("public SVGAnimatedLength[ ]*getRadius")
|
||||
"public SVGAnimatedNumber getRadius"))
|
||||
(call-with-output-file "EventListenerInitializer.java"
|
||||
(lambda (port)
|
||||
(format port "
|
||||
// License: http://www.apache.org/licenses/LICENSE-2.0
|
||||
package org.w3c.dom.svg;
|
||||
public interface EventListenerInitializer {
|
||||
public void initializeEventListeners(SVGDocument doc);
|
||||
}
|
||||
|
||||
")))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("java-w3c-smil" ,java-w3c-smil-3.0)))
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)))
|
||||
(home-page "https://www.w3.org/Style/CSS/SAC/")
|
||||
(synopsis "W3C SVG 1.0 interface")
|
||||
(description "This package provides a SVG 1.0 interface.")
|
||||
(license license:w3c)))
|
||||
|
||||
(define-public java-w3c-svg
|
||||
(package
|
||||
(inherit java-w3c-svg-1.0)
|
||||
(version "20110816")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.w3.org/TR/2011/REC-SVG11-" version
|
||||
"/java-binding.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jicqcrxav8ggs37amgvvwgc2f0qp1c5wns4rb2i3si83s2m09ns"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments java-w3c-svg-1.0)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'patch-interface)))))
|
||||
(propagated-inputs
|
||||
`())
|
||||
(synopsis "W3C SVG interface")
|
||||
(description "This package provides a SVG interface.")))
|
||||
|
||||
(define-public java-w3c-sac
|
||||
(package
|
||||
(name "java-w3c-sac")
|
||||
(version "1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.w3.org/2002/06/sacjava-" version
|
||||
".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1djp2nnzf8jchnwz1ij9i5jfx4cg1ryf3lbw133yzjy0wkhcla52"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:jar-name "w3c-sac.jar"
|
||||
#:source-dir "sac-1.3"
|
||||
#:tests? #f ; No tests exist.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda* (#:key source #:allow-other-keys)
|
||||
(invoke "unzip" source))))))
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)))
|
||||
(home-page "https://www.w3.org/Style/CSS/SAC/")
|
||||
(synopsis "W3C SAC interface for CSS parsers in Java")
|
||||
(description "This package provides a SAC interface by the W3C.
|
||||
SAC is an interface for CSS parsers.")
|
||||
(license license:w3c)))
|
||||
|
||||
(define-public java-xmlgraphics-commons
|
||||
(package
|
||||
(name "java-xmlgraphics-commons")
|
||||
(version "2.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-"
|
||||
version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
`(begin
|
||||
(delete-file-recursively "lib")
|
||||
#t))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:build-target "jar-main"
|
||||
#:test-target "junit"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'make-reproducible
|
||||
(lambda _
|
||||
(substitute* "build.xml"
|
||||
(("<attribute name=\"Build-Id\" value=\"[^\"]*\"")
|
||||
"<attribute name=\"Build-Id\" value=\"\""))
|
||||
#t))
|
||||
(add-before 'build 'prepare-build-directories
|
||||
(lambda _
|
||||
(mkdir "lib")
|
||||
(mkdir "lib/build")
|
||||
#t))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(out-share (string-append out "/share/java")))
|
||||
(for-each (lambda (name)
|
||||
(install-file name out-share))
|
||||
(find-files "build"
|
||||
"xmlgraphics-commons.*\\.jar$"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("java-apache-xml-commons-resolver" ,java-apache-xml-commons-resolver)
|
||||
("java-asm" ,java-asm)
|
||||
("java-cglib" ,java-cglib)
|
||||
("java-hamcrest" ,java-hamcrest-core)
|
||||
("java-junit" ,java-junit)
|
||||
("java-mockito" ,java-mockito-1)
|
||||
("java-objenesis" ,java-objenesis)))
|
||||
(propagated-inputs
|
||||
`(("java-commons-io" ,java-commons-io)
|
||||
("java-commons-logging-minimal" ,java-commons-logging-minimal)))
|
||||
(home-page "https://xmlgraphics.apache.org/commons/")
|
||||
(synopsis "XMLGraphics constants")
|
||||
(description "This package provides XMLGraphics constants (originally
|
||||
from @code{batik}).")
|
||||
(license license:asl2.0)))
|
|
@ -886,3 +886,30 @@ Time-Course experiments) analyses 4sU-seq and RNA-seq time-course data in
|
|||
order to evaluate synthesis, processing and degradation rates and assess via
|
||||
modeling the rates that determines changes in mature mRNA levels.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-dnabarcodes
|
||||
(package
|
||||
(name "r-dnabarcodes")
|
||||
(version "1.10.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "DNABarcodes" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0xhna7f0kr7pp2hqwara5i57m9mdr65shflfxiyw6yy3g90pgb5x"))))
|
||||
(properties `((upstream-name . "DNABarcodes")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-bh" ,r-bh)
|
||||
("r-matrix" ,r-matrix)
|
||||
("r-rcpp" ,r-rcpp)))
|
||||
(home-page "https://bioconductor.org/packages/DNABarcodes")
|
||||
(synopsis "Create and analyze DNA barcodes")
|
||||
(description
|
||||
"This package offers tools to create DNA barcode sets capable of
|
||||
correcting insertion, deletion, and substitution errors. Existing barcodes
|
||||
can be analyzed regarding their minimal, maximal and average distances between
|
||||
barcodes. Finally, reads that start with a (possibly mutated) barcode can be
|
||||
demultiplexed, i.e. assigned to their original reference barcode.")
|
||||
(license license:gpl2)))
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -409,7 +409,7 @@ desktops.")
|
|||
(define-public qbittorrent
|
||||
(package
|
||||
(name "qbittorrent")
|
||||
(version "4.0.4")
|
||||
(version "4.1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -418,7 +418,7 @@ desktops.")
|
|||
(file-name (string-append name "-release-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"145r4lv7rqdhrm5znn3ndxsfdf579n46zvj7c53c422am8ir5xhp"))))
|
||||
"00zrpnwanq9f7maky2z4wnzw08xy902s77scm2gcvxxxankr4j92"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -434,7 +434,7 @@ desktops.")
|
|||
`(("boost" ,boost)
|
||||
("libtorrent-rasterbar" ,libtorrent-rasterbar)
|
||||
("openssl" ,openssl)
|
||||
("python" ,python)
|
||||
("python" ,python-wrapper)
|
||||
("qtbase" ,qtbase)
|
||||
("qtsvg" ,qtsvg)
|
||||
("zlib" ,zlib)))
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -27,6 +28,7 @@
|
|||
|
||||
(define-module (gnu packages boost)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
|
@ -134,6 +136,15 @@ across a broad spectrum of applications.")
|
|||
(sha256
|
||||
(base32
|
||||
"1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"))))
|
||||
(arguments (substitute-keyword-arguments (package-arguments boost)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
;; This was removed after boost-1.67.
|
||||
(add-before 'configure 'more-bin-sh-patching
|
||||
(lambda _
|
||||
(substitute* "tools/build/doc/bjam.qbk"
|
||||
(("/bin/sh") (which "sh")))))
|
||||
(delete 'provide-libboost_python)))))
|
||||
(properties '((hidden? . #t)))))
|
||||
|
||||
(define-public boost-sync
|
||||
|
|
|
@ -361,7 +361,7 @@ tree binary files. These are board description files used by Linux and BSD.")
|
|||
(define u-boot
|
||||
(package
|
||||
(name "u-boot")
|
||||
(version "2018.07")
|
||||
(version "2018.09")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -369,7 +369,7 @@ tree binary files. These are board description files used by Linux and BSD.")
|
|||
"u-boot-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m7nw64mxflpc6sqvnz2kb5fxfkb4mrpy8b1wi15dcwipj4dy44z"))))
|
||||
"0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3"))))
|
||||
(native-inputs
|
||||
`(("bc" ,bc)
|
||||
("bison" ,bison)
|
||||
|
@ -404,6 +404,12 @@ also initializes the boards (RAM etc).")
|
|||
(("/bin/false") (which "false")))
|
||||
(substitute* "tools/dtoc/fdt_util.py"
|
||||
(("'cc'") "'gcc'"))
|
||||
(substitute* "tools/patman/test_util.py"
|
||||
;; python-coverage is simply called coverage in guix.
|
||||
(("python-coverage") "coverage")
|
||||
;; XXX Allow for only 99% test coverage.
|
||||
;; TODO: Find out why that is needed.
|
||||
(("if coverage != '100%':") "if not int(coverage.rstrip('%')) >= 99:"))
|
||||
(substitute* "test/run"
|
||||
;; Make it easier to find test failures.
|
||||
(("#!/bin/bash") "#!/bin/bash -x")
|
||||
|
@ -418,8 +424,6 @@ also initializes the boards (RAM etc).")
|
|||
(("def test_ctrl_c")
|
||||
"@pytest.mark.skip(reason='Guix has problems with SIGINT')
|
||||
def test_ctrl_c"))
|
||||
(substitute* "tools/binman/binman.py"
|
||||
(("100%") "99%")) ; TODO: Find out why that is needed.
|
||||
#t))
|
||||
(replace 'configure
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
|
|
|
@ -96,13 +96,13 @@ data units.")
|
|||
(define-public khal
|
||||
(package
|
||||
(name "khal")
|
||||
(version "0.9.9")
|
||||
(version "0.9.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "khal" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0dq9aqb9pqjfqrnfg43mhpb7m0szmychxy1ydb3lwzf3500c9rsh"))))
|
||||
"03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
@ -879,7 +879,8 @@ subprocess and see the output as well as any file modifications.")
|
|||
(uri (pypi-uri "testtools" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0n8519lk8aaa91vymz842831181wf7fss98hyllhygi3z1nfq9sq"))))
|
||||
"0n8519lk8aaa91vymz842831181wf7fss98hyllhygi3z1nfq9sq"))
|
||||
(patches (search-patches "python-testtools.patch"))))
|
||||
(build-system python-build-system)
|
||||
(arguments '(#:tests? #f))
|
||||
(propagated-inputs
|
||||
|
@ -1920,14 +1921,14 @@ create data based on random numbers and yet remain repeatable.")
|
|||
(define-public python-nose-timer
|
||||
(package
|
||||
(name "python-nose-timer")
|
||||
(version "0.7.2")
|
||||
(version "0.7.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "nose-timer" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ywg223p528014z5s0vzck74r4xyw3kvcp2casfnc85dkvir1zj7"))))
|
||||
"0hfz5aqnhf493i9kyb6prm4zm8vx7wmfsyg3nvsnh24lzh2kwx44"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-nose" ,python-nose)
|
||||
|
|
|
@ -85,6 +85,7 @@
|
|||
("xorg-rgb" ,xorg-rgb)
|
||||
("nanopass" ,nanopass)
|
||||
("zlib" ,zlib)
|
||||
("zlib:static" ,zlib "static")
|
||||
("stex" ,stex)))
|
||||
(native-inputs
|
||||
`(("texlive" ,texlive)
|
||||
|
@ -128,6 +129,7 @@
|
|||
(nanopass (assoc-ref inputs "nanopass"))
|
||||
(stex (assoc-ref inputs "stex"))
|
||||
(zlib (assoc-ref inputs "zlib"))
|
||||
(zlib-static (assoc-ref inputs "zlib:static"))
|
||||
(unpack (assoc-ref %standard-phases 'unpack))
|
||||
(patch-source-shebangs
|
||||
(assoc-ref %standard-phases 'patch-source-shebangs)))
|
||||
|
@ -148,7 +150,7 @@
|
|||
(("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a")
|
||||
"${Kernel}: ${kernelobj}")
|
||||
(("ld ([-a-zA-Z0-9_${} ]+) \\.\\./zlib/libz\\.a" all args)
|
||||
(string-append "ld " args " " zlib "/lib/libz.a"))
|
||||
(string-append "ld " args " " zlib-static "/lib/libz.a"))
|
||||
(("\\(cd \\.\\./zlib; ([-a-zA-Z0-9=./ ]+))")
|
||||
(which "true")))
|
||||
(substitute* (find-files "mats" "Mf-.*")
|
||||
|
|
|
@ -186,8 +186,8 @@ their dependencies.")
|
|||
(license l:gpl3+))))
|
||||
|
||||
(define-public cuirass
|
||||
(let ((commit "8d40c49170971ad7bbf8b97336934dbb3d949fc1")
|
||||
(revision "19"))
|
||||
(let ((commit "fe2b73c2353d106431ed0659345391f14ed64600")
|
||||
(revision "20"))
|
||||
(package
|
||||
(name "cuirass")
|
||||
(version (string-append "0.0.1-" revision "." (string-take commit 7)))
|
||||
|
@ -199,7 +199,7 @@ their dependencies.")
|
|||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0xxcapf9ag3zx6131v128vhin5m2j3w2gjbjbpdwr0qkaysh0gvf"))))
|
||||
"00ldbig2p14qpwrl2i2hnhb9idgbbf0kqnlh4n79rmz96blm7463"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:modules ((guix build utils)
|
||||
|
|
|
@ -403,13 +403,13 @@ functionality such as HTML output.")
|
|||
(package
|
||||
(name "rtags")
|
||||
(version "2.18")
|
||||
(home-page "https://github.com/Andersbakken/rtags")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append home-page "/archive/v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Andersbakken/rtags.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "rtags-separate-rct.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -424,7 +424,7 @@ functionality such as HTML output.")
|
|||
#t)))
|
||||
(sha256
|
||||
(base32
|
||||
"0scjbp1z201q8njvrxqz7lk2m9b6k2rxd5q1shrng6532r7ndif2"))))
|
||||
"0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:build-type "RelWithDebInfo"
|
||||
|
@ -442,6 +442,7 @@ functionality such as HTML output.")
|
|||
("lua" ,lua)
|
||||
("rct" ,rct)
|
||||
("selene" ,selene)))
|
||||
(home-page "https://github.com/Andersbakken/rtags")
|
||||
(synopsis "Indexer for the C language family with Emacs integration")
|
||||
(description
|
||||
"RTags is a client/server application that indexes C/C++ code and keeps a
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
|
||||
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
|
@ -584,7 +584,23 @@ decompressors when faced with corrupted input.")
|
|||
(patches (search-patches "sharutils-CVE-2018-1000097.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b"))))
|
||||
"16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Adjust the bundled gnulib to work with glibc 2.28. See e.g.
|
||||
;; "m4-gnulib-libio.patch". This is a phase rather than patch
|
||||
;; or snippet to work around <https://bugs.gnu.org/32347>.
|
||||
(substitute* (find-files "lib" "\\.c$")
|
||||
(("#if defined _IO_ftrylockfile")
|
||||
"#if defined _IO_EOF_SEEN"))
|
||||
(substitute* "lib/stdio-impl.h"
|
||||
(("^/\\* BSD stdio derived implementations")
|
||||
(string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n"
|
||||
"# define _IO_IN_BACKUP 0x100\n"
|
||||
"#endif\n\n"
|
||||
"/* BSD stdio derived implementations")))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("which" ,which)))
|
||||
|
@ -875,8 +891,16 @@ the LZ4 frame format.")
|
|||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(chdir "squashfs-tools"))))))
|
||||
(lambda _
|
||||
(chdir "squashfs-tools")
|
||||
#t))
|
||||
(add-after 'unpack 'fix-glibc-compatability
|
||||
(lambda _
|
||||
(substitute* '("squashfs-tools/mksquashfs.c"
|
||||
"squashfs-tools/unsquashfs.c")
|
||||
(("<sys/sysinfo.h>")
|
||||
"<sys/sysinfo.h>\n#include <sys/sysmacros.h>"))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("lz4" ,lz4)
|
||||
("lzo" ,lzo)
|
||||
|
@ -1728,19 +1752,14 @@ or junctions, and always follows hard links.")
|
|||
(define-public zstd
|
||||
(package
|
||||
(name "zstd")
|
||||
(version "1.3.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/facebook/zstd/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sifbq18p0hc978g0pq8fymrlpzz1fcxqkbxfqk44z6v9jg5bqfn"))
|
||||
;; Fix a regression that causes the tests to fail. Both patches
|
||||
;; have been merged upstream and will be part of the next release.
|
||||
(patches (search-patches "zstd-fix-stdin-list-without-tty.patch"
|
||||
"zstd-fix-stdin-list-test.patch"))))
|
||||
(version "1.3.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/facebook/zstd/releases/download/"
|
||||
"v" version "/zstd-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1525b31jmbiczjj1n58nckdzky4cdnbwcsil3zgy4cx03v0a0cp8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -5875,3 +5875,384 @@ score in order to detect blood doping. The package also contains functions to
|
|||
calculate other scores used in anti-doping programs, such as the ratio of
|
||||
hemoglobin to reticulocytes (OFF-score), as well as example data.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-parmigene
|
||||
(package
|
||||
(name "r-parmigene")
|
||||
(version "1.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "parmigene" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/parmigene/")
|
||||
(synopsis "Mutual information estimation for gene network reconstruction")
|
||||
(description
|
||||
"This package provides a parallel estimation of the mutual information
|
||||
based on entropy estimates from k-nearest neighbors distances and algorithms
|
||||
for the reconstruction of gene regulatory networks.")
|
||||
(license license:agpl3+)))
|
||||
|
||||
(define-public r-pscl
|
||||
(package
|
||||
(name "r-pscl")
|
||||
(version "1.5.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "pscl" version))
|
||||
(sha256
|
||||
(base32 "1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-mass" ,r-mass)))
|
||||
(home-page "https://github.com/atahk/pscl/")
|
||||
(synopsis "Political science computational laboratory")
|
||||
(description
|
||||
"The @code{pscl} is an R package providing classes and methods for:
|
||||
@enumerate
|
||||
@item Bayesian analysis of roll call data (item-response models);
|
||||
@item elementary Bayesian statistics;
|
||||
@item maximum likelihood estimation of zero-inflated and hurdle models for count
|
||||
data;
|
||||
@item utility functions.
|
||||
@end enumerate")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-accelmissing
|
||||
(package
|
||||
(name "r-accelmissing")
|
||||
(version "1.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "accelmissing" version))
|
||||
(sha256
|
||||
(base32 "1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-mice" ,r-mice)
|
||||
("r-pscl" ,r-pscl)))
|
||||
(home-page "https://cran.r-project.org/web/packages/accelmissing/")
|
||||
(synopsis "Missing value imputation for accelerometer data")
|
||||
(description
|
||||
"This package provides a statistical method to impute the missing values in
|
||||
accelerometer data. The methodology includes both parametric and
|
||||
semi-parametric multiple imputations under the zero-inflated Poisson lognormal
|
||||
model. It also provides multiple functions to preprocess the accelerometer data
|
||||
previous to the missing data imputation. These include detecting the wearing
|
||||
and the non-wearing time, selecting valid days and subjects, and creating plots.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-mhsmm
|
||||
(package
|
||||
(name "r-mhsmm")
|
||||
(version "0.4.16")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mhsmm" version))
|
||||
(sha256
|
||||
(base32 "009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs `(("r-mvtnorm" ,r-mvtnorm)))
|
||||
(home-page "https://github.com/jaredo/mhsmm/")
|
||||
(synopsis "Inference for hidden Markov and semi-Markov models")
|
||||
(description
|
||||
"The @code{r-mhsmm} package implements estimation and prediction methods for
|
||||
hidden Markov and semi-Markov models for multiple observation sequences. Such
|
||||
techniques are of interest when observed data is thought to be dependent on some
|
||||
unobserved (or hidden) state. Also, this package is suitable for equidistant
|
||||
time series data, with multivariate and/or missing data. Allows user defined
|
||||
emission distributions.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-nleqslv
|
||||
(package
|
||||
(name "r-nleqslv")
|
||||
(version "3.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "nleqslv" version))
|
||||
(sha256
|
||||
(base32 "1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"))))
|
||||
(build-system r-build-system)
|
||||
(native-inputs `(("gfortran" ,gfortran)))
|
||||
(home-page "https://cran.r-project.org/web/packages/nleqslv/")
|
||||
(synopsis "Solve systems of nonlinear equations")
|
||||
(description
|
||||
"The @code{r-nleqslv} package solves a system of nonlinear equations using a
|
||||
Broyden or a Newton method with a choice of global strategies such as line
|
||||
search and trust region. There are options for using a numerical or user
|
||||
supplied Jacobian, for specifying a banded numerical Jacobian and for allowing a
|
||||
singular or ill-conditioned Jacobian.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-physicalactivity
|
||||
(package
|
||||
(name "r-physicalactivity")
|
||||
(version "0.2-2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "PhysicalActivity" version))
|
||||
(sha256
|
||||
(base32 "14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln"))))
|
||||
(properties
|
||||
`((upstream-name . "PhysicalActivity")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/PhysicalActivity/")
|
||||
(synopsis "Procesing accelerometer data for physical activity measurement")
|
||||
(description
|
||||
"This @code{r-physicalactivity} package provides a function @code{wearingMarking}
|
||||
for classification of monitor wear and nonwear time intervals in accelerometer
|
||||
data collected to assess physical activity. The package also contains functions
|
||||
for making plots of accelerometer data and obtaining the summary of various
|
||||
information including daily monitor wear time and the mean monitor wear time
|
||||
during valid days. The revised package version 0.2-1 improved the functions
|
||||
regarding speed, robustness and add better support for time zones and daylight
|
||||
saving. In addition, several functions were added:
|
||||
@enumerate
|
||||
@item the @code{markDelivery} can classify days for ActiGraph delivery by mail;
|
||||
@item the @code{markPAI} can categorize physical activity intensity level based
|
||||
on user-defined cut-points of accelerometer counts.
|
||||
@end enumerate
|
||||
It also supports importing ActiGraph (AGD) files with @code{readActigraph} and
|
||||
@code{queryActigraph} functions.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public r-acc
|
||||
(package
|
||||
(name "r-acc")
|
||||
(version "1.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "acc" version))
|
||||
(sha256
|
||||
(base32 "1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-circlize" ,r-circlize)
|
||||
("r-dbi" ,r-dbi)
|
||||
("r-ggplot2" ,r-ggplot2)
|
||||
("r-iterators" ,r-iterators)
|
||||
("r-mhsmm" ,r-mhsmm)
|
||||
("r-nleqslv" ,r-nleqslv)
|
||||
("r-physicalactivity" ,r-physicalactivity)
|
||||
("r-plyr" ,r-plyr)
|
||||
("r-r-utils" ,r-r-utils)
|
||||
("r-rcpp" ,r-rcpp)
|
||||
("r-rcpparmadillo" ,r-rcpparmadillo)
|
||||
("r-rsqlite" ,r-rsqlite)
|
||||
("r-zoo" ,r-zoo)))
|
||||
(home-page "https://cran.r-project.org/web/packages/acc/")
|
||||
(synopsis "Exploring accelerometer data")
|
||||
(description
|
||||
"This package processes accelerometer data from uni-axial and tri-axial devices
|
||||
and generates data summaries. Also, includes functions to plot, analyze, and
|
||||
simulate accelerometer data.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-rbenchmark
|
||||
(package
|
||||
(name "r-rbenchmark")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rbenchmark" version))
|
||||
(sha256
|
||||
(base32 "010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/rbenchmark/")
|
||||
(synopsis "Benchmarking routine for R")
|
||||
(description
|
||||
"This @code{r-rbenchmark} package is inspired by the Perl module Benchmark,
|
||||
and is intended to facilitate benchmarking of arbitrary R code. The library
|
||||
consists of just one function, benchmark, which is a simple wrapper around
|
||||
system.time. Given a specification of the benchmarking process (counts of
|
||||
replications, evaluation environment) and an arbitrary number of expressions,
|
||||
benchmark evaluates each of the expressions in the specified environment,
|
||||
replicating the evaluation as many times as specified, and returning the results
|
||||
conveniently wrapped into a data frame.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-dvmisc
|
||||
(package
|
||||
(name "r-dvmisc")
|
||||
(version "1.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "dvmisc" version))
|
||||
(sha256
|
||||
(base32 "1dy0yykskwhkql19bhzmbwsgv028afc8jh9yqwbczj6f3vpv31zh"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-mass" ,r-mass)
|
||||
("r-rbenchmark" ,r-rbenchmark)
|
||||
("r-rcpp" ,r-rcpp)))
|
||||
(home-page "https://cran.r-project.org/web/packages/dvmisc/")
|
||||
(synopsis "Faster computation of common statistics and miscellaneous functions")
|
||||
(description
|
||||
"This package implements faster versions of base R functions (e.g. mean, standard
|
||||
deviation, covariance, weighted mean), mostly written in C++, along with
|
||||
miscellaneous functions for various purposes (e.g. create the histogram with
|
||||
fitted probability density function or probability mass function curve, create
|
||||
the body mass index groups, assess the linearity assumption in logistic
|
||||
regression).")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-accelerometry
|
||||
(package
|
||||
(name "r-accelerometry")
|
||||
(version "3.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "accelerometry" version))
|
||||
(sha256
|
||||
(base32 "13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-dvmisc" ,r-dvmisc)
|
||||
("r-rcpp" ,r-rcpp)))
|
||||
(home-page "https://cran.r-project.org/web/packages/accelerometry/")
|
||||
(synopsis "Functions for processing accelerometer data")
|
||||
(description
|
||||
"This package provides a collection of functions that perform operations on
|
||||
time-series accelerometer data, such as identify the non-wear time, flag minutes
|
||||
that are part of an activity bout, and find the maximum 10-minute average count
|
||||
value. The functions are generally very flexible, allowing for a variety of
|
||||
algorithms to be implemented.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public r-absim
|
||||
(package
|
||||
(name "r-absim")
|
||||
(version "0.2.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "AbSim" version))
|
||||
(sha256
|
||||
(base32 "16ddjk8b6xw80ch4jis1y751i9561wdxh0gifbf15qiz3vjckq8m"))))
|
||||
(properties `((upstream-name . "AbSim")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-ape" ,r-ape)
|
||||
("r-powerlaw" ,r-powerlaw)))
|
||||
(home-page "https://cran.r-project.org/web/packages/AbSim/")
|
||||
(synopsis "Time resolved simulations of antibody repertoires")
|
||||
(description
|
||||
"This package provides simulation methods for the evolution of antibody repertoires.
|
||||
The heavy and light chain variable region of both human and C57BL/6 mice can
|
||||
be simulated in a time-dependent fashion. Both single lineages using one set of
|
||||
V-, D-, and J-genes or full repertoires can be simulated. The algorithm begins
|
||||
with an initial V-D-J recombination event, starting the first phylogenetic tree.
|
||||
Upon completion, the main loop of the algorithm begins, with each iteration
|
||||
representing one simulated time step. Various mutation events are possible at
|
||||
each time step, contributing to a diverse final repertoire.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-ac3net
|
||||
(package
|
||||
(name "r-ac3net")
|
||||
(version "1.2.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "Ac3net" version))
|
||||
(sha256
|
||||
(base32 "1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz"))))
|
||||
(properties `((upstream-name . "Ac3net")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-data-table" ,r-data-table)))
|
||||
(home-page "https://cran.r-project.org/web/packages/Ac3net/")
|
||||
(synopsis "Inferring directional conservative causal core gene networks")
|
||||
(description "This package infers directional Conservative causal core
|
||||
(gene) networks (C3NET). This is a version of the algorithm C3NET with
|
||||
directional network.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public r-aca
|
||||
(package
|
||||
(name "r-aca")
|
||||
(version "1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ACA" version))
|
||||
(sha256
|
||||
(base32 "1i3hm27nvnkvc39xlh0d1blq8q0q02czmvgi3cazmjx3jvxay0vq"))))
|
||||
(properties `((upstream-name . "ACA")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/ACA/")
|
||||
(synopsis "Abrupt change-point or aberration detection in point series")
|
||||
(description
|
||||
"This package offers an interactive function for the detection of breakpoints in
|
||||
series.")
|
||||
;; Any version of the GPL
|
||||
(license (list license:gpl2+ license:gpl3+))))
|
||||
|
||||
(define-public r-acceptancesampling
|
||||
(package
|
||||
(name "r-acceptancesampling")
|
||||
(version "1.0-5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "AcceptanceSampling" version))
|
||||
(sha256
|
||||
(base32 "18krmmyn8pn11aqd81kbvka68lnd36mnpdh7p3pz9r4m4vjj007x"))))
|
||||
(properties
|
||||
`((upstream-name . "AcceptanceSampling")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/AcceptanceSampling/")
|
||||
(synopsis "Creation and evaluation of acceptance sampling plans")
|
||||
(description
|
||||
"This @code{r-acceptancesampling} provides functionality for creating and evaluating
|
||||
acceptance sampling plans. Acceptance sampling is a methodology commonly used
|
||||
in quality control and improvement. International standards of acceptance
|
||||
sampling provide sampling plans for specific circumstances. The aim of this
|
||||
package is to provide an easy-to-use interface to visualize single, double or
|
||||
multiple sampling plans. In addition, methods have been provided to enable the
|
||||
user to assess sampling plans against pre-specified levels of performance, as
|
||||
measured by the probability of acceptance for a given level of quality in the
|
||||
lot.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public r-acclma
|
||||
(package
|
||||
(name "r-acclma")
|
||||
(version "1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ACCLMA" version))
|
||||
(sha256
|
||||
(base32 "1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"))))
|
||||
(properties `((upstream-name . "ACCLMA")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/ACCLMA/")
|
||||
(synopsis "ACC & LMA graph plotting")
|
||||
(description
|
||||
"This package contains a function that imports data from a @acronym{CSV,
|
||||
Comma-Separated Values} file, or uses manually entered data from the format (x,
|
||||
y, weight) and plots the appropriate @acronym{ACC, Absolute Concentration
|
||||
Curve} vs @acronym{LOI, Line of Independence} graph and
|
||||
@acronym{LMA, @acronym{LOI} Minus @acronym{ACC}} graph. The main
|
||||
function is @code{plotLMA} (source file, header) that takes a data set and plots the
|
||||
appropriate @acronym{LMA} and @acronym{ACC} graphs. If no source file (a
|
||||
string) was passed, a manual data entry window is opened. The header parameter
|
||||
indicates by TRUE/FALSE (false by default) if the source @acronym{CSV} file has
|
||||
a header row or not. The dataset should contain only one independent variable
|
||||
(x) and one dependent variable (y) and can contain a weight for each
|
||||
observation.")
|
||||
(license license:gpl2)))
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018 Nicolò Balzarotti <nicolo@nixo.xyz>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -854,3 +855,36 @@ public-key cryptography. Asignify is designed to be portable and self-contained
|
|||
with zero external dependencies. Asignify can verify OpenBSD signatures, but it
|
||||
cannot sign messages in OpenBSD format yet.")
|
||||
(license license:bsd-2))))
|
||||
|
||||
(define-public enchive
|
||||
(package
|
||||
(name "enchive")
|
||||
(version "3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/skeeto/" name "/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17hrxpp4cpn10bk48sfvfjc8hghky34agsnypam1v9f36kbalqfk"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no check target '
|
||||
#:make-flags (list "CC=gcc" "PREFIX=$(out)")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'install 'post-install
|
||||
(lambda _
|
||||
(let* ((out (assoc-ref %outputs "out"))
|
||||
(lisp (string-append out "/share/emacs/site-lisp")))
|
||||
(install-file "enchive-mode.el" lisp)
|
||||
#t))))))
|
||||
(synopsis "Encrypted personal archives")
|
||||
(description
|
||||
"Enchive is a tool to encrypt files to yourself for long-term
|
||||
archival. It's a focused, simple alternative to more complex solutions such as
|
||||
GnuPG or encrypted filesystems. Enchive has no external dependencies and is
|
||||
trivial to build for local use. Portability is emphasized over performance.")
|
||||
(home-page "https://github.com/skeeto/enchive")
|
||||
(license license:unlicense)))
|
||||
|
|
|
@ -642,7 +642,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
|
|||
(define-public escpr
|
||||
(package
|
||||
(name "escpr")
|
||||
(version "1.6.20")
|
||||
(version "1.6.30")
|
||||
;; XXX: This currently works. But it will break as soon as a newer
|
||||
;; version is available since the URLs for older versions are not
|
||||
;; preserved. An alternative source will be added as soon as
|
||||
|
@ -650,12 +650,12 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
|
|||
(source (origin
|
||||
(method url-fetch)
|
||||
;; The uri has to be chopped up in order to satisfy guix lint.
|
||||
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/07/16/23/"
|
||||
"804253d188a31ae6a0f2722648248ef952afedfb/"
|
||||
"epson-inkjet-printer-escpr-1.6.20-1lsb3.2.tar.gz"))
|
||||
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/08/18/20/"
|
||||
"e94de600e28e510c1cfa158929d8b2c0aadc8aa0/"
|
||||
"epson-inkjet-printer-escpr-1.6.30-1lsb3.2.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19800pl7kbbgdzbsy9ijmd7dm3ly4kr2h1dxypqpd075g6n0i770"))))
|
||||
"0m8pyfkixisp0vclwxj340isn15zzisal0v2xvv66kxfd68dzf12"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
@ -923,7 +923,23 @@ organized in a hash table or B+ tree.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93"))))
|
||||
"0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Adjust the bundled gnulib to work with glibc 2.28. See e.g.
|
||||
;; "m4-gnulib-libio.patch". This is a phase rather than patch
|
||||
;; or snippet to work around <https://bugs.gnu.org/32347>.
|
||||
(substitute* (find-files "lib" "\\.c$")
|
||||
(("#if defined _IO_ftrylockfile")
|
||||
"#if defined _IO_EOF_SEEN"))
|
||||
(substitute* "lib/stdio-impl.h"
|
||||
(("^/\\* BSD stdio derived implementations")
|
||||
(string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n"
|
||||
"# define _IO_IN_BACKUP 0x100\n"
|
||||
"#endif\n\n"
|
||||
"/* BSD stdio derived implementations")))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
;; Running tests in parallel leads to test failures and crashes in
|
||||
|
@ -1457,15 +1473,15 @@ columns, primary keys, unique constraints and relationships.")
|
|||
(define-public perl-dbd-mysql
|
||||
(package
|
||||
(name "perl-dbd-mysql")
|
||||
(version "4.047")
|
||||
(version "4.048")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/"
|
||||
(uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/"
|
||||
"DBD-mysql-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0idizgr0hr7sj92fbdlb3gv6cva15jkpaq28wrdw4j4p7awx2mls"))))
|
||||
"1zqmch6c9gq06z90mkmk1skajk2kaggriw19ym5w04l7wv5gydqp"))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -1767,19 +1783,32 @@ trees (LSM), for sustained throughput under random insert workloads.")
|
|||
;; configure.ac: WiredTiger requires a 64-bit build.
|
||||
(supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux"))))
|
||||
|
||||
(define-public wiredtiger-3
|
||||
(package
|
||||
(inherit wiredtiger)
|
||||
(name "wiredtiger")
|
||||
(version "3.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://source.wiredtiger.com/releases/wiredtiger-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"014awypv579ascg4jbx4pndj2wld337m79yyzrzyr7hxrff139jx"))))))
|
||||
|
||||
(define-public guile-wiredtiger
|
||||
(package
|
||||
(name "guile-wiredtiger")
|
||||
(version "0.6.3")
|
||||
(version "0.7.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://framagit.org/a-guile-mind/guile-wiredtiger.git")
|
||||
(commit "070ed68139d99c279f058a6c293f00292d35dbd7")))
|
||||
(commit "340ad4bc2ff4dcc6216a2f5c6f9172ca320ac66b")))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"14rna97wsylajzxfif95wnblq85csgcfc666gh5dl0ssgd7x8llh"))))
|
||||
"15j36bvxxzil7qpwlmh1rffqpva3ynvrcpqhhqbj2c9208ayz595"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:parallel-tests? #f ;; tests can't be run in parallel, yet.
|
||||
|
@ -1787,21 +1816,19 @@ trees (LSM), for sustained throughput under random insert workloads.")
|
|||
(list (string-append "--with-libwiredtiger-prefix="
|
||||
(assoc-ref %build-inputs "wiredtiger")))
|
||||
#:make-flags '("GUILE_AUTO_COMPILE=0")))
|
||||
;; TODO: Remove microkanren.scm when we have a separate package
|
||||
;; for it.
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("wiredtiger" ,wiredtiger)
|
||||
`(("wiredtiger" ,wiredtiger-3)
|
||||
("guile" ,guile-2.2)))
|
||||
(propagated-inputs
|
||||
`(("guile-lib" ,guile-lib))) ;for (htmlprag)
|
||||
`(("guile-bytestructures" ,guile-bytestructures)))
|
||||
(synopsis "WiredTiger bindings for GNU Guile")
|
||||
(description
|
||||
"This package provides Guile bindings to the WiredTiger ``NoSQL''
|
||||
database. Various higher level database abstractions.")
|
||||
database.")
|
||||
(home-page "https://framagit.org/a-guile-mind/guile-wiredtiger")
|
||||
(license license:gpl3+)))
|
||||
|
||||
|
@ -2416,13 +2443,13 @@ SQLAlchemy Database Toolkit for Python.")
|
|||
(define-public python-pickleshare
|
||||
(package
|
||||
(name "python-pickleshare")
|
||||
(version "0.7.4")
|
||||
(version "0.7.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pickleshare" version))
|
||||
(sha256
|
||||
(base32 "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4"))))
|
||||
(base32 "1jmghg3c53yp1i8cm6pcrm280ayi8621rwyav9fac7awjr3kss47"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
@ -2669,12 +2696,14 @@ parsing code in hiredis. It primarily speeds up parsing of multi bulk replies."
|
|||
`(#:tests? #f))
|
||||
(home-page "https://github.com/jamesls/fakeredis")
|
||||
(synopsis "Fake implementation of redis API for testing purposes")
|
||||
(description "Fakeredis is a pure python implementation of the redis-py
|
||||
python client that simulates talking to a redis server. This was created for a
|
||||
single purpose: to write unittests. Setting up redis is not hard, but many time
|
||||
you want to write unittests that do not talk to an external server (such as
|
||||
redis). This module now allows tests to simply use this module as a reasonable
|
||||
substitute for redis.")
|
||||
(description
|
||||
"Fakeredis is a pure-Python implementation of the redis-py Python client
|
||||
that simulates talking to a redis server. It was created for a single purpose:
|
||||
to write unit tests.
|
||||
|
||||
Setting up redis is not hard, but one often wants to write unit tests that don't
|
||||
talk to an external server such as redis. This module can be used as a
|
||||
reasonable substitute.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-fakeredis
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; 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
|
||||
|
@ -71,7 +74,7 @@ contains the archive keys used for that.")
|
|||
(define-public ubuntu-keyring
|
||||
(package
|
||||
(name "ubuntu-keyring")
|
||||
(version "2018.02.28")
|
||||
(version "2018.09.18.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -79,7 +82,7 @@ contains the archive keys used for that.")
|
|||
"+files/" name "_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zj3012cz7rlx9pm39wnwa0lmi1h38n6bkgbz81vnmcsvqsc9a3a"))))
|
||||
"0csx2n62rj9rxjv4y8qhby7l9rbybfwrb0406pc2cjr7f2yk91af"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -37,14 +38,14 @@
|
|||
(define-public dico
|
||||
(package
|
||||
(name "dico")
|
||||
(version "2.6")
|
||||
(version "2.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/dico/dico-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i"))))
|
||||
"0dg4aacnmlf3ljssd7dwh8z5644xzq8k1501mbsx8nz8p8a9mbsq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags (list (string-append "--with-guile-site-dir=" %output
|
||||
|
@ -57,7 +58,11 @@
|
|||
;; infrastructure. Gag it.
|
||||
(setenv "GUILE_AUTO_COMPILE" "0")
|
||||
(setenv "GUILE_WARN_DEPRECATED" "no")
|
||||
#t)))))
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; Test '71: append + dooffs + env' fails if $V is not 2.
|
||||
(invoke "make" "check" "V=2"))))))
|
||||
(inputs
|
||||
`(("m4" ,m4) ;used at run time
|
||||
("pcre" ,pcre)
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -219,7 +220,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
|
|||
"Grammalecte-fr-v" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1flsahqw2r0cmg0bixpl5w0acricmdh2cf4lf9zr66ydgmjnmv2s"))))
|
||||
"11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://www.dicollecte.org")
|
||||
(synopsis "French spelling and grammar checker")
|
||||
|
|
|
@ -30,22 +30,24 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages disk)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages c)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cryptsetup)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages gnuzilla)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages perl)
|
||||
|
@ -53,20 +55,18 @@
|
|||
#:use-module (gnu packages popt)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages swig)
|
||||
#:use-module (gnu packages vim)
|
||||
#:use-module (gnu packages w3m)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages cryptsetup)
|
||||
#:use-module (gnu packages gnuzilla)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages swig)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages c))
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages))
|
||||
|
||||
(define-public parted
|
||||
(package
|
||||
|
@ -518,24 +518,25 @@ Duperemove can also take input from the @command{fdupes} program.")
|
|||
(define-public ranger
|
||||
(package
|
||||
(name "ranger")
|
||||
(version "1.9.1")
|
||||
(version "1.9.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ranger.github.io/"
|
||||
"ranger-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lnzkrxcnlwnyi3z0v8ybyp8d5rm26qm35rr68kbs2lbs06inha0"))))
|
||||
"12kbsqakbxs09y0x8hy66mmaf72rk0p850x7ryk2ghkq7wfin78f"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("w3m" ,w3m)))
|
||||
(native-inputs ;for tests
|
||||
`(("python-pytest" ,python-pytest)
|
||||
("python-pylint" ,python-pylint)
|
||||
("python-flake8" ,python-flake8)
|
||||
("which" ,which)))
|
||||
(native-inputs
|
||||
`(("which" ,which)
|
||||
|
||||
;; For tests.
|
||||
("python-pytest" ,python-pytest)))
|
||||
(arguments
|
||||
'(#:test-target "test"
|
||||
'( ;; The 'test' target runs developer tools like pylint, which fail.
|
||||
#:test-target "test_pytest"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'configure 'wrap-program
|
||||
|
@ -548,7 +549,11 @@ Duperemove can also take input from the @command{fdupes} program.")
|
|||
"/libexec/w3m/w3mimgdisplay")))
|
||||
(wrap-program ranger
|
||||
`("W3MIMGDISPLAY_PATH" ":" prefix (,w3mimgdisplay)))
|
||||
#t))))))
|
||||
#t)))
|
||||
(replace 'check
|
||||
;; The default check phase simply prints 'Ran 0 tests in 0.000s'.
|
||||
(lambda* (#:key test-target #:allow-other-keys)
|
||||
(invoke "make" test-target))))))
|
||||
(home-page "https://ranger.github.io/")
|
||||
(synopsis "Console file manager")
|
||||
(description "ranger is a console file manager with Vi key bindings. It
|
||||
|
@ -560,28 +565,28 @@ automatically finding out which program to use for what file type.")
|
|||
(define-public volume-key
|
||||
(package
|
||||
(name "volume-key")
|
||||
(version "0.3.11")
|
||||
(version "0.3.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://releases.pagure.org/volume_key/volume_key-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vaz15rcgdkh5z4yxc22x76wi44gh50jxnrqz5avaxz4bb17kcp6"))))
|
||||
"16rhfz6sjwxlmss1plb2wv2i3jq6wza02rmz1d2jrlnsq67p98vc"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("util-linux" ,util-linux)
|
||||
("swig" ,swig)
|
||||
("python" ,python-3))) ; Used to generate the Python bindings.
|
||||
("python" ,python-3))) ; used to generate the Python bindings
|
||||
(inputs
|
||||
`(("cryptsetup" ,cryptsetup)
|
||||
("nss" ,nss)
|
||||
("lvm2" ,lvm2) ; For "-ldevmapper".
|
||||
("lvm2" ,lvm2) ; for "-ldevmapper"
|
||||
("glib" ,glib)
|
||||
("gpgme" ,gpgme)))
|
||||
(arguments
|
||||
`(#:tests? #f ; Not sure how tests are supposed to pass, even when run manually.
|
||||
`(#:tests? #f ; not sure how tests are supposed to pass, even when run manually
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-python.h-path
|
||||
|
@ -601,27 +606,28 @@ passphrases.")
|
|||
(define-public ndctl
|
||||
(package
|
||||
(name "ndctl")
|
||||
(version "61.2")
|
||||
(version "63")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pmem/ndctl")
|
||||
(url "https://github.com/pmem/ndctl.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0vid78jzhmzh505bpwn8mvlamfhcvl6rlfjc29y4yn7zslpydxl7"))))
|
||||
"060nsza8xic769bxj3pvl70a9885bwrc0myw16l095i3z6w7yzwq"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("asciidoc" ,asciidoc)
|
||||
("automake" ,automake)
|
||||
("autoconf" ,autoconf)
|
||||
("bash-completion" ,bash-completion)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("libtool" ,libtool)
|
||||
("libxml2" ,libxml2)
|
||||
("pkg-config" ,pkg-config)
|
||||
("xmlto" ,xmlto)
|
||||
;; Required for offline docbook generation:
|
||||
;; Required for offline docbook generation.
|
||||
("which" ,which)))
|
||||
(inputs
|
||||
`(("eudev" ,eudev)
|
||||
|
@ -629,16 +635,18 @@ passphrases.")
|
|||
("kmod" ,kmod)
|
||||
("util-linux" ,util-linux)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
`(#:configure-flags
|
||||
(list "--disable-asciidoctor" ; use docbook-xsl instead
|
||||
"--without-systemd")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autogen
|
||||
(add-after 'unpack 'patch-FHS-file-names
|
||||
(lambda _
|
||||
(substitute* "autogen.sh"
|
||||
(("/bin/sh") (which "sh")))
|
||||
(substitute* "git-version-gen"
|
||||
(("/bin/sh") (which "sh")))
|
||||
(substitute* "git-version"
|
||||
(("/bin/bash") (which "bash"))))))
|
||||
(("/bin/bash") (which "bash")))
|
||||
#t)))
|
||||
#:make-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "BASH_COMPLETION_DIR=" out
|
||||
|
@ -698,14 +706,15 @@ to create devices with respective mappings for the ATARAID sets discovered.")
|
|||
(define-public libblockdev
|
||||
(package
|
||||
(name "libblockdev")
|
||||
(version "2.18")
|
||||
(version "2.20")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/storaged-project/libblockdev/releases/download/"
|
||||
(uri (string-append "https://github.com/storaged-project/"
|
||||
"libblockdev/releases/download/"
|
||||
version "-1/libblockdev-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a3kpdr9s6g7nfibazi92i27wbv692b5gm2r24gimis6l6jq4pbh"))))
|
||||
"092snk5jyv48na4d46v1ckiy859zwpb3r0ivnxv3km5vzsp76y7q"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -738,6 +747,4 @@ manipulation of block devices. It has a plugin-based architecture where each
|
|||
technology (like LVM, Btrfs, MD RAID, Swap...) is implemented in a separate
|
||||
plugin, possibly with multiple implementations (e.g. using LVM CLI or the new
|
||||
LVM D-Bus API).")
|
||||
;; XXX: Copying says LGPL2.1, but the source files with license
|
||||
;; information are GPL2+.
|
||||
(license license:gpl2+)))
|
||||
(license license:lgpl2.1+)))
|
||||
|
|
|
@ -104,7 +104,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||
(define-public isc-bind
|
||||
(package
|
||||
(name "bind")
|
||||
(version "9.12.2-P1")
|
||||
(version "9.12.2-P2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -112,7 +112,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"192ld6w8f4n46hvdmmzzrfkd28apf4dwmbpbi3j2q1d2p315ajww"))))
|
||||
"0gk9vwqlbdmn10m21f2awvmiccfbadvcwi8zsgm91awbx4k7h0l7"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs `("out" "utils"))
|
||||
(inputs
|
||||
|
@ -289,6 +289,77 @@ asynchronous fashion.")
|
|||
(license:non-copyleft "file://LICENSE") ; includes.h
|
||||
license:openssl))))
|
||||
|
||||
(define-public nsd
|
||||
(package
|
||||
(name "nsd")
|
||||
(version "4.1.25")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "--enable-pie" ; fully benefit from ASLR
|
||||
"--enable-ratelimit"
|
||||
"--enable-recvmmsg"
|
||||
"--enable-relro-now" ; protect GOT and .dtor areas
|
||||
"--disable-radix-tree"
|
||||
(string-append "--with-libevent="
|
||||
(assoc-ref %build-inputs "libevent"))
|
||||
(string-append "--with-ssl="
|
||||
(assoc-ref %build-inputs "openssl"))
|
||||
"--with-configdir=/etc"
|
||||
"--with-nsd_conf_file=/etc/nsd/nsd.conf"
|
||||
"--with-logfile=/var/log/nsd.log"
|
||||
"--with-pidfile=/var/db/nsd/nsd.pid"
|
||||
"--with-dbfile=/var/db/nsd/nsd.db"
|
||||
"--with-zonesdir=/etc/nsd"
|
||||
"--with-xfrdfile=/var/db/nsd/xfrd.state"
|
||||
"--with-zonelistfile=/var/db/nsd/zone.list")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-installation-paths
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(doc (string-append out "/share/doc/" ,name "-" ,version)))
|
||||
;; The ‘make install’ target tries to create the parent
|
||||
;; directories of run-time things like ‘pidfile’ above, and
|
||||
;; useless empty directories like 'configdir'. Remove such
|
||||
;; '$(INSTALL)' lines and install the example configuration file
|
||||
;; in an appropriate location.
|
||||
(substitute* "Makefile.in"
|
||||
((".*INSTALL.*\\$\\((config|pid|xfr|db)dir" command)
|
||||
(string-append "#" command))
|
||||
(("\\$\\(nsdconfigfile\\)\\.sample" file-name)
|
||||
(string-append doc "/examples/" file-name)))
|
||||
#t))))
|
||||
#:tests? #f)) ; no tests
|
||||
(inputs
|
||||
`(("libevent" ,libevent)
|
||||
("openssl" ,openssl)))
|
||||
(home-page "https://www.nlnetlabs.nl/projects/nsd/about/")
|
||||
(synopsis "Authoritative DNS name server")
|
||||
(description "@dfn{NSD}, short for Name Server Daemon, is an authoritative
|
||||
name server for the Domain Name System (@dfn{DNS}). It aims to be a fast and
|
||||
RFC-compliant nameserver.
|
||||
|
||||
NSD uses zone information compiled via @command{zonec} into a binary database
|
||||
file (@file{nsd.db}). This allows fast startup of the name service daemon and
|
||||
allows syntax-structural errors in zone files to be flagged at compile time,
|
||||
before being made available to NSD service itself. However, most traditional
|
||||
BIND-style zone files can be directly imported into NSD without modification.
|
||||
|
||||
The collection of programs and processes that make up NSD are designed so that
|
||||
the daemon itself runs as a non-privileged user and can be easily configured to
|
||||
run in a @code{chroot} jail, thus making any security flaws in NSD less likely
|
||||
to result in system-wide compromise.")
|
||||
(license (list license:bsd-3))))
|
||||
|
||||
(define-public unbound
|
||||
(package
|
||||
(name "unbound")
|
||||
|
|
|
@ -243,7 +243,7 @@ easy.")
|
|||
(define-public snap
|
||||
(package
|
||||
(name "snap")
|
||||
(version "4.2.1.3")
|
||||
(version "4.2.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -253,7 +253,7 @@ easy.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0n32hg8rx6alk5j58l76gzmicrg1bp7jagz5mh1zrg7591aicjal"))))
|
||||
"0yc0w0cdhvi0nwqqrann2v3y0n7shxh7irgixqvlavp4k49d7aqj"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
;;; Copyright © 2018 Jack Hill <jackhill@jackhill.us>
|
||||
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
||||
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
|
||||
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -118,6 +119,7 @@
|
|||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages haskell)
|
||||
#:use-module (gnu packages wordnet)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (ice-9 match))
|
||||
|
@ -334,9 +336,9 @@ editor (without an X toolkit)" )
|
|||
;;; Emacs hacking.
|
||||
;;;
|
||||
|
||||
(define-public geiser
|
||||
(define-public emacs-geiser
|
||||
(package
|
||||
(name "geiser")
|
||||
(name "emacs-geiser")
|
||||
(version "0.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -369,7 +371,10 @@ implementation, Emacs and, ultimately, the schemer, giving them access to live
|
|||
metadata.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public paredit
|
||||
(define-public geiser
|
||||
(deprecated-package "geiser" emacs-geiser))
|
||||
|
||||
(define-public emacs-paredit
|
||||
(package
|
||||
(name "emacs-paredit")
|
||||
(version "24")
|
||||
|
@ -394,6 +399,9 @@ for those who may want transient periods of unbalanced parentheses, such as
|
|||
when typing parentheses directly or commenting out code line by line.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public paredit
|
||||
(deprecated-package "paredit" emacs-paredit))
|
||||
|
||||
(define-public git-modes
|
||||
(package
|
||||
(name "emacs-git-modes")
|
||||
|
@ -443,15 +451,15 @@ For remote processes a substitute is provided, which communicates with Emacs
|
|||
on stdout instead of using a socket as the Emacsclient does.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public magit
|
||||
(define-public emacs-magit
|
||||
(package
|
||||
(name "magit")
|
||||
(name "emacs-magit")
|
||||
(version "2.13.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/magit/magit/releases/download/"
|
||||
version "/" name "-" version ".tar.gz"))
|
||||
version "/magit-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ygaah3dd3nxpyd17297xgvdcgr7pgzzwlmpnmchki0kiwgg3sbc"))))
|
||||
|
@ -511,9 +519,12 @@ cherry picking, reverting, merging, rebasing, and other common Git
|
|||
operations.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public magit-svn
|
||||
(define-public magit
|
||||
(deprecated-package "magit" emacs-magit))
|
||||
|
||||
(define-public emacs-magit-svn
|
||||
(package
|
||||
(name "magit-svn")
|
||||
(name "emacs-magit-svn")
|
||||
(version "2.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -530,7 +541,7 @@ operations.")
|
|||
("gzip" ,gzip)))
|
||||
(propagated-inputs `(("dash" ,emacs-dash)
|
||||
("with-editor" ,emacs-with-editor)
|
||||
("magit" ,magit)))
|
||||
("magit" ,emacs-magit)))
|
||||
(arguments
|
||||
`(#:modules ((guix build utils)
|
||||
(guix build emacs-utils))
|
||||
|
@ -576,6 +587,9 @@ operations.")
|
|||
support for Git-SVN.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public magit-svn
|
||||
(deprecated-package "magit-svn" emacs-magit-svn))
|
||||
|
||||
(define-public emacs-magit-popup
|
||||
(package
|
||||
(name "emacs-magit-popup")
|
||||
|
@ -640,9 +654,9 @@ Gitlab APIs from Emacs packages. It abstracts access to API resources using
|
|||
only a handful of functions that are not resource-specific.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public haskell-mode
|
||||
(define-public emacs-haskell-mode
|
||||
(package
|
||||
(name "haskell-mode")
|
||||
(name "emacs-haskell-mode")
|
||||
(version "16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -730,7 +744,10 @@ only a handful of functions that are not resource-specific.")
|
|||
programs.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public flycheck
|
||||
(define-public haskell-mode
|
||||
(deprecated-package "haskell-mode" emacs-haskell-mode))
|
||||
|
||||
(define-public emacs-flycheck
|
||||
(package
|
||||
(name "emacs-flycheck")
|
||||
(version "31")
|
||||
|
@ -909,7 +926,7 @@ provides an optional IDE-like error list.")
|
|||
;;; Multimedia.
|
||||
;;;
|
||||
|
||||
(define-public emms
|
||||
(define-public emacs-emms
|
||||
(package
|
||||
(name "emacs-emms")
|
||||
(version "5.0")
|
||||
|
@ -1049,7 +1066,7 @@ light user interface.")
|
|||
|
||||
(define-public emacs-emms-player-mpv
|
||||
;; A new mpv backend is included in Emms from 5.0.
|
||||
(deprecated-package "emacs-emms-player-mpv" emms))
|
||||
(deprecated-package "emacs-emms-player-mpv" emacs-emms))
|
||||
|
||||
(define-public emacs-emms-mode-line-cycle
|
||||
(package
|
||||
|
@ -1066,7 +1083,7 @@ light user interface.")
|
|||
"0ifszi930pnaxk1x8pcydmvnp06868gc7nfx14q17zbajbx735k6"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emms" ,emms)))
|
||||
`(("emms" ,emacs-emms)))
|
||||
(home-page "https://github.com/momomo5717/emms-mode-line-cycle")
|
||||
(synopsis "Display the EMMS mode line as a ticker")
|
||||
(description
|
||||
|
@ -1079,9 +1096,9 @@ within a specified width. It is useful for displaying long track titles.")
|
|||
;;; Miscellaneous.
|
||||
;;;
|
||||
|
||||
(define-public bbdb
|
||||
(define-public emacs-bbdb
|
||||
(package
|
||||
(name "bbdb")
|
||||
(name "emacs-bbdb")
|
||||
(version "3.1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -1120,6 +1137,9 @@ like. It can be linked with various Emacs mail clients (Message and Mail
|
|||
mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public bbdb
|
||||
(deprecated-package "bbdb" emacs-bbdb))
|
||||
|
||||
(define-public emacs-aggressive-indent
|
||||
(package
|
||||
(name "emacs-aggressive-indent")
|
||||
|
@ -1356,7 +1376,7 @@ environment set through Direnv.")
|
|||
(define-public emacs-ggtags
|
||||
(package
|
||||
(name "emacs-ggtags")
|
||||
(version "0.8.12")
|
||||
(version "0.8.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1364,7 +1384,7 @@ environment set through Direnv.")
|
|||
version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ny3llk021g6r0s75xdm4hzpbxv393ddm2r6f2xdk8kqnq4gnirp"))))
|
||||
"1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/leoliu/ggtags")
|
||||
(synopsis "Frontend to the GNU Global source code tagging system")
|
||||
|
@ -1720,7 +1740,7 @@ type, for example: packages, buffers, files, etc.")
|
|||
`(("guile" ,guile-2.2)
|
||||
("guix" ,guix)))
|
||||
(propagated-inputs
|
||||
`(("geiser" ,geiser)
|
||||
`(("geiser" ,emacs-geiser)
|
||||
("guile-gcrypt" ,guile-gcrypt)
|
||||
("dash" ,emacs-dash)
|
||||
("bui" ,emacs-bui)
|
||||
|
@ -2142,7 +2162,7 @@ keep pressing the key until it selects what you want. There's also
|
|||
(define-public emacs-fill-column-indicator
|
||||
(package
|
||||
(name "emacs-fill-column-indicator")
|
||||
(version "1.81")
|
||||
(version "1.89")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2151,7 +2171,7 @@ keep pressing the key until it selects what you want. There's also
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xwyqbjbbicmvhlb85vg4j5snwy1vd7rfk89ws4viws5ljkhhyg8"))))
|
||||
"09ab01np14bdcsr38xf95kpnvxzqr46mdjmphg3pigwnx39a3jvg"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://www.emacswiki.org/emacs/FillColumnIndicator")
|
||||
(synopsis "Graphically indicate the fill column")
|
||||
|
@ -2376,7 +2396,7 @@ in Lisp modes.")
|
|||
"1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("ert-runner" ,ert-runner)))
|
||||
`(("ert-runner" ,emacs-ert-runner)))
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
#:test-command '("ert-runner")))
|
||||
|
@ -2492,7 +2512,7 @@ snippets for yasnippet.")
|
|||
(define-public emacs-smart-mode-line
|
||||
(package
|
||||
(name "emacs-smart-mode-line")
|
||||
(version "2.10.1")
|
||||
(version "2.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2501,7 +2521,7 @@ snippets for yasnippet.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0i9wajabrrsjzwd842q0m2611kf0q31p9hg1pdj81177gynkw8l8"))))
|
||||
"1hn8s6laijmg7w1bgwdfrki6h9vxkbgr8rmmssvd5yqyad5w2sba"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-rich-minority" ,emacs-rich-minority)))
|
||||
|
@ -2662,7 +2682,7 @@ framework for Emacs Lisp to be used with @code{ert}.")
|
|||
(native-inputs
|
||||
`(("emacs-ert-expectations" ,emacs-ert-expectations)
|
||||
("emacs-undercover" ,emacs-undercover)
|
||||
("ert-runner" ,ert-runner)))
|
||||
("ert-runner" ,emacs-ert-runner)))
|
||||
(synopsis "Simple asynchronous functions for Emacs Lisp")
|
||||
(description
|
||||
"The @code{deferred.el} library provides support for asynchronous tasks.
|
||||
|
@ -2671,7 +2691,7 @@ The API is almost the same as that of
|
|||
for asynchronous tasks.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public butler
|
||||
(define-public emacs-butler
|
||||
(package
|
||||
(name "emacs-butler")
|
||||
(version "0.2.4")
|
||||
|
@ -2822,7 +2842,7 @@ completion candidate when using the Company text completion framework.")
|
|||
simultaneous cursors.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public typo
|
||||
(define-public emacs-typo
|
||||
(package
|
||||
(name "emacs-typo")
|
||||
(version "1.1")
|
||||
|
@ -3014,7 +3034,7 @@ in @code{html-mode}.")
|
|||
(define-public emacs-slime
|
||||
(package
|
||||
(name "emacs-slime")
|
||||
(version "2.20")
|
||||
(version "2.22")
|
||||
(source
|
||||
(origin
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
|
@ -3024,7 +3044,7 @@ in @code{html-mode}.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"086lq5y4pvj9wihy0si02xxvyzpzz8mcg3hz1cvy9zxlyjwzr1gk"))))
|
||||
"07vaib1n4zyh5yy30gdpq0bc5cv6w84piml5b3mfc9ibjhaykkms"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
|
@ -3071,7 +3091,7 @@ an Emacs minor mode that complements the standard @command{lisp-mode}.
|
|||
While lisp-mode supports editing Lisp source files, @command{slime-mode}
|
||||
adds support for interacting with a running Common Lisp process
|
||||
for compilation, debugging, documentation lookup, and so on.")
|
||||
(license license:gpl2+)))
|
||||
(license (list license:gpl2+ license:public-domain))))
|
||||
|
||||
(define-public emacs-popup
|
||||
(package
|
||||
|
@ -3981,7 +4001,7 @@ state and will work even without lispy being enabled.")
|
|||
(native-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-s" ,emacs-s)
|
||||
("ert-runner" ,ert-runner)))
|
||||
("ert-runner" ,emacs-ert-runner)))
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
#:test-command '("ert-runner")))
|
||||
|
@ -4287,14 +4307,14 @@ strings, and code folding.")
|
|||
(define-public emacs-nodejs-repl
|
||||
(package
|
||||
(name "emacs-nodejs-repl")
|
||||
(version "0.1.6")
|
||||
(version "0.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/abicky/nodejs-repl.el"
|
||||
"/archive/" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sphg1jxi3a5l0gqdp27d0qgyjaiq2p293av9zm8ksm0vwqp3fr9"))
|
||||
"0hq2cqdq2668yf48g7qnkci90nhih1gnhacsgz355jnib56lhmkz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/abicky/nodejs-repl.el")
|
||||
|
@ -4353,7 +4373,7 @@ indentation and filling of comments and C preprocessor fontification.")
|
|||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-s" ,emacs-s)
|
||||
("emacs-flycheck" ,flycheck)
|
||||
("emacs-flycheck" ,emacs-flycheck)
|
||||
("emacs-typescript-mode" ,emacs-typescript-mode)))
|
||||
(home-page "https://github.com/ananthakumaran/tide")
|
||||
(synopsis "Typescript IDE for Emacs")
|
||||
|
@ -4518,7 +4538,7 @@ provide the historic behavior of @code{flet}, as well as
|
|||
`(#:tests? #t
|
||||
#:test-command '("ert-runner")))
|
||||
(native-inputs
|
||||
`(("ert-runner" ,ert-runner)))
|
||||
`(("ert-runner" ,emacs-ert-runner)))
|
||||
(propagated-inputs
|
||||
`(("emacs-el-x" ,emacs-el-x)))
|
||||
(home-page "https://github.com/sigma/mocker.el")
|
||||
|
@ -4584,7 +4604,7 @@ functions to assist in reviewing changes on files.")
|
|||
#:tests? #t
|
||||
#:test-command '("ert-runner")))
|
||||
(native-inputs
|
||||
`(("ert-runner" ,ert-runner)
|
||||
`(("ert-runner" ,emacs-ert-runner)
|
||||
("emacs-mocker" ,emacs-mocker)))
|
||||
(home-page "https://github.com/jorgenschaefer/pyvenv")
|
||||
(synopsis "Virtualenv minor mode for Emacs")
|
||||
|
@ -4669,7 +4689,7 @@ indentation (space indentation only).
|
|||
("pyvenv" ,emacs-pyvenv)
|
||||
("s" ,emacs-s)))
|
||||
(native-inputs
|
||||
`(("ert-runner" ,ert-runner)
|
||||
`(("ert-runner" ,emacs-ert-runner)
|
||||
("emacs-f" ,emacs-f)
|
||||
("python" ,python-wrapper)
|
||||
("python-autopep8" ,python-autopep8)
|
||||
|
@ -4737,14 +4757,14 @@ of its name.")
|
|||
(define-public emacs-rainbow-mode
|
||||
(package
|
||||
(name "emacs-rainbow-mode")
|
||||
(version "0.13")
|
||||
(version "1.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://elpa.gnu.org/packages/rainbow-mode-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1d3aamx6qgqqpqijwsr02ggwrh67gfink1bir0692alfkm3zdddl"))))
|
||||
"0cpga4ax635rfpj7y2vmh7ank0yw00dcy20gjg1mj74r97by8csf"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://elpa.gnu.org/packages/rainbow-mode.html")
|
||||
(synopsis "Colorize color names in buffers")
|
||||
|
@ -5180,11 +5200,11 @@ extensions.")
|
|||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-evil-collection
|
||||
(let ((commit "b55ae90f367e103e6568ae00779a8a51c68a0104")
|
||||
(revision "3"))
|
||||
(let ((commit "abc9dd60f71ccc1f24803a12d853f84b4a8b258c")
|
||||
(revision "4"))
|
||||
(package
|
||||
(name "emacs-evil-collection")
|
||||
(version (git-version "20180911" revision commit))
|
||||
(version (git-version "0.0.1" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -5193,7 +5213,7 @@ extensions.")
|
|||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n7bzi5s7rqi78l1424sxvsk2g46z7ksq02xx5jrmqymnij90jml"))))
|
||||
"0c9l93vrsl6kzx8gg305dq8qkb2dr3s10fww7lh382911pdmsh7v"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-evil" ,emacs-evil)))
|
||||
|
@ -5252,7 +5272,7 @@ distribution, primarily targeting Clojure users")
|
|||
(define-public emacs-orgalist
|
||||
(package
|
||||
(name "emacs-orgalist")
|
||||
(version "1.8")
|
||||
(version "1.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -5260,7 +5280,7 @@ distribution, primarily targeting Clojure users")
|
|||
"orgalist-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wqwnmn08i0qkxm8b2iclvf6cydcn68h1p3h7r1kig2bdn5b8948"))))
|
||||
"1rmmcyiiqkq54hn74nhzxzl4nvd902hv6gq341jwhrm7yiagffi6"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://elpa.gnu.org/packages/orgalist.html")
|
||||
(synopsis "Manage Org-like lists in non-Org buffers")
|
||||
|
@ -5318,14 +5338,14 @@ passive voice.")
|
|||
(name "emacs-org")
|
||||
;; emacs-org-contrib inherits from this package. Please update its sha256
|
||||
;; checksum as well.
|
||||
(version "9.1.13")
|
||||
(version "9.1.14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/org-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vx0n32gvrgy2bl2b4pvxf00cywxwm57gi46f2b2zlrnmd5n85pr"))))
|
||||
"17vd9hig26rqv90l6y92hc2i0x29g44lsdsp0xd4m53s8r3zdikz"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://orgmode.org/")
|
||||
(synopsis "Outline-based notes management and organizer")
|
||||
|
@ -5507,14 +5527,15 @@ extensibility.")
|
|||
(define-public m17n-db
|
||||
(package
|
||||
(name "m17n-db")
|
||||
(version "1.7.0")
|
||||
(version "1.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/m17n/m17n-db-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2"))))
|
||||
(base32
|
||||
"0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gettext" ,gettext-minimal)))
|
||||
|
@ -5541,14 +5562,15 @@ This package contains the library database.")
|
|||
(define-public m17n-lib
|
||||
(package
|
||||
(name "m17n-lib")
|
||||
(version "1.7.0")
|
||||
(version "1.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/m17n/m17n-lib-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f"))))
|
||||
(base32
|
||||
"0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("fribidi" ,fribidi)
|
||||
|
@ -5577,7 +5599,7 @@ This package contains the library runtime.")
|
|||
(define-public emacs-nginx-mode
|
||||
(package
|
||||
(name "emacs-nginx-mode")
|
||||
(version "1.1.4")
|
||||
(version "1.1.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -5587,7 +5609,7 @@ This package contains the library runtime.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lvkj07kq0jkskr2f61vqb5rlrbnaz9a76ikq40w6925i2r970rr"))))
|
||||
"0bzyrj6zz1hm67bkhw23bam7qc869s3zg7m1rb1c3aa4n0aw90cq"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/ajc/nginx-mode")
|
||||
(synopsis "Emacs major mode for editing nginx config files")
|
||||
|
@ -5792,7 +5814,7 @@ mode-line.")
|
|||
(define-public emacs-yasnippet
|
||||
(package
|
||||
(name "emacs-yasnippet")
|
||||
(version "0.12.2")
|
||||
(version "0.13.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/joaotavora/yasnippet/"
|
||||
|
@ -5800,7 +5822,7 @@ mode-line.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01jabaz0g67bsziayrxgv74px55fx4nlrcl0csl8f1by2102pwc5"))
|
||||
"12ls2x17agzbrj1xynjbmfa11igqxia4hj4fv6fpr66yci2r1plc"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -5907,8 +5929,20 @@ Yasnippet.")
|
|||
(base32
|
||||
"01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f"))))
|
||||
(build-system emacs-build-system)
|
||||
(inputs
|
||||
`(("recutils" ,recutils)))
|
||||
(propagated-inputs
|
||||
`(("emacs-helm" ,emacs-helm)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((recutils (assoc-ref inputs "recutils")))
|
||||
;; Specify the absolute file names of the various
|
||||
;; programs so that everything works out-of-the-box.
|
||||
(substitute* "helm-system-packages-guix.el"
|
||||
(("recsel") (string-append recutils "/bin/recsel")))))))))
|
||||
(home-page "https://github.com/emacs-helm/helm-system-packages")
|
||||
(synopsis "Helm System Packages is an interface to your package manager")
|
||||
(description "List all available packages in Helm (with installed
|
||||
|
@ -6554,14 +6588,14 @@ which code derived from Kelvin H's org-page.")
|
|||
(define-public emacs-xelb
|
||||
(package
|
||||
(name "emacs-xelb")
|
||||
(version "0.15")
|
||||
(version "0.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/xelb-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"031rvgprsqhf344p9wsczr50vj2qcpwdmhxi80jdbrsm7wyxf3qz"))))
|
||||
"03wsr1jr7f7zfd80h864rd4makwh4widdnj1kjv2xyjwdgap9rl8"))))
|
||||
(build-system emacs-build-system)
|
||||
;; The following functions and variables needed by emacs-xelb are
|
||||
;; not included in emacs-minimal:
|
||||
|
@ -6593,7 +6627,7 @@ It should enable you to implement low-level X11 applications.")
|
|||
(define-public emacs-exwm
|
||||
(package
|
||||
(name "emacs-exwm")
|
||||
(version "0.19")
|
||||
(version "0.20")
|
||||
(synopsis "Emacs X window manager")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -6601,8 +6635,7 @@ It should enable you to implement low-level X11 applications.")
|
|||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"11xd2w4h3zdwkdxypvmcz8s7q72cn76lfr9js77jbizyj6b04lr0"))
|
||||
(patches (search-patches "emacs-exwm-fix-fullscreen-issue.patch"))))
|
||||
"0nhhzbkm0mkj7sd1dy2c19cmn56gyaj9nl8kgy86h4fp63hjaz04"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-xelb" ,emacs-xelb)))
|
||||
|
@ -6931,9 +6964,9 @@ Emacs.")
|
|||
|
||||
;; Tests for ert-runner have a circular dependency with ecukes, and therefore
|
||||
;; cannot be run
|
||||
(define-public ert-runner
|
||||
(define-public emacs-ert-runner
|
||||
(package
|
||||
(name "ert-runner")
|
||||
(name "emacs-ert-runner")
|
||||
(version "0.7.0")
|
||||
(source
|
||||
(origin
|
||||
|
@ -6961,8 +6994,8 @@ Emacs.")
|
|||
(substitute* "bin/ert-runner"
|
||||
(("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
|
||||
(string-append "ERT_RUNNER=\"" out
|
||||
"/share/emacs/site-lisp/guix.d/"
|
||||
,name "-" ,version)))
|
||||
"/share/emacs/site-lisp/guix.d/ert-runner-"
|
||||
,version)))
|
||||
(install-file "bin/ert-runner" (string-append out "/bin"))
|
||||
(wrap-program (string-append out "/bin/ert-runner")
|
||||
(list "EMACSLOADPATH" ":" 'prefix
|
||||
|
@ -6976,6 +7009,9 @@ using ERT. It assumes a certain test structure setup and can therefore make
|
|||
running tests easier.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public ert-runner
|
||||
(deprecated-package "ert-runner" emacs-ert-runner))
|
||||
|
||||
(define-public emacs-disable-mouse
|
||||
(package
|
||||
(name "emacs-disable-mouse")
|
||||
|
@ -7019,7 +7055,7 @@ running a customisable handler command (@code{ignore} by default). ")
|
|||
(native-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-shut-up" ,emacs-shut-up)
|
||||
("ert-runner" ,ert-runner)))
|
||||
("ert-runner" ,emacs-ert-runner)))
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
#:test-command '("ert-runner")))
|
||||
|
@ -7207,7 +7243,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.")
|
|||
(define-public emacs-which-key
|
||||
(package
|
||||
(name "emacs-which-key")
|
||||
(version "3.0.2")
|
||||
(version "3.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -7216,7 +7252,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xvd70cwq9n31f28viyjxmr3nn8l153gsy6scpszvgvjxkiikv24"))
|
||||
"1lsj314111cp2hjjwnv3f46ws1za6bm39rgy3l19044xf6a68j5w"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
|
@ -7250,7 +7286,7 @@ settings).")
|
|||
"1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("ert-runner" ,ert-runner)))
|
||||
`(("ert-runner" ,emacs-ert-runner)))
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
#:test-command '("ert-runner" "tests")))
|
||||
|
@ -7385,7 +7421,7 @@ created by @code{git format-patch}, from @code{magit}, @code{dired} and
|
|||
(define-public emacs-erc-hl-nicks
|
||||
(package
|
||||
(name "emacs-erc-hl-nicks")
|
||||
(version "1.3.2")
|
||||
(version "1.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -7394,7 +7430,7 @@ created by @code{git format-patch}, from @code{magit}, @code{dired} and
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01svpl9bps5kx4y1wnymakxya2cznqmlynvqv2r500wpnbxczrbs"))))
|
||||
"1a1r2kc3688g8c2ybkpwh88kgmnqhg3h3032g2yn4zr9m0n3vpkr"))))
|
||||
(build-system emacs-build-system)
|
||||
(synopsis "Nickname highlighting for Emacs ERC")
|
||||
(description "@code{erc-hl-nicks} highlights nicknames in ERC, an IRC
|
||||
|
@ -7506,7 +7542,7 @@ Idris.")
|
|||
`(("emacs-f" ,emacs-f)
|
||||
("emacs-s" ,emacs-s)))
|
||||
(native-inputs
|
||||
`(("ert-runner" ,ert-runner)))
|
||||
`(("ert-runner" ,emacs-ert-runner)))
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
#:test-command '("ert-runner")))
|
||||
|
@ -7976,14 +8012,14 @@ supports multiple backends such as @code{vlc}, @code{mpg123},
|
|||
@code{afplay}.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public groovy-emacs-modes
|
||||
(define-public emacs-groovy-modes
|
||||
(package
|
||||
(name "groovy-emacs-modes")
|
||||
(name "emacs-groovy-modes")
|
||||
(version "2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/Groovy-Emacs-Modes/" name
|
||||
"https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes"
|
||||
"/archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
|
@ -8000,7 +8036,10 @@ Groovy source files, REPL integration with run-groovy and Grails project
|
|||
navigation with the grails mode.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public org-tree-slide
|
||||
(define-public groovy-emacs-modes
|
||||
(deprecated-package "groovy-emacs-modes" emacs-groovy-modes))
|
||||
|
||||
(define-public emacs-org-tree-slide
|
||||
(let ((commit "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134")
|
||||
(revision "0"))
|
||||
(package
|
||||
|
@ -8394,7 +8433,7 @@ close, copy, cut, paste, undo, redo.")
|
|||
(define-public emacs-password-store
|
||||
(package
|
||||
(name "emacs-password-store")
|
||||
(version "1.7.2")
|
||||
(version "1.7.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -8402,7 +8441,7 @@ close, copy, cut, paste, undo, redo.")
|
|||
"password-store-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27"))))
|
||||
"1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -9697,7 +9736,7 @@ documentation.")
|
|||
(define-public emacs-hy-mode
|
||||
(package
|
||||
(name "emacs-hy-mode")
|
||||
(version "1.0.2")
|
||||
(version "1.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -9706,7 +9745,7 @@ documentation.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sbga36zkyhzrzcczsyjzll7b9qsa215pnlw51m4li2irm23jh17"))))
|
||||
"0b4pvbr2hf77bq2vsyfsv653q0dab7qzq85wc7kdziw7687jdf2z"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
|
@ -10094,7 +10133,7 @@ time is being spent during Emacs startup in order to optimize startup time.")
|
|||
|
||||
(define-public emacs-emms-player-simple-mpv
|
||||
;; A new mpv backend is included in Emms from 5.0.
|
||||
(deprecated-package "emacs-emms-player-simple-mpv" emms))
|
||||
(deprecated-package "emacs-emms-player-simple-mpv" emacs-emms))
|
||||
|
||||
(define-public emacs-magit-org-todos-el
|
||||
(let ((commit "df206287737b9671f2e36ae7b1474ebbe9940d2a"))
|
||||
|
@ -10112,7 +10151,7 @@ time is being spent during Emacs startup in order to optimize startup time.")
|
|||
(base32
|
||||
"0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn"))))
|
||||
(propagated-inputs
|
||||
`(("magit" ,magit)))
|
||||
`(("magit" ,emacs-magit)))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/danielma/magit-org-todos.el")
|
||||
(synopsis "Get todo.org into Emacs Magit status")
|
||||
|
@ -10383,8 +10422,8 @@ perform regression test for packages that provide font-lock rules.")
|
|||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-racket-mode
|
||||
(let ((commit "92c33487f6c707880ac3f6169e7ea65ddffd1463")
|
||||
(revision "1"))
|
||||
(let ((commit "b977873e6128f8399432dcd60cc39f6a6f803d9c")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "emacs-racket-mode")
|
||||
(version (string-append "0.0.2" "-" revision "."
|
||||
|
@ -10398,7 +10437,7 @@ perform regression test for packages that provide font-lock rules.")
|
|||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"19q6ym10gj2xdzzcgh3wdbq1xv8cv7nlrhv2b0bjvvdjzhiki472"))))
|
||||
"0vp4bbbplqvmnhjpl6ajrlydmrhqzil56cfbs18m5c5fddx0zlh7"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:include '("\\.el$" "\\.rkt$")))
|
||||
|
@ -10951,7 +10990,7 @@ through the symbol: @command{this-fn}.")
|
|||
`(("emacs-el-mock" ,emacs-el-mock)
|
||||
("emacs-noflet" ,emacs-noflet)
|
||||
("emacs-undercover" ,emacs-undercover)
|
||||
("ert-runner" ,ert-runner)))
|
||||
("ert-runner" ,emacs-ert-runner)))
|
||||
(propagated-inputs
|
||||
`(("emacs-f" ,emacs-f)
|
||||
("emacs-popup" ,emacs-popup)))
|
||||
|
@ -11138,7 +11177,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
|
|||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-evil" ,emacs-evil)
|
||||
("magit" ,magit)))
|
||||
("magit" ,emacs-magit)))
|
||||
(home-page
|
||||
"https://github.com/emacs-evil/evil-magit")
|
||||
(synopsis "Evil-based key bindings for Magit")
|
||||
|
@ -11317,27 +11356,25 @@ the GIF result.")
|
|||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-google-translate
|
||||
(let ((commit "d8b84a8359fcc697114d1298840e9a45b111c974"))
|
||||
(package
|
||||
(name "emacs-google-translate")
|
||||
(version (git-version "0.11.14" "1" commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/atykhonov/google-translate")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qs4hcg1i2m487z50nnwgs0sa2xj4lpgizbrvi2yda0mf3m75fgc"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/atykhonov/google-translate")
|
||||
(synopsis "Emacs interface to Google Translate")
|
||||
(description
|
||||
"This packages provides an Emacs interface to the Google Translate
|
||||
(package
|
||||
(name "emacs-google-translate")
|
||||
(version "0.11.15")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/atykhonov/google-translate/"
|
||||
"archive/v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zxvfagbaf5mxi528mz33c8vxdk86wj0xx5y2jfy97wi8dzrwn3g"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/atykhonov/google-translate")
|
||||
(synopsis "Emacs interface to Google Translate")
|
||||
(description
|
||||
"This packages provides an Emacs interface to the Google Translate
|
||||
on-line service.")
|
||||
(license license:gpl3+))))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-helm-company
|
||||
(let ((commit "acc9c7901e094c1591327a0db1ec7a439f67a84d"))
|
||||
|
@ -11411,7 +11448,7 @@ you searched for and execute it, or view its documentation.")
|
|||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-helm" ,emacs-helm)
|
||||
("emacs-emms" ,emms)))
|
||||
("emacs-emms" ,emacs-emms)))
|
||||
(home-page
|
||||
"https://github.com/emacs-helm/helm-emms")
|
||||
(synopsis "Emms for Helm")
|
||||
|
@ -11466,7 +11503,7 @@ See @code{helm-exwm-switch-browser} for an example.")
|
|||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-flycheck" ,flycheck)
|
||||
("emacs-flycheck" ,emacs-flycheck)
|
||||
("emacs-helm" ,emacs-helm)))
|
||||
(home-page "https://github.com/yasuyk/helm-flycheck")
|
||||
(synopsis "Show Flycheck errors with Helm")
|
||||
|
@ -11705,8 +11742,8 @@ file.")
|
|||
(synopsis
|
||||
"Show a complete thread in a single buffer")
|
||||
(description
|
||||
"This package offers an alternate view to mu4e e-mail display. It
|
||||
shows all e-mails of a thread in a single view, where each correspondant has
|
||||
"This package offers an alternate view to mu4e's e-mail display. It
|
||||
shows all e-mails of a thread in a single view, where each correspondent has
|
||||
their own face. Threads can be displayed linearly (in which case e-mails are
|
||||
displayed in chronological order) or as an Org document where the node tree
|
||||
maps the thread tree.")
|
||||
|
@ -12028,7 +12065,7 @@ buffers – other modes on the TODO list).
|
|||
("emacs-dash" ,emacs-dash)
|
||||
("emacs-f" ,emacs-f)
|
||||
("emacs-hl-todo" ,emacs-hl-todo)
|
||||
("magit" ,magit)
|
||||
("magit" ,emacs-magit)
|
||||
("emacs-pcre2el" ,emacs-pcre2el)
|
||||
("emacs-s" ,emacs-s)))
|
||||
(home-page "https://github.com/alphapapa/magit-todos")
|
||||
|
@ -12197,3 +12234,155 @@ wrapper around all Imagemagick commands with descriptions, autocompletion (for
|
|||
some commands) and hints displayed in prompt using @command{eimp.el} to
|
||||
execute its commands and resize images.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-synosaurus
|
||||
(let ((commit "8bf95b935976ec0a1964cf175ed57cc5f6f93bdb"))
|
||||
(package
|
||||
(name "emacs-synosaurus")
|
||||
(version (git-version "0.1.0" "1" commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hpdeifel/synosaurus")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"15by9jccab6kyplxa6k0glzaivxkqdigl33gl2qi2cvy6f2q7gva"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("wordnet" ,wordnet)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((wn (assoc-ref inputs "wordnet")))
|
||||
;; .el is read-only in git.
|
||||
(chmod "synosaurus-wordnet.el" #o644)
|
||||
;; Specify the absolute file names of the various
|
||||
;; programs so that everything works out-of-the-box.
|
||||
(emacs-substitute-variables
|
||||
"synosaurus-wordnet.el"
|
||||
("wordnet-command"
|
||||
(string-append wn "/bin/wn")))))))))
|
||||
(home-page "https://github.com/hpdeifel/synosaurus")
|
||||
(synopsis "Extensible thesaurus mode for Emacs")
|
||||
(description "Synosaurus is a thesaurus fontend for Emacs with pluggable
|
||||
backends, including the @command{wordnet} offline backend.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-all-the-icons
|
||||
(package
|
||||
(name "emacs-all-the-icons")
|
||||
(version "3.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/domtronn/all-the-icons.el.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:include '("\\.el$" "^data/" "^fonts/")
|
||||
;; Compiling "test/" fails with "Symbol’s value as variable is void:
|
||||
;; all-the-icons--root-code". Ignoring tests.
|
||||
#:exclude '("^test/")
|
||||
#:tests? #f))
|
||||
(propagated-inputs
|
||||
`(("f" ,emacs-f)
|
||||
("memoize" ,emacs-memoize)))
|
||||
(home-page "https://github.com/domtronn/all-the-icons.el")
|
||||
(synopsis "Collect icon fonts and propertize them within Emacs")
|
||||
(description "All-the-icons is a utility package to collect various icon
|
||||
fonts and propertize them within Emacs. Icon fonts allow you to propertize
|
||||
and format icons the same way you would normal text. This enables things such
|
||||
as better scaling of and anti aliasing of the icons.")
|
||||
;; Package is released under Expat license. Elisp files are licensed
|
||||
;; under GPL3+. Fonts come with various licenses: Expat for
|
||||
;; "all-the-icons.ttf" and "file-icons.ttf", Apache License 2.0 for
|
||||
;; "material-design-icons.ttf", and SIL OFL 1.1 for "fontawesome.ttf",
|
||||
;; "ocitcons.ttf" and "weathericons.ttf".
|
||||
(license
|
||||
(list license:expat license:gpl3+ license:silofl1.1 license:asl2.0))))
|
||||
|
||||
(define-public emacs-powerline
|
||||
(package
|
||||
(name "emacs-powerline")
|
||||
(version "2.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/milkypostman/powerline.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hp3xp18943n0rlggz55150020ivw8gvi1vyxkr4z8xhpwq4gaar"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/milkypostman/powerline/")
|
||||
(synopsis "Mode-line plugin for Emacs")
|
||||
(description "Powerline is a utility plugin which allows you to create
|
||||
a better-looking, more functional Emacs mode-line. A collection of predefined
|
||||
themes comes with the package.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-spaceline
|
||||
(package
|
||||
(name "emacs-spaceline")
|
||||
(version "2.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/TheBB/spaceline.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1q8r95zfrh0vxna5ml2pq9b9f66clfqcl4d2qy2aizkvzyxg6skl"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("dash" ,emacs-dash)
|
||||
("powerline" ,emacs-powerline)
|
||||
("s" ,emacs-s)))
|
||||
(home-page "https://github.com/TheBB/spaceline")
|
||||
(synopsis "Powerline theme from Spacemacs")
|
||||
(description "Spaceline provides Spacemacs' mode-line theme.
|
||||
This package provides features for three kinds of users.
|
||||
|
||||
@itemize
|
||||
@item You just want to use the Spacemacs mode-line theme and forget about it.
|
||||
@item You want to use something similar to the Spacemacs mode-line theme, but
|
||||
with a handful of easy tweaks.
|
||||
@item You want an easy-to-use library for building your own mode-line from
|
||||
scratch, and you think the Spacemacs theme looks good.
|
||||
@end itemize")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-column-marker
|
||||
(package
|
||||
(name "emacs-column-marker")
|
||||
(version "9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.emacswiki.org/emacs/download/column-marker.el")
|
||||
(sha256 (base32 "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://www.emacswiki.org/emacs/ColumnMarker")
|
||||
(synopsis "Emacs mode for highlighting columns")
|
||||
(description
|
||||
"With @code{column-marker.el} you can highlight any number of text columns.
|
||||
Three such highlight column markers are provided by default. This is
|
||||
especially useful for languages like COBOL or Fortran where certain columns
|
||||
have special meaning. It is also handy for aligning text across long vertical
|
||||
distances. Multi-column characters, such as @kbd{TAB} are treated
|
||||
correctly.")
|
||||
(license license:gpl2+)))
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -27,6 +28,7 @@
|
|||
#:use-module (guix svn-download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix build utils)
|
||||
|
@ -1104,3 +1106,40 @@ and displaying decoded target responses.
|
|||
@end enumerate")
|
||||
(home-page "https://www.freecalypso.org/")
|
||||
(license license:public-domain)))
|
||||
|
||||
(define-public stlink
|
||||
(package
|
||||
(name "stlink")
|
||||
(version "1.5.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/texane/stlink/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01z1cz1a5xbbhd163qrqcgp4bi1k145pb80jmwdz50g7sfzmy570"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no tests
|
||||
#:configure-flags
|
||||
(let* ((out (assoc-ref %outputs "out"))
|
||||
(etc (in-vicinity out "etc"))
|
||||
(modprobe (in-vicinity etc "modprobe.d"))
|
||||
(udev-rules (in-vicinity etc "udev/rules.d")))
|
||||
(list (string-append "-DSTLINK_UDEV_RULES_DIR=" udev-rules)
|
||||
(string-append "-DSTLINK_MODPROBED_DIR=" modprobe)))))
|
||||
(inputs
|
||||
`(("libusb" ,libusb)))
|
||||
(synopsis "Programmer for STM32 Discovery boards")
|
||||
(description "This package provides a firmware programmer for the STM32
|
||||
Discovery boards. It supports two versions of the chip: ST-LINK/V1 (on
|
||||
STM32VL discovery kits) and ST-LINK/V2 (on STM32L discovery and later kits).
|
||||
Two different transport layers are used: ST-LINK/V1 uses SCSI passthru
|
||||
commands over USB, and ST-LINK/V2 and ST-LINK/V2-1 (seen on Nucleo boards) use
|
||||
raw USB commands.")
|
||||
(home-page "https://github.com/texane/stlink")
|
||||
;; The flashloaders/stm32l0x.s and flashloaders/stm32lx.s source files are
|
||||
;; licensed under the GPLv2+.
|
||||
(license (list license:bsd-3 license:gpl2+))))
|
||||
|
|
|
@ -1055,15 +1055,16 @@ emulation community. It provides highly accurate emulation.")
|
|||
(define-public retroarch
|
||||
(package
|
||||
(name "retroarch")
|
||||
(version "1.7.4")
|
||||
(version "1.7.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/libretro/RetroArch/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/libretro/RetroArch.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w"))))
|
||||
(base32 "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
@ -1184,7 +1185,7 @@ play them on systems for which they were never designed!")
|
|||
(define-public mame
|
||||
(package
|
||||
(name "mame")
|
||||
(version "0.201")
|
||||
(version "0.202")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1194,7 +1195,7 @@ play them on systems for which they were never designed!")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"00whiig4ld3d4fkl34q48vlf28ygvvp5g7fp0rb5n31ymhl4kajk"))
|
||||
"1v9gm124p65nbj678gfkcvwphp9qc15ky2p12ca6g3rllma94di5"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -19,34 +20,41 @@
|
|||
(define-module (gnu packages enchant)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages aspell)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix licenses))
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public enchant
|
||||
(package
|
||||
(name "enchant")
|
||||
(version "1.6.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "http://www.abisource.com/downloads/" name "/" version
|
||||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"))))
|
||||
|
||||
(version "2.2.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/AbiWord/enchant/releases"
|
||||
"/download/v" version "/enchant-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-static"
|
||||
;; Tests require a relocatable build.
|
||||
"--enable-relocatable")))
|
||||
(inputs
|
||||
`(("aspell" ,aspell) ;; Currently, the only supported backend in Guix
|
||||
("glib" ,glib))) ;; is aspell. (This information might be old)
|
||||
`(("aspell" ,aspell))) ;; Currently, the only supported backend in Guix
|
||||
(propagated-inputs ;; is aspell. (This information might be old)
|
||||
;; Required by enchant.pc.
|
||||
`(("glib" ,glib)))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin")
|
||||
("pkg-config" ,pkg-config)))
|
||||
|
||||
("pkg-config" ,pkg-config)
|
||||
("unittest-cpp" ,unittest-cpp)))
|
||||
(synopsis "Multi-backend spell-checking library wrapper")
|
||||
(description
|
||||
"On the surface, Enchant appears to be a generic spell checking library.
|
||||
|
@ -57,5 +65,23 @@ Enchant steps in to provide uniformity and conformity on top of these libraries,
|
|||
and implement certain features that may be lacking in any individual provider
|
||||
library. Everything should \"just work\" for any and every definition of \"just
|
||||
working\".")
|
||||
(home-page "http://www.abisource.com/projects/enchant")
|
||||
(home-page "https://abiword.github.io/enchant/")
|
||||
(license lgpl2.1+)))
|
||||
|
||||
;; Some packages are not ready for the 2.x API yet, so we keep this version
|
||||
;; around. The library and executables of Enchant 2 have been designed not to
|
||||
;; conflict with 1.x, so it's OK if both end up in the same profile.
|
||||
(define-public enchant-1.6
|
||||
(package
|
||||
(inherit enchant)
|
||||
(version "1.6.0")
|
||||
(arguments '(#:configure-flags '("--disable-static")))
|
||||
(native-inputs (alist-delete "unittest-cpp"
|
||||
(package-native-inputs enchant)))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.abisource.com/downloads/enchant/"
|
||||
version "/enchant-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"))))))
|
||||
|
|
|
@ -823,6 +823,30 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
|
|||
render model libraries.")
|
||||
(license license:lgpl2.0+))))
|
||||
|
||||
(define-public kicad-symbols
|
||||
(package
|
||||
(name "kicad-symbols")
|
||||
(version "5.0.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/KiCad/kicad-symbols.git")
|
||||
(commit version)))
|
||||
(file-name (string-append "kicad-symbols-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"18z5vpdq7hy2mpvm5vz1dz3ra3a5iybavvlzi8q2bmmdb6gsvf64"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; No tests exist
|
||||
(home-page "http://kicad-pcb.org/")
|
||||
(synopsis "Official KiCad schematic symbol libraries for KiCad 5")
|
||||
(description "This package contains the official KiCad schematic symbol
|
||||
libraries for KiCad 5.")
|
||||
;; TODO: Exception: "To the extent that the creation of electronic designs that use 'Licensed Material' can be considered to be 'Adapted Material', then the copyright holder waives article 3 of the license with respect to these designs and any generated files which use data provided as part of the 'Licensed Material'."
|
||||
;; See <https://github.com/KiCad/kicad-symbols/blob/master/LICENSE.md>.
|
||||
(license license:cc-by-sa4.0)))
|
||||
|
||||
(define-public linsmith
|
||||
(package
|
||||
(name "linsmith")
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -268,13 +269,23 @@ Libraries with some extra bells and whistles.")
|
|||
(add-before 'configure 'set-system-actions
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((xkeyboard (assoc-ref inputs "xkeyboard-config"))
|
||||
(utils (assoc-ref inputs "util-linux")))
|
||||
(setxkbmap (assoc-ref inputs "setxkbmap"))
|
||||
(utils (assoc-ref inputs "util-linux"))
|
||||
(libc (assoc-ref inputs "libc")))
|
||||
;; We need to patch the path to 'base.lst' to be able
|
||||
;; to switch the keyboard layout in E.
|
||||
(substitute* "src/modules/xkbswitch/e_mod_parse.c"
|
||||
(substitute* (list "src/modules/xkbswitch/e_mod_parse.c"
|
||||
"src/modules/wizard/page_011.c")
|
||||
(("/usr/share/X11/xkb/rules/xorg.lst")
|
||||
(string-append xkeyboard
|
||||
"/share/X11/xkb/rules/base.lst")))
|
||||
(substitute* "src/bin/e_xkb.c"
|
||||
(("\"setxkbmap \"")
|
||||
(string-append "\"" setxkbmap "/bin/setxkbmap \"")))
|
||||
(substitute* (list "src/bin/e_intl.c"
|
||||
"src/modules/conf_intl/e_int_config_intl.c"
|
||||
"src/modules/wizard/page_010.c")
|
||||
(("locale -a") (string-append libc "/bin/locale -a")))
|
||||
(substitute* "src/modules/everything/evry_plug_apps.c"
|
||||
(("/usr/bin/") ""))
|
||||
(substitute* "configure"
|
||||
|
@ -298,6 +309,7 @@ Libraries with some extra bells and whistles.")
|
|||
("libxcb" ,libxcb)
|
||||
("libxext" ,libxext)
|
||||
("linux-pam" ,linux-pam)
|
||||
("setxkbmap" ,setxkbmap)
|
||||
("xcb-util-keysyms" ,xcb-util-keysyms)
|
||||
("xkeyboard-config" ,xkeyboard-config)))
|
||||
(home-page "https://www.enlightenment.org/about-enlightenment")
|
||||
|
@ -452,19 +464,22 @@ and in creating applications based on the Enlightenment Foundation Library suite
|
|||
(home-page "http://smhouston.us/ephoto/")
|
||||
(synopsis "EFL image viewer/editor/manipulator/slideshow creator")
|
||||
(description "Ephoto is an image viewer and editor written using the
|
||||
@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and ease
|
||||
of use, while taking advantage of the speed and small footprint the EFL provide.
|
||||
@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and
|
||||
ease of use, while taking advantage of the speed and small footprint the EFL
|
||||
provide.
|
||||
|
||||
Ephoto’s features include:
|
||||
@enumerate
|
||||
@item Browsing the filesystem and displaying images in an easy to use grid view.
|
||||
@item Browsing the file system and displaying images in an easy-to-use grid view.
|
||||
@item Browsing images in a single image view format.
|
||||
@item Viewing images in a slideshow.
|
||||
@item Editing your image with features such as cropping, auto enhance,
|
||||
blurring, sharpening, brightness/contrast/gamma adjustments, hue/saturation/value
|
||||
adjustments, and color level adjustment.
|
||||
@item Applying artistic filters to your image such as black and white and old photo.
|
||||
@item Drag And Drop along with file operations to easy maintain your photo directories.
|
||||
@item Applying artistic filters to your image such as black and white and old
|
||||
photo.
|
||||
@item Drag And Drop along with file operations to easily maintain your photo
|
||||
directories.
|
||||
@end enumerate\n")
|
||||
(license (list
|
||||
license:bsd-2 ; Ephoto's thumbnailing code
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Dave Love <fx@gnu.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -41,33 +42,38 @@
|
|||
(define-public opensm
|
||||
(package
|
||||
(name "opensm")
|
||||
(version "3.3.20")
|
||||
(version "3.3.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://www.openfabrics.org/downloads/management/opensm-"
|
||||
version ".tar.gz"))
|
||||
(sha256 (base32 "162sg1w7kgy8ayl8a4dcbrfacmnfy2lr9a2yjyq0k65rmd378zg1"))))
|
||||
(string-append "https://github.com/linux-rdma/opensm/releases/download/"
|
||||
version "/opensm-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0j4vp118w1l47vs4had46ynybklyacxjlya0r15jg0y01l4j9l2h"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("flex" ,flex)
|
||||
("bison" ,bison)))
|
||||
`(("bison" ,bison)
|
||||
("flex" ,flex)
|
||||
|
||||
;; The 3.3.21 'release' tarball isn't properly bootstrapped.
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
(inputs
|
||||
`(("rdma-core" ,rdma-core)))
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-static")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'doc
|
||||
(add-after 'install 'install-doc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((base (assoc-ref outputs "out"))
|
||||
(doc (string-append base "/share/doc/"
|
||||
,name "-" ,version)))
|
||||
(for-each (lambda (file)
|
||||
(install-file file doc))
|
||||
(append (list "AUTHORS" "COPYING" "ChangeLog")
|
||||
(find-files "doc")))
|
||||
(find-files "doc"))
|
||||
#t))))))
|
||||
(home-page "https://www.openfabrics.org/")
|
||||
(synopsis "OpenIB InfiniBand Subnet Manager and management utilities")
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("dbus" ,dbus)
|
||||
("enchant" ,enchant)
|
||||
("enchant" ,enchant-1.6)
|
||||
("gettext" ,gettext-minimal)
|
||||
("gtk2" ,gtk+-2)
|
||||
("gtk3" ,gtk+)
|
||||
|
|
|
@ -107,7 +107,7 @@ single file can be mounted.")
|
|||
(define-public disorderfs
|
||||
(package
|
||||
(name "disorderfs")
|
||||
(version "0.5.3")
|
||||
(version "0.5.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -117,7 +117,7 @@ single file can be mounted.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1nmhfvxpvz3xsfxl9wqnh6r2l5m7hjq6n0vpblsl5xdcvwaqcf50"))))
|
||||
"1mw4ix9h17ikki8p2rxdvzp87rcm1c7by5lvfn5gxlxr7hlj9f8g"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -1210,7 +1210,7 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
|
|||
(define-public font-culmus
|
||||
(package
|
||||
(name "font-culmus")
|
||||
(version "0.132")
|
||||
(version "0.133")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1219,7 +1219,7 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z"))))
|
||||
"02akysgsqhi15cck54xcacm16q5raf4l7shgb8fnj7xr3c1pbfyp"))))
|
||||
(build-system font-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -1302,3 +1302,53 @@ Kannada, Malayalam, Manipuri, Oriya, Punjabi, Tamil and Telugu scripts.")
|
|||
"Inria Sans and Inria Serif are the two members of a type family designed
|
||||
for Inria, a public research institute in computer science and mathematics.")
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-sil-gentium
|
||||
(package
|
||||
(name "font-sil-gentium")
|
||||
(version "5.000")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://software.sil.org/downloads/r/gentium/GentiumPlus-"
|
||||
version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0m7189870hha217n1vgpmf89mwggrxkh679ffi1lxpnjggqi2n9k"))))
|
||||
;; Note: The zip file provides TTF files only, but the developer release,
|
||||
;; which contains additional files, has a 'SOURCES.txt' file that says
|
||||
;; that "the primary source files for the fonts are the fonts themselves".
|
||||
;; Thus it looks like the TTF can be considered source.
|
||||
(build-system font-build-system)
|
||||
(synopsis "Serif font for the Cyrillic, Greek, and Latin alphabets")
|
||||
(description
|
||||
"Gentium is a typeface family designed to enable the diverse ethnic
|
||||
groups around the world who use the Latin, Cyrillic and Greek scripts to
|
||||
produce readable, high-quality publications. The font comes with regular and
|
||||
italics shapes. This package provides only TrueType files (TTF).")
|
||||
(home-page "https://software.sil.org/gentium/")
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-sil-charis
|
||||
(package
|
||||
(name "font-sil-charis")
|
||||
(version "5.000")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://software.sil.org/downloads/r/charis/CharisSIL-"
|
||||
version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zcvw37f1a7gkml3yfm6hxh93844llm7xj4w52600qq3ndrm8gjy"))))
|
||||
;; As for Gentium (see above), the TTF files are considered source.
|
||||
(build-system font-build-system)
|
||||
(synopsis "Serif font for the Cyrillic and Latin alphabets")
|
||||
(description
|
||||
"Charis SIL is a Unicode-based font family that supports the wide range
|
||||
of languages that use the Latin and Cyrillic scripts. It is specially
|
||||
designed to make long texts pleasant and easy to read, even in less than ideal
|
||||
reproduction and display environments. This package provides only TrueType
|
||||
files (TTF).")
|
||||
(home-page "https://software.sil.org/charis/")
|
||||
(license license:silofl1.1)))
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -194,6 +195,58 @@ TTF (TrueType/OpenType Font) files.")
|
|||
(license license:bsd-2)
|
||||
(home-page "https://github.com/wget/ttf2eot")))
|
||||
|
||||
(define-public ttf2pt1
|
||||
(package
|
||||
(name "ttf2pt1")
|
||||
(version "3.4.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/ttf2pt1/ttf2pt1/"
|
||||
version "/ttf2pt1-" version ".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove trailing backslashes in the sed expression of the
|
||||
;; 'install' rule since sed would otherwise fail.
|
||||
(substitute* "Makefile"
|
||||
(("\\|;\\\\[[:space:]]*$") "|; "))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ;no tests
|
||||
#:phases (modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* "Makefile"
|
||||
(("INSTDIR =.*")
|
||||
(string-append "INSTDIR = " out "\n"))
|
||||
(("OWNER = .*")
|
||||
"OWNER = `id -un`\n")
|
||||
(("GROUP = .*")
|
||||
"GROUP = `id -g`\n"))
|
||||
#t)))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "make" "-j"
|
||||
(number->string (parallel-job-count))
|
||||
"all" "CC=gcc"))))))
|
||||
(inputs `(("perl" ,perl)))
|
||||
(synopsis "Convert TrueType fonts to Postscript Type 1")
|
||||
(description
|
||||
"TTF2PT1 provides tools to convert most TrueType fonts (or other formats
|
||||
supported by the FreeType library) to an Adobe Type 1 @file{.pfa} or
|
||||
@file{.pfb} file. Another use is as a hinting engine: feed it an unhinted or
|
||||
poorly hinted Adobe Type 1 font through the FreeType library and get it back
|
||||
with freshly generated hints. The files produced by default are in
|
||||
human-readable form, which further needs to be encoded with t1utilities to
|
||||
work with most software requiring Type 1 fonts.")
|
||||
(home-page "http://ttf2pt1.sourceforge.net/")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public woff2
|
||||
(let ((commit "4e698b8c6c5e070d53c340db9ddf160e21070ede")
|
||||
(revision "1"))
|
||||
|
|
|
@ -148,14 +148,14 @@ freedesktop.org project.")
|
|||
(define-public libinput
|
||||
(package
|
||||
(name "libinput")
|
||||
(version "1.12.0")
|
||||
(version "1.12.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://freedesktop.org/software/libinput/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m"))))
|
||||
"14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Ddocumentation=false")))
|
||||
|
@ -349,7 +349,7 @@ of a the system to know what users are logged in, and where.")
|
|||
(define-public packagekit
|
||||
(package
|
||||
(name "packagekit")
|
||||
(version "1.1.10")
|
||||
(version "1.1.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -358,7 +358,7 @@ of a the system to know what users are logged in, and where.")
|
|||
"PackageKit-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1msfmb22cm4s3l6vsbr86b8s0v897sy6gcga3qg87z7640a0di2b"))))
|
||||
"0fi6wn54y03zh5sn92nmmxkh4cd8yn44cyk0l8phw60ivfwmkh1q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
|
|
@ -170,15 +170,15 @@ as required.")
|
|||
(define-public libfilezilla
|
||||
(package
|
||||
(name "libfilezilla")
|
||||
(version "0.13.1")
|
||||
(version "0.14.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.filezilla-project.org/"
|
||||
(uri (string-append "https://download.filezilla-project.org/"
|
||||
name "/" name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0347zkapp0wrhfm1yzw7wa1v3lww65ch176scifxn8f9068f1ixb"))))
|
||||
"15cfz98asypf9rfybv4c6kx8nk3wak7qlm1azldc0gd1nqm4xqvz"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("cppunit" ,cppunit)
|
||||
|
@ -207,16 +207,14 @@ output.
|
|||
(define-public filezilla
|
||||
(package
|
||||
(name "filezilla")
|
||||
(version "3.31.0")
|
||||
(version "3.37.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://sourceforge.net/projects/" name
|
||||
"/files/FileZilla_Client/" version
|
||||
"/FileZilla_" version "_src" ".tar.bz2"))
|
||||
(uri (string-append "https://download.filezilla-project.org/client/"
|
||||
"FileZilla_" version "_src.tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l"))))
|
||||
(base32 "169wy7ilsh518mcinkjmr6m0kzxbzchmc9mivf5c9b4zp1w4gg3i"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; Don't let filezilla phone home to check for updates.
|
||||
|
|
|
@ -397,7 +397,7 @@ support.")
|
|||
(define-public tiled
|
||||
(package
|
||||
(name "tiled")
|
||||
(version "1.1.6")
|
||||
(version "1.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/bjorn/tiled/archive/v"
|
||||
|
@ -405,7 +405,7 @@ support.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"194ciw8688mikndvxivzb8ql5vm405pkwnn4srzm7ymwfc4xygb0"))))
|
||||
"13dlf5kzvhhjkhy19118x3diakmraz4m9kxrsdam8dms6xivb6lp"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
|
@ -1080,7 +1080,7 @@ games.")
|
|||
(define-public godot
|
||||
(package
|
||||
(name "godot")
|
||||
(version "3.0.4")
|
||||
(version "3.0.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -1089,7 +1089,7 @@ games.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0i4ssfb6igga9zwvsmahrnasx9cyqrsd6mlmssjgc482fy9q2kz4"))
|
||||
"0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -1256,17 +1256,24 @@ a 2D editor view.")
|
|||
(define-public guile-chickadee
|
||||
(package
|
||||
(name "guile-chickadee")
|
||||
(version "0.2.0")
|
||||
(version "0.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://files.dthompson.us/chickadee/"
|
||||
"chickadee-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10qx0ha5gsayybd186r1my7vc7rf5fbzp9jvmc4xg9a8wz8rqhah"))))
|
||||
"0jl223dybsj5gvs7z4q60gnafj1b7kgi5mx0kj58m5knrp8qwg5h"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags '("GUILE_AUTO_COMPILE=0")))
|
||||
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-godir
|
||||
(lambda _
|
||||
;; Install compiled '.go' files into the site directory.
|
||||
(substitute* "Makefile.in"
|
||||
(("/ccache") "/site-ccache")))))))
|
||||
(propagated-inputs
|
||||
`(("guile-opengl" ,guile-opengl)
|
||||
("guile-sdl2" ,guile-sdl2)))
|
||||
|
|
|
@ -181,9 +181,73 @@ more advanced player there are new game modes and a wide variety of physics
|
|||
settings to tweak as well.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public bastet
|
||||
(package
|
||||
(name "bastet")
|
||||
(version "0.43.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/fph/bastet.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn"))
|
||||
(patches
|
||||
(search-patches "bastet-change-source-of-unordered_set.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list (string-append "CXXFLAGS=-I"
|
||||
(assoc-ref %build-inputs "boost") "/include"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
(replace 'check
|
||||
;; The 'Test' target builds the tests, but doesn't actually run them.
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(apply invoke "make" "Test" make-flags)
|
||||
(setenv "HOME" ".")
|
||||
(invoke "./Test")))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(share (string-append out "/share"))
|
||||
(hicolor (string-append share "/icons/hicolor")))
|
||||
(install-file "bastet"
|
||||
(string-append out "/bin"))
|
||||
|
||||
(install-file "bastet.desktop"
|
||||
(string-append share "/applications"))
|
||||
(install-file "bastet.svg"
|
||||
(string-append hicolor "/scalable/apps"))
|
||||
|
||||
(install-file "bastet.appdata.xml"
|
||||
(string-append share "/appdata"))
|
||||
|
||||
(install-file "bastet.6"
|
||||
(string-append out "/share/man/man6"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("hicolor-icon-theme" ,hicolor-icon-theme)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("ncurses" ,ncurses)))
|
||||
(home-page "http://fph.altervista.org/prog/bastet.html")
|
||||
(synopsis "Antagonistic Tetris-style falling brick game for text terminals")
|
||||
(description
|
||||
"Bastet (short for Bastard Tetris) is a simple ncurses-based falling brick
|
||||
game. Unlike normal Tetris, Bastet does not choose the next brick at random.
|
||||
Instead, it uses a special algorithm to choose the worst brick possible.
|
||||
|
||||
Playing bastet can be a painful experience, especially if you usually make
|
||||
canyons and wait for the long I-shaped block to clear four rows at a time.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public cataclysm-dda
|
||||
(let ((commit "ad3b0c3d521292d119f97a83390e7acfe9e9e7f7")
|
||||
(revision "1"))
|
||||
(let ((commit "0b2c194e5c6a06f4fbf14a0ec1260e0f3cf2567c")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "cataclysm-dda")
|
||||
;; This denotes the version released after the 0.C release.
|
||||
|
@ -196,7 +260,7 @@ settings to tweak as well.")
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1kdgbl8zqd53f5yilm2c9nyq3w6585yxl5jvgxy65dlpzxcqqj7y"))
|
||||
"1yzsn0y2g27bvbxjvivjyjhkmf2w5na1qqw5qfkswcfqqwym2y33"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
@ -364,6 +428,59 @@ played. Freedoom complements the Doom engine with free levels, artwork, sound
|
|||
effects and music to make a completely free game.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public freedroidrpg
|
||||
(package
|
||||
(name "freedroidrpg")
|
||||
(version "0.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://ftp.osuosl.org/pub/freedroid/"
|
||||
"freedroidRPG-" (version-major+minor version) "/"
|
||||
"freedroidRPG-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list
|
||||
(string-append "CFLAGS="
|
||||
"-I" (assoc-ref %build-inputs "sdl-gfx") "/include/SDL "
|
||||
"-I" (assoc-ref %build-inputs "sdl-image") "/include/SDL "
|
||||
"-I" (assoc-ref %build-inputs "sdl-mixer") "/include/SDL")
|
||||
"--enable-opengl")
|
||||
;; FIXME: the test suite fails with the following error output:
|
||||
;; 4586 Segmentation fault env SDL_VIDEODRIVER=dummy \
|
||||
;; SDL_AUDIODRIVER=dummy ./src/freedroidRPG -nb text
|
||||
#:tests? #f))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glu" ,glu)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libogg" ,libogg)
|
||||
("libpng" ,libpng)
|
||||
("libvorbis" ,libvorbis)
|
||||
("mesa" ,mesa)
|
||||
("python" ,python-wrapper)
|
||||
("sdl" ,sdl)
|
||||
("sdl-gfx" ,sdl-gfx)
|
||||
("sdl-image" ,sdl-image)
|
||||
("sdl-mixer" ,sdl-mixer)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "http://www.freedroid.org/")
|
||||
(synopsis "Isometric role-playing game against killer robots")
|
||||
(description
|
||||
"Freedroid RPG is an @dfn{RPG} (Role-Playing Game) with isometric graphics.
|
||||
The game tells the story of a world destroyed by a conflict between robots and
|
||||
their human masters. To restore peace to humankind, the player must complete
|
||||
numerous quests while fighting off rebelling robots---either by taking control
|
||||
of them, or by simply blasting them to pieces with melee and ranged weapons in
|
||||
real-time combat.")
|
||||
(license (list license:expat ; lua/
|
||||
license:gpl3 ; src/gen_savestruct.py
|
||||
license:gpl2+)))) ; the rest
|
||||
|
||||
(define-public golly
|
||||
(package
|
||||
(name "golly")
|
||||
|
@ -883,7 +1000,7 @@ Every puzzle has a complete solution, although there may be more than one.")
|
|||
(define-public retux
|
||||
(package
|
||||
(name "retux")
|
||||
(version "1.3.5")
|
||||
(version "1.3.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/retux/"
|
||||
|
@ -891,7 +1008,7 @@ Every puzzle has a complete solution, although there may be more than one.")
|
|||
version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pcrh3z16fl412r3k7xccrgika19ahb1xh90jihgl8yy7zza2i6p"))))
|
||||
"01bidh4zisjp3nc436x0g85v60dvwb3ig37i7y01sa71j8fm4fmb"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
@ -2020,7 +2137,7 @@ falling, themeable graphics and sounds, and replays.")
|
|||
(define-public wesnoth
|
||||
(package
|
||||
(name "wesnoth")
|
||||
(version "1.14.4")
|
||||
(version "1.14.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/wesnoth/wesnoth-"
|
||||
|
@ -2029,7 +2146,7 @@ falling, themeable graphics and sounds, and replays.")
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hw1ap8xxpdwyx1sf8fm1g75p6724y3hwb4kpvyqbsq7bwfwsb9i"))))
|
||||
"1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no check target
|
||||
|
@ -2122,28 +2239,36 @@ on the screen and keyboard to display letters.")
|
|||
(define-public raincat
|
||||
(package
|
||||
(name "raincat")
|
||||
(version "1.1.1.3")
|
||||
(version "1.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://hackage.haskell.org/package/Raincat/Raincat-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(uri (string-append "http://hackage.haskell.org/package/Raincat/"
|
||||
"Raincat-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1aalh68h6799mv4vyg30zpskl5jkn6x2j1jza7p4lrflyifxzar8"))))
|
||||
"10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-executable
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(wrap-program (string-append out "/bin/raincat")
|
||||
`("LD_LIBRARY_PATH" ":" =
|
||||
(,(string-append (assoc-ref inputs "freeglut")
|
||||
"/lib"))))
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-random" ,ghc-random)
|
||||
("ghc-glut" ,ghc-glut)
|
||||
("freeglut" ,freeglut)
|
||||
("ghc-opengl" ,ghc-opengl)
|
||||
("ghc-sdl" ,ghc-sdl)
|
||||
("ghc-sdl-image" ,ghc-sdl-image)
|
||||
("ghc-sdl-mixer" ,ghc-sdl-mixer)))
|
||||
("ghc-sdl2" ,ghc-sdl2)
|
||||
("ghc-sdl2-image" ,ghc-sdl2-image)
|
||||
("ghc-sdl2-mixer" ,ghc-sdl2-mixer)))
|
||||
(home-page "http://www.bysusanlin.com/raincat/")
|
||||
(synopsis "Puzzle game with a cat in lead role")
|
||||
(description "Project Raincat is a game developed by Carnegie Mellon
|
||||
|
@ -3533,7 +3658,7 @@ throwing people around in pseudo-randomly generated buildings.")
|
|||
(define-public hyperrogue
|
||||
(package
|
||||
(name "hyperrogue")
|
||||
(version "10.4j")
|
||||
(version "10.4t")
|
||||
;; When updating this package, be sure to update the "hyperrogue-data"
|
||||
;; origin in native-inputs.
|
||||
(source (origin
|
||||
|
@ -3544,11 +3669,12 @@ throwing people around in pseudo-randomly generated buildings.")
|
|||
"-src.tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0909p4xvbi1c2jc5rdgrf8b1c60fmsaapabsi6yyglh5znkf0k27"))))
|
||||
"0phqhmnzmc16a23qb4fkil0flzb86kibdckf1r35nc3l0k4193nn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
#:make-flags '("CXXFLAGS=-std=c++11")
|
||||
#:make-flags '("HYPERROGUE_USE_GLEW=1"
|
||||
"HYPERROGUE_USE_PNG=1")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'set-paths 'set-sdl-paths
|
||||
|
@ -3571,12 +3697,16 @@ throwing people around in pseudo-randomly generated buildings.")
|
|||
(string-append dejavu-dir "/" dejavu-font)))
|
||||
(substitute* music-file
|
||||
(("\\*/")
|
||||
(string-append share-dir "/sounds/"))))
|
||||
;; Fix Makefile.
|
||||
(substitute* "Makefile"
|
||||
(("g\\+\\+ langen.cpp")
|
||||
"g++ langen.cpp ${CXXFLAGS}")
|
||||
(("savepng.c") "savepng.cpp"))
|
||||
(string-append share-dir "/sounds/")))
|
||||
(substitute* "sound.cpp"
|
||||
(("musicfile = \"\"")
|
||||
(string-append "musicfile = \""
|
||||
share-dir "/" music-file "\"")))
|
||||
;; Disable build machine CPU optimizations and warnings treated
|
||||
;; as errors.
|
||||
(substitute* "Makefile"
|
||||
(("-march=native") "")
|
||||
(("-Werror") "")))
|
||||
#t))
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
|
@ -3584,7 +3714,7 @@ throwing people around in pseudo-randomly generated buildings.")
|
|||
(bin (string-append out "/bin"))
|
||||
(share-dir (string-append out "/share/hyperrogue")))
|
||||
(mkdir-p bin)
|
||||
(copy-file "hyper" (string-append bin "/hyperrogue"))
|
||||
(install-file "hyperrogue" bin)
|
||||
(install-file "hyperrogue-music.txt" share-dir))
|
||||
#t))
|
||||
(add-after 'install 'install-data
|
||||
|
@ -3616,7 +3746,7 @@ throwing people around in pseudo-randomly generated buildings.")
|
|||
"-win.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w61iv2rn93hi0q3hxyyyf9xcr8vi9zd7fjvpz5adpgf94jm3zsc"))))
|
||||
"1xd9v8zzgi8m5ar8g4gy1xx5zqwidz3gn1knz0lwib3kbxx4drpg"))))
|
||||
("unzip" ,unzip)))
|
||||
(inputs
|
||||
`(("font-dejavu" ,font-dejavu)
|
||||
|
@ -4272,7 +4402,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
|
|||
(define-public crawl
|
||||
(package
|
||||
(name "crawl")
|
||||
(version "0.21.0")
|
||||
(version "0.22.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -4286,7 +4416,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
|
|||
version "-nodeps.tar.xz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0mmnkch8s9l7dh136yjvcyjr0vmyzv7z370rlcyir91qz6gg82n1"))
|
||||
"1qc90wwbxvjzqq66n8kfr0a2ny7sfvv2n84si67jiv2887d0ws6k"))
|
||||
(patches (search-patches "crawl-upgrade-saves.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
@ -5225,7 +5355,7 @@ You can save humanity and get programming skills!")
|
|||
(build-system cmake-build-system)
|
||||
(inputs `(("bzip2" ,bzip2)
|
||||
("fluid-3" ,fluid-3)
|
||||
("fluidsynth" ,fluidsynth)
|
||||
("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when updating
|
||||
("gtk+3" ,gtk+)
|
||||
("libgme" ,libgme)
|
||||
("libjpeg" ,libjpeg)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -32,7 +32,23 @@
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci"))))
|
||||
"1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Adjust the bundled gnulib to work with glibc 2.28. See e.g.
|
||||
;; "m4-gnulib-libio.patch". This is a phase rather than patch
|
||||
;; or snippet to work around <https://bugs.gnu.org/32347>.
|
||||
(substitute* (find-files "lib" "\\.c$")
|
||||
(("#if defined _IO_ftrylockfile")
|
||||
"#if defined _IO_EOF_SEEN"))
|
||||
(substitute* "lib/stdio-impl.h"
|
||||
(("^/\\* BSD stdio derived implementations")
|
||||
(string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n"
|
||||
"# define _IO_IN_BACKUP 0x100\n"
|
||||
"#endif\n\n"
|
||||
"/* BSD stdio derived implementations")))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.gnu.org/software/gcal/")
|
||||
(synopsis "Calculating and printing a wide variety of calendars")
|
||||
|
|
|
@ -24,8 +24,10 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages geo)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system scons)
|
||||
#:use-module (guix build-system r)
|
||||
|
@ -37,6 +39,8 @@
|
|||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages datastructures)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages cran)
|
||||
#:use-module (gnu packages glib)
|
||||
|
@ -44,6 +48,7 @@
|
|||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
|
@ -57,7 +62,7 @@
|
|||
(define-public geos
|
||||
(package
|
||||
(name "geos")
|
||||
(version "3.6.2")
|
||||
(version "3.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.osgeo.org/geos/geos-"
|
||||
|
@ -65,7 +70,7 @@
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"))))
|
||||
"1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -760,3 +765,224 @@ location queries to be run in SQL.")
|
|||
license:bsd-3 ; files only say "BSD"
|
||||
;; doc
|
||||
license:cc-by-sa3.0))))
|
||||
|
||||
(define-public tegola
|
||||
(package
|
||||
(name "tegola")
|
||||
(version "0.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/go-spatial/tegola/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09vnzxfn0r70kmd776kcdfqxhzdj11syxa0b27z4ci1k367v7viw"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "github.com/go-spatial/tegola/cmd/tegola"
|
||||
#:unpack-path "github.com/go-spatial"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'set-version
|
||||
(lambda _
|
||||
(with-directory-excursion
|
||||
(string-append "src/github.com/go-spatial/tegola-" ,version)
|
||||
(substitute* '("cmd/tegola/cmd/root.go"
|
||||
"cmd/tegola_lambda/main.go")
|
||||
(("version not set") ,version)))
|
||||
#t))
|
||||
(add-before 'build 'rename-import
|
||||
(lambda _
|
||||
(rename-file (string-append "src/github.com/go-spatial/tegola-" ,version)
|
||||
"src/github.com/go-spatial/tegola")
|
||||
#t)))))
|
||||
(home-page "http://tegola.io")
|
||||
(synopsis "Vector tile server for maps")
|
||||
(description "Tegola is a free vector tile server written in Go. Tegola
|
||||
takes geospatial data and slices it into vector tiles that can be efficiently
|
||||
delivered to any client.")
|
||||
(license (list
|
||||
license:expat
|
||||
;; Some packages in vendor have other licenses
|
||||
license:asl2.0
|
||||
license:bsd-2
|
||||
license:bsd-3
|
||||
license:wtfpl2))))
|
||||
|
||||
(define-public imposm3
|
||||
(package
|
||||
(name "imposm3")
|
||||
(version "0.6.0-alpha.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/omniscale/imposm3/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06f0kwmv52yd5m9jlckqxqmkf0cnqy3hamakrvg9lspplyqrds80"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "github.com/omniscale/imposm3/cmd/imposm"
|
||||
#:unpack-path "github.com/omniscale"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'rename-import
|
||||
(lambda _
|
||||
(rename-file (string-append "src/github.com/omniscale/imposm3-" ,version)
|
||||
"src/github.com/omniscale/imposm3")
|
||||
#t))
|
||||
(add-before 'build 'set-version
|
||||
(lambda _
|
||||
(substitute* "src/github.com/omniscale/imposm3/version.go"
|
||||
(("0.0.0-dev") ,version))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("geos" ,geos)
|
||||
("leveldb" ,leveldb)))
|
||||
(home-page "https://imposm.org/")
|
||||
(synopsis "OpenStreetMap importer for PostGIS")
|
||||
(description "Imposm is an importer for OpenStreetMap data. It reads PBF
|
||||
files and imports the data into PostgreSQL/PostGIS databases. It is designed
|
||||
to create databases that are optimized for rendering/tile/map-services.")
|
||||
(license (list
|
||||
license:asl2.0
|
||||
;; Some dependencies in vendor have different licenses
|
||||
license:expat
|
||||
license:bsd-2
|
||||
license:bsd-3))))
|
||||
|
||||
(define-public protozero
|
||||
(package
|
||||
(name "protozero")
|
||||
(version "1.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mapbox/protozero/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xaj4phz1r7xn0vgdfvfkz8b0bizgb6mavjky1zqcvdmbwgwgly5"))))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "https://github.com/mapbox/protozero")
|
||||
(synopsis "Minimalistic protocol buffer decoder and encoder in C++")
|
||||
(description "Protozero is a minimalistic protocol buffer decored and
|
||||
encoder in C++. The developer using protozero has to manually translate the
|
||||
@file{.proto} description into code.")
|
||||
(license (list
|
||||
license:asl2.0; for folly
|
||||
license:bsd-2))))
|
||||
|
||||
(define-public libosmium
|
||||
(package
|
||||
(name "libosmium")
|
||||
(version "2.14.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/osmcode/libosmium/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0d9b46qiw7zkw1h9lygjdwqxnbhm3c7v8kydzw9f9f778cyagc94"))))
|
||||
(build-system cmake-build-system)
|
||||
(propagated-inputs
|
||||
`(("boost" ,boost)
|
||||
("expat" ,expat)
|
||||
("gdal" ,gdal)
|
||||
("geos" ,geos)
|
||||
("proj.4" ,proj.4)
|
||||
("protozero" ,protozero)
|
||||
("sparsehash" ,sparsehash)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)))
|
||||
(home-page "https://osmcode.org/libosmium/")
|
||||
(synopsis "C++ library for working with OpenStreetMap data")
|
||||
(description "Libosmium is a fast and flexible C++ library for working with
|
||||
OpenStreetMap data.")
|
||||
(license license:boost1.0)))
|
||||
|
||||
(define-public osm2pgsql
|
||||
(package
|
||||
(name "osm2pgsql")
|
||||
(version "0.96.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/openstreetmap/osm2pgsql/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08y7776r4l9v9177a4q6cfdri0lpirky96m6g699hwl7v1vhw0mn"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "contrib/protozero")
|
||||
(delete-file-recursively "contrib/libosmium")
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f; tests fail because we need to setup a database
|
||||
#:configure-flags
|
||||
(list (string-append "-DOSMIUM_INCLUDE_DIR="
|
||||
(assoc-ref %build-inputs "libosmium")
|
||||
"/include")
|
||||
(string-append "-DPROTOZERO_INCLUDE_DIR="
|
||||
(assoc-ref %build-inputs "protozero")
|
||||
"/include"))))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("expat" ,expat)
|
||||
("libosmium" ,libosmium)
|
||||
("lua" ,lua)
|
||||
("postgresql" ,postgresql)
|
||||
("proj.4" ,proj.4)
|
||||
("protozero" ,protozero)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("python-2" ,python-2)
|
||||
("python2-psycopg2" ,python2-psycopg2)))
|
||||
(home-page "https://github.com/openstreetmap/osm2pgsql")
|
||||
(synopsis "OSM data importer to postgresql")
|
||||
(description "Osm2pgsql is a tool for loading OpenStreetMap data into a
|
||||
PostgreSQL / PostGIS database suitable for applications like rendering into a
|
||||
map, geocoding with Nominatim, or general analysis.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public tippecanoe
|
||||
(package
|
||||
(name "tippecanoe")
|
||||
(version "1.31.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mapbox/tippecanoe/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1057na1dkgjaryr7jr15lqkxpam111d3l5zdpdkqzzzpxmdjxqcf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases (delete 'configure))
|
||||
#:test-target "test"
|
||||
#:make-flags
|
||||
(list "CC=gcc"
|
||||
(string-append "PREFIX=" (assoc-ref %outputs "out")))))
|
||||
(inputs
|
||||
`(("perl" ,perl)
|
||||
("sqlite" ,sqlite)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://github.com/mapbox/tippecanoe")
|
||||
(synopsis "Vector tile server for maps")
|
||||
(description "Tippecanoe creates scale-independent view of data, so that
|
||||
the texture and density of features is visible at every zoom level, instead of
|
||||
dropping features at lower levels.")
|
||||
(license license:bsd-2)))
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -305,3 +306,67 @@ brushstrokes which is used by MyPaint and GIMP.")
|
|||
MyPaint.")
|
||||
(home-page "https://github.com/Jehan/mypaint-brushes")
|
||||
(license license:cc0)))
|
||||
|
||||
(define-public gimp-resynthesizer
|
||||
;; GIMP does not respect any plugin search path environment variable, so after
|
||||
;; installation users have to edit their GIMP settings to include
|
||||
;; "$HOME/.guix-profile/lib/gimp/2.0/plug-ins/" in
|
||||
;; “Edit->Preferences->Folders->Plug Ins”.
|
||||
(package
|
||||
(name "gimp-resynthesizer")
|
||||
(version "2.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/bootchk/resynthesizer/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`( ;; Turn off tests to avoid:
|
||||
;; make[1]: *** No rule to make target '../src/resynth-gui.c', needed by 'resynthesizer.pot'. Stop.
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-env
|
||||
(lambda _
|
||||
(setenv "CONFIG_SHELL" (which "sh"))
|
||||
#t))
|
||||
(add-after 'configure 'set-prefix
|
||||
;; Install plugin under $prefix, not under GIMP's libdir.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((target (string-append (assoc-ref outputs "out")
|
||||
"/lib/gimp/"
|
||||
,(version-major
|
||||
(package-version gimp))
|
||||
".0")))
|
||||
(substitute* (list "src/resynthesizer/Makefile"
|
||||
"src/resynthesizer-gui/Makefile")
|
||||
(("GIMP_LIBDIR = .*")
|
||||
(string-append "GIMP_LIBDIR = " target "\n")))
|
||||
(mkdir-p target)
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf-wrapper)
|
||||
("automake" ,automake)
|
||||
("glib" ,glib "bin") ; glib-gettextize
|
||||
("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("gimp" ,gimp)
|
||||
("gdk-pixbuf" ,gdk-pixbuf) ; needed by gimp-2.0.pc
|
||||
("cairo" ,cairo)
|
||||
("gegl" ,gegl)
|
||||
("gtk+" ,gtk+-2) ; needed by gimpui-2.0.pc
|
||||
("glib" ,glib)))
|
||||
(home-page "https://github.com/bootchk/resynthesizer")
|
||||
(synopsis "GIMP plugins for texture synthesis")
|
||||
(description
|
||||
"This package provides resynthesizer plugins for GIMP, which encompasses
|
||||
tools for healing selections (content-aware fill), enlarging the canvas and
|
||||
healing the border, increasing the resolution while adding detail, and
|
||||
transfering the style of an image.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -725,7 +725,7 @@ mixed vector/bitmap output.")
|
|||
(define-public virtualgl
|
||||
(package
|
||||
(name "virtualgl")
|
||||
(version "2.5.2")
|
||||
(version "2.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -734,16 +734,17 @@ mixed vector/bitmap output.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476"))))
|
||||
"1ck1d0w19cgyqvrb9mdlj6l5db90xf18yln71kdninlqxvpgj6h7"))))
|
||||
(arguments
|
||||
`(#:tests? #f ;; no tests are available
|
||||
`(#:tests? #f ; no tests are available
|
||||
#:configure-flags (list
|
||||
(string-append "-DCMAKE_INSTALL_LIBDIR="
|
||||
(assoc-ref %outputs "out") "/lib")
|
||||
"-DVGL_USESSL=1"))) ;; use OpenSSL
|
||||
(string-append "-DCMAKE_INSTALL_LIBDIR="
|
||||
(assoc-ref %outputs "out") "/lib")
|
||||
"-DVGL_USESSL=1"))) ; use OpenSSL
|
||||
(build-system cmake-build-system)
|
||||
(inputs `(("glu" ,glu)
|
||||
("libjpeg-turbo" ,libjpeg-turbo)
|
||||
("libxtst" ,libxtst)
|
||||
("mesa" ,mesa)
|
||||
("openssl" ,openssl)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -787,7 +787,7 @@ programming langauage. It also contains the utility
|
|||
(define-public appstream-glib
|
||||
(package
|
||||
(name "appstream-glib")
|
||||
(version "0.7.12")
|
||||
(version "0.7.14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://people.freedesktop.org/~hughsient/"
|
||||
|
@ -795,7 +795,7 @@ programming langauage. It also contains the utility
|
|||
"appstream-glib-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jcb2bggcic3iczr2hn8zp8a3c2hl1xjij0aawr7kwqmzh9b3jms"))))
|
||||
"0n0s99jmx2sx5895lcvmfjwa9r0f06i71495dpn9v9frz4asvk3d"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
|
|
@ -115,6 +115,8 @@
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages rdesktop)
|
||||
#:use-module (gnu packages scanner)
|
||||
#:use-module (gnu packages selinux)
|
||||
|
@ -396,28 +398,30 @@ access the common Google services, and has full asynchronous support.")
|
|||
(define-public libgxps
|
||||
(package
|
||||
(name "libgxps")
|
||||
(version "0.2.5")
|
||||
(version "0.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(patches (search-patches "libgxps-CVE-2017-11590.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"184r06s8g20cfigg7m169n42jjsc9wmzzlycr4g1fxxhr72r8x9y"))))
|
||||
(build-system gnu-build-system)
|
||||
"1bhgrpb6ndlp11qwr95g9piklmjcsca7bi04f8gy9ziipm1i6as1"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
("glib" ,glib)
|
||||
("libarchive" ,libarchive)
|
||||
("libjpeg" ,libjpeg)
|
||||
`(("gtk+" ,gtk+)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("lcms" ,lcms)
|
||||
("libtiff" ,libtiff)
|
||||
("nettle" ,nettle)))
|
||||
(propagated-inputs
|
||||
;; In Requires of libgxps.pc.
|
||||
`(("cairo" ,cairo)
|
||||
("glib" ,glib)
|
||||
("libarchive" ,libarchive)))
|
||||
(home-page "https://wiki.gnome.org/Projects/libgxps")
|
||||
(synopsis "GObject-based library for handling and rendering XPS documents")
|
||||
(description
|
||||
|
@ -4094,35 +4098,27 @@ work and the interface is well tested.")
|
|||
(define-public eolie
|
||||
(package
|
||||
(name "eolie")
|
||||
(version "0.9.15")
|
||||
(version "0.9.38")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/gnumdk/eolie/"
|
||||
"releases/download/" version
|
||||
"/eolie-" version ".tar.xz"))
|
||||
(uri (string-append "https://gitlab.gnome.org/World/eolie/"
|
||||
"uploads/9814c06a1bc83ea09c3da8719a9ed11b/"
|
||||
"eolie-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0glydxp1xh85gfidk1l9miqn6qxdbvvk5s3iy0pjlv8nrs3263jd"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
"10vrh91rapgfmqwc6jkcybpmlvn4q0y8bnklw3rddzigf9kvqsff"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
`(#:glib-or-gtk? #t
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(zero? (system* "meson" "build"
|
||||
"--prefix" (assoc-ref outputs "out")))))
|
||||
(replace 'check
|
||||
(lambda _ (zero? (system* "ninja" "-C" "build" "test"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(zero? (system* "ninja" "-C" "build" "install"))))
|
||||
(add-after 'wrap 'wrap-more
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
;; These libraries must be on LD_LIBRARY_PATH.
|
||||
(libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret"
|
||||
"atk" "gtk+" "gsettings-desktop-schemas"
|
||||
"gcc:lib" ; needed b/c webkitgtk is built with gcc-7
|
||||
"gobject-introspection"))
|
||||
(path (string-join
|
||||
(map (lambda (lib)
|
||||
|
@ -4135,12 +4131,12 @@ work and the interface is well tested.")
|
|||
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
`(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7
|
||||
("intltool" ,intltool)
|
||||
("itstool" ,itstool)
|
||||
("pkg-config" ,pkg-config)
|
||||
("meson" ,meson-for-build)
|
||||
("ninja" ,ninja)
|
||||
("python" ,python)
|
||||
("glib:bin" ,glib "bin")
|
||||
("gtk+" ,gtk+ "bin")))
|
||||
(inputs
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
|
@ -4150,12 +4146,14 @@ work and the interface is well tested.")
|
|||
("atk" ,atk) ; propagated by gtk+, but we need it in LD_LIBRARY_PATH
|
||||
("python" ,python-wrapper)
|
||||
("python-dateutil" ,python-dateutil)
|
||||
("python-pyfxa" ,python-pyfxa)
|
||||
("python-pygobject" ,python-pygobject)
|
||||
("python-pycairo" ,python-pycairo)
|
||||
("python-pycrypto" ,python-pycrypto)
|
||||
("libsecret" ,libsecret)
|
||||
("gtkspell3" ,gtkspell3)
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
("webkitgtk" ,webkitgtk)))
|
||||
("webkitgtk" ,webkitgtk-2.22)))
|
||||
(home-page "https://wiki.gnome.org/Apps/Eolie")
|
||||
(synopsis "Web browser for GNOME")
|
||||
(description
|
||||
|
@ -4193,6 +4191,7 @@ a secret password store, an adblocker, and a modern UI.")
|
|||
`(("dconf" ,dconf)))
|
||||
(native-inputs
|
||||
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
|
||||
("gcc" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7
|
||||
("glib:bin" ,glib "bin") ; for glib-mkenums
|
||||
("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
|
||||
("intltool" ,intltool)
|
||||
|
@ -4213,7 +4212,7 @@ a secret password store, an adblocker, and a modern UI.")
|
|||
("libxslt" ,libxslt)
|
||||
("nettle" ,nettle) ; for hogweed
|
||||
("sqlite" ,sqlite)
|
||||
("webkitgtk" ,webkitgtk)))
|
||||
("webkitgtk" ,webkitgtk-2.22)))
|
||||
(home-page "https://wiki.gnome.org/Apps/Web")
|
||||
(synopsis "GNOME web browser")
|
||||
(description
|
||||
|
@ -6936,7 +6935,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).")
|
|||
(define-public gspell
|
||||
(package
|
||||
(name "gspell")
|
||||
(version "1.4.2")
|
||||
(version "1.8.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -6944,7 +6943,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1683vyyfq3q0ph665jj6id8hnlyid4qxzmqiwpv97gmz8zksg6x5"))
|
||||
"1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1"))
|
||||
(patches (search-patches "gspell-dash-test.patch"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
|
@ -6978,7 +6977,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).")
|
|||
("aspell-dict-en" ,aspell-dict-en)
|
||||
("xorg-server" ,xorg-server)))
|
||||
(propagated-inputs
|
||||
`(("enchant" ,enchant))) ; enchant.pc is required by gspell-1.pc
|
||||
`(("enchant" ,enchant))) ;enchant.pc is required by gspell-1.pc
|
||||
(home-page "https://wiki.gnome.org/Projects/gspell")
|
||||
(synopsis "GNOME's alternative spell checker")
|
||||
(description
|
||||
|
@ -7229,8 +7228,73 @@ It supports ripping to any audio codec supported by a GStreamer plugin, such as
|
|||
mp3, Ogg Vorbis and FLAC")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public soundconverter
|
||||
(package
|
||||
(name "soundconverter")
|
||||
(version "3.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://launchpad.net/soundconverter/trunk/"
|
||||
version "/+download/"
|
||||
"soundconverter-" version ".tar.xz"))
|
||||
|
||||
(sha256
|
||||
(base32
|
||||
"1wrxf5py54xplrf97qp24pzbis0cvax5c6k0c7vr3z3ry8r7gd7c"))
|
||||
(patches
|
||||
(search-patches
|
||||
"soundconverter-remove-gconf-dependency.patch"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:imported-modules ((guix build python-build-system)
|
||||
(guix build glib-or-gtk-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
|
||||
#:modules ((guix build glib-or-gtk-build-system)
|
||||
(guix build utils)
|
||||
((guix build gnu-build-system) #:prefix gnu:)
|
||||
((guix build python-build-system) #:prefix python:))
|
||||
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-POTFILES.in
|
||||
(lambda _
|
||||
(substitute* "po/POTFILES.in"
|
||||
;; This file doesn't exist, so without removing it, the 'check
|
||||
;; phase fails for the po directory
|
||||
(("soundconverter/gconfstore\\.py") ""))))
|
||||
(add-after 'install 'wrap-soundconverter-for-python
|
||||
(assoc-ref python:%standard-phases 'wrap))
|
||||
(add-after 'install 'wrap-soundconverter
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
|
||||
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
|
||||
(wrap-program (string-append out "/bin/soundconverter")
|
||||
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
|
||||
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)
|
||||
("glib:bin" ,glib "bin")))
|
||||
(inputs
|
||||
`(("gtk+" ,gtk+)
|
||||
("python" ,python)
|
||||
("python-pygobject" ,python-pygobject)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)))
|
||||
(home-page "http://soundconverter.org/")
|
||||
(synopsis "Convert between audio formats with a graphical interface")
|
||||
(description
|
||||
"SoundConverter supports converting between many audio formats including
|
||||
Opus, Ogg Vorbis, FLAC and more. It supports parallel conversion, and
|
||||
configurable file renaming. ")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public workrave
|
||||
(let ((commit "v1_10_20"))
|
||||
(let ((commit "v1_10_21"))
|
||||
(package
|
||||
(name "workrave")
|
||||
(version (string-map (match-lambda
|
||||
|
@ -7242,18 +7306,11 @@ mp3, Ogg Vorbis and FLAC")
|
|||
(uri (git-reference
|
||||
(url "https://github.com/rcaelers/workrave.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941"))))
|
||||
"150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autogen
|
||||
(lambda _
|
||||
(invoke "sh" "autogen.sh")
|
||||
#t)))))
|
||||
(propagated-inputs `(("glib" ,glib)
|
||||
("gtk+" ,gtk+)
|
||||
("gdk-pixbuf" ,gdk-pixbuf)
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#:use-module (guix build-system cmake)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages cmake)
|
||||
|
@ -50,7 +51,7 @@
|
|||
(define-public gnucash
|
||||
(package
|
||||
(name "gnucash")
|
||||
(version "3.0")
|
||||
(version "3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -58,11 +59,9 @@
|
|||
version "/gnucash-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ffvf1rryg5yin86fnf1zvy6hnpwzrjarbdfmjmrf2mqlmv48xac"))
|
||||
|
||||
;; TODO: rebase this patch
|
||||
; (patches (search-patches "gnucash-price-quotes-perl.patch"))
|
||||
))
|
||||
"0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3"))
|
||||
(patches (search-patches "gnucash-price-quotes-perl.patch"
|
||||
"gnucash-disable-failing-tests.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("guile" ,guile-2.2)
|
||||
|
@ -76,7 +75,8 @@
|
|||
("webkitgtk" ,webkitgtk)
|
||||
("aqbanking" ,aqbanking)
|
||||
("perl-date-manip" ,perl-date-manip)
|
||||
("perl-finance-quote" ,perl-finance-quote)))
|
||||
("perl-finance-quote" ,perl-finance-quote)
|
||||
("tzdata" ,tzdata-for-tests)))
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin") ; glib-compile-schemas, etc.
|
||||
("intltool" ,intltool)
|
||||
|
@ -90,6 +90,13 @@
|
|||
#:configure-flags
|
||||
(list "-DWITH_OFX=OFF" ; libofx is not available yet
|
||||
"-DWITH_SQL=OFF") ; without dbi.h
|
||||
#:make-flags '("GUILE_AUTO_COMPILE=0")
|
||||
#:modules ((guix build cmake-build-system)
|
||||
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
|
||||
(guix build utils))
|
||||
#:imported-modules (,@%gnu-build-system-modules
|
||||
(guix build cmake-build-system)
|
||||
(guix build glib-or-gtk-build-system))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-gmock
|
||||
|
@ -99,14 +106,28 @@
|
|||
"-C" "gmock" "--strip-components=1")
|
||||
(setenv "GMOCK_ROOT" (string-append (getcwd) "/gmock/googlemock"))
|
||||
#t))
|
||||
(add-after 'unpack 'set-env-vars
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((tzdata (assoc-ref inputs "tzdata")))
|
||||
;; At least one test is time-related and requires this
|
||||
;; environment variable.
|
||||
(setenv "TZDIR"
|
||||
(string-append tzdata
|
||||
"/share/zoneinfo"))
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("set\\(SHELL /bin/bash\\)")
|
||||
(string-append "set(SHELL " (which "bash") ")")))
|
||||
#t)))
|
||||
;; There are about 100 megabytes of documentation.
|
||||
(add-after
|
||||
'install 'install-docs
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((docs (assoc-ref inputs "gnucash-docs"))
|
||||
(doc-output (assoc-ref outputs "doc")))
|
||||
(mkdir-p (string-append doc-output "/share"))
|
||||
(symlink (string-append docs "/share/gnome")
|
||||
(string-append doc-output "/share/gnome")))))
|
||||
(string-append doc-output "/share/gnome"))
|
||||
#t)))
|
||||
(add-after
|
||||
'install-docs 'wrap-programs
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
|
@ -134,7 +155,11 @@
|
|||
'("gnucash"
|
||||
"gnc-fq-check"
|
||||
"gnc-fq-helper"
|
||||
"gnc-fq-dump")))))))
|
||||
"gnc-fq-dump"))))
|
||||
(add-after 'install 'glib-or-gtk-compile-schemas
|
||||
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
|
||||
(add-after 'install 'glib-or-gtk-wrap
|
||||
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
|
||||
(home-page "https://www.gnucash.org/")
|
||||
(synopsis "Personal and small business financial accounting software")
|
||||
(description
|
||||
|
@ -154,11 +179,11 @@ financial calculations or scheduled transactions.")
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/gnucash/gnucash-docs/"
|
||||
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
|
||||
version "/gnucash-docs-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yq65s3z3dwdwdf2nq1d1w9ckdjdyjwkfpmvhzyib54b66q65xh5"))))
|
||||
"10v4hw4lh888r8yv473pqrvzfjg8dwamk62sghs93rn88ndwm16c"))))
|
||||
(build-system gnu-build-system)
|
||||
;; These are native-inputs because they are only required for building the
|
||||
;; documentation.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
|
@ -67,7 +67,8 @@
|
|||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python))
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public libgpg-error
|
||||
(package
|
||||
|
@ -458,6 +459,13 @@ strong randomness, and more. It is implemented using the foreign function
|
|||
interface (FFI) of Guile.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile2.0-gcrypt
|
||||
(package (inherit guile-gcrypt)
|
||||
(name "guile2.0-gcrypt")
|
||||
(inputs
|
||||
`(("guile" ,guile-2.0)
|
||||
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
|
||||
|
||||
(define-public python-gpg
|
||||
(package
|
||||
(name "python-gpg")
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
|
||||
|
@ -35,6 +35,8 @@
|
|||
#:use-module (guix git-download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cargo)
|
||||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages databases)
|
||||
|
@ -58,8 +60,10 @@
|
|||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages assembly)
|
||||
#:use-module (gnu packages rust)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages readline))
|
||||
|
||||
|
@ -467,10 +471,10 @@ security standards.")
|
|||
(license license:mpl2.0)))
|
||||
|
||||
(define (mozilla-patch file-name changeset hash)
|
||||
"Return an origin for CHANGESET from the mozilla-esr52 repository."
|
||||
"Return an origin for CHANGESET from the mozilla-esr60 repository."
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hg.mozilla.org/releases/mozilla-esr52/raw-rev/"
|
||||
(uri (string-append "https://hg.mozilla.org/releases/mozilla-esr60/raw-rev/"
|
||||
changeset))
|
||||
(sha256 (base32 hash))
|
||||
(file-name file-name)))
|
||||
|
@ -478,112 +482,43 @@ security standards.")
|
|||
(define-public icecat
|
||||
(package
|
||||
(name "icecat")
|
||||
(version "52.6.0-gnu1")
|
||||
(version "60.2.0-gnu1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
;; Temporary URL pending official release:
|
||||
(uri "https://alpha.gnu.org/gnu/gnuzilla/60.2.0/icecat-60.2.0-gnu1.tar.bz2")
|
||||
#;
|
||||
(uri (string-append "mirror://gnu/gnuzilla/"
|
||||
(first (string-split version #\-))
|
||||
"/" name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"09fn54glqg1aa93hnz5zdcy07cps09dbni2b4200azh6nang630a"))
|
||||
"0lqx7g79x15941rhjr3qsfwsny6vzc7d7abdmvjy6jjbqkqlc1zl"))
|
||||
(patches
|
||||
(list
|
||||
(search-patch "icecat-avoid-bundled-libraries.patch")
|
||||
(search-patch "icecat-use-system-harfbuzz.patch")
|
||||
(search-patch "icecat-use-system-graphite2.patch")
|
||||
(mozilla-patch "icecat-bug-546387.patch" "d13e3fefb76e" "1b760r0bg2ydbl585wlmajljh1nlisrwxvjws5b28a3sgjy01i6k")
|
||||
(mozilla-patch "icecat-bug-1350152.patch" "f822bda79c28" "1wf56169ca874shr6r7qx40s17h2gwj7ngmpyylrpmd1c6hipvsj")
|
||||
(mozilla-patch "icecat-bug-1411708.patch" "34c968767eb7" "0l2jy201ikj3m3h66mvlsj4y0ki7cpm7x7nnfygbwnfxg42s1sip")
|
||||
(mozilla-patch "icecat-bug-1375217.patch" "00fc630c9a46" "17pcprp452nslk6sac6sili0p74zh8w3g0v1wsdn0ikm9xmnphhv")
|
||||
(mozilla-patch "icecat-CVE-2018-5145.patch" "f0ec180993d2" "0jiazxcwki83wr00fyh2g518ynsd33p7nk65zk4d1682gn22lc8v")
|
||||
(mozilla-patch "icecat-CVE-2018-5130.patch" "a6a9e26688c1" "0cvizvilb4k422j2gzqcbakznvsffmk6n6xn1ayj5rgxfaizkkqk")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt1.patch" "198ad052621e" "1721zx8hifdlflrhvw6hmkdgjbvsmxl9n84iji5qywhlp2krdk9r")
|
||||
(mozilla-patch "icecat-bug-1426087.patch" "391ea77ebfdb" "1fhkvd0z6mvdkj7m0d3jlj42rsdw5r4x122c1wb1i428228ifw6n")
|
||||
(mozilla-patch "icecat-bug-1416307.patch" "54f2f7f93b30" "1ncjir16mqya37wgf6fy2rqki3vl433c4grjr3fypmlig6xfgg1l")
|
||||
(mozilla-patch "icecat-CVE-2018-5127.patch" "2c4d7a59041b" "178c6gid89cvw52yqs43i6x6s5w0hslj0rfa2r8b4762ij3civ92")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt2.patch" "f87ef3774d5e" "0payf3az2w93nzl5qknqx290jbxk8v39rwhdgq7wyd5f245dywxk")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt3.patch" "ac743923f81d" "0msyr45xr1j5q4x6ah4r907pwjngyi0k6pp9y8ixk21cnwbzrdwx")
|
||||
(mozilla-patch "icecat-CVE-2018-5129.patch" "456913d7e8b5" "0fx0s06kxxj7g4hllinaskgh41z3k48zml6yqqzxx485qk3hdh9x")
|
||||
(mozilla-patch "icecat-bug-1334465-pt1.patch" "f95c5b881442" "0iaddhf65jd9cycj4bw0b207n2jiqkr4q84jifzyqn4ygs75wdqd")
|
||||
(mozilla-patch "icecat-bug-1334465-pt2.patch" "8a4265c8fb41" "1d9zfdbrlw9wzr84b7pj7lxgy487lsx0kfd89287hjk0al8m6vrw")
|
||||
(mozilla-patch "icecat-bug-1398021.patch" "28855df568d8" "1kmq836gniplxpjnvq8lhbcc1aqi56al628r1mzdy94b5yb0lis3")
|
||||
(mozilla-patch "icecat-bug-1388020.patch" "e8ab2736499b" "0n28vcd65rxsyq3z22rfcfksryfndhm1i3g6ah3akg11jnagqf5v")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt4.patch" "014877bf17ea" "0hk90pnf7h7kvidji6ydvva1zpyraipn03pjhvprdqr7k2fqzmsz")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt5.patch" "5b3a5de48912" "1ifya05rcd34ryp9zawdacihhkkf2m0xn2q8m8c6v78bvxj0mgig")
|
||||
(mozilla-patch "icecat-CVE-2018-5144.patch" "1df9b4404acd" "1sd59vsarfsbh3vlrzrqv6n1ni7vxdzm83j6s6g0fygl1h8kwijg")
|
||||
(mozilla-patch "icecat-bug-1430173-pt1.patch" "9124c3972e2b" "13ns5yy39yzfx7lrkv4rgwdz6s6q0z4i09wkbxdvnkfsz17cd17i")
|
||||
(mozilla-patch "icecat-bug-1430173-pt2.patch" "9f6dc031be51" "0bv2p98z5ahp3x9wxnhwxn87g21djvzzp7jy55ik90hqixsbhwdl")
|
||||
(mozilla-patch "icecat-CVE-2018-5131.patch" "3102fbb97b32" "0kg0183v92gxjb9255xjwhxyd6gl77l9c0civx3040k975fybwlp")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt6.patch" "4904c0f4a645" "0lsq62ynksy1fbw0m87f1d741fyvrrp1vrznx5hx0l2p4g4frhv3")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt7.patch" "16b8073d5c30" "1dv94qqah1wjd3bxjvrkmjbb2f95d3d11zpm8mggdk52il575bwl")
|
||||
(mozilla-patch "icecat-bug-1442127-pt1.patch" "f931f85b09da" "02s380w8a73g4w2wm810lbigh4z4rrlfy10ywwhv4lpkbk8xg7pr")
|
||||
(mozilla-patch "icecat-bug-1442127-pt2.patch" "da5792b70f30" "116k9qja5ir9b3laazasp43f5jx59qq72nknmq5bn5v1ixya9r4l")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt8.patch" "62b831df8269" "109pn0hqn7s27580glv4z7qv1pmjzii9szvf3wkn97k5wybrzgkx")
|
||||
(mozilla-patch "icecat-bug-1442504.patch" "8954ce68a364" "0bl65zw82bwqg0mmcri94pxqq6ibff7y5rclkzapb081p6yvf73q")
|
||||
(mozilla-patch "icecat-CVE-2018-5125-pt9.patch" "8a16f439117c" "108iarql6z7h1r4rlzac6n6lrzs78x7kcdbfa0b5dbr5xc66jmgb")
|
||||
(mozilla-patch "icecat-bug-1426603.patch" "ca0b92ecedee" "0dc3mdl4a3hrq4j384zjavf3splj6blv4masign710hk7svlgbhq")
|
||||
(mozilla-patch "icecat-CVE-2018-5146.patch" "494e5d5278ba" "1yb4lxjw499ppwhk31vz0vzl0cfqvj9d4jwqag7ayj53ybwsqgjr")
|
||||
(mozilla-patch "icecat-CVE-2018-5147.patch" "5cd5586a2f48" "10s774pwvj6xfk3kk6ivnhp2acc8x9sqq6na8z47nkhgwl2712i5")
|
||||
(mozilla-patch "icecat-CVE-2018-5148.patch" "c3e447e07077" "0gmwy631f8ip4gr1mpbjk8bx1n1748wdls5zq4y8hpmpnq5g1wyx")
|
||||
(mozilla-patch "icecat-CVE-2018-5178.patch" "17201199b18d" "1d0hcim1fwh0bklwpmnal1mv9d9kmyif1m15aj1nqkf1n3x4xc37")
|
||||
(mozilla-patch "icecat-bug-1361699.patch" "a07d6c3ff262" "1z8mjg2487r8pxi0x951v6fwwr696q84f6hlzimc3r7bn5ds9r83")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt01.patch" "7127ccf8f88c" "0m4my7aflpp0wlqilr2m4axd7k2fyrs7jqdcz2rrz5pwivz1anvd")
|
||||
(mozilla-patch "icecat-bug-1444231.patch" "57bd35fa8618" "0pl6x5amc5x6nhwl7qnmnff3jjjxmbs8r365bfzj58g7q5ihqwvf")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt02.patch" "2f3e1ccf1661" "0azl8g81kpc0w2xpjpgm1154ll12g0a8n6i7bl3s9nnrk2i26n74")
|
||||
(mozilla-patch "icecat-CVE-2018-5159.patch" "8ff2c4d68e36" "0kz1rqhnz8ca4z20hnpcafidhsrwhnm0h2gmlgchni33h8pisr1f")
|
||||
(mozilla-patch "icecat-CVE-2018-5154.patch" "b8c430253efd" "1arjcaps9axhxh5ff84n9bydhhzrihn7hbq7v69nvqwqrjp3lgg9")
|
||||
(mozilla-patch "icecat-CVE-2018-5155.patch" "05cadfa3ac39" "0q0vh7vy7x0l8jp6376fn10qljfp4mnp4m9zfn90j4m19pfl86a0")
|
||||
(mozilla-patch "icecat-CVE-2018-5168.patch" "48a678d7cb81" "1yfh7kxxxvqck2hpn98pwag4splyc6c9brc5haq28fp8x9r9qvlk")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt03.patch" "112032576872" "1x1hxyggbxlnlj0n9cbp03hjnfvm6cq8nqj0jizrd8cfyd5aig8p")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt04.patch" "ad9a885b0df4" "1hrk1q9mk59jww55g4lqmaflznk87x3vvjn2mxfgfbbjs8l1cyz4")
|
||||
(mozilla-patch "icecat-bug-1452416.patch" "f89ab96a2532" "1dqchxdyznhgyxhfq0hm0vg1p597hjqflfzigc7j3s5vxf9rg2nv")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt05.patch" "af885a1bd293" "1wfpqhm2dp4fsx6zbrncngsqz7g2x09b625zcighixrbpvybyww3")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt06.patch" "666fc84ec72d" "0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v")
|
||||
(search-patch "icecat-CVE-2018-5157-and-CVE-2018-5158.patch")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt07.patch" "1ab40761a856" "1kgwypy7k5b33jwkni4025za4kcnv5m6klsx4wsswlixmljmkbc7")
|
||||
(mozilla-patch "icecat-bug-1453339.patch" "0edb8dca7087" "0b30pipqryh311sc97rcmwnx9n8qdlbbz90b2hkybjnprmbhfxrm")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt08.patch" "134c728799c1" "16hbwx6fx1hrddsyjjbd3z954ql3pg348xs13h9riyblq8crzmam")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt09.patch" "14eab155eaa8" "0wr4xgblxzk4c2gvlnpl7ic1196mrhry1hgwdl1jivq0ji5cbvbd")
|
||||
(mozilla-patch "icecat-bug-1452619.patch" "2b75d55ccf0e" "1g87aybw6ggv6hyk385bplv0lx63n020gwyq0d6d4pqld48hsm1i")
|
||||
(mozilla-patch "icecat-CVE-2018-5156-pt1.patch" "89857f35df29" "0gzi47svrw5ajdlm3i12193psm702zx70x5h1rwp4gb7gxh4m4d9")
|
||||
(mozilla-patch "icecat-CVE-2018-5150-pt10.patch" "3f2ec03c0405" "0w02952dlxd2gmwghck2nm4rjjmc5ylg62bw6m1rvi35kcr134lr")
|
||||
(mozilla-patch "icecat-CVE-2018-5183.patch" "f729bf78fb3a" "0xkj6jwxwdqkvb5c7wi16b8cm8qrnlrd3s9jnd46jg03iykrx56f")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt01.patch" "eb896089db47" "10lppk4x2d3pim71a36ky1dmg08rs5ckfiljwvfnr1cw6934qxl4")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt02.patch" "2374dca97bde" "0y1g55wvj44nzb1qfkl271jcf8s1ik8lcl1785z0zim4qzn7qkpa")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt03.patch" "70b6298e0c9e" "0n5jfy6c421dkybk8m18vd61y95zz0r64g1p1zlya3fps5knfaqi")
|
||||
(mozilla-patch "icecat-CVE-2018-12365-pt1.patch" "4ef79fe9b3b7" "1c32z1ki1i6xj1nbb0xlxwqnmz48ikmy8dmp37rkjz8ssn04wgfg")
|
||||
(mozilla-patch "icecat-CVE-2018-12365-pt2.patch" "9ad16112044a" "0ayya67sx7avcb8bplfdxb92l9g4mjrb1s3hby283llhqv0ikg9b")
|
||||
(mozilla-patch "icecat-CVE-2018-12359.patch" "11d8a87fb6d6" "1rkmdk18llw0x1jakix75hlhy0hpsmlminnflagbzrzjli81gwm1")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt04.patch" "407b10ad1273" "16qzsfirw045xag96f1qvpdlibm8lwdj9l1mlli4n1vz0db91v9q")
|
||||
(mozilla-patch "icecat-CVE-2018-6126.patch" "e76e2e481b17" "0hnx13msjy28n3bpa2c24kpzalam4bdk5gnp0f9k671l48rs9yb3")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt05.patch" "2c75bfcd465c" "1pjinj8qypafqm2fk68s3hzcbzcijn09qzrpcxvzq6bl1yfc1xfd")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt06.patch" "042f80f3befd" "0av918kin4bkrq7gnjz0h9w8kkq8rk9l93250lfl5kqrinza1gsk")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt07+bugs-1455071+1433642+1456604+1458320.patch"
|
||||
"bb0451c9c4a0" "1lhm1b2a7c6jwhzsg3c830hfhp17p8j9zbcmgchpb8c5jkc3vw0x")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt08.patch" "8189b262e3b9" "13rh86ddwmj1bhv3ibbil3sv5xbqq1c9v1czgbsna5hxxkzc1y3b")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt09.patch" "9f81ae3f6e1d" "05vfg8a8jrzd93n1wvncmvdmqgf9cgsl8ryxgjs3032gbbjkga7q")
|
||||
(mozilla-patch "icecat-CVE-2018-12360.patch" "face7a3dd5d7" "0jclw30mf693w8lrmvn0iankggj21nh4j3zh51q5363rj5xncdzx")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt10.patch" "7afb58c046c8" "1r0569r76712x7x1sw6xr0x06ilv6iw3fncb0f8r8b9mp6wrpx34")
|
||||
(mozilla-patch "icecat-CVE-2018-12362-pt1.patch" "f1a745f8c42d" "11q73pb7a8f09xjzil4rhg5nr49zrnz1vb0prni0kqvrnppf5s40")
|
||||
(mozilla-patch "icecat-CVE-2018-12362-pt2.patch" "1f9a430881cc" "0f79rv7njliqxx33z07n60b50jg0a596d1km7ayz2hivbl2d0168")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt11.patch" "28f4fc0a5141" "1a8f9z6c80in8ccj82ysdrcr2lqypp29l4acs50kwncm0c0b01zl")
|
||||
(mozilla-patch "icecat-CVE-2018-12363.patch" "ad5a53a1d2b1" "0rhl4r39ydb3lkfp5pkwvhhzqgfh33s9r7b7jccgkrx6f13xyq78")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt12.patch" "0ddfc03c0454" "1b0xw2kj9765lvpl8iwr3wwcz40bdfp3dp4y9f546a61qsi9q9d6")
|
||||
(mozilla-patch "icecat-CVE-2018-5156-pt2.patch" "dbf36189a364" "1awbyhy0r79i03sns2p0m78f9hb6c7kp4hwia2khx4qszlsr4j95")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt13.patch" "32509dfde003" "0cc3c92dgf5qynk093prq610c9x815l2fa24ddrw9czdzbwblsdq")
|
||||
(mozilla-patch "icecat-bug-1462912.patch" "f18535a212da" "0zkqz9il89f1s1yrp5c6hj6kysy2x02iy50vgwdj30lr56gkpzmk")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt14.patch" "e8e9e1ef79f2" "0dc8p6fsppq3bhbpmp41f8mjxbr31pvgpga0a73dqdaicq5ydgj4")
|
||||
(search-patch "icecat-bug-1413868-pt1.patch")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt15.patch" "9d4d31b2630d" "1lcbmsyi09kp80h1jgxj5l45zl24xn22h1lq7drbyjxsn1kggq4g")
|
||||
(mozilla-patch "icecat-CVE-2018-12366-pt1.patch" "edf2c7dff493" "06xmyk7nm54cm9m6qc59wz8cxxfa5r25mf2xzdzy74iq5hwa1ac8")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt16.patch" "05549a4d1b80" "10q68cllshmmhlrbirm9h4gyc3ffrcpsxihfpcbxh90nv2h16jci")
|
||||
(mozilla-patch "icecat-CVE-2018-12364.patch" "67b2d8924841" "197riigbb6l30959pygr0zlv7vaims78dg1mh0pg33pa7cbna0ds")
|
||||
(mozilla-patch "icecat-CVE-2018-12366-pt2.patch" "528d4d997bb3" "0f375i96a404dkn0fanmd9pgfj3wyrhjfc5dwslw2s44gwfjhljb")
|
||||
(mozilla-patch "icecat-bug-1369771.patch" "fab16ad7f256" "0kd8qm04sjgfgfg8yw3ivcxazb1d7v430g86chw4n64qybsh9ka3")
|
||||
(mozilla-patch "icecat-CVE-2018-5188-pt17.patch" "068e249d02b4" "1iy9by1mg5qhp8502h31m8zm99aq2hx0c5n3hadd5pk11lfnq6ll")
|
||||
(mozilla-patch "icecat-bug-1413868-pt2.patch" "755067c14b06" "089dwqwzcdg1l6aimi0i65q4dgb2iny5h8yjx63h9zgv77n0700a")))
|
||||
(search-patch "icecat-avoid-bundled-libraries.patch")
|
||||
(search-patch "icecat-use-system-graphite2+harfbuzz.patch")
|
||||
(search-patch "icecat-use-system-media-libs.patch")
|
||||
(mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5")
|
||||
(search-patch "icecat-CVE-2018-12383.patch")
|
||||
(mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51")
|
||||
(mozilla-patch "icecat-CVE-2018-12386.patch" "4808fcb2e6ca" "05sc881l7sh8bag8whd2ggdn198lskqcxq8f41scfpqscw6xs5d5")
|
||||
(mozilla-patch "icecat-CVE-2018-12387.patch" "b8f5c37486e1" "0lvmbh126m695kgdbasy1y5xh9n1j08cwdhn071mgvj6yn8cns5z")
|
||||
(mozilla-patch "icecat-bug-1464751.patch" "d5d00faf0465" "1mj7dbb06brwrk0mvap0z4lfl2hwz1cj6dwjvdrisxm046pdw98i")
|
||||
(mozilla-patch "icecat-bug-1472538.patch" "11462f2b98f2" "1nxgh0plzilylx8r73r7d74pv66qwjqxmd7nqii33p0snl2jjfzs")
|
||||
(mozilla-patch "icecat-bug-1478685.patch" "098585dc86fc" "1b0x4qdh6isvffmibvc8ad8z62m3iky9q6jq0z6gyvn8q252cqal")
|
||||
(mozilla-patch "icecat-bug-1486080.patch" "3f8d57d936ea" "0pz2c18wcgj44v0j8my9xbm90m4bsjcvzmavj569fi8bh6s6zz8p")
|
||||
(mozilla-patch "icecat-bug-1423278.patch" "878ceaee5634" "0i47s5nvrx9vqbnj6s9y9f4ffww20p8nviqa6frg676y1188xlyl")
|
||||
(mozilla-patch "icecat-bug-1442010.patch" "87be1b98ec9a" "15f4l18c7hz9aqn89gg3dwmdidfwgn10dywgpzydm8mps45amx7j")
|
||||
(mozilla-patch "icecat-bug-1484559.patch" "99e58b5307ce" "02fdgbliwzi2r2376wg6k1rky1isfka0smac4ii2cll01jhpfrn6")
|
||||
(mozilla-patch "icecat-bug-1487098.patch" "f25ce451a492" "18nzg39iyxza1686180qk9cc88l5j2hf1h35d62lrqmdgd9vcj33")
|
||||
(mozilla-patch "icecat-bug-1484905.patch" "35c26bc231df" "0qh8d4z6y03h5xh7djci26a01l6zq667lg2k11f6zzg7z2j0h67x")
|
||||
(mozilla-patch "icecat-bug-1488061.patch" "050d0cfa8e3d" "05ql798ynbyz5pvyri4b95j4ixmgnny3zl7sd2ckfrrbm9mxh627")
|
||||
(mozilla-patch "icecat-bug-1434963-pt1.patch" "1e6dad87efed" "1v00a6cmgswjk54041jyv1ib129fxshpzwk6mn6lr0v5hylk3bx9")
|
||||
(mozilla-patch "icecat-bug-1434963-pt2.patch" "6558c46df9ea" "0vdy9dm9w5k1flhcfxwvvff0aa415b5mgmmq5r37i83686768xfb")
|
||||
(mozilla-patch "icecat-bug-1434963-pt3.patch" "686fcfa8abd6" "0ihqr11aq4b0y7mx7bwn8yzn25mv3k2gdphm951mj1g85qg35ann")
|
||||
(mozilla-patch "icecat-bug-1491132.patch" "14120e0c74d6" "188c5fbhqqhmlk88p70l6d97skh7xy4jhqdby1ri3h9ix967515j")))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -600,15 +535,24 @@ security standards.")
|
|||
;; FIXME: A script from the bundled nspr is used.
|
||||
;;"nsprpub"
|
||||
;;
|
||||
;; TODO: Use system media libraries. Waiting for:
|
||||
;; FIXME: With the update to IceCat 60, using system NSS
|
||||
;; broke certificate validation. See
|
||||
;; <https://bugs.gnu.org/32833>. For now, we use
|
||||
;; the bundled NSPR and NSS. TODO: Investigate,
|
||||
;; and try to unbundle these libraries again.
|
||||
;; UNBUNDLE-ME! "security/nss"
|
||||
;;
|
||||
;; TODO: Use more system media libraries. See:
|
||||
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=517422>
|
||||
;; * libogg
|
||||
;; * libtheora
|
||||
;; * libvorbis
|
||||
;; * libtremor (not yet in guix)
|
||||
;; * libtheora: esr60 wants v1.2, not yet released.
|
||||
;; * soundtouch: avoiding the bundled library would
|
||||
;; result in some loss of functionality. There's
|
||||
;; also an issue with exception handling
|
||||
;; configuration. It seems that this is needed in
|
||||
;; some moz.build:
|
||||
;; DEFINES['ST_NO_EXCEPTION_HANDLING'] = 1
|
||||
;; * libopus
|
||||
;; * speex
|
||||
;; * soundtouch (not yet in guix)
|
||||
;;
|
||||
"modules/freetype2"
|
||||
"modules/zlib"
|
||||
|
@ -616,8 +560,10 @@ security standards.")
|
|||
"ipc/chromium/src/third_party/libevent"
|
||||
"media/libjpeg"
|
||||
"media/libvpx"
|
||||
"security/nss"
|
||||
"gfx/cairo"
|
||||
"media/libogg"
|
||||
"media/libvorbis"
|
||||
;; "media/libtheora" ; wants theora-1.2, not yet released
|
||||
"media/libtremor"
|
||||
"gfx/harfbuzz"
|
||||
"gfx/graphite2"
|
||||
"js/src/ctypes/libffi"
|
||||
|
@ -633,7 +579,6 @@ security standards.")
|
|||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
("bzip2" ,bzip2)
|
||||
("cairo" ,cairo)
|
||||
("cups" ,cups)
|
||||
("dbus-glib" ,dbus-glib)
|
||||
("gdk-pixbuf" ,gdk-pixbuf)
|
||||
|
@ -648,29 +593,37 @@ security standards.")
|
|||
("libcanberra" ,libcanberra)
|
||||
("libgnome" ,libgnome)
|
||||
("libjpeg-turbo" ,libjpeg-turbo)
|
||||
("libogg" ,libogg)
|
||||
;; ("libtheora" ,libtheora) ; wants theora-1.2, not yet released
|
||||
("libvorbis" ,libvorbis)
|
||||
("libxft" ,libxft)
|
||||
("libevent" ,libevent-2.0)
|
||||
("libevent" ,libevent)
|
||||
("libxinerama" ,libxinerama)
|
||||
("libxscrnsaver" ,libxscrnsaver)
|
||||
("libxcomposite" ,libxcomposite)
|
||||
("libxt" ,libxt)
|
||||
("libffi" ,libffi)
|
||||
("ffmpeg" ,ffmpeg-3.4)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
("libvpx" ,libvpx)
|
||||
("icu4c" ,icu4c)
|
||||
("pixman" ,pixman)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("mesa" ,mesa)
|
||||
("mit-krb5" ,mit-krb5)
|
||||
("nspr" ,nspr)
|
||||
("nss" ,nss)
|
||||
;; See <https://bugs.gnu.org/32833>
|
||||
;; and related comments in the 'snippet' above.
|
||||
;; UNBUNDLE-ME! ("nspr" ,nspr)
|
||||
;; UNBUNDLE-ME! ("nss" ,nss)
|
||||
("sqlite" ,sqlite)
|
||||
("startup-notification" ,startup-notification)
|
||||
("unzip" ,unzip)
|
||||
("zip" ,zip)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
;; Icecat 60 checkes for rust>=1.24
|
||||
`(("rust" ,rust-1.24)
|
||||
("cargo" ,rust-1.24 "cargo")
|
||||
("perl" ,perl)
|
||||
("python" ,python-2) ; Python 3 not supported
|
||||
("python2-pysqlite" ,python2-pysqlite)
|
||||
("yasm" ,yasm)
|
||||
|
@ -687,11 +640,12 @@ security standards.")
|
|||
;; practice somehow. See <http://hydra.gnu.org/build/378133>.
|
||||
#:validate-runpath? #f
|
||||
|
||||
#:imported-modules ,%cargo-build-system-modules ;for `generate-checksums'
|
||||
|
||||
#:configure-flags '("--enable-default-toolkit=cairo-gtk3"
|
||||
|
||||
"--with-distribution-id=org.gnu"
|
||||
|
||||
"--enable-gio"
|
||||
"--enable-startup-notification"
|
||||
"--enable-pulseaudio"
|
||||
|
||||
|
@ -701,7 +655,9 @@ security standards.")
|
|||
"--disable-maintenance-service"
|
||||
"--disable-eme"
|
||||
"--disable-gconf"
|
||||
"--disable-gnomeui"
|
||||
|
||||
;; Stylo requires LLVM/clang. For now, disable it.
|
||||
"--disable-stylo"
|
||||
|
||||
;; Building with debugging symbols takes ~5GiB, so
|
||||
;; disable it.
|
||||
|
@ -717,14 +673,20 @@ security standards.")
|
|||
"--with-system-bz2"
|
||||
"--with-system-jpeg" ; must be libjpeg-turbo
|
||||
"--with-system-libevent"
|
||||
"--with-system-ogg"
|
||||
"--with-system-vorbis"
|
||||
;; "--with-system-theora" ; wants theora-1.2, not yet released
|
||||
"--with-system-libvpx"
|
||||
"--with-system-icu"
|
||||
"--with-system-nspr"
|
||||
"--with-system-nss"
|
||||
|
||||
;; See <https://bugs.gnu.org/32833>
|
||||
;; and related comments in the 'snippet' above.
|
||||
;; UNBUNDLE-ME! "--with-system-nspr"
|
||||
;; UNBUNDLE-ME! "--with-system-nss"
|
||||
|
||||
"--with-system-harfbuzz"
|
||||
"--with-system-graphite2"
|
||||
"--enable-system-pixman"
|
||||
"--enable-system-cairo"
|
||||
"--enable-system-ffi"
|
||||
"--enable-system-hunspell"
|
||||
"--enable-system-sqlite"
|
||||
|
@ -774,6 +736,27 @@ security standards.")
|
|||
'avcodec', 'avutil', 'pulse' ]\n\n"
|
||||
all)))
|
||||
#t))
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
(invoke "sh" "-c" "autoconf old-configure.in > old-configure")))
|
||||
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
||||
(lambda _
|
||||
(use-modules (guix build cargo-build-system))
|
||||
(let ((null-file "/dev/null")
|
||||
(null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
|
||||
(substitute* '("Cargo.lock" "servo/Cargo.lock")
|
||||
(("(\"checksum .* = )\".*\"" all name)
|
||||
(string-append name "\"" null-hash "\"")))
|
||||
(for-each
|
||||
(lambda (filename)
|
||||
(delete-file filename)
|
||||
(let ((dir (dirname filename)))
|
||||
(display (string-append
|
||||
"patch-cargo-checksums: generate-checksums for "
|
||||
dir "\n"))
|
||||
(generate-checksums dir null-file)))
|
||||
(find-files "third_party/rust" ".cargo-checksum.json")))
|
||||
#t))
|
||||
(replace
|
||||
'configure
|
||||
;; configure does not work followed by both "SHELL=..." and
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
|
||||
;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
|
||||
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
|
@ -12,6 +12,7 @@
|
|||
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
|
||||
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
||||
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright @ 2018 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -76,6 +77,10 @@
|
|||
(guix build utils)
|
||||
(srfi srfi-1))
|
||||
#:tests? #f ; Tests are run by the all.bash script.
|
||||
,@(if (string-prefix? "aarch64-linux" (or (%current-system)
|
||||
(%current-target-system)))
|
||||
'(#:system "armhf-linux")
|
||||
'())
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
|
@ -212,7 +217,7 @@ programming language designed primarily for systems programming. Go is a
|
|||
compiled, statically typed language in the tradition of C and C++, but adds
|
||||
garbage collection, various safety features, and concurrent programming features
|
||||
in the style of communicating sequential processes (@dfn{CSP}).")
|
||||
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
|
||||
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux"))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-1.9
|
||||
|
@ -272,6 +277,15 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
(string-append
|
||||
"\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", ")))
|
||||
|
||||
;; XXX Commit 65fa2b615b72c1fa61a7 in the Go repo. We do this
|
||||
;; without a patch because ((guix packages) patch-and-repack)
|
||||
;; resets file mtimes, and parts of Go's test suite rely on
|
||||
;; those timestamps.
|
||||
;; <https://github.com/golang/go/issues/26369>
|
||||
(substitute* "cmd/internal/objfile/elf.go"
|
||||
(("PT_LOAD")
|
||||
"PT_LOAD && p.Flags&elf.PF_X != 0"))
|
||||
|
||||
;; Disable failing tests: these tests attempt to access
|
||||
;; commands or network resources which are neither available
|
||||
;; nor necessary for the build to succeed.
|
||||
|
@ -385,11 +399,11 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
,@(package-native-inputs go-1.4)))
|
||||
(supported-systems %supported-systems)))
|
||||
|
||||
(define-public go-1.10
|
||||
(define-public go-1.11
|
||||
(package
|
||||
(inherit go-1.9)
|
||||
(name "go")
|
||||
(version "1.10.4")
|
||||
(version "1.11.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -397,7 +411,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
name version ".src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10ap5pan71y2hdwzv4cg8wx4sy8fkcz5520rm1ldjg25xmjlkr3g"))))
|
||||
"05qivf2f59pv4bfrmdr4m0xvswkmvvl9c5a2h5dy45g2k8b8r3sm"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments go-1.9)
|
||||
((#:phases phases)
|
||||
|
@ -412,18 +426,31 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))
|
||||
(output (assoc-ref outputs "out")))
|
||||
|
||||
;; Removing net/ tests, which fail when attempting to access
|
||||
;; network resources not present in the build container.
|
||||
(for-each delete-file
|
||||
;; Removing net/ tests, which fail when attempting to access
|
||||
;; network resources not present in the build container.
|
||||
'("net/listen_test.go"
|
||||
"net/parse_test.go"
|
||||
"net/cgo_unix_test.go"))
|
||||
"net/cgo_unix_test.go"
|
||||
;; A side effect of these test scripts is testing
|
||||
;; cgo. Attempts at using cgo flags and
|
||||
;; directives with these scripts as specified
|
||||
;; here (https://golang.org/cmd/cgo/) have not
|
||||
;; worked. The tests continue to state that they
|
||||
;; can not find crt1.o despite being present.
|
||||
"cmd/go/testdata/script/list_compiled_imports.txt"
|
||||
"cmd/go/testdata/script/mod_case_cgo.txt"
|
||||
;; https://github.com/golang/go/issues/24884
|
||||
"os/user/user_test.go"))
|
||||
|
||||
(substitute* "os/os_test.go"
|
||||
(("/usr/bin") (getcwd))
|
||||
(("/bin/pwd") (which "pwd"))
|
||||
(("/bin/sh") (which "sh")))
|
||||
|
||||
(substitute* "cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go"
|
||||
(("/usr/bin") "/tmp"))
|
||||
|
||||
;; Add libgcc to runpath
|
||||
(substitute* "cmd/link/internal/ld/lib.go"
|
||||
(("!rpath.set") "true"))
|
||||
|
@ -494,10 +521,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||
;; Tell the build system where to find the bootstrap Go.
|
||||
(let ((go (assoc-ref inputs "go")))
|
||||
(setenv "GOROOT_BOOTSTRAP" go)
|
||||
(setenv "GOGC" "400")
|
||||
;; Go 1.10 tries to write to $HOME in a test
|
||||
(setenv "HOME" "/tmp")
|
||||
#t)))))))))
|
||||
(setenv "GOGC" "400"))))))))))
|
||||
|
||||
(define-public go go-1.9)
|
||||
|
||||
|
|
|
@ -27,15 +27,18 @@
|
|||
(define-public gprolog
|
||||
(package
|
||||
(name "gprolog")
|
||||
(version "1.4.4")
|
||||
(version "1.4.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gprolog/gprolog-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q"))))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
;; Recent versions are not hosted on the GNU mirrors.
|
||||
(uri (list (string-append "http://gprolog.org/gprolog-" version
|
||||
".tar.gz")
|
||||
(string-append "mirror://gnu/gprolog/gprolog-" version
|
||||
".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
@ -224,6 +224,7 @@ lines.")
|
|||
(propagated-inputs
|
||||
`(("python-decorator" ,python-decorator)
|
||||
("python-nbformat" ,python-nbformat)
|
||||
("python-pandas" ,python-pandas)
|
||||
("python-pytz" ,python-pytz)
|
||||
("python-requests" ,python-requests)
|
||||
("python-six" ,python-six)))
|
||||
|
|
|
@ -406,7 +406,7 @@ visual effects work for film.")
|
|||
(define-public openscenegraph
|
||||
(package
|
||||
(name "openscenegraph")
|
||||
(version "3.6.2")
|
||||
(version "3.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -415,8 +415,8 @@ visual effects work for film.")
|
|||
(commit (string-append "OpenSceneGraph-" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
"0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q"))
|
||||
(file-name (git-file-name name version))))
|
||||
(properties
|
||||
`((upstream-name . "OpenSceneGraph")))
|
||||
(build-system cmake-build-system)
|
||||
|
@ -437,8 +437,6 @@ visual effects work for film.")
|
|||
("jasper" ,jasper)
|
||||
("librsvg" ,librsvg)
|
||||
("libxrandr" ,libxrandr)
|
||||
("pth" ,pth)
|
||||
("qtbase" ,qtbase)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
("mesa" ,mesa)))
|
||||
(synopsis "High performance real-time graphics toolkit")
|
||||
|
@ -707,20 +705,20 @@ and understanding different BRDFs (and other component functions).")
|
|||
(list (string-append "--x-includes=" (assoc-ref %build-inputs "libx11")
|
||||
"/include")
|
||||
(string-append "--x-libraries=" (assoc-ref %build-inputs "libx11")
|
||||
"/lib"))
|
||||
"/lib")
|
||||
"--disable-examples")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autoreconf
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
;; let's call configure from configure phase and not now
|
||||
(substitute* "autogen.sh" (("./configure") "# ./configure"))
|
||||
(zero? (system* "sh" "autogen.sh")))))))
|
||||
(invoke "sh" "autogen.sh"))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("libtool" ,libtool)
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("bash" ,bash)))
|
||||
("automake" ,automake)))
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
("freetype" ,freetype)
|
||||
|
|
|
@ -220,17 +220,18 @@ be used either as a standalone application, or as a python library.")
|
|||
(define-public python-pydot
|
||||
(package
|
||||
(name "python-pydot")
|
||||
(version "1.2.3")
|
||||
(version "1.2.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pydot" version))
|
||||
(sha256
|
||||
(base32
|
||||
"00imlz0033dygb9gdag1xr0cybn33gk5jsdi9ffbszzr97rd7dgd"))))
|
||||
"1dhy4jpp646jslh2yks6klwwbaxcs905byyny880gl1iap8y5llj"))))
|
||||
(build-system python-build-system)
|
||||
;; FIXME: No tests in PyPi release tarball.
|
||||
(arguments '(#:tests? #f))
|
||||
(native-inputs
|
||||
;; For tests.
|
||||
`(("python-chardet" ,python-chardet)))
|
||||
(propagated-inputs
|
||||
`(("python-pyparsing" ,python-pyparsing)))
|
||||
(home-page "https://github.com/erocarrera/pydot")
|
||||
|
|
|
@ -227,6 +227,7 @@ for the GStreamer multimedia library.")
|
|||
("gdk-pixbuf" ,gdk-pixbuf)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("jack" ,jack-1)
|
||||
("lame" ,lame)
|
||||
("libavc1394" ,libavc1394)
|
||||
("libcaca" ,libcaca)
|
||||
("libdv" ,libdv)
|
||||
|
@ -236,10 +237,12 @@ for the GStreamer multimedia library.")
|
|||
("libshout" ,libshout)
|
||||
("libsoup" ,libsoup)
|
||||
("libvpx" ,libvpx)
|
||||
("mpg123" ,mpg123)
|
||||
("orc" ,orc)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("speex" ,speex)
|
||||
("taglib" ,taglib)
|
||||
("twolame" ,twolame)
|
||||
("wavpack" ,wavpack)))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin")
|
||||
|
@ -320,7 +323,6 @@ developers consider to have good quality code and correct functionality.")
|
|||
("libxml2" ,libxml2)
|
||||
("lrdf" ,lrdf)
|
||||
("mesa" ,mesa)
|
||||
("mpg123" ,mpg123)
|
||||
("neon" ,neon)
|
||||
("openal" ,openal)
|
||||
("openexr" ,openexr)
|
||||
|
@ -357,13 +359,10 @@ par compared to the rest.")
|
|||
(inputs
|
||||
`(("gst-plugins-base" ,gst-plugins-base)
|
||||
("liba52" ,liba52)
|
||||
("lame" ,lame)
|
||||
("libcdio" ,libcdio)
|
||||
("twolame" ,twolame)
|
||||
("libmpeg2" ,libmpeg2)
|
||||
("libdvdread" ,libdvdread)
|
||||
("libx264" ,libx264)
|
||||
("mpg123" ,mpg123)
|
||||
;; TODO:
|
||||
;; * opencore-amr (for the AMR-NB decoder and encoder and the
|
||||
;; AMR-WB decoder) <http://sourceforge.net/projects/opencore-amr/>
|
||||
|
|
|
@ -469,7 +469,11 @@ highlighting and other features typical of a source code editor.")
|
|||
;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag:
|
||||
;; assertion failed (error == NULL): Data differ
|
||||
;; (gdk-pixbuf-error-quark, 0)
|
||||
((".*'pixbuf-jpeg'.*") ""))
|
||||
((".*'pixbuf-jpeg'.*") "")
|
||||
;; Extend the timeout of the test suite.
|
||||
;; TODO: Check upstreaming effort:
|
||||
;; https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/21
|
||||
(("300") "1800"))
|
||||
#t))
|
||||
(add-before 'configure 'aid-install-script
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
@ -774,54 +778,26 @@ application suites.")
|
|||
(define-public guile-cairo
|
||||
(package
|
||||
(name "guile-cairo")
|
||||
(version "1.4.1")
|
||||
(version "1.10.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://download.gna.org/guile-cairo/guile-cairo-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(uri (string-append "mirror://savannah/guile-cairo/guile-cairo-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x"))))
|
||||
"0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
(begin
|
||||
'(begin
|
||||
;; Install Scheme files in …/guile/site/X.Y.
|
||||
(substitute* (find-files "." "^Makefile\\.in$")
|
||||
(("^(.*)dir = (.*)/guile/site(.*)" _ name prefix suffix)
|
||||
(string-append name "dir = " prefix
|
||||
"/guile/site/@GUILE_EFFECTIVE_VERSION@"
|
||||
suffix)))
|
||||
#t)))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:modules ((guix build utils)
|
||||
(guix build gnu-build-system)
|
||||
(ice-9 popen)
|
||||
(ice-9 rdelim))
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'set-module-directory
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Install modules under $out/share/guile/site/2.0.
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(effective
|
||||
(read-line
|
||||
(open-pipe* OPEN_READ "guile" "-c"
|
||||
"(display (effective-version))"))))
|
||||
(substitute* "Makefile.in"
|
||||
(("scmdir = ([[:graph:]]+).*" _ value)
|
||||
(string-append "scmdir = " value "/" effective "\n")))
|
||||
(substitute* "cairo/Makefile.in"
|
||||
(("moduledir = ([[:graph:]]+).*" _ value)
|
||||
(string-append "moduledir = "
|
||||
"$(prefix)/share/guile/site/"
|
||||
effective "/cairo\n'")))
|
||||
#t)))
|
||||
(add-after 'install 'install-missing-file
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; By default 'vector-types.scm' is not installed, so do
|
||||
;; it here.
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(effective
|
||||
(read-line
|
||||
(open-pipe* OPEN_READ "guile" "-c"
|
||||
"(display (effective-version))"))))
|
||||
(install-file "cairo/vector-types.scm"
|
||||
(string-append out "/share/guile/site/"
|
||||
effective "/cairo"))
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("guile-lib" ,guile-lib)
|
||||
("expat" ,expat)
|
||||
|
@ -1579,12 +1555,11 @@ glass artworks done by Venicians glass blowers.")
|
|||
`(("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("enchant" ,enchant)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
("gtk+" ,gtk+)
|
||||
("pango" ,pango)))
|
||||
(propagated-inputs
|
||||
`(("enchant" ,enchant))) ; gtkspell3-3.0.pc refers to it.
|
||||
`(("enchant" ,enchant-1.6))) ;gtkspell3-3.0.pc refers to it
|
||||
(home-page "http://gtkspell.sourceforge.net")
|
||||
(synopsis "Spell-checking addon for GTK's TextView widget")
|
||||
(description
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
||||
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -224,6 +225,20 @@ without requiring the source code to be rewritten.")
|
|||
(home-page "https://www.gnu.org/software/guile/")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public guile-2.0.13
|
||||
;; For testing a "minimal" Guix
|
||||
(hidden-package
|
||||
(package (inherit guile-2.0)
|
||||
(name "guile")
|
||||
(version "2.0.13")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/guile/guile-" version
|
||||
".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p")))))))
|
||||
|
||||
(define-public guile-2.2
|
||||
(package (inherit guile-2.0)
|
||||
(name "guile")
|
||||
|
@ -286,7 +301,30 @@ without requiring the source code to be rewritten.")
|
|||
; when heavily loaded)
|
||||
|
||||
(define-public guile-next
|
||||
(deprecated-package "guile-next" guile-2.2))
|
||||
;; This is the upcoming Guile 3.0, with JIT support.
|
||||
(let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779")
|
||||
(revision "1"))
|
||||
(package
|
||||
(inherit guile-2.2)
|
||||
(name "guile-next")
|
||||
(version "2.9.1")
|
||||
(source (origin
|
||||
(inherit (package-source guile-2.2))
|
||||
(uri (string-append "https://alpha.gnu.org/gnu/guile/guile-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0iba93yqn6mvgid0rfsrg4amym36pg9m8cqdplxsy222blrj9gh1"))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "GUILE_LOAD_PATH")
|
||||
(files '("share/guile/site/3.0")))
|
||||
(search-path-specification
|
||||
(variable "GUILE_LOAD_COMPILED_PATH")
|
||||
(files '("lib/guile/3.0/site-ccache"
|
||||
"share/guile/site/3.0")))))
|
||||
(properties '((ftp-server . "alpha.gnu.org")
|
||||
(upstream-name . "guile"))))))
|
||||
|
||||
(define (make-guile-readline guile)
|
||||
(package
|
||||
|
@ -1097,6 +1135,9 @@ Guile's foreign function interface.")
|
|||
"This package provides Guile bindings to the SQLite database system.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile2.0-sqlite3
|
||||
(package-for-guile-2.0 guile-sqlite3))
|
||||
|
||||
(define-public haunt
|
||||
(package
|
||||
(name "haunt")
|
||||
|
@ -1115,13 +1156,15 @@ Guile's foreign function interface.")
|
|||
#:tests? #f ; test suite is non-deterministic :(
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-haunt
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Wrap the 'haunt' command to refer to the right
|
||||
;; modules.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(site (string-append
|
||||
out "/share/guile/site")))
|
||||
out "/share/guile/site"))
|
||||
(deps (list (assoc-ref inputs "guile-reader")
|
||||
(assoc-ref inputs "guile-commonmark"))))
|
||||
(match (scandir site)
|
||||
(("." ".." version)
|
||||
(let ((modules (string-append site "/" version))
|
||||
|
@ -1130,9 +1173,19 @@ Guile's foreign function interface.")
|
|||
"/site-ccache")))
|
||||
(wrap-program (string-append bin "/haunt")
|
||||
`("GUILE_LOAD_PATH" ":" prefix
|
||||
(,modules))
|
||||
(,modules
|
||||
,@(map (lambda (dep)
|
||||
(string-append dep
|
||||
"/share/guile/site/"
|
||||
version))
|
||||
deps)))
|
||||
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
|
||||
(,compiled-modules)))
|
||||
(,compiled-modules
|
||||
,@(map (lambda (dep)
|
||||
(string-append dep "/lib/guile/"
|
||||
version
|
||||
"/site-ccache"))
|
||||
deps))))
|
||||
#t)))))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -1565,7 +1618,7 @@ you send to a FIFO file.")
|
|||
(define-public guile-commonmark
|
||||
(package
|
||||
(name "guile-commonmark")
|
||||
(version "0.1")
|
||||
(version "0.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/OrangeShark/" name
|
||||
|
@ -1573,24 +1626,12 @@ you send to a FIFO file.")
|
|||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12cb5fqvvgc87f5xp0ih5az305wnjia89l5jba83d0r2p8bfy0b0"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Use the real effective version of Guile in directory names
|
||||
;; instead of a hard-coded "/2.0".
|
||||
'(begin
|
||||
(substitute* "configure"
|
||||
(("ac_subst_vars='")
|
||||
"ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
|
||||
(substitute* "Makefile.in"
|
||||
(("moddir =.*")
|
||||
"moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n")
|
||||
(("godir =.*")
|
||||
"godir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
|
||||
#t))))
|
||||
"0kzclwkfijj8xka3g9kfj53y67c34ndfy84swdbw3j7y962ndxq6"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("guile" ,guile-2.2)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(synopsis "CommonMark parser for Guile")
|
||||
(description
|
||||
"guile-commonmark is a library for parsing CommonMark, a fully specified
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
(define-module (gnu packages hardware)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux)
|
||||
|
@ -35,14 +36,14 @@
|
|||
(define-public ddcutil
|
||||
(package
|
||||
(name "ddcutil")
|
||||
(version "0.9.1")
|
||||
(version "0.9.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.ddcutil.com/tarballs/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1b4bm3zhk5vnad6fxf0mn8nrlj3fngifl7nzxgxw0n56hlv7ccv0"))))
|
||||
(base32 "0nhi261vf2n3jpi0a0n6659911kxi3lj7a4h7cmv0ip6sbb8rk88"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -74,6 +75,115 @@ calibrated, and restored when the calibration is applied.")
|
|||
(license (list license:bsd-3 ; FindDDCUtil.cmake
|
||||
license:gpl2+)))) ; everything else
|
||||
|
||||
;; Distinct from memtest86, which is obsolete.
|
||||
(define-public memtest86+
|
||||
(package
|
||||
(name "memtest86+")
|
||||
;; Update the description when/if UEFI support is released.
|
||||
(version "5.01")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.memtest.org/download/5.01/memtest86+-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:system "i686-linux" ; the result runs outside of any OS
|
||||
#:tests? #f ; no way to test this
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
(replace 'build
|
||||
;; The default 'make all' does wonderful things, like scp(1) a file to
|
||||
;; 192.168.0.12. Build the bootable images and nothing more.
|
||||
(lambda _
|
||||
(invoke "make"
|
||||
"memtest" ; ELF executable
|
||||
"memtest.bin"))) ; DOS/MBR boot sector
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib/memtest86+"))
|
||||
(doc (string-append out "/share/doc/memtest86+-" ,version)))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(install-file file lib))
|
||||
(list "memtest"
|
||||
"memtest.bin"))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(install-file file doc))
|
||||
(list "FAQ"
|
||||
"README"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
;; Newer GCCs fail with a deluge of "multiple definition of `__foo'" errors.
|
||||
`(("gcc" ,gcc-4.9)))
|
||||
(supported-systems (list "i686-linux" "x86_64-linux"))
|
||||
(home-page "https://www.memtest.org/")
|
||||
(synopsis "Thorough real-mode memory tester")
|
||||
(description
|
||||
"Memtest86+ is a thorough, stand-alone memory test for x86 systems. It
|
||||
repeatedly writes different patterns to all memory locations, reads them back
|
||||
again, and verifies whether the result is the same as what was written. This
|
||||
can help debug even intermittent and non-deterministic errors.
|
||||
|
||||
It runs independently of any operating system, at computer boot-up, so that it
|
||||
can scan as much of your RAM as possible for hardware defects.
|
||||
|
||||
Memtest86+ cannot currently be used on computers booted with UEFI.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public memtester
|
||||
(package
|
||||
(name "memtester")
|
||||
(version "4.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
;; Even the latest release is available under 'old-versions/'.
|
||||
(uri (string-append "http://pyropus.ca/software/memtester/old-versions/"
|
||||
"memtester-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list "CC=gcc")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
;; This is a home-brewed configuration system where the cc/ld command
|
||||
;; lines are stored in one-line files.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
(substitute* (list "conf-cc" "conf-ld")
|
||||
(("^cc") "gcc"))
|
||||
(substitute* "Makefile"
|
||||
(("(INSTALLPATH.*=).*" _ assignment)
|
||||
(string-append assignment out)))
|
||||
#t)))
|
||||
(replace 'check
|
||||
;; There is no test suite. Test some RAM for a single iteration.
|
||||
(lambda _
|
||||
(invoke "./memtester" "64K" "1"))))))
|
||||
(home-page "http://pyropus.ca/software/memtester/")
|
||||
(synopsis "User-space memory subsystem tester")
|
||||
(description
|
||||
"Memtester stress-tests the memory subsystem of your operating system and
|
||||
computer. It repeatedly writes different patterns to all memory locations,
|
||||
reads them back again, and verifies whether the result is the same as what was
|
||||
written. This can help debug even intermittent and non-deterministic errors.
|
||||
|
||||
Memtester runs entirely in user space. This means that you don't need to reboot
|
||||
to test your memory, but also that it's not possible to test all of the RAM
|
||||
installed in the system.
|
||||
|
||||
It can also be told to test memory starting at a particular physical address.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public msr-tools
|
||||
(package
|
||||
(name "msr-tools")
|
||||
|
|
|
@ -54,7 +54,6 @@
|
|||
(inputs
|
||||
`(("ghc-generic-deriving" ,ghc-generic-deriving)
|
||||
("ghc-xml" ,ghc-xml)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-stm" ,ghc-stm)
|
||||
("ghc-tagged" ,ghc-tagged)
|
||||
("ghc-tasty" ,ghc-tasty)))
|
||||
|
@ -97,7 +96,7 @@ Haskell test framework.")
|
|||
(define-public ghc-tasty-quickcheck
|
||||
(package
|
||||
(name "ghc-tasty-quickcheck")
|
||||
(version "0.8.4")
|
||||
(version "0.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -106,7 +105,7 @@ Haskell test framework.")
|
|||
"tasty-quickcheck-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15rjxib5jmjq0hzj47x15kgp3awc73va4cy1pmpf7k3hvfv4qprn"))))
|
||||
"0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-quickcheck" ,ghc-quickcheck)
|
||||
|
@ -125,7 +124,7 @@ Haskell test framework.")
|
|||
(define-public ghc-tasty-golden
|
||||
(package
|
||||
(name "ghc-tasty-golden")
|
||||
(version "2.3.1.1")
|
||||
(version "2.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -135,12 +134,11 @@ Haskell test framework.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy"))))
|
||||
"0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-temporary" ,ghc-temporary)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
("ghc-tagged" ,ghc-tagged)
|
||||
("ghc-async" ,ghc-async)
|
||||
|
@ -183,7 +181,7 @@ timer functions of different operating systems via a unified API.")
|
|||
(define-public ghc-tasty
|
||||
(package
|
||||
(name "ghc-tasty")
|
||||
(version "0.11.0.4")
|
||||
(version "1.1.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -193,19 +191,18 @@ timer functions of different operating systems via a unified API.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0"))))
|
||||
"14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-stm" ,ghc-stm)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-tagged" ,ghc-tagged)
|
||||
("ghc-regex-tdfa" ,ghc-regex-tdfa)
|
||||
("ghc-regex-tdfa-rc" ,ghc-regex-tdfa-rc)
|
||||
("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
("ghc-unbounded-delays" ,ghc-unbounded-delays)
|
||||
("ghc-async" ,ghc-async)
|
||||
("ghc-ansi-terminal" ,ghc-ansi-terminal)
|
||||
("ghc-clock-bootstrap" ,ghc-clock-bootstrap)))
|
||||
("ghc-clock-bootstrap" ,ghc-clock-bootstrap)
|
||||
("ghc-wcwidth" ,ghc-wcwidth-bootstrap)))
|
||||
(home-page "http://documentup.com/feuerbach/tasty")
|
||||
(synopsis "Modern and extensible testing framework")
|
||||
(description "Tasty is a modern testing framework for Haskell. It lets
|
||||
|
@ -216,7 +213,7 @@ and any other types of tests into a single test suite.")
|
|||
(define-public ghc-tasty-hunit
|
||||
(package
|
||||
(name "ghc-tasty-hunit")
|
||||
(version "0.9.2")
|
||||
(version "0.10.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -226,10 +223,11 @@ and any other types of tests into a single test suite.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf"))))
|
||||
"0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-tasty" ,ghc-tasty)))
|
||||
`(("ghc-call-stack" ,ghc-call-stack-boot)
|
||||
("ghc-tasty" ,ghc-tasty)))
|
||||
(home-page "http://documentup.com/feuerbach/tasty")
|
||||
(synopsis "HUnit support for the Tasty test framework")
|
||||
(description "This package provides HUnit support for the Tasty Haskell
|
||||
|
@ -250,7 +248,6 @@ test framework.")
|
|||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)))
|
||||
(home-page "https://github.com/vincenthz/tasty-kat")
|
||||
|
@ -263,7 +260,7 @@ tasty.")
|
|||
(define-public ghc-tasty-th
|
||||
(package
|
||||
(name "ghc-tasty-th")
|
||||
(version "0.1.4")
|
||||
(version "0.1.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -272,10 +269,12 @@ tasty.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dff9si8i1qp0s7p4hlk0l29vq7wxfglw6mvlgmld43h7rllv88q"))))
|
||||
"0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-tasty" ,ghc-tasty)))
|
||||
`(("ghc-haskell-src-exts" ,ghc-haskell-src-exts)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)))
|
||||
(home-page "https://github.com/bennofs/tasty-th")
|
||||
(synopsis "Automatically generate tasty TestTrees")
|
||||
(description
|
||||
|
@ -288,7 +287,7 @@ test-framework.")
|
|||
(define-public ghc-tasty-rerun
|
||||
(package
|
||||
(name "ghc-tasty-rerun")
|
||||
(version "1.1.8")
|
||||
(version "1.1.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -296,11 +295,10 @@ test-framework.")
|
|||
"tasty-rerun-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788"))))
|
||||
"05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
`(("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
("ghc-reducers" ,ghc-reducers)
|
||||
("ghc-split" ,ghc-split)
|
||||
("ghc-stm" ,ghc-stm)
|
||||
|
@ -317,7 +315,7 @@ been added since previous test run.")
|
|||
(define-public ghc-tasty-expected-failure
|
||||
(package
|
||||
(name "ghc-tasty-expected-failure")
|
||||
(version "0.11.0.4")
|
||||
(version "0.11.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -326,7 +324,7 @@ been added since previous test run.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r555f18d2gj96pjyc13chn1nxaxl81am4xgip3mvvjhw8s5mva1"))))
|
||||
"1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-tagged" ,ghc-tagged)
|
||||
|
@ -356,7 +354,8 @@ development.")
|
|||
"1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "--allow-newer=base-compat")))
|
||||
`(#:cabal-revision
|
||||
("1" "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly")))
|
||||
(inputs
|
||||
`(("ghc-quickcheck" ,ghc-quickcheck)
|
||||
("ghc-base-compat" ,ghc-base-compat)
|
||||
|
@ -426,7 +425,7 @@ use HUnit assertions as QuickCheck properties.")
|
|||
(define-public ghc-quickcheck
|
||||
(package
|
||||
(name "ghc-quickcheck")
|
||||
(version "2.10.1")
|
||||
(version "2.11.3")
|
||||
(outputs '("out" "doc"))
|
||||
(source
|
||||
(origin
|
||||
|
@ -437,11 +436,10 @@ use HUnit assertions as QuickCheck properties.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx"))))
|
||||
"0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: currently missing libraries used for tests.
|
||||
#:configure-flags '("-f base4")))
|
||||
`(#:tests? #f)) ; FIXME: currently missing libraries used for tests.
|
||||
(inputs
|
||||
`(("ghc-random" ,ghc-random)
|
||||
("ghc-tf-random" ,ghc-tf-random)))
|
||||
|
@ -455,37 +453,10 @@ hold in a large number of randomly generated cases. Specifications are
|
|||
expressed in Haskell, using combinators defined in the QuickCheck library.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-quickcheck-2.9
|
||||
(package
|
||||
(inherit ghc-quickcheck)
|
||||
(name "ghc-quickcheck")
|
||||
(version "2.9.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/QuickCheck-2.9.2/QuickCheck-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m"))))))
|
||||
|
||||
(define-public ghc-quickcheck-latest
|
||||
(package (inherit ghc-quickcheck)
|
||||
(version "2.11.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/QuickCheck/QuickCheck-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328"))))))
|
||||
|
||||
(define-public ghc-test-framework
|
||||
(package
|
||||
(name "ghc-test-framework")
|
||||
(version "0.8.1.1")
|
||||
(version "0.8.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -493,10 +464,17 @@ expressed in Haskell, using combinators defined in the QuickCheck library.")
|
|||
"test-framework-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq"))))
|
||||
"1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "--allow-newer=time")))
|
||||
`(#:tests? #f ; FIXME: Tests do not build.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'update-constraints
|
||||
(lambda _
|
||||
(substitute* "test-framework.cabal"
|
||||
(("QuickCheck >= 2\\.3 && < 2\\.10")
|
||||
"QuickCheck >= 2.3 && < 2.12")))))))
|
||||
(native-inputs
|
||||
`(("ghc-hunit" ,ghc-hunit)
|
||||
("ghc-quickcheck" ,ghc-quickcheck)))
|
||||
|
@ -508,7 +486,8 @@ expressed in Haskell, using combinators defined in the QuickCheck library.")
|
|||
("ghc-random" ,ghc-random)
|
||||
("ghc-regex-posix" ,ghc-regex-posix)
|
||||
("ghc-xml" ,ghc-xml)
|
||||
("ghc-libxml" ,ghc-libxml)))
|
||||
("ghc-libxml" ,ghc-libxml)
|
||||
("ghc-semigroups" ,ghc-semigroups-bootstrap)))
|
||||
(home-page "https://batterseapower.github.io/test-framework/")
|
||||
(synopsis "Framework for running and organising tests")
|
||||
(description
|
||||
|
@ -533,9 +512,9 @@ reporting and test statistics output.")
|
|||
(base32
|
||||
"1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm"))))
|
||||
(build-system haskell-build-system)
|
||||
;; The official revision of the cabal file allows for HUnit lower than 1.7
|
||||
(arguments
|
||||
`(#:configure-flags (list "--allow-newer=HUnit")))
|
||||
`(#:cabal-revision
|
||||
("3" "0i9mlalv7cl1iq43ld5myrnpszq5rxmd79hk495dcb08rglhgl3z")))
|
||||
(inputs
|
||||
`(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
|
||||
("ghc-hunit" ,ghc-hunit)
|
||||
|
@ -560,6 +539,9 @@ reporting and test statistics output.")
|
|||
(base32
|
||||
"0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:cabal-revision
|
||||
("1" "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff")))
|
||||
(inputs
|
||||
`(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
|
||||
("ghc-quickcheck" ,ghc-quickcheck)
|
||||
|
@ -827,7 +809,6 @@ minimal dependencies.")
|
|||
"19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs `(("ghc-quickcheck" ,ghc-quickcheck)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-hunit" ,ghc-hunit)
|
||||
("ghc-test-framework" ,ghc-test-framework)
|
||||
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
|
||||
|
|
|
@ -70,8 +70,7 @@ format.")
|
|||
(inputs
|
||||
`(("ghc-hourglass" ,ghc-hourglass)
|
||||
("ghc-asn1-types" ,ghc-asn1-types)
|
||||
("ghc-text" ,ghc-text)
|
||||
("ghc-mtl" ,ghc-mtl)))
|
||||
("ghc-text" ,ghc-text)))
|
||||
(native-inputs
|
||||
`(("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
|
||||
|
@ -108,7 +107,7 @@ when ASN1 pattern matching is not convenient.")
|
|||
(define-public ghc-crypto-api
|
||||
(package
|
||||
(name "ghc-crypto-api")
|
||||
(version "0.13.2")
|
||||
(version "0.13.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -117,7 +116,7 @@ when ASN1 pattern matching is not convenient.")
|
|||
"crypto-api-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak"))))
|
||||
"19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs `(("ghc-cereal" ,ghc-cereal)
|
||||
("ghc-tagged" ,ghc-tagged)
|
||||
|
@ -211,7 +210,9 @@ that hides the C implementation.")
|
|||
"1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
|
||||
`(#:cabal-revision
|
||||
("2" "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a")
|
||||
#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
|
||||
(native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring)
|
||||
("ghc-puremd5" ,ghc-puremd5)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
|
@ -237,7 +238,9 @@ that hides the C implementation.")
|
|||
"1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
|
||||
`(#:cabal-revision
|
||||
("2" "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m")
|
||||
#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
|
||||
(native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring)
|
||||
("ghc-sha" ,ghc-sha)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
|
@ -250,6 +253,42 @@ pure API to the @uref{https://en.wikipedia.org/wiki/SHA-1, SHA-1 hash algorithm}
|
|||
including @uref{https://en.wikipedia.org/wiki/HMAC, HMAC support}, with
|
||||
performance close to the fastest implementations available in other languages.
|
||||
|
||||
The implementation is made in C with a haskell FFI wrapper that hides
|
||||
the C implementation.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-cryptohash-sha256
|
||||
(package
|
||||
(name "ghc-cryptohash-sha256")
|
||||
(version "0.11.101.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"cryptohash-sha256-" version "/"
|
||||
"cryptohash-sha256-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:cabal-revision
|
||||
("1" "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3")
|
||||
#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
|
||||
(inputs
|
||||
`(("ghc-base16-bytestring" ,ghc-base16-bytestring)))
|
||||
(native-inputs
|
||||
`(("ghc-sha" ,ghc-sha)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
|
||||
("ghc-hunit" ,ghc-hunit)))
|
||||
(home-page "https://github.com/hvr/cryptohash-sha1")
|
||||
(synopsis "SHA-256 implementation for Haskell")
|
||||
(description "This Haskell package provides an incremental and
|
||||
one-pass, pure API to the @uref{https://en.wikipedia.org/wiki/SHA-2,
|
||||
SHA-256 cryptographic hash algorithm}, with performance close to the
|
||||
fastest implementations available in other languages.
|
||||
|
||||
The implementation is made in C with a haskell FFI wrapper that hides
|
||||
the C implementation.")
|
||||
(license license:bsd-3)))
|
||||
|
@ -315,7 +354,7 @@ are implemented as FFI bindings to efficient code from zlib.")
|
|||
(define-public ghc-entropy
|
||||
(package
|
||||
(name "ghc-entropy")
|
||||
(version "0.3.8")
|
||||
(version "0.4.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -324,7 +363,7 @@ are implemented as FFI bindings to efficient code from zlib.")
|
|||
"entropy-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl"))))
|
||||
"1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "https://github.com/TomMD/entropy")
|
||||
(synopsis "Provides platform independent entropy source for Haskell")
|
||||
|
@ -335,18 +374,18 @@ to obtain cryptographically strong entropy.")
|
|||
(define-public ghc-pem
|
||||
(package
|
||||
(name "ghc-pem")
|
||||
(version "0.2.2")
|
||||
(version "0.2.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"pem/pem-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p"))))
|
||||
"1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-base64-bytestring" ,ghc-base64-bytestring)))
|
||||
`(("ghc-basement" ,ghc-basement)
|
||||
("ghc-memory" ,ghc-memory)))
|
||||
(native-inputs
|
||||
`(("ghc-test-framework" ,ghc-test-framework)
|
||||
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
|
||||
|
@ -393,14 +432,14 @@ interface.")
|
|||
(define-public ghc-sha
|
||||
(package
|
||||
(name "ghc-sha")
|
||||
(version "1.6.4.2")
|
||||
(version "1.6.4.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"SHA/SHA-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64"))))
|
||||
"0i4b2wjisivdy72synal711ywhx05mfqfba5n65rk8qidggm1nbb"))))
|
||||
(build-system haskell-build-system)
|
||||
(native-inputs
|
||||
`(("ghc-quickcheck" ,ghc-quickcheck)
|
||||
|
@ -420,18 +459,17 @@ libraries, like OpenSSL.")
|
|||
(define-public ghc-x509
|
||||
(package
|
||||
(name "ghc-x509")
|
||||
(version "1.6.4")
|
||||
(version "1.7.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"x509/x509-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hixx76wpb4qxida017ka5zr6lrsycahrqyw8z90q9mxvndpy3my"))))
|
||||
"0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-memory" ,ghc-memory)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-hourglass" ,ghc-hourglass)
|
||||
("ghc-pem" ,ghc-pem)
|
||||
("ghc-asn1-types" ,ghc-asn1-types)
|
||||
|
@ -450,7 +488,7 @@ libraries, like OpenSSL.")
|
|||
(define-public ghc-x509-store
|
||||
(package
|
||||
(name "ghc-x509-store")
|
||||
(version "1.6.2")
|
||||
(version "1.6.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
|
@ -458,15 +496,17 @@ libraries, like OpenSSL.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9"))))
|
||||
"0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-pem" ,ghc-pem)
|
||||
`(("ghc-pem" ,ghc-pem)
|
||||
("ghc-asn1-types" ,ghc-asn1-types)
|
||||
("ghc-asn1-encoding" ,ghc-asn1-encoding)
|
||||
("ghc-cryptonite" ,ghc-cryptonite)
|
||||
("ghc-x509" ,ghc-x509)))
|
||||
(native-inputs
|
||||
`(("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)))
|
||||
(home-page "https://github.com/vincenthz/hs-certificate")
|
||||
(synopsis "X.509 collection accessing and storing methods")
|
||||
(description
|
||||
|
@ -477,7 +517,7 @@ collections, certificates, revocation lists, and exception lists.")
|
|||
(define-public ghc-x509-validation
|
||||
(package
|
||||
(name "ghc-x509-validation")
|
||||
(version "1.6.5")
|
||||
(version "1.6.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
|
@ -485,12 +525,11 @@ collections, certificates, revocation lists, and exception lists.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"190w1sr3w6w49v3yvqz4grb0v09ym4gll3n8bxwijvbvcybk3xyi"))))
|
||||
"1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-memory" ,ghc-memory)
|
||||
("ghc-byteable" ,ghc-byteable)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-hourglass" ,ghc-hourglass)
|
||||
("ghc-data-default-class" ,ghc-data-default-class)
|
||||
("ghc-pem" ,ghc-pem)
|
||||
|
@ -499,6 +538,9 @@ collections, certificates, revocation lists, and exception lists.")
|
|||
("ghc-x509" ,ghc-x509)
|
||||
("ghc-x509-store" ,ghc-x509-store)
|
||||
("ghc-cryptonite" ,ghc-cryptonite)))
|
||||
(native-inputs
|
||||
`(("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-hunit" ,ghc-tasty-hunit)))
|
||||
(home-page "https://github.com/vincenthz/hs-certificate")
|
||||
(synopsis "X.509 certificate and revocation list validation")
|
||||
(description
|
||||
|
@ -509,7 +551,7 @@ list validation.")
|
|||
(define-public ghc-x509-system
|
||||
(package
|
||||
(name "ghc-x509-system")
|
||||
(version "1.6.4")
|
||||
(version "1.6.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
|
@ -517,11 +559,10 @@ list validation.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr"))))
|
||||
"06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-pem" ,ghc-pem)
|
||||
`(("ghc-pem" ,ghc-pem)
|
||||
("ghc-x509" ,ghc-x509)
|
||||
("ghc-x509-store" ,ghc-x509-store)))
|
||||
(home-page "https://github.com/vincenthz/hs-certificate")
|
||||
|
@ -660,3 +701,33 @@ percent.
|
|||
@item Monte Carlo value for Pi is 3.132465868 (error 0.29 percent).
|
||||
@end itemize")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-ed25519
|
||||
(package
|
||||
(name "ghc-ed25519")
|
||||
(version "0.0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/ed25519/ed25519-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:cabal-revision
|
||||
("2" "1cq6h3jqkb1kvd9fjfhsllg5gq78sdiyf2gy9862xhlbv6wil19f")
|
||||
;; We omit these test suites because they require old versions of
|
||||
;; packages and packages we do not have.
|
||||
#:configure-flags
|
||||
'("--flags=-test-hlint -test-doctests -test-properties")))
|
||||
(home-page "http://thoughtpolice.github.com/hs-ed25519")
|
||||
(synopsis "Ed25519 cryptographic signatures")
|
||||
(description "This package provides a simple, fast, self-contained
|
||||
copy of the Ed25519 public-key signature system with a clean interface.
|
||||
It also includes support for detached signatures, and thorough
|
||||
documentation on the design and implementation, including usage
|
||||
guidelines.")
|
||||
(license license:expat)))
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
(define-module (gnu packages haskell-web)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages haskell)
|
||||
#:use-module (gnu packages haskell-check)
|
||||
#:use-module (gnu packages haskell-crypto)
|
||||
|
@ -64,7 +65,7 @@ for screen-scraping.")
|
|||
(define-public ghc-cookie
|
||||
(package
|
||||
(name "ghc-cookie")
|
||||
(version "0.4.3")
|
||||
(version "0.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -74,7 +75,7 @@ for screen-scraping.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv"))))
|
||||
"1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-old-locale" ,ghc-old-locale)
|
||||
|
@ -171,7 +172,6 @@ both client and server code).")
|
|||
("ghc-old-time" ,ghc-old-time)
|
||||
("ghc-parsec" ,ghc-parsec)
|
||||
("ghc-puremd5" ,ghc-puremd5)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-network" ,ghc-network)
|
||||
("ghc-network-uri" ,ghc-network-uri)
|
||||
("ghc-split" ,ghc-split)))
|
||||
|
@ -230,7 +230,7 @@ for more user-friendly packages.")
|
|||
(define-public ghc-http-client-tls
|
||||
(package
|
||||
(name "ghc-http-client-tls")
|
||||
(version "0.3.5.1")
|
||||
(version "0.3.5.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
|
@ -238,7 +238,7 @@ for more user-friendly packages.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1"))))
|
||||
"0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7"))))
|
||||
(build-system haskell-build-system)
|
||||
;; Tests require Internet access
|
||||
(arguments `(#:tests? #f))
|
||||
|
@ -262,7 +262,7 @@ libraries, such as http-conduit.")
|
|||
(define-public ghc-http-date
|
||||
(package
|
||||
(name "ghc-http-date")
|
||||
(version "0.0.6.1")
|
||||
(version "0.0.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -271,7 +271,7 @@ libraries, such as http-conduit.")
|
|||
"http-date-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj"))))
|
||||
"09slbzqayjnqqz9zybk7slgzvizgplikqgg4b2flzgks91466k0g"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-attoparsec" ,ghc-attoparsec)))
|
||||
|
@ -350,7 +350,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.")
|
|||
("ghc-http-client" ,ghc-http-client)
|
||||
("ghc-http-client-tls" ,ghc-http-client-tls)
|
||||
("ghc-monad-control" ,ghc-monad-control)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-exceptions" ,ghc-exceptions)
|
||||
("ghc-unliftio" ,ghc-unliftio)))
|
||||
(native-inputs
|
||||
|
@ -370,7 +369,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.")
|
|||
("ghc-warp" ,ghc-warp)
|
||||
("ghc-wai-conduit" ,ghc-wai-conduit)
|
||||
("ghc-http-types" ,ghc-http-types)
|
||||
("ghc-http-client" ,ghc-http-client)
|
||||
("ghc-cookie" ,ghc-cookie)
|
||||
("ghc-conduit-extra" ,ghc-conduit-extra)
|
||||
("ghc-streaming-commons" ,ghc-streaming-commons)
|
||||
|
@ -387,7 +385,7 @@ which allow you to avoid direct usage of conduits.")
|
|||
(define-public ghc-wai
|
||||
(package
|
||||
(name "ghc-wai")
|
||||
(version "3.2.1.1")
|
||||
(version "3.2.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -397,7 +395,7 @@ which allow you to avoid direct usage of conduits.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x"))))
|
||||
"0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-bytestring-builder" ,ghc-bytestring-builder)
|
||||
|
@ -422,7 +420,7 @@ communication between web applications and web servers.")
|
|||
(define-public ghc-wai-logger
|
||||
(package
|
||||
(name "ghc-wai-logger")
|
||||
(version "2.3.0")
|
||||
(version "2.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -432,7 +430,7 @@ communication between web applications and web servers.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch"))))
|
||||
"0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported
|
||||
; by propagated-inputs.
|
||||
|
@ -455,7 +453,7 @@ communication between web applications and web servers.")
|
|||
(define-public ghc-wai-extra
|
||||
(package
|
||||
(name "ghc-wai-extra")
|
||||
(version "3.0.18")
|
||||
(version "3.0.24.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -465,7 +463,7 @@ communication between web applications and web servers.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r079mqqdv14fp97w0rigdpwk6b88grpjlqsjc5y8bbc0skf5za2"))))
|
||||
"07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
|
||||
|
@ -504,7 +502,7 @@ functionality.")
|
|||
(define-public ghc-wai-conduit
|
||||
(package
|
||||
(name "ghc-wai-conduit")
|
||||
(version "3.0.0.3")
|
||||
(version "3.0.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -513,7 +511,7 @@ functionality.")
|
|||
"wai-conduit-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4"))))
|
||||
"07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-conduit" ,ghc-conduit)
|
||||
|
@ -526,10 +524,34 @@ functionality.")
|
|||
Haskell's Web Application Interface (WAI).")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-bsb-http-chunked
|
||||
(package
|
||||
(name "ghc-bsb-http-chunked")
|
||||
(version "0.0.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/"
|
||||
"bsb-http-chunked/bsb-http-chunked-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-bytestring-builder" ,ghc-bytestring-builder)))
|
||||
(home-page "http://github.com/sjakobi/bsb-http-chunked")
|
||||
(synopsis "Chunked HTTP transfer encoding for bytestring builders")
|
||||
(description "This Haskell library contains functions for encoding
|
||||
bytestring builders for chunked Hypertext Transfer Protocol (HTTP) 1.1
|
||||
transfers.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-warp
|
||||
(package
|
||||
(name "ghc-warp")
|
||||
(version "3.2.11.1")
|
||||
(version "3.2.23")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -538,15 +560,12 @@ Haskell's Web Application Interface (WAI).")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zp5cy0bbj508vdvms1n5z80z37m253kwsqc5a83cfc990n6fgw5"))))
|
||||
"12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; FIXME: Test-Suite `spec` fails.
|
||||
(inputs
|
||||
`(("ghc-async" ,ghc-async)
|
||||
("ghc-auto-update" ,ghc-auto-update)
|
||||
("ghc-blaze-builder" ,ghc-blaze-builder)
|
||||
("ghc-bytestring-builder" ,ghc-bytestring-builder)
|
||||
("ghc-bsb-http-chunked" ,ghc-bsb-http-chunked)
|
||||
("ghc-case-insensitive" ,ghc-case-insensitive)
|
||||
("ghc-hashable" ,ghc-hashable)
|
||||
("ghc-http-types" ,ghc-http-types)
|
||||
|
@ -559,18 +578,18 @@ Haskell's Web Application Interface (WAI).")
|
|||
("ghc-vault" ,ghc-vault)
|
||||
("ghc-wai" ,ghc-wai)
|
||||
("ghc-word8" ,ghc-word8)
|
||||
("ghc-lifted-base" ,ghc-lifted-base)
|
||||
("ghc-http-date" ,ghc-http-date)
|
||||
("ghc-simple-sendfile" ,ghc-simple-sendfile)
|
||||
("ghc-http2" ,ghc-http2)))
|
||||
(native-inputs
|
||||
`(("ghc-silently" ,ghc-silently)
|
||||
`(("curl" ,curl)
|
||||
("ghc-silently" ,ghc-silently)
|
||||
("ghc-hspec" ,ghc-hspec)
|
||||
("ghc-auto-update" ,ghc-auto-update)
|
||||
("ghc-doctest" ,ghc-doctest)
|
||||
("ghc-lifted-base" ,ghc-lifted-base)
|
||||
("ghc-quickcheck" ,ghc-quickcheck)
|
||||
("ghc-hunit" ,ghc-hunit)
|
||||
("ghc-http" ,ghc-http)
|
||||
("ghc-http-client" ,ghc-http-client)
|
||||
("hspec-discover" ,hspec-discover)))
|
||||
(home-page "http://github.com/yesodweb/wai")
|
||||
(synopsis "HTTP server library for Haskell's WAI")
|
||||
|
@ -578,10 +597,36 @@ Haskell's Web Application Interface (WAI).")
|
|||
based WAI (Web Application Interface in Haskell).")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ghc-tls-session-manager
|
||||
(package
|
||||
(name "ghc-tls-session-manager")
|
||||
(version "0.0.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/"
|
||||
"tls-session-manager/tls-session-manager-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-auto-update" ,ghc-auto-update)
|
||||
("ghc-clock" ,ghc-clock)
|
||||
("ghc-psqueues" ,ghc-psqueues)
|
||||
("ghc-tls" ,ghc-tls)))
|
||||
(home-page "http://hackage.haskell.org/package/tls-session-manager")
|
||||
(synopsis "In-memory TLS session manager")
|
||||
(description "This Haskell library provides a TLS session manager with
|
||||
limitation, automatic pruning, energy saving and replay resistance.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-warp-tls
|
||||
(package
|
||||
(name "ghc-warp-tls")
|
||||
(version "3.2.3")
|
||||
(version "3.2.4.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -590,7 +635,7 @@ based WAI (Web Application Interface in Haskell).")
|
|||
"warp-tls-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14m2bzk5ivz9gdpxlcj6qnh46f2lycm1ybdjnfkj2876zrqwii7m"))))
|
||||
"17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-cryptonite" ,ghc-cryptonite)
|
||||
|
@ -598,6 +643,7 @@ based WAI (Web Application Interface in Haskell).")
|
|||
("ghc-network" ,ghc-network)
|
||||
("ghc-streaming-commons" ,ghc-streaming-commons)
|
||||
("ghc-tls" ,ghc-tls)
|
||||
("ghc-tls-session-manager" ,ghc-tls-session-manager)
|
||||
("ghc-wai" ,ghc-wai)
|
||||
("ghc-warp" ,ghc-warp)))
|
||||
(home-page "http://github.com/yesodweb/wai")
|
||||
|
@ -609,7 +655,7 @@ a WAI handler, via the native Haskell TLS implementation.")
|
|||
(define-public ghc-xss-sanitize
|
||||
(package
|
||||
(name "ghc-xss-sanitize")
|
||||
(version "0.3.5.7")
|
||||
(version "0.3.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -618,7 +664,7 @@ a WAI handler, via the native Haskell TLS implementation.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"005cmhaw9xbzkcn42jmhvcvk63bzmg4lml368xwmqdvh7r0mcn4m"))))
|
||||
"1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-tagsoup" ,ghc-tagsoup)
|
||||
|
@ -666,7 +712,7 @@ Haskell.")
|
|||
(define-public ghc-mime-types
|
||||
(package
|
||||
(name "ghc-mime-types")
|
||||
(version "0.1.0.7")
|
||||
(version "0.1.0.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
|
@ -674,7 +720,7 @@ Haskell.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3"))))
|
||||
"14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-text" ,ghc-text)))
|
||||
|
@ -710,7 +756,7 @@ documents.")
|
|||
(define-public ghc-xhtml
|
||||
(package
|
||||
(name "ghc-xhtml")
|
||||
(version "3000.2.1")
|
||||
(version "3000.2.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -720,7 +766,7 @@ documents.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik"))))
|
||||
"0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "https://github.com/haskell/xhtml")
|
||||
(synopsis "XHTML combinator library")
|
||||
|
@ -732,7 +778,7 @@ Strict, Transitional and Frameset variants.")
|
|||
(define-public ghc-blaze-html
|
||||
(package
|
||||
(name "ghc-blaze-html")
|
||||
(version "0.9.0.1")
|
||||
(version "0.9.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -741,11 +787,8 @@ Strict, Transitional and Frameset variants.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf"))))
|
||||
"06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "--allow-newer=QuickCheck"
|
||||
"--allow-newer=HUnit")))
|
||||
(inputs
|
||||
`(("ghc-blaze-builder" ,ghc-blaze-builder)
|
||||
("ghc-text" ,ghc-text)
|
||||
|
@ -764,7 +807,7 @@ Strict, Transitional and Frameset variants.")
|
|||
(define-public ghc-aeson
|
||||
(package
|
||||
(name "ghc-aeson")
|
||||
(version "1.2.4.0")
|
||||
(version "1.3.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -774,7 +817,7 @@ Strict, Transitional and Frameset variants.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l"))))
|
||||
"1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
|
||||
(inputs
|
||||
|
@ -808,22 +851,10 @@ for Haskell, optimized for ease of use and high performance. (A note on
|
|||
naming: in Greek mythology, Aeson was the father of Jason.)")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-aeson-for-pandoc-1
|
||||
(package (inherit ghc-aeson)
|
||||
(version "1.1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/aeson/aeson-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"))))))
|
||||
|
||||
(define-public ghc-aeson-pretty
|
||||
(package
|
||||
(name "ghc-aeson-pretty")
|
||||
(version "0.8.5")
|
||||
(version "0.8.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -831,7 +862,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx"))))
|
||||
"1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-aeson" ,ghc-aeson)
|
||||
|
@ -889,7 +920,7 @@ of a JSON value into a @code{Data.Aeson.Value}.")
|
|||
(define-public ghc-multipart
|
||||
(package
|
||||
(name "ghc-multipart")
|
||||
(version "0.1.2")
|
||||
(version "0.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -899,9 +930,11 @@ of a JSON value into a @code{Data.Aeson.Value}.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5"))))
|
||||
"1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs `(("ghc-parsec" ,ghc-parsec)))
|
||||
(inputs
|
||||
`(("ghc-parsec" ,ghc-parsec)
|
||||
("ghc-stringsearch" ,ghc-stringsearch)))
|
||||
(home-page
|
||||
"http://www.github.com/silkapp/multipart")
|
||||
(synopsis
|
||||
|
@ -1023,7 +1056,7 @@ avoid any issues with characters.")
|
|||
(define-public ghc-yesod-core
|
||||
(package
|
||||
(name "ghc-yesod-core")
|
||||
(version "1.4.37")
|
||||
(version "1.6.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1032,18 +1065,18 @@ avoid any issues with characters.")
|
|||
"yesod-core-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ww8hl0cx2g58zrdx3j6d5m2xwhssbajdqws1xk6rzl7rpfm1b9j"))))
|
||||
"0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs `(("ghc-wai" ,ghc-wai)
|
||||
("ghc-extra" ,ghc-extra)
|
||||
("ghc-text" ,ghc-text)
|
||||
("ghc-shakespeare" ,ghc-shakespeare)
|
||||
("ghc-blaze-builder" ,ghc-blaze-builder)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-clientsession" ,ghc-clientsession)
|
||||
("ghc-random" ,ghc-random)
|
||||
("ghc-cereal" ,ghc-cereal)
|
||||
("ghc-old-locale" ,ghc-old-locale)
|
||||
("ghc-unliftio" ,ghc-unliftio)
|
||||
("ghc-unordered-containers" ,ghc-unordered-containers)
|
||||
("ghc-monad-control" ,ghc-monad-control)
|
||||
("ghc-transformers-base" ,ghc-transformers-base)
|
||||
|
@ -1058,6 +1091,7 @@ avoid any issues with characters.")
|
|||
("ghc-monad-logger" ,ghc-monad-logger)
|
||||
("ghc-conduit" ,ghc-conduit)
|
||||
("ghc-resourcet" ,ghc-resourcet)
|
||||
("ghc-rio" ,ghc-rio)
|
||||
("ghc-lifted-base" ,ghc-lifted-base)
|
||||
("ghc-blaze-html" ,ghc-blaze-html)
|
||||
("ghc-blaze-markup" ,ghc-blaze-markup)
|
||||
|
@ -1093,7 +1127,7 @@ functions, widgets, etc.")
|
|||
(define-public ghc-yesod-persistent
|
||||
(package
|
||||
(name "ghc-yesod-persistent")
|
||||
(version "1.4.3")
|
||||
(version "1.6.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1102,7 +1136,7 @@ functions, widgets, etc.")
|
|||
"yesod-persistent-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kiksw46c8ww9yiwl28pkrppx8d6fhsasr0hvmsliqbrp16likj8"))))
|
||||
"1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH.
|
||||
(inputs `(("ghc-yesod-core" ,ghc-yesod-core)
|
||||
|
@ -1126,7 +1160,7 @@ from Yesod.")
|
|||
(define-public ghc-yesod-form
|
||||
(package
|
||||
(name "ghc-yesod-form")
|
||||
(version "1.4.16")
|
||||
(version "1.6.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1136,7 +1170,7 @@ from Yesod.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lij3m5vn8nvh6y88r1dhk03xmmjwmjzazm307nc2wvc5fmx9p2j"))))
|
||||
"1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-yesod-core" ,ghc-yesod-core)
|
||||
|
@ -1169,7 +1203,7 @@ providing richtext field using Nic editor. ")
|
|||
(define-public ghc-yesod
|
||||
(package
|
||||
(name "ghc-yesod")
|
||||
(version "1.4.5")
|
||||
(version "1.6.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1178,7 +1212,7 @@ providing richtext field using Nic editor. ")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sg66nq8yaas2m5nqsdrxricvcizd1ik02zqk60sxh3wna08fz16"))))
|
||||
"0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-yesod-core" ,ghc-yesod-core)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -21,25 +22,33 @@
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu))
|
||||
|
||||
(define-public hexedit
|
||||
(package
|
||||
(name "hexedit")
|
||||
(version "1.2.13")
|
||||
(version "1.4.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://rigaux.org/"
|
||||
name "-" version ".src.tgz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pixel/hexedit.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka"))))
|
||||
"1xsxa5mip892jkvz9jshj73y6c7j3mgp8y393ciihqlyf2nmfs67"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments '(#:tests? #f)) ; no check target
|
||||
(inputs `(("ncurses" ,ncurses)))
|
||||
(arguments '(#:tests? #f)) ; no check target
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)))
|
||||
(inputs
|
||||
`(("ncurses" ,ncurses)))
|
||||
(synopsis "View and edit files or devices in hexadecimal or ASCII")
|
||||
(description "hexedit shows a file both in ASCII and in hexadecimal. The
|
||||
file can be a device as the file is read a piece at a time. You can modify
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
(define-public ibus
|
||||
(package
|
||||
(name "ibus")
|
||||
(version "1.5.17")
|
||||
(version "1.5.19")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ibus/ibus/"
|
||||
|
@ -52,22 +52,29 @@
|
|||
version "/ibus-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06fj7lawww5d5w73pk249191lvmpz7shlxfxia74bjkpb42shiq3"))))
|
||||
"0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; tests fail because there's no connection to dbus
|
||||
#:configure-flags '("--disable-emoji-dict" ; cannot find emoji.json path
|
||||
#:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path
|
||||
"--disable-python2"
|
||||
"--enable-python-library"
|
||||
,(string-append "--with-ucd-dir="
|
||||
(getcwd) "/ucd")
|
||||
"--enable-wayland")
|
||||
#:make-flags
|
||||
(list "CC=gcc"
|
||||
(string-append "pyoverridesdir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/python2.7/site-packages/gi/overrides/")
|
||||
(string-append "py2overridesdir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/python2.7/site-packages/gi/overrides/"))
|
||||
"/lib/python3.6/site-packages/gi/overrides/"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'prepare-ucd-dir
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(mkdir-p "../ucd")
|
||||
(symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt")
|
||||
(symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt")
|
||||
#t))
|
||||
(add-before 'configure 'disable-dconf-update
|
||||
(lambda _
|
||||
(substitute* "data/dconf/Makefile.in"
|
||||
|
@ -117,11 +124,23 @@
|
|||
("wayland" ,wayland)
|
||||
("xmodmap" ,xmodmap)
|
||||
("iso-codes" ,iso-codes)
|
||||
("pygobject2" ,python2-pygobject)
|
||||
("python2" ,python-2)))
|
||||
("pygobject2" ,python-pygobject)
|
||||
("python" ,python)))
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin") ; for glib-genmarshal
|
||||
("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler
|
||||
("unicode-nameslist"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.unicode.org/Public/UNIDATA/NamesList.txt")
|
||||
(sha256
|
||||
(base32 "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8"))))
|
||||
("unicode-blocks"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.unicode.org/Public/UNIDATA/Blocks.txt")
|
||||
(sha256
|
||||
(base32 "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b"))))
|
||||
("vala" ,vala)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(native-search-paths
|
||||
|
|
|
@ -55,6 +55,12 @@
|
|||
(string-prefix? "mips" s)))
|
||||
'("--with-data-packaging=archive")
|
||||
'()))
|
||||
,@(if (string-prefix? "i686" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
;; FIXME: Some tests are failing on i686:
|
||||
;; <https://unicode-org.atlassian.net/browse/ICU-20080>.
|
||||
'(#:tests? #f)
|
||||
'())
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir-to-source
|
||||
|
|
|
@ -31,56 +31,10 @@
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages))
|
||||
|
||||
(define ghc-aeson-1.1.2.0
|
||||
(package (inherit ghc-aeson)
|
||||
(version "1.1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/aeson/aeson-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"))))))
|
||||
|
||||
(define ghc-trifecta-1.6.2.1
|
||||
(package (inherit ghc-trifecta)
|
||||
(version "1.6.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/trifecta/"
|
||||
"trifecta-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"))))))
|
||||
|
||||
;; ghc-cheapskate appeared too new. This follows LTS Haskell.
|
||||
(define ghc-cheapskate-0.1.0.5
|
||||
(package
|
||||
(inherit ghc-cheapskate)
|
||||
(version "0.1.0.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://hackage.haskell.org/package/cheapskate/cheapskate-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs"))))
|
||||
(arguments
|
||||
;; LTS Haskell says data-default >=0.5 && <0.8
|
||||
`(#:configure-flags (list "--allow-newer=data-default")))))
|
||||
|
||||
(define-public idris
|
||||
(package
|
||||
(name "idris")
|
||||
(version "1.0")
|
||||
(version "1.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -88,12 +42,12 @@
|
|||
"idris-" version "/idris-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h"))))
|
||||
"1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("gmp" ,gmp)
|
||||
("ncurses" ,ncurses)
|
||||
("ghc-aeson" ,ghc-aeson-1.1.2.0)
|
||||
("ghc-aeson" ,ghc-aeson)
|
||||
("ghc-annotated-wl-pprint" ,ghc-annotated-wl-pprint)
|
||||
("ghc-ansi-terminal" ,ghc-ansi-terminal)
|
||||
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
|
||||
|
@ -101,12 +55,12 @@
|
|||
("ghc-base64-bytestring" ,ghc-base64-bytestring)
|
||||
("ghc-blaze-html" ,ghc-blaze-html)
|
||||
("ghc-blaze-markup" ,ghc-blaze-markup)
|
||||
("ghc-cheapskate" ,ghc-cheapskate-0.1.0.5)
|
||||
("ghc-cheapskate" ,ghc-cheapskate)
|
||||
("ghc-code-page" ,ghc-code-page)
|
||||
("ghc-fingertree" ,ghc-fingertree)
|
||||
("ghc-fsnotify" ,ghc-fsnotify)
|
||||
("ghc-ieee754" ,ghc-ieee754)
|
||||
("ghc-mtl" ,ghc-mtl)
|
||||
("ghc-megaparsec" ,ghc-megaparsec)
|
||||
("ghc-network" ,ghc-network)
|
||||
("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
("ghc-regex-tdfa" ,ghc-regex-tdfa)
|
||||
|
@ -114,7 +68,6 @@
|
|||
("ghc-split" ,ghc-split)
|
||||
("ghc-terminal-size" ,ghc-terminal-size)
|
||||
("ghc-text" ,ghc-text)
|
||||
("ghc-trifecta" ,ghc-trifecta-1.6.2.1)
|
||||
("ghc-uniplate" ,ghc-uniplate)
|
||||
("ghc-unordered-containers" ,ghc-unordered-containers)
|
||||
("ghc-utf8-string" ,ghc-utf8-string)
|
||||
|
@ -132,6 +85,11 @@
|
|||
(lambda _
|
||||
(setenv "CC" "gcc")
|
||||
#t))
|
||||
(add-before 'configure 'update-constraints
|
||||
(lambda _
|
||||
(substitute* "idris.cabal"
|
||||
(("aeson >= 0\\.6 && < 1\\.3")
|
||||
"aeson >= 0.6 && < 1.4"))))
|
||||
(add-after 'install 'fix-libs-install-location
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
|
|
@ -200,7 +200,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
|
|||
(define-public opencv
|
||||
(package
|
||||
(name "opencv")
|
||||
(version "3.4.1")
|
||||
(version "3.4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/opencv/opencv/archive/"
|
||||
|
@ -208,7 +208,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
|
|||
(file-name (string-append name "-" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1g8pvnlkzzp50amd89149hqsbvsc2hq3vk1d6a9fksdcx8ra9g94"))
|
||||
"0pycx1pz8lj794q32mlalyc3ijqxwsyin65r26nh4yc0p71xiirp"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -345,7 +345,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
|
|||
"opencv/opencv_extra/zip/" version))
|
||||
(file-name (string-append "opencv-extra-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0wfh3pvfxqydf7hsccp50npcsg37sf6fqi6cd3zkc4qil9zhpbps"))))
|
||||
(base32 "0yd1vidzbg6himxyh4yzivywijg8548kfmcn421khabnipm7l74y"))))
|
||||
("opencv-contrib"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
|
@ -353,7 +353,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
|
|||
"opencv/opencv_contrib/zip/" version))
|
||||
(file-name (string-append "opencv-contrib-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "18zm0qmjcdvg90c33gzv0ws0xdaid1xpqzz2xa9l2x12qkr6zj3p"))))))
|
||||
(base32 "0j0ci6ia1qwklp9hq07ypl0vkngj1wrgh6n98n657m5d0pyp4m0g"))))))
|
||||
(inputs `(("libjpeg" ,libjpeg)
|
||||
("libpng" ,libpng)
|
||||
("jasper" ,jasper)
|
||||
|
|
|
@ -1347,16 +1347,18 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI
|
|||
(define-public libiptcdata
|
||||
(package
|
||||
(name "libiptcdata")
|
||||
(version "1.0.4")
|
||||
(version "1.0.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/" name "/" name "/"
|
||||
version "/" name "-" version ".tar.gz"))
|
||||
(uri (string-append "https://github.com/ianw/libiptcdata"
|
||||
"/releases/download/release_"
|
||||
(string-join (string-split version #\.) "_")
|
||||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr"))))
|
||||
"17m2bscc76r1bymjgb44fbbfrdsjfqyb2ivg9wchyllm8pgx1560"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://libiptcdata.sourceforge.net/")
|
||||
(home-page "https://github.com/ianw/libiptcdata")
|
||||
(synopsis "IPTC metadata manipulation library")
|
||||
(description
|
||||
"Libiptcdata is a C library for manipulating the International Press
|
||||
|
|
|
@ -47,14 +47,14 @@
|
|||
;; The 7 release series has an incompatible API, while the 6 series is still
|
||||
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
|
||||
;; users are ready for the 7-series API.
|
||||
(version "6.9.10-10")
|
||||
(version "6.9.10-12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0b0wwxm6mgaxq0i0hazxcpbk7xd5j1329r1vk9h07iz4v3k8i57h"))))
|
||||
"0ri96yqihdk921k5qx23y2sbhraxbp2avdccxiy6m3srjkirym2l"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
|
||||
|
|
|
@ -1948,27 +1948,43 @@ designs.")
|
|||
license:asl2.0
|
||||
license:cpl1.0)))))
|
||||
|
||||
(define-public javacc
|
||||
(define-public javacc-4
|
||||
(package
|
||||
(name "javacc")
|
||||
(version "7.0.3")
|
||||
(version "4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/javacc/javacc/"
|
||||
"archive/" version ".tar.gz"))
|
||||
(file-name (string-append "javacc-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/javacc/javacc.git")
|
||||
(commit "release_41")))
|
||||
(file-name (string-append "javacc-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))))
|
||||
"07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0"))
|
||||
(modules '((guix build utils)))
|
||||
;; delete bundled jars
|
||||
(snippet '(begin (delete-file-recursively "lib") #t))))
|
||||
(build-system ant-build-system)
|
||||
;; Tests fail with
|
||||
;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml:60:
|
||||
;; JAVACODE failed
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
`(#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-bundled-libs
|
||||
;; Delete tests to avoid build failure (we don't run them anyway).
|
||||
(add-after 'unpack 'delete-tests
|
||||
(lambda _
|
||||
(delete-file-recursively "lib") #t))
|
||||
(replace 'install (install-jars "target")))))
|
||||
(for-each delete-file
|
||||
'("src/org/javacc/JavaCCTestCase.java"
|
||||
"src/org/javacc/parser/ExpansionTest.java"
|
||||
"src/org/javacc/parser/OptionsTest.java"
|
||||
"src/org/javacc/jjtree/JJTreeOptionsTest.java"))
|
||||
(for-each delete-file-recursively
|
||||
'("src/org/javacc/parser/test"
|
||||
"src/org/javacc/jjdoc/test"))
|
||||
#t))
|
||||
(replace 'install (install-jars "bin/lib")))))
|
||||
(home-page "https://javacc.org/")
|
||||
(synopsis "Java parser generator")
|
||||
(description "Java Compiler Compiler (JavaCC) is the most popular parser
|
||||
|
@ -1980,29 +1996,34 @@ as tree building (via a tool called JJTree included with JavaCC), actions,
|
|||
debugging, etc.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public javacc-4
|
||||
(package (inherit javacc)
|
||||
(version "4.1")
|
||||
(define-public javacc
|
||||
(package
|
||||
(inherit javacc-4)
|
||||
(version "7.0.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/javacc/javacc.git")
|
||||
(commit "release_41")))
|
||||
(file-name (string-append "javacc-" version "-checkout"))
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/javacc/javacc/"
|
||||
"archive/" version ".tar.gz"))
|
||||
(file-name (string-append "javacc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0"))))
|
||||
;; Tests fail with
|
||||
;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml:60:
|
||||
;; JAVACODE failed
|
||||
"111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))
|
||||
(modules '((guix build utils)))
|
||||
;; delete bundled jars
|
||||
(snippet '(begin (for-each delete-file-recursively
|
||||
'("bootstrap" "lib"))
|
||||
#t))))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
`(#:make-flags ; bootstrap from javacc-4
|
||||
(list (string-append "-Dbootstrap-jar="
|
||||
(assoc-ref %build-inputs "javacc")
|
||||
"/share/java/javacc.jar"))
|
||||
#:test-target "test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-bundled-libs
|
||||
(lambda _
|
||||
(delete-file-recursively "lib") #t))
|
||||
(replace 'install (install-jars "bin/lib")))))))
|
||||
(replace 'install (install-jars "target")))))
|
||||
(native-inputs
|
||||
`(("javacc" ,javacc-4)))))
|
||||
|
||||
;; This is the last 3.x release of ECJ
|
||||
(define-public java-ecj-3
|
||||
|
@ -4288,6 +4309,85 @@ setter and getter method.")
|
|||
file filters and endian classes.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public java-commons-exec-1.1
|
||||
(package
|
||||
(name "java-commons-exec")
|
||||
(version "1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/commons/exec/source/"
|
||||
"commons-exec-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"025dk8xgj10lxwwwqp0hng2rn7fr4vcirxzydqzx9k4dim667alk"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:make-flags
|
||||
(list (string-append "-Dmaven.junit.jar="
|
||||
(assoc-ref %build-inputs "java-junit")
|
||||
"/share/java/junit.jar"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'delete-network-tests
|
||||
(lambda _
|
||||
(delete-file "src/test/java/org/apache/commons/exec/DefaultExecutorTest.java")
|
||||
(substitute* "src/test/java/org/apache/commons/exec/TestRunner.java"
|
||||
(("suite\\.addTestSuite\\(DefaultExecutorTest\\.class\\);") ""))
|
||||
#t))
|
||||
;; The "build" phase automatically tests.
|
||||
(delete 'check)
|
||||
(replace 'install (install-jars "target")))))
|
||||
(native-inputs
|
||||
`(("java-junit" ,java-junit)))
|
||||
(home-page "http://commons.apache.org/proper/commons-exec/")
|
||||
(synopsis "Common program execution related classes")
|
||||
(description "Commons-Exec simplifies executing external processes.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public java-commons-exec
|
||||
(package
|
||||
(inherit java-commons-exec-1.1)
|
||||
(version "1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/commons/exec/source/"
|
||||
"commons-exec-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17yb4h6f8l49c5iyyvda4z2nmw0bxrx857nrwmsr7mmpb7x441yv"))))
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:make-flags
|
||||
(list (string-append "-Dmaven.junit.jar="
|
||||
(assoc-ref %build-inputs "java-junit")
|
||||
"/share/java/junit.jar")
|
||||
"-Dmaven.compiler.source=1.7"
|
||||
"-Dmaven.compiler.target=1.7")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'delete-network-tests
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; This test hangs indefinitely.
|
||||
(delete-file "src/test/java/org/apache/commons/exec/issues/Exec60Test.java")
|
||||
(substitute* "src/test/java/org/apache/commons/exec/issues/Exec41Test.java"
|
||||
(("ping -c 10 127.0.0.1") "sleep 10"))
|
||||
(substitute* "src/test/java/org/apache/commons/exec/issues/Exec49Test.java"
|
||||
(("/bin/ls") "ls"))
|
||||
(call-with-output-file "src/test/scripts/ping.sh"
|
||||
(lambda (port)
|
||||
(format port "#!~a/bin/sh\nsleep $1\n"
|
||||
(assoc-ref inputs "bash"))))
|
||||
#t))
|
||||
;; The "build" phase automatically tests.
|
||||
(delete 'check)
|
||||
(replace 'install (install-jars "target")))))
|
||||
(native-inputs
|
||||
`(("java-junit" ,java-junit)
|
||||
("java-hamcrest-core" ,java-hamcrest-core)))))
|
||||
|
||||
(define-public java-commons-lang
|
||||
(package
|
||||
(name "java-commons-lang")
|
||||
|
@ -7585,6 +7685,55 @@ configuration.")
|
|||
(description "This package is the jaxb annotations module for jackson.")
|
||||
(license license:asl2.0))); found on wiki.fasterxml.com/JacksonLicensing
|
||||
|
||||
(define-public java-fasterxml-jackson-modules-base-mrbean
|
||||
(package
|
||||
(name "java-fasterxml-jackson-modules-base-mrbean")
|
||||
(version "2.9.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/FasterXML/"
|
||||
"jackson-modules-base/archive/"
|
||||
"jackson-modules-base-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wws95xi8sppp6b0k2vvjdjyynl20r1a4dwrhai08lzlria6blp5"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:jar-name "jackson-modules-base-mrbean.jar"
|
||||
#:source-dir "mrbean/src/main/java"
|
||||
#:test-dir "mrbean/src/test"
|
||||
#:test-exclude
|
||||
;; Base class for tests
|
||||
(list "**/BaseTest.java")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'generate-PackageVersion.java
|
||||
(lambda _
|
||||
(let* ((out (string-append "mrbean/src/main/java/com/fasterxml/"
|
||||
"jackson/module/mrbean/PackageVersion.java"))
|
||||
(in (string-append out ".in")))
|
||||
(copy-file in out)
|
||||
(substitute* out
|
||||
(("@package@") "com.fasterxml.jackson.module.mrbean")
|
||||
(("@projectversion@") ,version)
|
||||
(("@projectgroupid@") "com.fasterxml.jackson.module.mrbean")
|
||||
(("@projectartifactid@") "jackson-module-mrbean")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("java-asm" ,java-asm)
|
||||
("java-fasterxml-jackson-annotations"
|
||||
,java-fasterxml-jackson-annotations)
|
||||
("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core)
|
||||
("java-fasterxml-jackson-databind" ,java-fasterxml-jackson-databind)))
|
||||
(native-inputs
|
||||
`(("java-junit" ,java-junit)))
|
||||
(home-page "https://github.com/FasterXML/jackson-modules-base")
|
||||
(synopsis "POJO type materialization for Java")
|
||||
(description "This package implements POJO type materialization.
|
||||
Databinders can construct implementation classes for Java interfaces as part
|
||||
of deserialization.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public java-snakeyaml
|
||||
(package
|
||||
(name "java-snakeyaml")
|
||||
|
@ -9506,6 +9655,39 @@ Candidate Recommendation, and will correctly serialize XML 1.1 documents if
|
|||
the DOM level 3 load/save API's are in use.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public java-jakarta-regexp
|
||||
(package
|
||||
(name "java-jakarta-regexp")
|
||||
(version "1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://archive.apache.org/dist/jakarta/regexp/jakarta-regexp-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zg9rmyif48dck0cv6ynpxv23mmcsx265am1fnnxss7brgw0ms3r"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(out-share (string-append out "/share/java")))
|
||||
(mkdir-p out-share)
|
||||
(for-each (lambda (name)
|
||||
(install-file name out-share))
|
||||
(find-files "build" "^jakarta-regexp-.*\\.jar$"))
|
||||
#t))))))
|
||||
(home-page "https://attic.apache.org/projects/jakarta-regexp.html")
|
||||
(synopsis "Regular expression parser generator for Java.")
|
||||
(description "@code{jakarta-regexp} is an old regular expression parser
|
||||
generator for Java.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public java-jline
|
||||
(package
|
||||
(name "java-jline")
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Mark Meyer <mark@ofosos.org>
|
||||
;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -22,6 +23,7 @@
|
|||
(define-module (gnu packages kde)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
|
@ -47,8 +49,87 @@
|
|||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public kdenlive
|
||||
(let ((version "18.08.1"))
|
||||
(package
|
||||
(name "kdenlive")
|
||||
(version version)
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "git://anongit.kde.org/kdenlive.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ifnaclsz7w08mc485i3j1kkcpd1m8q5qamckrfwc375ac13xf4g"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("qttools" ,qttools)))
|
||||
(propagated-inputs
|
||||
`(("mlt" ,mlt)))
|
||||
(inputs
|
||||
`(("shared-mime-info" ,shared-mime-info)
|
||||
("frei0r-plugins" ,frei0r-plugins)
|
||||
("qtbase" ,qtbase)
|
||||
("qtscript" ,qtscript)
|
||||
("qtsvg" ,qtsvg)
|
||||
("kparts" ,kparts)
|
||||
("knotifications" ,knotifications)
|
||||
("karchive" ,karchive)
|
||||
("kdbusaddons" ,kdbusaddons)
|
||||
("kcrash" ,kcrash)
|
||||
("kguiaddons" ,kguiaddons)
|
||||
("knewstuff" ,knewstuff)
|
||||
("knotifyconfig" ,knotifyconfig)
|
||||
("kfilemetadata" ,kfilemetadata)
|
||||
("kdoctools" ,kdoctools)
|
||||
("kdeclarative", kdeclarative)
|
||||
("qtdeclarative", qtdeclarative)
|
||||
("qtquickcontrols", qtquickcontrols)
|
||||
("kiconthemes", kiconthemes)
|
||||
("qtgraphicaleffects" ,qtgraphicaleffects)
|
||||
("kplotting", kplotting)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-executable
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(qtquickcontrols (assoc-ref inputs "qtquickcontrols"))
|
||||
(qtbase (assoc-ref inputs "qtbase"))
|
||||
(qtdeclarative (assoc-ref inputs "qtdeclarative"))
|
||||
(frei0r (assoc-ref inputs "frei0r-plugins"))
|
||||
(qml "/lib/qt5/qml"))
|
||||
(wrap-program (string-append out "/bin/kdenlive")
|
||||
`("QT_PLUGIN_PATH" ":" prefix
|
||||
,(map (lambda (label)
|
||||
(string-append (assoc-ref inputs label)
|
||||
"/lib/qt5/plugins/"))
|
||||
'("qtbase", "qtsvg")))
|
||||
`("FREI0R_PATH" ":" =
|
||||
(,(string-append frei0r "/lib/frei0r-1/")))
|
||||
`("QT_QPA_PLATFORM_PLUGIN_PATH" ":" =
|
||||
(,(string-append qtbase "/lib/qt5/plugins/platforms")))
|
||||
`("QML2_IMPORT_PATH" ":" prefix
|
||||
(,(string-append qtquickcontrols qml)
|
||||
,(string-append qtdeclarative qml)))))
|
||||
#t)))))
|
||||
(home-page "https://kdenlive.org")
|
||||
(synopsis "Non-linear video editor")
|
||||
(description "Kdenlive is an acronym for KDE Non-Linear Video Editor.
|
||||
|
||||
Non-linear video editing is much more powerful than beginner's (linear)
|
||||
editors, hence it requires a bit more organization before starting. However,
|
||||
it is not reserved to specialists and can be used for small personal
|
||||
projects.")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public kdevelop
|
||||
(package
|
||||
(name "kdevelop")
|
||||
|
@ -236,7 +317,7 @@ plugins, as well as code to create plugins, or complete applications.")
|
|||
(define-public krita
|
||||
(package
|
||||
(name "krita")
|
||||
(version "4.1.1")
|
||||
(version "4.1.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -245,7 +326,7 @@ plugins, as well as code to create plugins, or complete applications.")
|
|||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw"))))
|
||||
"1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2015 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -92,22 +93,22 @@
|
|||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
(delete 'configure) ; no configure script
|
||||
;; There's no build system here, so we have to do it ourselves.
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o"
|
||||
"-std=c++11" "-DGUID_LIBUUID"))
|
||||
(zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o")))))
|
||||
(invoke "g++" "-c" "guid.cpp" "-o" "guid.o"
|
||||
"-std=c++11" "-DGUID_LIBUUID")
|
||||
(invoke "ar" "rvs" "libcrossguid.a" "guid.o")))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o"
|
||||
"-std=c++11"))
|
||||
(zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o"
|
||||
"-std=c++11"))
|
||||
(zero? (system* "g++" "test.o" "guid.o" "testmain.o"
|
||||
"-o" "test" "-luuid"))
|
||||
(zero? (system* (string-append (getcwd) "/test"))))))
|
||||
(invoke "g++" "-c" "test.cpp" "-o" "test.o"
|
||||
"-std=c++11")
|
||||
(invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o"
|
||||
"-std=c++11")
|
||||
(invoke "g++" "test.o" "guid.o" "testmain.o"
|
||||
"-o" "test" "-luuid")
|
||||
(invoke (string-append (getcwd) "/test"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
|
@ -294,7 +295,7 @@ generator library for C++.")
|
|||
"lib/cpluff")))
|
||||
(every (lambda (third-party)
|
||||
(with-directory-excursion third-party
|
||||
(zero? (system* "autoreconf" "-vif"))))
|
||||
(invoke "autoreconf" "-vif")))
|
||||
dirs))))
|
||||
(add-after 'bootstrap-bundled-software 'patch-stuff
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
|
@ -316,6 +317,11 @@ generator library for C++.")
|
|||
(string-append (assoc-ref inputs "tzdata")
|
||||
"/share/zoneinfo")))
|
||||
|
||||
;; Don't phone home to check for updates.¬
|
||||
(substitute* "system/addon-manifest.xml"¬
|
||||
(("<addon optional=\\\"true\\\">service.xbmc.versioncheck</addon>")
|
||||
""))
|
||||
|
||||
;; Let's disable some tests that are known not to work here.
|
||||
;; Doing this later while in the cmake "../build" directory
|
||||
;; is trickier.
|
||||
|
@ -335,7 +341,7 @@ generator library for C++.")
|
|||
#t))
|
||||
(add-before 'check 'build-kodi-test
|
||||
(lambda _
|
||||
(zero? (system* "make" "kodi-test")))))))
|
||||
(invoke "make" "kodi-test"))))))
|
||||
;; TODO: Add dependencies for:
|
||||
;; - nfs
|
||||
;; - cec
|
||||
|
|
|
@ -152,6 +152,19 @@ resolution, asynchronous file system operations, and threading primitives.")
|
|||
;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'.
|
||||
(license (list expat cc-by4.0))))
|
||||
|
||||
;; This version is required for Node versions < 10.
|
||||
(define-public libuv-1.19
|
||||
(package
|
||||
(inherit libuv)
|
||||
(version "1.19.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dist.libuv.org/dist/v" version
|
||||
"/libuv-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1msk9ac1z69whww88ibrwjqkd1apdla6l77cm2fwy5kigq0z5g3w"))))))
|
||||
|
||||
(define-public perl-anyevent
|
||||
(package
|
||||
(name "perl-anyevent")
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages libreoffice)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix download)
|
||||
|
@ -935,7 +936,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
|
|||
(define-public libreoffice
|
||||
(package
|
||||
(name "libreoffice")
|
||||
(version "6.1.0.3")
|
||||
(version "6.1.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -945,10 +946,10 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
|
|||
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1n7b6abc0bp9x8lddx60w5br444wf62mdlkqmfk2zmkmiwkcvv2l"))
|
||||
"149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335"))
|
||||
(patches (search-patches "libreoffice-icu.patch"
|
||||
"libreoffice-glm.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
("cppunit" ,cppunit-1.14)
|
||||
|
|
|
@ -61,7 +61,7 @@ Regexp::Pattern is a convention for organizing reusable regex patterns.")
|
|||
(define-public perl-string-copyright
|
||||
(package
|
||||
(name "perl-string-copyright")
|
||||
(version "0.003005")
|
||||
(version "0.003006")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -70,7 +70,7 @@ Regexp::Pattern is a convention for organizing reusable regex patterns.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12c6x4c10gr46ryc3dpwgfi6wggmgy4a1ls2hwhcpdm3wvzy5619"))))
|
||||
"0fzymv065nn3glwnw34nkyadzw2dh4rcz8avmki4zrnk4k45m01a"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-number-range" ,perl-number-range)))
|
||||
|
|
|
@ -399,8 +399,8 @@ It has been modified to remove all non-free binary blobs.")
|
|||
;; supports qemu "virt" machine and possibly a large number of ARM boards.
|
||||
;; See : https://wiki.debian.org/DebianKernel/ARMMP.
|
||||
|
||||
(define %linux-libre-version "4.18.8")
|
||||
(define %linux-libre-hash "163awpba1yd0x33xzj5dczimk4y96xc28syc4w2ad0qafgapng8l")
|
||||
(define %linux-libre-version "4.18.15")
|
||||
(define %linux-libre-hash "0v6xs85qn1iy2dj3m6s3cfnhbwb1mjy21d9lagjni8dg3jic26hf")
|
||||
|
||||
(define %linux-libre-4.18-patches
|
||||
(list %boot-logo-patch
|
||||
|
@ -430,8 +430,8 @@ It has been modified to remove all non-free binary blobs.")
|
|||
#:patches %linux-libre-4.18-patches
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define %linux-libre-4.14-version "4.14.70")
|
||||
(define %linux-libre-4.14-hash "138v51m6k57wnvlf9c22dad0w819mfb8f95i6w99mlg69qpwdvag")
|
||||
(define %linux-libre-4.14-version "4.14.77")
|
||||
(define %linux-libre-4.14-hash "18y81rga2lhsk7bjckglxz52pvnzf103ar0z2zj611g37wyf83r5")
|
||||
|
||||
(define-public linux-libre-4.14
|
||||
(make-linux-libre %linux-libre-4.14-version
|
||||
|
@ -440,14 +440,14 @@ It has been modified to remove all non-free binary blobs.")
|
|||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-4.9
|
||||
(make-linux-libre "4.9.127"
|
||||
"0q7h5gnl3ikic0pvwrxp78pz56yvijhz6s84gb92xywi1v3dd8mh"
|
||||
(make-linux-libre "4.9.134"
|
||||
"0f5qif27k0mhc57d98arbfkq7zlvg0ra2gz6g5fasblyjz3j7w7h"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-4.4
|
||||
(make-linux-libre "4.4.156"
|
||||
"13j4jb4hifh3fah2ysy2425fakwqqdh2z23lf4i0frxa1xl974h2"
|
||||
(make-linux-libre "4.4.161"
|
||||
"1q6bsndpjgw72mybhl5l8vrxs4mimg6821bjgi1pjkxbc7nd921b"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
|
@ -962,6 +962,8 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
|
|||
(substitute* "strace.c"
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t)))
|
||||
;; Don't fail if the architecture doesn't support different personalities.
|
||||
#:configure-flags '("--enable-mpers=check")
|
||||
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32459>.
|
||||
#:parallel-tests? #f)) ; undeterministic failures
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
|
@ -2667,14 +2669,14 @@ isolation or root privileges.")
|
|||
(define-public hdparm
|
||||
(package
|
||||
(name "hdparm")
|
||||
(version "9.55")
|
||||
(version "9.56")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/" name "/" name "/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ivdvrzimaayiq03by8mcq0mhmdljndj06h012zkdpw34irnpixm"))))
|
||||
"1np42qyhb503khvacnjcl3hb1dqly68gj0a1xip3j5qhbxlyvybg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags (let ((out (assoc-ref %outputs "out")))
|
||||
|
@ -3626,14 +3628,14 @@ The following service daemons are also provided:
|
|||
(define-public perftest
|
||||
(package
|
||||
(name "perftest")
|
||||
(version "4.2-0.8")
|
||||
(version "4.4-0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/linux-rdma/perftest/releases/download/V"
|
||||
version "/perftest-" version ".g0e24e67.tar.gz"))
|
||||
(uri (string-append "https://github.com/linux-rdma/perftest/releases/download/v"
|
||||
version "/perftest-" version ".g0927198.tar.gz"))
|
||||
(sha256
|
||||
(base32 "1r3pxn7cx3grb8myb4q1b0pk447pc06cifd0v7ym13xw00372dlx"))))
|
||||
(base32 "11ix4h0rrmqqyi84y55a9xnkvwsmwq0sywr46hvxzm4rqz4ma8vq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -3668,15 +3670,16 @@ The collection contains a set of bandwidth and latency benchmark such as:
|
|||
(define-public rng-tools
|
||||
(package
|
||||
(name "rng-tools")
|
||||
(version "6.4")
|
||||
(home-page "https://github.com/nhorman/rng-tools")
|
||||
(version "6.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/nhorman/rng-tools/"
|
||||
"archive/v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"005krksl8iz37l5p1nx8apl1yg7q78yrsb6inby31d2g5ck8nnwa"))))
|
||||
"0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB.
|
||||
|
@ -3691,7 +3694,6 @@ The collection contains a set of bandwidth and latency benchmark such as:
|
|||
(description
|
||||
"Monitor a hardware random number generator, and supply entropy
|
||||
from that to the system kernel's @file{/dev/random} machinery.")
|
||||
(home-page "https://sourceforge.net/projects/gkernel")
|
||||
;; The source package is offered under the GPL2+, but the files
|
||||
;; 'rngd_rdrand.c' and 'rdrand_asm.S' are only available under the GPL2.
|
||||
(license (list license:gpl2 license:gpl2+))))
|
||||
|
@ -3737,15 +3739,16 @@ such as frequency and voltage scaling.")
|
|||
(define-public haveged
|
||||
(package
|
||||
(name "haveged")
|
||||
(version "1.9.2")
|
||||
(version "1.9.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.issihosts.com/haveged/haveged-"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jirka-h/haveged.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0w5ypz6451msckivjriwyw8djydlwffam7x23xh626s2vzdrlzgp"))))
|
||||
(base32 "1hrwzjd4byq4fdrg8svww3d8x449k80jxxrjy9v6jvzhfv19rvxr"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://www.issihosts.com/haveged")
|
||||
(synopsis "Entropy source for the Linux random number generator")
|
||||
|
@ -3754,11 +3757,16 @@ such as frequency and voltage scaling.")
|
|||
Linux's @file{/dev/random} and @file{/dev/urandom} devices. The kernel's
|
||||
standard mechanisms for filling the entropy pool may not be sufficient for
|
||||
systems with high needs or limited user interaction, such as headless servers.
|
||||
|
||||
@command{haveged} runs as a privileged daemon, harvesting randomness from the
|
||||
indirect effects of hardware events on hidden processor state using the HArdware
|
||||
Volatile Entropy Gathering and Expansion (HAVEGE) algorithm. It tunes itself to
|
||||
its environment and provides the same built-in test suite for the output stream
|
||||
as used on certified hardware security devices.")
|
||||
Volatile Entropy Gathering and Expansion (@dfn{HAVEGE}) algorithm. It tunes
|
||||
itself to its environment and provides the same built-in test suite for the
|
||||
output stream as used on certified hardware security devices.
|
||||
|
||||
The quality of the randomness produced by this algorithm has not been proven.
|
||||
It is recommended to run it together with another entropy source like rngd, and
|
||||
not as a replacement for it.")
|
||||
(license (list (license:non-copyleft "file://nist/mconf.h")
|
||||
(license:non-copyleft "file://nist/packtest.c")
|
||||
license:public-domain ; nist/dfft.c
|
||||
|
@ -4248,12 +4256,14 @@ Light is the successor of lightscript.")
|
|||
(setenv "TLP_SHCPL"
|
||||
(string-append out "/share/bash-completion/completions"))
|
||||
(setenv "TLP_MAN" (string-append out "/share/man"))
|
||||
(setenv "TLP_META" (string-append out "/share/metainfo")))))
|
||||
(setenv "TLP_META" (string-append out "/share/metainfo"))
|
||||
#t)))
|
||||
(delete 'check) ; no tests
|
||||
(add-before 'install 'fix-installation
|
||||
(lambda _
|
||||
;; Stop the Makefile from trying to create system directories.
|
||||
(substitute* "Makefile" (("\\[ -f \\$\\(_CONF\\) \\]") "#"))))
|
||||
(substitute* "Makefile" (("\\[ -f \\$\\(_CONF\\) \\]") "#"))
|
||||
#t))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(invoke "make" "install-tlp" "install-man")
|
||||
|
@ -4287,7 +4297,8 @@ Light is the successor of lightscript.")
|
|||
"pciutils"
|
||||
"rfkill"
|
||||
"wireless-tools"))))))
|
||||
bin-files)))))))
|
||||
bin-files)
|
||||
#t))))))
|
||||
(home-page "http://linrunner.de/en/tlp/tlp.html")
|
||||
(synopsis "Power management tool for Linux")
|
||||
(description "TLP is a power management tool for Linux. It comes with
|
||||
|
@ -4827,19 +4838,20 @@ interface to this kernel feature.")
|
|||
(define-public mbpfan
|
||||
(package
|
||||
(name "mbpfan")
|
||||
(version "2.0.2")
|
||||
(version "2.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/dgraziotin/mbpfan/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/dgraziotin/mbpfan.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0wifsws9icki95hhfh4zw1hmk07ddmkcz9mg5a9jr7q2kkrk01cx"))))
|
||||
"1gysq778rkl6dvvj9a1swxcl15wvz0bng5bn4nwq118cl8p8pask"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no tests
|
||||
'(#:tests? #f ; tests ask to be run as root
|
||||
#:make-flags (let ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "DESTDIR=" out)
|
||||
"CC=gcc"))
|
||||
|
@ -4850,7 +4862,7 @@ interface to this kernel feature.")
|
|||
(substitute* "Makefile"
|
||||
(("/usr") ""))
|
||||
#t))
|
||||
(delete 'configure)))) ; There's no configure phase.
|
||||
(delete 'configure)))) ; there's no configure phase
|
||||
(home-page "https://github.com/dgraziotin/mbpfan")
|
||||
(synopsis "Control fan speed on Macbooks")
|
||||
(description
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -270,7 +271,8 @@ code analysis tools.")
|
|||
llvm-3.9.1
|
||||
"16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk"
|
||||
'("clang-runtime-asan-build-fixes.patch"
|
||||
"clang-runtime-esan-build-fixes.patch")))
|
||||
"clang-runtime-esan-build-fixes.patch"
|
||||
"clang-3.5-libsanitizer-ustat-fix.patch")))
|
||||
|
||||
(define-public clang-3.9.1
|
||||
(clang-from-llvm llvm-3.9.1 clang-runtime-3.9.1
|
||||
|
@ -294,7 +296,8 @@ code analysis tools.")
|
|||
(clang-runtime-from-llvm
|
||||
llvm-3.8
|
||||
"0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"
|
||||
'("clang-runtime-asan-build-fixes.patch")))
|
||||
'("clang-runtime-asan-build-fixes.patch"
|
||||
"clang-3.5-libsanitizer-ustat-fix.patch")))
|
||||
|
||||
(define-public clang-3.8
|
||||
(clang-from-llvm llvm-3.8 clang-runtime-3.8
|
||||
|
@ -317,7 +320,8 @@ code analysis tools.")
|
|||
(clang-runtime-from-llvm
|
||||
llvm-3.7
|
||||
"10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx"
|
||||
'("clang-runtime-asan-build-fixes.patch")))
|
||||
'("clang-runtime-asan-build-fixes.patch"
|
||||
"clang-3.5-libsanitizer-ustat-fix.patch")))
|
||||
|
||||
(define-public clang-3.7
|
||||
(clang-from-llvm llvm-3.7 clang-runtime-3.7
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -77,6 +78,12 @@
|
|||
#t))
|
||||
(add-before 'check 'disable-failing-tests
|
||||
(lambda _
|
||||
;; In libc 2.28, the 'major' and 'minor' macros are provided by
|
||||
;; <sys/sysmacros.h> only so include it.
|
||||
(substitute* "tests/LTlib.c"
|
||||
(("#ifndef lint")
|
||||
"#include <sys/sysmacros.h>\n\n#ifndef lint"))
|
||||
|
||||
(substitute* "tests/Makefile"
|
||||
;; Fails with ‘ERROR!!! client gethostbyaddr() failure’.
|
||||
(("(STDTST=.*) LTsock" _ prefix) prefix)
|
||||
|
|
|
@ -164,7 +164,7 @@ toolkit. It allows users to monitor and control of running processes.")
|
|||
(define-public lxterminal
|
||||
(package
|
||||
(name "lxterminal")
|
||||
(version "0.3.1")
|
||||
(version "0.3.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/lxde/LXTerminal"
|
||||
|
@ -172,7 +172,7 @@ toolkit. It allows users to monitor and control of running processes.")
|
|||
version "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jrc3m0hbxcmcgahwjlm46s2350gh80ggb6a90xy0h6xqa3z73fd"))))
|
||||
"1124pghrhnx6q4391ri8nvi6bsmvbj1dx81an08mird8jf2b2rii"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("gtk+" ,gtk+-2)
|
||||
("vte" ,vte/gtk+-2)))
|
||||
|
|
|
@ -750,7 +750,24 @@ data analysis.")
|
|||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-scikit-learn
|
||||
(package-with-python2 python-scikit-learn))
|
||||
(let ((parent (package-with-python2 python-scikit-learn)))
|
||||
(package (inherit parent)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments parent)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; Restrict OpenBLAS threads to prevent segfaults while testing!
|
||||
(setenv "OPENBLAS_NUM_THREADS" "1")
|
||||
;; Some tests expect to be able to write to HOME.
|
||||
(setenv "HOME" "/tmp")
|
||||
;; Disable tests that require network access
|
||||
(delete-file "sklearn/datasets/tests/test_kddcup99.py")
|
||||
(delete-file "sklearn/datasets/tests/test_mldata.py")
|
||||
(delete-file "sklearn/datasets/tests/test_rcv1.py")
|
||||
(invoke "pytest" "sklearn")
|
||||
#t)))))))))
|
||||
|
||||
(define-public python-autograd
|
||||
(let* ((commit "442205dfefe407beffb33550846434baa90c4de7")
|
||||
|
|
|
@ -763,14 +763,14 @@ invoking @command{notifymuch} from the post-new hook.")
|
|||
(define-public notmuch
|
||||
(package
|
||||
(name "notmuch")
|
||||
(version "0.27")
|
||||
(version "0.28")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://notmuchmail.org/releases/notmuch-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0"))))
|
||||
"0dqarmjc8544m2w7bqrqmvsfy55fw82707z3lz9cql8nr777bjmc"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
|
@ -2556,17 +2556,16 @@ PGP handling, multiple servers, and secure connections.")
|
|||
(define-public imapfilter
|
||||
(package
|
||||
(name "imapfilter")
|
||||
(version "2.6.11")
|
||||
(version "2.6.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://github.com/lefcha/imapfilter/archive/"
|
||||
"v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/lefcha/imapfilter.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1yslvwr3w5fnl06gfrp0lim8zdlasx3cvgd2fsqi0695xnb9bsms"))))
|
||||
(base32 "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
|
|
@ -1411,7 +1411,7 @@ can be used as backgrounds in the MATE Desktop environment.")
|
|||
(inputs
|
||||
`(("atk" ,atk)
|
||||
("cairo" ,cairo)
|
||||
("enchant" ,enchant)
|
||||
("enchant" ,enchant-1.6)
|
||||
("glib" ,glib)
|
||||
("gtk+" ,gtk+)
|
||||
("gtksourceview" ,gtksourceview)
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue