Merge branch 'master' into staging
commit
f5961dd585
|
@ -120,6 +120,7 @@ MODULES = \
|
|||
guix/build-system/gnu.scm \
|
||||
guix/build-system/guile.scm \
|
||||
guix/build-system/haskell.scm \
|
||||
guix/build-system/linux-module.scm \
|
||||
guix/build-system/perl.scm \
|
||||
guix/build-system/python.scm \
|
||||
guix/build-system/ocaml.scm \
|
||||
|
@ -138,6 +139,7 @@ MODULES = \
|
|||
guix/store.scm \
|
||||
guix/cvs-download.scm \
|
||||
guix/svn-download.scm \
|
||||
guix/colors.scm \
|
||||
guix/i18n.scm \
|
||||
guix/ui.scm \
|
||||
guix/status.scm \
|
||||
|
@ -172,6 +174,7 @@ MODULES = \
|
|||
guix/build/texlive-build-system.scm \
|
||||
guix/build/waf-build-system.scm \
|
||||
guix/build/haskell-build-system.scm \
|
||||
guix/build/linux-module-build-system.scm \
|
||||
guix/build/store-copy.scm \
|
||||
guix/build/utils.scm \
|
||||
guix/build/union.scm \
|
||||
|
@ -276,7 +279,8 @@ endif BUILD_DAEMON_OFFLOAD
|
|||
# Scheme implementation of the build daemon and related functionality.
|
||||
STORE_MODULES = \
|
||||
guix/store/database.scm \
|
||||
guix/store/deduplication.scm
|
||||
guix/store/deduplication.scm \
|
||||
guix/store/roots.scm
|
||||
|
||||
MODULES += $(STORE_MODULES)
|
||||
|
||||
|
@ -407,7 +411,8 @@ SCM_TESTS = \
|
|||
tests/pypi.scm \
|
||||
tests/import-utils.scm \
|
||||
tests/store-database.scm \
|
||||
tests/store-deduplication.scm
|
||||
tests/store-deduplication.scm \
|
||||
tests/store-roots.scm
|
||||
|
||||
SH_TESTS = \
|
||||
tests/guix-build.sh \
|
||||
|
|
168
doc/guix.texi
168
doc/guix.texi
|
@ -1795,25 +1795,14 @@ available.
|
|||
@node Limitations
|
||||
@section Limitations
|
||||
|
||||
As of version @value{VERSION}, Guix System is
|
||||
not production-ready. It may contain bugs and lack important
|
||||
features. Thus, if you are looking for a stable production system that
|
||||
respects your freedom as a computer user, a good solution at this point
|
||||
is to consider @url{http://www.gnu.org/distros/free-distros.html, one of
|
||||
the more established GNU/Linux distributions}. We hope you can soon switch
|
||||
to the Guix System without fear, of course. In the meantime, you can
|
||||
also keep using your distribution and try out the package manager on top
|
||||
of it (@pxref{Installation}).
|
||||
We consider Guix System to be ready for a wide range of ``desktop'' and server
|
||||
use cases. The reliability guarantees it provides---transactional upgrades
|
||||
and rollbacks, reproducibility---make it a solid foundation.
|
||||
|
||||
Before you proceed with the installation, be aware of the following
|
||||
noteworthy limitations applicable to version @value{VERSION}:
|
||||
Nevertheless, before you proceed with the installation, be aware of the
|
||||
following noteworthy limitations applicable to version @value{VERSION}:
|
||||
|
||||
@itemize
|
||||
@item
|
||||
The installation process does not include a graphical user interface and
|
||||
requires familiarity with GNU/Linux (see the following subsections to
|
||||
get a feel of what that means.)
|
||||
|
||||
@item
|
||||
Support for the Logical Volume Manager (LVM) is missing.
|
||||
|
||||
|
@ -1821,19 +1810,15 @@ Support for the Logical Volume Manager (LVM) is missing.
|
|||
More and more system services are provided (@pxref{Services}), but some
|
||||
may be missing.
|
||||
|
||||
@item
|
||||
More than 8,500 packages are available, but you might
|
||||
occasionally find that a useful package is missing.
|
||||
|
||||
@item
|
||||
GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}),
|
||||
as well as a number of X11 window managers. However, some graphical
|
||||
applications may be missing, as well as KDE.
|
||||
as well as a number of X11 window managers. However, KDE is currently
|
||||
missing.
|
||||
@end itemize
|
||||
|
||||
You have been warned! But more than a disclaimer, this is an invitation
|
||||
to report issues (and success stories!), and to join us in improving it.
|
||||
@xref{Contributing}, for more info.
|
||||
More than a disclaimer, this is an invitation to report issues (and success
|
||||
stories!), and to join us in improving it. @xref{Contributing}, for more
|
||||
info.
|
||||
|
||||
|
||||
@node Hardware Considerations
|
||||
|
@ -1856,7 +1841,7 @@ devices. WiFi devices known to work include those using Atheros chips
|
|||
driver, and those using Broadcom/AirForce chips (BCM43xx with
|
||||
Wireless-Core Revision 5), which corresponds to the @code{b43-open}
|
||||
Linux-libre driver. Free firmware exists for both and is available
|
||||
out-of-the-box on Guix System, as part of @var{%base-firmware}
|
||||
out-of-the-box on Guix System, as part of @code{%base-firmware}
|
||||
(@pxref{operating-system Reference, @code{firmware}}).
|
||||
|
||||
@cindex RYF, Respects Your Freedom
|
||||
|
@ -3385,7 +3370,7 @@ deleted. The set of garbage collector roots (``GC roots'' for short)
|
|||
includes default user profiles; by default, the symlinks under
|
||||
@file{/var/guix/gcroots} represent these GC roots. New GC roots can be
|
||||
added with @command{guix build --root}, for example (@pxref{Invoking
|
||||
guix build}).
|
||||
guix build}). The @command{guix gc --list-roots} command lists them.
|
||||
|
||||
Prior to running @code{guix gc --collect-garbage} to make space, it is
|
||||
often useful to remove old generations from user profiles; that way, old
|
||||
|
@ -3438,8 +3423,22 @@ as @code{500MiB}, as described above.
|
|||
When @var{free} or more is already available in @file{/gnu/store}, do
|
||||
nothing and exit immediately.
|
||||
|
||||
@item --delete-generations[=@var{duration}]
|
||||
@itemx -d [@var{duration}]
|
||||
Before starting the garbage collection process, delete all the generations
|
||||
older than @var{duration}, for all the user profiles; when run as root, this
|
||||
applies to all the profiles @emph{of all the users}.
|
||||
|
||||
For example, this command deletes all the generations of all your profiles
|
||||
that are older than 2 months (except generations that are current), and then
|
||||
proceeds to free space until at least 10 GiB are available:
|
||||
|
||||
@example
|
||||
guix gc -d 2m -F 10G
|
||||
@end example
|
||||
|
||||
@item --delete
|
||||
@itemx -d
|
||||
@itemx -D
|
||||
Attempt to delete all the store files and directories specified as
|
||||
arguments. This fails if some of the files are not in the store, or if
|
||||
they are still live.
|
||||
|
@ -3451,6 +3450,10 @@ This prints nothing unless the daemon was started with
|
|||
@option{--cache-failures} (@pxref{Invoking guix-daemon,
|
||||
@option{--cache-failures}}).
|
||||
|
||||
@item --list-roots
|
||||
List the GC roots owned by the user; when run as root, list @emph{all} the GC
|
||||
roots.
|
||||
|
||||
@item --clear-failures
|
||||
Remove the specified store items from the failed-build cache.
|
||||
|
||||
|
@ -5406,6 +5409,27 @@ automatically corrected.
|
|||
@end table
|
||||
@end deftp
|
||||
|
||||
@deffn {Scheme Syntax} this-package
|
||||
When used in the @emph{lexical scope} of a package field definition, this
|
||||
identifier resolves to the package being defined.
|
||||
|
||||
The example below shows how to add a package as a native input of itself when
|
||||
cross-compiling:
|
||||
|
||||
@example
|
||||
(package
|
||||
(name "guile")
|
||||
;; ...
|
||||
|
||||
;; When cross-compiled, Guile, for example, depends on
|
||||
;; a native version of itself. Add it here.
|
||||
(native-inputs (if (%current-target-system)
|
||||
`(("self" ,this-package))
|
||||
'())))
|
||||
@end example
|
||||
|
||||
It is an error to refer to @code{this-package} outside a package definition.
|
||||
@end deffn
|
||||
|
||||
@node origin Reference
|
||||
@subsection @code{origin} Reference
|
||||
|
@ -6192,6 +6216,33 @@ is not enabled by default. It can be enabled with @code{#:glib-or-gtk?}.
|
|||
@end table
|
||||
@end defvr
|
||||
|
||||
@defvr {Scheme Variable} linux-module-build-system
|
||||
@var{linux-module-build-system} allows building Linux kernel modules.
|
||||
|
||||
@cindex build phases
|
||||
This build system is an extension of @var{gnu-build-system}, but with the
|
||||
following phases changed:
|
||||
|
||||
@table @code
|
||||
|
||||
@item configure
|
||||
This phase configures the environment so that the Linux kernel's Makefile
|
||||
can be used to build the external kernel module.
|
||||
|
||||
@item build
|
||||
This phase uses the Linux kernel's Makefile in order to build the external
|
||||
kernel module.
|
||||
|
||||
@item install
|
||||
This phase uses the Linux kernel's Makefile in order to install the external
|
||||
kernel module.
|
||||
@end table
|
||||
|
||||
It is possible and useful to specify the Linux kernel to use for building
|
||||
the module (in the "arguments" form of a package using the
|
||||
linux-module-build-system, use the key #:linux to specify it).
|
||||
@end defvr
|
||||
|
||||
Lastly, for packages that do not need anything as sophisticated, a
|
||||
``trivial'' build system is provided. It is trivial in the sense that
|
||||
it provides basically no support: it does not pull any implicit inputs,
|
||||
|
@ -10406,6 +10457,10 @@ the command-line of the kernel---e.g., @code{("console=ttyS0")}.
|
|||
@item @code{bootloader}
|
||||
The system bootloader configuration object. @xref{Bootloader Configuration}.
|
||||
|
||||
@item @code{label}
|
||||
This is the label (a string) as it appears in the bootloader's menu entry.
|
||||
The default label includes the kernel name and version.
|
||||
|
||||
@item @code{keyboard-layout} (default: @code{#f})
|
||||
This field specifies the keyboard layout to use in the console. It can be
|
||||
either @code{#f}, in which case the default keyboard layout is used (usually
|
||||
|
@ -10558,6 +10613,27 @@ is that only @code{root} and members of the @code{wheel} group may use
|
|||
@code{sudo}.
|
||||
|
||||
@end table
|
||||
|
||||
@deffn {Scheme Syntax} this-operating-system
|
||||
When used in the @emph{lexical scope} of an operating system field definition,
|
||||
this identifier resolves to the operating system being defined.
|
||||
|
||||
The example below shows how to refer to the operating system being defined in
|
||||
the definition of the @code{label} field:
|
||||
|
||||
@example
|
||||
(use-modules (gnu) (guix))
|
||||
|
||||
(operating-system
|
||||
;; ...
|
||||
(label (package-full-name
|
||||
(operating-system-kernel this-operating-system))))
|
||||
@end example
|
||||
|
||||
It is an error to refer to @code{this-operating-system} outside an operating
|
||||
system definition.
|
||||
@end deffn
|
||||
|
||||
@end deftp
|
||||
|
||||
@node File Systems
|
||||
|
@ -23122,7 +23198,7 @@ The port to bind the server to.
|
|||
@cindex fingerprint
|
||||
@subsubheading Fingerprint Service
|
||||
|
||||
The @code{(gnu services fingerprint)} module provides a DBus service to
|
||||
The @code{(gnu services authentication)} module provides a DBus service to
|
||||
read and identify fingerprints via a fingerprint sensor.
|
||||
|
||||
@defvr {Scheme Variable} fprintd-service-type
|
||||
|
@ -23983,7 +24059,7 @@ must @emph{not} be an OS device name such as @file{/dev/sda1}.
|
|||
@end deftp
|
||||
|
||||
@c FIXME: Write documentation once it's stable.
|
||||
Fow now only GRUB has theme support. GRUB themes are created using
|
||||
For now only GRUB has theme support. GRUB themes are created using
|
||||
the @code{grub-theme} form, which is not documented yet.
|
||||
|
||||
@defvr {Scheme Variable} %default-theme
|
||||
|
@ -24669,23 +24745,23 @@ exception is the @dfn{boot service type}, which is the ultimate service.
|
|||
Optionally, a default value for instances of this type.
|
||||
@end enumerate
|
||||
|
||||
In this example, @var{guix-service-type} extends three services:
|
||||
In this example, @code{guix-service-type} extends three services:
|
||||
|
||||
@table @var
|
||||
@table @code
|
||||
@item shepherd-root-service-type
|
||||
The @var{guix-shepherd-service} procedure defines how the Shepherd
|
||||
The @code{guix-shepherd-service} procedure defines how the Shepherd
|
||||
service is extended. Namely, it returns a @code{<shepherd-service>}
|
||||
object that defines how @command{guix-daemon} is started and stopped
|
||||
(@pxref{Shepherd Services}).
|
||||
|
||||
@item account-service-type
|
||||
This extension for this service is computed by @var{guix-accounts},
|
||||
This extension for this service is computed by @code{guix-accounts},
|
||||
which returns a list of @code{user-group} and @code{user-account}
|
||||
objects representing the build user accounts (@pxref{Invoking
|
||||
guix-daemon}).
|
||||
|
||||
@item activation-service-type
|
||||
Here @var{guix-activation} is a procedure that returns a gexp, which is
|
||||
Here @code{guix-activation} is a procedure that returns a gexp, which is
|
||||
a code snippet to run at ``activation time''---e.g., when the service is
|
||||
booted.
|
||||
@end table
|
||||
|
@ -24710,7 +24786,7 @@ value is omitted, the default value specified by
|
|||
(service guix-service-type)
|
||||
@end example
|
||||
|
||||
@var{guix-service-type} is quite simple because it extends other
|
||||
@code{guix-service-type} is quite simple because it extends other
|
||||
services but is not extensible itself.
|
||||
|
||||
@c @subsubsubsection Extensible Service Types
|
||||
|
@ -24736,7 +24812,7 @@ The service type for an @emph{extensible} service looks like this:
|
|||
This is the service type for the
|
||||
@uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device
|
||||
management daemon}. Compared to the previous example, in addition to an
|
||||
extension of @var{shepherd-root-service-type}, we see two new fields:
|
||||
extension of @code{shepherd-root-service-type}, we see two new fields:
|
||||
|
||||
@table @code
|
||||
@item compose
|
||||
|
@ -24763,7 +24839,7 @@ them (@pxref{Invoking guix system}).
|
|||
@end table
|
||||
|
||||
There can be only one instance of an extensible service type such as
|
||||
@var{udev-service-type}. If there were more, the
|
||||
@code{udev-service-type}. If there were more, the
|
||||
@code{service-extension} specifications would be ambiguous.
|
||||
|
||||
Still here? The next section provides a reference of the programming
|
||||
|
@ -24837,7 +24913,7 @@ Here is an example of how a service is created and manipulated:
|
|||
|
||||
The @code{modify-services} form provides a handy way to change the
|
||||
parameters of some of the services of a list such as
|
||||
@var{%base-services} (@pxref{Base Services, @code{%base-services}}). It
|
||||
@code{%base-services} (@pxref{Base Services, @code{%base-services}}). It
|
||||
evaluates to a list of services. Of course, you could always use
|
||||
standard list combinators such as @code{map} and @code{fold} to do that
|
||||
(@pxref{SRFI-1, List Library,, guile, GNU Guile Reference Manual});
|
||||
|
@ -25018,8 +25094,8 @@ You can actually generate such a graph for any operating system
|
|||
definition using the @command{guix system shepherd-graph} command
|
||||
(@pxref{system-shepherd-graph, @command{guix system shepherd-graph}}).
|
||||
|
||||
The @var{%shepherd-root-service} is a service object representing
|
||||
PID@tie{}1, of type @var{shepherd-root-service-type}; it can be extended
|
||||
The @code{%shepherd-root-service} is a service object representing
|
||||
PID@tie{}1, of type @code{shepherd-root-service-type}; it can be extended
|
||||
by passing it lists of @code{<shepherd-service>} objects.
|
||||
|
||||
@deftp {Data Type} shepherd-service
|
||||
|
@ -25067,10 +25143,10 @@ A documentation string, as shown when running:
|
|||
herd doc @var{service-name}
|
||||
@end example
|
||||
|
||||
where @var{service-name} is one of the symbols in @var{provision}
|
||||
where @var{service-name} is one of the symbols in @code{provision}
|
||||
(@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual}).
|
||||
|
||||
@item @code{modules} (default: @var{%default-modules})
|
||||
@item @code{modules} (default: @code{%default-modules})
|
||||
This is the list of modules that must be in scope when @code{start} and
|
||||
@code{stop} are evaluated.
|
||||
|
||||
|
@ -25317,7 +25393,7 @@ order of magnitudes lower than a full rebuild of the dependency chain.
|
|||
@cindex replacements of packages, for grafts
|
||||
For instance, suppose a security update needs to be applied to Bash.
|
||||
Guix developers will provide a package definition for the ``fixed''
|
||||
Bash, say @var{bash-fixed}, in the usual way (@pxref{Defining
|
||||
Bash, say @code{bash-fixed}, in the usual way (@pxref{Defining
|
||||
Packages}). Then, the original package definition is augmented with a
|
||||
@code{replacement} field pointing to the package containing the bug fix:
|
||||
|
||||
|
@ -25332,14 +25408,14 @@ Packages}). Then, the original package definition is augmented with a
|
|||
From there on, any package depending directly or indirectly on Bash---as
|
||||
reported by @command{guix gc --requisites} (@pxref{Invoking guix
|
||||
gc})---that is installed is automatically ``rewritten'' to refer to
|
||||
@var{bash-fixed} instead of @var{bash}. This grafting process takes
|
||||
@code{bash-fixed} instead of @code{bash}. This grafting process takes
|
||||
time proportional to the size of the package, usually less than a
|
||||
minute for an ``average'' package on a recent machine. Grafting is
|
||||
recursive: when an indirect dependency requires grafting, then grafting
|
||||
``propagates'' up to the package that the user is installing.
|
||||
|
||||
Currently, the length of the name and version of the graft and that of
|
||||
the package it replaces (@var{bash-fixed} and @var{bash} in the example
|
||||
the package it replaces (@code{bash-fixed} and @code{bash} in the example
|
||||
above) must be equal. This restriction mostly comes from the fact that
|
||||
grafting works by patching files, including binary files, directly.
|
||||
Other restrictions may apply: for instance, when adding a graft to a
|
||||
|
|
|
@ -471,11 +471,6 @@ GRUB configuration and OS-DRV as the stuff in it."
|
|||
"mnt=/tmp/root/mnt"
|
||||
"-path-list" "-"
|
||||
"--"
|
||||
|
||||
;; XXX: Add padding to avoid I/O errors on i686:
|
||||
;; <https://bugs.gnu.org/33639>.
|
||||
"-padding" "10m"
|
||||
|
||||
"-volid" (string-upcase volume-id)
|
||||
(if volume-uuid
|
||||
`("-volume_date" "uuid"
|
||||
|
|
|
@ -91,9 +91,17 @@ version of this file."
|
|||
|
||||
(define apply-locale
|
||||
;; Install the specified locale.
|
||||
#~(lambda (locale-name)
|
||||
(false-if-exception
|
||||
(setlocale LC_ALL locale-name))))
|
||||
(with-imported-modules (source-module-closure '((gnu services herd)))
|
||||
#~(lambda (locale)
|
||||
(false-if-exception
|
||||
(setlocale LC_ALL locale))
|
||||
|
||||
;; Restart the documentation viewer so it displays the manual in
|
||||
;; language that corresponds to LOCALE.
|
||||
(with-error-to-port (%make-void-port "w")
|
||||
(lambda ()
|
||||
(stop-service 'term-tty2)
|
||||
(start-service 'term-tty2 (list locale)))))))
|
||||
|
||||
(define* (compute-locale-step #:key
|
||||
locales-name
|
||||
|
@ -323,6 +331,7 @@ selected keymap."
|
|||
(gnu installer newt)
|
||||
((gnu installer newt keymap)
|
||||
#:select (keyboard-layout->configuration))
|
||||
(gnu services herd)
|
||||
(guix i18n)
|
||||
(guix build utils)
|
||||
(ice-9 match))
|
||||
|
|
|
@ -45,19 +45,14 @@ choose the one to use on the log-in screen.")
|
|||
(condition
|
||||
(&installer-step-abort))))))
|
||||
|
||||
(define (run-networking-cbt-page network-management?)
|
||||
"Run a page allowing the user to select networking services. When
|
||||
NETWORK-MANAGEMENT? is true, include network management services like
|
||||
NetworkManager."
|
||||
(define (run-networking-cbt-page)
|
||||
"Run a page allowing the user to select networking services."
|
||||
(run-checkbox-tree-page
|
||||
#:info-text (G_ "You can now select networking services to run on your \
|
||||
system.")
|
||||
#:title (G_ "Network service")
|
||||
#:items (filter (let ((types (if network-management?
|
||||
'(network-management networking)
|
||||
'(networking))))
|
||||
(lambda (service)
|
||||
(memq (system-service-type service) types)))
|
||||
#:items (filter (lambda (service)
|
||||
(eq? 'networking (system-service-type service)))
|
||||
%system-services)
|
||||
#:item->text (compose G_ system-service-name)
|
||||
#:checkbox-tree-height 5
|
||||
|
@ -67,9 +62,35 @@ system.")
|
|||
(condition
|
||||
(&installer-step-abort))))))
|
||||
|
||||
(define (run-network-management-page)
|
||||
"Run a page to select among several network management methods."
|
||||
(let ((title (G_ "Network management")))
|
||||
(run-listbox-selection-page
|
||||
#:title title
|
||||
#:info-text (G_ "Choose the method to manage network connections.
|
||||
|
||||
We recommend NetworkManager or Connman for a WiFi-capable laptop; the DHCP \
|
||||
client may be enough for a server.")
|
||||
#:info-textbox-width 70
|
||||
#:listbox-items (filter (lambda (service)
|
||||
(eq? 'network-management
|
||||
(system-service-type service)))
|
||||
%system-services)
|
||||
#:listbox-item->text (compose G_ system-service-name)
|
||||
#:sort-listbox-items? #f
|
||||
#:button-text (G_ "Exit")
|
||||
#:button-callback-procedure
|
||||
(lambda _
|
||||
(raise
|
||||
(condition
|
||||
(&installer-step-abort)))))))
|
||||
|
||||
(define (run-services-page)
|
||||
(let ((desktop (run-desktop-environments-cbt-page)))
|
||||
;; When the user did not select any desktop services, and thus didn't get
|
||||
;; '%desktop-services', offer network management services.
|
||||
(append desktop
|
||||
(run-networking-cbt-page (null? desktop)))))
|
||||
(run-networking-cbt-page)
|
||||
(if (null? desktop)
|
||||
(list (run-network-management-page))
|
||||
'()))))
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
(define-module (gnu installer services)
|
||||
#:use-module (guix records)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (ice-9 match)
|
||||
#:export (system-service?
|
||||
system-service-name
|
||||
system-service-type
|
||||
|
@ -75,15 +76,17 @@
|
|||
(system-service
|
||||
(name (G_ "NetworkManager network connection manager"))
|
||||
(type 'network-management)
|
||||
(snippet '(service network-manager-service-type)))
|
||||
(snippet '((service network-manager-service-type)
|
||||
(service wpa-supplicant-service-type))))
|
||||
(system-service
|
||||
(name (G_ "Connman network connection manager"))
|
||||
(type 'network-management)
|
||||
(snippet '(service connman-service-type)))
|
||||
(snippet '((service connman-service-type)
|
||||
(service wpa-supplicant-service-type))))
|
||||
(system-service
|
||||
(name (G_ "DHCP client (dynamic IP address assignment)"))
|
||||
(type 'network-management)
|
||||
(snippet '(service dhcp-client-service))))))
|
||||
(snippet '(service dhcp-client-service-type))))))
|
||||
|
||||
(define (desktop-system-service? service)
|
||||
"Return true if SERVICE is a desktop environment service."
|
||||
|
@ -95,7 +98,13 @@
|
|||
|
||||
(define (system-services->configuration services)
|
||||
"Return the configuration field for SERVICES."
|
||||
(let* ((snippets (map system-service-snippet services))
|
||||
(let* ((snippets (append-map (lambda (service)
|
||||
(match (system-service-snippet service)
|
||||
((and lst (('service _ ...) ...))
|
||||
lst)
|
||||
(sexp
|
||||
(list sexp))))
|
||||
services))
|
||||
(desktop? (find desktop-system-service? services))
|
||||
(base (if desktop?
|
||||
'%desktop-services
|
||||
|
|
15
gnu/local.mk
15
gnu/local.mk
|
@ -374,6 +374,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/php.scm \
|
||||
%D%/packages/pkg-config.scm \
|
||||
%D%/packages/plotutils.scm \
|
||||
%D%/packages/poedit.scm \
|
||||
%D%/packages/polkit.scm \
|
||||
%D%/packages/popt.scm \
|
||||
%D%/packages/printers.scm \
|
||||
|
@ -622,7 +623,7 @@ INSTALLER_MODULES = \
|
|||
# ENABLE_INSTALLER is true.
|
||||
if ENABLE_INSTALLER
|
||||
GNU_SYSTEM_MODULES += $(INSTALLER_MODULES)
|
||||
elif !ENABLE_INSTALLER
|
||||
else !ENABLE_INSTALLER
|
||||
MODULES_NOT_COMPILED += $(INSTALLER_MODULES)
|
||||
endif
|
||||
|
||||
|
@ -916,6 +917,7 @@ dist_patch_DATA = \
|
|||
%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 \
|
||||
%D%/packages/patches/idris-test-no-node.patch \
|
||||
%D%/packages/patches/ilmbase-fix-tests.patch \
|
||||
%D%/packages/patches/inkscape-poppler-compat3.patch \
|
||||
%D%/packages/patches/intltool-perl-compatibility.patch \
|
||||
|
@ -945,7 +947,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/kio-search-smbd-on-PATH.patch \
|
||||
%D%/packages/patches/kmod-module-directory.patch \
|
||||
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \
|
||||
%D%/packages/patches/knot-include-system-lmdb-header.patch \
|
||||
%D%/packages/patches/kpackage-allow-external-paths.patch \
|
||||
%D%/packages/patches/kobodeluxe-paths.patch \
|
||||
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
|
||||
|
@ -953,6 +954,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch \
|
||||
%D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \
|
||||
%D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \
|
||||
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
|
||||
%D%/packages/patches/kodi-skip-test-449.patch \
|
||||
%D%/packages/patches/laby-make-install.patch \
|
||||
%D%/packages/patches/lcms-CVE-2018-16435.patch \
|
||||
|
@ -1102,6 +1104,10 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ocaml-CVE-2015-8869.patch \
|
||||
%D%/packages/patches/ocaml-Add-a-.file-directive.patch \
|
||||
%D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch \
|
||||
%D%/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch \
|
||||
%D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
|
||||
%D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
|
||||
%D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
|
||||
%D%/packages/patches/omake-fix-non-determinism.patch \
|
||||
%D%/packages/patches/ola-readdir-r.patch \
|
||||
%D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \
|
||||
|
@ -1213,9 +1219,6 @@ 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-getopt-nondigit-param.patch \
|
||||
%D%/packages/patches/quilt-getopt-second-separator.patch \
|
||||
%D%/packages/patches/qtwebkit-pbutils-include.patch \
|
||||
%D%/packages/patches/randomjungle-disable-static-build.patch \
|
||||
%D%/packages/patches/rapicorn-isnan.patch \
|
||||
|
@ -1273,7 +1276,6 @@ dist_patch_DATA = \
|
|||
%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 \
|
||||
%D%/packages/patches/stumpwm-fix-broken-read-one-line.patch \
|
||||
%D%/packages/patches/t1lib-CVE-2010-2642.patch \
|
||||
%D%/packages/patches/t1lib-CVE-2011-0764.patch \
|
||||
|
@ -1338,6 +1340,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/wavpack-CVE-2018-6767.patch \
|
||||
%D%/packages/patches/wavpack-CVE-2018-7253.patch \
|
||||
%D%/packages/patches/wavpack-CVE-2018-7254.patch \
|
||||
%D%/packages/patches/webkitgtk-sse2.patch \
|
||||
%D%/packages/patches/weechat-python.patch \
|
||||
%D%/packages/patches/wicd-bitrate-none-fix.patch \
|
||||
%D%/packages/patches/wicd-get-selected-profile-fix.patch \
|
||||
|
|
|
@ -1287,7 +1287,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
|
|||
(define-public acpica
|
||||
(package
|
||||
(name "acpica")
|
||||
(version "20190215")
|
||||
(version "20190405")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1295,7 +1295,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1iy2zwi8aicq0b5a0phfacvk1f9z1d89cx43adcf0qh82gb9m4wg"))))
|
||||
"0hv6r65l8vk3f6i3by7i47vc1917qm47838bpq80lfn22784y53y"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("flex" ,flex)
|
||||
("bison" ,bison)))
|
||||
|
@ -1599,13 +1599,13 @@ of supported upstream metrics systems simultaneously.")
|
|||
(define-public ansible
|
||||
(package
|
||||
(name "ansible")
|
||||
(version "2.7.9")
|
||||
(version "2.7.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ansible" version))
|
||||
(sha256
|
||||
(base32 "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf"))))
|
||||
(base32 "15721d0bxymghxnlnknq43lszlxg3ybbcp2p5v424hhw6wg2v944"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-bcrypt" ,python-bcrypt)
|
||||
|
@ -1736,18 +1736,18 @@ limits.")
|
|||
(define-public autojump
|
||||
(package
|
||||
(name "autojump")
|
||||
(version "22.5.1")
|
||||
(version "22.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/wting/autojump/archive/"
|
||||
"release-v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/wting/autojump.git")
|
||||
(commit (string-append "release-v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn"))))
|
||||
(base32 "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs ;for tests
|
||||
(native-inputs ; for tests
|
||||
`(("python-mock" ,python-mock)
|
||||
("python-pytest" ,python-pytest)))
|
||||
(inputs
|
||||
|
@ -1755,6 +1755,11 @@ limits.")
|
|||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'make-git-checkout-writable
|
||||
;; ‘install.py’ modifies files before installing them.
|
||||
(lambda _
|
||||
(for-each make-file-writable (find-files "."))
|
||||
#t))
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(replace 'check
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
|
||||
;;;
|
||||
|
@ -499,7 +499,7 @@ matrices, and polynomials over the integers and over finite fields.")
|
|||
(define-public singular
|
||||
(package
|
||||
(name "singular")
|
||||
(version "4.1.1p3")
|
||||
(version "4.1.2p1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -513,7 +513,7 @@ matrices, and polynomials over the integers and over finite fields.")
|
|||
#\.) "-")
|
||||
"/singular-" version ".tar.gz"))
|
||||
(sha256 (base32
|
||||
"1qqj9bm9pkzm0iyycpvm8x6s79wws3nq60lz25h8x1q61h3426sm"))))
|
||||
"0kvd55353fiqyq1msmi0kka66n5h0aqs7m3km60r01b1w2f8085m"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)
|
||||
|
|
|
@ -41,18 +41,20 @@
|
|||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages video))
|
||||
|
||||
;; ETL, synfig, and Synfig Studio are updated in tandem.
|
||||
(define synfig-version "1.2.2")
|
||||
|
||||
(define-public etl
|
||||
(package
|
||||
(name "etl")
|
||||
(version "0.04.22")
|
||||
(version synfig-version)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; Keep this synchronized with the synfig release version.
|
||||
(uri (string-append "mirror://sourceforge/synfig/releases/"
|
||||
"1.2.0/source/ETL-" version ".tar.gz"))
|
||||
version "/source/ETL-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ii73nsd3xzkhz6w1rnxwphl637j9w82xiy6apa9vin2isdynnmc"))))
|
||||
"12sd8pz8l5xcxcmapkvih3brihdhdb6xmxisr9a415lydid9rh8d"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.synfig.org")
|
||||
(synopsis "Extended C++ template library")
|
||||
|
@ -65,7 +67,7 @@ C++ @dfn{Standard Template Library} (STL).")
|
|||
(define-public synfig
|
||||
(package
|
||||
(name "synfig")
|
||||
(version "1.2.0")
|
||||
(version synfig-version)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/synfig/releases/"
|
||||
|
@ -73,7 +75,7 @@ C++ @dfn{Standard Template Library} (STL).")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1gqx4gn4c73rqwhsgzx0a460gr9hadmi28csp75rx30qavqsj7k1"))))
|
||||
"1vy27kl68sbg41sfasa58k3p2nc1xfalvzk3k9gich9h90rpnpsz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -131,7 +133,8 @@ C++ @dfn{Standard Template Library} (STL).")
|
|||
("openexr" ,openexr)
|
||||
("pango" ,pango)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
`(("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.synfig.org")
|
||||
(synopsis "Vector-based 2D animation renderer")
|
||||
(description
|
||||
|
@ -143,7 +146,7 @@ for tweening, preventing the need to hand-draw each frame.")
|
|||
(define-public synfigstudio
|
||||
(package
|
||||
(name "synfigstudio")
|
||||
(version "1.2.0")
|
||||
(version synfig-version)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/synfig/releases/"
|
||||
|
@ -151,16 +154,14 @@ for tweening, preventing the need to hand-draw each frame.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fbckfbw8dzf0m2wv7vlmw492k1dqa3zf510z019d0as3zpnp6qm"))
|
||||
"1ql92kh9z8w2j9yi3pr7hn7wh2r2j35xynwv9xlwyd7niackgykn"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(substitute* "src/synfigapp/pluginmanager.cpp"
|
||||
(("xmlpp::Node\\* n =") "const xmlpp::Node* n =")
|
||||
(("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList"))
|
||||
#t))
|
||||
(patches
|
||||
(search-patches "synfigstudio-fix-ui-with-gtk3.patch"))))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -44,14 +44,14 @@
|
|||
(define-public clamav
|
||||
(package
|
||||
(name "clamav")
|
||||
(version "0.101.1")
|
||||
(version "0.101.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.clamav.net/downloads/production/"
|
||||
"clamav-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01mq3z04fjbq5iq8wfwfim72iv3dn04d3ishc5lkhxpmnalqydps"))
|
||||
"0d3n4y8i5q594h4cjglmvpk4jd73r9ajpp1bvq5lr9zpdzgyn4ha"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
@ -129,14 +129,14 @@ to the clients.")
|
|||
(define-public fasm
|
||||
(package
|
||||
(name "fasm")
|
||||
(version "1.73.09")
|
||||
(version "1.73.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://flatassembler.net/fasm-"
|
||||
version ".tgz"))
|
||||
(sha256
|
||||
(base32 "197bcj9aa5wpkvrlaafc1smxjss0fwdspq5fwhwgyy9cc7z5g0ym"))))
|
||||
(base32 "1lk8vlr0vg7h8lhiav99paa5a1mi0r2m8agxjmczhhavqhx44c32"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests exist
|
||||
|
|
|
@ -1307,7 +1307,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
|
|||
(define-public guitarix
|
||||
(package
|
||||
(name "guitarix")
|
||||
(version "0.38.0")
|
||||
(version "0.38.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1315,7 +1315,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nv5vm2q86lzsz42kl78jxm6w20al8r7qcnr5f057ria7f8fq2f7"))))
|
||||
"0bw7xnrx062nwb1bfj9x660h7069ncmz77szcs8icpqxrvhs7z80"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no "check" target
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
(define-public duplicity
|
||||
(package
|
||||
(name "duplicity")
|
||||
(version "0.7.18.1")
|
||||
(version "0.7.18.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -82,8 +82,7 @@
|
|||
"-series/" version "/+download/duplicity-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9"))))
|
||||
(base32 "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("util-linux" ,util-linux) ; setsid command, for the tests
|
||||
|
@ -996,14 +995,14 @@ precious backup space.
|
|||
(define-public burp
|
||||
(package
|
||||
(name "burp")
|
||||
(version "2.3.2")
|
||||
(version "2.3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/burp/burp-" version
|
||||
"/burp-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nkkn0nfydn39cl5rxd1wbmzizird6z05j9h2xr7xczdlhhjnaai"))))
|
||||
"0r82mmfjm57yr4f34za3x3rkgc5z2c7nwbnsjjki16qfc9kjyai3"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("librsync" ,librsync)
|
||||
|
|
|
@ -7916,13 +7916,13 @@ as well as query and modify the browser state, such as the current viewport.")
|
|||
(define-public r-genomicfeatures
|
||||
(package
|
||||
(name "r-genomicfeatures")
|
||||
(version "1.34.7")
|
||||
(version "1.34.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "GenomicFeatures" version))
|
||||
(sha256
|
||||
(base32
|
||||
"100y8cx9xfglbn36k25y09y0qfwm0qpb4b01qhk367832rqz5dhz"))))
|
||||
"1sxp86hdsg32l2c85jgic65gy92d8kxsm01264hrx6yikdhicjax"))))
|
||||
(properties
|
||||
`((upstream-name . "GenomicFeatures")))
|
||||
(build-system r-build-system)
|
||||
|
@ -14555,3 +14555,192 @@ overlapping paired-ended reads into (longer) consensus sequences.
|
|||
Additionally, the AdapterRemoval may be used to recover a consensus adapter
|
||||
sequence for paired-ended data, for which this information is not available.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public pplacer
|
||||
(let ((commit "807f6f3"))
|
||||
(package
|
||||
(name "pplacer")
|
||||
;; The commit should be updated with each version change.
|
||||
(version "1.1.alpha19")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/matsen/pplacer.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "11ppbbbx20p2g9wj3ff64dhnarb12q79v7qh4rk0gj6lkbz4n7cn"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build ocaml-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 ftw))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'fix-build-with-latest-ocaml
|
||||
(lambda _
|
||||
(substitute* "myocamlbuild.ml"
|
||||
(("dep \\[\"c_pam\"\\]" m)
|
||||
(string-append "flag [\"ocaml\"; \"compile\"] (A \"-unsafe-string\");\n"
|
||||
m))
|
||||
(("let run_and_read" m)
|
||||
(string-append "
|
||||
let split s ch =
|
||||
let x = ref [] in
|
||||
let rec go s =
|
||||
let pos = String.index s ch in
|
||||
x := (String.before s pos)::!x;
|
||||
go (String.after s (pos + 1))
|
||||
in
|
||||
try go s
|
||||
with Not_found -> !x
|
||||
let split_nl s = split s '\\n'
|
||||
let before_space s =
|
||||
try String.before s (String.index s ' ')
|
||||
with Not_found -> s
|
||||
|
||||
" m))
|
||||
(("run_and_read \"ocamlfind list \\| cut -d' ' -f1\"" m)
|
||||
(string-append "List.map before_space (split_nl & " m ")"))
|
||||
((" blank_sep_strings &") "")
|
||||
((" Lexing.from_string &") ""))
|
||||
#t))
|
||||
(add-after 'unpack 'replace-bundled-cddlib
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((cddlib-src (assoc-ref inputs "cddlib-src"))
|
||||
(local-dir "cddlib_guix"))
|
||||
(mkdir local-dir)
|
||||
(with-directory-excursion local-dir
|
||||
(invoke "tar" "xvf" cddlib-src))
|
||||
(let ((cddlib-src-folder
|
||||
(string-append local-dir "/"
|
||||
(list-ref (scandir local-dir) 2)
|
||||
"/lib-src")))
|
||||
(for-each make-file-writable (find-files "cdd_src" ".*"))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(copy-file file
|
||||
(string-append "cdd_src/" (basename file))))
|
||||
(find-files cddlib-src-folder ".*[ch]$")))
|
||||
#t)))
|
||||
(add-after 'unpack 'fix-makefile
|
||||
(lambda _
|
||||
;; Remove system calls to 'git'.
|
||||
(substitute* "Makefile"
|
||||
(("^DESCRIPT:=pplacer-.*")
|
||||
(string-append
|
||||
"DESCRIPT:=pplacer-$(shell uname)-v" ,version "\n")))
|
||||
(substitute* "myocamlbuild.ml"
|
||||
(("git describe --tags --long .*\\\" with")
|
||||
(string-append
|
||||
"echo -n v" ,version "-" ,commit "\" with")))
|
||||
#t))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(copy-recursively "bin" bin))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("zlib" ,zlib "static")
|
||||
("gsl" ,gsl)
|
||||
("ocaml-ounit" ,ocaml-ounit)
|
||||
("ocaml-batteries" ,ocaml-batteries)
|
||||
("ocaml-camlzip" ,camlzip)
|
||||
("ocaml-csv" ,ocaml-csv)
|
||||
("ocaml-sqlite3" ,ocaml-sqlite3)
|
||||
("ocaml-xmlm" ,ocaml-xmlm)
|
||||
("ocaml-mcl" ,ocaml-mcl)
|
||||
("ocaml-gsl" ,ocaml-gsl-1)))
|
||||
(native-inputs
|
||||
`(("cddlib-src" ,(package-source cddlib))
|
||||
("ocamlbuild" ,ocamlbuild)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(propagated-inputs
|
||||
`(("pplacer-scripts" ,pplacer-scripts)))
|
||||
(synopsis "Phylogenetic placement of biological sequences")
|
||||
(description
|
||||
"Pplacer places query sequences on a fixed reference phylogenetic tree
|
||||
to maximize phylogenetic likelihood or posterior probability according to a
|
||||
reference alignment. Pplacer is designed to be fast, to give useful
|
||||
information about uncertainty, and to offer advanced visualization and
|
||||
downstream analysis.")
|
||||
(home-page "http://matsen.fhcrc.org/pplacer")
|
||||
(license license:gpl3))))
|
||||
|
||||
;; This package is installed alongside 'pplacer'. It is a separate package so
|
||||
;; that it can use the python-build-system for the scripts that are
|
||||
;; distributed alongside the main OCaml binaries.
|
||||
(define pplacer-scripts
|
||||
(package
|
||||
(inherit pplacer)
|
||||
(name "pplacer-scripts")
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-scripts-dir
|
||||
(lambda _ (chdir "scripts") #t))
|
||||
(replace 'check
|
||||
(lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t))
|
||||
(add-after 'install 'wrap-executables
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(let ((path (string-append
|
||||
(assoc-ref inputs "hmmer") "/bin:"
|
||||
(assoc-ref inputs "infernal") "/bin")))
|
||||
(display path)
|
||||
(wrap-program (string-append bin "/refpkg_align.py")
|
||||
`("PATH" ":" prefix (,path))))
|
||||
(let ((path (string-append
|
||||
(assoc-ref inputs "hmmer") "/bin")))
|
||||
(wrap-program (string-append bin "/hrefpkg_query.py")
|
||||
`("PATH" ":" prefix (,path)))))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("infernal" ,infernal)
|
||||
("hmmer" ,hmmer)))
|
||||
(propagated-inputs
|
||||
`(("python-biopython" ,python2-biopython)
|
||||
("taxtastic" ,taxtastic)))
|
||||
(synopsis "Pplacer Python scripts")))
|
||||
|
||||
(define-public python2-checkm-genome
|
||||
(package
|
||||
(name "python2-checkm-genome")
|
||||
(version "1.0.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "checkm-genome" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bm8gpxjmzxsxxl8lzwqhgx8g1dlnmp6znz7wv3hgb0gdjbf9dzz"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:tests? #f)) ; some tests are interactive
|
||||
(propagated-inputs
|
||||
`(("python-dendropy" ,python2-dendropy)
|
||||
("python-matplotlib" ,python2-matplotlib)
|
||||
("python-numpy" ,python2-numpy)
|
||||
("python-pysam" ,python2-pysam)
|
||||
("python-scipy" ,python2-scipy)))
|
||||
(home-page "http://pypi.python.org/pypi/checkm/")
|
||||
(synopsis "Assess the quality of putative genome bins")
|
||||
(description
|
||||
"CheckM provides a set of tools for assessing the quality of genomes
|
||||
recovered from isolates, single cells, or metagenomes. It provides robust
|
||||
estimates of genome completeness and contamination by using collocated sets of
|
||||
genes that are ubiquitous and single-copy within a phylogenetic lineage.
|
||||
Assessment of genome quality can also be examined using plots depicting key
|
||||
genomic characteristics (e.g., GC, coding density) which highlight sequences
|
||||
outside the expected distributions of a typical genome. CheckM also provides
|
||||
tools for identifying genome bins that are likely candidates for merging based
|
||||
on marker set compatibility, similarity in genomic characteristics, and
|
||||
proximity within a reference genome.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -96,13 +96,13 @@ data units.")
|
|||
(define-public khal
|
||||
(package
|
||||
(name "khal")
|
||||
(version "0.10.0")
|
||||
(version "0.10.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "khal" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1p49f3g25x900vk32spjbr2aipj12kcbhayny2vwhdpkjlv6k396"))))
|
||||
"1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
@ -146,7 +146,7 @@ data units.")
|
|||
(synopsis "Console calendar program")
|
||||
(description "Khal is a standards based console calendar program,
|
||||
able to synchronize with CalDAV servers through vdirsyncer.")
|
||||
(home-page "http://lostpackets.de/khal/")
|
||||
(home-page "https://lostpackets.de/khal/")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public remind
|
||||
|
|
|
@ -863,3 +863,108 @@ Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
|
|||
blanking CD-RW media, creating ISO-9660 file system images, extracting audio
|
||||
CD data, and more. It's mostly compatible with @code{cdrtools}.")
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public libmirage
|
||||
(package
|
||||
(name "libmirage")
|
||||
(version "3.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://downloads.sourceforge.net/cdemu/libmirage-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ydph33sfxplp4872dp8ghp574jk5d4qr8hqz61qnznq1b11cnbr"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)))
|
||||
(inputs
|
||||
`(("glib" ,glib)))
|
||||
(arguments
|
||||
;; No tests.
|
||||
'(#:tests? #f))
|
||||
(home-page "https://cdemu.sourceforge.io/")
|
||||
(synopsis "CD-ROM image access library")
|
||||
(description "libMirage is a CD-ROM image access library. It supports the
|
||||
following formats: B6T, C2D, CCD, CDI, CIF, CUE, ISO, MDS, MDX, NRG, TOC. It
|
||||
is written in C and based on GLib. Its aim is to provide uniform access to
|
||||
the data stored in various image formats.")
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public cdemu-daemon
|
||||
(package
|
||||
(name "cdemu-daemon")
|
||||
(version "3.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://downloads.sourceforge.net/cdemu/cdemu-daemon/cdemu-daemon-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"171qqcziqgf6dd9n8xs9hc71krhjiyx9qr767s8znidyjj88hbc4"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)))
|
||||
(inputs
|
||||
`(("libmirage" ,libmirage)
|
||||
("glib" ,glib)
|
||||
("ao" ,ao)))
|
||||
(arguments
|
||||
;; No tests.
|
||||
'(#:tests? #f))
|
||||
(home-page "https://cdemu.sourceforge.io/")
|
||||
(synopsis "CD/DVD-ROM device emulator")
|
||||
(description "CDemu is a software suite designed to emulate an optical
|
||||
drive and disc (including CD-ROMs and DVD-ROMs).")
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public cdemu-client
|
||||
(package
|
||||
(name "cdemu-client")
|
||||
(version "3.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://downloads.sourceforge.net/cdemu/cdemu-client-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zwz987pb2pakfk9kz8a6xa9hq1ip48cn4ryl9z85dik8k2sizm9"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)))
|
||||
(inputs
|
||||
`(("python" ,python)
|
||||
("python-pygobject" ,python-pygobject)
|
||||
("cdemu-daemon" ,cdemu-daemon)))
|
||||
(arguments
|
||||
;; No tests.
|
||||
`(#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'patch-shebang
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(patch-shebang (string-append (assoc-ref outputs "out")
|
||||
"/bin/cdemu"))
|
||||
#t))
|
||||
(add-after 'patch-shebang 'wrap-program
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((prog (string-append (assoc-ref outputs "out")
|
||||
"/bin/cdemu")))
|
||||
(wrap-program prog
|
||||
`("PYTHONPATH" = (,(getenv "PYTHONPATH"))))
|
||||
#t))))))
|
||||
(home-page "https://cdemu.sourceforge.io/")
|
||||
(synopsis "Command-line client for controlling cdemu-daemon")
|
||||
(description "CDEmu client is a simple command-line client for controlling
|
||||
CDEmu daemon.
|
||||
|
||||
It provides a way to perform the key tasks related to controlling the CDEmu
|
||||
daemon, such as loading and unloading devices, displaying devices' status and
|
||||
retrieving/setting devices' debug masks.")
|
||||
(license gpl2+)))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -37,16 +37,16 @@
|
|||
(package
|
||||
(name "conky")
|
||||
(home-page "https://github.com/brndnmtthws/conky")
|
||||
(version "1.11.2")
|
||||
(version "1.11.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx"))))
|
||||
(base32 "0pdl31xvmy8niagzqx9sd2b6hc6lzwfiaz66m4djf1gz9bksc8qv"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; there are no tests
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -44,15 +44,14 @@
|
|||
(define-public connman
|
||||
(package
|
||||
(name "connman")
|
||||
(version "1.36")
|
||||
(version "1.37")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/linux/network/connman/"
|
||||
name "-" version ".tar.xz"))
|
||||
"connman-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7"))))
|
||||
(base32 "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -63,8 +62,6 @@
|
|||
"--enable-vpnc"
|
||||
"--enable-pptp"
|
||||
"--enable-l2tp"
|
||||
;; location for daemon state files and internal configuration
|
||||
;; needs to be writeable
|
||||
"--localstatedir=/var"
|
||||
(string-append
|
||||
"--with-dbusconfdir=" (assoc-ref %outputs "out") "/etc")
|
||||
|
|
|
@ -242,14 +242,14 @@ single step.")
|
|||
(define-public r-rvest
|
||||
(package
|
||||
(name "r-rvest")
|
||||
(version "0.3.2")
|
||||
(version "0.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rvest" version))
|
||||
(sha256
|
||||
(base32
|
||||
"04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"))))
|
||||
"0vsm38w83zf0djcrc5ymb1ysg88hmgq2w937ql7pqgvk5px8f2mi"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-httr" ,r-httr)
|
||||
|
@ -2515,14 +2515,14 @@ Delaunay triangulation and convex hull computation.")
|
|||
(define-public r-ddalpha
|
||||
(package
|
||||
(name "r-ddalpha")
|
||||
(version "1.3.8")
|
||||
(version "1.3.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ddalpha" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gi0hl14ghgf65zxsvgzh9z6xx1nyi49cpx192lmwrwqn3dy7ba0"))))
|
||||
"1vzs0cvl6xw3h9i00rg3hs02xwgxcnh8326y10kxmhs3qq4m7nb2"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-bh" ,r-bh)
|
||||
|
@ -2674,14 +2674,14 @@ by base R methods related to model fitting.")
|
|||
(define-public r-broom
|
||||
(package
|
||||
(name "r-broom")
|
||||
(version "0.5.1")
|
||||
(version "0.5.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "broom" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bmf38yvwalqf5j5yrr48nsk5k3n75s0gwcw621hp5lgrgvnp7ns"))))
|
||||
"0qmclih5dm5sqzy4hplcfy677kr12pm9pnpv3r319g14dd27pbqn"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-backports" ,r-backports)
|
||||
|
@ -3701,14 +3701,14 @@ terminals.")
|
|||
(define-public r-tinytex
|
||||
(package
|
||||
(name "r-tinytex")
|
||||
(version "0.11")
|
||||
(version "0.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "tinytex" version))
|
||||
(sha256
|
||||
(base32
|
||||
"017g0niwmx8qafsn9b01gp60j5fgwxch0dnkmjgpxxr1k4h1r64x"))))
|
||||
"03ggxbd4y1ipcmjw5ixa6g6wg4ydargnln7g08bdrdi96zyyq1fh"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-xfun" ,r-xfun)))
|
||||
|
@ -5181,14 +5181,14 @@ obtain a better initial configuration in non-metric MDS.")
|
|||
(define-public r-reticulate
|
||||
(package
|
||||
(name "r-reticulate")
|
||||
(version "1.11.1")
|
||||
(version "1.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "reticulate" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1cyb92dvv9iibsk28i0gm5hm2xqbsn0y6d67id74c8rhai9y8i9v"))))
|
||||
"0pqr1rcs8yg9nlh729mvlws93cqhpmv49j9bcgarh7vxzkwyv0kb"))))
|
||||
(build-system r-build-system)
|
||||
(inputs `(("python" ,python)))
|
||||
(propagated-inputs
|
||||
|
@ -7979,14 +7979,14 @@ terminals that do not support Unicode.")
|
|||
(define-public r-usethis
|
||||
(package
|
||||
(name "r-usethis")
|
||||
(version "1.4.0")
|
||||
(version "1.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "usethis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gadckx3sxz9gxvpkprj9x7zcgg2nz5m4q0vi76ya9li1v03rwwn"))))
|
||||
"0pn6ka3726psaqlx573g6nxi90apf0rn5m4k2lz1jr66xdc19sag"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-clipr" ,r-clipr)
|
||||
|
@ -7998,10 +7998,13 @@ terminals that do not support Unicode.")
|
|||
("r-gh" ,r-gh)
|
||||
("r-git2r" ,r-git2r)
|
||||
("r-glue" ,r-glue)
|
||||
("r-purrr" ,r-purrr)
|
||||
("r-rlang" ,r-rlang)
|
||||
("r-rprojroot" ,r-rprojroot)
|
||||
("r-rstudioapi" ,r-rstudioapi)
|
||||
("r-whisker" ,r-whisker)))
|
||||
("r-whisker" ,r-whisker)
|
||||
("r-withr" ,r-withr)
|
||||
("r-yaml" ,r-yaml)))
|
||||
(home-page "https://github.com/r-lib/usethis")
|
||||
(synopsis "Automate R package and project setup")
|
||||
(description
|
||||
|
@ -8037,14 +8040,14 @@ more information about packages, and where they were installed from.")
|
|||
(define-public r-remotes
|
||||
(package
|
||||
(name "r-remotes")
|
||||
(version "2.0.2")
|
||||
(version "2.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "remotes" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rsjxmhwpr51ilsdjfqn06mj8yr2d7nckcn3arv1ljn23qfkpcxa"))))
|
||||
"1jbn4kjimcr82zv5lnqxqa2487a96vn6jxf7wc6gnpxr6k06d61p"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/r-lib/remotes#readme")
|
||||
(synopsis "R package installation from remote repositories")
|
||||
|
@ -8161,14 +8164,14 @@ ways.")
|
|||
(define-public r-summarytools
|
||||
(package
|
||||
(name "r-summarytools")
|
||||
(version "0.9.2")
|
||||
(version "0.9.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "summarytools" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1q83kii6prqf9z5v8cxj1q2944kx9x7dcxyqix3m883a94dmgivy"))))
|
||||
"1wfbkgvicaic37zgpr6zcm4a58yx43p59h0sqggdj44ncqs7147f"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-checkmate" ,r-checkmate)
|
||||
|
@ -8181,6 +8184,7 @@ ways.")
|
|||
("r-pryr" ,r-pryr)
|
||||
("r-rapportools" ,r-rapportools)
|
||||
("r-rcurl" ,r-rcurl)
|
||||
("r-tibble" ,r-tibble)
|
||||
("r-tidyr" ,r-tidyr)))
|
||||
(home-page "https://github.com/dcomtois/summarytools")
|
||||
(synopsis "Tools to quickly and neatly summarize data")
|
||||
|
@ -10618,14 +10622,14 @@ regression coefficients can be conducted via jackknifing.")
|
|||
(define-public r-huge
|
||||
(package
|
||||
(name "r-huge")
|
||||
(version "1.3.1")
|
||||
(version "1.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "huge" version))
|
||||
(sha256
|
||||
(base32
|
||||
"06s22i2cdn6g2r8kq5csyspinayh8dxxg9gkwcf4sa1lmrgb0bf9"))))
|
||||
"1j93gvi1jyq3ld9jhdqhrpm2is54rk3ilmf3yw7fx6gva0y6hjqd"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-igraph" ,r-igraph)
|
||||
|
@ -11806,14 +11810,14 @@ al. (2010).")
|
|||
(define-public r-reinforcelearn
|
||||
(package
|
||||
(name "r-reinforcelearn")
|
||||
(version "0.2.0")
|
||||
(version "0.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "reinforcelearn" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0naakmyb14d2cf7cy5ir52qh3bp51gvs6hyhfi3f72yl2jfnnpzg"))))
|
||||
"176z2q69p24i29a8sh19xxn2zl3h1z2ixdssr5i6m4yvkvdrvv3b"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-checkmate" ,r-checkmate)
|
||||
|
@ -12721,14 +12725,14 @@ that accept short and long options.")
|
|||
(define-public r-wgcna
|
||||
(package
|
||||
(name "r-wgcna")
|
||||
(version "1.66")
|
||||
(version "1.67")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "WGCNA" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rhnyhzfn93yp24jz9v6dzrmyizwzdw070a7idm0k33w1cm8sjqv"))))
|
||||
"09387w85lxvwr8ax2i2h602b4dgfv4wbvsl9aj1q0b1vfs4rkk69"))))
|
||||
(properties `((upstream-name . "WGCNA")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -13860,3 +13864,27 @@ making it possible to download files over HTTPS across platforms. The
|
|||
@code{RCurl} package provides this functionality (and much more) but has
|
||||
external dependencies. This package has is implemented purely in R.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public r-rex
|
||||
(package
|
||||
(name "r-rex")
|
||||
(version "1.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rex" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-lazyeval" ,r-lazyeval)
|
||||
("r-magrittr" ,r-magrittr)))
|
||||
(home-page "https://github.com/kevinushey/rex")
|
||||
(synopsis "Friendly regular expressions")
|
||||
(description
|
||||
"This package provides a friendly interface for the construction of
|
||||
regular expressions. Regular expressions are a very powerful feature, however
|
||||
they are often difficult to interpret. Rex allows you to build complex
|
||||
regular expressions from human readable expressions")
|
||||
(license license:expat)))
|
||||
|
|
|
@ -82,6 +82,7 @@
|
|||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages perl-check)
|
||||
#:use-module (gnu packages perl-web)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages popt)
|
||||
#:use-module (gnu packages python)
|
||||
|
@ -984,6 +985,92 @@ for example from a shell script.")
|
|||
;; others (like sparql-query.c) contain a GPLv2+ license header.
|
||||
(license (list license:gpl3+))))
|
||||
|
||||
(define-public sqitch
|
||||
(package
|
||||
(name "sqitch")
|
||||
(version "0.9999")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cvj8grs3bzc4g7dw1zc26g4biv1frav18sq0fkvi2kk0q1aigzm"))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'set-check-environment
|
||||
(lambda _
|
||||
(setenv "TZ" "UTC")
|
||||
(setenv "HOME" "/tmp")
|
||||
#t))
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(path (getenv "PERL5LIB")))
|
||||
(wrap-program (string-append out "/bin/sqitch")
|
||||
`("PERL5LIB" ":" prefix
|
||||
(,(string-append out "/lib/perl5/site_perl"
|
||||
":"
|
||||
path)))))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("perl-capture-tiny" ,perl-capture-tiny)
|
||||
("perl-io-pager" ,perl-io-pager)
|
||||
("perl-module-build" ,perl-module-build)
|
||||
("perl-module-runtime" ,perl-module-runtime)
|
||||
("perl-path-class" ,perl-path-class)
|
||||
("perl-test-deep" ,perl-test-deep)
|
||||
("perl-test-dir" ,perl-test-dir)
|
||||
("perl-test-exception" ,perl-test-exception)
|
||||
("perl-test-file" ,perl-test-file)
|
||||
("perl-test-file-contents" ,perl-test-file-contents)
|
||||
("perl-test-mockmodule" ,perl-test-mockmodule)
|
||||
("perl-test-nowarnings" ,perl-test-nowarnings)
|
||||
("perl-test-warn" ,perl-test-warn)))
|
||||
(inputs
|
||||
`(("perl-class-xsaccessor" ,perl-class-xsaccessor)
|
||||
("perl-clone" ,perl-clone)
|
||||
("perl-config-gitlike" ,perl-config-gitlike)
|
||||
("perl-datetime" ,perl-datetime)
|
||||
("perl-datetime-timezone" ,perl-datetime-timezone)
|
||||
("perl-dbd-pg" ,perl-dbd-pg)
|
||||
("perl-dbi" ,perl-dbi)
|
||||
("perl-devel-stacktrace" ,perl-devel-stacktrace)
|
||||
("perl-encode-locale" ,perl-encode-locale)
|
||||
("perl-file-homedir" ,perl-file-homedir)
|
||||
("perl-hash-merge" ,perl-hash-merge)
|
||||
("perl-ipc-run3" ,perl-ipc-run3)
|
||||
("perl-ipc-system-simple" ,perl-ipc-system-simple)
|
||||
("perl-libintl-perl" ,perl-libintl-perl)
|
||||
("perl-list-moreutils" ,perl-list-moreutils)
|
||||
("perl-moo" ,perl-moo)
|
||||
("perl-mysql-config" ,perl-mysql-config)
|
||||
("perl-namespace-autoclean" ,perl-namespace-autoclean)
|
||||
("perl-path-class" ,perl-path-class)
|
||||
("perl-perlio-utf8_strict" ,perl-perlio-utf8_strict)
|
||||
("perl-string-formatter" ,perl-string-formatter)
|
||||
("perl-string-shellquote" ,perl-string-shellquote)
|
||||
("perl-sub-exporter" ,perl-sub-exporter)
|
||||
("perl-template-tiny" ,perl-template-tiny)
|
||||
("perl-template-toolkit" ,perl-template-toolkit)
|
||||
("perl-throwable" ,perl-throwable)
|
||||
("perl-try-tiny" ,perl-try-tiny)
|
||||
("perl-type-tiny" ,perl-type-tiny)
|
||||
("perl-type-tiny-xs" ,perl-type-tiny-xs)
|
||||
("perl-uri" ,perl-uri)
|
||||
("perl-uri-db" ,perl-uri-db)))
|
||||
(home-page "https://sqitch.org/")
|
||||
(synopsis "Database change management tool")
|
||||
(description
|
||||
"Sqitch is a standalone change management system for database schemas,
|
||||
which uses SQL to describe changes.")
|
||||
(license license:x11)))
|
||||
|
||||
(define-public sqlcrush
|
||||
;; Unfortunately, there is no proper upstream release and may never be.
|
||||
(let ((commit "b5f6868f189566a26eecc78d0f0659813c1aa98a")
|
||||
|
@ -1319,6 +1406,29 @@ module, and nothing else.")
|
|||
(license license:perl-license)
|
||||
(home-page "https://metacpan.org/release/DBD-SQLite")))
|
||||
|
||||
(define-public perl-mysql-config
|
||||
(package
|
||||
(name "perl-mysql-config")
|
||||
(version "1.04")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/D/DA/DARREN/MySQL-Config-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1svn7ccw2gc4cazvc58j84rxhnc9vs01zpird0l8460598j475qr"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/MySQL-Config")
|
||||
(synopsis "Parse and utilize MySQL's /etc/my.cnf and ~/.my.cnf files")
|
||||
(description
|
||||
"@code{MySQL::Config} emulates the @code{load_defaults} function from
|
||||
libmysqlclient. It will fill an aray with long options, ready to be parsed by
|
||||
@code{Getopt::Long}.")
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-sql-abstract
|
||||
(package
|
||||
(name "perl-sql-abstract")
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -33,14 +33,14 @@
|
|||
(define-public ncdc
|
||||
(package
|
||||
(name "ncdc")
|
||||
(version "1.20")
|
||||
(version "1.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://dev.yorhel.nl/download/ncdc-" version
|
||||
".tar.gz"))
|
||||
(sha256 (base32
|
||||
"0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca"))))
|
||||
"10hrk7pcvfl9cj6d0kr4qf3l068ikqhccbg7lf25pr2kln9lz412"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("bzip2" ,bzip2)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
|
@ -92,11 +92,10 @@ program to exhibit a bug.")
|
|||
;; home-page pointing to a bsd-2 license.
|
||||
(license bsd-3)))
|
||||
|
||||
;; Newer versions depend on LLVM and Clang >= 4, which have yet to be packaged.
|
||||
(define-public c-reduce
|
||||
(package
|
||||
(name "c-reduce")
|
||||
(version "2.6.0")
|
||||
(version "2.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -105,12 +104,12 @@ program to exhibit a bug.")
|
|||
"creduce-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0pf5q0n8vkdcr1wrkxn2jzxv0xkrir13bwmqfw3jpbm3dh2c3b6d"))))
|
||||
"1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("astyle" ,astyle)
|
||||
("llvm" ,llvm-3.9.1)
|
||||
("clang" ,clang-3.9.1)
|
||||
("llvm" ,llvm-6)
|
||||
("clang" ,clang-6)
|
||||
("flex" ,flex)
|
||||
("indent" ,indent)
|
||||
("perl" ,perl)
|
||||
|
@ -118,11 +117,16 @@ program to exhibit a bug.")
|
|||
("file-which" ,perl-file-which)
|
||||
("getopt-tabular" ,perl-getopt-tabular)
|
||||
("regex-common" ,perl-regexp-common)
|
||||
("sys-cpu" ,perl-sys-cpu)
|
||||
("term-readkey" ,perl-term-readkey)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(with-directory-excursion "tests"
|
||||
;; Running all tests can take a looong time, and tests 4 and 5
|
||||
;; require frama-c or kcc. So run just one for sanity.
|
||||
(invoke "./run_tests" "1"))))
|
||||
(add-after 'install 'set-load-paths
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Tell creduce where to find the perl modules it needs.
|
||||
|
@ -137,7 +141,7 @@ program to exhibit a bug.")
|
|||
,(package-version perl)))
|
||||
'("term-readkey" "exporter-lite"
|
||||
"file-which" "getopt-tabular"
|
||||
"regex-common" "sys-cpu")))))
|
||||
"regex-common")))))
|
||||
#t)))))
|
||||
(home-page "https://embed.cs.utah.edu/creduce")
|
||||
(synopsis "Reducer for interesting code")
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2015, 2018 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||
;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -81,15 +81,15 @@ and freshness without requiring additional information from the user.")
|
|||
(package
|
||||
(name "ldc")
|
||||
(version "0.17.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/ldc-developers/ldc/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kw0j378k6bh0k66dvx99bjq8ilp8bb24w3jrmibn8rhmqv0d5q8"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ldc-developers/ldc.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0nnrjavfmpfp7bib04isqlxvyzh6mlvsdan0gxysdz96hlg4hcq8"))))
|
||||
(build-system cmake-build-system)
|
||||
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
|
||||
(properties
|
||||
|
@ -101,11 +101,15 @@ and freshness without requiring additional information from the user.")
|
|||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-submodule-sources
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((unpack (lambda (source target)
|
||||
(with-directory-excursion target
|
||||
(invoke "tar" "xvf"
|
||||
(assoc-ref inputs source)
|
||||
"--strip-components=1")))))
|
||||
(let ((unpack (lambda (input target)
|
||||
(let ((source (assoc-ref inputs input)))
|
||||
;; Git checkouts are directories as long as
|
||||
;; there are no patches; tarballs otherwise.
|
||||
(if (file-is-directory? source)
|
||||
(copy-recursively source target)
|
||||
(with-directory-excursion target
|
||||
(invoke "tar" "xvf" source
|
||||
"--strip-components=1")))))))
|
||||
(unpack "phobos-src" "runtime/phobos")
|
||||
(unpack "druntime-src" "runtime/druntime")
|
||||
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
|
||||
|
@ -147,32 +151,32 @@ and freshness without requiring additional information from the user.")
|
|||
("unzip" ,unzip)
|
||||
("phobos-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/ldc-developers/phobos/archive/ldc-v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ldc-developers/phobos.git")
|
||||
(commit (string-append "ldc-v" version))))
|
||||
(file-name (git-file-name "phobos" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16x36kp46mqiihxx7jvr1d3mv3b96yfmhinb9lzinh2m4clr85wz"))
|
||||
(base32 "0i7gh99w4mi0hdv16261jcdiqyv1nkjdcwy9prw32s0lvplx8fdy"))
|
||||
(patches (search-patches "ldc-bootstrap-disable-tests.patch"))))
|
||||
("druntime-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/ldc-developers/druntime/archive/ldc-v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ldc-developers/druntime.git")
|
||||
(commit (string-append "ldc-v" version))))
|
||||
(file-name (git-file-name "druntime" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0iw2xxhcbsc5f1707dgdzhff528363l4faqdk513gaxs2dhfx8vx"))))
|
||||
(base32 "0alabm3bbvs94msvxz5psiwk4f51cw9h82z1p5hhsnf8ja6d0am7"))))
|
||||
("dmd-testsuite-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ldc-developers/dmd-testsuite.git")
|
||||
(commit (string-append "ldc-v" version))))
|
||||
(file-name (git-file-name "dmd-testsuite" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4"))))))
|
||||
(base32 "05qr4cgb4scfqzbw1l5pk72kil074mvj9d55b165ljyr51sgwgbl"))))))
|
||||
(home-page "http://wiki.dlang.org/LDC")
|
||||
(synopsis "LLVM-based compiler for the D programming language")
|
||||
(description
|
||||
|
@ -195,28 +199,33 @@ bootstrapping more recent compilers written in D.")
|
|||
(inherit ldc-bootstrap)
|
||||
(name "ldc")
|
||||
(version "1.10.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/ldc-developers/ldc/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16b1h9kwfggjw6ykc6sfs26ak6vypylsx9wmvp5m6x3cvi6g70yi"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ldc-developers/ldc.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0qcb2rn01wql7y8qp31blbv3hwmnh3zjgzi2n7k168cxr6rrdhlp"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-submodule-sources
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((unpack (lambda (source target)
|
||||
(with-directory-excursion target
|
||||
(invoke "tar" "xvf"
|
||||
(assoc-ref inputs source)
|
||||
"--strip-components=1")))))
|
||||
(let ((unpack (lambda (input target)
|
||||
(let ((source (assoc-ref inputs input)))
|
||||
;; Git checkouts are directories as long as
|
||||
;; there are no patches; tarballs otherwise.
|
||||
(if (file-is-directory? source)
|
||||
(copy-recursively source target)
|
||||
(with-directory-excursion target
|
||||
(invoke "tar" "xvf" source
|
||||
"--strip-components=1")))))))
|
||||
(unpack "phobos-src" "runtime/phobos")
|
||||
(unpack "druntime-src" "runtime/druntime")
|
||||
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))
|
||||
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
|
||||
#t)))
|
||||
(add-after 'unpack-submodule-sources 'patch-phobos
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* '("runtime/phobos/std/process.d"
|
||||
|
@ -224,7 +233,7 @@ bootstrapping more recent compilers written in D.")
|
|||
(("/bin/sh") (which "sh"))
|
||||
(("echo") (which "echo")))
|
||||
(substitute* "tests/d2/dmd-testsuite/Makefile"
|
||||
(("/bin/bash") (which "bash")))
|
||||
(("/bin/bash") (which "bash")))
|
||||
;; disable unittests in the following files. We are discussing with
|
||||
;; upstream
|
||||
(substitute* '("runtime/phobos/std/net/curl.d"
|
||||
|
@ -241,14 +250,14 @@ bootstrapping more recent compilers written in D.")
|
|||
(delete-file "tests/plugins/addFuncEntryCall/testPlugin.d")
|
||||
;; the following tests requires AVX instruction set in the CPU.
|
||||
(substitute* "tests/d2/dmd-testsuite/runnable/test_cdvecfill.d"
|
||||
(("^// DISABLED: ") "^// DISABLED: linux64 "))
|
||||
(("^// DISABLED: ") "^// DISABLED: linux64 "))
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; some tests call into gdb binary which needs SHELL and CC set
|
||||
(setenv "SHELL" (which "sh"))
|
||||
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
||||
(invoke "make" "test" "-j" (number->string (parallel-job-count))))))))
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; some tests call into gdb binary which needs SHELL and CC set
|
||||
(setenv "SHELL" (which "sh"))
|
||||
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
||||
(invoke "make" "test" "-j" (number->string (parallel-job-count))))))))
|
||||
(native-inputs
|
||||
`(("llvm" ,llvm-6)
|
||||
("clang" ,clang-6)
|
||||
|
@ -259,13 +268,13 @@ bootstrapping more recent compilers written in D.")
|
|||
("gdb" ,gdb)
|
||||
("phobos-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/ldc-developers/phobos/archive/ldc-v"
|
||||
older-version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ldc-developers/phobos.git")
|
||||
(commit (string-append "ldc-v" older-version))))
|
||||
(file-name (git-file-name "phobos" older-version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cpmrww00xf1qx38bcc22rr05qw41p00p45yb5fbwnfaccfwdn0s"))
|
||||
(base32 "1gmlwnjdcf6s5aahadxsif9l5nyaj0rrn379g6fmhcvdk64kf509"))
|
||||
;; This patch deactivates some tests that depend on network access
|
||||
;; to pass. It also deactivates some tests that have some reliance
|
||||
;; on timezone.
|
||||
|
@ -278,36 +287,37 @@ bootstrapping more recent compilers written in D.")
|
|||
(patches (search-patches "ldc-disable-phobos-tests.patch"))))
|
||||
("druntime-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/ldc-developers/druntime/archive/ldc-v"
|
||||
older-version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ldc-developers/druntime.git")
|
||||
(commit (string-append "ldc-v" older-version))))
|
||||
(file-name (git-file-name "druntime" older-version))
|
||||
(sha256
|
||||
(base32
|
||||
"1akh2vdi98jih8642yjbvv2vavxzrmq24kz8i3kfidg5ndqyv222"))))
|
||||
(base32 "0a3yyjcnpvm5fbdczf76fx08kl154w17w06hlxf0j3p1p4jc85aj"))))
|
||||
("dmd-testsuite-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v"
|
||||
older-version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ldc-developers/dmd-testsuite.git")
|
||||
(commit (string-append "ldc-v" older-version))))
|
||||
(file-name (git-file-name "dmd-testsuite" older-version))
|
||||
(sha256
|
||||
(base32
|
||||
"0z5x07qrbkpksshaymp11ir6jlmg9wjicxn6zhp8cya6i1ha9p99")))))))))
|
||||
(base32 "0mm3rliki1nqiqfaha7ssvm156aa398vpvf4v6895m7nn1mz7rss")))))))))
|
||||
|
||||
(define-public dub
|
||||
(package
|
||||
(name "dub")
|
||||
(version "1.7.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/dlang/dub/archive/"
|
||||
"v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jvr1mmq8j77wnsrsg7x2xv8yfljqd6x8gn6yy7dd6h6y3cf408q"))))
|
||||
(build-system gnu-build-system)
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/dlang/dub.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "073ibvgm1gphcqs1yjrav9ryp677nh3b194nxmvicwgvdc0sb6w9"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; it would have tested itself by installing some packages (vibe etc)
|
||||
#:phases
|
||||
|
|
|
@ -569,23 +569,21 @@ Extensions} (DNSSEC).")
|
|||
(define-public knot
|
||||
(package
|
||||
(name "knot")
|
||||
(version "2.8.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
|
||||
"knot-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vw7xx7bm440jwrpvdd04vrp6ccz2b11swcn9msvs62hf0kdjjj9"))
|
||||
(patches
|
||||
(search-patches "knot-include-system-lmdb-header.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete bundled libraries.
|
||||
(with-directory-excursion "src/contrib"
|
||||
(delete-file-recursively "lmdb"))
|
||||
#t))))
|
||||
(version "2.8.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
|
||||
"knot-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1im2wb8hl394mzni1wavmvfqd7il8s28kcz8w3s4v05nbhzg06xj"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete bundled libraries.
|
||||
(with-directory-excursion "src/contrib"
|
||||
(delete-file-recursively "lmdb"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages virtualization))
|
||||
|
||||
(define %docker-version "18.09.3")
|
||||
(define %docker-version "18.09.5")
|
||||
|
||||
(define-public python-docker-py
|
||||
(package
|
||||
|
@ -241,7 +241,7 @@ network attachments.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx"))
|
||||
(base32 "0cirpd9l2qazp2jyanwzvrkx2m98nksjdvn43ff38p89w6133ipb"))
|
||||
(patches
|
||||
(search-patches "docker-engine-test-noinstall.patch"
|
||||
"docker-fix-tests.patch"
|
||||
|
@ -487,7 +487,7 @@ provisioning etc.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "09j1i668p330gjz5vw5pss8ghxh1mz7rl2q9ykp02q9p112zhy4j"))))
|
||||
(base32 "0mxxjzkwdny8p2dmyjich7x1gn7hdlfppzjy2skk2k5bwv7nxpmi"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "github.com/docker/cli"
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016, 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
|
||||
|
@ -68,14 +68,14 @@
|
|||
(define-public emacs
|
||||
(package
|
||||
(name "emacs")
|
||||
(version "26.1")
|
||||
(version "26.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/emacs/emacs-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"))
|
||||
"13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"))
|
||||
(patches (search-patches "emacs-exec-path.patch"
|
||||
"emacs-fix-scheme-indent-function.patch"
|
||||
"emacs-source-date-epoch.patch"))
|
||||
|
|
|
@ -1013,6 +1013,8 @@ SPI, I2C, JTAG.")
|
|||
"uptools/atcmd/atinterf.c")
|
||||
(("/opt/freecalypso/loadtools")
|
||||
(string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
|
||||
(("\\$\\{INSTALL_PREFIX\\}/loadtools")
|
||||
(string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
|
||||
(("/opt/freecalypso")
|
||||
(assoc-ref outputs "out")))
|
||||
#t)))))
|
||||
|
|
|
@ -466,13 +466,13 @@ and Game Boy Color games.")
|
|||
(version "2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-core/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-core.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0dg2hksm5qni2hcha93k7n4fqr92888p946f7phb0ndschzfh9kk"))))
|
||||
(base32 "116fndl6652zrp1r6ag4xv3dzp1x52mlvadj8xwflq07fd5rhri1"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -514,13 +514,13 @@ core library.")
|
|||
(version "2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-audio-sdl/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-audio-sdl.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ss6w92n2rpfnazhg9lbq0nvs3fqx93nliz3k3wjxdlx4dpi7h3a"))))
|
||||
(base32 "0z19amfg9vr2pqjjri1ipc7hs681fzjcnb0f9y7bjhp5n8d7p6bb"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -560,13 +560,13 @@ SDL audio plugin.")
|
|||
(version "2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-input-sdl/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-input-sdl.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "11sj5dbalp2nrlmki34vy7wy28vc175pnnkdk65p8599hnyq37ri"))))
|
||||
(base32 "1dyazfbdjycdfslq8jixqiqhziw0rlkvach2r9dz91229jmkyc9c"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("which" ,which)))
|
||||
|
@ -605,13 +605,13 @@ SDL input plugin.")
|
|||
(version "2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-rsp-hle/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-rsp-hle.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "15h7mgz6xd2zjzm6l3f96sbs8kwr3xvbwzgikhnka79m6c69hsxv"))))
|
||||
(base32 "0pi31qzjjp7aypdvvnz6ms18g09c4gqzxi6328zj8sji94b75gf0"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("mupen64plus-core" ,mupen64plus-core)))
|
||||
|
@ -647,13 +647,13 @@ high-level emulation (HLE) RSP processor plugin.")
|
|||
(version "2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-rsp-z64/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-rsp-z64.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "10jz1w2dhx5slhyk4m8mdqlpsd6cshchslr1fckb2ayzb1ls3ghi"))))
|
||||
(base32 "0nfyjns9k8xbg3aqs7593nfaxvlj72h3l8h467442xlk8ajfcylx"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("mupen64plus-core" ,mupen64plus-core)))
|
||||
|
@ -689,13 +689,13 @@ Z64 RSP processor plugin.")
|
|||
(version "2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-video-arachnoid/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-video-arachnoid.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0jjwf144rihznm4lnqbhgigxw664v3v32wy94adaa6imk8z6gslh"))))
|
||||
(base32 "1v9fqwpb6pawr8z5cm2ki7bqkks4iyr5c4jy4v5khj6h8zcv55gc"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -735,13 +735,13 @@ Arachnoid video plugin.")
|
|||
(version "2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-video-glide64/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-video-glide64.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1rm55dbf6xgsq1blbzs6swa2ajv0qkn38acbljj346abnk6s3dla"))))
|
||||
(base32 "0qn5za7g7796kh2ag3xpmhbqg0yf71g9liz6ks0rha8pz73lgs01"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -789,13 +789,13 @@ Glide64 video plugin.")
|
|||
(version "2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-video-glide64mk2/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-video-glide64mk2.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ihl4q293d6svba26b4mhapjcdg12p90gibz79b4mx423jlcxxj9"))))
|
||||
(base32 "08pm28a36dpr0cvr8pzw0n5ksdazp7jqvlmqfy2lwb4dm0cwhkqd"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -839,13 +839,13 @@ Glide64MK2 video plugin.")
|
|||
(version "2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-video-rice/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-video-rice.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rd2scjmh285w61aj3mgx71whg5rqrjbry3cdgicczrnyvf8wdvk"))))
|
||||
(base32 "0rpmbcq67gsj5h5jjis146378qc1mskskvx20y1ikx59yhbamh13"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -887,13 +887,13 @@ Rice Video plugin.")
|
|||
(version "2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-video-z64/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-video-z64.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1x7wsjs5gx2iwx20p4cjcbf696zsjlh31qxmghwv0ifrq8x58s1b"))
|
||||
(base32 "04qa2fdd6dakpk2v0d4l80xh9b4h8gm71g80c0wyyxdhmhwk1r9c"))
|
||||
(patches (search-patches "mupen64plus-video-z64-glew-correct-path.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
@ -942,13 +942,13 @@ Z64 video plugin.")
|
|||
(version "2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mupen64plus/mupen64plus-ui-console/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mupen64plus/mupen64plus-ui-console.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "04qkpd8ic7xsgnqz7spl00wxdygf79m7d1k8rabbygjk5lg6p8z2"))
|
||||
(base32 "0vrf98qa6a0y3647kslsv644fag233dxh5dcr1yncjiiwickcr5a"))
|
||||
(patches (search-patches "mupen64plus-ui-console-notice.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
@ -1005,21 +1005,21 @@ towards a working Mupen64Plus for casual users.")
|
|||
(package
|
||||
(name "nestopia-ue")
|
||||
(version "1.48")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/rdanbrook/nestopia/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"184y05z4k4a4m4022niy625kan0rklh8gcxyynxli1fss2sjjrpv"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; We don't need libretro for the GNU/Linux build.
|
||||
(delete-file-recursively "libretro")
|
||||
#t))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rdanbrook/nestopia.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "19c8vx5yxbysl0sszk5blfngwacshdgwbf44g1qaxvq8ywiyxmb4"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; We don't need libretro for the GNU/Linux build.
|
||||
(delete-file-recursively "libretro")
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2018, 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2019 Tim Stahel <swedneck@swedneck.xyz>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -2008,3 +2008,57 @@ editors.")
|
|||
slicing software to x3g files for standalone 3D printing on common 3D
|
||||
printers.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public gnucap
|
||||
(package
|
||||
(name "gnucap")
|
||||
(version "20171003")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16m09xa685qhj5fqq3bcgakrwnb74xhf5f7rpqkkf9fg8plzbb1g"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("readline" ,readline)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; Set correct rpath so that gnucap finds libgnucap.so.
|
||||
(substitute* (list "apps/configure" "lib/configure"
|
||||
"main/configure" "modelgen/configure")
|
||||
(("LDFLAGS =")
|
||||
(string-append "LDFLAGS = -Wl,-rpath=" out "/lib")))
|
||||
;; gnucap uses a hand-written configure script that expects the
|
||||
;; --prefix argument to be the first argument passed to it.
|
||||
(invoke "./configure" (string-append "--prefix=" out)))))
|
||||
(replace 'check
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(libpath "../lib/O:../apps/O"))
|
||||
(with-directory-excursion "tests"
|
||||
;; Make test return non-zero exit code when a test fails.
|
||||
(substitute* "test"
|
||||
(("/bin/sh") "/bin/sh -e")
|
||||
(("\\|\\| echo \"\\*\\*\\*\\* \\$ii fails \\*\\*\\*\\*\"") ""))
|
||||
;; Fix expected plugin search path for test c_attach.1.gc
|
||||
(substitute* "==out/c_attach.1.gc.out"
|
||||
(("/usr/local/lib/gnucap")
|
||||
(string-append libpath ":" out "/lib/gnucap")))
|
||||
;; Set library path so that gnucap can find libgnucap.so
|
||||
;; while running the tests.
|
||||
(setenv "LD_LIBRARY_PATH" libpath)
|
||||
(invoke "./test" "../main/O/gnucap" "" "test-output" "==out"))))))))
|
||||
(home-page "https://www.gnu.org/software/gnucap/")
|
||||
(synopsis "Mixed analog and digital circuit simulator")
|
||||
(description "GNUcap is a circuit analysis package. It offers a general
|
||||
purpose circuit simulator and can perform DC and transient analyses, fourier
|
||||
analysis and AC analysis. The engine is designed to do true mixed-mode
|
||||
simulation.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -322,7 +322,7 @@ network. LIBNFS offers three different APIs, for different use :
|
|||
`(("bzip2" ,bzip2)
|
||||
("fuse" ,fuse)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Read-only FUSE driver for the APFS filesystem")
|
||||
(synopsis "Read-only FUSE driver for the APFS file system")
|
||||
(description "APFS-FUSE is a read-only FUSE driver for the @dfn{Apple File
|
||||
System} (APFS). It is currently in an experimental state — it may not be able
|
||||
to read all files, and it does not support all the compression methods in
|
||||
|
|
|
@ -390,7 +390,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
|
|||
(package
|
||||
(inherit electrum)
|
||||
(name "electron-cash")
|
||||
(version "3.3.6")
|
||||
(version "4.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -401,7 +401,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"110apc376wm4yd9ghpffiipwdn8rzyr3z7ncpp2516wbz4mmyhxc"))
|
||||
"16fi03f23yb5r9s64x1a9wrxnvivlbawvrbq4d486yclzl1r7y48"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -627,7 +627,7 @@ Monero GUI client.")
|
|||
(define-public python-trezor-agent
|
||||
(package
|
||||
(name "python-trezor-agent")
|
||||
(version "0.13.0")
|
||||
(version "0.13.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -636,7 +636,7 @@ Monero GUI client.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0i4igkxi8fwdlbhg6nx27lhnc9v9nmrw4j5fvpnc202n6yjlc7x7"))))
|
||||
(base32 "0q99vbfd3h85s8rnjipnmldixabqmmlk5w9karv6f0rhyi54f4zv"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -733,14 +733,14 @@ Ledger Blue/Nano S.")
|
|||
(define-public python-trezor
|
||||
(package
|
||||
(name "python-trezor")
|
||||
(version "0.11.1")
|
||||
(version "0.11.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "trezor" version))
|
||||
(sha256
|
||||
(base32
|
||||
"064yds8f4px0c6grkkanpdjx022g4q87ihzhkmdv9qanv0hz6hv0"))))
|
||||
"1f0zfki12mnhidkfxpx2lpq1xim8f35i2d64bx9lf4m26xxv9x56"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -779,14 +779,14 @@ TREZOR Hardware Wallet.")
|
|||
(define-public python-keepkey
|
||||
(package
|
||||
(name "python-keepkey")
|
||||
(version "6.0.2")
|
||||
(version "6.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "keepkey" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16j8hnxj9r4b2w6kfncmny09pb1al8ppmn59qxzl3qmh1xhpy45g"))))
|
||||
"0z3d0m6364v9dv0njs4cd5m5ai6j6v35xaaxfxl90m9vmyxy81vd"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -377,7 +377,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
|
|||
(define* (make-arm-trusted-firmware platform #:optional (arch "aarch64"))
|
||||
(package
|
||||
(name (string-append "arm-trusted-firmware-" platform))
|
||||
(version "1.5")
|
||||
(version "2.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -388,7 +388,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
|
|||
(file-name (git-file-name "arm-trusted-firmware" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8"))))
|
||||
"1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -448,25 +448,10 @@ such as:
|
|||
license:bsd-2)))) ; libfdt
|
||||
|
||||
(define-public arm-trusted-firmware-sun50i-a64
|
||||
(let ((base (make-arm-trusted-firmware "sun50i_a64"))
|
||||
;; Use unreleased version which enables additional features needed for
|
||||
;; LCD support
|
||||
(commit "98aab97484b27e40aa74a93e5d1c1ac037a7e0b8")
|
||||
(revision "2"))
|
||||
(let ((base (make-arm-trusted-firmware "sun50i_a64")))
|
||||
(package
|
||||
(inherit base)
|
||||
(name "arm-trusted-firmware-sun50i-a64")
|
||||
(version (git-version "2.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ARM-software/arm-trusted-firmware.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0z5si034vcn4m68zaixc5v8fs1c7vxbh7n4hggxs55p0jg01dan5")))))))
|
||||
(name "arm-trusted-firmware-sun50i-a64"))))
|
||||
|
||||
(define-public arm-trusted-firmware-puma-rk3399
|
||||
(let ((base (make-arm-trusted-firmware "rk3399"))
|
||||
|
|
|
@ -127,15 +127,14 @@ brick your device.")
|
|||
(define-public avrdude
|
||||
(package
|
||||
(name "avrdude")
|
||||
(version "6.1")
|
||||
(version "6.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/avrdude/avrdude-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y"))))
|
||||
(base32 "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libelf" ,libelf)
|
||||
|
@ -148,8 +147,8 @@ brick your device.")
|
|||
(synopsis "AVR downloader and uploader")
|
||||
(description
|
||||
"AVRDUDE is a utility to download/upload/manipulate the ROM and
|
||||
EEPROM contents of AVR microcontrollers using the in-system programming
|
||||
technique (ISP).")
|
||||
EEPROM contents of AVR microcontrollers using the @acronym{ISP, in-system
|
||||
programming} technique.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public dfu-programmer
|
||||
|
|
|
@ -54,12 +54,14 @@
|
|||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib) ;intltool
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages libunwind)
|
||||
#:use-module (gnu packages libusb)
|
||||
|
@ -74,6 +76,7 @@
|
|||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages valgrind)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages w3m)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
|
@ -628,7 +631,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
|
|||
(define-public weston
|
||||
(package
|
||||
(name "weston")
|
||||
(version "5.0.0")
|
||||
(version "6.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -636,30 +639,40 @@ applications, X servers (rootless or fullscreen) or other display servers.")
|
|||
"weston-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm"))))
|
||||
(build-system gnu-build-system)
|
||||
"04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("xorg-server" ,xorg-server)))
|
||||
(inputs
|
||||
`(("cairo" ,cairo-xcb)
|
||||
("colord" ,colord)
|
||||
("dbus" ,dbus)
|
||||
("elogind" ,elogind)
|
||||
("lcms" ,lcms)
|
||||
("libevdev" ,libevdev)
|
||||
("libinput" ,libinput-minimal)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libunwind" ,libunwind)
|
||||
("libva" ,libva)
|
||||
("libwebp" ,libwebp)
|
||||
("libxcursor" ,libxcursor)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("libxml2" ,libxml2)
|
||||
("mesa" ,mesa)
|
||||
("mtdev" ,mtdev)
|
||||
("linux-pam" ,linux-pam)
|
||||
("pango" ,pango)
|
||||
("wayland" ,wayland)
|
||||
("wayland-protocols" ,wayland-protocols)
|
||||
("xorg-server-xwayland" ,xorg-server-xwayland)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "--disable-setuid-install"
|
||||
"--enable-systemd-login"
|
||||
(string-append "--with-xserver-path="
|
||||
(list "-Dbackend-rdp=false" ; TODO: Enable.
|
||||
"-Dremoting=false" ; TODO: Enable.
|
||||
"-Dsimple-dmabuf-drm=auto"
|
||||
"-Dsystemd=false"
|
||||
(string-append "-Dxwayland-path="
|
||||
(assoc-ref %build-inputs "xorg-server-xwayland")
|
||||
"/bin/Xwayland"))
|
||||
#:parallel-tests? #f ; Parallel tests cause failures.
|
||||
|
@ -668,8 +681,8 @@ applications, X servers (rootless or fullscreen) or other display servers.")
|
|||
(add-before 'configure 'use-elogind
|
||||
(lambda _
|
||||
;; Use elogind instead of systemd
|
||||
(substitute* "configure"
|
||||
(("libsystemd-login >= 198") "libelogind"))
|
||||
(substitute* "libweston/meson.build"
|
||||
(("libsystemd-login") "libelogind"))
|
||||
(substitute* '("libweston/launcher-logind.c"
|
||||
"libweston/weston-launch.c")
|
||||
(("#include <systemd/sd-login.h>")
|
||||
|
@ -677,7 +690,8 @@ applications, X servers (rootless or fullscreen) or other display servers.")
|
|||
#t))
|
||||
(add-after 'configure 'patch-confdefs.h
|
||||
(lambda _
|
||||
(system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h")))
|
||||
(system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h")
|
||||
#t))
|
||||
(add-before 'check 'setup
|
||||
(lambda _
|
||||
(setenv "HOME" (getcwd))
|
||||
|
@ -906,7 +920,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
|
|||
(define-public libmbim
|
||||
(package
|
||||
(name "libmbim")
|
||||
(version "1.18.0")
|
||||
(version "1.18.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -914,7 +928,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c"))))
|
||||
"0s4jsfsydp2vykv7lnimalp9i680aas1qcx7zdpjiic64b5g48vp"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin") ; for glib-mkenums
|
||||
|
@ -937,7 +951,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.")
|
|||
(define-public libqmi
|
||||
(package
|
||||
(name "libqmi")
|
||||
(version "1.22.2")
|
||||
(version "1.22.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -945,7 +959,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.")
|
|||
"libqmi-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi"))))
|
||||
"1wgrrb9vb3myl8xgck8ik86876ycbg8crylybs3ssi21vrxqwnsc"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libgudev" ,libgudev)))
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
|
@ -1404,3 +1404,33 @@ Fenix.")
|
|||
(description "This package contains a collection of modules for the Bennu
|
||||
Game Developement programming language, from CD handling through SDL to
|
||||
joystick support.")))
|
||||
|
||||
(define-public plib
|
||||
(package
|
||||
(name "plib")
|
||||
(version "1.8.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://plib.sourceforge.net/dist/"
|
||||
"plib-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("mesa" ,mesa)
|
||||
("libxi" ,libxi)
|
||||
("libxmu" ,libxmu)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "http://plib.sourceforge.net/")
|
||||
(synopsis "Suite of portable game libraries")
|
||||
(description "PLIB is a set of libraries that will permit programmers to
|
||||
write games and other realtime interactive applications that are 100% portable
|
||||
across a wide range of hardware and operating systems. PLIB includes sound
|
||||
effects, music, a complete 3D engine, font rendering, a simple Windowing
|
||||
library, a game scripting language, a GUI, networking, 3D math library and a
|
||||
collection of handy utility functions. All are 100% portable across nearly
|
||||
all modern computing platforms. Each library component is fairly independent
|
||||
of the others")
|
||||
(license license:lgpl2.0+)))
|
||||
|
|
|
@ -3542,12 +3542,19 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.")
|
|||
(inputs
|
||||
`(("lablgtk" ,lablgtk)
|
||||
("ocaml" ,ocaml)
|
||||
("ocaml-findlib" ,ocaml-findlib)))
|
||||
("ocaml-findlib" ,ocaml-findlib)
|
||||
("ocamlbuild" ,ocamlbuild)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-before 'build 'setenv
|
||||
(add-before 'build 'allow-unsafe-strings
|
||||
;; Fix a build failure with ocaml >=4.06.0.
|
||||
;; See <https://github.com/sgimenez/laby/issues/53>.
|
||||
(lambda _
|
||||
(setenv "OCAMLPARAM" "safe-string=0,_")
|
||||
#t))
|
||||
(add-before 'build 'set-library-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((lablgtk (assoc-ref inputs "lablgtk")))
|
||||
(setenv "LD_LIBRARY_PATH"
|
||||
|
@ -6765,3 +6772,198 @@ a procedurally generated world, the player can explore thousands of rooms in
|
|||
search of powerful artifacts, tools to help them, and to eventually free the
|
||||
Orcus Dome from evil.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public marble-marcher
|
||||
(let ((commit "e580460a0c3826f9b28ab404607942a8ecb625d7")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "marble-marcher")
|
||||
(version (git-version "0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/HackerPoet/MarbleMarcher.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0jjv832hl1v170n6gryp2sr3lgqndi9ab841qvgqk68bks8701mx"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; there are none
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'embed-asset-directory
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((assets (string-append (assoc-ref outputs "out")
|
||||
"/share/marble-marcher/assets/")))
|
||||
;; Some of the files we're patching are
|
||||
;; ISO-8859-1-encoded, so choose it as the default
|
||||
;; encoding so the byte encoding is preserved.
|
||||
(with-fluids ((%default-port-encoding #f))
|
||||
(substitute* "src/Resource.rc"
|
||||
(("../assets/icon.ico")
|
||||
(string-append assets "icon.ico")))
|
||||
(substitute* "src/Res.h"
|
||||
(("assets/") assets))))
|
||||
#t))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(assets (string-append out "/share/marble-marcher/assets"))
|
||||
(bin (string-append out "/bin/")))
|
||||
(mkdir-p bin)
|
||||
(mkdir-p assets)
|
||||
(copy-recursively "../source/assets" assets)
|
||||
(install-file "MarbleMarcher" bin))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("eigen" ,eigen)
|
||||
("mesa" ,mesa)
|
||||
("sfml" ,sfml)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://codeparade.itch.io/marblemarcher")
|
||||
(synopsis "Guide a marble across fractal landscapes")
|
||||
(description "Marble Marcher is a video game that uses a fractal physics
|
||||
engine and fully procedural rendering to produce beautiful and unique
|
||||
gameplay. The game is played on the surface of evolving fractals. The goal
|
||||
of the game is to get your marble to the flag as quickly as possible. But be
|
||||
careful not to fall off the level or get crushed by the fractal! There are 24
|
||||
levels to unlock.")
|
||||
;; Code is under GPLv2+, assets are under CC-BY-SA 3.0 and OFL 1.1.
|
||||
(license (list license:gpl2+
|
||||
license:silofl1.1
|
||||
license:cc-by-sa3.0)))))
|
||||
|
||||
;; This must be updated together with flightgear.
|
||||
(define simgear
|
||||
(package
|
||||
(name "simgear")
|
||||
(version "2018.3.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/flightgear/release-"
|
||||
(version-major+minor version) "/"
|
||||
"simgear-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1941ay8rngz4vwsx37bbpxr48hpcvcbj3xw1hy264lq4qnl99c68"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; Skip tests that require internet access.
|
||||
(invoke "ctest" "-E" "(http|dns)"))))))
|
||||
(inputs
|
||||
`(("boost" ,boost-for-mysql) ; fails with 1.69
|
||||
("curl" ,curl)
|
||||
("expat" ,expat)
|
||||
("mesa" ,mesa)
|
||||
("openal" ,openal)
|
||||
("openscenegraph" ,openscenegraph-3.4)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://home.flightgear.org/")
|
||||
(synopsis "Libraries for 3D simulations and games")
|
||||
(description "SimGear is a set of libraries designed to be used as
|
||||
building blocks for quickly assembling 3D simulations, games, and
|
||||
visualization applications. SimGear is developed by the FlightGear project
|
||||
and also provides the base for the FlightGear Flight Simulator.")
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public flightgear
|
||||
(package
|
||||
(name "flightgear")
|
||||
(version (package-version simgear))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/flightgear/release-"
|
||||
(version-major+minor version) "/"
|
||||
"flightgear-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lzy524cjzs8vldcjcc750bgg5c4mq9fkymxxxzqf68ilc4d1jss"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; There are some bundled libraries.
|
||||
(for-each delete-file-recursively
|
||||
'("3rdparty/sqlite3/"))
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "-DSYSTEM_SQLITE=ON"
|
||||
(string-append "-DFG_DATA_DIR="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/flightgear"))
|
||||
;; TODO: test cannot be run because the "run_test_suite" executable
|
||||
;; does not seem to be built.
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-executable
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(wrap-program (string-append out "/bin/fgfs")
|
||||
`("QT_PLUGIN_PATH" ":" prefix
|
||||
,(map (lambda (label)
|
||||
(string-append (assoc-ref inputs label)
|
||||
"/lib/qt5/plugins"))
|
||||
'("qtbase" "qtdeclarative" "qtsvg")))
|
||||
`("QML2_IMPORT_PATH" ":" prefix
|
||||
,(map (lambda (label)
|
||||
(string-append (assoc-ref inputs label)
|
||||
"/lib/qt5/qml"))
|
||||
'("qtdeclarative" "qtsvg"))))
|
||||
#t)))
|
||||
(add-after 'install 'install-data
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((share (string-append (assoc-ref outputs "out") "/share/flightgear")))
|
||||
(mkdir-p share)
|
||||
(with-directory-excursion share
|
||||
(invoke "tar" "xf" (assoc-ref inputs "flightgear-data")
|
||||
"--strip-components=1")))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("boost" ,boost-for-mysql) ; same as simgear
|
||||
("dbus" ,dbus)
|
||||
("eudev" ,eudev)
|
||||
("freeglut" ,freeglut)
|
||||
("freetype" ,freetype)
|
||||
("glew" ,glew)
|
||||
("libpng" ,libpng)
|
||||
("openal" ,openal)
|
||||
("openscenegraph" ,openscenegraph-3.4)
|
||||
("plib" ,plib)
|
||||
("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
("qtsvg" ,qtsvg)
|
||||
("simgear" ,simgear)
|
||||
("speexdsp" ,speexdsp)
|
||||
("sqlite" ,sqlite)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("cppunit" ,cppunit)
|
||||
("pkg-config" ,pkg-config)
|
||||
("qttools" ,qttools)
|
||||
("flightgear-data"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/flightgear/release-"
|
||||
(version-major+minor version) "/"
|
||||
"FlightGear-" version "-data.tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0h4npa7gqpf5fw6pv2bpw0wbwr7fa2vhia21cjbigfgd75x82zi7"))))))
|
||||
(home-page "https://home.flightgear.org/")
|
||||
(synopsis "Flight simulator")
|
||||
(description "The goal of the FlightGear project is to create a
|
||||
sophisticated flight simulator framework for use in research or academic
|
||||
environments, pilot training, as an industry engineering tool, for DIY-ers to
|
||||
pursue their favorite interesting flight simulation idea, and last but
|
||||
certainly not least as a fun, realistic, and challenging desktop flight
|
||||
simulator.")
|
||||
(license license:gpl2+)))
|
||||
|
|
|
@ -746,14 +746,14 @@ to create databases that are optimized for rendering/tile/map-services.")
|
|||
(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"))))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/osmcode/libosmium.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "123ri1l0a2b9fljgpwsl7z2w4i3kmgxz79d4ns9z4mwbp8sw0250"))))
|
||||
(build-system cmake-build-system)
|
||||
(propagated-inputs
|
||||
`(("boost" ,boost)
|
||||
|
@ -776,20 +776,21 @@ OpenStreetMap data.")
|
|||
(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))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/openstreetmap/osm2pgsql.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl"))
|
||||
(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
|
||||
|
@ -823,14 +824,15 @@ map, geocoding with Nominatim, or general analysis.")
|
|||
(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"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mapbox/tippecanoe.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1m0x931a945sr7axyhcvpwh798m58hx1zxh6ikgf9gsgqhdhmszz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -118,7 +118,7 @@ buffers.")
|
|||
(define-public gimp
|
||||
(package
|
||||
(name "gimp")
|
||||
(version "2.10.8")
|
||||
(version "2.10.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.gimp.org/pub/gimp/v"
|
||||
|
@ -126,7 +126,7 @@ buffers.")
|
|||
"/gimp-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"))))
|
||||
"0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ; 9 MiB of gtk-doc HTML
|
||||
|
@ -368,5 +368,5 @@ MyPaint.")
|
|||
"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.")
|
||||
transferring the style of an image.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -2666,7 +2666,7 @@ libxml to ease remote use of the RESTful API.")
|
|||
(define-public libsoup
|
||||
(package
|
||||
(name "libsoup")
|
||||
(version "2.66.0")
|
||||
(version "2.66.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/libsoup/"
|
||||
|
@ -2674,7 +2674,7 @@ libxml to ease remote use of the RESTful API.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08c9kkdhzy504gv23pfdm4sq3dd3j20sikwz6gv0qrwcdjnw5bai"))))
|
||||
"1zs3bhspwg7fggxd7x1rrggpkcf2j9ch6dhncq9syh252z0vcb2a"))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
@ -4309,15 +4309,15 @@ work and the interface is well tested.")
|
|||
(define-public eolie
|
||||
(package
|
||||
(name "eolie")
|
||||
(version "0.9.52")
|
||||
(version "0.9.60")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gitlab.gnome.org/World/eolie/"
|
||||
"uploads/d95bf72958276c80dfaca8cce0e4e92c/"
|
||||
"uploads/3b2ceb7eb15860587db6886bfdd8a91e/"
|
||||
"eolie-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1s3b0rkm8sxmhzzi624snzqvz61i1rja5wxyzw6jg2kcdjcylwln"))))
|
||||
"1s9gkzxa6457v6bh0q8n1ijq1chd2jwgvhk5kppsnya7kxvsx8qh"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
|
@ -4378,9 +4378,9 @@ a secret password store, an adblocker, and a modern UI.")
|
|||
(version "3.28.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(uri (string-append "mirror://gnome/sources/epiphany/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
"epiphany-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9"))))
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
|
@ -538,6 +538,32 @@ virtual reality, scientific visualization and modeling.")
|
|||
;; LGPL 2.1, but with 4 exceptions. This version is called OSGPL.
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
;; We need this for simgear
|
||||
(define-public openscenegraph-3.4
|
||||
(package (inherit openscenegraph)
|
||||
(name "openscenegraph")
|
||||
(version "3.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/openscenegraph/OpenSceneGraph")
|
||||
(commit (string-append "OpenSceneGraph-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fbzg1ihjpxk6smlq80p3h3ggllbr16ihd2fxpfwzam8yr8yxip9"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openscenegraph)
|
||||
((#:configure-flags flags)
|
||||
`(cons
|
||||
;; The jpeg plugin requires conversion between integers and booleans
|
||||
"-DCMAKE_CXX_FLAGS=-fpermissive"
|
||||
,flags))))
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg)
|
||||
,@(package-inputs openscenegraph)))))
|
||||
|
||||
(define-public povray
|
||||
(package
|
||||
(name "povray")
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
;;; Copyright © 2017 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
||||
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
|
||||
|
@ -898,33 +898,30 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.")
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile-email
|
||||
(let ((commit "fa52eac55e5946db89621a6c583d2aa357864dee")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "guile-email")
|
||||
(version (git-version "0.1.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.systemreboot.net/guile-email")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1037mbz7qd9bzaqp8ysyhnl9ipd97fmj3b9jr8qfzx9179vvsj63"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.2)))
|
||||
(home-page "https://git.systemreboot.net/guile-email")
|
||||
(synopsis "Guile email parser")
|
||||
(description "This package provides an email parser written in pure
|
||||
(package
|
||||
(name "guile-email")
|
||||
(version "0.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://git.systemreboot.net/guile-email/snapshot/guile-email-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p2v8q2kkz8m6vf2rsjvz3dj1mvnx7dxakjf72dwkndbgk3rp79f"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.2)))
|
||||
(home-page "https://git.systemreboot.net/guile-email")
|
||||
(synopsis "Guile email parser")
|
||||
(description "This package provides an email parser written in pure
|
||||
Guile.")
|
||||
(license license:agpl3+))))
|
||||
(license license:agpl3+)))
|
||||
|
||||
(define-public guile-debbugs-next
|
||||
(let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe")
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2015, 2016 Federico Beffa <beffa@fbengineering.ch>
|
||||
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
|
@ -833,6 +833,28 @@ code pages on Windows. On all other operating systems, the library does
|
|||
nothing.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-libffi
|
||||
(package
|
||||
(name "ghc-libffi")
|
||||
(version "0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"libffi/libffi-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28"))))
|
||||
(build-system haskell-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("libffi" ,libffi)))
|
||||
(home-page "http://hackage.haskell.org/package/libffi")
|
||||
(synopsis "Haskell binding to libffi")
|
||||
(description
|
||||
"A binding to libffi, allowing C functions of types only known at runtime
|
||||
to be called from Haskell.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-newtype-generics
|
||||
(package
|
||||
(name "ghc-newtype-generics")
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com>
|
||||
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -19,11 +20,14 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages idris)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages haskell)
|
||||
#:use-module (gnu packages haskell-check)
|
||||
#:use-module (gnu packages haskell-web)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages multiprecision)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system haskell)
|
||||
#:use-module (guix download)
|
||||
|
@ -34,7 +38,7 @@
|
|||
(define-public idris
|
||||
(package
|
||||
(name "idris")
|
||||
(version "1.3.0")
|
||||
(version "1.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -42,8 +46,14 @@
|
|||
"idris-" version "/idris-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48"))))
|
||||
"0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi"))
|
||||
(patches (search-patches "idris-test-no-node.patch"))))
|
||||
(build-system haskell-build-system)
|
||||
(native-inputs ;For tests
|
||||
`(("perl" ,perl)
|
||||
("ghc-tasty" ,ghc-tasty)
|
||||
("ghc-tasty-golden" ,ghc-tasty-golden)
|
||||
("ghc-tasty-rerun" ,ghc-tasty-rerun)))
|
||||
(inputs
|
||||
`(("gmp" ,gmp)
|
||||
("ncurses" ,ncurses)
|
||||
|
@ -60,6 +70,7 @@
|
|||
("ghc-fingertree" ,ghc-fingertree)
|
||||
("ghc-fsnotify" ,ghc-fsnotify)
|
||||
("ghc-ieee754" ,ghc-ieee754)
|
||||
("ghc-libffi" ,ghc-libffi)
|
||||
("ghc-megaparsec" ,ghc-megaparsec)
|
||||
("ghc-network" ,ghc-network)
|
||||
("ghc-optparse-applicative" ,ghc-optparse-applicative)
|
||||
|
@ -75,21 +86,16 @@
|
|||
("ghc-vector-binary-instances" ,ghc-vector-binary-instances)
|
||||
("ghc-zip-archive" ,ghc-zip-archive)))
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: Test suite doesn't run in a sandbox.
|
||||
#:configure-flags
|
||||
`(#:configure-flags
|
||||
(list (string-append "--datasubdir="
|
||||
(assoc-ref %outputs "out") "/lib/idris"))
|
||||
(assoc-ref %outputs "out") "/lib/idris")
|
||||
"-fFFI" "-fGMP")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'set-cc-command
|
||||
(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"))
|
||||
|
@ -99,7 +105,15 @@
|
|||
(lambda (module)
|
||||
(symlink (string-append modules "/" module)
|
||||
(string-append lib "/" module)))
|
||||
'("prelude" "base" "contrib" "effects" "pruviloj"))))))))
|
||||
'("prelude" "base" "contrib" "effects" "pruviloj")))))
|
||||
(delete 'check) ;Run check later
|
||||
(add-after 'install 'check
|
||||
(lambda* (#:key outputs #:allow-other-keys #:rest args)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count)))
|
||||
(setenv "IDRIS_CC" "gcc") ;Needed for creating executables
|
||||
(setenv "PATH" (string-append out "/bin:" (getenv "PATH")))
|
||||
(apply (assoc-ref %standard-phases 'check) args)))))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "IDRIS_LIBRARY_PATH")
|
||||
|
|
|
@ -4027,16 +4027,18 @@ complex transformations and code analysis tools.")
|
|||
(package
|
||||
(name "java-cglib")
|
||||
(version "3.2.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/cglib/cglib/archive/RELEASE_"
|
||||
(string-map (lambda (c) (if (char=? c #\.) #\_ c)) version)
|
||||
".tar.gz"))
|
||||
(file-name (string-append "cglib-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"162dvd4fln76ai8prfharf66pn6r56p3sxx683j5vdyccrd5hi1q"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cglib/cglib.git")
|
||||
(commit (string-append
|
||||
"RELEASE_"
|
||||
(string-map (lambda (c) (if (char=? c #\.) #\_ c))
|
||||
version)))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "186451jms2zfp47yd8kxd77az2cqal1my2br7klgyp8fpl4qfg8v"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: tests fail because junit runs
|
||||
|
|
|
@ -281,7 +281,8 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
|
|||
(sha256
|
||||
(base32
|
||||
"1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc"))
|
||||
(patches (search-patches "kodi-skip-test-449.patch"))
|
||||
(patches (search-patches "kodi-skip-test-449.patch"
|
||||
"kodi-set-libcurl-ssl-parameters.patch"))
|
||||
(snippet
|
||||
'(begin
|
||||
(use-modules (guix build utils))
|
||||
|
|
|
@ -118,6 +118,7 @@
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix build-system linux-module)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
|
@ -264,9 +265,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
|
|||
(search-auxiliary-file file)))
|
||||
|
||||
(define %default-extra-linux-options
|
||||
`(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
|
||||
("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)
|
||||
;; Modules required for initrd:
|
||||
`(;; Modules required for initrd:
|
||||
("CONFIG_NET_9P" . m)
|
||||
("CONFIG_NET_9P_VIRTIO" . m)
|
||||
("CONFIG_VIRTIO_BLK" . m)
|
||||
|
@ -401,7 +400,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
|
|||
(kmod (assoc-ref (or native-inputs inputs) "kmod")))
|
||||
;; Install kernel image, kernel configuration and link map.
|
||||
(for-each (lambda (file) (install-file file out))
|
||||
(find-files "." "^(\\.config|bzImage|zImage|Image|vmlinuz|System\\.map)$"))
|
||||
(find-files "." "^(\\.config|bzImage|zImage|Image|vmlinuz|System\\.map|Module\\.symvers)$"))
|
||||
;; Install device tree files
|
||||
(unless (null? (find-files "." "\\.dtb$"))
|
||||
(mkdir-p dtbdir)
|
||||
|
@ -438,6 +437,28 @@ It has been modified to remove all non-free binary blobs.")
|
|||
#:patches %linux-libre-5.0-patches
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public vhba-module
|
||||
(package
|
||||
(name "vhba-module")
|
||||
(version "20170610")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://downloads.sourceforge.net/cdemu/vhba-module-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
;; TODO: No tests?
|
||||
`(#:tests? #f))
|
||||
(home-page "https://cdemu.sourceforge.io/")
|
||||
(synopsis "Kernel module that emulates SCSI devices")
|
||||
(description "VHBA module provides a Virtual (SCSI) HBA, which is the link
|
||||
between the CDemu userspace daemon and linux kernel.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define %linux-libre-4.19-version "4.19.34")
|
||||
(define %linux-libre-4.19-hash "0rmpyj2qb651p2k2srpjndjxry87hr5vq0jkk4rvxjhm5y3sb65l")
|
||||
|
||||
|
@ -471,7 +492,13 @@ It has been modified to remove all non-free binary blobs.")
|
|||
(make-linux-libre "4.4.178"
|
||||
"1lgsd760md6b32qb5ng3anfq1n754a9d0c4xnf2mjxkimncb1jpp"
|
||||
'("x86_64-linux" "i686-linux")
|
||||
#:configuration-file kernel-config))
|
||||
#:configuration-file kernel-config
|
||||
#:extra-options
|
||||
(append
|
||||
`(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
|
||||
;; This option was removed upstream in version 4.7.
|
||||
("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t))
|
||||
%default-extra-linux-options)))
|
||||
|
||||
(define-public linux-libre-arm-generic
|
||||
(make-linux-libre %linux-libre-version
|
||||
|
@ -1452,14 +1479,14 @@ Linux-based operating systems.")
|
|||
(define-public bridge-utils
|
||||
(package
|
||||
(name "bridge-utils")
|
||||
(version "1.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/bridge/bridge/"
|
||||
"bridge-utils-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12367cwqmi0yqphi6j8rkx97q8hw52yq2fx4k0xfclkcizxybya2"))))
|
||||
(version "1.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.kernel.org/pub/linux/utils/net/"
|
||||
"bridge-utils/bridge-utils-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1j16kr44csyr4yqxly26l1yw2bh4nkiasgwvask2i2gvsnsyyryc"))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
;; The tarball lacks all the generated files.
|
||||
|
@ -2467,18 +2494,18 @@ country-specific regulations for the wireless spectrum.")
|
|||
(define-public lm-sensors
|
||||
(package
|
||||
(name "lm-sensors")
|
||||
(version "3.4.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append
|
||||
"https://github.com/groeck/lm-sensors/archive/V"
|
||||
(string-join (string-split version #\.) "-")
|
||||
".tar.gz")))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0knb09s9lvx0wzfsaizx3xq58q6kllqf7nkbwvir0wkgn31c2d73"))
|
||||
(patches (search-patches "lm-sensors-hwmon-attrs.patch"))))
|
||||
(version "3.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/groeck/lm-sensors.git")
|
||||
(commit (string-append "V" (string-join
|
||||
(string-split version #\.) "-")))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1mdrnb9r01z1xfdm6dpkywvf9yy9a4yzb59paih9sijwmigv19fj"))
|
||||
(patches (search-patches "lm-sensors-hwmon-attrs.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("rrdtool" ,rrdtool)
|
||||
("perl" ,perl)
|
||||
|
@ -2535,7 +2562,7 @@ country-specific regulations for the wireless spectrum.")
|
|||
(string-append (assoc-ref inputs "coreutils")
|
||||
"/bin/readlink -f")))
|
||||
#t)))))
|
||||
(home-page "http://jdelvare.nerim.net/devel.html#lmsensors")
|
||||
(home-page "https://hwmon.wiki.kernel.org/lm_sensors")
|
||||
(synopsis "Utilities to read temperature/voltage/fan sensors")
|
||||
(description
|
||||
"Lm-sensors is a hardware health monitoring package for Linux. It allows
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -691,13 +692,13 @@ portable between implementations.")
|
|||
(version "1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/sionescu/fiveam/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sionescu/fiveam.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "fiveam" version))
|
||||
(sha256
|
||||
(base32 "0f48pcbhqs3wwwzjl5nk57d4hcbib4l9xblxc66b8c2fhvhmhxnv"))
|
||||
(file-name (string-append "fiveam-" version ".tar.gz"))))
|
||||
(base32 "1yx9716mk8pq9076q6cjx4c9lyax3amiccy37sh0913k2x8gsm4l"))))
|
||||
(inputs `(("alexandria" ,sbcl-alexandria)))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(synopsis "Common Lisp testing framework")
|
||||
|
@ -714,18 +715,18 @@ interactive development model in mind.")
|
|||
(sbcl-package->ecl-package sbcl-fiveam))
|
||||
|
||||
(define-public sbcl-bordeaux-threads
|
||||
(let ((commit "354abb0ae9f1d9324001e1a8abab3128d7420e0e")
|
||||
(let ((commit "5dce49fbc829f4d136a734f5ef4f5d599660984f")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "sbcl-bordeaux-threads")
|
||||
(version (git-version "0.8.5" revision commit))
|
||||
(version (git-version "0.8.6" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sionescu/bordeaux-threads.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32 "1hcfp21l6av1xj6z7r77sp6h4mwf9vvx4s745803sysq2qy2mwnq"))
|
||||
(base32 "1gkh9rz7zw57n3110ikcf4835950wr4hgp8l79id5ai6nd86x7wv"))
|
||||
(file-name
|
||||
(git-file-name "bordeaux-threads" version))))
|
||||
(inputs `(("alexandria" ,sbcl-alexandria)))
|
||||
|
@ -818,14 +819,21 @@ logical continuation of Stefil. It focuses on interactive debugging.")
|
|||
(version "1.0.16")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/edicl/flexi-streams/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/edicl/flexi-streams.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "flexi-streams" version))
|
||||
(sha256
|
||||
(base32 "1fb0jrwxr5c3i2lhy7kn30m1n0vggfzwjm1dacx6y5wf9wfsbamw"))
|
||||
(file-name (string-append "flexi-streams-" version ".tar.gz"))))
|
||||
(base32 "0gvykjlmja060zqq6nn6aqxlshh6r6ijahmmgf20q0d839rwpgxc"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'make-git-checkout-writable
|
||||
(lambda _
|
||||
(for-each make-file-writable (find-files "."))
|
||||
#t)))))
|
||||
(inputs `(("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
|
||||
(synopsis "Implementation of virtual bivalent streams for Common Lisp")
|
||||
(description "Flexi-streams is an implementation of \"virtual\" bivalent
|
||||
|
@ -848,13 +856,13 @@ streams which are similar to string streams.")
|
|||
(version "2.0.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/edicl/cl-ppcre/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/edicl/cl-ppcre.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "cl-ppcre" version))
|
||||
(sha256
|
||||
(base32 "1i7daxf0wnydb0pgwiym7qh2wy70n14lxd6dyv28sy0naa8p31gd"))
|
||||
(file-name (string-append "cl-ppcre-" version ".tar.gz"))))
|
||||
(base32 "0q3iany07vgqm144lw6pj0af2d3vsikpbkwcxr30fci3kzsq4f49"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(native-inputs `(("flexi-streams" ,sbcl-flexi-streams)))
|
||||
(synopsis "Portable regular expression library for Common Lisp")
|
||||
|
@ -973,18 +981,19 @@ from other CLXes around the net.")
|
|||
(package
|
||||
(name "stumpwm")
|
||||
(version "18.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/stumpwm/stumpwm/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "177gxfk4c127i9crghx6fmkipznhgylvzgnjb2pna38g21gg6s39"))
|
||||
(file-name (string-append "stumpwm-" version ".tar.gz"))
|
||||
(patches
|
||||
;; This patch is included in the post-18.11 git master tree
|
||||
;; and can be removed when we move to the next release.
|
||||
(search-patches "stumpwm-fix-broken-read-one-line.patch"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/stumpwm/stumpwm.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name "stumpwm" version))
|
||||
(sha256
|
||||
(base32 "003g1fmh7446ws49866kzny4lrk1wf034dq5fa4m9mq1nzc7cwv7"))
|
||||
(patches
|
||||
;; This patch is included in the post-18.11 git master tree
|
||||
;; and can be removed when we move to the next release.
|
||||
(search-patches "stumpwm-fix-broken-read-one-line.patch"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(native-inputs `(("fiasco" ,sbcl-fiasco)
|
||||
("texinfo" ,texinfo)))
|
||||
|
@ -1604,13 +1613,13 @@ utilities that make it even easier to manipulate text in Common Lisp. It has
|
|||
(version "0.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/trivial-features/trivial-features/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/trivial-features/trivial-features.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "trivial-features" version))
|
||||
(sha256
|
||||
(base32 "0db1awn6jyhcfhyfvpjvfziprmq85cigf19mwbvaprhblydsag3c"))
|
||||
(file-name (string-append "trivial-features-" version ".tar.gz"))))
|
||||
(base32 "0ccv7dqyrk55xga78i5vzlic7mdwp28in3g1a8fqhlk6626scsq9"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(arguments '(#:tests? #f))
|
||||
(home-page "http://cliki.net/trivial-features")
|
||||
|
@ -1691,13 +1700,13 @@ with a focus on interactive development.")
|
|||
(version "0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/cl-babel/babel/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cl-babel/babel.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "babel" version))
|
||||
(sha256
|
||||
(base32 "189kgbmslh36xx0d2i1g6a7mcvjryvjzkdlnhilqy5xs7hkyqirq"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(base32 "139a8rn2gnhj082n8jg01gc8fyr63hkj57hgrnmb3d1r327yc77f"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(native-inputs
|
||||
`(("tests:cl-hu.dwim.stefil" ,sbcl-hu.dwim.stefil)))
|
||||
|
@ -2971,12 +2980,13 @@ non-consing thread safe queues and fibonacci priority queues.")
|
|||
(version "0.19.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/cffi/cffi/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cffi/cffi.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "cffi-bootstrap" version))
|
||||
(sha256
|
||||
(base32 "07bc3c1fbfx17wgrvx6bh9byilfzfwv5n597cfdllm0vzwvbmiyk"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(base32 "09sfgc6r7ihmbkwfpvkq5fxc7h45cabpvgbvs47i5cvnmv3k72xy"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(inputs
|
||||
`(("libffi" ,libffi)
|
||||
|
@ -3235,13 +3245,13 @@ precisely control behavior of the parser via Common Lisp restarts.")
|
|||
(version "0.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/trivial-garbage/trivial-garbage/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/trivial-garbage/trivial-garbage.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "trivial-garbage" version))
|
||||
(sha256
|
||||
(base32 "0b244nlszkrqawsnp568clnx32xmvjmbbagbz7625w9n0yq7396y"))
|
||||
(file-name (string-append "trivial-garbage-" version ".tar.gz"))))
|
||||
(base32 "0122jicfg7pca1wxw8zak1n92h5friqy60988ns0ysksj3fphw9n"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(native-inputs
|
||||
`(("rt" ,sbcl-rt)))
|
||||
|
@ -4169,12 +4179,13 @@ sockets, SSL, continuable uploads, file uploads, cookies, and more.")
|
|||
(version "1.2.38")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/edicl/hunchentoot/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/edicl/hunchentoot.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "hunchentoot" version))
|
||||
(sha256
|
||||
(base32 "17z8rpd6b5w93jwrdwfwxjha617xnjqw8aq1hw2z76zp1fn8yrmh"))))
|
||||
(base32 "1anpcad7w045m4rsjs1f3xdhjwx5cppq1h0vlb3q7dz81fi3i6yq"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(native-inputs
|
||||
`(("sbcl-cl-who" ,sbcl-cl-who)
|
||||
|
@ -5238,3 +5249,36 @@ Python's WSGI and Ruby's Rack.")
|
|||
|
||||
(define-public cl-clack
|
||||
(sbcl-package->cl-source-package sbcl-clack))
|
||||
|
||||
(define-public sbcl-log4cl
|
||||
(let ((commit "611e094458504b938d49de904eab141285328c7c")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "sbcl-log4cl")
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(version "1.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sharplispers/log4cl")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"08jly0s0g26b56hhpfizxsb4j0yvbh946sd205gr42dkzv8l7dsc"))))
|
||||
;; FIXME: tests require stefil, sbcl-hu.dwim.stefil wont work
|
||||
(arguments
|
||||
`(#:tests? #f))
|
||||
(inputs `(("bordeaux-threads" ,sbcl-bordeaux-threads)))
|
||||
(synopsis "Common Lisp logging framework, modeled after Log4J")
|
||||
(home-page "https://github.com/7max/log4cl")
|
||||
(description "This is a Common Lisp logging framework that can log at
|
||||
various levels and mix text with expressions.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public cl-log4cl
|
||||
(sbcl-package->cl-source-package sbcl-log4cl))
|
||||
|
||||
(define-public ecl-log4cl
|
||||
(sbcl-package->ecl-package sbcl-log4cl))
|
||||
|
|
|
@ -40,7 +40,9 @@
|
|||
#:use-module (gnu packages bootstrap) ;glibc-dynamic-linker
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages mpi)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
|
@ -282,6 +284,43 @@ code analysis tools.")
|
|||
use with Clang, targeting C++11, C++14 and above.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public libomp
|
||||
(package
|
||||
(name "libomp")
|
||||
(version (package-version llvm))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://releases.llvm.org/"
|
||||
version "/openmp-" version
|
||||
".src.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"030dkg5cypd7j9hq0mcqb5gs31lxwmzfq52j81l7v9ldcy5bf5mz"))
|
||||
(file-name (string-append "libomp-" version ".tar.xz"))))
|
||||
(build-system cmake-build-system)
|
||||
;; XXX: Note this gets built with GCC because building with Clang itself
|
||||
;; fails (missing <atomic>, even when libcxx is added as an input.)
|
||||
(arguments
|
||||
'(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON"
|
||||
"-DOPENMP_TEST_C_COMPILER=clang"
|
||||
"-DOPENMP_TEST_CXX_COMPILER=clang++")
|
||||
#:test-target "check-libomptarget"))
|
||||
(native-inputs
|
||||
`(("clang" ,clang)
|
||||
("llvm" ,llvm)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("hwloc" ,hwloc "lib")))
|
||||
(home-page "https://openmp.llvm.org")
|
||||
(synopsis "OpenMP run-time support library")
|
||||
(description
|
||||
"This package provides the run-time support library developed by the LLVM
|
||||
project for the OpenMP multi-theaded programming extension. This package
|
||||
notably provides @file{libgomp.so}, which is has a binary interface compatible
|
||||
with that of libgomp, the GNU Offloading and Multi Processing Library.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public clang-runtime
|
||||
(clang-runtime-from-llvm
|
||||
llvm
|
||||
|
|
|
@ -49,6 +49,7 @@
|
|||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cran)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages dejagnu)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages glib)
|
||||
|
@ -65,7 +66,9 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages statistics)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages swig)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages web)
|
||||
|
@ -305,28 +308,46 @@ networks) based on simulation of (stochastic) flow in graphs.")
|
|||
(version "12-068oasis4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/fhcrc/mcl/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/fhcrc/mcl.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1l5jbhwjpsj38x8b9698hfpkv75h8hn3kj0gihjhn8ym2cwwv110"))))
|
||||
"0009dc3h2jp3qg5val452wngpqnbfyhbcxylghq0mrjqxx0jdq5p"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:ocaml ,ocaml-4.02
|
||||
#:findlib ,ocaml4.02-findlib
|
||||
#:phases
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-paths
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("SHELL = /bin/sh") (string-append "SHELL = "(which "sh"))))
|
||||
(("/bin/sh") (which "sh")))
|
||||
(substitute* "setup.ml"
|
||||
(("LDFLAGS=-fPIC")
|
||||
(string-append "LDFLAGS=-fPIC\"; \"SHELL=" (which "sh"))))
|
||||
(string-append "LDFLAGS=-fPIC\"; \"SHELL=" (which "sh")))
|
||||
(("-std=c89") "-std=gnu99")
|
||||
|
||||
;; This is a mutable string, which is no longer supported. Use
|
||||
;; a byte buffer instead.
|
||||
(("String.make \\(String.length s\\)")
|
||||
"Bytes.make (String.length s)")
|
||||
|
||||
;; These two belong together.
|
||||
(("OASISString.replace_chars")
|
||||
"Bytes.to_string (OASISString.replace_chars")
|
||||
((" s;")
|
||||
" s);"))
|
||||
(substitute* "myocamlbuild.ml"
|
||||
(("std=c89") "std=gnu99"))
|
||||
;; Since we build with a more recent OCaml, we have to use C99 or
|
||||
;; later. This causes problems with the old C code.
|
||||
(substitute* "src/impala/matrix.c"
|
||||
(("restrict") "restrict_"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("ocamlbuild" ,ocamlbuild)))
|
||||
(home-page "https://github.com/fhcrc/mcl")
|
||||
(synopsis "OCaml wrappers around MCL")
|
||||
(description
|
||||
|
@ -1285,3 +1306,451 @@ for load balancing, tracing, health checking and authentication. It is also
|
|||
applicable in last mile of distributed computing to connect devices, mobile
|
||||
applications and browsers to backend services.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
;; Note that Tensorflow includes a "third_party" directory, which seems to not
|
||||
;; only contain modified subsets of upstream library source code, but also
|
||||
;; adapter headers provided by Google (such as the fft.h header, which is not
|
||||
;; part of the upstream project code). The Tensorflow code includes headers
|
||||
;; from the "third_party" directory. It does not look like we can replace
|
||||
;; these headers with unmodified upstream files, so we keep them.
|
||||
(define-public tensorflow
|
||||
(package
|
||||
(name "tensorflow")
|
||||
(version "1.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tensorflow/tensorflow.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (string-append "tensorflow-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a9kwha395g3wgxfwln5j8vn9nkspmd75xldrlqdq540w996g8xa"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no "check" target
|
||||
#:build-type "Release"
|
||||
#:configure-flags
|
||||
(let ((protobuf (assoc-ref %build-inputs "protobuf"))
|
||||
(protobuf:native (assoc-ref %build-inputs "protobuf:native"))
|
||||
(jsoncpp (assoc-ref %build-inputs "jsoncpp"))
|
||||
(snappy (assoc-ref %build-inputs "snappy"))
|
||||
(sqlite (assoc-ref %build-inputs "sqlite")))
|
||||
(list
|
||||
;; Use protobuf from Guix
|
||||
(string-append "-Dprotobuf_STATIC_LIBRARIES="
|
||||
protobuf "/lib/libprotobuf.so")
|
||||
(string-append "-DPROTOBUF_PROTOC_EXECUTABLE="
|
||||
protobuf:native "/bin/protoc")
|
||||
|
||||
;; Use snappy from Guix
|
||||
(string-append "-Dsnappy_STATIC_LIBRARIES="
|
||||
snappy "/lib/libsnappy.so")
|
||||
;; Yes, this is not actually the include directory but a prefix...
|
||||
(string-append "-Dsnappy_INCLUDE_DIR=" snappy)
|
||||
|
||||
;; Use jsoncpp from Guix
|
||||
(string-append "-Djsoncpp_STATIC_LIBRARIES="
|
||||
jsoncpp "/lib/libjsoncpp.so")
|
||||
;; Yes, this is not actually the include directory but a prefix...
|
||||
(string-append "-Djsoncpp_INCLUDE_DIR=" jsoncpp)
|
||||
|
||||
;; Use sqlite from Guix
|
||||
(string-append "-Dsqlite_STATIC_LIBRARIES="
|
||||
sqlite "/lib/libsqlite.a")
|
||||
|
||||
;; Use system libraries wherever possible. Currently, this
|
||||
;; only affects zlib.
|
||||
"-Dsystemlib_ALL=ON"
|
||||
"-Dtensorflow_ENABLE_POSITION_INDEPENDENT_CODE=ON"
|
||||
"-Dtensorflow_BUILD_SHARED_LIB=ON"
|
||||
"-Dtensorflow_OPTIMIZE_FOR_NATIVE_ARCH=OFF"
|
||||
"-Dtensorflow_ENABLE_SSL_SUPPORT=OFF"
|
||||
"-Dtensorflow_BUILD_CONTRIB_KERNELS=OFF"))
|
||||
#:make-flags
|
||||
(list "CC=gcc")
|
||||
#:modules ((ice-9 ftw)
|
||||
(guix build utils)
|
||||
(guix build cmake-build-system))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-source-file-times-to-1980
|
||||
;; At the end of the tf_python_build_pip_package target, a ZIP
|
||||
;; archive should be generated via bdist_wheel, but it fails with
|
||||
;; "ZIP does not support timestamps before 1980". Luckily,
|
||||
;; SOURCE_DATE_EPOCH is respected, which we set to some time in
|
||||
;; 1980.
|
||||
(lambda _ (setenv "SOURCE_DATE_EPOCH" "315532800") #t))
|
||||
;; See https://github.com/tensorflow/tensorflow/issues/20517#issuecomment-406373913
|
||||
(add-after 'unpack 'python3.7-compatibility
|
||||
(lambda _
|
||||
(substitute* '("tensorflow/python/eager/pywrap_tfe_src.cc"
|
||||
"tensorflow/python/lib/core/ndarray_tensor.cc"
|
||||
"tensorflow/python/lib/core/py_func.cc")
|
||||
(("PyUnicode_AsUTF8") "(char *)PyUnicode_AsUTF8"))
|
||||
(substitute* "tensorflow/c/eager/c_api.h"
|
||||
(("unsigned char async")
|
||||
"unsigned char is_async"))
|
||||
|
||||
;; Remove dependency on tensorboard, a complicated but probably
|
||||
;; optional package.
|
||||
(substitute* "tensorflow/tools/pip_package/setup.py"
|
||||
((".*'tensorboard >.*") ""))
|
||||
#t))
|
||||
(add-after 'python3.7-compatibility 'chdir
|
||||
(lambda _ (chdir "tensorflow/contrib/cmake") #t))
|
||||
(add-after 'chdir 'disable-downloads
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* (find-files "external" "\\.cmake$")
|
||||
(("GIT_REPOSITORY.*") "")
|
||||
(("GIT_TAG.*") "")
|
||||
(("PREFIX ")
|
||||
"DOWNLOAD_COMMAND \"\"\nPREFIX "))
|
||||
|
||||
;; Use packages from Guix
|
||||
(let ((grpc (assoc-ref inputs "grpc")))
|
||||
(substitute* "CMakeLists.txt"
|
||||
;; Sqlite
|
||||
(("include\\(sqlite\\)") "")
|
||||
(("\\$\\{sqlite_STATIC_LIBRARIES\\}")
|
||||
(string-append (assoc-ref inputs "sqlite")
|
||||
"/lib/libsqlite3.so"))
|
||||
(("sqlite_copy_headers_to_destination") "")
|
||||
|
||||
;; PNG
|
||||
(("include\\(png\\)") "")
|
||||
(("\\$\\{png_STATIC_LIBRARIES\\}")
|
||||
(string-append (assoc-ref inputs "libpng")
|
||||
"/lib/libpng16.so"))
|
||||
(("png_copy_headers_to_destination") "")
|
||||
|
||||
;; JPEG
|
||||
(("include\\(jpeg\\)") "")
|
||||
(("\\$\\{jpeg_STATIC_LIBRARIES\\}")
|
||||
(string-append (assoc-ref inputs "libjpeg")
|
||||
"/lib/libjpeg.so"))
|
||||
(("jpeg_copy_headers_to_destination") "")
|
||||
|
||||
;; GIF
|
||||
(("include\\(gif\\)") "")
|
||||
(("\\$\\{gif_STATIC_LIBRARIES\\}")
|
||||
(string-append (assoc-ref inputs "giflib")
|
||||
"/lib/libgif.so"))
|
||||
(("gif_copy_headers_to_destination") "")
|
||||
|
||||
;; lmdb
|
||||
(("include\\(lmdb\\)") "")
|
||||
(("\\$\\{lmdb_STATIC_LIBRARIES\\}")
|
||||
(string-append (assoc-ref inputs "lmdb")
|
||||
"/lib/liblmdb.so"))
|
||||
(("lmdb_copy_headers_to_destination") "")
|
||||
|
||||
;; Protobuf
|
||||
(("include\\(protobuf\\)") "")
|
||||
(("protobuf_copy_headers_to_destination") "")
|
||||
(("^ +protobuf") "")
|
||||
|
||||
;; gRPC
|
||||
(("include\\(grpc\\)")
|
||||
"find_package(grpc REQUIRED NAMES gRPC)")
|
||||
(("list\\(APPEND tensorflow_EXTERNAL_DEPENDENCIES grpc\\)") "")
|
||||
|
||||
;; Eigen
|
||||
(("include\\(eigen\\)")
|
||||
(string-append "find_package(eigen REQUIRED NAMES Eigen3)
|
||||
set(eigen_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/eigen_archive "
|
||||
(assoc-ref inputs "eigen") "/include/eigen3)"))
|
||||
(("^ +eigen") "")
|
||||
|
||||
;; snappy
|
||||
(("include\\(snappy\\)")
|
||||
"add_definitions(-DTF_USE_SNAPPY)")
|
||||
(("list\\(APPEND tensorflow_EXTERNAL_DEPENDENCIES snappy\\)") "")
|
||||
|
||||
;; jsoncpp
|
||||
(("include\\(jsoncpp\\)") "")
|
||||
(("^ +jsoncpp") ""))
|
||||
|
||||
(substitute* "tf_core_framework.cmake"
|
||||
((" grpc") "")
|
||||
(("\\$\\{GRPC_BUILD\\}/grpc_cpp_plugin")
|
||||
(which "grpc_cpp_plugin"))
|
||||
;; Link with gRPC libraries
|
||||
(("add_library\\(tf_protos_cc.*" m)
|
||||
(string-append m
|
||||
(format #f "\ntarget_link_libraries(tf_protos_cc PRIVATE \
|
||||
~a/lib/libgrpc++_unsecure.a \
|
||||
~a/lib/libgrpc_unsecure.a \
|
||||
~a/lib/libaddress_sorting.a \
|
||||
~a/lib/libgpr.a \
|
||||
~a//lib/libcares.so
|
||||
)\n"
|
||||
grpc grpc grpc grpc
|
||||
(assoc-ref inputs "c-ares"))))))
|
||||
(substitute* "tf_tools.cmake"
|
||||
(("add_dependencies\\(\\$\\{proto_text.*") ""))
|
||||
;; Remove dependency on bundled grpc
|
||||
(substitute* "tf_core_distributed_runtime.cmake"
|
||||
(("tf_core_cpu grpc") "tf_core_cpu"))
|
||||
|
||||
;; This directory is a dependency of many targets.
|
||||
(mkdir-p "protobuf")
|
||||
#t))
|
||||
(add-after 'configure 'unpack-third-party-sources
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; This is needed to configure bundled packages properly.
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
(for-each
|
||||
(lambda (name)
|
||||
(let* ((what (assoc-ref inputs (string-append name "-src")))
|
||||
(name* (string-map (lambda (c)
|
||||
(if (char=? c #\-)
|
||||
#\_ c)) name))
|
||||
(where (string-append "../build/" name* "/src/" name*)))
|
||||
(cond
|
||||
((string-suffix? ".zip" what)
|
||||
(mkdir-p where)
|
||||
(with-directory-excursion where
|
||||
(invoke "unzip" what)))
|
||||
((string-suffix? ".tar.gz" what)
|
||||
(mkdir-p where)
|
||||
(invoke "tar" "xf" what
|
||||
"-C" where "--strip-components=1"))
|
||||
(else
|
||||
(let ((parent (dirname where)))
|
||||
(mkdir-p parent)
|
||||
(with-directory-excursion parent
|
||||
(when (file-exists? name*)
|
||||
(delete-file-recursively name*))
|
||||
(copy-recursively what name*)
|
||||
(map make-file-writable
|
||||
(find-files name* ".*"))))))))
|
||||
(list "boringssl"
|
||||
"cub"
|
||||
"double-conversion"
|
||||
"farmhash"
|
||||
"fft2d"
|
||||
"highwayhash"
|
||||
"nsync"
|
||||
"re2"))
|
||||
|
||||
(rename-file "../build/cub/src/cub/cub-1.8.0/"
|
||||
"../build/cub/src/cub/cub/")
|
||||
#t))
|
||||
(add-after 'unpack 'fix-python-build
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(mkdir-p "protobuf-src")
|
||||
(invoke "tar" "xf" (assoc-ref inputs "protobuf:src")
|
||||
"-C" "protobuf-src" "--strip-components=1")
|
||||
(mkdir-p "eigen-src")
|
||||
(invoke "tar" "xf" (assoc-ref inputs "eigen:src")
|
||||
"-C" "eigen-src" "--strip-components=1")
|
||||
|
||||
(substitute* "tensorflow/contrib/cmake/tf_python.cmake"
|
||||
;; Ensure that all Python dependencies can be found at build time.
|
||||
(("PYTHONPATH=\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/tf_python" m)
|
||||
(string-append m ":" (getenv "PYTHONPATH")))
|
||||
;; Take protobuf source files from our source package.
|
||||
(("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/protobuf/src/protobuf/src/google")
|
||||
(string-append (getcwd) "/protobuf-src/src/google")))
|
||||
|
||||
(substitute* '("tensorflow/contrib/cmake/tf_shared_lib.cmake"
|
||||
"tensorflow/contrib/cmake/tf_python.cmake")
|
||||
;; Take Eigen source files from our source package.
|
||||
(("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/eigen/src/eigen/")
|
||||
(string-append (getcwd) "/eigen-src/"))
|
||||
;; Take Eigen headers from our own package.
|
||||
(("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/external/eigen_archive")
|
||||
(string-append (assoc-ref inputs "eigen") "/include/eigen3")))
|
||||
|
||||
;; Correct the RUNPATH of ops libraries generated for Python.
|
||||
;; TODO: this doesn't work :(
|
||||
;; /gnu/store/...-tensorflow-1.9.0/lib/python3.7/site-packages/tensorflow/contrib/seq2seq/python/ops/lib_beam_search_ops.so:
|
||||
;; warning: RUNPATH contains bogus entries: ("/tmp/guix-build-tensorflow-1.9.0.drv-0/source/tensorflow/contrib/build")
|
||||
;; /gnu/store/...-tensorflow-1.9.0/lib/python3.7/site-packages/tensorflow/contrib/seq2seq/python/ops/lib_beam_search_ops.so:
|
||||
;; error: depends on 'libpywrap_tensorflow_internal.so', which
|
||||
;; cannot be found in RUNPATH ...
|
||||
(substitute* "tensorflow/contrib/cmake/tf_cc_ops.cmake"
|
||||
(("set_target_properties.*")
|
||||
(string-append "set_target_properties(${_AT_TARGET} PROPERTIES \
|
||||
COMPILE_FLAGS ${target_compile_flags} \
|
||||
INSTALL_RPATH_USE_LINK_PATH TRUE \
|
||||
INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
|
||||
#t))
|
||||
(add-after 'build 'build-pip-package
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(setenv "LDFLAGS"
|
||||
(string-append "-Wl,-rpath="
|
||||
(assoc-ref outputs "out") "/lib"))
|
||||
(invoke "make" "tf_python_build_pip_package")
|
||||
#t))
|
||||
(add-after 'build-pip-package 'install-python
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(wheel (car (find-files "../build/tf_python/dist/" "\\.whl$"))))
|
||||
(invoke "python" "-m" "pip" "install" wheel
|
||||
(string-append "--prefix=" out))
|
||||
|
||||
;; XXX: broken RUNPATH, see fix-python-build phase.
|
||||
(delete-file
|
||||
(string-append
|
||||
out "/lib/python3.7/site-packages/tensorflow/contrib/"
|
||||
"seq2seq/python/ops/lib_beam_search_ops.so"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("protobuf:native" ,protobuf-next) ; protoc
|
||||
("protobuf:src" ,(package-source protobuf-next))
|
||||
("eigen:src" ,(package-source eigen-for-tensorflow))
|
||||
;; The commit hashes and URLs for third-party source code are taken
|
||||
;; from "tensorflow/workspace.bzl".
|
||||
("boringssl-src"
|
||||
,(let ((commit "ee7aa02")
|
||||
(revision "1"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://boringssl.googlesource.com/boringssl")
|
||||
(commit commit)))
|
||||
(file-name (string-append "boringssl-0-" revision
|
||||
(string-take commit 7)
|
||||
"-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jf693q0nw0adsic6cgmbdx6g7wr4rj4vxa8j1hpn792fqhd8wgw")))))
|
||||
("cub-src"
|
||||
,(let ((version "1.8.0"))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://mirror.bazel.build/github.com/NVlabs/"
|
||||
"cub/archive/" version ".zip"))
|
||||
(file-name (string-append "cub-" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hsqikqridb90dkxkjr2918dcry6pfh46ccnwrzawl56aamhdykb")))))
|
||||
("double-conversion-src"
|
||||
,(let ((commit "5664746")
|
||||
(revision "1"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/google/double-conversion.git")
|
||||
(commit commit)))
|
||||
(file-name
|
||||
(git-file-name "double-conversion"
|
||||
(string-append "0-" revision "."
|
||||
(string-take commit 7))))
|
||||
(sha256
|
||||
(base32
|
||||
"1h5lppqqxcvdg5jq42i5msgwx20ryij3apvmndflngrgdpc04gn1")))))
|
||||
("farmhash-src"
|
||||
,(let ((commit "816a4ae622e964763ca0862d9dbd19324a1eaf45"))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://mirror.bazel.build/github.com/google/farmhash/archive/"
|
||||
commit ".tar.gz"))
|
||||
(file-name (string-append "farmhash-0-" (string-take commit 7)
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"185b2xdxl4d4cnsnv6abg8s22gxvx8673jq2yaq85bz4cdy58q35")))))
|
||||
;; The license notice on the home page at
|
||||
;; http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html says:
|
||||
;; Copyright Takuya OOURA, 1996-2001
|
||||
;;
|
||||
;; You may use, copy, modify and distribute this code for any purpose
|
||||
;; (include commercial use) and without fee. Please refer to this
|
||||
;; package when you modify this code.
|
||||
;;
|
||||
;; We take the identical tarball from the Bazel mirror, because the URL
|
||||
;; at the home page is not versioned and might change.
|
||||
("fft2d-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://mirror.bazel.build/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz")
|
||||
(file-name "fft2d.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
"15jjkfvhqvl2c0753d2di8hz0pyzn598g74wqy79awdrf1y67fsj"))))
|
||||
("highwayhash-src"
|
||||
,(let ((commit "be5edafc2e1a455768e260ccd68ae7317b6690ee")
|
||||
(revision "1"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/google/highwayhash.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append "highwayhash-0-" revision
|
||||
(string-take commit 7)
|
||||
"-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"154jwf98cyy54hldr94pgjn85zynly3abpnc1avmb8a18lzwjyb6")))))
|
||||
("nsync-src"
|
||||
,(let ((version "0559ce013feac8db639ee1bf776aca0325d28777")
|
||||
(revision "1"))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://mirror.bazel.build/"
|
||||
"github.com/google/nsync/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append "nsync-0." revision
|
||||
"-" (string-take version 7)
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qdkyqym34x739mmzv97ah5r7ph462v5xkxqxvidmcfqbi64b132")))))
|
||||
("re2-src"
|
||||
,(let ((commit "e7efc48")
|
||||
(revision "1"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/google/re2")
|
||||
(commit commit)))
|
||||
(file-name (string-append "re2-0-" revision
|
||||
(string-take commit 7)
|
||||
"-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign")))))
|
||||
("googletest" ,googletest)
|
||||
("swig" ,swig)
|
||||
("unzip" ,unzip)))
|
||||
(propagated-inputs
|
||||
`(("python-absl-py" ,python-absl-py)
|
||||
("python-astor" ,python-astor)
|
||||
("python-gast" ,python-gast)
|
||||
("python-grpcio" ,python-grpcio)
|
||||
("python-numpy" ,python-numpy)
|
||||
("python-protobuf" ,python-protobuf-next)
|
||||
("python-six" ,python-six)
|
||||
("python-termcolo" ,python-termcolor)
|
||||
("python-wheel" ,python-wheel)))
|
||||
(inputs
|
||||
`(("c-ares" ,c-ares-next)
|
||||
("eigen" ,eigen-for-tensorflow)
|
||||
("gemmlowp" ,gemmlowp-for-tensorflow)
|
||||
("lmdb" ,lmdb)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libpng" ,libpng)
|
||||
("giflib" ,giflib)
|
||||
("grpc" ,grpc)
|
||||
("jsoncpp" ,jsoncpp-for-tensorflow)
|
||||
("snappy" ,snappy)
|
||||
("sqlite" ,sqlite)
|
||||
("protobuf" ,protobuf-next)
|
||||
("python" ,python-wrapper)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://tensorflow.org")
|
||||
(synopsis "Machine learning framework")
|
||||
(description
|
||||
"TensorFlow is a flexible platform for building and training machine
|
||||
learning models. It provides a library for high performance numerical
|
||||
computation and includes high level Python APIs, including both a sequential
|
||||
API for beginners that allows users to build models quickly by plugging
|
||||
together building blocks and a subclassing API with an imperative style for
|
||||
advanced research.")
|
||||
(license license:asl2.0)))
|
||||
|
|
|
@ -95,6 +95,7 @@
|
|||
#:use-module (gnu packages onc-rpc)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages perl-web)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-web)
|
||||
|
@ -110,6 +111,7 @@
|
|||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages w3m)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages webkit)
|
||||
|
@ -1389,7 +1391,7 @@ How it works:
|
|||
@item This password digest is used as a symmetric secret to decrypt a libsodium secretbox.
|
||||
@item Inside the secretbox is stored a Curve25519 private key.
|
||||
@item The Curve25519 private key is used to decrypt each individual message,
|
||||
using lidsodium sealed boxes.
|
||||
using libsodium sealed boxes.
|
||||
@item New mail is encrypted as it arrives using the Curve25519 public key.
|
||||
@end enumerate\n")
|
||||
(license agpl3)))
|
||||
|
@ -1504,6 +1506,28 @@ locates email addresses in strings and returns a list of Email::Address
|
|||
objects found. Alternatively you may construct objects manually.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-address-xs
|
||||
(package
|
||||
(name "perl-email-address-xs")
|
||||
(version "1.04")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/P/PA/PALI/"
|
||||
"Email-Address-XS-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/Email-Address-XS")
|
||||
(synopsis "Parse and format RFC 5322 email addresses and groups")
|
||||
(description
|
||||
"Email::Address::XS implements RFC 5322 parser and formatter of email
|
||||
addresses and groups. Unlike Email::Address, this module does not use regular
|
||||
expressions for parsing but instead is implemented in XS and uses shared code
|
||||
from Dovecot IMAP server.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-date-format
|
||||
(package
|
||||
(name "perl-email-date-format")
|
||||
|
@ -2866,3 +2890,79 @@ replacement for the @code{urlview} program.")
|
|||
(description "This package provides a TNEF stream reader library and
|
||||
related tools to process winmail.dat files.")
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public public-inbox
|
||||
(let ((commit "3cf66514aea9e958999973b9f104473b6d800fbe")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "public-inbox")
|
||||
(version (git-version "1.0.0" revision commit))
|
||||
(source
|
||||
(origin (method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://public-inbox.org")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1sxycwlm2n6p544gn9f0vf3xs6gz8vdswdhs2ha6fka8mgabvmdh"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'qualify-paths
|
||||
(lambda _
|
||||
;; Use absolute paths for 'xapian-compact'.
|
||||
(let ((xapian-compact (which "xapian-compact")))
|
||||
(substitute* "script/public-inbox-compact"
|
||||
(("xapian-compact") xapian-compact)))
|
||||
#t))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(substitute* "t/spawn.t"
|
||||
(("\\['env'\\]") (string-append "['" (which "env") "']")))
|
||||
#t))
|
||||
(add-after 'install 'wrap-programs
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(for-each
|
||||
(lambda (prog)
|
||||
(wrap-program prog
|
||||
;; Let those scripts find their perl modules.
|
||||
`("PERL5LIB" ":" prefix
|
||||
(,(string-append out "/lib/perl5/site_perl")
|
||||
,(getenv "PERL5LIB")))
|
||||
;; 'git' is invoked in various files of the PublicInbox
|
||||
;; perl module.
|
||||
`("PATH" ":" prefix
|
||||
(,(string-append (assoc-ref inputs "git") "/bin")))))
|
||||
(find-files (string-append out "/bin"))))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("git" ,git)
|
||||
("xapian" ,xapian)))
|
||||
(inputs
|
||||
`(("perl-danga-socket" ,perl-danga-socket)
|
||||
("perl-dbd-sqlite" ,perl-dbd-sqlite)
|
||||
("perl-dbi" ,perl-dbi)
|
||||
("perl-email-address-xs" ,perl-email-address-xs)
|
||||
("perl-email-mime-contenttype" ,perl-email-mime-contenttype)
|
||||
("perl-email-mime" ,perl-email-mime)
|
||||
("perl-email-simple" ,perl-email-simple)
|
||||
("perl-filesys-notify-simple" ,perl-filesys-notify-simple)
|
||||
("perl-plack-middleware-deflater" ,perl-plack-middleware-deflater)
|
||||
("perl-plack-middleware-reverseproxy" ,perl-plack-middleware-reverseproxy)
|
||||
("perl-plack" ,perl-plack)
|
||||
("perl-search-xapian" ,perl-search-xapian)
|
||||
("perl-timedate" ,perl-timedate)
|
||||
("perl-uri-escape" ,perl-uri-escape)
|
||||
;; For testing.
|
||||
("perl-ipc-run" ,perl-ipc-run)
|
||||
("perl-xml-feed" ,perl-xml-feed)))
|
||||
(home-page "https://public-inbox.org/README.html")
|
||||
(synopsis "Archive mailing lists in git repositories")
|
||||
(description
|
||||
"public-inbox implements the sharing of an email inbox via git to
|
||||
complement or replace traditional mailing lists. Readers may read via NNTP,
|
||||
Atom feeds or HTML archives.")
|
||||
(license agpl3+))))
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2017 ng0 <ng0@n0.is>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -92,6 +93,46 @@
|
|||
MATE applications.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public mate-power-manager
|
||||
(package
|
||||
(name "mate-power-manager")
|
||||
(version "1.22.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://pub.mate-desktop.org/releases/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03c09h41qfz83wmjfvwzkq4xqc54aswmki4h034qcxbgfnyfmk1i"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)
|
||||
("yelp-tools" ,yelp-tools)
|
||||
("glib" ,glib "bin") ; glib-gettextize
|
||||
("libtool" ,libtool)))
|
||||
(inputs
|
||||
`(("gtk+" ,gtk+)
|
||||
("glib" ,glib)
|
||||
("dbus-glib" ,dbus-glib)
|
||||
("libgnome-keyring" ,libgnome-keyring)
|
||||
("cairo" ,cairo)
|
||||
("dbus" ,dbus)
|
||||
("libnotify" ,libnotify)
|
||||
("mate-panel" ,mate-panel)
|
||||
("libxrandr" ,libxrandr)
|
||||
("libcanberra" ,libcanberra)
|
||||
("upower" ,upower)))
|
||||
(home-page "https://mate-desktop.org/")
|
||||
(synopsis "A Power Manager for MATE")
|
||||
(description
|
||||
"MATE Power Manager is a MATE session daemon that acts as a policy agent on
|
||||
top of UPower. It listens to system events and responds with user-configurable
|
||||
actions.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public mate-icon-theme
|
||||
(package
|
||||
(name "mate-icon-theme")
|
||||
|
@ -1565,6 +1606,7 @@ used to bring up authentication dialogs.")
|
|||
("mate-terminal" ,mate-terminal)
|
||||
("mate-themes" ,mate-themes)
|
||||
("mate-icon-theme" ,mate-icon-theme)
|
||||
("mate-power-manager" ,mate-power-manager)
|
||||
("mate-menu" ,mate-menus)
|
||||
("mate-panel" ,mate-panel)
|
||||
("mate-control-center" ,mate-control-center)
|
||||
|
|
|
@ -650,13 +650,13 @@ plotting engine by third-party applications like Octave.")
|
|||
(version "2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/OkoSanto/GCTP/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/OkoSanto/GCTP.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0l9aqnqynh9laicn5dxf3rsb1n14xiks79wbyqccirzmjqd1c1x4"))))
|
||||
(base32 "11wqmd443b4nksdbzp1msdws3av948nmwq1xz80w6hka3ss2aigd"))))
|
||||
(native-inputs
|
||||
`(("fortran" ,gfortran)))
|
||||
(build-system gnu-build-system)
|
||||
|
@ -1555,15 +1555,14 @@ script files.")
|
|||
(version "0.17.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/tpaviot/oce/archive/OCE-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tpaviot/oce.git")
|
||||
(commit (string-append "OCE-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "opencascade-oce-glibc-2.26.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd"))))
|
||||
(base32 "0rg5wzkvfmzfl6v2amyryb8dnjad0nn9kyr607wy2gch6rciah69"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
|
@ -2228,12 +2227,12 @@ programming problems.")
|
|||
(define-public r-pracma
|
||||
(package
|
||||
(name "r-pracma")
|
||||
(version "2.2.2")
|
||||
(version "2.2.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "pracma" version))
|
||||
(sha256
|
||||
(base32 "18zhni05gwnxbphl6bmjjxmsgg5wwnnkwlb4g971cqyw3dsd83ki"))))
|
||||
(base32 "0isd3s0i4mzmva8lkh0j76hwjy1w50q7d1n9lhxsnnkgalx3xs1g"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/pracma/")
|
||||
(synopsis "Practical numerical math functions")
|
||||
|
@ -2952,13 +2951,13 @@ associated functions (eg. contiguous and non-contiguous submatrix views).")
|
|||
(version (string-append upstream-version "-" revision))
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/beltoforion/muparser/archive/v"
|
||||
upstream-version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/beltoforion/muparser.git")
|
||||
(commit (string-append "v" upstream-version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0277qsi5l23jsck1vhn383bmvc2n9l4a1dl5r9bf7hvjv9ayyrh6"))))
|
||||
(base32 "0f0g4995xngf1pp3zr4p6ai2f8v6f8bxwa0k8ayjjiv1l8h44m24"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-samples=no")
|
||||
|
@ -3146,13 +3145,13 @@ access to BLIS implementations via traditional BLAS routine calls.")
|
|||
(version "0.6.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/JuliaLang/openlibm/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JuliaLang/openlibm.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0a5fpm8nra5ldhjk0cqd2rx1qh32wiarkxmcqcm5xl8z7l4kjm6l"))))
|
||||
(base32 "08wfchmmr5200fvmn1kwq9byc1fhsq46hn0y5k8scdl74771c7gh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
@ -3185,13 +3184,13 @@ environments.")
|
|||
(version "0.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/JuliaLang/openspecfun/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JuliaLang/openspecfun.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m"))))
|
||||
(base32 "0pfw6l3ch7isz403llx7inxlvavqh01jh1hb9dpidi86sjjx9kfh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no "check" target
|
||||
|
@ -3682,31 +3681,32 @@ set.")
|
|||
(define-public hypre
|
||||
(package
|
||||
(name "hypre")
|
||||
(version "2.14.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/LLNL/hypre/archive/"
|
||||
"v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v515i73bvaz378h5465b1dy9v2gf924zy2q94cpq4qqarawvkqh"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove use of __DATE__ and __TIME__ for reproducibility;
|
||||
;; substitute the tarball creation time.
|
||||
(substitute* "src/utilities/HYPRE_utilities.h"
|
||||
(("Date Compiled: .*$")
|
||||
"Date Compiled: Apr 11 2018 16:24:59 +0000\"\n"))
|
||||
#t))))
|
||||
(version "2.15.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/LLNL/hypre.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1lvh4ybqkriyqfg2zmic6mrg1981qv1i9vry1fdgsabn81hb71g4"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove use of __DATE__ and __TIME__ for reproducibility;
|
||||
;; substitute the release date.
|
||||
(substitute* "src/utilities/HYPRE_utilities.h"
|
||||
(("Date Compiled: .*$")
|
||||
"Date Compiled: Oct 19 2018 15:23:00 +0000\"\n"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" ;6.1 MiB of headers and libraries
|
||||
"doc")) ;4.8 MiB of documentation
|
||||
(outputs '("out" ; 6.1 MiB of headers and libraries
|
||||
"doc")) ; 4.8 MiB of documentation
|
||||
(native-inputs
|
||||
`(("doc++" ,doc++)
|
||||
("netpbm" ,netpbm)
|
||||
("perl" ,perl) ;needed to run 'ppmquant' during tests
|
||||
("perl" ,perl) ; needed to run 'ppmquant' during tests
|
||||
("texlive" ,(texlive-union (list texlive-generic-xypic
|
||||
texlive-fonts-xypic
|
||||
texlive-latex-hyperref
|
||||
|
@ -3770,7 +3770,7 @@ set.")
|
|||
(with-directory-excursion "docs"
|
||||
(for-each (lambda (base)
|
||||
(install-file (string-append base ".pdf") docdir)
|
||||
(copy-recursively base docdir)) ;html docs
|
||||
(copy-recursively base docdir)) ; html docs
|
||||
'("HYPRE_usr_manual"
|
||||
"HYPRE_ref_manual")))
|
||||
#t))))))
|
||||
|
|
|
@ -1693,18 +1693,19 @@ building the IRC clients and bots.")
|
|||
(define-public toxic
|
||||
(package
|
||||
(name "toxic")
|
||||
(version "0.8.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/JFreegman/toxic/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dx6z7k0zpsd7dpysdy23f0hnm49qlikb0mq8fg0y01dsz9vxgak"))
|
||||
(file-name (git-file-name name version))))
|
||||
(version "0.8.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JFreegman/toxic.git")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
`(#:tests? #f ; no tests
|
||||
#:make-flags
|
||||
(list
|
||||
"CC=gcc"
|
||||
|
@ -1721,7 +1722,7 @@ building the IRC clients and bots.")
|
|||
`(("c-toxcore" ,c-toxcore)
|
||||
("curl" ,curl)
|
||||
("freealut" ,freealut)
|
||||
("gdk-pixbuf" ,gdk-pixbuf) ; for libnotify.pc
|
||||
("gdk-pixbuf" ,gdk-pixbuf) ; for libnotify.pc
|
||||
("libconfig" ,libconfig)
|
||||
("libnotify" ,libnotify)
|
||||
("libpng" ,libpng)
|
||||
|
@ -1819,13 +1820,13 @@ QMatrixClient project.")
|
|||
(define-public hangups
|
||||
(package
|
||||
(name "hangups")
|
||||
(version "0.4.6")
|
||||
(version "0.4.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "hangups" version))
|
||||
(sha256
|
||||
(base32 "0mvpfd5dc3zgcvwfidcd2qyn59xl5biv728mxifw0ls5rzkc9chs"))))
|
||||
(base32 "1jw4i58cd4j1ymsnhv9224xsi26w8y0qrj6z4nw50dnbl45b6aaa"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -1847,6 +1848,9 @@ QMatrixClient project.")
|
|||
("python-reparser" ,python-reparser)
|
||||
("python-requests" ,python-requests)
|
||||
("python-urwid" ,python-urwid)))
|
||||
(native-inputs
|
||||
`(("python-httpretty" ,python-httpretty)
|
||||
("python-pytest" ,python-pytest)))
|
||||
(home-page "https://hangups.readthedocs.io/")
|
||||
(synopsis "Instant messaging client for Google Hangouts")
|
||||
(description
|
||||
|
|
|
@ -427,16 +427,16 @@ written in Go with pluggable metric collectors.")
|
|||
(define-public fswatch
|
||||
(package
|
||||
(name "fswatch")
|
||||
(version "1.13.0")
|
||||
(version "1.14.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/emcrisostomo/fswatch.git")
|
||||
(commit version)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0r9m3rysqa1kdgghv2i6sv4zrd0v8idsbrp627ys642dl39svir3"))))
|
||||
"1ihn7wp3y7ml2lm8drz2hc6fmgj8kygbygnw8mz7gjax88f9dbx7"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -471,16 +471,16 @@ compression format (.mpc files).")
|
|||
(define-public eyed3
|
||||
(package
|
||||
(name "eyed3")
|
||||
(version "0.8.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "eyeD3" version))
|
||||
(sha256
|
||||
(base32
|
||||
"197lszkyzm377ym5r0ssryfsiz20yjx8y4rii3wc81n92d1qzlaq"))))
|
||||
(version "0.8.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "eyeD3" version))
|
||||
(sha256
|
||||
(base32 "1jb22n1jczxgbpcnfiw12r8dcs74556g1d09mzms44f52kgs7lgc"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; the required test data contains copyrighted material.
|
||||
`(#:tests? #f)) ; the required test data contains copyrighted material
|
||||
(propagated-inputs
|
||||
`(("python-grako" ,python-grako)
|
||||
("python-magic" ,python-magic)
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2016, 2018, 2019 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -195,7 +195,7 @@ player daemon.")
|
|||
(define-public ncmpc
|
||||
(package
|
||||
(name "ncmpc")
|
||||
(version "0.33")
|
||||
(version "0.34")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -204,7 +204,7 @@ player daemon.")
|
|||
"/ncmpc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19fp7xkpai4lq3vmpbppgh3ism7lg2sibv237c0sl5a0hls4mq4l"))))
|
||||
"0mz8r6vc4zn5sa3hlq4ii74qcrkh01nbg784zcwahgz8g3fb3i8l"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
@ -161,7 +161,7 @@ bind processes, and much more.")
|
|||
(define-public openmpi
|
||||
(package
|
||||
(name "openmpi")
|
||||
(version "4.0.0")
|
||||
(version "4.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -169,8 +169,7 @@ bind processes, and much more.")
|
|||
(version-major+minor version)
|
||||
"/downloads/openmpi-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"))))
|
||||
(base32 "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("hwloc" ,hwloc "lib")
|
||||
|
|
|
@ -2222,14 +2222,14 @@ computer's keyboard.")
|
|||
(define-public aj-snapshot
|
||||
(package
|
||||
(name "aj-snapshot")
|
||||
(version "0.9.8")
|
||||
(version "0.9.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/aj-snapshot/"
|
||||
"aj-snapshot-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p"))))
|
||||
"0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("minixml" ,minixml)
|
||||
|
|
|
@ -28,14 +28,14 @@
|
|||
(define-public musl
|
||||
(package
|
||||
(name "musl")
|
||||
(version "1.1.21")
|
||||
(version "1.1.22")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.musl-libc.org/releases/"
|
||||
"musl-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0i2z52zgc86af1n1gjiz43hgd85mxjgvgn345zsybja9dxpvchn7"))))
|
||||
"1qr9xqdzziy5bsyyqlh6k8yz056ll55d5yvc0gbhz61ginj422cb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; musl has no tests
|
||||
|
|
|
@ -161,7 +161,7 @@ residing in IPv4-only networks, even when they are behind a NAT device.")
|
|||
(define-public socat
|
||||
(package
|
||||
(name "socat")
|
||||
(version "1.7.3.2")
|
||||
(version "1.7.3.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -169,7 +169,7 @@ residing in IPv4-only networks, even when they are behind a NAT device.")
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3"))))
|
||||
"0jnhjijyq74g3wa4ph0am83z6vq7qna7ac0xqjma8s4197z3zmhd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments '(#:tests? #f)) ;no 'check' phase
|
||||
(inputs `(("openssl" ,openssl)))
|
||||
|
@ -590,15 +590,14 @@ of the same name.")
|
|||
(define-public wireshark
|
||||
(package
|
||||
(name "wireshark")
|
||||
(version "3.0.0")
|
||||
(version "3.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.wireshark.org/download/src/wireshark-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17h0ixq7yr6scscjkidaj3dh5x6dfd3f97ggdxlklkz9nbsk0kxw"))))
|
||||
(base32 "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -894,6 +893,30 @@ attacking, testing, and cracking. All tools are command-line driven, which
|
|||
allows for heavy scripting.")
|
||||
(license (list license:gpl2+ license:bsd-3))))
|
||||
|
||||
(define-public perl-danga-socket
|
||||
(package
|
||||
(name "perl-danga-socket")
|
||||
(version "1.61")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/B/BR/BRADFITZ/"
|
||||
"Danga-Socket-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nciapvxnc922ms304af0vavz1kgyr45ard8wc659k9srqar4hwf"))))
|
||||
(build-system perl-build-system)
|
||||
(propagated-inputs
|
||||
`(("perl-sys-syscall" ,perl-sys-syscall)))
|
||||
(home-page "https://metacpan.org/release/Danga-Socket")
|
||||
(synopsis "Event loop and event-driven async socket base class")
|
||||
(description
|
||||
"Danga::Socket is an abstract base class for objects backed by a socket
|
||||
which provides the basic framework for event-driven asynchronous IO, designed
|
||||
to be fast. Danga::Socket is both a base class for objects, and an event
|
||||
loop.")
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-data-validate-ip
|
||||
(package
|
||||
(name "perl-data-validate-ip")
|
||||
|
@ -924,7 +947,7 @@ private (reserved).")
|
|||
(define-public perl-net-dns
|
||||
(package
|
||||
(name "perl-net-dns")
|
||||
(version "1.19")
|
||||
(version "1.20")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -935,7 +958,7 @@ private (reserved).")
|
|||
(string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-"
|
||||
version ".tar.gz")))
|
||||
(sha256
|
||||
(base32 "1myc23vz0m42yyg8iw7bf1pdrmx9ql6fhl2vwk1vwf55v6yphqi0"))))
|
||||
(base32 "06z09igd42s0kg2ps5k7vpypg77zswfryqzbyalbllvjd0mnknbz"))))
|
||||
(build-system perl-build-system)
|
||||
(inputs
|
||||
`(("perl-digest-hmac" ,perl-digest-hmac)))
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016-2018 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Peter Kreye <kreyepr@gmail.com>
|
||||
;;; Copyright © 2018, 2019 Gabriel Hondet <gabrielhondet@gmail.com>
|
||||
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
|
||||
|
@ -57,6 +57,7 @@
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages sdl)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages tex)
|
||||
|
@ -264,14 +265,15 @@ functional, imperative and object-oriented styles of programming.")
|
|||
(package
|
||||
(name "ocamlbuild")
|
||||
(version "0.13.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ocaml/ocamlbuild/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1320cfkixs1xlng5av04pa5qjb3ynvi2kl3k1ngqzg5fpi29b0vr"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml/ocamlbuild.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0v37vjvdqw35yvj8ipmlzmwf1jhip0hbsmcbdcn9cnj12p3mr6k7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
|
@ -302,33 +304,200 @@ functional, imperative and object-oriented styles of programming.")
|
|||
for building OCaml library and programs.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public ocaml-extlib
|
||||
(package
|
||||
(name "ocaml-extlib")
|
||||
(version "1.7.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ygrek.org.ua/p/release/ocaml-extlib/"
|
||||
"extlib-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(native-inputs
|
||||
`(("ocaml-cppo" ,ocaml-cppo)))
|
||||
(home-page "https://github.com/ygrek/ocaml-extlib")
|
||||
(synopsis "Complete and small extension for OCaml standard library")
|
||||
(description "This library adds new functions to OCaml standard library
|
||||
modules, modifies some functions in order to get better performances or
|
||||
safety (tail-recursive) and also provides new modules which should be useful
|
||||
for day to day programming.")
|
||||
;; With static-linking exception
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public ocaml-cudf
|
||||
(package
|
||||
(name "ocaml-cudf")
|
||||
(version "0.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
"0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"))))
|
||||
(build-system ocaml-build-system)
|
||||
(propagated-inputs `(("ocaml-extlib" ,ocaml-extlib)))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("ocamlbuild" ,ocamlbuild)
|
||||
("ocaml-ounit" ,ocaml-ounit)))
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list
|
||||
"all" "opt"
|
||||
(string-append "BINDIR=" (assoc-ref %outputs "out")
|
||||
"/bin"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(home-page "http://www.mancoosi.org/cudf/")
|
||||
(synopsis "CUDF library (part of the Mancoosi tools)")
|
||||
(description "CUDF (for Common Upgradeability Description Format) is a
|
||||
format for describing upgrade scenarios in package-based Free and Open Source
|
||||
Software distribution.")
|
||||
;; With static-linking exception
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public ocaml-mccs
|
||||
(package
|
||||
(name "ocaml-mccs")
|
||||
(version "1.1+9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/AltGr/ocaml-mccs")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1i0hhkrqi7rqlainlg5pc4hibbx6b5dp3x99gmav8c3sbfvlk9mc"))))
|
||||
(build-system dune-build-system)
|
||||
(propagated-inputs `(("ocaml-cudf" ,ocaml-cudf)))
|
||||
(home-page "http://www.i3s.unice.fr/~cpjm/misc/")
|
||||
(synopsis "Upgrade path problem solver")
|
||||
(description "Mccs (Multi Criteria CUDF Solver) is a CUDF problem solver.
|
||||
Mccs take as input a CUDF problem and computes the best solution according to
|
||||
a set of criteria. It relies on a Integer Programming solver or a
|
||||
Pseudo Boolean solver to achieve its task. Mccs can use a wide set of
|
||||
underlying solvers like Cplex, Gurobi, Lpsolver, Glpk, CbC, SCIP or WBO.")
|
||||
(license (list
|
||||
license:bsd-3
|
||||
license:gpl3+
|
||||
;; With static-linking exception
|
||||
license:lgpl2.1+))))
|
||||
|
||||
(define-public ocaml-dose3
|
||||
(package
|
||||
(name "ocaml-dose3")
|
||||
(version "5.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
"00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"))
|
||||
(patches
|
||||
(search-patches
|
||||
"ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch"
|
||||
"ocaml-dose3-Fix-for-ocaml-4.06.patch"
|
||||
"ocaml-dose3-dont-make-printconf.patch"
|
||||
"ocaml-dose3-Install-mli-cmx-etc.patch"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "SHELL="
|
||||
(assoc-ref %build-inputs "bash")
|
||||
"/bin/sh"))
|
||||
#:make-flags
|
||||
(list (string-append "LIBDIR="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/ocaml/site-lib"))))
|
||||
(propagated-inputs
|
||||
`(("ocaml-graph" ,ocaml-graph)
|
||||
("ocaml-cudf" ,ocaml-cudf)
|
||||
("ocaml-extlib" ,ocaml-extlib)
|
||||
("ocaml-re" ,ocaml-re)))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("python" ,python-2) ; for a test script
|
||||
("python2-pyyaml" ,python2-pyyaml) ; for a test script
|
||||
("ocaml-extlib" ,ocaml-extlib)
|
||||
("ocamlbuild" ,ocamlbuild)
|
||||
("ocaml-cppo" ,ocaml-cppo)))
|
||||
(home-page "http://www.mancoosi.org/software/")
|
||||
(synopsis "Package distribution management framework")
|
||||
(description "Dose3 is a framework made of several OCaml libraries for
|
||||
managing distribution packages and their dependencies. Though not tied to
|
||||
any particular distribution, dose3 constitutes a pool of libraries which
|
||||
enable analyzing packages coming from various distributions. Besides basic
|
||||
functionalities for querying and setting package properties, dose3 also
|
||||
implements algorithms for solving more complex problems such as monitoring
|
||||
package evolutions, correct and complete dependency resolution and
|
||||
repository-wide uninstallability checks.")
|
||||
;; with static-linking exception
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public ocaml-opam-file-format
|
||||
(package
|
||||
(name "ocaml-opam-file-format")
|
||||
(version "2.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml/opam-file-format")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f; No tests
|
||||
#:make-flags (list (string-append "LIBDIR=" (assoc-ref %outputs "out")
|
||||
"/lib/ocaml/site-lib"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(home-page "https://opam.ocaml.org")
|
||||
(synopsis "Parser and printer for the opam file syntax")
|
||||
(description "This package contains a parser and a pretty-printer for
|
||||
the opam file fomat.")
|
||||
;; With static-linking exception
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public opam
|
||||
(package
|
||||
(name "opam")
|
||||
(version "2.0.3")
|
||||
(version "2.0.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; Use the '-full' version, which includes all the dependencies.
|
||||
(uri (string-append
|
||||
"https://github.com/ocaml/opam/releases/download/"
|
||||
version "/opam-full-" version ".tar.gz")
|
||||
;; (string-append "https://github.com/ocaml/opam/archive/"
|
||||
;; version ".tar.gz")
|
||||
)
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml/opam")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qphm1grxx5j8li7f9qfpih4ylrnjl08b4ym8ma4ln44l56xm285"))))
|
||||
(build-system gnu-build-system)
|
||||
"1yx5k8v5vnnc20fmz5zx8kqd242j48qcknlk6vmkr7rkq886ipq2"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
'(;; Sometimes, 'make -jX' would fail right after ./configure with
|
||||
;; "Fatal error: exception End_of_file".
|
||||
#:parallel-build? #f
|
||||
`(#:configure-flags
|
||||
(list (string-append "SHELL="
|
||||
(assoc-ref %build-inputs "bash")
|
||||
"/bin/sh"))
|
||||
|
||||
;; For some reason, 'ocp-build' needs $TERM to be set.
|
||||
#:make-flags `("TERM=screen"
|
||||
,(string-append "SHELL="
|
||||
(assoc-ref %build-inputs "bash")
|
||||
"/bin/sh"))
|
||||
#:make-flags
|
||||
(list "TERM=screen"
|
||||
(string-append "SHELL="
|
||||
(assoc-ref %build-inputs "bash")
|
||||
"/bin/sh"))
|
||||
|
||||
#:test-target "tests"
|
||||
|
||||
;; FIXME: There's an obscure test failure:
|
||||
|
@ -354,12 +523,10 @@ for building OCaml library and programs.")
|
|||
;; isolated environment when building with opam.
|
||||
;; This is necessary for packages to find external
|
||||
;; dependencies, such as a C compiler, make, etc...
|
||||
(("^add_mounts ro /usr")
|
||||
"add_mounts ro /gnu /run/current-system /usr"))
|
||||
(("^add_sys_mounts /usr")
|
||||
"add_sys_mounts /gnu /run/current-system /usr"))
|
||||
(substitute* "src/client/opamInitDefaults.ml"
|
||||
(("\"bwrap\"") (string-append "\"" bwrap "\"")))
|
||||
;; Build dependencies
|
||||
(apply invoke "make" "lib-ext" make-flags)
|
||||
#t)))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
|
@ -368,7 +535,9 @@ for building OCaml library and programs.")
|
|||
(invoke "git" "config" "--global" "user.name" "Guix")
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("git" ,git) ;for the tests
|
||||
`(("dune" ,dune)
|
||||
("git" ,git) ;for the tests
|
||||
("ocaml-cppo" ,ocaml-cppo)
|
||||
("python" ,python) ;for the tests
|
||||
("camlp4" ,camlp4)))
|
||||
(inputs
|
||||
|
@ -376,6 +545,12 @@ for building OCaml library and programs.")
|
|||
("ncurses" ,ncurses)
|
||||
("curl" ,curl)
|
||||
("bubblewrap" ,bubblewrap)))
|
||||
(propagated-inputs
|
||||
`(("ocaml-cmdliner" ,ocaml-cmdliner)
|
||||
("ocaml-dose3" ,ocaml-dose3)
|
||||
("ocaml-mccs" ,ocaml-mccs)
|
||||
("ocaml-opam-file-format" ,ocaml-opam-file-format)
|
||||
("ocaml-re" ,ocaml-re)))
|
||||
(home-page "http://opam.ocamlpro.com/")
|
||||
(synopsis "Package manager for OCaml")
|
||||
(description
|
||||
|
@ -390,14 +565,15 @@ Git-friendly development workflow.")
|
|||
(package
|
||||
(name "camlp4")
|
||||
(version "4.02+6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ocaml/camlp4/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0icdfzhsbgf89925gc8gl3fm8z2xzszzlib0v9dj5wyzkyv3a342"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml/camlp4.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("ocaml" ,ocaml-4.02)
|
||||
("which" ,which)))
|
||||
|
@ -447,14 +623,15 @@ syntax of OCaml.")
|
|||
(inherit camlp4-4.02)
|
||||
(name "camlp4")
|
||||
(version "4.07+1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ocaml/camlp4/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"143hhxv1i6aq413z0i1pynrjcfl2g5gnh5r3863v6h9z0riqknzc"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml/camlp4.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0cxl4hkqcvspvkx4f2k83217rh6051fll9i2yz7cw6m3bq57mdvl"))))
|
||||
(properties
|
||||
`((ocaml4.02-variant . ,(delay camlp4-4.02))))
|
||||
(native-inputs
|
||||
|
@ -470,14 +647,15 @@ syntax of OCaml.")
|
|||
(package
|
||||
(name "camlp5")
|
||||
(version "7.07")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/camlp5/camlp5/archive/rel"
|
||||
(string-delete #\. version) ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"148r6p93xlxi6v7kbsqv8i70r6av04cyn0109pwss5xj6fw97i52"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/camlp5/camlp5.git")
|
||||
(commit (string-append "rel" (string-delete #\. version)))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("ocaml" ,ocaml)))
|
||||
|
@ -556,14 +734,15 @@ written in Objective Caml.")
|
|||
(package
|
||||
(name "ocaml-num")
|
||||
(version "1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ocaml/num/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xlkd0svc0mgq5s7nrm2rjrsvg15i9wxqkc1kvwjp6sv8vv8bb04"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml/num.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -600,20 +779,25 @@ the OCaml core distribution.")
|
|||
(package
|
||||
(name "emacs-tuareg")
|
||||
(version "2.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ocaml/tuareg/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ynpfc170f9jqx49biji9npfkvfpflbm29xf24wc7fnxxayr49ig"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml/tuareg.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("emacs" ,emacs-minimal)
|
||||
("opam" ,opam)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'make-git-checkout-writable
|
||||
(lambda _
|
||||
(for-each make-file-writable (find-files "."))
|
||||
#t))
|
||||
(delete 'configure)
|
||||
(add-before 'install 'fix-install-path
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
@ -1094,14 +1278,15 @@ GNU CC attributes. It provides also a C pretty printer as an example of use.")
|
|||
(package
|
||||
(name "ocaml-qcheck")
|
||||
(version "0.5.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/c-cube/qcheck/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zs1pg5cb1iry554v3cdmmiglsrwmsqa9x8zxmzb118fnk5d3ha6"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/c-cube/qcheck.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0vl2asr7md99pv558nbszxvjj36b4l6rj05hyczfy524vihhl0gf"))))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("ounit" ,ocaml-ounit)
|
||||
|
@ -1185,17 +1370,18 @@ full_split, cut, rcut, etc..")
|
|||
(package
|
||||
(name "ocaml-bisect")
|
||||
(version "1.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/gasche/bisect/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p67fppk5ifb63b00kxwrb1xg75hrqhknng3bsdyw3gxxqyjlpmx"))
|
||||
(patches
|
||||
(search-patches
|
||||
"ocaml-bisect-fix-camlp4-in-another-directory.patch"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/gasche/bisect.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0hm5za61qydda6ri3887b4zqqbqilh42x712xnclm1rr7ggga2nh"))
|
||||
(patches
|
||||
(search-patches
|
||||
"ocaml-bisect-fix-camlp4-in-another-directory.patch"))))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("camlp4" ,camlp4)
|
||||
|
@ -1613,32 +1799,28 @@ spans without being subject to operating system calendar time adjustments.")
|
|||
(define-public ocaml-cmdliner
|
||||
(package
|
||||
(name "ocaml-cmdliner")
|
||||
(version "1.0.2")
|
||||
(version "1.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://erratique.ch/software/cmdliner/releases/"
|
||||
"cmdliner-" version ".tbz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"))))
|
||||
"0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna"))))
|
||||
(build-system ocaml-build-system)
|
||||
(inputs
|
||||
`(("ocaml-result" ,ocaml-result)))
|
||||
(native-inputs
|
||||
`(("ocamlbuild" ,ocamlbuild)
|
||||
("opam" ,opam)))
|
||||
`(("ocamlbuild" ,ocamlbuild)))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:build-flags '("native=true" "native-dynlink=true")
|
||||
#:make-flags (list (string-append "LIBDIR=" (assoc-ref %outputs "out")
|
||||
"/lib/ocaml/site-lib/cmdliner"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'install
|
||||
;; The makefile says 'adjust on cli invocation'
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(invoke "make" "install" (string-append "PREFIX=" out))
|
||||
#t)))
|
||||
(delete 'configure))))
|
||||
(properties
|
||||
`((ocaml4.02-variant . ,(delay ocaml4.02-cmdliner))))
|
||||
(home-page "http://erratique.ch/software/cmdliner")
|
||||
(synopsis "Declarative definition of command line interfaces for OCaml")
|
||||
(description "Cmdliner is a module for the declarative definition of command
|
||||
|
@ -1650,7 +1832,17 @@ most of the POSIX and GNU conventions.")
|
|||
(license license:bsd-3)))
|
||||
|
||||
(define-public ocaml4.02-cmdliner
|
||||
(package-with-ocaml4.02 ocaml-cmdliner))
|
||||
(let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-cmdliner))))
|
||||
(package
|
||||
(inherit base)
|
||||
(version "1.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://erratique.ch/software/cmdliner/releases/"
|
||||
"cmdliner-" version ".tbz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1")))))))
|
||||
|
||||
(define-public ocaml-fmt
|
||||
(package
|
||||
|
@ -1764,18 +1956,19 @@ simple (yet expressive) query language to select the tests to run.")
|
|||
(name "ocaml-ppx-tools")
|
||||
(version "5.1+4.06.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/alainfrisch/ppx_tools/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256 (base32
|
||||
"0mncpy9v2mcjgnj7s2vqpp2b1ixv54djicfx66ic9wny9d202gj1"))))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/alainfrisch/ppx_tools.git")
|
||||
(commit version)))
|
||||
(sha256 (base32
|
||||
"1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases (delete 'configure))
|
||||
#:tests? #f))
|
||||
(properties
|
||||
`((ocaml4.02-variant . ,(delay ocaml4.02-ppx-tools))))
|
||||
`((ocaml4.02-variant . ,(delay ocaml4.02-ppx-tools))))
|
||||
(home-page "https://github.com/alainfrisch/ppx_tools")
|
||||
(synopsis "Tools for authors of ppx rewriters and other syntactic tools")
|
||||
(description "Tools for authors of ppx rewriters and other syntactic tools.")
|
||||
|
@ -1787,12 +1980,13 @@ simple (yet expressive) query language to select the tests to run.")
|
|||
(inherit base)
|
||||
(version "5.0+4.02.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/alainfrisch/ppx_tools/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256 (base32
|
||||
"0rjg4rngi8k9873z4zq95zn9hj8qyw1vcrf11y15aqasfpqq16rc")))))))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/alainfrisch/ppx_tools.git")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32 "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8")))))))
|
||||
|
||||
(define-public ocaml-react
|
||||
(package
|
||||
|
@ -2088,14 +2282,15 @@ representation of the data.")
|
|||
(package
|
||||
(name "ocaml-ulex")
|
||||
(version "1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/whitequark/ulex/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16gnbhqs6y2v89vw4igzvxdf2g8ybh5643636824aldcv8sscac0"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/whitequark/ulex.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "08yf2x9a52l2y4savjqfjd2xy4pjd1rpla2ylrr9qrz1drpfw4ic"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases (delete 'configure))
|
||||
|
@ -2761,13 +2956,14 @@ programs. It allows the definition of simple macros and file inclusion. Cpp oi
|
|||
(name "ocaml4.02-ppx-deriving")
|
||||
(version "4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/whitequark/ppx_deriving//archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256 (base32
|
||||
"1fr16g121j6zinwcprzlhx2py4271n9jzs2m9hq2f3qli2b1p0vl"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/whitequark/ppx_deriving.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9"))))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("js-build-tools" ,ocaml4.02-js-build-tools)
|
||||
|
@ -2782,13 +2978,17 @@ programs. It allows the definition of simple macros and file inclusion. Cpp oi
|
|||
#:findlib ,ocaml4.02-findlib
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'make-git-checkout-writable
|
||||
(lambda _
|
||||
(for-each make-file-writable (find-files "."))
|
||||
#t))
|
||||
(delete 'configure)
|
||||
(add-before 'install 'fix-environment
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; the installation procedures looks for the installed module
|
||||
(setenv "OCAMLPATH"
|
||||
(string-append (getenv "OCAMLPATH") ":"
|
||||
(getenv "OCAMLFIND_DESTDIR"))))))))
|
||||
(add-before 'install 'fix-environment
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; the installation procedures looks for the installed module
|
||||
(setenv "OCAMLPATH"
|
||||
(string-append (getenv "OCAMLPATH") ":"
|
||||
(getenv "OCAMLFIND_DESTDIR"))))))))
|
||||
(home-page "https://github.com/whitequark/ppx_deriving/")
|
||||
(synopsis "Type-driven code generation for OCaml >=4.02")
|
||||
(description "Ppx_deriving provides common infrastructure for generating
|
||||
|
@ -3316,14 +3516,15 @@ new record values.")
|
|||
(package
|
||||
(name "ocaml-seq")
|
||||
(version "0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/c-cube/seq/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/c-cube/seq.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
@ -3342,9 +3543,9 @@ new record values.")
|
|||
version=\"[distributed with ocaml]\"
|
||||
description=\"dummy package for compatibility\"
|
||||
requires=\"\"")))
|
||||
#t))))))
|
||||
#t))))))
|
||||
(properties
|
||||
`((ocaml4.02-variant . ,(delay ocaml4.02-seq))))
|
||||
`((ocaml4.02-variant . ,(delay ocaml4.02-seq))))
|
||||
(home-page "https://github.com/c-cube/seq")
|
||||
(synopsis "OCaml's standard iterator type")
|
||||
(description "This package is a compatibility package for OCaml's
|
||||
|
@ -3365,14 +3566,15 @@ standard iterator type starting from 4.07.")
|
|||
(package
|
||||
(name "ocaml-re")
|
||||
(version "1.8.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ocaml/ocaml-re//archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pdb0mr6z5ax6szblr3f5lbdnqq9grm97cmsfjmdma60yrx2rqhd"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml/ocaml-re.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i"))))
|
||||
(build-system dune-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
@ -3751,14 +3953,15 @@ writing to these structures, and they are accessed via the Bigarray module.")
|
|||
(package
|
||||
(name "ocaml4.02-ezjsonm")
|
||||
(version "0.4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mirage/ezjsonm/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kag0z2xlk4rw73a240dmkxh9rj6psxxcxkm7d7z0rrj6hzjajgq"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mirage/ezjsonm.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls"))))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
`(("alcotest" ,ocaml4.02-alcotest)))
|
||||
|
@ -3783,14 +3986,15 @@ JSON.")
|
|||
(package
|
||||
(name "ocaml4.02-uri")
|
||||
(version "1.9.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mirage/ocaml-uri/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02bzrag79prx261rxf9mlak749pwf4flpfl8p012x1xznv9m0clc"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mirage/ocaml-uri.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:ocaml ,ocaml-4.02
|
||||
|
@ -3838,14 +4042,15 @@ Format module of the OCaml standard library.")
|
|||
(package
|
||||
(name "optcomp")
|
||||
(version "1.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/diml/optcomp/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/diml/optcomp.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0bm4f3fs9g1yiz48hdxvcjwnrgymwisqilxhmm87ndz81wp47zfy"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:ocaml ,ocaml-4.02
|
||||
|
@ -3867,14 +4072,15 @@ cpp-like directives.")
|
|||
(package
|
||||
(name "ocaml-piqilib")
|
||||
(version "0.6.14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/alavrik/piqi/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/alavrik/piqi.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0lyqllmfsxmwlg7qidy92kvxi9n39lvachmydcyi81f8p07ykd2d"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -4135,15 +4341,15 @@ library is currently designed for Unicode Standard 3.2.")
|
|||
(package
|
||||
(name "ocaml-jbuilder")
|
||||
(version "1.0+beta16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/janestreet/jbuilder/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cy07pwvbrlysszs938yd74yyvvbgkffpb82qrjph77zf0h2gdi7"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/janestreet/jbuilder.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1y3fgf570w3vrnhianrg26jy5j749zczq3f78s2dy5ylbp1hrx71"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:ocaml ,ocaml-4.02
|
||||
|
@ -4171,14 +4377,15 @@ is provide a description of your project and Jbuilder will do the rest.")
|
|||
(package
|
||||
(name "ocaml-zed")
|
||||
(version "1.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/diml/zed/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19m5vrj60vg1b63qfsv0aabdlzgn40cqmx65s3wafqi4fs9xp6jn"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/diml/zed.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -4212,12 +4419,13 @@ connect an engine to your inputs and rendering functions to get an editor.")
|
|||
(version "1.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/diml/lambda-term/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/diml/lambda-term.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l"))))
|
||||
(base32 "0wwib20b2ir3h2g9zwhzn04cv160psb805skp8v23wqgyn5cnbh8"))))
|
||||
(build-system dune-build-system)
|
||||
(arguments
|
||||
`(#:build-flags (list "--profile" "release")
|
||||
|
@ -4243,14 +4451,15 @@ instead of bindings to a C library.")
|
|||
(package
|
||||
(name "ocaml-utop")
|
||||
(version "2.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ocaml-community/utop/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1414snwmqaxs1x8wbpjf6fn3jsl01hq0phrr7639xmb5vh15mgd4"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ocaml-community/utop.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "02hjkc0rdzfq3bqy9mqm5wmw312r3187v9cl66ynb6hxkj6s3glb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
|
@ -4824,6 +5033,26 @@ Atom.")
|
|||
the OCaml language.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public ocaml-gsl-1
|
||||
(package
|
||||
(inherit ocaml-gsl)
|
||||
(version "1.19.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mmottl/gsl-ocaml"
|
||||
"/releases/download/v"
|
||||
version "/gsl-ocaml-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh"))))
|
||||
(build-system ocaml-build-system)
|
||||
(inputs
|
||||
`(("gsl" ,gsl)))
|
||||
(native-inputs
|
||||
`(("ocamlbuild" ,ocamlbuild)))
|
||||
(arguments '())
|
||||
(propagated-inputs '())))
|
||||
|
||||
(define-public cubicle
|
||||
(package
|
||||
(name "cubicle")
|
||||
|
|
|
@ -136,7 +136,7 @@ and they are executed on lists of files, hosts, users or other items.")
|
|||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "--enable-pam"
|
||||
(list "--enable-pam" "--sysconfdir=/etc/slurm"
|
||||
(string-append "--with-freeipmi=" (assoc-ref %build-inputs "freeipmi"))
|
||||
(string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc"))
|
||||
(string-append "--with-json=" (assoc-ref %build-inputs "json-c"))
|
||||
|
|
|
@ -103,17 +103,35 @@ See <https://github.com/moby/moby/pull/38930>.
|
|||
|
||||
--- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go.orig 2019-03-19 11:23:20.738316699 +0100
|
||||
+++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go 2019-03-19 11:27:57.149753073 +0100
|
||||
@@ -100,12 +100,7 @@
|
||||
@@ -76,12 +76,8 @@ func NlHandle() *netlink.Handle {
|
||||
func getSupportedNlFamilies() []int {
|
||||
fams := []int{syscall.NETLINK_ROUTE}
|
||||
// NETLINK_XFRM test
|
||||
- if err := loadXfrmModules(); err != nil {
|
||||
- if checkXfrmSocket() != nil {
|
||||
- logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err)
|
||||
- } else {
|
||||
- fams = append(fams, syscall.NETLINK_XFRM)
|
||||
- }
|
||||
+ if err := checkXfrmSocket(); err != nil {
|
||||
+ logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err)
|
||||
} else {
|
||||
fams = append(fams, syscall.NETLINK_XFRM)
|
||||
}
|
||||
@@ -99,16 +95,6 @@ func getSupportedNlFamilies() []int {
|
||||
return fams
|
||||
}
|
||||
|
||||
func loadXfrmModules() error {
|
||||
-func loadXfrmModules() error {
|
||||
- if out, err := exec.Command("modprobe", "-va", "xfrm_user").CombinedOutput(); err != nil {
|
||||
- return fmt.Errorf("Running modprobe xfrm_user failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
|
||||
- }
|
||||
- if out, err := exec.Command("modprobe", "-va", "xfrm_algo").CombinedOutput(); err != nil {
|
||||
- return fmt.Errorf("Running modprobe xfrm_algo failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
|
||||
- }
|
||||
+ // Those are automatically loaded when someone opens the socket anyway.
|
||||
return nil
|
||||
}
|
||||
|
||||
- return nil
|
||||
-}
|
||||
-
|
||||
// API check on required xfrm modules (xfrm_user, xfrm_algo)
|
||||
func checkXfrmSocket() error {
|
||||
fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, syscall.NETLINK_XFRM)
|
||||
|
|
|
@ -0,0 +1,61 @@
|
|||
From 6c52e1b902b869c25e2fe39cff6364143a04da61 Mon Sep 17 00:00:00 2001
|
||||
From: Niklas Larsson <niklas@mm.st>
|
||||
Date: Tue, 11 Dec 2018 19:56:22 +0100
|
||||
Subject: [PATCH] Only check for Node when required
|
||||
|
||||
---
|
||||
test/TestRun.hs | 34 ++++++++++++++++++++--------------
|
||||
1 file changed, 20 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/test/TestRun.hs b/test/TestRun.hs
|
||||
index c7db9fdcd..4809911f3 100644
|
||||
--- a/test/TestRun.hs
|
||||
+++ b/test/TestRun.hs
|
||||
@@ -11,6 +11,7 @@ import Data.Proxy
|
||||
import Data.Typeable
|
||||
import Options.Applicative
|
||||
import System.Directory
|
||||
+import System.Environment
|
||||
import System.Exit
|
||||
import System.FilePath ((</>))
|
||||
import System.Info
|
||||
@@ -103,20 +104,25 @@ runTest path flags = do
|
||||
normalise (x : xs) = x : normalise xs
|
||||
normalise [] = []
|
||||
|
||||
+checkNode :: IO ()
|
||||
+checkNode = do
|
||||
+ nodePath <- findExecutable "node"
|
||||
+ nodejsPath <- findExecutable "nodejs"
|
||||
+ let node = nodePath <|> nodejsPath
|
||||
+ case node of
|
||||
+ Nothing -> do
|
||||
+ putStrLn "For running the test suite against Node, node must be installed."
|
||||
+ exitFailure
|
||||
+ Just _ -> return ()
|
||||
+
|
||||
main :: IO ()
|
||||
main = do
|
||||
- nodePath <- findExecutable "node"
|
||||
- nodejsPath <- findExecutable "nodejs"
|
||||
- let node = nodePath <|> nodejsPath
|
||||
- case node of
|
||||
- Nothing -> do
|
||||
- putStrLn "For running the test suite against Node, node must be installed."
|
||||
- exitFailure
|
||||
- Just _ -> do
|
||||
- defaultMainWithIngredients ingredients $
|
||||
+ args <- getArgs
|
||||
+ when ("--node" `elem` args) checkNode
|
||||
+ defaultMainWithIngredients ingredients $
|
||||
askOption $ \(NodeOpt node) ->
|
||||
- let (codegen, flags) = if node then (JS, ["--codegen", "node"])
|
||||
- else (C , [])
|
||||
- in
|
||||
- mkGoldenTests (testFamiliesForCodegen codegen)
|
||||
- (flags ++ idrisFlags)
|
||||
+ let (codegen, flags) = if node then (JS, ["--codegen", "node"])
|
||||
+ else (C , [])
|
||||
+ in
|
||||
+ mkGoldenTests (testFamiliesForCodegen codegen) (flags ++ idrisFlags)
|
||||
+
|
|
@ -1,34 +0,0 @@
|
|||
From: Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
Date: Wed, 20 Mar 2019 00:08:00 +0100
|
||||
Subject: [PATCH] gnu: knot: Include system <lmdb.h>.
|
||||
|
||||
Copied verbatim from Knot master[0].
|
||||
|
||||
[0]: https://gitlab.labs.nic.cz/knot/knot-dns/commit/b557430cffbb1c6b30617a394b02acc514e7e536
|
||||
|
||||
From b557430cffbb1c6b30617a394b02acc514e7e536 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Salzman <daniel.salzman@nic.cz>
|
||||
Date: Wed, 6 Mar 2019 17:35:44 +0100
|
||||
Subject: [PATCH] journal: include proper header <lmdb.h>
|
||||
|
||||
fixes #638
|
||||
---
|
||||
src/knot/journal/knot_lmdb.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/knot/journal/knot_lmdb.h b/src/knot/journal/knot_lmdb.h
|
||||
index 35a88845c..b1d09cbb4 100644
|
||||
--- a/src/knot/journal/knot_lmdb.h
|
||||
+++ b/src/knot/journal/knot_lmdb.h
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
-#include "contrib/lmdb/lmdb.h"
|
||||
+#include <lmdb.h>
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
--
|
||||
2.18.1
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
Kodi doesn't set the CAPATH and CAINFO parameters for libcurl. To make HTTPS
|
||||
connections work we can set them based on SSL_CERT_DIR and SSL_CERT_FILE.
|
||||
|
||||
--- a/xbmc/filesystem/CurlFile.cpp
|
||||
+++ b/xbmc/filesystem/CurlFile.cpp
|
||||
@@ -626,5 +626,9 @@
|
||||
// Setup allowed TLS/SSL ciphers. New versions of cURL may deprecate things that are still in use.
|
||||
if (!m_cipherlist.empty())
|
||||
g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str());
|
||||
+
|
||||
+ // Load certificate data from environment paths
|
||||
+ g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAPATH, getenv("SSL_CERT_DIR"));
|
||||
+ g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAINFO, getenv("SSL_CERT_FILE"));
|
||||
}
|
||||
|
||||
void CCurlFile::SetRequestHeaders(CReadState* state)
|
|
@ -0,0 +1,25 @@
|
|||
From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
|
||||
Date: Tue, 6 Feb 2018 10:15:45 +0100
|
||||
Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in
|
||||
|
||||
---
|
||||
META.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/META.in b/META.in
|
||||
index aa2cd8d..0f9d337 100644
|
||||
--- a/META.in
|
||||
+++ b/META.in
|
||||
@@ -8,7 +8,7 @@ package "common" (
|
||||
version = "@PACKAGE_VERSION@"
|
||||
archive(byte) = "common.cma"
|
||||
archive(native) = "common.cmxa"
|
||||
-requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
|
||||
+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
|
||||
)
|
||||
|
||||
package "algo" (
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
|
||||
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
|
||||
Date: Sat, 2 Dec 2017 12:51:01 +0100
|
||||
Subject: [PATCH] Fix for ocaml 4.06
|
||||
|
||||
---
|
||||
common/criteria_lexer.mll | 8 ++++----
|
||||
common/util.ml | 2 +-
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
|
||||
index 71f9178..fc4eae3 100644
|
||||
--- a/common/criteria_lexer.mll
|
||||
+++ b/common/criteria_lexer.mll
|
||||
@@ -18,7 +18,7 @@
|
||||
let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
|
||||
(* find the terminating delimiter *)
|
||||
let endpos =
|
||||
- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
|
||||
+ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
|
||||
|Invalid_argument _ ->
|
||||
raise (Format822.Syntax_error (
|
||||
Format822.error lexbuf "String too short"))
|
||||
@@ -27,9 +27,9 @@
|
||||
Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
|
||||
in
|
||||
let len = endpos - (lexbuf.lex_start_pos + 3) in
|
||||
- let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
|
||||
- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
|
||||
- s
|
||||
+ let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
|
||||
+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
|
||||
+ Bytes.to_string s
|
||||
|
||||
}
|
||||
|
||||
diff --git a/common/util.ml b/common/util.ml
|
||||
index 598f266..36ca3d1 100644
|
||||
--- a/common/util.ml
|
||||
+++ b/common/util.ml
|
||||
@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
|
||||
let clean label =
|
||||
try
|
||||
let s = Filename.chop_extension (Filename.basename label) in
|
||||
- String.capitalize s
|
||||
+ String.capitalize_ascii s
|
||||
with Invalid_argument _ -> label
|
||||
|
||||
let create ?(enabled=false) label =
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,133 @@
|
|||
From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
|
||||
Date: Thu, 2 Mar 2017 12:19:56 +0100
|
||||
Subject: [PATCH] Install mli, cmx, etc.
|
||||
|
||||
---
|
||||
Makefile | 26 +++++++++++++-------------
|
||||
1 file changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 09464ff..5044d7f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
|
||||
@for i in _build/cudf/cudf.*; do \
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.%
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.%
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.%
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.%
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ; \
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \
|
||||
+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
|
||||
if [ -e $$i ]; then \
|
||||
cp $$i $(DOSELIBS) ;\
|
||||
rm $$i ;\
|
||||
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\
|
||||
+ rm -f $(DOSELIBS)/*.mlpack ;\
|
||||
fi ; \
|
||||
done
|
||||
|
||||
@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META
|
||||
INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi)
|
||||
INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs)
|
||||
INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a)
|
||||
-#INSTALL_STUFF_ += $(wildcard _build/*/*.mli)
|
||||
+INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
|
||||
INSTALL_STUFF_ += $(wildcard _build/rpm/*.so)
|
||||
|
||||
exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*)
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
||||
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
||||
fi
|
||||
-
|
||||
-
|
||||
-make printconf
|
|
@ -1,45 +0,0 @@
|
|||
From: Jean Delvare <jdelvare@suse.de>
|
||||
Subject: compat/getopt: Allow non-digit parameter embedded in short option
|
||||
|
||||
The compatibility getopt script allows only digit parameters to be
|
||||
embedded in short options. Util-linux's getopt implementation does
|
||||
not have such a restriction and allows any parameter to be embedded
|
||||
in short options. As a consequence, using the compatibility getopt
|
||||
script would choke for example on "-pab", which is a legal option
|
||||
of the "quilt refresh" command.
|
||||
|
||||
Remove the limitation on digits so that the compatibility getopt
|
||||
script allows what util-linux allows. This fixes the second half
|
||||
of bug #54772:
|
||||
https://savannah.nongnu.org/bugs/index.php?54772
|
||||
|
||||
As a side note, this feature of the compatibility script was broken
|
||||
anyway, as it would output the digits in reverse order.
|
||||
|
||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||
---
|
||||
compat/getopt.in | 13 ++++---------
|
||||
1 file changed, 4 insertions(+), 9 deletions(-)
|
||||
|
||||
--- quilt.orig/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200
|
||||
+++ quilt/compat/getopt.in 2018-10-03 16:12:17.624841732 +0200
|
||||
@@ -108,15 +108,10 @@ foreach my $word (@words) {
|
||||
if (scalar(@letters) == 0) {
|
||||
$need_param = $letter;
|
||||
} else {
|
||||
- # short options can have numerical args
|
||||
- # embedded in the short option list: -UO
|
||||
- die "unexpected character after option $letter"
|
||||
- if ($letters[$#letters] !~ /[0-9]/);
|
||||
- my @digits;
|
||||
- while (scalar(@letters) && ($letters[$#letters] =~ /[0-9]/)) {
|
||||
- push @digits, pop @letters;
|
||||
- }
|
||||
- push @options, quote_word(join('', reverse @digits));
|
||||
+ # short options can have args
|
||||
+ # embedded in the short option list
|
||||
+ push @options, quote_word(join('', reverse @letters));
|
||||
+ @letters = ();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,58 +0,0 @@
|
|||
From: Jean Delvare <jdelvare@suse.de>
|
||||
Subject: compat/getopt: Handle a second separator
|
||||
|
||||
getopt can be passed 2 '--' separators. The first one tells that
|
||||
getopt options are over and target program options start. The second
|
||||
one tells that the target program's options are over and following
|
||||
arguments should be treated as non-options even if they look like
|
||||
options.
|
||||
|
||||
This second separator was not handled, causing the compatibility
|
||||
getopt script to treat the following arguments as options, eventually
|
||||
failing one way or another.
|
||||
|
||||
Properly detect and handle the second separator. This fixes the first
|
||||
half of bug #54772:
|
||||
https://savannah.nongnu.org/bugs/index.php?54772
|
||||
|
||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||
---
|
||||
compat/getopt.in | 13 ++++++++++---
|
||||
1 file changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
--- quilt.orig/compat/getopt.in 2018-10-03 15:23:21.147620172 +0200
|
||||
+++ quilt/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
use strict;
|
||||
|
||||
-my $opts;
|
||||
+my $opts = '';
|
||||
my @words;
|
||||
my $found_sep = 0;
|
||||
|
||||
foreach my $arg (@ARGV) {
|
||||
- if ($arg eq '--') {
|
||||
+ if (!$found_sep && $arg eq '--') {
|
||||
$found_sep = 1;
|
||||
}
|
||||
else {
|
||||
@@ -62,10 +62,17 @@ sub quote_word
|
||||
return "'$word'";
|
||||
}
|
||||
|
||||
+# there can be a second separator, to inhibit processing following arguments
|
||||
+# as options
|
||||
+$found_sep = 0;
|
||||
foreach my $word (@words) {
|
||||
+ if ($word eq '--') {
|
||||
+ $found_sep = 1;
|
||||
+ next;
|
||||
+ }
|
||||
|
||||
# allow '-' to be an option value
|
||||
- if (!$need_param && $word !~ /^-./) {
|
||||
+ if ($found_sep || (!$need_param && $word !~ /^-./)) {
|
||||
push @barewords, quote_word($word);
|
||||
next;
|
||||
}
|
|
@ -1,41 +0,0 @@
|
|||
From 5193b137b5a9034ce79946edd40760df2f63a82a Mon Sep 17 00:00:00 2001
|
||||
From: Jean Delvare <jdelvare@suse.de>
|
||||
Date: Tue, 25 Apr 2017 15:17:53 +0200
|
||||
Subject: test: Escape curly braces in regex
|
||||
|
||||
Curly braces in perl regex are supposed to be escaped, recent
|
||||
versions of perl complain when they aren't:
|
||||
|
||||
Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE (\w+)}/ at ./run line 114.
|
||||
Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE \?}/ at ./run line 290.
|
||||
|
||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||
---
|
||||
test/run | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/run b/test/run
|
||||
index 942014e..03afc7a 100755
|
||||
--- a/test/run
|
||||
+++ b/test/run
|
||||
@@ -112,7 +112,7 @@ sub flush_output()
|
||||
sub substitute_vars($)
|
||||
{
|
||||
my ($line) = @_;
|
||||
- $line =~ s[%{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg;
|
||||
+ $line =~ s[%\{(\w+)\}][defined $ENV{$1} ? $ENV{$1} : ""]eg;
|
||||
return $line;
|
||||
}
|
||||
|
||||
@@ -288,7 +288,7 @@ while (defined(my $line = <SOURCE>)) {
|
||||
# Parse the next command
|
||||
if ($line =~ s/^\s*\$ ?//) {
|
||||
# Substitute %{?} with the last command's status
|
||||
- $line =~ s[%{\?}][$last_status]eg;
|
||||
+ $line =~ s[%\{\?\}][$last_status]eg;
|
||||
|
||||
chomp($prog = substitute_vars($line));
|
||||
$prog_line = $lineno;
|
||||
--
|
||||
cgit v1.0-41-gc330
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
Downloaded from
|
||||
https://github.com/synfig/synfig/commit/b9c3b73ee35b83c4d9183c800809040cef98b2f2.patch
|
||||
|
||||
Without this patch the UI of Synfig Studio (when built with the latest version
|
||||
of GTK) displays very large buttons in the header of every frame.
|
||||
|
||||
This patch can be removed with the next release.
|
||||
|
||||
|
||||
From b9c3b73ee35b83c4d9183c800809040cef98b2f2 Mon Sep 17 00:00:00 2001
|
||||
From: caryoscelus <caryoscelus@gmx.com>
|
||||
Date: Wed, 25 Jan 2017 18:34:39 +0300
|
||||
Subject: [PATCH] Fix dock drop area size
|
||||
|
||||
Fixes #227
|
||||
|
||||
By using Frame instead of Button we avoid intrusive Gtk themes
|
||||
from forcing huge drop area size.
|
||||
---
|
||||
synfig-studio/src/gui/docks/dockdroparea.cpp | 15 ++++++++++-----
|
||||
1 file changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gui/docks/dockdroparea.cpp b/synfig-studio/src/gui/docks/dockdroparea.cpp
|
||||
index 0f8936fdb..e012282f0 100644
|
||||
--- a/src/gui/docks/dockdroparea.cpp
|
||||
+++ b/src/gui/docks/dockdroparea.cpp
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "app.h"
|
||||
#include "docks/dockdroparea.h"
|
||||
#include "docks/dockmanager.h"
|
||||
-#include <gtkmm/button.h>
|
||||
+#include <gtkmm/frame.h>
|
||||
|
||||
#endif
|
||||
|
||||
@@ -61,10 +61,15 @@ DockDropArea::DockDropArea(Gtk::Widget *target):
|
||||
std::vector<Gtk::TargetEntry> listTargets;
|
||||
listTargets.push_back( Gtk::TargetEntry("SYNFIG_DOCK") );
|
||||
|
||||
- Gtk::Button *button_left = manage(new Gtk::Button());
|
||||
- Gtk::Button *button_right = manage(new Gtk::Button());
|
||||
- Gtk::Button *button_top = manage(new Gtk::Button());
|
||||
- Gtk::Button *button_bottom = manage(new Gtk::Button());
|
||||
+ Gtk::Frame *button_left = manage(new Gtk::Frame());
|
||||
+ Gtk::Frame *button_right = manage(new Gtk::Frame());
|
||||
+ Gtk::Frame *button_top = manage(new Gtk::Frame());
|
||||
+ Gtk::Frame *button_bottom = manage(new Gtk::Frame());
|
||||
+
|
||||
+ button_left->set_size_request(20, 10);
|
||||
+ button_right->set_size_request(20, 10);
|
||||
+ button_top->set_size_request(20, 10);
|
||||
+ button_bottom->set_size_request(20, 10);
|
||||
|
||||
button_left->drag_dest_set(listTargets);
|
||||
button_right->drag_dest_set(listTargets);
|
|
@ -0,0 +1,202 @@
|
|||
Fix build on i686.
|
||||
|
||||
This patch is taken from upstream, with ChangeLog entries omitted.
|
||||
|
||||
From 5048338c5f21605441c6833907d1136ac9640b35 Mon Sep 17 00:00:00 2001
|
||||
From: "mcatanzaro@igalia.com"
|
||||
<mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
|
||||
Date: Wed, 10 Apr 2019 18:27:25 +0000
|
||||
Subject: [PATCH] Unreviewed, rolling out r243989.
|
||||
|
||||
Broke i686 builds
|
||||
|
||||
Reverted changeset:
|
||||
|
||||
"[CMake] Detect SSE2 at compile time"
|
||||
https://bugs.webkit.org/show_bug.cgi?id=196488
|
||||
https://trac.webkit.org/changeset/243989
|
||||
|
||||
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
|
||||
---
|
||||
CMakeLists.txt | 10 ---
|
||||
ChangeLog | 12 ++++
|
||||
Source/JavaScriptCore/ChangeLog | 12 ++++
|
||||
.../assembler/MacroAssemblerX86Common.cpp | 7 ++
|
||||
.../assembler/MacroAssemblerX86Common.h | 30 +++++++++
|
||||
Source/cmake/FindSSE2.cmake | 65 -------------------
|
||||
6 files changed, 61 insertions(+), 75 deletions(-)
|
||||
delete mode 100644 Source/cmake/FindSSE2.cmake
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index acd77f4b623..d3e8a23f9ff 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -114,16 +114,6 @@ else ()
|
||||
set(WTF_CPU_UNKNOWN 1)
|
||||
endif ()
|
||||
|
||||
-#---------------------------
|
||||
-# Make sure SSE2 is present.
|
||||
-#---------------------------
|
||||
-if (WTF_CPU_X86)
|
||||
- include(FindSSE2)
|
||||
- if (NOT SSE2_SUPPORT_FOUND)
|
||||
- message(FATAL_ERROR "SSE2 support is required to compile WebKit")
|
||||
- endif ()
|
||||
-endif ()
|
||||
-
|
||||
# -----------------------------------------------------------------------------
|
||||
# Determine the operating system
|
||||
# -----------------------------------------------------------------------------
|
||||
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp
|
||||
index 8c752c0d030..31753589df7 100644
|
||||
--- a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp
|
||||
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp
|
||||
@@ -168,6 +168,11 @@ static_assert(PROBE_OFFSETOF_REG(cpu.fprs, X86Registers::xmm15) == PROBE_CPU_XMM
|
||||
static_assert(sizeof(Probe::State) == PROBE_SIZE, "Probe::State::size's matches ctiMasmProbeTrampoline");
|
||||
static_assert((PROBE_EXECUTOR_OFFSET + PTR_SIZE) <= (PROBE_SIZE + OUT_SIZE), "Must have room after ProbeContext to stash the probe handler");
|
||||
|
||||
+#if CPU(X86)
|
||||
+// SSE2 is a hard requirement on x86.
|
||||
+static_assert(isSSE2Present(), "SSE2 support is required in JavaScriptCore");
|
||||
+#endif
|
||||
+
|
||||
#undef PROBE_OFFSETOF
|
||||
|
||||
#if CPU(X86)
|
||||
@@ -787,6 +792,7 @@ void MacroAssemblerX86Common::collectCPUFeatures()
|
||||
std::call_once(onceKey, [] {
|
||||
{
|
||||
CPUID cpuid = getCPUID(0x1);
|
||||
+ s_sse2CheckState = (cpuid[3] & (1 << 26)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
|
||||
s_sse4_1CheckState = (cpuid[2] & (1 << 19)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
|
||||
s_sse4_2CheckState = (cpuid[2] & (1 << 20)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
|
||||
s_popcntCheckState = (cpuid[2] & (1 << 23)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
|
||||
@@ -803,6 +809,7 @@ void MacroAssemblerX86Common::collectCPUFeatures()
|
||||
});
|
||||
}
|
||||
|
||||
+MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse2CheckState = CPUIDCheckState::NotChecked;
|
||||
MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_1CheckState = CPUIDCheckState::NotChecked;
|
||||
MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_2CheckState = CPUIDCheckState::NotChecked;
|
||||
MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_avxCheckState = CPUIDCheckState::NotChecked;
|
||||
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
|
||||
index ff097290ef3..097bcb0bb86 100644
|
||||
--- a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
|
||||
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
|
||||
@@ -4197,11 +4197,41 @@ private:
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if CPU(X86)
|
||||
+#if OS(MAC_OS_X)
|
||||
+
|
||||
+ // All X86 Macs are guaranteed to support at least SSE2,
|
||||
+ static bool isSSE2Present()
|
||||
+ {
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+#else // OS(MAC_OS_X)
|
||||
+ static bool isSSE2Present()
|
||||
+ {
|
||||
+ if (s_sse2CheckState == CPUIDCheckState::NotChecked)
|
||||
+ collectCPUFeatures();
|
||||
+ return s_sse2CheckState == CPUIDCheckState::Set;
|
||||
+ }
|
||||
+
|
||||
+#endif // OS(MAC_OS_X)
|
||||
+#elif !defined(NDEBUG) // CPU(X86)
|
||||
+
|
||||
+ // On x86-64 we should never be checking for SSE2 in a non-debug build,
|
||||
+ // but non debug add this method to keep the asserts above happy.
|
||||
+ static bool isSSE2Present()
|
||||
+ {
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
using CPUID = std::array<unsigned, 4>;
|
||||
static CPUID getCPUID(unsigned level);
|
||||
static CPUID getCPUIDEx(unsigned level, unsigned count);
|
||||
JS_EXPORT_PRIVATE static void collectCPUFeatures();
|
||||
|
||||
+ JS_EXPORT_PRIVATE static CPUIDCheckState s_sse2CheckState;
|
||||
JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_1CheckState;
|
||||
JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_2CheckState;
|
||||
JS_EXPORT_PRIVATE static CPUIDCheckState s_avxCheckState;
|
||||
diff --git a/Source/cmake/FindSSE2.cmake b/Source/cmake/FindSSE2.cmake
|
||||
deleted file mode 100644
|
||||
index 7a947feadd4..00000000000
|
||||
--- a/Source/cmake/FindSSE2.cmake
|
||||
+++ /dev/null
|
||||
@@ -1,65 +0,0 @@
|
||||
-#################################
|
||||
-# Check for the presence of SSE2.
|
||||
-#
|
||||
-# Once done, this will define:
|
||||
-# - SSE2_SUPPORT_FOUND - the system supports (at least) SSE2.
|
||||
-#
|
||||
-# Copyright (c) 2014, Pablo Fernandez Alcantarilla, Jesus Nuevo
|
||||
-# Copyright (c) 2019, Igalia S.L.
|
||||
-#
|
||||
-# Redistribution and use in source and binary forms, with or without modification,
|
||||
-# are permitted provided that the following conditions are met:
|
||||
-#
|
||||
-# * Redistributions of source code must retain the above copyright notice,
|
||||
-# this list of conditions and the following disclaimer.
|
||||
-#
|
||||
-# * Redistributions in binary form must reproduce the above copyright notice,
|
||||
-# this list of conditions and the following disclaimer in the documentation
|
||||
-# and/or other materials provided with the distribution.
|
||||
-#
|
||||
-# * Neither the name of the copyright holders nor the names of its contributors
|
||||
-# may be used to endorse or promote products derived from this software without
|
||||
-# specific prior written permission.
|
||||
-#
|
||||
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
||||
-# SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
|
||||
-# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
|
||||
-# WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-
|
||||
-set(SSE2_SUPPORT_FOUND FALSE)
|
||||
-
|
||||
-macro(CHECK_FOR_SSE2)
|
||||
- include(CheckCXXSourceRuns)
|
||||
-
|
||||
- check_cxx_source_runs("
|
||||
- #include <emmintrin.h>
|
||||
- int main ()
|
||||
- {
|
||||
- __m128d a, b;
|
||||
- double vals[2] = {0};
|
||||
- a = _mm_loadu_pd (vals);
|
||||
- b = _mm_add_pd (a,a);
|
||||
- _mm_storeu_pd (vals,b);
|
||||
- return(0);
|
||||
- }"
|
||||
- HAVE_SSE2_EXTENSIONS)
|
||||
-
|
||||
- if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
|
||||
- if (HAVE_SSE2_EXTENSIONS)
|
||||
- set(SSE2_SUPPORT_FOUND TRUE)
|
||||
- endif ()
|
||||
- elseif (MSVC AND NOT CMAKE_CL_64)
|
||||
- if (HAVE_SSE2_EXTENSIONS)
|
||||
- set(SSE2_SUPPORT_FOUND TRUE)
|
||||
- message(STATUS "Found SSE2 extensions.")
|
||||
- endif (HAVE_SSE2_EXTENSIONS)
|
||||
- endif ()
|
||||
-
|
||||
-endmacro(CHECK_FOR_SSE2)
|
||||
-
|
||||
-CHECK_FOR_SSE2()
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -98,18 +98,14 @@ listing the files modified by a patch.")
|
|||
(define-public quilt
|
||||
(package
|
||||
(name "quilt")
|
||||
(version "0.65")
|
||||
(version "0.66")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/quilt/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn"))
|
||||
(patches (search-patches "quilt-test-fix-regex.patch"
|
||||
"quilt-getopt-second-separator.patch"
|
||||
"quilt-getopt-nondigit-param.patch"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/quilt/"
|
||||
"quilt-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("gettext" ,gnu-gettext)))
|
||||
|
@ -248,7 +244,7 @@ GiB).")
|
|||
(define-public meld
|
||||
(package
|
||||
(name "meld")
|
||||
(version "3.20.0")
|
||||
(version "3.20.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -256,8 +252,7 @@ GiB).")
|
|||
(version-major+minor version)
|
||||
"/meld-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11khi1sg02k3b9qdag3r939cwi27cql4kjim7jhxf9ckfhpzwh6b"))))
|
||||
(base32 "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
|
|
|
@ -142,6 +142,30 @@ framework base class. It concentrates on offering reusable data driven
|
|||
patterns, so that you can write tests with a minimum of code.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-test-checkdeps
|
||||
(package
|
||||
(name "perl-test-checkdeps")
|
||||
(version "0.010")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vjinlixxdx6gfcw8y1dw2rla8bfhi8nmgcqr3nffc7kqskcrz36"))))
|
||||
(build-system perl-build-system)
|
||||
(propagated-inputs
|
||||
`(("perl-cpan-meta-check" ,perl-cpan-meta-check)))
|
||||
(home-page "https://metacpan.org/release/Test-CheckDeps")
|
||||
(synopsis "Check for presence of dependencies")
|
||||
(description
|
||||
"This module provides a test that checks all dependencies have been
|
||||
installed properly.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-test-class
|
||||
(package
|
||||
(name "perl-test-class")
|
||||
|
@ -361,6 +385,30 @@ functions.")
|
|||
;; license, any version, ..."
|
||||
(license gpl3+)))
|
||||
|
||||
(define-public perl-test-dir
|
||||
(package
|
||||
(name "perl-test-dir")
|
||||
(version "1.16")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/M/MT/MTHURN/"
|
||||
"Test-Dir-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hpafgr93jjl6s8spskhdxhgich4cccmaiq99mla5diyj4iv6ckk"))))
|
||||
(build-system perl-build-system)
|
||||
(propagated-inputs
|
||||
`(("perl-pod-coverage" ,perl-pod-coverage)
|
||||
("perl-test-pod" ,perl-test-pod)
|
||||
("perl-test-pod-coverage" ,perl-test-pod-coverage)))
|
||||
(home-page "https://metacpan.org/release/Test-Dir")
|
||||
(synopsis "Utilities for testing directory attributes")
|
||||
(description
|
||||
"This modules provides a collection of test utilities for directory
|
||||
attributes.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-test-directory
|
||||
(package
|
||||
(name "perl-test-directory")
|
||||
|
@ -500,6 +548,58 @@ Test::Exception. It does much less, but should allow greater flexibility in
|
|||
testing exception-throwing code with about the same amount of typing.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-test-file
|
||||
(package
|
||||
(name "perl-test-file")
|
||||
(version "1.443")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/B/BD/BDFOY/Test-File-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mdwb3x8d4l24wsymamsnq2c73a637v4q5kmb5xqqz31iymsdd31"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-test-utf8" ,perl-test-utf8)))
|
||||
(home-page "https://metacpan.org/release/Test-File")
|
||||
(synopsis "Utilities for testing file attributes")
|
||||
(description
|
||||
"@code{Test::File} provides a collection of test utilities for file
|
||||
attributes.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-test-file-contents
|
||||
(package
|
||||
(name "perl-test-file-contents")
|
||||
(version "0.23")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0g8zgfyw84181snw7ghahnl9r4lrmlfj7zwi76sv8d0bj7xssvyd"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-module-build" ,perl-module-build)))
|
||||
(propagated-inputs
|
||||
`(("perl-test-pod" ,perl-test-pod)
|
||||
("perl-test-pod-coverage" ,perl-test-pod-coverage)
|
||||
("perl-text-diff" ,perl-text-diff)))
|
||||
(home-page "https://metacpan.org/release/Test-File-Contents")
|
||||
(synopsis "Test routines for examining the contents of files")
|
||||
(description
|
||||
"@{Test::File::Contents} provides functions for testing the contents of
|
||||
files.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-test-file-sharedir-dist
|
||||
(package
|
||||
(name "perl-test-file-sharedir-dist")
|
||||
|
@ -1275,6 +1375,32 @@ check if a string is valid and not corrupt, whereas the characteristics tests
|
|||
will check that string has a given set of characteristics.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-test-version
|
||||
(package
|
||||
(name "perl-test-version")
|
||||
(version "2.09")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/P/PL/PLICEASE/Test-Version-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1q1qradaf7r2rb3jhpv01wl8z3bxymkfqrl9gwdhxwx5jwldvqcw"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-test-exception" ,perl-test-exception)))
|
||||
(propagated-inputs
|
||||
`(("perl-file-find-rule-perl" ,perl-file-find-rule-perl)))
|
||||
(home-page "https://metacpan.org/release/Test-Version")
|
||||
(synopsis "Check versions in modules")
|
||||
(description
|
||||
"@code{Test::Version} checks to ensure that all modules have a version
|
||||
defined, and that the version is valid.")
|
||||
(license artistic2.0)))
|
||||
|
||||
(define-public perl-test-warn
|
||||
(package
|
||||
(name "perl-test-warn")
|
||||
|
|
|
@ -21,9 +21,11 @@
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages perl-check)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system perl))
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (gnu packages web))
|
||||
|
||||
(define-public perl-mojolicious
|
||||
(package
|
||||
|
@ -48,6 +50,33 @@ used are outdated now, the idea behind it is not. Mojolicious is a new
|
|||
endeavor to implement this idea using modern technologies.")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public perl-uri-db
|
||||
(package
|
||||
(name "perl-uri-db")
|
||||
(version "0.19")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n56xxlw7c39pfar0dxckr9mbmp6yrzk53ic0cb24raiykm9v6f4"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-module-build" ,perl-module-build)))
|
||||
(propagated-inputs
|
||||
`(("perl-uri" ,perl-uri)
|
||||
("perl-uri-nested" ,perl-uri-nested)))
|
||||
(home-page "https://metacpan.org/release/URI-db")
|
||||
(synopsis "Handle database URIs")
|
||||
(description
|
||||
"This module defines a format for database URIs, and provides a @{URI}
|
||||
class to handle these.")
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-uri-escape
|
||||
(package
|
||||
(name "perl-uri-escape")
|
||||
|
@ -70,3 +99,29 @@ percent-decode URI strings as defined by RFC 3986. Percent-encoding URI's is
|
|||
informally called URI escaping. This is the terminology used by this module,
|
||||
which predates the formalization of the terms by the RFC by several years.")
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-uri-nested
|
||||
(package
|
||||
(name "perl-uri-nested")
|
||||
(version "0.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bzg6f11m8wfnmycflvp858rs99xknsx8hkip0xcdfjzlqwi75z1"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-module-build" ,perl-module-build)))
|
||||
(propagated-inputs
|
||||
`(("perl-uri" ,perl-uri)))
|
||||
(home-page "https://metacpan.org/release/URI-Nested")
|
||||
(synopsis "Nested URIs")
|
||||
(description
|
||||
"@code{URI::Nested} provides support for nested URIs, where the scheme is
|
||||
a prefix, and the remainder of the URI is another URI.")
|
||||
(license license:perl-license)))
|
||||
|
|
|
@ -49,6 +49,7 @@
|
|||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages less)
|
||||
#:use-module (gnu packages perl-check)
|
||||
#:use-module (gnu packages perl-compression)
|
||||
#:use-module (gnu packages perl-web)
|
||||
|
@ -1435,6 +1436,33 @@ some enhancements such as here-documents, C-style comments, and multiline
|
|||
options.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-config-gitlike
|
||||
(package
|
||||
(name "perl-config-gitlike")
|
||||
(version "1.17")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kp57na9mk6yni693h2fwap6l1ndbcj97l4860r9vkzx2jw0fjk7"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-test-exception" ,perl-test-exception)))
|
||||
(propagated-inputs
|
||||
`(("perl-moo" ,perl-moo)
|
||||
("perl-moox-types-mooselike" ,perl-moox-types-mooselike)))
|
||||
(home-page "https://metacpan.org/release/Config-GitLike")
|
||||
(synopsis "Parse Git style configuration files")
|
||||
(description
|
||||
"This module handles parsing, modifying and creating configuration files
|
||||
of the style used by the Git version control system.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-config-ini
|
||||
(package
|
||||
(name "perl-config-ini")
|
||||
|
@ -1530,6 +1558,28 @@ data.")
|
|||
@file{Changes} files that conform to a common specification.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-cpan-distnameinfo
|
||||
(package
|
||||
(name "perl-cpan-distnameinfo")
|
||||
(version "0.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/CPAN-DistnameInfo")
|
||||
(synopsis "Extract the name and version from a distribution filename")
|
||||
(description
|
||||
"@code{CPAN::DistnameInfo} uses heuristics to extract the distribution
|
||||
name and version from filenames.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-cpan-meta-check
|
||||
(package
|
||||
(name "perl-cpan-meta-check")
|
||||
|
@ -2738,6 +2788,26 @@ equivalent of \"$@{^GLOBAL_PHASE@} eq 'DESTRUCT'\" for older perls.")
|
|||
files/modules are installed or not).")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-devel-leak
|
||||
(package
|
||||
(name "perl-devel-leak")
|
||||
(version "0.03")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/N/NI/NI-S/"
|
||||
"Devel-Leak-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lkj2xwc3lhxv7scl43r8kfmls4am0b98sqf5vmf7d72257w6hkg"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/Devel-Leak")
|
||||
(synopsis "Utility for looking for perl objects that are not reclaimed")
|
||||
(description
|
||||
"This module provides a basic way to discover if a piece of perl code is
|
||||
allocating perl data and not releasing them again.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-devel-lexalias
|
||||
(package
|
||||
(name "perl-devel-lexalias")
|
||||
|
@ -3803,6 +3873,31 @@ functionality; it returns a list of file names that match the given pattern.
|
|||
For instance, it supports the @code{**/*.pm} form.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-filesys-notify-simple
|
||||
(package
|
||||
(name "perl-filesys-notify-simple")
|
||||
(version "0.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/M/MI/MIYAGAWA/"
|
||||
"Filesys-Notify-Simple-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18jv96k1pf8wqf4vn2ahs7dv44lc9cyqj0bja9z17qici3dx7qxd"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-test-sharedfork" ,perl-test-sharedfork)))
|
||||
(home-page "https://metacpan.org/release/Filesys-Notify-Simple")
|
||||
(synopsis "Simple and dumb file system watcher")
|
||||
(description
|
||||
"Filesys::Notify::Simple is a simple but unified interface to get
|
||||
notifications of changes to a given filesystem path. It utilizes inotify2 on
|
||||
Linux, fsevents on OS X, kqueue on FreeBSD and FindFirstChangeNotification on
|
||||
Windows if they're installed, with a fallback to the full directory scan if
|
||||
they're not available.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-getopt-long
|
||||
(package
|
||||
(name "perl-getopt-long")
|
||||
|
@ -4212,6 +4307,41 @@ easier to develop interactive applications: is_interactive(), interactive(),
|
|||
and busy().")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-io-pager
|
||||
(package
|
||||
(name "perl-io-pager")
|
||||
(version "0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-"
|
||||
version
|
||||
"0.tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vzdypsr7vkj8nnda9ccrksci6pqj5awwmi89l7x3mbpq36gad87"))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-less
|
||||
(lambda _
|
||||
(substitute* "lib/IO/Pager.pm"
|
||||
(("/usr/local/bin/less', '/usr/bin/less")
|
||||
(which "less")))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("perl-file-which" ,perl-file-which)))
|
||||
(inputs
|
||||
`(("less" ,less)))
|
||||
(home-page "https://metacpan.org/release/IO-Pager")
|
||||
(synopsis "Select a pager and pipe text to it")
|
||||
(description
|
||||
"@code{IO::Pager} can be used to locate an available pager and use it to
|
||||
display output if a TTY is in use.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-io-string
|
||||
(package
|
||||
(name "perl-io-string")
|
||||
|
@ -7539,6 +7669,32 @@ expanding standard C/Unix-style backslash escapes like \n and \t, wrapping and
|
|||
removing double-quotes, and truncating to fit within a desired length.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-string-formatter
|
||||
(package
|
||||
(name "perl-string-formatter")
|
||||
(version "0.102084")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"))))
|
||||
(build-system perl-build-system)
|
||||
(propagated-inputs
|
||||
`(("perl-params-util" ,perl-params-util)
|
||||
("perl-sub-exporter" ,perl-sub-exporter)))
|
||||
(home-page "https://metacpan.org/release/String-Formatter")
|
||||
(synopsis "Build your own sprintf-like functions")
|
||||
(description
|
||||
"@code{String::Formatter} is a tool for building sprintf-like formatting
|
||||
routines. It supports named or positional formatting, custom conversions,
|
||||
fixed string interpolation, and simple width-matching.")
|
||||
(license gpl2)))
|
||||
|
||||
(define-public perl-string-rewriteprefix
|
||||
(package
|
||||
(name "perl-string-rewriteprefix")
|
||||
|
@ -7560,6 +7716,28 @@ removing double-quotes, and truncating to fit within a desired length.")
|
|||
known prefixes.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-string-shellquote
|
||||
(package
|
||||
(name "perl-string-shellquote")
|
||||
(version "1.04")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/String-ShellQuote")
|
||||
(synopsis "Quote strings for passing through a shell")
|
||||
(description
|
||||
"@code{shell-quote} lets you pass arbitrary strings through the shell so
|
||||
that they won't be changed.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-string-print
|
||||
(package
|
||||
(name "perl-string-print")
|
||||
|
@ -7893,6 +8071,28 @@ determining their type and clock speed.")
|
|||
of a system.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-sys-syscall
|
||||
(package
|
||||
(name "perl-sys-syscall")
|
||||
(version "0.25")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/B/BR/BRADFITZ/"
|
||||
"Sys-Syscall-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r8k4q04dhs191zgdfgiagvbra770hx0bm6x24jsykxn0c6ghi8y"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/Sys-Syscall")
|
||||
(synopsis
|
||||
"Access system calls that Perl doesn't normally provide access to")
|
||||
(description
|
||||
"Sys::Syscall allows one to use epoll and sendfile system calls from
|
||||
Perl. Support is mostly Linux-only for now, but other syscalls/OSes are
|
||||
planned for the future.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-task-weaken
|
||||
(package
|
||||
(name "perl-task-weaken")
|
||||
|
@ -7932,7 +8132,7 @@ error encouraging the user to seek support.")
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/A/AB/ABW/"
|
||||
(uri (string-append "mirror://cpan/authors/id/A/AT/ATOOMIC/"
|
||||
"Template-Toolkit-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -7971,6 +8171,32 @@ documents: HTML, XML, POD, PostScript, LaTeX, and so on.")
|
|||
processing in Perl code.")
|
||||
(license (list gpl3 artistic2.0))))
|
||||
|
||||
(define-public perl-template-tiny
|
||||
(package
|
||||
(name "perl-template-tiny")
|
||||
(version "1.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jhadxbc8rzbk2v8qvjrbhnvfp0m56iqar6d4nvxyl8bccn0cgh7"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/Template-Tiny")
|
||||
(synopsis "Template Toolkit reimplemented in as little code as possible")
|
||||
(description
|
||||
"@code{Template::Tiny} is a reimplementation of a subset of the
|
||||
functionality from Template Toolkit in as few lines of code as possible.
|
||||
|
||||
It is intended for use in light-usage, low-memory, or low-cpu templating
|
||||
situations, where you may need to upgrade to the full feature set in the
|
||||
future, or if you want the retain the familiarity of TT-style templates.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-term-encoding
|
||||
(package
|
||||
(name "perl-term-encoding")
|
||||
|
@ -8538,6 +8764,28 @@ can also be set to any arbitrary supplied order. The familiar perl array
|
|||
operations can also be performed on the IxHash.")
|
||||
(license (package-license perl))))
|
||||
|
||||
(define-public perl-tie-handle-offset
|
||||
(package
|
||||
(name "perl-tie-handle-offset")
|
||||
(version "0.004")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://cpan/authors/id/D/DA/DAGOLDEN/Tie-Handle-Offset-"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"17m8s8314wi4g0wasdxk15rf12vzsgzmcbr598jam5f6bl2kk7zf"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/Tie-Handle-Offset")
|
||||
(synopsis "Special file handle that hides the beginning of a file")
|
||||
(description
|
||||
"This modules provides a file handle that hides the beginning of a file,
|
||||
by modifying the @code{seek()} and @code{tell()} calls.")
|
||||
(license asl2.0)))
|
||||
|
||||
(define-public perl-tie-toobject
|
||||
(package
|
||||
(name "perl-tie-toobject")
|
||||
|
|
|
@ -360,7 +360,7 @@ photographic equipment.")
|
|||
(define-public darktable
|
||||
(package
|
||||
(name "darktable")
|
||||
(version "2.6.1")
|
||||
(version "2.6.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -368,7 +368,7 @@ photographic equipment.")
|
|||
"https://github.com/darktable-org/darktable/releases/"
|
||||
"download/release-" version "/darktable-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "09ihbj0602spgc5lfbskf9am38n03gam2r8v3kj4dyfgxqr37ib3"))))
|
||||
(base32 "0igvgyd042j7hm4y8fcm6dc1qqjs4d1r7y6f0pzpa0x416xyzfcw"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; there are no tests
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016, 2017, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
|
@ -93,7 +93,16 @@ scientific data.")
|
|||
"guile-charting-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m"))))
|
||||
"0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; By default, .go files would be installed to
|
||||
;; $libdir/…/ccache instead of $libdir/…/site-ccache. Fix
|
||||
;; that.
|
||||
(substitute* (find-files "." "^Makefile\\.in$")
|
||||
(("/ccache") "/site-ccache"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("guile" ,guile-2.2)))
|
||||
|
|
|
@ -0,0 +1,80 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
|
||||
;;;
|
||||
;;; 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 poedit)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages enchant)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages rdf)
|
||||
#:use-module (gnu packages wxwidgets)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public poedit
|
||||
(package
|
||||
(name "poedit")
|
||||
(version "2.2.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vslavik/poedit")
|
||||
(commit (string-append "v" version "-oss"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fxzmry4b23l90j03jdyvd4jprdpy4xcnhw7xrmmfnlbh2abf9x7"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "deps")
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-boost-libdir="
|
||||
(assoc-ref %build-inputs "boost")
|
||||
"/lib"))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("gettext-minimal" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("enchant" ,enchant)
|
||||
("gtk+" ,gtk+)
|
||||
("gtkspell3" ,gtkspell3)
|
||||
("icu4c" ,icu4c)
|
||||
("lucene++" ,lucene++)
|
||||
("pugixml" ,pugixml)
|
||||
("wxwidgets" ,wxwidgets)))
|
||||
(home-page "https://poedit.net/")
|
||||
(synopsis "Gettext catalog editing tool")
|
||||
(description "Poedit is a GUI frontend to the GNU gettext utilities and
|
||||
a catalog editor/source code parser. It helps with translating applications
|
||||
into other languages.")
|
||||
(license license:expat)))
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -241,14 +241,14 @@ seen in a terminal.")
|
|||
(define-public highlight
|
||||
(package
|
||||
(name "highlight")
|
||||
(version "3.49")
|
||||
(version "3.50")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.andre-simon.de/zip/highlight-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1zlhmlq5fnsxxmm04qfchhl4w2iw5fa6sn81c34q6k2m1m77g6aj"))))
|
||||
(base32 "0frcq12zy3dqfhwwzylm10ydp7zp51w9jlijm23zvx09daslg1bl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
|
|
@ -3349,24 +3349,16 @@ color scales, and color space conversion easy. It has support for:
|
|||
(define-public python-pygit2
|
||||
(package
|
||||
(name "python-pygit2")
|
||||
(version "0.27.4")
|
||||
(version "0.28.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pygit2" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15c1mhwwjc7nr8hn5gm21hcfhw61jmwb0vngpjhlm3y5565wg2pz"))))
|
||||
(base32 "0lngsaz029d4fjcwhl17pr59nh9gwl6hwfin36nph60fgsmfdg3d"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f; tests don't run correctly in our environment
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-dependency-versioning
|
||||
(lambda _
|
||||
(substitute* "setup.py"
|
||||
(("<") "<="))
|
||||
#t)))))
|
||||
'(#:tests? #f)) ; tests don't run correctly in our environment
|
||||
(propagated-inputs
|
||||
`(("python-six" ,python-six)
|
||||
("python-cffi" ,python-cffi)
|
||||
|
@ -4453,13 +4445,13 @@ memoizing PEG/Packrat parser in Python.")
|
|||
(version "0.13.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/pygridtools/gridmap/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pygridtools/gridmap.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1gzjg2k6f14i1msm2b0ax8d9ds1hvk6qd5nlaivg8m4cxqp4cp1x"))))
|
||||
(base32 "1478lbwsr1w24cii2x01m2910fvh8r43ghnb78nc972a96hqiknm"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; FIXME: Requires python-cherrypy.
|
||||
|
@ -4484,13 +4476,13 @@ cluster without needing to write any wrapper code yourself.")
|
|||
(version "1.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/nickstenning/honcho/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/nickstenning/honcho.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0zizn61n5z5hq421hkypk9pw8s6fpxw30f4hsg7k4ivwzy3gjw9j"))))
|
||||
(base32 "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest)
|
||||
|
@ -6747,14 +6739,15 @@ Python Package Index (PyPI).")
|
|||
(name "python-tlsh")
|
||||
(version "3.4.5")
|
||||
(home-page "https://github.com/trendmicro/tlsh")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/trendmicro/tlsh/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x1vahd4zg5kpyr9h9hs3fvh460p25rjy4cclwdnbbw8x3vc30q3"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/trendmicro/tlsh.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:out-of-source? #f
|
||||
|
@ -10235,20 +10228,21 @@ discovery, monitoring and configuration.")
|
|||
(name "python-schematics")
|
||||
(version "1.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/schematics/schematics/archive/v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19v1i69bf3bzarfxmbv0v6ivpcn758x3shvbiy9l2hy0lvqwnp6l"))))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/schematics/schematics.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0xdqskycznqc7mfp60bhw1zq8wx7yx1dvmbq3brnm1dx3xnqa0zd"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-six" ,python-six)))
|
||||
(arguments
|
||||
`(#:tests? #f)) ; requires a bunch of not very nice packages with fixed
|
||||
; version requirements (eg python-coveralls)
|
||||
;; The tests require a bunch of not very nice packages with fixed
|
||||
;; version requirements (e.g. python-coveralls).
|
||||
`(#:tests? #f))
|
||||
(home-page "https://github.com/schematics/schematics")
|
||||
(synopsis "Python Data Structures for Humans")
|
||||
(description "Python Data Structures for Humans.")
|
||||
|
@ -12585,13 +12579,13 @@ Swagger 2.0).")
|
|||
(version "0.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/rochacbruno/flasgger/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rochacbruno/flasgger.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gqzlm0rb55fdpsy5ipkganlx9cnpi454fqyycr03jm22zql14ay"))))
|
||||
(base32 "0yydxsyjnc0clbrjqb1n7587l6cdqvwdagwxk5hkx01qwdfbkvpn"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -13097,13 +13091,13 @@ executed more than a given number of times during a given period.")
|
|||
(version "0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/kovidgoyal/dukpy/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/kovidgoyal/dukpy.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pj39rfwlzivqm5hkrsza7gssg6ggpxlq5ivc8f3h7x5pfgc6y6c"))))
|
||||
(base32 "13h21nqzasv4zj32xs61brmc106pr2cx243672crcmwxxnjgaxls"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/kovidgoyal/dukpy")
|
||||
(synopsis "Run JavaScript in python")
|
||||
|
@ -14170,16 +14164,15 @@ manager compatible with @code{asyncio}.")
|
|||
(package
|
||||
(name "python-glob2")
|
||||
(version "0.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/miracle2k/python-glob2/archive/"
|
||||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ja168f0dz4kbz4m06dm0rd3acaypk6hjx2km541pw22y9s40mag"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/miracle2k/python-glob2.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1lm1xz3k3l0k1c5bcp9hlzmi3gp5j8dl1k3xhpiq5mnm0xq6n163"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/miracle2k/python-glob2/")
|
||||
(synopsis "Extended Version of the python buildin glob module")
|
||||
|
@ -14863,14 +14856,14 @@ append on old values. Partd excels at shuffling operations.")
|
|||
(define-public python-dask
|
||||
(package
|
||||
(name "python-dask")
|
||||
(version "1.1.4")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "dask" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hrnfz4pzawikz9b622vjz2500n7hs25nz9msy1k8l4g7l2kr6ky"))))
|
||||
"1y0dqcp72ixwblgway0jpvfirlxfcmwrjiivdq96firj1hw127sd"))))
|
||||
(build-system python-build-system)
|
||||
;; A single test out of 5000+ fails. This test is marked as xfail when
|
||||
;; pytest-xdist is used.
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -20,7 +21,7 @@
|
|||
|
||||
(define-module (gnu packages rdf)
|
||||
#:use-module ((guix licenses)
|
||||
#:select (non-copyleft isc gpl2 lgpl2.1 lgpl2.1+))
|
||||
#:select (non-copyleft asl2.0 isc gpl2 lgpl2.1 lgpl2.1+ lgpl3+))
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix download)
|
||||
|
@ -119,6 +120,37 @@ full-featured indexing and searching API. It is a port of the very popular
|
|||
Java Lucene text search engine API to C++.")
|
||||
(license lgpl2.1)))
|
||||
|
||||
(define-public lucene++
|
||||
(package
|
||||
(name "lucene++")
|
||||
(version "3.0.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/luceneplusplus/LucenePlusPlus")
|
||||
(commit (string-append "rel_" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"06b37fly6l27zc6kbm93f6khfsv61w792j8xihfagpcm9cfz2zi1"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
;; CXX_FLAGS suggested in a closed issue on github:
|
||||
;; https://github.com/luceneplusplus/LucenePlusPlus/issues/100
|
||||
(list "-Wno-dev" "-DCMAKE_CXX_FLAGS=-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT"
|
||||
;; Install in lib64 break rpath
|
||||
"-DCMAKE_INSTALL_LIBDIR:PATH=lib")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("boost" ,boost)))
|
||||
(home-page "https://github.com/luceneplusplus/LucenePlusPlus")
|
||||
(synopsis "Text search engine")
|
||||
(description "Lucene++ is an up to date C++ port of the popular Java
|
||||
Lucene library, a high-performance, full-featured text search engine.")
|
||||
(license (list asl2.0 lgpl3+)))); either asl or lgpl.
|
||||
|
||||
(define-public lrdf
|
||||
(package
|
||||
(name "lrdf")
|
||||
|
|
|
@ -2986,12 +2986,13 @@ with processes on remote servers, via SSH2.")
|
|||
(version "1.2.2.rc2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/net-ssh/net-scp/archive/v"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/net-ssh/net-scp.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0xyf17mhgvyz54xjj9ria4wnq3x62bhmkfgzqv8jwiip2bplv1nk"))))
|
||||
(base32 "1nyn17sy71fn7zs3y6wbgcn35318c10flqgc0582409095x4h0sx"))))
|
||||
(build-system ruby-build-system)
|
||||
(native-inputs
|
||||
`(("bundler" ,bundler)
|
||||
|
@ -7679,14 +7680,15 @@ strings or files.")
|
|||
(package
|
||||
(name "ruby-sass-spec")
|
||||
(version "3.5.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/sass/sass-spec/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nx8lp7c9qa58w489crgqa3c489xsyarn1a8h4np9mwwfqm1h3rr"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sass/sass-spec.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1zsw66830w0xlc7kxz6fm4b5nyb44vdsdgm9mgy06s5aixx83pwr"))))
|
||||
(build-system ruby-build-system)
|
||||
(propagated-inputs
|
||||
`(("ruby-command-line-reporter-3" ,ruby-command-line-reporter-3)
|
||||
|
|
|
@ -726,6 +726,16 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
|
|||
`(modify-phases ,phases
|
||||
;; binaryen was replaced with LLD project from LLVM
|
||||
(delete 'dont-build-native)
|
||||
(replace 'check
|
||||
(lambda* _
|
||||
;; Enable parallel execution.
|
||||
(let ((parallel-job-spec
|
||||
(string-append "-j" (number->string
|
||||
(min 4
|
||||
(parallel-job-count))))))
|
||||
(invoke "./x.py" parallel-job-spec "test" "-vv")
|
||||
(invoke "./x.py" parallel-job-spec "test"
|
||||
"src/tools/cargo"))))
|
||||
(replace 'remove-unsupported-tests
|
||||
(lambda* _
|
||||
;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH.
|
||||
|
@ -930,7 +940,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
|
|||
(("```rust") "```rust,no_run"))
|
||||
#t)))))))))
|
||||
|
||||
(define-public rust
|
||||
(define-public rust-1.32
|
||||
(let ((base-rust
|
||||
(rust-bootstrapped-package rust-1.31 "1.32.0"
|
||||
"0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"
|
||||
|
@ -982,3 +992,44 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
|
|||
;; Remove no longer relevant steps
|
||||
(delete 'remove-flaky-test)
|
||||
(delete 'patch-aarch64-test))))))))
|
||||
|
||||
(define-public rust-1.33
|
||||
(let ((base-rust
|
||||
(rust-bootstrapped-package rust-1.32 "1.33.0"
|
||||
"152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"
|
||||
#:patches '())))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(inputs
|
||||
;; Upgrade to jemalloc@5.1.0
|
||||
(alist-replace "jemalloc" (list jemalloc)
|
||||
(package-inputs base-rust)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'ignore-cargo-package-tests)
|
||||
(add-after 'configure 'configure-test-threads
|
||||
;; Several rustc and cargo tests will fail if run on one core
|
||||
;; https://github.com/rust-lang/rust/issues/59122
|
||||
;; https://github.com/rust-lang/cargo/issues/6746
|
||||
;; https://github.com/rust-lang/rust/issues/58907
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "RUST_TEST_THREADS" "2")
|
||||
#t)))))))))
|
||||
|
||||
(define-public rust
|
||||
(let ((base-rust
|
||||
(rust-bootstrapped-package rust-1.33 "1.34.0"
|
||||
"0n8z1wngkxab1rvixqg6w8b727hzpnm9wp9h8iy3mpbrzp7mmj3s"
|
||||
#:patches '())))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source base-rust))
|
||||
(snippet '(begin
|
||||
(delete-file-recursively "src/llvm-emscripten")
|
||||
(delete-file-recursively "src/llvm-project")
|
||||
(delete-file-recursively "vendor/jemalloc-sys/jemalloc")
|
||||
#t)))))))
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
;;;
|
||||
|
@ -56,14 +56,14 @@
|
|||
(define-public cifs-utils
|
||||
(package
|
||||
(name "cifs-utils")
|
||||
(version "6.8")
|
||||
(version "6.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.samba.org/pub/linux-cifs/"
|
||||
name "/" name "-" version ".tar.bz2"))
|
||||
"cifs-utils/cifs-utils-" version ".tar.bz2"))
|
||||
(sha256 (base32
|
||||
"0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7"))))
|
||||
"175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
|
@ -80,7 +80,8 @@
|
|||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'set-root-sbin
|
||||
(lambda _ ; Don't try to install in "/sbin".
|
||||
(lambda _
|
||||
;; Don't try to install into "/sbin".
|
||||
(setenv "ROOTSBINDIR"
|
||||
(string-append (assoc-ref %outputs "out") "/sbin"))
|
||||
#t)))))
|
||||
|
@ -152,14 +153,14 @@ anywhere.")
|
|||
(define-public samba
|
||||
(package
|
||||
(name "samba")
|
||||
(version "4.10.1")
|
||||
(version "4.10.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.samba.org/pub/samba/stable/"
|
||||
"samba-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kf5v65xgz7z18ggj1k46yy5g5dy76k7ni04s79kalzqqs25scd7"))))
|
||||
"112yizx9cpjhi8c7mh9znqg0c9dkj3383hwr8dhgpykl3g2zv347"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -23,11 +23,12 @@
|
|||
|
||||
(define-module (gnu packages search)
|
||||
#:use-module ((guix licenses)
|
||||
#:select (gpl2 gpl2+ gpl3+ lgpl2.1+ bsd-3 x11))
|
||||
#:select (gpl2 gpl2+ gpl3+ lgpl2.1+ bsd-3 x11 perl-license))
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
|
@ -110,6 +111,31 @@ rich set of boolean query operators.")
|
|||
(synopsis "Python bindings for the Xapian search engine library")
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public perl-search-xapian
|
||||
(package
|
||||
(name "perl-search-xapian")
|
||||
(version "1.2.25.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/O/OL/OLLY/"
|
||||
"Search-Xapian-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hpa8gi38j0ibq8af6dy69lm1bl5jnq76nsa69dbrzbr88l5m594"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-devel-leak" ,perl-devel-leak)))
|
||||
(inputs
|
||||
`(("xapian" ,xapian)))
|
||||
(home-page "https://metacpan.org/release/Search-Xapian")
|
||||
(synopsis "Perl XS frontend to the Xapian C++ search library")
|
||||
(description
|
||||
"Search::Xapian wraps most methods of most Xapian classes. The missing
|
||||
classes and methods should be added in the future. It also provides a
|
||||
simplified, more 'perlish' interface to some common operations.")
|
||||
(license perl-license)))
|
||||
|
||||
(define-public libtocc
|
||||
(package
|
||||
(name "libtocc")
|
||||
|
|
|
@ -312,7 +312,7 @@ and other operations. It includes a library and a command-line tool.")
|
|||
(define-public yubikey-personalization
|
||||
(package
|
||||
(name "yubikey-personalization")
|
||||
(version "1.19.0")
|
||||
(version "1.19.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -320,7 +320,7 @@ and other operations. It includes a library and a command-line tool.")
|
|||
"/Releases/ykpers-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"104lc0nnqdr365fa7c4vrq67rxp1dp8idndsh9jlhnj9dnhszj1b"))))
|
||||
"0jhvnavjrpwzmmjcw486df5s48j53njqgyz36yz3dskbaz3kwlfr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags (list (string-append "--with-udevrulesdir="
|
||||
|
|
|
@ -117,7 +117,7 @@ which allows users to view a desktop computing environment.")
|
|||
(define-public spice-gtk
|
||||
(package
|
||||
(name "spice-gtk")
|
||||
(version "0.35")
|
||||
(version "0.36")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -125,7 +125,7 @@ which allows users to view a desktop computing environment.")
|
|||
"spice-gtk-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"))))
|
||||
"1kfpixfdmxs9wn3id48gc9bvfrgxz935y3wpykf40bgi9mcc69ki"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("gstreamer" ,gstreamer)
|
||||
|
@ -134,20 +134,23 @@ which allows users to view a desktop computing environment.")
|
|||
("gst-plugins-good" ,gst-plugins-good)
|
||||
("gst-plugins-bad" ,gst-plugins-bad)
|
||||
("gst-plugins-ugly" ,gst-plugins-ugly)
|
||||
("spice-protocol" ,spice-protocol)))
|
||||
("spice-protocol" ,spice-protocol)
|
||||
|
||||
;; These are required by the pkg-config files.
|
||||
("gtk+" ,gtk+)
|
||||
("pixman" ,pixman)
|
||||
("openssl" ,openssl)))
|
||||
(inputs
|
||||
`(("glib-networking" ,glib-networking)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("gtk+" ,gtk+)
|
||||
("json-glib" ,json-glib)
|
||||
("libepoxy" ,libepoxy)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libxcb" ,libxcb)
|
||||
("lz4" ,lz4)
|
||||
("mesa" ,mesa)
|
||||
("pixman" ,pixman)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("python" ,python)
|
||||
("openssl" ,openssl)
|
||||
("opus" ,opus)
|
||||
("usbredir" ,usbredir)))
|
||||
(native-inputs
|
||||
|
@ -162,6 +165,13 @@ which allows users to view a desktop computing environment.")
|
|||
"--enable-introspection")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'disable-session-test
|
||||
(lambda _
|
||||
;; XXX: Disable session tests, because they require USB support,
|
||||
;; which is not available in the build container.
|
||||
(substitute* "tests/Makefile"
|
||||
(("test-session\\$\\(EXEEXT\\) ") ""))
|
||||
#t))
|
||||
(add-after
|
||||
'install 'wrap-spicy
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
|
@ -291,7 +301,6 @@ resolution scaling on graphical console window resize.")
|
|||
`(("gtk+" ,gtk+)
|
||||
("libcap" ,libcap)
|
||||
("libxml2" ,libxml2)
|
||||
("openssl" ,openssl)
|
||||
("spice-gtk" ,spice-gtk)))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin")
|
||||
|
|
|
@ -570,14 +570,14 @@ and operations on them using LAPACK and SuiteSparse.")
|
|||
(define-public r-nlme
|
||||
(package
|
||||
(name "r-nlme")
|
||||
(version "3.1-137")
|
||||
(version "3.1-139")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "nlme" version))
|
||||
(sha256
|
||||
(base32
|
||||
"11vyxxc0n36vb8d8g02zr0402ymicvbifwdsqm7gy9iqqnwrn101"))))
|
||||
"0fap121c18nbznyzvnqvsdiszg2nbmkas6zhgrz1f8jiv1lzqq04"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-lattice" ,r-lattice)))
|
||||
|
@ -636,14 +636,14 @@ single hidden layer, and for multinomial log-linear models.")
|
|||
(define-public r-rpart
|
||||
(package
|
||||
(name "r-rpart")
|
||||
(version "4.1-13")
|
||||
(version "4.1-15")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rpart" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0k29qx3k3pj5sgrpg0p47yd8i811rmdakaw57bigpq1449asc4cf"))))
|
||||
"0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/rpart")
|
||||
(synopsis "Recursive partitioning and regression trees")
|
||||
|
@ -1120,13 +1120,13 @@ legends.")
|
|||
(define-public r-ggplot2
|
||||
(package
|
||||
(name "r-ggplot2")
|
||||
(version "3.1.0")
|
||||
(version "3.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ggplot2" version))
|
||||
(sha256
|
||||
(base32 "1msy36r21nlmnpyaw2m9k0ykmnd19b9il01b65w457pfw75prrs9"))))
|
||||
(base32 "0y8cks9r9hvjlx0isnvbgs3p0al167hlr3q7c3syfcj77dzjkpmz"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-digest" ,r-digest)
|
||||
|
@ -1635,13 +1635,13 @@ defined in different packages.")
|
|||
(define-public r-rlang
|
||||
(package
|
||||
(name "r-rlang")
|
||||
(version "0.3.3")
|
||||
(version "0.3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rlang" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pdlafnijpd2vzy8jxcxwakfi66n4qzrqxvcxi1ja389m066cvbb"))))
|
||||
"1pks7d2xavzgaxqrnk3f79qsmv4wqv93f8991jv93pnb1mxpyijf"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "http://rlang.tidyverse.org")
|
||||
(synopsis "Functions for base types, core R and Tidyverse features")
|
||||
|
@ -1827,13 +1827,13 @@ times.")
|
|||
(define-public r-data-table
|
||||
(package
|
||||
(name "r-data-table")
|
||||
(version "1.12.0")
|
||||
(version "1.12.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "data.table" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xz388khklqqc39r1cmjvqm65azambgzqw0743aypm6v4chi26v1"))))
|
||||
"1x929lwhai6nkppm4zvicyw5qh5va5sizp86r30qnfkh1n7w2mfv"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/Rdatatable/data.table/wiki")
|
||||
(synopsis "Enhanced version of data.frame R object")
|
||||
|
@ -2056,13 +2056,13 @@ jackknifed confidence intervals are available for most estimates.")
|
|||
(define-public r-rversions
|
||||
(package
|
||||
(name "r-rversions")
|
||||
(version "1.0.3")
|
||||
(version "1.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rversions" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"))))
|
||||
"0g4wvq6m9inhy6ww18lvkhkgarb1m9dp2kdxkkyk5qvldgqa598l"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-curl" ,r-curl)
|
||||
|
@ -2096,14 +2096,14 @@ limited to R.")
|
|||
(define-public r-backports
|
||||
(package
|
||||
(name "r-backports")
|
||||
(version "1.1.3")
|
||||
(version "1.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "backports" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hac46xaawnqajlsfb5k7pfkc2ya9h76s5qv9ycj3jafh93d26z4"))))
|
||||
"00zz969vc2gfi5p9q65pzghq2bxm3p9zqgwqswkyz9rgybz5wjzf"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/backports")
|
||||
(synopsis "Reimplementations of functions introduced since R 3.0.0")
|
||||
|
@ -2421,13 +2421,13 @@ informative error messages when it's not available.")
|
|||
(define-public r-devtools
|
||||
(package
|
||||
(name "r-devtools")
|
||||
(version "2.0.1")
|
||||
(version "2.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "devtools" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1nyspqicn9zd1rgq3k07b3179i8w5ys6jbd65g9q8qczrb7z3x8f"))))
|
||||
"028pppj39ng7q17k27531s8k00lmw982vz5krn74n9b8f2azm8lr"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-callr" ,r-callr)
|
||||
|
@ -2521,13 +2521,13 @@ disk (or a connection).")
|
|||
(define-public r-plotrix
|
||||
(package
|
||||
(name "r-plotrix")
|
||||
(version "3.7-4")
|
||||
(version "3.7-5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "plotrix" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hs0zwaqs34559girinvysjfbvznyn8znp9cwvkqx6k2cqvcjinj"))))
|
||||
"0k6ivryac1k81z2dijjds376a9jxwk8rf5g48snj67cnjffkybxj"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/plotrix")
|
||||
(synopsis "Various plotting functions")
|
||||
|
@ -3805,13 +3805,13 @@ features present in other programming languages.")
|
|||
(define-public r-plotly
|
||||
(package
|
||||
(name "r-plotly")
|
||||
(version "4.8.0")
|
||||
(version "4.9.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "plotly" version))
|
||||
(sha256
|
||||
(base32
|
||||
"19p8pa03q9mw5vaan7r56xgd13d90ssiz0flbrkvpfrir2105ybq"))))
|
||||
"1kz2hm7vnkn4clxr6yyxxnmdmkz9zwjq6bzysw7j27r3721i8qgp"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-base64enc" ,r-base64enc)
|
||||
|
@ -4427,13 +4427,13 @@ data at that region, and avoids over-plotting.")
|
|||
(define-public r-ggthemes
|
||||
(package
|
||||
(name "r-ggthemes")
|
||||
(version "4.1.0")
|
||||
(version "4.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ggthemes" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1a6r384v72hb91qkg9rz2m7s3qskbl9haxynf2vzz6v1ak9xd4c5"))))
|
||||
"092hks6bxi6al8nclgswnzfmx5wp6n3qf63aqiajca7dx8w8n0m2"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-ggplot2" ,r-ggplot2)
|
||||
|
|
|
@ -496,15 +496,14 @@ cups server to be installed.")
|
|||
(define-public noice
|
||||
(package
|
||||
(name "noice")
|
||||
(version "0.7")
|
||||
(version "0.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dl.2f30.org/releases/"
|
||||
name "-" version ".tar.gz"))
|
||||
"noice-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03b0kzngzacfpz4n8lgbvia2s765i5bkw55v482hh4m49dm41gpc"))))
|
||||
(base32 "0g01iwzscdv27c1idv93gd74kjzy3n9kazgm6qz08rygp96qx4xw"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
|
|
@ -249,10 +249,14 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
|
|||
"0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87"))
|
||||
(patches
|
||||
(search-patches "kmscon-runtime-keymap-switch.patch"))
|
||||
(modules '((guix build utils)))))
|
||||
(modules '((guix build utils)))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
`(;; The closure of MESA is huge so we'd rather avoid it.
|
||||
#:disallowed-references (,mesa)
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "indeed")
|
||||
|
@ -285,7 +289,10 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
|
|||
("libtsm" ,libtsm)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("logind" ,elogind)
|
||||
("mesa" ,mesa)
|
||||
;; MESA can be used for accelerated video output via OpenGLESv2, but
|
||||
;; it's a bit dependency that we'd rather avoid in the installation
|
||||
;; image.
|
||||
;; ("mesa" ,mesa)
|
||||
("pango" ,pango)
|
||||
("udev" ,eudev)))
|
||||
(synopsis "Linux KMS-based terminal emulator")
|
||||
|
@ -377,7 +384,7 @@ to all types of devices that provide serial consoles.")
|
|||
(define-public beep
|
||||
(package
|
||||
(name "beep")
|
||||
(version "1.4.3")
|
||||
(version "1.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -390,7 +397,7 @@ to all types of devices that provide serial consoles.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1gramwa2zm59kqjhv96fi8vg7l6lyffv02h0310vb90naschi99g"))))
|
||||
(base32 "1bk7g63qpiclbq20iz2x238by8s1b2iafdim7i6dq1i5n01s7lgx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
|
|
@ -6022,7 +6022,7 @@ typearea (which are the main parts of the bundle).")
|
|||
(copy-recursively (assoc-ref %build-inputs "source") target)
|
||||
#t))))
|
||||
(home-page "https://www.ctan.org/pkg/listofitems")
|
||||
(synopsis "Grab items in lists using user-specified seperation character")
|
||||
(synopsis "Grab items in lists using user-specified separation character")
|
||||
(description
|
||||
"This package allows one to capture all the items of a list, for which
|
||||
the parsing character has been selected by the user, and to access any of
|
||||
|
|
|
@ -529,13 +529,13 @@ netcat implementation that supports TLS.")
|
|||
(package
|
||||
(name "python-acme")
|
||||
;; Remember to update the hash of certbot when updating python-acme.
|
||||
(version "0.33.0")
|
||||
(version "0.33.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "acme" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gmnbjanv8dl8035n2b30wisqn4w9rr6fxzxrbrbnhhd40pnlplx"))))
|
||||
"10ks4wp55qxzkf8ms3xcfs5njg2zz7w499wh24gzw7h7s1qxp35k"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -586,7 +586,7 @@ netcat implementation that supports TLS.")
|
|||
(uri (pypi-uri name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0iiqr306zy56y8wpxsvzw1izs184pzps72kxhssmznqlgz5ngni5"))))
|
||||
"1nf3bb6j3nmdd5bcp3k7d6jqilmwvpzllzpr5niwaghgqlr3y86m"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(,@(substitute-keyword-arguments (package-arguments python-acme)
|
||||
|
|
|
@ -32,14 +32,14 @@
|
|||
(define-public miniupnpc
|
||||
(package
|
||||
(name "miniupnpc")
|
||||
(version "2.1.20190403")
|
||||
(version "2.1.20190408")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://miniupnp.tuxfamily.org/files/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0qgwcinj8h312v2995qc2z1lbpmw916glkc8j9fa16xr4l2skxfy"))))
|
||||
(base32 "1v0l2m8j7r6jiy871d6v11ls243xqn6s3856iwd3bmk5c37npi50"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("python" ,python-2)))
|
||||
|
|
|
@ -522,13 +522,14 @@ everything from small to very large projects with speed and efficiency.")
|
|||
(name "libgit2")
|
||||
(version "0.28.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/libgit2/libgit2/"
|
||||
"archive/v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/libgit2/libgit2.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0swk2dyq5a4p1jn5wvbcsrxckhh808vifxz5y8w663avg541188c"))
|
||||
"0j5p0hhz2wizvgkf0nbpd8g32mb5bg1vp8ckpbhb0pq38ja4h43r"))
|
||||
(patches (search-patches "libgit2-avoid-python.patch"
|
||||
"libgit2-mtime-0.patch"))
|
||||
|
||||
|
@ -551,6 +552,10 @@ everything from small to very large projects with speed and efficiency.")
|
|||
(("/bin/cp") (which "cp"))
|
||||
(("/bin/rm") (which "rm")))
|
||||
#t))
|
||||
(add-after 'unpack 'make-git-checkout-writable
|
||||
(lambda _
|
||||
(for-each make-file-writable (find-files "."))
|
||||
#t))
|
||||
;; Run checks more verbosely.
|
||||
(replace 'check
|
||||
(lambda _ (invoke "./libgit2_clar" "-v" "-Q"))))))
|
||||
|
@ -577,14 +582,15 @@ write native speed custom Git applications in any language with bindings.")
|
|||
(package
|
||||
(name "git-crypt")
|
||||
(version "0.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/AGWA/git-crypt"
|
||||
"/archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0454fdmgm5f3razkn8n03lfqm5zyzvr4r2528zmlxiwba9518l2i"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/AGWA/git-crypt.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1x9209n3k49k998saadr2d0lmvs01smjinx7gzzyjdwj9l904sii"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("git" ,git)
|
||||
|
@ -771,14 +777,13 @@ a built-in cache to decrease server I/O pressure.")
|
|||
(version "0.5.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/davisp/ghp-import/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/davisp/ghp-import.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0x887v690xsac2hzjkpbvp3a6crh3m08mqbk3nb4xwc9dnk869q7"))))
|
||||
(base32 "12pmw3zz3i57ljnm0rxdyjqdyhisbvy18mjwkb3bzp5pgzs2f45c"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
@ -1026,14 +1031,15 @@ manipulate them in various ways.")
|
|||
(package
|
||||
(name "vcsh")
|
||||
(version "1.20151229")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/RichiH/vcsh/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ym3swkh738c3vciffvlr96vqzhwmzkb8ajqzap8f0j9n039a1mf"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/RichiH/vcsh.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1grpj45nbpv4j60vd2kg4rj53zrm0bc0h9l4pfd3c2mwbvywm6ab"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("which" ,which)))
|
||||
|
@ -1100,15 +1106,15 @@ also walk each side of a merge and test those changes individually.")
|
|||
(package
|
||||
(name "gitolite")
|
||||
(version "3.6.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/sitaramc/gitolite/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1idxipg0df80bhjcxgwxs3lllqnkvhwpinmfv1xvg1l98fxiapgp"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sitaramc/gitolite.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no tests
|
||||
|
@ -1762,14 +1768,15 @@ output of the @code{git} command.")
|
|||
(package
|
||||
(name "findnewest")
|
||||
(version "0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/0-wiz-0/findnewest/archive/findnewest-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ydis4y0amkgfr4y60sn076f1l41ya2kn89kfd9fqf44f9ccgb5r"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/0-wiz-0/findnewest.git")
|
||||
(commit (string-append "findnewest-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1x1cbn2b27h5r0ah5xc06fkalfdci2ngrgd4wibxjw0h88h0nvgq"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("autoconf" ,autoconf)
|
||||
("automake" ,automake)))
|
||||
|
@ -1833,15 +1840,15 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.")
|
|||
(package
|
||||
(name "git-annex-remote-hubic")
|
||||
(version "0.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/Schnouki/" name "/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"196g3jkaybjx11nbr51n0cjps3wjzb145ab76y717diqvvxp5v4r"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Schnouki/git-annex-remote-hubic.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "16y9sk67hfi17h9n2kkffyabfccksh5rab40hhk69v6cxmbpn2sx"))))
|
||||
(build-system python-build-system)
|
||||
(arguments `(#:python ,python-2))
|
||||
(native-inputs
|
||||
|
@ -2096,18 +2103,18 @@ how information about the merge is displayed.")
|
|||
(package
|
||||
(name "git-imerge")
|
||||
(version "1.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/mhagger/git-imerge/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a6ay8fpgz3yd84jc40w41x0rcfpan6bcq4wd1hxiiqwb51jysb2"))))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mhagger/git-imerge.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; The are only manual test scripts.
|
||||
`(#:tests? #f ; only manual test scripts
|
||||
#:make-flags (list (string-append "DESTDIR=" %output)
|
||||
"PREFIX=")
|
||||
#:phases
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue