Merge branch 'master' into emacs-team
commit
cdbd81ce14
|
@ -5,10 +5,12 @@
|
|||
(tab-width . 8)
|
||||
(sentence-end-double-space . t)
|
||||
|
||||
;; For use with 'bug-reference-prog-mode'.
|
||||
;; For use with 'bug-reference-prog-mode'. Extra bug-reference
|
||||
;; configuration should be done in your Emacs user configuration file;
|
||||
;; refer to (info (guix) The Perfect Setup).
|
||||
(bug-reference-bug-regexp
|
||||
. "\\(<https?://\\bugs\\.gnu\\.org/\\([0-9]+\\)>\\)")
|
||||
(bug-reference-url-format . "https://bugs.gnu.org/%s")
|
||||
(bug-reference-url-format . "https://issues.guix.gnu.org/%s")
|
||||
|
||||
(eval . (add-to-list 'completion-ignored-extensions ".go"))
|
||||
|
||||
|
|
|
@ -692,6 +692,7 @@ EXTRA_DIST += \
|
|||
ROADMAP \
|
||||
TODO \
|
||||
bootstrap \
|
||||
manifest.scm \
|
||||
build-aux/build-self.scm \
|
||||
build-aux/check-channel-news.scm \
|
||||
build-aux/check-final-inputs-self-contained.scm \
|
||||
|
|
|
@ -77,6 +77,12 @@ hack on Guix:
|
|||
guix shell -D guix --pure
|
||||
@end example
|
||||
|
||||
or even, from within a Git worktree for Guix:
|
||||
|
||||
@example
|
||||
guix shell --pure
|
||||
@end example
|
||||
|
||||
@xref{Invoking guix shell}, for more information on that command.
|
||||
|
||||
If you are unable to use Guix when building Guix from a checkout, the
|
||||
|
@ -204,12 +210,11 @@ To that end, all the command-line tools can be used even if you have not
|
|||
run @code{make install}. To do that, you first need to have an
|
||||
environment with all the dependencies available (@pxref{Building from
|
||||
Git}), and then simply prefix each command with @command{./pre-inst-env}
|
||||
(the @file{pre-inst-env} script lives in the top build tree of Guix; it
|
||||
is generated by running @command{./bootstrap} followed by
|
||||
@command{./configure}). As an example, here is how you would build the
|
||||
@code{hello} package as defined in your working tree (this assumes
|
||||
@command{guix-daemon} is already running on your system; it's OK if it's
|
||||
a different version):
|
||||
(the @file{pre-inst-env} script lives in the top build tree of Guix;
|
||||
@pxref{Building from Git} to generate it). As an example, here is how you
|
||||
would build the @code{hello} package as defined in your working tree (this
|
||||
assumes @command{guix-daemon} is already running on your system; it's OK if
|
||||
it's a different version):
|
||||
|
||||
@example
|
||||
$ ./pre-inst-env guix build hello
|
||||
|
@ -379,6 +384,70 @@ copyright-update}. If you want to do it automatically after each buffer
|
|||
save then add @code{(add-hook 'after-save-hook 'copyright-update)} in
|
||||
Emacs.
|
||||
|
||||
@subsection Viewing Bugs within Emacs
|
||||
|
||||
Emacs has a nice minor mode called @code{bug-reference}, which, when
|
||||
combined with @samp{emacs-debbugs} (the Emacs package), can be used to
|
||||
open links such as @samp{<https://bugs.gnu.org/58697>} or
|
||||
@samp{<https://issues.guix.gnu.org/58697>} as bug report buffers. From
|
||||
there you can easily consult the email thread via the Gnus interface,
|
||||
reply or modify the bug status, all without leaving the comfort of
|
||||
Emacs! Below is a sample configuration to add to your @file{~/.emacs}
|
||||
configuration file:
|
||||
|
||||
@lisp
|
||||
;;; Bug references.
|
||||
(add-hook 'prog-mode-hook #'bug-reference-prog-mode)
|
||||
(add-hook 'gnus-mode-hook #'bug-reference-mode)
|
||||
(add-hook 'erc-mode-hook #'bug-reference-mode)
|
||||
(add-hook 'bug-reference-mode-hook 'debbugs-browse-mode)
|
||||
(add-hook 'bug-reference-prog-mode-hook 'debbugs-browse-mode)
|
||||
(add-hook 'gnus-summary-mode-hook 'bug-reference-mode)
|
||||
(add-hook 'gnus-article-mode-hook 'bug-reference-mode)
|
||||
|
||||
;;; This extends the default expression (the top-most, first expression
|
||||
;;; provided to 'or') to also match URLs such as
|
||||
;;; <https://issues.guix.gnu.org/58697> or <https://bugs.gnu.org/58697>.
|
||||
;;; It is also extended to detect "Fixes: #NNNNN" git trailers.
|
||||
(setq bug-reference-bug-regexp
|
||||
(rx (group (or (seq word-boundary
|
||||
(or (seq (char "Bb") "ug"
|
||||
(zero-or-one " ")
|
||||
(zero-or-one "#"))
|
||||
(seq (char "Pp") "atch"
|
||||
(zero-or-one " ")
|
||||
"#")
|
||||
(seq (char "Ff") "ixes"
|
||||
(zero-or-one ":")
|
||||
(zero-or-one " ") "#")
|
||||
(seq "RFE"
|
||||
(zero-or-one " ") "#")
|
||||
(seq "PR "
|
||||
(one-or-more (char "a-z+-")) "/"))
|
||||
(group (one-or-more (char "0-9"))
|
||||
(zero-or-one
|
||||
(seq "#" (one-or-more
|
||||
(char "0-9"))))))
|
||||
(seq "<https://bugs.gnu.org/"
|
||||
(group-n 2 (one-or-more (char "0-9")))
|
||||
">")))))
|
||||
|
||||
;; The following allows Emacs Debbugs user to open the issue directly within
|
||||
;; Emacs.
|
||||
(setq debbugs-browse-url-regexp
|
||||
(rx line-start
|
||||
"http" (zero-or-one "s") "://"
|
||||
(or "debbugs" "issues.guix" "bugs")
|
||||
".gnu.org" (one-or-more "/")
|
||||
(group (zero-or-one "cgi/bugreport.cgi?bug="))
|
||||
(group-n 3 (one-or-more digit))
|
||||
line-end))
|
||||
@end lisp
|
||||
|
||||
For more information, refer to @ref{Bug Reference,,, emacs, The GNU
|
||||
Emacs Manual} and @ref{Minor Mode,,, debbugs-ug, The Debbugs User
|
||||
Guide}.
|
||||
|
||||
@node Packaging Guidelines
|
||||
@section Packaging Guidelines
|
||||
|
||||
|
|
136
doc/guix.texi
136
doc/guix.texi
|
@ -6117,7 +6117,7 @@ the fingerprint of the OpenPGP used to sign it.
|
|||
@end enumerate
|
||||
|
||||
Before pushing to your public Git repository, you can run @command{guix
|
||||
git-authenticate} to verify that you did sign all the commits you are
|
||||
git authenticate} to verify that you did sign all the commits you are
|
||||
about to push with an authorized key:
|
||||
|
||||
@example
|
||||
|
@ -16837,24 +16837,37 @@ instance to support new system services.
|
|||
The operating system is configured by providing an
|
||||
@code{operating-system} declaration in a file that can then be passed to
|
||||
the @command{guix system} command (@pxref{Invoking guix system}). A
|
||||
simple setup, with the default system services, the default Linux-Libre
|
||||
kernel, initial RAM disk, and boot loader looks like this:
|
||||
simple setup, with the default Linux-Libre
|
||||
kernel, initial RAM disk, and a couple of system services added to those
|
||||
provided by default looks like this:
|
||||
|
||||
@findex operating-system
|
||||
@lisp
|
||||
@include os-config-bare-bones.texi
|
||||
@end lisp
|
||||
|
||||
This example should be self-describing. Some of the fields defined
|
||||
The configuration is declarative and hopefully mostly self-describing.
|
||||
It is actually code in the Scheme programming language; the whole
|
||||
@code{(operating-system @dots{})} expression produces a @dfn{record}
|
||||
with a number of @dfn{fields}.
|
||||
Some of the fields defined
|
||||
above, such as @code{host-name} and @code{bootloader}, are mandatory.
|
||||
Others, such as @code{packages} and @code{services}, can be omitted, in
|
||||
which case they get a default value.
|
||||
which case they get a default value. @xref{operating-system Reference},
|
||||
for details about all the available fields.
|
||||
|
||||
Below we discuss the effect of some of the most important fields
|
||||
(@pxref{operating-system Reference}, for details about all the available
|
||||
fields), and how to @dfn{instantiate} the operating system using
|
||||
Below we discuss the effect of some of the most important fields,
|
||||
and how to @dfn{instantiate} the operating system using
|
||||
@command{guix system}.
|
||||
|
||||
@quotation Do not panic
|
||||
@cindex Scheme programming language, getting started
|
||||
Intimidated by the Scheme language or curious about it? The Cookbook
|
||||
has a short section to get started that explains the fundamentals, which
|
||||
you will find helpful when hacking your configuration. @xref{A Scheme
|
||||
Crash Course,,, guix-cookbook, GNU Guix Cookbook}.
|
||||
@end quotation
|
||||
|
||||
@unnumberedsubsec Bootloader
|
||||
|
||||
@cindex legacy boot, on Intel machines
|
||||
|
@ -17028,14 +17041,6 @@ Alternatively, the @code{modify-services} macro can be used:
|
|||
(delete avahi-service-type))
|
||||
@end lisp
|
||||
|
||||
@quotation Do not panic
|
||||
@cindex Scheme programming language, getting started
|
||||
Intimidated by the Scheme language or curious about it? The Cookbook
|
||||
has a short section to get started that explains the fundamentals, which
|
||||
you will find helpful when hacking your configuration. @xref{A Scheme
|
||||
Crash Course,,, guix-cookbook, GNU Guix Cookbook}.
|
||||
@end quotation
|
||||
|
||||
@unnumberedsubsec Instantiating the System
|
||||
|
||||
Assuming the @code{operating-system} declaration
|
||||
|
@ -20459,10 +20464,16 @@ non-loopback interfaces that can be activated. Otherwise the DHCP
|
|||
client listens only on the specified interfaces.
|
||||
|
||||
@item @code{shepherd-requirement} (default: @code{'()})
|
||||
@itemx @code{shepherd-provision} (default: @code{'(networking)})
|
||||
This option can be used to provide a list of symbols naming Shepherd services
|
||||
that this service will depend on, such as @code{'wpa-supplicant} or
|
||||
@code{'iwd} if you require authenticated access for encrypted WiFi or Ethernet
|
||||
networks.
|
||||
|
||||
Likewise, @code{shepherd-provision} is a list of Shepherd service names
|
||||
(symbols) provided by this service. You might want to change the
|
||||
default value if you intend to run several DHCP clients, only one of
|
||||
which provides the @code{networking} Shepherd service.
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
|
@ -38086,6 +38097,65 @@ File name of the file system key for the target volume.
|
|||
@node Guix Services
|
||||
@subsection Guix Services
|
||||
|
||||
@subsubheading Build Farm Front-End (BFFE)
|
||||
The @uref{https://git.cbaines.net/guix/bffe/,Build Farm Front-End}
|
||||
assists with building Guix packages in bulk. It's responsible for
|
||||
submitting builds and displaying the status of the build farm.
|
||||
|
||||
@defvar bffe-service-type
|
||||
Service type for the Build Farm Front-End. Its value must be a
|
||||
@code{bffe-configuration} object.
|
||||
@end defvar
|
||||
|
||||
@deftp {Data Type} bffe-configuration
|
||||
Data type representing the configuration of the Build Farm Front-End.
|
||||
|
||||
@table @asis
|
||||
@item @code{package} (default: @code{bffe})
|
||||
The Build Farm Front-End package to use.
|
||||
|
||||
@item @code{user} (default: @code{"bffe"})
|
||||
The system user to run the service as.
|
||||
|
||||
@item @code{group} (default: @code{"bffe"})
|
||||
The system group to run the service as.
|
||||
|
||||
@item @code{arguments}
|
||||
A list of arguments to the Build Farm Front-End. These are passed to
|
||||
the @code{run-bffe-service} procedure when starting the service.
|
||||
|
||||
For example, the following value directs the Build Farm Front-End to
|
||||
submit builds for derivations available from @code{data.guix.gnu.org} to
|
||||
the Build Coordinator instance assumed to be running on the same
|
||||
machine.
|
||||
|
||||
@example
|
||||
(list
|
||||
#:build
|
||||
(list
|
||||
(build-from-guix-data-service
|
||||
(data-service-url "https://data.guix.gnu.org")
|
||||
(build-coordinator-url "http://127.0.0.1:8746")
|
||||
(branches '("master"))
|
||||
(systems '("x86_64-linux" "i686-linux"))
|
||||
(systems-and-targets
|
||||
(map (lambda (target)
|
||||
(cons "x86_64-linux" target))
|
||||
'("aarch64-linux-gnu"
|
||||
"i586-pc-gnu")))
|
||||
(build-priority (const 0))))
|
||||
#:web-server-args
|
||||
'(#:event-source "https://example.com"
|
||||
#:controller-args
|
||||
(#:title "example.com build farm")))
|
||||
@end example
|
||||
|
||||
@item @code{extra-environment-variables} (default: @var{'()})
|
||||
Extra environment variables to set via the shepherd service.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@subsubheading Guix Build Coordinator
|
||||
The @uref{https://git.cbaines.net/guix/build-coordinator/,Guix Build
|
||||
Coordinator} aids in distributing derivation builds among machines
|
||||
|
@ -40915,8 +40985,8 @@ QEMU monitor and the VM.
|
|||
@cindex image, creating disk images
|
||||
The @code{image} command can produce various image types. The image
|
||||
type can be selected using the @option{--image-type} option. It
|
||||
defaults to @code{mbr-raw}. When its value is @code{iso9660}, the
|
||||
@option{--label} option can be used to specify a volume ID with
|
||||
defaults to @code{mbr-hybrid-raw}. When its value is @code{iso9660},
|
||||
the @option{--label} option can be used to specify a volume ID with
|
||||
@code{image}. By default, the root file system of a disk image is
|
||||
mounted non-volatile; the @option{--volatile} option can be provided to
|
||||
make it volatile instead. When using @code{image}, the bootloader
|
||||
|
@ -40934,8 +41004,8 @@ qemu-system-x86_64 -enable-kvm -hda /tmp/my-image.qcow2 -m 1000 \
|
|||
-bios $(guix build ovmf)/share/firmware/ovmf_x64.bin
|
||||
@end example
|
||||
|
||||
When using the @code{mbr-raw} image type, a raw disk image is produced;
|
||||
it can be copied as is to a USB stick, for instance. Assuming
|
||||
When using the @code{mbr-hybrid-raw} image type, a raw disk image is
|
||||
produced; it can be copied as is to a USB stick, for instance. Assuming
|
||||
@code{/dev/sdc} is the device corresponding to a USB stick, one can copy
|
||||
the image to it using the following command:
|
||||
|
||||
|
@ -41072,7 +41142,7 @@ of the image.
|
|||
For the @code{image} action, create an image with given @var{type}.
|
||||
|
||||
When this option is omitted, @command{guix system} uses the
|
||||
@code{mbr-raw} image type.
|
||||
@code{mbr-hybrid-raw} image type.
|
||||
|
||||
@cindex ISO-9660 format
|
||||
@cindex CD image format
|
||||
|
@ -45280,7 +45350,7 @@ then directly boot from it, without any kind of installation procedure.
|
|||
|
||||
The @command{guix system image} command is able to turn an operating
|
||||
system definition into a bootable image. This command supports
|
||||
different image types, such as @code{mbr-raw}, @code{iso9660} and
|
||||
different image types, such as @code{mbr-hybrid-raw}, @code{iso9660} and
|
||||
@code{docker}. Any modern @code{x86_64} machine will probably be able
|
||||
to boot from an @code{iso9660} image. However, there are a few machines
|
||||
out there that require specific image types. Those machines, in general
|
||||
|
@ -45544,8 +45614,24 @@ from them to simplify the @code{image} definition. The @code{(gnu
|
|||
system image)} module provides the following @code{image} definition
|
||||
variables.
|
||||
|
||||
@defvar mbr-disk-image
|
||||
An MBR disk-image composed of a single ROOT partition. The ROOT
|
||||
partition starts at a 1@tie{}MiB offset so that the bootloader can
|
||||
install itself in the post-MBR gap.
|
||||
@end defvar
|
||||
|
||||
@defvar mbr-hybrid-disk-image
|
||||
An MBR disk-image composed of two partitions: a 64 bits ESP partition
|
||||
and a ROOT boot partition. The ESP partition starts at a 1@tie{}MiB
|
||||
offset so that a BIOS compatible bootloader can install itself in the
|
||||
post-MBR gap. The image can be used by @code{x86_64} and @code{i686}
|
||||
machines supporting only legacy BIOS booting. The ESP partition ensures
|
||||
that it can also be used by newer machines relying on UEFI booting,
|
||||
hence the @emph{hybrid} denomination.
|
||||
@end defvar
|
||||
|
||||
@defvar efi-disk-image
|
||||
A MBR disk-image composed of two partitions: a 64 bits ESP partition and
|
||||
A GPT disk-image composed of two partitions: a 64 bits ESP partition and
|
||||
a ROOT boot partition. This image can be used on most @code{x86_64} and
|
||||
@code{i686} machines, supporting BIOS or UEFI booting.
|
||||
@end defvar
|
||||
|
@ -45636,6 +45722,10 @@ system image)} and the @code{(gnu system images @dots{})} modules.
|
|||
Build an image based on the @code{mbr-disk-image} image.
|
||||
@end defvar
|
||||
|
||||
@defvar mbr-hybrid-raw-image-type
|
||||
Build an image based on the @code{mbr-hybrid-disk-image} image.
|
||||
@end defvar
|
||||
|
||||
@defvar efi-raw-image-type
|
||||
Build an image based on the @code{efi-disk-image} image.
|
||||
@end defvar
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
(srfi srfi-1))
|
||||
|
||||
(use-package-modules
|
||||
base bootloaders commencement compression file gawk gdb gettext guile
|
||||
base bootloaders commencement compression file gawk gdb gettext gtk guile
|
||||
hurd less m4 package-management python ssh version-control)
|
||||
|
||||
(define (input->package input)
|
||||
|
@ -72,6 +72,9 @@
|
|||
;; system
|
||||
grub-minimal grub
|
||||
|
||||
;; system reconfigure
|
||||
gdk-pixbuf
|
||||
|
||||
(append
|
||||
guix-dependencies
|
||||
%base-packages/hurd)))
|
||||
|
|
|
@ -639,6 +639,10 @@ GLib/GIO, GTK, GStreamer and Webkit."
|
|||
"cox.katherine.e+guix@gmail.com")
|
||||
emacs go lisp)
|
||||
|
||||
(define-member (person "Marius Bakke"
|
||||
"marius@gnu.org")
|
||||
python)
|
||||
|
||||
|
||||
(define (find-team name)
|
||||
(or (hash-ref %teams (string->symbol name))
|
||||
|
|
|
@ -66,12 +66,21 @@
|
|||
|
||||
(define %release-commits
|
||||
;; Release commits: the list of version/commit pairs.
|
||||
'(("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff")
|
||||
("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063")
|
||||
("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2")
|
||||
("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac")
|
||||
("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c")
|
||||
("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c")))
|
||||
'(("1.4.0" . "8e2f32cee982d42a79e53fc1e9aa7b8ff0514714")
|
||||
("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff")
|
||||
|
||||
;; FIXME: To merely compute the derivation of these revisions, we need to
|
||||
;; be able to build their dependencies. However, pre-built binaries are
|
||||
;; currently missing and some of these no longer build from source due to
|
||||
;; time bombs like <https://issues.guix.gnu.org/58650>. Thus, comment
|
||||
;; them output until we have substitutes for these old things.
|
||||
|
||||
;; ("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063")
|
||||
;; ("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2")
|
||||
;; ("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac")
|
||||
;; ("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c")
|
||||
;; ("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c")
|
||||
))
|
||||
|
||||
(manifest
|
||||
(map (match-lambda
|
||||
|
|
|
@ -268,7 +268,7 @@ otherwise use the IMAGE name."
|
|||
(if (member system %guix-system-supported-systems)
|
||||
`(,(image->job store
|
||||
(image
|
||||
(inherit efi-disk-image)
|
||||
(inherit mbr-hybrid-disk-image)
|
||||
(operating-system installation-os))
|
||||
#:name "usb-image"
|
||||
#:system system)
|
||||
|
|
|
@ -172,7 +172,7 @@ format."))
|
|||
;; FIXME: This fails to start if Home is first activated from a
|
||||
;; non-X11 session.
|
||||
(start #~(make-forkexec-constructor
|
||||
(list #$(file-append redshift "/bin/redshift")
|
||||
(list #$(file-append (home-redshift-configuration-redshift config) "/bin/redshift")
|
||||
"-c" #$config-file)))
|
||||
(stop #~(make-kill-destructor))
|
||||
(actions (list (shepherd-configuration-action config-file))))))
|
||||
|
|
|
@ -183,7 +183,8 @@ another process for example)."))
|
|||
(mixed-text-file
|
||||
"zshenv"
|
||||
(zsh-serialize-field config 'zshenv)
|
||||
(zsh-serialize-field config 'environment-variables)))
|
||||
(zsh-serialize-field config 'environment-variables)
|
||||
"[ -n \"$SSH_CLIENT\" ] && source /etc/profile"))
|
||||
|
||||
(define (zsh-file-zprofile config)
|
||||
(mixed-text-file
|
||||
|
@ -209,9 +210,7 @@ source ~/.profile
|
|||
|
||||
(define (zsh-get-configuration-files config)
|
||||
`((".zprofile" ,(zsh-file-by-field config 'zprofile)) ;; Always non-empty
|
||||
,@(if (or (zsh-field-not-empty? config 'zshenv)
|
||||
(zsh-field-not-empty? config 'environment-variables))
|
||||
`((".zshenv" ,(zsh-file-by-field config 'zshenv))) '())
|
||||
(".zshenv" ,(zsh-file-by-field config 'zshenv)) ;; Always non-empty
|
||||
,@(if (zsh-field-not-empty? config 'zshrc)
|
||||
`((".zshrc" ,(zsh-file-by-field config 'zshrc))) '())
|
||||
,@(if (zsh-field-not-empty? config 'zlogin)
|
||||
|
|
12
gnu/local.mk
12
gnu/local.mk
|
@ -902,6 +902,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/akonadi-not-relocatable.patch \
|
||||
%D%/packages/patches/akonadi-timestamps.patch \
|
||||
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
|
||||
%D%/packages/patches/alure-dumb-2.patch \
|
||||
%D%/packages/patches/ibus-anthy-fix-tests.patch \
|
||||
%D%/packages/patches/ibus-table-paths.patch \
|
||||
%D%/packages/patches/anki-mpv-args.patch \
|
||||
|
@ -1116,6 +1117,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/emacs-kv-fix-tests.patch \
|
||||
%D%/packages/patches/emacs-pgtk-super-key-fix.patch \
|
||||
%D%/packages/patches/emacs-xelb-ignore-length-element.patch \
|
||||
%D%/packages/patches/enblend-enfuse-reproducible.patch \
|
||||
%D%/packages/patches/enjarify-setup-py.patch \
|
||||
%D%/packages/patches/enlightenment-fix-setuid-path.patch \
|
||||
%D%/packages/patches/erlang-man-path.patch \
|
||||
|
@ -1123,7 +1125,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/esmini-use-pkgconfig.patch \
|
||||
%D%/packages/patches/esmtp-add-lesmtp.patch \
|
||||
%D%/packages/patches/eudev-rules-directory.patch \
|
||||
%D%/packages/patches/evdi-fix-build-with-linux-6.2.patch \
|
||||
%D%/packages/patches/exercism-disable-self-update.patch \
|
||||
%D%/packages/patches/extempore-unbundle-external-dependencies.patch \
|
||||
%D%/packages/patches/extundelete-e2fsprogs-1.44.patch \
|
||||
|
@ -1290,6 +1291,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch \
|
||||
%D%/packages/patches/glibc-2.37-versioned-locpath.patch \
|
||||
%D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \
|
||||
%D%/packages/patches/glibc-hurd-getauxval.patch \
|
||||
%D%/packages/patches/glibc-hurd-gettyent.patch \
|
||||
%D%/packages/patches/glibc-hurd-mach-print.patch \
|
||||
%D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \
|
||||
|
@ -1309,6 +1311,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gnash-fix-giflib-version.patch \
|
||||
%D%/packages/patches/gnome-2048-fix-positional-argument.patch \
|
||||
%D%/packages/patches/gnome-control-center-libexecdir.patch \
|
||||
%D%/packages/patches/gnome-dictionary-meson-i18n.patch \
|
||||
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
|
||||
%D%/packages/patches/gnome-settings-daemon-gc.patch \
|
||||
%D%/packages/patches/gnome-session-support-elogind.patch \
|
||||
|
@ -1375,10 +1378,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \
|
||||
%D%/packages/patches/gzdoom-search-in-installed-share.patch \
|
||||
%D%/packages/patches/gzdoom-find-system-libgme.patch \
|
||||
%D%/packages/patches/hdf4-architectures.patch \
|
||||
%D%/packages/patches/hdf4-reproducibility.patch \
|
||||
%D%/packages/patches/hdf4-shared-fortran.patch \
|
||||
%D%/packages/patches/hdf4-tirpc.patch \
|
||||
%D%/packages/patches/hdf5-config-date.patch \
|
||||
%D%/packages/patches/hdf-eos2-build-shared.patch \
|
||||
%D%/packages/patches/hdf-eos2-remove-gctp.patch \
|
||||
|
@ -1454,6 +1455,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
|
||||
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
|
||||
%D%/packages/patches/julia-Use-MPFR-4.2.patch \
|
||||
%D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \
|
||||
%D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \
|
||||
%D%/packages/patches/libobjc2-unbundle-robin-map.patch \
|
||||
%D%/packages/patches/librime-fix-build-with-gcc10.patch \
|
||||
|
@ -1484,6 +1486,7 @@ dist_patch_DATA = \
|
|||
%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/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
|
||||
%D%/packages/patches/kodi-mesa-eglchromium.patch \
|
||||
%D%/packages/patches/laby-make-install.patch \
|
||||
%D%/packages/patches/laby-use-tmpdir-from-runtime.patch \
|
||||
|
@ -1641,6 +1644,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mutter-fix-inverted-test.patch \
|
||||
%D%/packages/patches/mutt-store-references.patch \
|
||||
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
|
||||
%D%/packages/patches/nanosvg-prusa-slicer.patch \
|
||||
%D%/packages/patches/nautilus-extension-search-path.patch \
|
||||
%D%/packages/patches/ncompress-fix-softlinks.patch \
|
||||
%D%/packages/patches/ncftp-reproducible.patch \
|
||||
|
@ -1696,6 +1700,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/openjdk-10-pointer-comparison.patch \
|
||||
%D%/packages/patches/openjdk-10-setsignalhandler.patch \
|
||||
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
|
||||
%D%/packages/patches/openjdk-21-fix-rpath.patch \
|
||||
%D%/packages/patches/openmpi-mtl-priorities.patch \
|
||||
%D%/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch \
|
||||
%D%/packages/patches/openssh-trust-guix-store-directory.patch \
|
||||
|
@ -2004,6 +2009,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/tcsh-fix-autotest.patch \
|
||||
%D%/packages/patches/teensy-loader-cli-help.patch \
|
||||
%D%/packages/patches/tensorflow-c-api-fix.patch \
|
||||
%D%/packages/patches/tensorflow-lite-unbundle.patch \
|
||||
%D%/packages/patches/texinfo-headings-single.patch \
|
||||
%D%/packages/patches/texinfo-5-perl-compat.patch \
|
||||
%D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
||||
;;; Copyright © 2016, 2017, 2020 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017, 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
|
||||
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
|
||||
|
@ -36,7 +36,7 @@
|
|||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021, 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
|
||||
;;; Copyright © 2021 qblade <qblade@protonmail.com>
|
||||
;;; Copyright © 2021 Hyunseok Kim <lasnesne@lagunposprasihopre.org>
|
||||
|
@ -101,7 +101,6 @@
|
|||
#:use-module (gnu packages acl)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages attr)
|
||||
#:use-module (gnu packages autogen)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
|
@ -112,7 +111,6 @@
|
|||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages crates-graphics)
|
||||
#:use-module (gnu packages crates-io)
|
||||
#:use-module (gnu packages cross-base)
|
||||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages cryptsetup)
|
||||
#:use-module (gnu packages curl)
|
||||
|
@ -140,7 +138,6 @@
|
|||
#:use-module (gnu packages inkscape)
|
||||
#:use-module (gnu packages kerberos)
|
||||
#:use-module (gnu packages libbsd)
|
||||
#:use-module (gnu packages libftdi)
|
||||
#:use-module (gnu packages libunwind)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux)
|
||||
|
@ -153,6 +150,7 @@
|
|||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (gnu packages openldap)
|
||||
#:use-module (gnu packages package-management)
|
||||
#:use-module (gnu packages patchutils)
|
||||
#:use-module (gnu packages pciutils)
|
||||
#:use-module (gnu packages pcre)
|
||||
|
@ -160,11 +158,9 @@
|
|||
#:use-module (gnu packages perl-check)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages polkit)
|
||||
#:use-module (gnu packages popt)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-build)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages readline)
|
||||
|
@ -407,6 +403,43 @@ interface and is based on GNU Guile.")
|
|||
(native-inputs (list pkg-config guile-2.2))
|
||||
(inputs (list guile-2.2 guile2.2-fibers))))
|
||||
|
||||
(define-public swineherd
|
||||
(package
|
||||
(name "swineherd")
|
||||
(version "0.0.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/BIMSBbioinfo/swineherd")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18nk0sy5s0dm2rhxnrrn8g0m098b110mxnnxa2vnl1dnvfdzszw8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--localstatedir=/var")
|
||||
#:make-flags '("GUILE_AUTO_COMPILE=0")))
|
||||
(native-inputs
|
||||
(list autoconf automake guile-3.0 pkg-config texinfo))
|
||||
(propagated-inputs
|
||||
(list btrfs-progs
|
||||
guile-config
|
||||
guile-fibers-1.3
|
||||
guile-netlink
|
||||
guile-3.0
|
||||
guix
|
||||
shepherd-0.10))
|
||||
(home-page "https://github.com/BIMSBbioinfo/swineherd")
|
||||
(synopsis "System container manager")
|
||||
(description
|
||||
"This project aims to provide an extension to the Shepherd, retraining it
|
||||
as a swineherd, a manager of crude system containers. It does this by
|
||||
providing a Shepherd service @code{swineherd} that talks to the Shepherd
|
||||
process to create Guix System containers as Shepherd services. It also comes
|
||||
with an optional HTTP API server.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public cfm
|
||||
(package
|
||||
(name "cfm")
|
||||
|
@ -1233,13 +1266,13 @@ IPv6, proxies, and Unix sockets.")
|
|||
(define-public nmon
|
||||
(package
|
||||
(name "nmon")
|
||||
(version "16n")
|
||||
(version "16p")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/nmon/lmon" version ".c"))
|
||||
(sha256
|
||||
(base32 "1wpm2f30414b87kpbr9hbidblr5cmfby5skwqd0fkpi5v712q0f0"))))
|
||||
(base32 "0akbkv70zffdmc5p51r02rlxd8b3jvkgl64rjsd29qr5cxgh9ijx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ; no test suite
|
||||
|
@ -1940,7 +1973,11 @@ at once based on a Perl regular expression.")
|
|||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "rc/rc"
|
||||
(("/usr/sbin/sendmail")
|
||||
(search-input-file inputs "/bin/mail")))))
|
||||
(search-input-file inputs "/bin/mail")))
|
||||
(with-fluids ((%default-port-encoding "ISO-8859-1"))
|
||||
(substitute* "src/rottlog"
|
||||
(("awk")
|
||||
(search-input-file inputs "/bin/awk"))))))
|
||||
(add-after 'build 'set-packdir
|
||||
(lambda _
|
||||
;; Set a default location for archived logs.
|
||||
|
@ -1959,7 +1996,7 @@ at once based on a Perl regular expression.")
|
|||
(lambda _
|
||||
(invoke "make" "install-info"))))))
|
||||
(native-inputs (list autoconf automake texinfo util-linux)) ; for 'cal'
|
||||
(inputs (list coreutils mailutils))
|
||||
(inputs (list coreutils gawk mailutils))
|
||||
(home-page "https://www.gnu.org/software/rottlog/")
|
||||
(synopsis "Log rotation and management")
|
||||
(description
|
||||
|
@ -2400,14 +2437,14 @@ network, which causes enabled computers to power on.")
|
|||
(define-public dmidecode
|
||||
(package
|
||||
(name "dmidecode")
|
||||
(version "3.4")
|
||||
(version "3.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/dmidecode/dmidecode-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "04i2ahvqinkrnzfsbswplv9wff36xf9b3snvriwrjz26v18sijs3"))))
|
||||
(base32 "0wy0khw02sr59f43fdahh6as1xc3jv7n8abj59p1j9cfxqsngmvr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ; no 'check' target
|
||||
|
@ -2416,7 +2453,7 @@ network, which causes enabled computers to power on.")
|
|||
(string-append "prefix=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
(delete 'configure)))) ; no configure script
|
||||
(home-page "https://www.nongnu.org/dmidecode/")
|
||||
(synopsis "Read hardware information from the BIOS")
|
||||
(description
|
||||
|
@ -3970,12 +4007,12 @@ Intel DRM Driver.")
|
|||
"0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; there are no tests
|
||||
#:make-flags
|
||||
(list (string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
(list #:tests? #f ; there are no tests
|
||||
#:make-flags
|
||||
#~(list (string-append "PREFIX=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
(home-page "https://github.com/dylanaraps/neofetch")
|
||||
(synopsis "System information script")
|
||||
(description "Neofetch is a command-line system information tool written in
|
||||
|
@ -4037,15 +4074,15 @@ you are running, what theme or icon set you are using, etc.")
|
|||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-before 'build 'patch-source-paths
|
||||
(lambda _
|
||||
(substitute* "fetch.c"
|
||||
(("grep")
|
||||
#$(file-append grep "/bin/grep"))
|
||||
(("awk")
|
||||
#$(file-append gawk "/bin/awk")))
|
||||
(substitute* "uwufetch.c"
|
||||
(("(/usr(/local)?)(.*;)" all _ _ rest)
|
||||
(string-append #$output rest)))))
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((grep (search-input-file inputs "/bin/grep"))
|
||||
(awk (search-input-file inputs "/bin/awk")))
|
||||
(substitute* "fetch.c"
|
||||
(("grep") grep)
|
||||
(("awk") awk))
|
||||
(substitute* "uwufetch.c"
|
||||
(("(/usr(/local)?)(.*;)" all _ _ rest)
|
||||
(string-append #$output rest))))))
|
||||
;; TODO this will be fixed in the next release of uwufetch
|
||||
(add-before 'install 'make-include-dir
|
||||
(lambda _
|
||||
|
@ -4167,8 +4204,8 @@ everyone's screenshots nowadays.")
|
|||
(license license:expat))))
|
||||
|
||||
(define-public pfetch
|
||||
(let ((commit "e18a0959ab98b963744755ec4687e59dc11db3c5")
|
||||
(revision "0"))
|
||||
(let ((commit "a906ff89680c78cec9785f3ff49ca8b272a0f96b")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "pfetch")
|
||||
(version (git-version "0.7.0" revision commit))
|
||||
|
@ -4180,7 +4217,7 @@ everyone's screenshots nowadays.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1md40av6i3xvvwig5jzhy4kf3s5sgxxk35r0vcyrjd8qyndk927l"))))
|
||||
"1yhf8mxjn58gjfdii3bpn8522gfaicd8jxjxvmwi2jz7fgvp0zpn"))))
|
||||
(build-system trivial-build-system)
|
||||
(inputs (list bash))
|
||||
(arguments
|
||||
|
@ -4197,8 +4234,7 @@ everyone's screenshots nowadays.")
|
|||
(install-file (source "pfetch") (string-append output "/bin"))
|
||||
(patch-shebang
|
||||
(string-append output "/bin/pfetch")
|
||||
(list (string-append (assoc-ref %build-inputs "bash") "/bin")))
|
||||
#t))))
|
||||
(list (string-append (assoc-ref %build-inputs "bash") "/bin")))))))
|
||||
(home-page "https://github.com/dylanaraps/pfetch")
|
||||
(synopsis "System information tool")
|
||||
(description "This package provides a simple, configurable system
|
||||
|
@ -4208,14 +4244,14 @@ information tool.")
|
|||
(define-public nnn
|
||||
(package
|
||||
(name "nnn")
|
||||
(version "4.7")
|
||||
(version "4.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/jarun/nnn/releases/download/v"
|
||||
version "/nnn-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0dbm54m3iv8hzar38dsfxh77z4mlpjj649ga82s0wwms4vlrm5pg"))))
|
||||
(base32 "0d8apcichwbmsqgbs0kay3k63898x6xdxpb9hn1nvv5qwxxdq59b"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list ncurses readline))
|
||||
|
@ -4454,7 +4490,7 @@ Python loading in HPC environments.")
|
|||
(let ((real-name "inxi"))
|
||||
(package
|
||||
(name "inxi-minimal")
|
||||
(version "3.3.28-1")
|
||||
(version "3.3.29-1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -4463,7 +4499,7 @@ Python loading in HPC environments.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name real-name version))
|
||||
(sha256
|
||||
(base32 "0h00dasmw3crci8kwpa503jljy3c5r2fsdhpbbczhsgznhlr8pbi"))))
|
||||
(base32 "05z0vydfmkva61kj14p6jxy7dr8qwd024a7nn8pib57q4qnjm4r8"))))
|
||||
(build-system trivial-build-system)
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
|
@ -5953,7 +5989,7 @@ Discover other RouterOS devices or @command{mactelnetd} hosts.
|
|||
(define-public bfs
|
||||
(package
|
||||
(name "bfs")
|
||||
(version "3.0.1")
|
||||
(version "3.0.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -5962,7 +5998,7 @@ Discover other RouterOS devices or @command{mactelnetd} hosts.
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ffma9p82bl0ai4h439cnhvcyyy8x593m27xlf16gsg6knpldm58"))))
|
||||
"055qn2bhnyk9k96w8aviz7v4wip9hwsv7ak1m3yygm1x3fhdyhyz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:make-flags #~(list (string-append "CC="
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
|
||||
;;; Copyright © 2022 Andy Tai <atai@atai.org>
|
||||
;;; Copyright © 2023 Simon South <simon@simonsouth.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -33,6 +34,7 @@
|
|||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module ((guix build utils) #:select (parallel-job-count))
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
|
@ -55,10 +57,69 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages sphinx)
|
||||
#:use-module (gnu packages shells)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module ((guix utils)
|
||||
#:select (%current-system cc-for-target)))
|
||||
|
||||
(define-public asl
|
||||
(let ((build "247"))
|
||||
(package
|
||||
(name "asl")
|
||||
(version (string-append "1.42-beta-" build))
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/"
|
||||
"asl-current-142-bld" build ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1qgz5yzg50vpwzrjqvw8bgnvm67dqhfb8ldxyqwaqmrj3icshp5s"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:make-flags #~(list "V=1") ; ensures output during "check" phase
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'bootstrap)
|
||||
(replace 'configure
|
||||
(lambda* (#:key target #:allow-other-keys)
|
||||
(copy-file "Makefile.def-samples/Makefile.def-unknown-linux"
|
||||
"Makefile.def")
|
||||
|
||||
;; Use the cross-compilation tools when cross-compiling.
|
||||
(when #$(%current-target-system)
|
||||
(substitute* "Makefile.def"
|
||||
(("^(TARG_(CC|LD) = ).*" all prefix)
|
||||
(string-append prefix target "-gcc\n"))))
|
||||
|
||||
;; Set the output directories appropriately.
|
||||
(substitute* "Makefile.def"
|
||||
(("^(DOCDIR = ).*" all prefix)
|
||||
(string-append prefix #$output:doc "/share/doc/" #$name))
|
||||
(("/usr/local")
|
||||
#$output))))
|
||||
(add-after 'check 'build-doc
|
||||
(lambda* (#:key parallel-build? #:allow-other-keys)
|
||||
(invoke "make"
|
||||
"-j" (if parallel-build?
|
||||
(number->string (parallel-job-count))
|
||||
"1")
|
||||
"docs"))))
|
||||
#:test-target "test"))
|
||||
(native-inputs
|
||||
(list (texlive-updmap.cfg (list texlive-german texlive-hyperref))))
|
||||
(outputs '("out" "doc"))
|
||||
(home-page "http://john.ccac.rwth-aachen.de:8000/as/")
|
||||
(synopsis
|
||||
"AS macro cross-assembler for microprocessors and microcontrollers")
|
||||
(description
|
||||
"AS is a portable macro cross-assembler targeting a wide range of
|
||||
microprocessors and microcontrollers, including devices from Intel, Motorola,
|
||||
MOS Technology, Hitachi, Fujitsu, NEC, Texas Instruments, Zilog and many other
|
||||
manufacturers.")
|
||||
(license (list license:gpl2 license:gpl3)))))
|
||||
|
||||
(define-public nasm
|
||||
(package
|
||||
(name "nasm")
|
||||
|
@ -134,14 +195,14 @@ debugging information in STABS, DWARF 2, and CodeView 8 formats.")
|
|||
(define-public lightning
|
||||
(package
|
||||
(name "lightning")
|
||||
(version "2.2.1")
|
||||
(version "2.2.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/lightning/lightning-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1aiwx9cl9c7swqcgrsjnvd5laah3iwxzl1van3670iv8sn0icrwq"))))
|
||||
"1qmkfg7br543kqy82hhpr1n8bsm9wrwb1z5w2whxc5xdvr185jha"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list zlib))
|
||||
(arguments
|
||||
|
|
|
@ -3330,6 +3330,38 @@ buffers, and audio capture.")
|
|||
(home-page "https://kcat.strangesoft.net/openal.html")
|
||||
(license license:lgpl2.0)))
|
||||
|
||||
(define-public alure
|
||||
(package
|
||||
(name "alure")
|
||||
(version "1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://kcat.tomasu.net/alure-releases/"
|
||||
"alure-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6"))
|
||||
(patches (search-patches "alure-dumb-2.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no tests
|
||||
#:configure-flags '("-DMODPLUG=ON")))
|
||||
(native-inputs (list pkg-config))
|
||||
(inputs (list dumb
|
||||
flac
|
||||
mpg123
|
||||
libmodplug
|
||||
libsndfile
|
||||
libvorbis
|
||||
openal))
|
||||
(home-page "https://kcat.tomasu.net/alure.html")
|
||||
(synopsis "OpenAL utility library")
|
||||
(description
|
||||
"ALURE is a utility library to help manage common tasks with OpenAL applications.
|
||||
This includes device enumeration and initialization, file loading, and
|
||||
streaming.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public patchage
|
||||
(package
|
||||
(name "patchage")
|
||||
|
@ -6287,7 +6319,7 @@ and DSD streams.")
|
|||
(define-public qpwgraph
|
||||
(package
|
||||
(name "qpwgraph")
|
||||
(version "0.5.2")
|
||||
(version "0.5.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -6296,9 +6328,10 @@ and DSD streams.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"186c3s56py8xjasbp4380m9sqdba9mf7mppqz8hkli1nhbspbix9"))))
|
||||
"1i9p8gqm9swa2szr7i8rf3dhqxlaqjslb6yd5s9z1rs1jdb9lhp7"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments (list #:tests? #f)) ;; no tests
|
||||
(arguments
|
||||
(list #:tests? #f)) ; no tests
|
||||
(inputs (list alsa-lib
|
||||
libxkbcommon
|
||||
pipewire
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cross-base)
|
||||
|
|
|
@ -481,14 +481,14 @@ errors.")
|
|||
(define-public rdiff-backup
|
||||
(package
|
||||
(name "rdiff-backup")
|
||||
(version "2.2.5")
|
||||
(version "2.2.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/rdiff-backup/rdiff-backup/releases/"
|
||||
"download/v" version "/rdiff-backup-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "13m0kq9y6rzgaq0zlzh7qhi789qmbzp3dnc7y57fmhsfg1mq5ql6"))))
|
||||
(base32 "1ksqjkqadhxzp83zdfs80dvb494vn9q4anppnwxm3ikb4rbq6xyh"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
(list python-setuptools-scm))
|
||||
|
@ -635,13 +635,13 @@ detection, and lossless compression.")
|
|||
(define-public borg
|
||||
(package
|
||||
(name "borg")
|
||||
(version "1.2.4")
|
||||
(version "1.2.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "borgbackup" version))
|
||||
(sha256
|
||||
(base32 "1a2d6z2ln476l0fcnkl4rpciij5b2lql44b71aivg0cy8vlm9gd4"))
|
||||
(base32 "178klb3pglhhz553frf928v7zvaiqvri9fbhj33yx7h3hvqgi9mp"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages ed)
|
||||
#:use-module (gnu packages gawk)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages multiprecision)
|
||||
|
@ -1463,7 +1462,8 @@ command.")
|
|||
"glibc-2.37-hurd-clock_t_centiseconds.patch"
|
||||
"glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch"
|
||||
"glibc-hurd-mach-print.patch"
|
||||
"glibc-hurd-gettyent.patch"))))
|
||||
"glibc-hurd-gettyent.patch"
|
||||
"glibc-hurd-getauxval.patch"))))
|
||||
(supported-systems %hurd-systems)))
|
||||
|
||||
(define-public glibc/hurd-headers
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#:use-module (gnu packages haskell-xyz)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages java)
|
||||
#:use-module (gnu packages javascript)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages netpbm)
|
||||
#:use-module (gnu packages python)
|
||||
|
@ -7194,13 +7195,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.")
|
|||
(define-public r-genomeinfodb
|
||||
(package
|
||||
(name "r-genomeinfodb")
|
||||
(version "1.36.2")
|
||||
(version "1.36.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "GenomeInfoDb" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bd46s7ch4j70n0snjf2nyx8gzkxn7d563jh5i3i0wzb647f5hbg"))))
|
||||
"04bh4481jcj91xdh11ic4519jczck6zmysbpnpbbhykanp31z4pf"))))
|
||||
(properties
|
||||
`((upstream-name . "GenomeInfoDb")))
|
||||
(build-system r-build-system)
|
||||
|
@ -7253,13 +7254,13 @@ alignments.")
|
|||
(define-public r-genomicdatacommons
|
||||
(package
|
||||
(name "r-genomicdatacommons")
|
||||
(version "1.24.2")
|
||||
(version "1.24.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "GenomicDataCommons" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0dgvhi6nbc1qvrdwww2r39gxd2xmbadvy03lxh5nny9pyhhdlz3l"))))
|
||||
"1grvria7lx7p0py3w8yi0j41bpfx951lds5db7jdiq0j8l75fh38"))))
|
||||
(properties `((upstream-name . "GenomicDataCommons")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-dplyr
|
||||
|
@ -7272,6 +7273,7 @@ alignments.")
|
|||
r-readr
|
||||
r-rlang
|
||||
r-tibble
|
||||
r-tidyr
|
||||
r-xml2))
|
||||
(native-inputs (list r-knitr))
|
||||
(home-page "https://bioconductor.org/packages/GenomicDataCommons")
|
||||
|
@ -7734,6 +7736,90 @@ of other R packages who wish to make use of HTSlib.")
|
|||
microarray data, using nearest neighbor averaging.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-interactivedisplay
|
||||
(package
|
||||
(name "r-interactivedisplay")
|
||||
(version "1.38.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "interactiveDisplay" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1y9fdnpz1bagrwhyj8jikp2q5fd9y74j48l5z7f0s88v88sa7szl"))
|
||||
(snippet
|
||||
'(for-each delete-file
|
||||
'("inst/www/js/jquery.js"
|
||||
"inst/www/js/jquery.min.js"
|
||||
"inst/www/js/jquery.dataTables.min.js")))))
|
||||
(properties `((upstream-name . "interactiveDisplay")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:modules '((guix build utils)
|
||||
(guix build r-build-system)
|
||||
(srfi srfi-1))
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'process-javascript
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(call-with-values
|
||||
(lambda ()
|
||||
(unzip2
|
||||
`((,(assoc-ref inputs "js-jquery-1.8.2")
|
||||
"inst/www/js/jquery.js")
|
||||
(,(assoc-ref inputs "js-jquery-1.9.1")
|
||||
"inst/www/js/jquery.min.js")
|
||||
(,(search-input-file inputs
|
||||
"/share/javascript/jquery.dataTables.min.js")
|
||||
"inst/www/js/jquery.dataTables.min.js"))))
|
||||
(lambda (sources targets)
|
||||
(for-each (lambda (source target)
|
||||
(format #true "Processing ~a --> ~a~%"
|
||||
source target)
|
||||
(invoke "esbuild" source "--minify"
|
||||
(string-append "--outfile=" target)))
|
||||
sources targets))))))))
|
||||
(propagated-inputs
|
||||
(list r-annotationdbi
|
||||
r-biocgenerics
|
||||
r-biocmanager
|
||||
r-category
|
||||
r-dt
|
||||
r-ggplot2
|
||||
r-gridsvg
|
||||
r-interactivedisplaybase
|
||||
r-plyr
|
||||
r-rcolorbrewer
|
||||
r-reshape2
|
||||
r-shiny
|
||||
r-zlibbioc
|
||||
r-xml))
|
||||
(native-inputs
|
||||
`(("esbuild" ,esbuild)
|
||||
("r-knitr" ,r-knitr)
|
||||
("js-datatables" ,js-datatables)
|
||||
("js-jquery-1.8.2"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://code.jquery.com/jquery-1.8.2.js")
|
||||
(sha256
|
||||
(base32
|
||||
"0nikk2clbnyi02k0brvhbd8m43lfh4l1zrya35jya9sy6wb9b9ng"))))
|
||||
("js-jquery-1.9.1"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://code.jquery.com/jquery-1.9.1.js")
|
||||
(sha256
|
||||
(base32
|
||||
"0h4dk67yc9d0kadqxb6b33585f3x3559p6qmp70l00qwq030vn3v"))))))
|
||||
(home-page "https://bioconductor.org/packages/interactiveDisplay")
|
||||
(synopsis "Package for Shiny web displays of Bioconductor objects")
|
||||
(description
|
||||
"This package offers interactive Shiny displays for Bioconductor
|
||||
objects. In addition, this package empowers users to develop engaging
|
||||
visualizations and interfaces for working with Bioconductor data.")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public r-interactivedisplaybase
|
||||
(package
|
||||
(name "r-interactivedisplaybase")
|
||||
|
@ -9727,13 +9813,13 @@ and advanced quality control routines.")
|
|||
(define-public r-shinymethyl
|
||||
(package
|
||||
(name "r-shinymethyl")
|
||||
(version "1.36.0")
|
||||
(version "1.36.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "shinyMethyl" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rqwwglj0475gr14bxazfmcvsy7rq6nlw2zcswa684751wy15w0r"))))
|
||||
"0hq1q66vjd9pwdwm9zx8q45ws65bn6cm87zmjmyc3md8dwvb8cck"))))
|
||||
(properties `((upstream-name . "shinyMethyl")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -9877,16 +9963,17 @@ level.")
|
|||
(define-public r-tcgautils
|
||||
(package
|
||||
(name "r-tcgautils")
|
||||
(version "1.20.2")
|
||||
(version "1.20.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "TCGAutils" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0nnfrd5x3mii9adizvz79jinlxn2lhg4civ9v0wwygmdhk7rrm1n"))))
|
||||
"02mkijvh2h58wg7hsi76ycw6gapl0ai190agckaw4l54sqpsx91q"))))
|
||||
(properties `((upstream-name . "TCGAutils")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-annotationdbi
|
||||
r-biocbaseutils
|
||||
r-biocgenerics
|
||||
r-genomeinfodb
|
||||
r-genomicdatacommons
|
||||
|
@ -11023,13 +11110,13 @@ posterior for individual coefficients.")
|
|||
(define-public r-greylistchip
|
||||
(package
|
||||
(name "r-greylistchip")
|
||||
(version "1.32.0")
|
||||
(version "1.32.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "GreyListChIP" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1sfpf9msnzyrc8b0xzc2406bq2gkcwrrhv7fa9ynqv2ip6xwsc8s"))))
|
||||
"0z89yikglx077x18qhq6f8f2fa9xni12jz8my9p5sa6zmvnj4dnm"))))
|
||||
(properties `((upstream-name . "GreyListChIP")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -12564,14 +12651,14 @@ abnormal copy number.")
|
|||
(define-public r-htscluster
|
||||
(package
|
||||
(name "r-htscluster")
|
||||
(version "2.0.10")
|
||||
(version "2.0.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "HTSCluster" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0scn4fsfmlkzxibfhsh6krm2cl9c8hsmyjgn48k9dyjf0ylyxg9n"))))
|
||||
"0x9shhyla9bldkkh367gfdmf0k72l1ppixb8gzsa6nf8jx8qdpbp"))))
|
||||
(properties `((upstream-name . "HTSCluster")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -14335,14 +14422,14 @@ attempts to assess their statistical significance.")
|
|||
(define-public r-clusterprofiler
|
||||
(package
|
||||
(name "r-clusterprofiler")
|
||||
(version "4.8.2")
|
||||
(version "4.8.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "clusterProfiler" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0iijby2j9i6sbdc3iwhqqb8xlz25k3dpiyq91p7yybggpr2p1nw4"))))
|
||||
"1kihrpa8cb2bqk5dck0w6yzgfpl72qxlrxwpidg1ar27q3ivz8w3"))))
|
||||
(properties
|
||||
`((upstream-name . "clusterProfiler")))
|
||||
(build-system r-build-system)
|
||||
|
@ -19576,13 +19663,13 @@ routines.")
|
|||
(define-public r-s4arrays
|
||||
(package
|
||||
(name "r-s4arrays")
|
||||
(version "1.0.5")
|
||||
(version "1.0.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "S4Arrays" version))
|
||||
(sha256
|
||||
(base32
|
||||
"01xlccybhdgas9pnx88ll9q56qb2xd687xvfrc7bd5r9sf72b81c"))))
|
||||
"011n4lyznlrya5l8d7m30x81k7h81wbp07b12s6a4s5sy9fzd5jb"))))
|
||||
(properties `((upstream-name . "S4Arrays")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -19840,14 +19927,14 @@ block processing.")
|
|||
(define-public r-rhdf5lib
|
||||
(package
|
||||
(name "r-rhdf5lib")
|
||||
(version "1.22.0")
|
||||
(version "1.22.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Rhdf5lib" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1j8i4rmq85n7jys86a9zyj1n4qn7bhc1sqgcq8dyh7zqfdvb9bcw"))
|
||||
"1007i2rzz86k04kswa4h53p8zzh52k31m9d8im6iw0n91inqbcj9"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -20463,14 +20550,14 @@ Visium platform.")
|
|||
(define-public r-delayedmatrixstats
|
||||
(package
|
||||
(name "r-delayedmatrixstats")
|
||||
(version "1.22.5")
|
||||
(version "1.22.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "DelayedMatrixStats" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1bzbsfds5zki6iazj53y6kps8bvn7zdysbmpf9359sv6zshk18fv"))))
|
||||
"0jaaqa2fm61dmsphm5y4rlwf2dm1l5rs0vpq0f5r35iyw2m12lh8"))))
|
||||
(properties
|
||||
`((upstream-name . "DelayedMatrixStats")))
|
||||
(build-system r-build-system)
|
||||
|
@ -21108,14 +21195,14 @@ on the plot.")
|
|||
(define-public r-abn
|
||||
(package
|
||||
(name "r-abn")
|
||||
(version "2.7-5")
|
||||
(version "3.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "abn" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ibznjhy7vmh2myarvmxy06rvddbpbarbp201px62mig2pb9aq4y"))))
|
||||
"100nafmyddz0c1h01fbqw5q6pji7zhg2196rkyak88za6s5ms0s4"))))
|
||||
(build-system r-build-system)
|
||||
(inputs
|
||||
(list gsl))
|
||||
|
@ -21124,11 +21211,13 @@ on the plot.")
|
|||
r-foreach
|
||||
r-graph
|
||||
r-lme4
|
||||
r-mclogit
|
||||
r-nnet
|
||||
r-rcpp
|
||||
r-rcpparmadillo
|
||||
r-rgraphviz
|
||||
r-rjags))
|
||||
r-rjags
|
||||
r-stringi))
|
||||
(native-inputs
|
||||
(list r-r-rsp))
|
||||
(home-page "https://r-bayesian-networks.org/")
|
||||
|
|
|
@ -1945,6 +1945,42 @@ matplotlib Axes objects, making them easy to style and incorporate into
|
|||
multi-panel figures.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-peaks2utr
|
||||
(package
|
||||
(name "python-peaks2utr")
|
||||
(version "1.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "peaks2utr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1idp9cgwqxvryf4qqrc1xjsamfqn3jmr56kmjp2h1ysmckwmhw4v"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-flags
|
||||
;; These two tests fail because file names are not URLs.
|
||||
'(list "-k" "not test_annotation.py")))
|
||||
(propagated-inputs
|
||||
(list python-asgiref
|
||||
python-gffutils
|
||||
python-importlib-resources
|
||||
macs
|
||||
python-numpy
|
||||
python-psutil
|
||||
python-pybedtools
|
||||
python-pysam
|
||||
python-requests
|
||||
python-tqdm
|
||||
python-typing-extensions
|
||||
python-zipp))
|
||||
(home-page "https://github.com/haessar/peaks2utr")
|
||||
(synopsis "Python CLI for annotating three prime UTR")
|
||||
(description
|
||||
"This package provides a robust, parallelized Python CLI for annotating
|
||||
three prime UTR.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public python-pegasusio
|
||||
(package
|
||||
(name "python-pegasusio")
|
||||
|
@ -3751,6 +3787,13 @@ UCSC genome browser.")
|
|||
"-xf" (assoc-ref inputs "test-data"))
|
||||
;; This one requires bowtie-build
|
||||
(delete-file "plastid/test/functional/test_crossmap.py")))
|
||||
(add-after 'unpack 'patch-for-python-3.10
|
||||
(lambda _
|
||||
;; Some classes were moved from collections to collections.abc
|
||||
;; in Python 3.10.
|
||||
(substitute* "plastid/readers/bigbed.pyx"
|
||||
((", Iterable")
|
||||
"\nfrom collections.abc import Iterable"))))
|
||||
(add-before 'check 'build-extensions
|
||||
(lambda _
|
||||
;; Cython extensions have to be built before running the tests.
|
||||
|
@ -7023,7 +7066,7 @@ experiments.")
|
|||
(define-public macs
|
||||
(package
|
||||
(name "macs")
|
||||
(version "2.2.7.1")
|
||||
(version "2.2.9.1")
|
||||
(source (origin
|
||||
;; The PyPi tarball does not contain tests.
|
||||
(method git-fetch)
|
||||
|
@ -7033,7 +7076,7 @@ experiments.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"08zsgh65xbpv1md2s3wqmrk9g2mz6izmn59ryw5lbac54120p291"))
|
||||
"10vwc09fq4nvbd39hax1949mvq2wvkgz0k3p2zqmqwq8hv9r5l0j"))
|
||||
(modules '((guix build utils)))
|
||||
;; Remove files generated by Cython
|
||||
(snippet
|
||||
|
@ -7048,21 +7091,17 @@ experiments.")
|
|||
;; Python 3.10 is in fact more recent than 3.6.
|
||||
(substitute* "setup.py"
|
||||
(("float\\(sys.version\\[:3\\]\\)<3.6") "False"))))))
|
||||
(build-system python-build-system)
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'set-HOME
|
||||
(lambda _ (setenv "HOME" "/tmp")))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
|
||||
(when tests?
|
||||
(add-installed-pythonpath inputs outputs)
|
||||
(invoke "pytest" "-v")))))))
|
||||
(inputs
|
||||
(list python-numpy))
|
||||
(lambda _ (setenv "HOME" "/tmp"))))))
|
||||
;; Propagate these for use of macs as a library.
|
||||
(propagated-inputs
|
||||
(list python-cython python-numpy))
|
||||
(native-inputs
|
||||
(list python-cython python-pytest))
|
||||
(list python-pytest))
|
||||
(home-page "https://github.com/macs3-project/MACS")
|
||||
(synopsis "Model based analysis for ChIP-Seq data")
|
||||
(description
|
||||
|
@ -16197,10 +16236,10 @@ includes operations like compartment, insulation or peak calling.")
|
|||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "python" "-m" "pytest" "-v")))))))
|
||||
(add-after 'unpack 'remove-invalid-syntax
|
||||
(lambda _
|
||||
(substitute* "setup.py"
|
||||
((".\\*\"") "\"")))))))
|
||||
(propagated-inputs
|
||||
(list python-cooler
|
||||
python-intervaltree
|
||||
|
@ -17777,8 +17816,10 @@ pycisTarget and SCENIC.")
|
|||
(list python-bokeh
|
||||
python-dask
|
||||
python-distributed
|
||||
python-lz4
|
||||
python-numpy
|
||||
python-pandas
|
||||
python-pyarrow
|
||||
python-scikit-learn
|
||||
python-scipy
|
||||
python-tornado-6))
|
||||
|
@ -18381,6 +18422,7 @@ Cflags: -I${includedir}~%"
|
|||
(description "The wavefront alignment (WFA) algorithm is an exact
|
||||
gap-affine algorithm that takes advantage of homologous regions between the
|
||||
sequences to accelerate the alignment process.")
|
||||
(properties `((tunable? . #t)))
|
||||
(license license:expat)))
|
||||
|
||||
(define-public vcflib
|
||||
|
@ -19134,7 +19176,7 @@ coordinates between different assemblies.")
|
|||
(define-public python-cgatcore
|
||||
(package
|
||||
(name "python-cgatcore")
|
||||
(version "0.6.14")
|
||||
(version "0.6.15")
|
||||
;; The version of pypi does not include test data.
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
@ -19144,7 +19186,7 @@ coordinates between different assemblies.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fjjaski39j8b7v21wldmbwwsfhicngajah7n4skafi56kdck33p"))))
|
||||
"103hpdnkqr3a34blbicshk56j36g652s0g1zi9isppc5dngn0s18"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -19214,77 +19256,77 @@ large-scale data-analysis.")
|
|||
"1dvh23fx52m59y6304xi2j2pl2hiqadlqg8jyv2pm14j1hy71ych"))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build perl-build-system)
|
||||
(list
|
||||
#:modules '((guix build perl-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'hardcode-references
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((bedtools (assoc-ref inputs "bedtools"))
|
||||
(r (assoc-ref inputs "r-minimal")))
|
||||
(substitute* '("scripts/python/getEigenVectors.py"
|
||||
"scripts/python/matrix2EigenVectors.py")
|
||||
(("bedtools intersect")
|
||||
(string-append bedtools "/bin/bedtools intersect")))
|
||||
(substitute* "lib/cworld/dekker.pm"
|
||||
(("bedtools --version")
|
||||
(string-append bedtools "/bin/bedtools --version")))
|
||||
(substitute* '("scripts/perl/correlateMatrices.pl"
|
||||
"scripts/perl/matrix2scaling.pl"
|
||||
"scripts/perl/matrix2distance.pl"
|
||||
"scripts/perl/coverageCorrect.pl"
|
||||
"scripts/perl/matrix2anchorPlot.pl"
|
||||
"scripts/python/matrix2EigenVectors.py"
|
||||
"scripts/python/matrix2insulation-lite.py"
|
||||
"scripts/perl/matrix2compartment.pl"
|
||||
"scripts/perl/anchorPurge.pl"
|
||||
"scripts/perl/applyCorrection.pl"
|
||||
"scripts/perl/compareInsulation.pl"
|
||||
"scripts/perl/fillMissingData.pl"
|
||||
"scripts/perl/matrix2loess.pl"
|
||||
"scripts/python/getEigenVectors.py"
|
||||
"scripts/perl/aggregateBED.pl"
|
||||
"scripts/perl/collapseMatrix.pl"
|
||||
"scripts/perl/matrix2direction.pl"
|
||||
"scripts/perl/singletonRemoval.pl"
|
||||
"lib/cworld/dekker.pm"
|
||||
"scripts/perl/matrix2insulation.pl")
|
||||
(("(`|\")Rscript" _ pre)
|
||||
(string-append pre r "/bin/Rscript"))))))
|
||||
(add-after 'install 'install-scripts
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(share (string-append out "/share/cworld-dekker")))
|
||||
(mkdir-p share)
|
||||
(copy-recursively "scripts" share)
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'hardcode-references
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((bedtools #$(this-package-input "bedtools"))
|
||||
(r #$(this-package-input "r-minimal")))
|
||||
(substitute* '("scripts/python/getEigenVectors.py"
|
||||
"scripts/python/matrix2EigenVectors.py")
|
||||
(("bedtools intersect")
|
||||
(string-append bedtools "/bin/bedtools intersect")))
|
||||
(substitute* "lib/cworld/dekker.pm"
|
||||
(("bedtools --version")
|
||||
(string-append bedtools "/bin/bedtools --version")))
|
||||
(substitute* '("scripts/perl/correlateMatrices.pl"
|
||||
"scripts/perl/matrix2scaling.pl"
|
||||
"scripts/perl/matrix2distance.pl"
|
||||
"scripts/perl/coverageCorrect.pl"
|
||||
"scripts/perl/matrix2anchorPlot.pl"
|
||||
"scripts/python/matrix2EigenVectors.py"
|
||||
"scripts/python/matrix2insulation-lite.py"
|
||||
"scripts/perl/matrix2compartment.pl"
|
||||
"scripts/perl/anchorPurge.pl"
|
||||
"scripts/perl/applyCorrection.pl"
|
||||
"scripts/perl/compareInsulation.pl"
|
||||
"scripts/perl/fillMissingData.pl"
|
||||
"scripts/perl/matrix2loess.pl"
|
||||
"scripts/python/getEigenVectors.py"
|
||||
"scripts/perl/aggregateBED.pl"
|
||||
"scripts/perl/collapseMatrix.pl"
|
||||
"scripts/perl/matrix2direction.pl"
|
||||
"scripts/perl/singletonRemoval.pl"
|
||||
"lib/cworld/dekker.pm"
|
||||
"scripts/perl/matrix2insulation.pl")
|
||||
(("(`|\")Rscript" _ pre)
|
||||
(string-append pre r "/bin/Rscript"))))))
|
||||
(add-after 'install 'install-scripts
|
||||
(lambda _
|
||||
(let ((share (string-append #$output "/share/cworld-dekker")))
|
||||
(mkdir-p share)
|
||||
(copy-recursively "scripts" share)
|
||||
|
||||
;; Make all scripts executable and wrap them.
|
||||
(let ((r (find-files share "\\.R$"))
|
||||
(py (find-files share "\\.py$"))
|
||||
(pl (find-files share "\\.pl$"))
|
||||
(wrap (lambda* (script var #:optional (extra ""))
|
||||
(let ((path (string-append (getenv var)
|
||||
extra)))
|
||||
(wrap-program script
|
||||
`(,var ":" prefix (,path)))))))
|
||||
(for-each (cut chmod <> #o555) (append r py pl))
|
||||
(for-each (cut wrap <> "PERL5LIB"
|
||||
(string-append ":" out
|
||||
"/lib/perl5/site_perl"))
|
||||
pl)
|
||||
(for-each (cut wrap <> "GUIX_PYTHONPATH") py))))))))
|
||||
;; Make all scripts executable and wrap them.
|
||||
(let ((r (find-files share "\\.R$"))
|
||||
(py (find-files share "\\.py$"))
|
||||
(pl (find-files share "\\.pl$"))
|
||||
(wrap (lambda* (script var #:optional (extra ""))
|
||||
(let ((path (string-append (getenv var)
|
||||
extra)))
|
||||
(wrap-program script
|
||||
`(,var ":" prefix (,path)))))))
|
||||
(for-each (cut chmod <> #o555) (append r py pl))
|
||||
(for-each (cut wrap <> "PERL5LIB"
|
||||
(string-append ":" #$output
|
||||
"/lib/perl5/site_perl"))
|
||||
pl)
|
||||
(for-each (cut wrap <> "GUIX_PYTHONPATH") py))))))))
|
||||
(inputs
|
||||
`(("libgd" ,gd)
|
||||
("perl-gd" ,perl-gd)
|
||||
("bedtools" ,bedtools)
|
||||
("python" ,python-wrapper)
|
||||
("python-scipy" ,python-scipy)
|
||||
("python-numpy" ,python-numpy)
|
||||
("python-matplotlib" ,python-matplotlib)
|
||||
("python-h5py" ,python-h5py)
|
||||
("python-scikit-learn" ,python-scikit-learn)
|
||||
("r-minimal" ,r-minimal)))
|
||||
(list gd
|
||||
perl-gd
|
||||
bedtools
|
||||
python-wrapper
|
||||
python-scipy
|
||||
python-numpy
|
||||
python-matplotlib
|
||||
python-h5py
|
||||
python-scikit-learn
|
||||
r-minimal))
|
||||
(native-inputs
|
||||
(list perl-module-build))
|
||||
(home-page "https://github.com/dekkerlab/cworld-dekker")
|
||||
|
@ -19814,7 +19856,7 @@ sequences")
|
|||
(inputs
|
||||
(list zlib))
|
||||
(home-page "https://github.com/ACEnglish/bwapy")
|
||||
(synopsis "Python bindings to bwa alinger")
|
||||
(synopsis "Python bindings to bwa aligner")
|
||||
(description "This package provides Python bindings to the bwa mem
|
||||
aligner.")
|
||||
;; These Python bindings are licensed under Mozilla Public License 2.0,
|
||||
|
@ -20424,7 +20466,7 @@ based on the pairwise alignment of hidden Markov models (HMMs).")
|
|||
(define-public wfmash
|
||||
(package
|
||||
(name "wfmash")
|
||||
(version "0.8.1")
|
||||
(version "0.10.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -20432,7 +20474,7 @@ based on the pairwise alignment of hidden Markov models (HMMs).")
|
|||
version "/wfmash-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"031cm1arpfckvihb28vlk69mirpnmlag81zcscfba1bac58wvr7c"))
|
||||
"1jsvnnh14h3ir4l13qhmglhd25kzwvni9apgvr1lbikqwgrpkiq4"))
|
||||
(snippet
|
||||
#~(begin
|
||||
(use-modules (guix build utils))
|
||||
|
@ -20443,14 +20485,12 @@ based on the pairwise alignment of hidden Markov models (HMMs).")
|
|||
"<atomic_queue/atomic_queue.h>"))
|
||||
;; Remove compiler optimizations.
|
||||
(substitute* (find-files "." "CMakeLists\\.txt")
|
||||
(("-mcx16 ") "")
|
||||
(("-march=native ") ""))
|
||||
;; Allow building on architectures other than x86_64.
|
||||
(substitute* "src/common/dset64.hpp"
|
||||
(("!__x86_64__") "0"))))))
|
||||
(("-march=native ") ""))))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list "-DWFA_PNG_AND_TSV=ON")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
|
@ -20563,7 +20603,8 @@ based on the pairwise alignment of hidden Markov models (HMMs).")
|
|||
jemalloc
|
||||
zlib))
|
||||
(native-inputs
|
||||
(list samtools))
|
||||
(list pkg-config
|
||||
samtools))
|
||||
(synopsis "Base-accurate DNA sequence aligner")
|
||||
(description "@code{wfmash} is a DNA sequence read mapper based on mash
|
||||
distances and the wavefront alignment algorithm. It is a fork of MashMap that
|
||||
|
|
|
@ -45,14 +45,12 @@
|
|||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages llvm)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages shells)
|
||||
#:use-module (gnu packages mpi)
|
||||
#:use-module (srfi srfi-1))
|
||||
#:use-module (gnu packages mpi))
|
||||
|
||||
(define (version-with-underscores version)
|
||||
(string-map (lambda (x) (if (eq? x #\.) #\_ x)) version))
|
||||
|
|
|
@ -36,8 +36,6 @@
|
|||
|
||||
(define-module (gnu packages bootloaders)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages assembly)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages disk)
|
||||
|
|
|
@ -58,8 +58,8 @@
|
|||
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
|
||||
|
||||
(define-public cuirass
|
||||
(let ((commit "7416bb916315730cd1ea74e7914f7532a1aba193")
|
||||
(revision "17"))
|
||||
(let ((commit "613188072c468fe2ffa4e8f83b48aefeb2488a2c")
|
||||
(revision "18"))
|
||||
(package
|
||||
(name "cuirass")
|
||||
(version (git-version "1.1.0" revision commit))
|
||||
|
@ -72,7 +72,7 @@
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1wc39c7aqva5sp3gpdxq2kqa17ywy21yn5w8r66qgxjinvj21a68"))))
|
||||
"13ai3xmf62kx9ijc5imapcjwyvkhj2kxnh36chh3vbh3sxbbanzz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils)
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
;;; Copyright © 2021 lu hui <luhuins@163.com>
|
||||
;;; Copyright © 2021, 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
|
||||
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -200,6 +201,10 @@ highlighting your own code that seemed comprehensible when you wrote it.")
|
|||
(string-append "--with-universal-ctags="
|
||||
#$(this-package-input "universal-ctags")
|
||||
"/bin/ctags")
|
||||
;; Otherwise this gets overridden in the 'configure phase.
|
||||
(string-append "--with-python-interpreter="
|
||||
#$(this-package-input "python-wrapper")
|
||||
"/bin/python")
|
||||
(string-append "--sysconfdir="
|
||||
#$output "/share/gtags")
|
||||
"--localstatedir=/var" ; This needs to be a writable location.
|
||||
|
@ -769,11 +774,13 @@ produce colored output.")
|
|||
(base32 "1gjfk3d8qg3cla7qd2y7r9s03whlfwy83q8k76xfcnqrjjfavdgk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:test-target "test"
|
||||
#:make-flags (list "CC=gcc" (string-append "prefix=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(list
|
||||
#:test-target "test"
|
||||
#:make-flags #~(list (string-append "CC=" #$(cc-for-target))
|
||||
(string-append "prefix=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(native-inputs
|
||||
(list graphviz))
|
||||
(home-page "https://github.com/lindenb/makefile2graph")
|
||||
|
@ -787,7 +794,7 @@ independent targets.")
|
|||
(define-public uncrustify
|
||||
(package
|
||||
(name "uncrustify")
|
||||
(version "0.75.1")
|
||||
(version "0.77.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -796,22 +803,20 @@ independent targets.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mzzzd4alajjdshbjd2a5mddqcpag8yyss72n09mfpialzyf7g60"))))
|
||||
"17x9p5pqgzjchi9xhskp4kq7ag4chmsgbkvwym5m2b9zwm6qykpm"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("python" ,python-wrapper)))
|
||||
(native-inputs (list python-wrapper))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-etc
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Configuration samples are not installed by default.
|
||||
(let* ((output (assoc-ref outputs "out"))
|
||||
(etcdir (string-append output "/etc")))
|
||||
(for-each (lambda (l)
|
||||
(install-file l etcdir))
|
||||
(find-files "etc" "\\.cfg$")))
|
||||
#t)))))
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-etc
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Configuration samples are not installed by default.
|
||||
(let* ((output (assoc-ref outputs "out"))
|
||||
(etcdir (string-append output "/etc")))
|
||||
(for-each (lambda (l)
|
||||
(install-file l etcdir))
|
||||
(find-files "etc" "\\.cfg$"))))))))
|
||||
(home-page "https://uncrustify.sourceforge.net/")
|
||||
(synopsis "Code formatter for C and other related languages")
|
||||
(description
|
||||
|
@ -888,13 +893,13 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.")
|
|||
(define-public indent
|
||||
(package
|
||||
(name "indent")
|
||||
(version "2.2.12")
|
||||
(version "2.2.13")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/indent/indent-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32 "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"))))
|
||||
(base32 "15c0ayp9rib7hzvrcxm5ijs0mpagw5y8kf5w0jr9fryfqi7n6r4y"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
(package
|
||||
(name "conky")
|
||||
(home-page "https://github.com/brndnmtthws/conky")
|
||||
(version "1.19.3")
|
||||
(version "1.19.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -49,7 +49,7 @@
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "079s6icvcrryhj71qya4rnyc6pdjq488l0gjqrrblycgzppn1pas"))))
|
||||
(base32 "03zzssdg1qdv83p4c3dbjgr0g1n0spc0ndk9bds1rd2n82i6g6sy"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
@ -298,7 +298,7 @@ various formats, including @code{json}.")
|
|||
(define-public libzen
|
||||
(package
|
||||
(name "libzen")
|
||||
(version "0.4.40")
|
||||
(version "0.4.41")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; Warning: This source has proved unreliable 1 time at least.
|
||||
|
@ -309,7 +309,7 @@ various formats, including @code{json}.")
|
|||
"libzen_" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"17pnp5i1ppcxhxnfs9qlkzzy35h23pkdwhsgpbqdkf8lab2f4hsm"))))
|
||||
"0b8yj3rmmcv2fn3b5bnchfkk82fy4w5446c70sxccvfa7myps8zb"))))
|
||||
(native-inputs
|
||||
(list autoconf automake libtool))
|
||||
(build-system gnu-build-system)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -21557,6 +21557,24 @@ signing, and verification in pure Rust.")
|
|||
@code{Right} is a general purpose sum type with two cases.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-either-1.6.0
|
||||
(package
|
||||
(inherit rust-either-1)
|
||||
(name "rust-either")
|
||||
(version "1.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "either" version))
|
||||
(file-name
|
||||
(string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mwl9vngqf5jvrhmhn9x60kr5hivxyjxbmby2pybncxfqhf4z3g7"))))
|
||||
(arguments
|
||||
`(#:cargo-inputs (("rust-serde" ,rust-serde-1))
|
||||
#:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1.0.73))))))
|
||||
|
||||
(define-public rust-elf-0.0.10
|
||||
(package
|
||||
(name "rust-elf")
|
||||
|
@ -41724,6 +41742,19 @@ with all line endings.")
|
|||
notification library.")
|
||||
(license (list license:cc0 license:artistic2.0))))
|
||||
|
||||
(define-public rust-notify-5-pre.13
|
||||
(package
|
||||
(inherit rust-notify-5)
|
||||
(name "rust-notify")
|
||||
(version "5.0.0-pre.13")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "notify" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0za8mpacxkr62fii5h7ny4h396y0m8myd3hf08njqdg2h21kap94"))))))
|
||||
|
||||
(define-public rust-notify-4
|
||||
(package
|
||||
(inherit rust-notify-5)
|
||||
|
@ -49388,6 +49419,27 @@ in your code.")
|
|||
in terms of the upstream unstable API.")
|
||||
(license (list license:asl2.0 license:expat))))
|
||||
|
||||
(define-public rust-proc-macro2-1.0.34
|
||||
(package
|
||||
(inherit rust-proc-macro2-1)
|
||||
(name "rust-proc-macro2")
|
||||
(version "1.0.34")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "proc-macro2" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1c93jhwl8lv3hiqqvdhd2d2xhjryh5bqb9w5icr5i7bw1wnfk11g"))))
|
||||
(arguments
|
||||
`(#:cargo-test-flags '("--lib")
|
||||
#:cargo-inputs
|
||||
(("rust-unicode-ident" ,rust-unicode-ident-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-quote" ,rust-quote-1.0.10)
|
||||
("rust-rustversion" ,rust-rustversion-1))))))
|
||||
|
||||
(define-public rust-proc-macro2-0.4
|
||||
(package
|
||||
(inherit rust-proc-macro2-1)
|
||||
|
@ -51588,6 +51640,25 @@ transport protocol in Rust.")
|
|||
(description "Quasi-quoting macro quote!(...)")
|
||||
(license (list license:asl2.0 license:expat))))
|
||||
|
||||
(define-public rust-quote-1.0.10
|
||||
(package
|
||||
(inherit rust-quote-1)
|
||||
(name "rust-quote")
|
||||
(version "1.0.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "quote" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01ff7a76f871ggnby57iagw6499vci4bihcr11g6bqzjlp38rg1q"))))
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-proc-macro2" ,rust-proc-macro2-1.0.34))
|
||||
#:cargo-development-inputs
|
||||
(("rust-rustversion" ,rust-rustversion-1)
|
||||
("rust-trybuild" ,rust-trybuild-1.0.19))))))
|
||||
|
||||
(define-public rust-quote-0.6
|
||||
(package
|
||||
(inherit rust-quote-1)
|
||||
|
@ -57489,7 +57560,7 @@ in pure Rust.")
|
|||
#:cargo-inputs
|
||||
(("rust-crossbeam-utils"
|
||||
,rust-crossbeam-utils-0.8)
|
||||
("rust-indexmap" ,rust-indexmap-1)
|
||||
("rust-indexmap" ,rust-indexmap-1.7)
|
||||
("rust-lock-api" ,rust-lock-api-0.4)
|
||||
("rust-log" ,rust-log-0.4)
|
||||
("rust-oorandom" ,rust-oorandom-11.1)
|
||||
|
@ -59795,6 +59866,32 @@ data. This crate provides a wrapper that works with any existing Serde
|
|||
"This package provides a JSON serialization file format.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-serde-json-1.0.73
|
||||
(package
|
||||
(inherit rust-serde-json-1)
|
||||
(name "rust-serde-json")
|
||||
(version "1.0.73")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "serde-json" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1xbwmzc5j6r1nz62a20w6l9bkwbhzd11vwbdqmzbqcv5pi207gdw"))))
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-indexmap" ,rust-indexmap-1.7)
|
||||
("rust-itoa" ,rust-itoa-1)
|
||||
("rust-ryu" ,rust-ryu-1)
|
||||
("rust-serde" ,rust-serde-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-automod" ,rust-automod-1)
|
||||
("rust-rustversion" ,rust-rustversion-1)
|
||||
("rust-serde-bytes" ,rust-serde-bytes-0.11)
|
||||
("rust-serde-derive" ,rust-serde-derive-1)
|
||||
("rust-serde-stacker" ,rust-serde-stacker-0.1)
|
||||
("rust-trybuild" ,rust-trybuild-1))))))
|
||||
|
||||
(define-public rust-serde-json-0.9
|
||||
(package
|
||||
(inherit rust-serde-json-1)
|
||||
|
@ -59863,7 +59960,7 @@ programs in rust.")
|
|||
(("rust-serde" ,rust-serde-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-serde-derive" ,rust-serde-derive-1)
|
||||
("rust-serde-json" ,rust-serde-json-1))))
|
||||
("rust-serde-json" ,rust-serde-json-1.0.73))))
|
||||
(home-page
|
||||
"https://github.com/dtolnay/path-to-error")
|
||||
(synopsis
|
||||
|
@ -59921,14 +60018,14 @@ commonly used by Ruby on Rails via Rack.")
|
|||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-proc-macro2" ,rust-proc-macro2-1)
|
||||
("rust-quote" ,rust-quote-1)
|
||||
(("rust-proc-macro2" ,rust-proc-macro2-1.0.34)
|
||||
("rust-quote" ,rust-quote-1.0.10)
|
||||
("rust-syn" ,rust-syn-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-rustversion" ,rust-rustversion-1)
|
||||
("rust-serde" ,rust-serde-1)
|
||||
("rust-serde-json" ,rust-serde-json-1)
|
||||
("rust-trybuild" ,rust-trybuild-1))))
|
||||
("rust-serde-json" ,rust-serde-json-1.0.73)
|
||||
("rust-trybuild" ,rust-trybuild-1.0.19))))
|
||||
(home-page "https://github.com/dtolnay/serde-repr")
|
||||
(synopsis "Serialize and deserialize C-like enum as underlying repr")
|
||||
(description
|
||||
|
@ -73148,6 +73245,29 @@ the Trust-DNS client to use rustls for TLS.")
|
|||
"Test harness for ui tests of compiler diagnostics.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-trybuild-1.0.19
|
||||
(package
|
||||
(inherit rust-trybuild-1)
|
||||
(name "rust-trybuild")
|
||||
(version "1.0.19")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "trybuild" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ab7ahdx563n6kbm14pm3qnxq4fp06pz42nh5ii4acvlzycnwdh4"))))
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-toml" ,rust-toml-0.5)
|
||||
("rust-dissimilar" ,rust-dissimilar-1)
|
||||
("rust-glob" ,rust-glob-0.3)
|
||||
("rust-lazy-static" ,rust-lazy-static-1)
|
||||
("rust-serde" ,rust-serde-1)
|
||||
("rust-serde-json" ,rust-serde-json-1.0.73)
|
||||
("rust-termcolor" ,rust-termcolor-1))
|
||||
#:cargo-development-inputs (("rust-automod" ,rust-automod-1))))))
|
||||
|
||||
(define-public rust-trybuild2-1
|
||||
(package
|
||||
(name "rust-trybuild2")
|
||||
|
|
|
@ -59,7 +59,8 @@
|
|||
;;; Copyright © 2022 muradm <mail@muradm.net>
|
||||
;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org>
|
||||
;;; Copyright © 2021, 2022 jgart <jgart@dismail.de>
|
||||
;;; Copyright © 2023 Felix Gruber <felgru@posteo.net>
|
||||
;;; Copyright © 2023 Felix Gruber <felgru@posteo.ne
|
||||
;;; Copyright © 2023 Munyoki Kilyungi <me@bonfacemunyoki.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -487,14 +488,14 @@ mapping from string keys to string values.")
|
|||
(define-public memcached
|
||||
(package
|
||||
(name "memcached")
|
||||
(version "1.6.18")
|
||||
(version "1.6.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://memcached.org/files/memcached-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0n21svnjw8j7bdbwrn0apnfql7ckraqgrl7wj9fsqj86h6w6mpfb"))))
|
||||
(base32 "1vm27la2yanjhwwdwabci4c21yv9hy5iqas47kcxaza1zh79i267"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list libevent cyrus-sasl))
|
||||
|
@ -3706,7 +3707,7 @@ PickleShare.")
|
|||
(define-public python-apsw
|
||||
(package
|
||||
(name "python-apsw")
|
||||
(version "3.40.0.0")
|
||||
(version "3.42.0.1")
|
||||
;; The compressed release has fetching functionality disabled.
|
||||
(source
|
||||
(origin
|
||||
|
@ -3716,11 +3717,11 @@ PickleShare.")
|
|||
version "/apsw-" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"02sgja00azvd08wi2wm105apmhp2644s7aw9b1zdg3dkcwjnsiad"))))
|
||||
"0dr7zymn45x2793cilr709rnwn9g1c4n4vzln57y2lhj7420ykic"))))
|
||||
(build-system pyproject-build-system)
|
||||
(native-inputs
|
||||
(list python-cython unzip))
|
||||
(inputs (list sqlite-next)) ;SQLite 3.40 required.
|
||||
(inputs (list sqlite-next)) ;SQLite 3.42 required.
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
|
@ -3829,13 +3830,13 @@ libraries with SQLALchemy.")
|
|||
(name "python-psycopg-pool")
|
||||
;; The connection pooling code is on a different release cadence
|
||||
;; from the driver code, so fetch the latest PyPI release.
|
||||
(version "3.0.3")
|
||||
(version "3.1.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "psycopg-pool" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1nx139pwzsgrz253zjxw2sf8h713s79h4cp1falmpc39j08djb46"))))
|
||||
"1pkx7nj1mhacwpna7ldzqfqxd1xg8826600r0bs9ad1h93f429yh"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;run for psycopg below
|
||||
|
@ -3854,7 +3855,7 @@ with the @code{psycopg} PostgreSQL driver.")
|
|||
(define-public python-psycopg
|
||||
(package
|
||||
(name "python-psycopg")
|
||||
(version "3.0.8")
|
||||
(version "3.1.10")
|
||||
(source (origin
|
||||
;; Fetch from git because PyPI contains only cythonized sources.
|
||||
(method git-fetch)
|
||||
|
@ -3864,7 +3865,7 @@ with the @code{psycopg} PostgreSQL driver.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"16i19jqd9lg9r7bc63ssh527cccrpf49g1nlayikk5qlswpzp75y"))))
|
||||
"0hqk45wlaflz69cy1r0hbv11bwb89p6hjb7zmgqas26gdhg37n0r"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
|
@ -3906,13 +3907,19 @@ with the @code{psycopg} PostgreSQL driver.")
|
|||
"-o" "asyncio_mode=auto"
|
||||
;; FIXME: Many of the typing tests are failing,
|
||||
;; conveniently tagged as slow...
|
||||
"-k" "not slow"))))))))
|
||||
"-k" "not slow")))))
|
||||
;; The sanity check phase attempts loading the C extension
|
||||
;; before the Python library, which results in the following:
|
||||
;; <ImportError: the psycopg package should be imported
|
||||
;; before psycopg_c>.
|
||||
(delete 'sanity-check))))
|
||||
(native-inputs
|
||||
(list python-cython-3
|
||||
python-mypy
|
||||
python-psycopg-pool
|
||||
python-pytest
|
||||
python-pytest-asyncio
|
||||
python-anyio
|
||||
python-tenacity
|
||||
pproxy
|
||||
tzdata-for-tests))
|
||||
|
@ -3963,7 +3970,7 @@ database).")
|
|||
(define-public yoyo-migrations
|
||||
(package
|
||||
(name "yoyo-migrations")
|
||||
(version "7.2.0")
|
||||
(version "8.2.0")
|
||||
(source
|
||||
(origin
|
||||
;; We use the upstream repository, as the tests are not included in the
|
||||
|
@ -3974,14 +3981,14 @@ database).")
|
|||
(changeset (string-append "v" version "-release"))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32 "0q2z9bgdj3wyix7yvqsayfs21grp5av8ilh411lgmjhigszkvhcq"))))
|
||||
(base32 "1al030ix0w63hr4s3mqry6s0mlqdj8p242pdqks06br7c25nx3yj"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; XXX: Tests require a connection to some pgsql database and psycopg
|
||||
;; fails to connect to it.
|
||||
'(#:tests? #f))
|
||||
(propagated-inputs
|
||||
(list python-sqlparse python-tabulate))
|
||||
(list python-sqlparse python-tabulate python-importlib-metadata))
|
||||
(home-page "https://ollycope.com/software/yoyo/latest/")
|
||||
(synopsis "Database migrations with SQL")
|
||||
(description
|
||||
|
@ -4304,7 +4311,7 @@ the SQL language using a syntax that reflects the resulting query.")
|
|||
(define-public apache-arrow
|
||||
(package
|
||||
(name "apache-arrow")
|
||||
(version "12.0.1")
|
||||
(version "13.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -4314,7 +4321,7 @@ the SQL language using a syntax that reflects the resulting query.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"03flvb4xj6a7mfphx68ndrqr6g5jphmzb75m16fx7rnbzira2zpz"))))
|
||||
"03ykynzz01ar2y4blhcxjh6xsi0gqv380h5m669dddfz2isplsf8"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
|
@ -213,14 +213,14 @@ allows multiple concurrent reader and writer threads.")
|
|||
(define-public liburcu
|
||||
(package
|
||||
(name "liburcu")
|
||||
(version "0.13.1")
|
||||
(version "0.14.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.lttng.org/files/urcu/"
|
||||
"userspace-rcu-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"10rh6v9j13622cjlzx31cfpghjy0kqkvn6pb42whwwcg5cyz64rj"))))
|
||||
"0kwx4fi3gn4p4sdxqkz2zh4z0fv06q449bnz43zjqfad3lkbyhya"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list perl)) ; for tests
|
||||
|
|
|
@ -190,7 +190,7 @@ contains the archive keys used for that.")
|
|||
(define-public debootstrap
|
||||
(package
|
||||
(name "debootstrap")
|
||||
(version "1.0.128")
|
||||
(version "1.0.132")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -199,7 +199,7 @@ contains the archive keys used for that.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0hc7xc6qvnmjlpf3j6bm25kf0j1ifvv5j7a0iljfmbag4idxc9jv"))))
|
||||
(base32 "1l6mc3i2wqfhmhj85x9qiiqchqp9br6gg54hv1xs08h8xndmfchf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -226,6 +226,12 @@ contains the archive keys used for that.")
|
|||
(substitute* "debootstrap"
|
||||
(("=/usr") (string-append "=" #$output))
|
||||
(("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg")))
|
||||
;; Include the keyring locations by default.
|
||||
(substitute* (find-files "scripts")
|
||||
(("keyring.*(debian-archive-keyring.gpg)"_ keyring)
|
||||
(string-append "keyring " debian "/share/keyrings/" keyring))
|
||||
(("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring)
|
||||
(string-append "keyring " ubuntu "/share/keyrings/" keyring)))
|
||||
;; Ensure PATH works both in guix and within the debian chroot
|
||||
;; workaround for: https://bugs.debian.org/929889
|
||||
(substitute* "functions"
|
||||
|
@ -335,7 +341,7 @@ distributions such as Debian and Trisquel.")
|
|||
(define-public dpkg
|
||||
(package
|
||||
(name "dpkg")
|
||||
(version "1.21.22")
|
||||
(version "1.22.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -344,7 +350,7 @@ distributions such as Debian and Trisquel.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0b5czgif5g6pdjzcw60hzzj0i1llxvajf3nlx115axmpa3y4iynd"))))
|
||||
(base32 "1p7f2mgrn2iy0xfysxfq4pjbbhbhb2rp649bsik0x25jrck4if83"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:modules
|
||||
|
@ -382,6 +388,7 @@ distributions such as Debian and Trisquel.")
|
|||
`("PATH" ":" prefix (,(string-append #$output
|
||||
"/bin")))))
|
||||
(list "dpkg-architecture"
|
||||
"dpkg-buildapi"
|
||||
"dpkg-buildflags"
|
||||
"dpkg-buildpackage"
|
||||
"dpkg-checkbuilddeps"
|
||||
|
|
|
@ -892,11 +892,10 @@ to aid in debugging.")
|
|||
(home-page "https://www.gnu.org/software/ddd/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
|
||||
(define-public delve
|
||||
(package
|
||||
(name "delve")
|
||||
(version "1.9.1")
|
||||
(version "1.21.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -906,14 +905,13 @@ to aid in debugging.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"07jch3yd1pgqviyy18amn23gazbzi7l51f210c3vmc707v3vbbqr"))))
|
||||
"1gdynx4gp02lj47znnf638kkbmmsl24a9fis81a2fg3pdrg6jg3c"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:import-path "github.com/go-delve/delve/cmd/dlv"
|
||||
#:unpack-path "github.com/go-delve/delve"
|
||||
#:install-source? #f
|
||||
#:phases #~(modify-phases %standard-phases (delete 'check))))
|
||||
(propagated-inputs (list go))
|
||||
(home-page "https://github.com/go-delve/delve")
|
||||
(synopsis "Debugger for the Go programming language")
|
||||
(description "Delve is a debugger for the Go programming language.")
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
(define-public diffoscope
|
||||
(package
|
||||
(name "diffoscope")
|
||||
(version "247")
|
||||
(version "250")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -83,7 +83,7 @@
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0c81pvdq0bz47sk3gcgpm2l3g5hxdi2s1jz05krv1cr2bd0sfq4j"))))
|
||||
(base32 "12cdsgxlva1gcry16w9x44ji9asar1n8p9q6rv2jd1gr9fi6l0sz"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -188,6 +188,7 @@
|
|||
gnumeric
|
||||
gnupg
|
||||
hdf5
|
||||
html2text
|
||||
imagemagick
|
||||
libarchive
|
||||
llvm
|
||||
|
@ -206,6 +207,7 @@
|
|||
sqlite
|
||||
squashfs-tools
|
||||
tcpdump
|
||||
u-boot-tools
|
||||
unzip
|
||||
wabt
|
||||
xxd
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
|
||||
;;; Copyright © 2019 Sam <smbaines8@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2022 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
|
||||
;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
|
||||
|
@ -32,8 +32,10 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix build-system pyproject)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (guix search-paths)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages compression)
|
||||
|
@ -52,16 +54,16 @@
|
|||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public python-django-4.0
|
||||
(define-public python-django-4.2
|
||||
(package
|
||||
(name "python-django")
|
||||
(version "4.0.7")
|
||||
(version "4.2.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Django" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qblhh7s7fcznqr79919yp2d7wiz3ixv39navmifb677dg9mlvcw"))))
|
||||
"1ha6c5j3pizbsfzw37r52lvdz8z5lblq4iwa99mpkdzz92aiqp2y"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
@ -126,9 +128,7 @@
|
|||
;; Set TZDIR when 'tzdata' is available so that timezone functionality
|
||||
;; works (mostly) out of the box in containerized environments.
|
||||
;; Note: This search path actually belongs to 'glibc'.
|
||||
(list (search-path-specification
|
||||
(variable "TZDIR")
|
||||
(files '("share/zoneinfo")))))
|
||||
(list $TZDIR))
|
||||
(home-page "https://www.djangoproject.com/")
|
||||
(synopsis "High-level Python Web framework")
|
||||
(description
|
||||
|
@ -141,17 +141,17 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
|
|||
|
||||
(define-public python-django-3.2
|
||||
(package
|
||||
(inherit python-django-4.0)
|
||||
(version "3.2.18")
|
||||
(inherit python-django-4.2)
|
||||
(version "3.2.21")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Django" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fikqpf75zjlx7dgdrrrz4212cajp6rl79rw0zzlzdifi7z8s808"))))
|
||||
"0g3zm2glh76g31q06g6fwkwvkrphjj3mnap5sgk1hx3v9r44rpm5"))))
|
||||
(native-search-paths '()) ;no need for TZDIR
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs python-django-4.0)
|
||||
(modify-inputs (package-propagated-inputs python-django-4.2)
|
||||
;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
|
||||
(append python-pytz)))))
|
||||
|
||||
|
@ -171,24 +171,69 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
|
|||
;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
|
||||
(append python-pytz)))))
|
||||
|
||||
(define-public python-django-2.2
|
||||
(package
|
||||
(inherit python-django-3.2)
|
||||
(version "2.2.28")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Django" version))
|
||||
(sha256
|
||||
(base32
|
||||
"04vl7aivsshzsnn547lm4jdinr67afhdspc40f0c06xzmxbvc002"))))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs python-django-3.2)
|
||||
(prepend ;; 2.2 requires Selenium for the test suite.
|
||||
python-selenium)))))
|
||||
|
||||
;; Use 3.2 LTS as the default until packages gain support for 4.x.
|
||||
(define-public python-django python-django-3.2)
|
||||
|
||||
(define-public python-django-cache-url
|
||||
(package
|
||||
(name "python-django-cache-url")
|
||||
(version "3.4.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-cache-url" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0dpx2wmcclmd3jkprdljz3makq12vd0sjv3xnvlj5vk1lg7glb7g"))))
|
||||
(build-system pyproject-build-system)
|
||||
(native-inputs
|
||||
(list python-django))
|
||||
(home-page "https://github.com/epicserve/django-cache-url")
|
||||
(synopsis "Configure Django cache settings from URLs")
|
||||
(description
|
||||
"This package provides a facility for configuring Django cache settings
|
||||
with a @var{CACHE_URL} environment variable.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-django-configurations
|
||||
(package
|
||||
(name "python-django-configurations")
|
||||
(version "2.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-configurations" version))
|
||||
(sha256
|
||||
(base32
|
||||
"11chll26iqqy5chyx62hya20cadk10nm2la7sch7pril70a5rhm6"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; Taken from tox.ini.
|
||||
(setenv "DJANGO_SETTINGS_MODULE" "tests.settings.main")
|
||||
(setenv "DJANGO_CONFIGURATION" "Test")
|
||||
(setenv "PYTHONPATH"
|
||||
(string-append ".:" (getenv "GUIX_PYTHONPATH")))
|
||||
(invoke "django-cadmin" "test" "-v2")))))))
|
||||
(propagated-inputs
|
||||
(list python-django))
|
||||
(native-inputs
|
||||
(list python-dj-database-url
|
||||
python-dj-email-url
|
||||
python-dj-search-url
|
||||
python-django-cache-url
|
||||
python-setuptools-scm))
|
||||
(home-page "https://django-configurations.readthedocs.io/")
|
||||
(synopsis "Helper module for organizing Django settings")
|
||||
(description
|
||||
"@code{django-configurations} helps you organize the configuration of
|
||||
your Django project by providing glue code to bridge between Django'smodule
|
||||
based settings system and programming patterns like mixins, facades, factories
|
||||
and adapters that are useful for non-trivial configuration scenarios.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-django-extensions
|
||||
(package
|
||||
(name "python-django-extensions")
|
||||
|
@ -379,13 +424,13 @@ size and quality.")
|
|||
(define-public python-pytest-django
|
||||
(package
|
||||
(name "python-pytest-django")
|
||||
(version "4.4.0")
|
||||
(version "4.5.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest-django" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mglnz0w6k7dgw1jn6giv56pmdjd6a3zwwkhxb2kyzmzk0viw5xm"))))
|
||||
"1hp61jbnnhnjxzdrz9ni08lzrv8q7iiycnnxvcwnkhxpkdsny1yr"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; The test suite is disabled because there are many test failures (see:
|
||||
|
@ -409,7 +454,7 @@ size and quality.")
|
|||
" and not test_urls_cache_is_cleared")))
|
||||
(format #t "test suite not run~%")))))))
|
||||
(native-inputs
|
||||
(list python-django python-setuptools-scm python-pytest-xdist))
|
||||
(list python-setuptools-scm))
|
||||
(propagated-inputs
|
||||
(list python-pytest))
|
||||
(home-page "https://pytest-django.readthedocs.org/")
|
||||
|
@ -673,14 +718,16 @@ example, explicit calls to callables from templates and better performance.")
|
|||
(define-public python-dj-database-url
|
||||
(package
|
||||
(name "python-dj-database-url")
|
||||
(version "0.5.0")
|
||||
(version "2.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "dj-database-url" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qs16g5y3lflxibsl8gwkwap21crhmmv98l60rdq6x1wawgypsja"))))
|
||||
"0pqkifl5zradgsznjpk6g6zp64gnsxdav7x3knf56vh8w7pjq17j"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
(list python-django python-typing-extensions))
|
||||
(home-page "https://github.com/kennethreitz/dj-database-url")
|
||||
(synopsis "Use Database URLs in your Django Application")
|
||||
(description
|
||||
|
@ -690,12 +737,50 @@ DATABASE_URL environment variable to configure your Django application.
|
|||
The dj_database_url.config method returns a Django database connection
|
||||
dictionary, populated with all the data specified in your URL. There is also a
|
||||
conn_max_age argument to easily enable Django’s connection pool.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-dj-email-url
|
||||
(package
|
||||
(name "python-dj-email-url")
|
||||
(version "1.0.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "dj-email-url" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16k91rvd9889xxrrf84a3zb0jpinizhfqdmafn54zxa8kqrf7zsm"))))
|
||||
(build-system pyproject-build-system)
|
||||
(home-page "https://github.com/migonzalvar/dj-email-url")
|
||||
(synopsis "Configure email settings from URLs")
|
||||
(description
|
||||
"This package provides a facility for configuring Django email backend
|
||||
settings from URLs.")
|
||||
(license (list license:bsd-2 ;source code
|
||||
license:cc-by4.0 ;documentation
|
||||
license:cc0)))) ;configuration and data
|
||||
|
||||
(define-public python-dj-search-url
|
||||
(package
|
||||
(name "python-dj-search-url")
|
||||
(version "0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "dj-search-url" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0h7vshhglym6af2pplkyivk6y0g0ncq0xpdzi88kq2sha9c1lka2"))))
|
||||
(build-system pyproject-build-system)
|
||||
(home-page "https://github.com/dstufft/dj-search-url")
|
||||
(synopsis "Configure Haystack search from URLs")
|
||||
(description
|
||||
"This package provides a facility for configuring Django Haystack
|
||||
applications with a @var{SEARCH_URL} variable.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public python-django-picklefield
|
||||
(package
|
||||
(name "python-django-picklefield")
|
||||
(version "3.0.1")
|
||||
(version "3.1.0")
|
||||
(home-page "https://github.com/gintas/django-picklefield")
|
||||
;; Use a git checkout because the PyPI release lacks tests.
|
||||
(source
|
||||
|
@ -707,7 +792,7 @@ conn_max_age argument to easily enable Django’s connection pool.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk"))))
|
||||
"00d8sm6cnkv5bxbs2a3qrm4g69nlaa1wari7mc697df8q91v6r0n"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
|
@ -715,10 +800,7 @@ conn_max_age argument to easily enable Django’s connection pool.")
|
|||
(lambda _
|
||||
(invoke "python" "-m" "django" "test" "-v2"
|
||||
"--settings=tests.settings"))))))
|
||||
(propagated-inputs
|
||||
;; XXX: Picklefield has not been updated in 10+ years and fails tests
|
||||
;; with Django 3.2.
|
||||
`(("python-django@2.2" ,python-django-2.2)))
|
||||
(propagated-inputs (list python-django))
|
||||
(synopsis "Pickled object field for Django")
|
||||
(description "Pickled object field for Django")
|
||||
(license license:expat)))
|
||||
|
@ -797,6 +879,36 @@ used to attach comments to any model, so you can use it for comments on blog
|
|||
entries, photos, book chapters, or anything else.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-django-ninja
|
||||
(package
|
||||
(name "python-django-ninja")
|
||||
(version "0.22.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django_ninja" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0b19w7nvw7c3z19dbza49m24c3384j59w2xcr5l6jshxazkvsgli"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
;; FIXME: How to configure this test properly?
|
||||
(list #:test-flags #~'("-k" "not test_improperly_configured")))
|
||||
(propagated-inputs
|
||||
(list python-django python-pydantic))
|
||||
(native-inputs
|
||||
(list python-flit-core
|
||||
python-psycopg2
|
||||
python-pytest
|
||||
python-pytest-asyncio
|
||||
python-pytest-django))
|
||||
(home-page "https://django-ninja.rest-framework.com")
|
||||
(synopsis "REST framework for Django")
|
||||
(description
|
||||
"Django Ninja is a web framework for building APIs with Django
|
||||
and Python type hints. It is designed to be fast and easy to use thanks
|
||||
to asyncio and Pydantic.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-django-pipeline
|
||||
(package
|
||||
(name "python-django-pipeline")
|
||||
|
|
|
@ -844,7 +844,7 @@ Extensions} (DNSSEC).")
|
|||
(define-public knot
|
||||
(package
|
||||
(name "knot")
|
||||
(version "3.2.9")
|
||||
(version "3.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -853,7 +853,7 @@ Extensions} (DNSSEC).")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kxmplngnlpd6j9nbzq1c1z02ipd38ypnppy7frg5crn83phfbxm"))
|
||||
(base32 "0l29809wcpx4q1d87539799c4mai0vvfkzkbmrba186mn47p3lsd"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -863,9 +863,8 @@ Extensions} (DNSSEC).")
|
|||
;; Remove bundled libraries to ensure we always use the system's.
|
||||
(with-directory-excursion "src/contrib"
|
||||
(for-each delete-file-recursively
|
||||
(list "libbpf"
|
||||
;; TODO: package this for DoQ (‘QUIC’) support.
|
||||
"libngtcp2")))))))
|
||||
;; TODO: package libngtcp2 for DoQ (‘QUIC’) support.
|
||||
'("libngtcp2")))))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs (list "out" "doc" "lib" "tools"))
|
||||
(arguments
|
||||
|
|
|
@ -134,6 +134,7 @@
|
|||
;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org>
|
||||
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
|
||||
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
|
||||
;;; Copyright © 2023 Thanos Apollo <public@thanosapollo.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -181,6 +182,7 @@
|
|||
#:use-module (gnu packages djvu)
|
||||
#:use-module (gnu packages ebook)
|
||||
#:use-module (gnu packages emacs)
|
||||
#:use-module (gnu packages enchant)
|
||||
#:use-module (gnu packages fonts)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages games)
|
||||
|
@ -493,6 +495,25 @@ just one-off queries and multiple independent sessions. It requires an OpenAI
|
|||
API key.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-chatgpt-shell
|
||||
(package
|
||||
(name "emacs-chatgpt-shell")
|
||||
(version "0.74.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/xenodium/chatgpt-shell")
|
||||
(commit "1de7bfa6a34f20cca813006282d9a8f2ef291f95")))
|
||||
(sha256
|
||||
(base32
|
||||
"1rabpp70qlmc47lmp2v7ckvfjhy6wkk881fxpbv2dchzhn77qk5r"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/xenodium/chatgpt-shell")
|
||||
(synopsis "ChatGPT and DALL-E Emacs shells + Org Babel")
|
||||
(description
|
||||
"chatgpt-shell is a comint-based ChatGPT shell for Emacs.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-geiser-guile
|
||||
(package
|
||||
(name "emacs-geiser-guile")
|
||||
|
@ -1447,10 +1468,10 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.")
|
|||
(license license:gpl2+))))
|
||||
|
||||
(define-public emacs-magit
|
||||
;; Use this unreleased commit to benefit from a recent change needed to
|
||||
;; add Reviewed-by: tags for any contributor in commit messages.
|
||||
(let ((commit "186414ae418a07a46c413f05c68413a76256a05e")
|
||||
(revision "5"))
|
||||
;; Use this unreleased commit to benefit from a recent improvements with
|
||||
;; regard to adding git trailers such as "Reviewed-by".
|
||||
(let ((commit "7a1d50347086678217cf90a32dda277b76ea3081")
|
||||
(revision "6"))
|
||||
(package
|
||||
(name "emacs-magit")
|
||||
(version (git-version "3.3.0" revision commit))
|
||||
|
@ -1462,7 +1483,7 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.")
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rhsbcjfjw0z3vy2ix30y4h55c0cx4lyvz6mbijwbbjryln71kpj"))))
|
||||
(base32 "1yn3v24w0sx6r8jqw8blfvyjdjfz5xa7c3x8p6xw1lj7b81l8i0l"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -10345,6 +10366,66 @@ insertion mode. When enabled all keys are implicitly prefixed with
|
|||
sgml/html integration, and indentation (working with sgml).")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-jinx
|
||||
(package
|
||||
(name "emacs-jinx")
|
||||
(version "0.8")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/minad/jinx")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1y097rnf9zg26jf4vh74a0laddfp4x6pp1fjqs3xqgwc0cmdq59w"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'expand-load-path 'build-jinx-mod
|
||||
(lambda* _
|
||||
(invoke
|
||||
"emacs" "--batch" "-L" "."
|
||||
"-l" "jinx.el"
|
||||
"-f" "jinx--load-module")))
|
||||
(add-after 'expand-load-path 'build-info
|
||||
(lambda _
|
||||
(invoke "emacs" "--batch"
|
||||
"--eval=(require 'ox-texinfo)"
|
||||
"--eval=(find-file \"README.org\")"
|
||||
"--eval=(org-texinfo-export-to-info)")))
|
||||
(add-after 'build-jinx-mod 'patch-path-to-jinx-mod
|
||||
(lambda _
|
||||
(let ((file "jinx.el"))
|
||||
(make-file-writable file)
|
||||
(emacs-substitute-sexps file
|
||||
("\"Compile and load dynamic module.\""
|
||||
`(module-load
|
||||
,(string-append #$output
|
||||
"/lib/emacs/jinx-mod.so")))))))
|
||||
(add-after 'install 'install-jinx-mod
|
||||
(lambda _
|
||||
(install-file "jinx-mod.so"
|
||||
(string-append #$output "/lib/emacs"))))
|
||||
(add-after 'install 'install-info
|
||||
(lambda _
|
||||
(install-file "jinx.info"
|
||||
(string-append #$output "/share/info")))))))
|
||||
(inputs (list enchant))
|
||||
(propagated-inputs (list emacs-compat))
|
||||
(native-inputs (list emacs-compat enchant pkg-config texinfo))
|
||||
(home-page "https://github.com/minad/jinx")
|
||||
(synopsis "Emacs Enchanted Spell Checker")
|
||||
(description "Jinx is a just-in-time spell-checker for Emacs
|
||||
based on the enchant library. It lazily highlights misspelled words in the
|
||||
text of the visible portion of the buffer by honouring window boundaries as
|
||||
well as text folding, if any.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-jit-spell
|
||||
(package
|
||||
(name "emacs-jit-spell")
|
||||
|
@ -12374,30 +12455,27 @@ The following completions are currently available:
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-sway
|
||||
;; Commit from Nicola's fork (dash free version with various improvments)
|
||||
(let ((commit "838ef531a30fe616f0141adbdabc132d4edfd374")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "emacs-sway")
|
||||
(version (git-version "0.6.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/thblt/sway.el")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ddaz8my3z4ca2z81kf1h8773pyx8h0l0ra3ssqd1rq5j0041wdh"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/thblt/sway.el")
|
||||
(synopsis "Communication with the Sway window manager")
|
||||
(description
|
||||
"This is a basic library to control the Sway window manager from Emacs.
|
||||
(package
|
||||
(name "emacs-sway")
|
||||
(version "0.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/thblt/sway.el")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1w29dkl7s835zgwnc4jx1cp84s6mmwbvlil8z2c31psy0rlajc6i"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/thblt/sway.el")
|
||||
(synopsis "Communication with the Sway window manager")
|
||||
(description
|
||||
"This is a basic library to control the Sway window manager from Emacs.
|
||||
Its main use case is in combination with popup managers like Shackle, to
|
||||
use frames instead of windows while still giving focus to existing frames
|
||||
instead of duplicating them.")
|
||||
(license license:gpl3+))))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-sweet-theme
|
||||
(let ((commit "78f741806ecebe01224bf54d09ad80e306652508")
|
||||
|
@ -18269,11 +18347,12 @@ in Emacs.")
|
|||
(package
|
||||
(name "emacs-php-mode")
|
||||
(version "1.25.0")
|
||||
(home-page "https://github.com/emacs-php/php-mode")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ejmr/php-mode")
|
||||
(url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
|
@ -18296,7 +18375,6 @@ in Emacs.")
|
|||
(lambda _
|
||||
(chdir "lisp"))))))
|
||||
(propagated-inputs (list emacs-projectile))
|
||||
(home-page "https://github.com/ejmr/php-mode")
|
||||
(synopsis "Major mode for editing PHP code")
|
||||
(description
|
||||
"PHP mode is a major mode for editing PHP source code. It's an extension
|
||||
|
@ -27816,6 +27894,33 @@ as playing them in some video player, or downloading them.")
|
|||
and comments.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-yeetube
|
||||
(package
|
||||
(name "emacs-yeetube")
|
||||
(version "1.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.sr.ht/~thanosapollo/yeetube.el")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"0vfap6sri6qnswrjsp6qvmrp98bvrfh58gwdqbjiakq1fzvcrm03"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system emacs-build-system)
|
||||
(inputs
|
||||
(list mpv yt-dlp))
|
||||
(home-page "https://sr.ht/~thanosapollo/yeetube.el")
|
||||
(synopsis "Youtube & Invidious front-end for Emacs")
|
||||
(description
|
||||
"This package offers an Emacs interface that allows you to search YouTube
|
||||
or an Invidious instance for a specific query. The search results are shown as
|
||||
links in an org-mode buffer. The videos can be opened to a user-defined video
|
||||
player(by default mpv) or downloaded using yt-dlp. This package also includes
|
||||
a yt-dlp front-end.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-org-web-tools
|
||||
(package
|
||||
(name "emacs-org-web-tools")
|
||||
|
@ -30198,6 +30303,27 @@ displays as you type thanks to Helm, though @command{notmuch-search} does the
|
|||
real search.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-notmuch-indicator
|
||||
(package
|
||||
(name "emacs-notmuch-indicator")
|
||||
(version "1.0.1")
|
||||
(home-page "https://git.sr.ht/~protesilaos/notmuch-indicator")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://elpa.gnu.org/packages/notmuch-indicator-" version
|
||||
".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"1n5k2ikk93mdwqqysf6l7gd8i6iazk8yvbqpf8xnz5zny248cc2x"))))
|
||||
(build-system emacs-build-system)
|
||||
(synopsis "Display a mode line indicator with @code{notmuch-count} output")
|
||||
(description "This package renders an indicator with an email count of the
|
||||
@code{notmuch} index on the Emacs mode line. The underlying mechanism is that of
|
||||
@code{notmuch-count}, which is used to find the number of items that match the
|
||||
given search terms.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-notmuch-maildir
|
||||
(package
|
||||
(name "emacs-notmuch-maildir")
|
||||
|
@ -32686,37 +32812,40 @@ time.")
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-mastodon
|
||||
(package
|
||||
(name "emacs-mastodon")
|
||||
(version "1.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://codeberg.org/martianh/mastodon.el")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"13swcbvwhjl8ksrgzvmfafkgd3iz8znk49bs1n48w3g9qvh097w7"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Move the source files to the top level, which is included in
|
||||
;; the EMACSLOADPATH.
|
||||
(add-after 'unpack 'move-source-files
|
||||
(lambda _
|
||||
(let ((el-files (find-files "./lisp" ".*\\.el$")))
|
||||
(for-each (lambda (f)
|
||||
(rename-file f (basename f)))
|
||||
el-files)))))))
|
||||
(propagated-inputs
|
||||
(list emacs-request))
|
||||
(home-page "https://codeberg.org/martianh/mastodon.el")
|
||||
(synopsis "Emacs client for Mastodon")
|
||||
(description "@code{mastodon.el} is an Emacs client for Mastodon, the
|
||||
;; No release in ~1 year, hence this snapshot.
|
||||
(let ((commit "20dec8871c9bb5f5e418bfc197e7533b5e3065e3")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-mastodon")
|
||||
(version (git-version "1.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://codeberg.org/martianh/mastodon.el")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"15cfjny99yw5frdp8nlyazlwgscvfvbinsj0fbdfprxf50k2zjs6"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Move the source files to the top level, which is included in
|
||||
;; the EMACSLOADPATH.
|
||||
(add-after 'unpack 'move-source-files
|
||||
(lambda _
|
||||
(let ((el-files (find-files "./lisp" ".*\\.el$")))
|
||||
(for-each (lambda (f)
|
||||
(rename-file f (basename f)))
|
||||
el-files)))))))
|
||||
(propagated-inputs
|
||||
(list emacs-request emacs-ts emacs-persist))
|
||||
(home-page "https://codeberg.org/martianh/mastodon.el")
|
||||
(synopsis "Emacs client for Mastodon")
|
||||
(description "@code{mastodon.el} is an Emacs client for Mastodon, the
|
||||
federated microblogging social network.")
|
||||
(license license:gpl3+)))
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-ebdb
|
||||
(package
|
||||
|
|
|
@ -56,7 +56,6 @@
|
|||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages build-tools)
|
||||
#:use-module (gnu packages cdrom)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
|
@ -72,7 +71,6 @@
|
|||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages fribidi)
|
||||
#:use-module (gnu packages game-development)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib)
|
||||
|
@ -102,7 +100,6 @@
|
|||
#:use-module (gnu packages upnp)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages vulkan)
|
||||
#:use-module (gnu packages wxwidgets)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xml)
|
||||
|
@ -253,8 +250,8 @@ console.")
|
|||
;; Following commits and revision numbers of beta versions listed at
|
||||
;; https://dolphin-emu.org/download/.
|
||||
(define-public dolphin-emu
|
||||
(let ((commit "a34823df61df65168aa40ef5e82e44defd4a0138")
|
||||
(revision "13178"))
|
||||
(let ((commit "f9deb68aee962564b1495ff04c54c015e58d086f")
|
||||
(revision "13669"))
|
||||
(package
|
||||
(name "dolphin-emu")
|
||||
(version (git-version "5.0" revision commit))
|
||||
|
@ -265,6 +262,8 @@ console.")
|
|||
(url "https://github.com/dolphin-emu/dolphin")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1p8qsxlabgmz3nic0a9ghh9d3lzl5f8i3kmdrrvx6w8kdlp33018"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -276,11 +275,8 @@ console.")
|
|||
"gettext" "hidapi" "libpng" "libusb" "mbedtls"
|
||||
"miniupnpc" "MoltenVK" "zlib"))
|
||||
;; Clean up source.
|
||||
(for-each delete-file (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$"))
|
||||
#t))
|
||||
(sha256
|
||||
(base32
|
||||
"0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1"))))
|
||||
(for-each delete-file
|
||||
(find-files "." ".*\\.(bin|dsy|exe|jar|rar)$"))))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f
|
||||
|
@ -304,8 +300,7 @@ console.")
|
|||
(substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
|
||||
(("\"vulkan\", 1") (string-append "\"vulkan\""))
|
||||
(("\"vulkan\"") (string-append "\"" libvulkan "\""))
|
||||
(("Common::DynamicLibrary::GetVersionedFilename") ""))
|
||||
#t))))
|
||||
(("Common::DynamicLibrary::GetVersionedFilename") ""))))))
|
||||
|
||||
;; The FindGTK2 cmake script only checks hardcoded directories for
|
||||
;; glib/gtk headers.
|
||||
|
@ -319,8 +314,7 @@ console.")
|
|||
"/lib/libX11.so")
|
||||
"-DX11_FOUND=1")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("gettext" ,gettext-minimal)))
|
||||
(list gettext-minimal pkg-config))
|
||||
(inputs
|
||||
(list alsa-lib
|
||||
ao
|
||||
|
|
|
@ -373,7 +373,7 @@ always possible.")
|
|||
(define-public exfat-utils
|
||||
(package
|
||||
(name "exfat-utils")
|
||||
(version "1.3.0")
|
||||
(version "1.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -381,7 +381,7 @@ always possible.")
|
|||
"https://github.com/relan/exfat/releases/download/v"
|
||||
version "/exfat-utils-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0da8f8mm1sbwqp7prh78qk33xm0b8kk2d5is7mh2szlhgdxd1syz"))))
|
||||
(base32 "0sdzflmwcxjjliq1yqhidy46kbkvj16kxrbrgsj0ci0hjgx7a594"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://github.com/relan/exfat")
|
||||
(synopsis "Utilities to manipulate exFAT file systems")
|
||||
|
@ -394,7 +394,7 @@ ones.")
|
|||
(define-public fsarchiver
|
||||
(package
|
||||
(name "fsarchiver")
|
||||
(version "0.8.6")
|
||||
(version "0.8.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -404,7 +404,7 @@ ones.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ry2sdkfbg4bwcldk42g1i3wa3z4pr9yh9dil6ilhwcvhqiw41zc"))))
|
||||
(base32 "1vy8ay0fn32i298bx9scqghi7xm9z2101zxk5xshbrkl00b2m4nm"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf automake pkg-config))
|
||||
|
@ -716,7 +716,7 @@ from the bcachefs-tools package. It is meant to be used in initrds.")
|
|||
(define-public exfatprogs
|
||||
(package
|
||||
(name "exfatprogs")
|
||||
(version "1.2.0")
|
||||
(version "1.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -725,7 +725,7 @@ from the bcachefs-tools package. It is meant to be used in initrds.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "02a6178brikg12wl80h9qgxyhpm6mly0jnml0rs9phb7lkbv9kzh"))))
|
||||
(base32 "1g5aqhjz0l58kvmis1j5b5qkn58hjs582f36ygiqkgxvp4njkny4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -1922,7 +1922,7 @@ and rewritable media that wears out (DVD/CD-RW).")
|
|||
(define-public fuse-overlayfs
|
||||
(package
|
||||
(name "fuse-overlayfs")
|
||||
(version "1.10")
|
||||
(version "1.13")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -1930,7 +1930,7 @@ and rewritable media that wears out (DVD/CD-RW).")
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"085hrz0nrdsjfjci0z2qfyqrydn8wwdp790dx2x67hwdw1kib3wp"))
|
||||
"03gqb4czswqhx6zrv9jj88mf3mczk4m7azcjgr785c2lmga442ly"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Carlo Holl <carloholl@gmail.com>
|
||||
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
|
@ -1378,14 +1378,14 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.")
|
|||
(define-public python-duniterpy
|
||||
(package
|
||||
(name "python-duniterpy")
|
||||
(version "1.1.0")
|
||||
(version "1.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "duniterpy" version))
|
||||
(sha256
|
||||
(base32 "18i5bqz58vjp740pxb4wb4ixg1g2d73cwi0d8gp85fmj5p8f2gx7"))))
|
||||
(build-system python-build-system)
|
||||
(base32 "0h0fsawsrjd50lb1bkysb21ph39qlhmiymd3r5vs695qxvbwaqaa"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required
|
||||
;; positional argument: 'value'".
|
||||
|
@ -1393,19 +1393,34 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.")
|
|||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'loosen-requirements
|
||||
(lambda _
|
||||
(substitute* "setup.py"
|
||||
(("mnemonic>=0\\.19,<0.20")
|
||||
"mnemonic>=0.19")))))))
|
||||
(substitute* "pyproject.toml"
|
||||
(("mnemonic = \"\\^0\\.19")
|
||||
"mnemonic = \">=0.19")
|
||||
(("jsonschema = \"\\^3\\.2")
|
||||
"jsonschema = \">=3.2"))))
|
||||
(add-after 'unpack 'adjust-for-new-libnacl
|
||||
(lambda _
|
||||
;; Mimic upstream commit ad8f6a26e9e7067; remove
|
||||
;; for newer versions of duniterpy.
|
||||
(substitute* "pyproject.toml"
|
||||
(("libnacl = \"1\\.8")
|
||||
"libnacl = \">=1.9"))
|
||||
(substitute* "duniterpy/key/ascii_armor.py"
|
||||
(("from libnacl\\.version import version as libnacl_version")
|
||||
"import importlib.metadata
|
||||
libnacl_version = importlib.metadata.version('libnacl')")))))))
|
||||
(native-inputs
|
||||
(list python-poetry-core))
|
||||
(propagated-inputs
|
||||
(list python-attrs
|
||||
python-base58
|
||||
python-graphql-core
|
||||
python-jsonschema
|
||||
python-libnacl
|
||||
python-pyaes
|
||||
python-graphql-core
|
||||
python-mnemonic
|
||||
python-websocket-client
|
||||
python-pypeg2))
|
||||
python-pyaes
|
||||
python-pypeg2
|
||||
python-websocket-client))
|
||||
(home-page "https://git.duniter.org/clients/python/duniterpy")
|
||||
(synopsis "Python implementation of Duniter API")
|
||||
(description "@code{duniterpy} is an implementation of
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages assembly)
|
||||
#:use-module (gnu packages backup)
|
||||
#:use-module (gnu packages base)
|
||||
|
@ -58,7 +57,6 @@
|
|||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages hardware)
|
||||
#:use-module (gnu packages libusb)
|
||||
|
@ -71,13 +69,11 @@
|
|||
#:use-module (gnu packages polkit)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-build)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages shells)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
|
|
|
@ -933,7 +933,7 @@ for use at smaller text sizes")))
|
|||
(define-public font-gnu-unifont
|
||||
(package
|
||||
(name "font-gnu-unifont")
|
||||
(version "15.0.01")
|
||||
(version "15.1.01")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -943,12 +943,11 @@ for use at smaller text sizes")))
|
|||
(string-append "mirror://gnu/unifont/unifont-"
|
||||
version "/unifont-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32 "1m9lfss6sbmcr0b6h7pxxmdl71j9dmnvk8idvxzylqrwpwjaj4bx"))
|
||||
(base32 "1dydcqa2nvmnij5jzj10carrzssd3ar24i8zd18pk4zpl84l4pz1"))
|
||||
(snippet
|
||||
'(begin
|
||||
(use-modules (guix build utils))
|
||||
(delete-file-recursively "font/precompiled")
|
||||
(delete-file-recursively "hangul/precompiled")))))
|
||||
(delete-file-recursively "font/precompiled")))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" ; TrueType/OpenType version
|
||||
"pcf" ; PCF (bitmap) version
|
||||
|
@ -956,6 +955,7 @@ for use at smaller text sizes")))
|
|||
"bin")) ; Utilities to manipulate '.hex' format
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
#:parallel-build? #f ; Race condition in the font Makefile
|
||||
#:make-flags
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
"BUILDFONT=TRUE")
|
||||
|
@ -977,20 +977,13 @@ for use at smaller text sizes")))
|
|||
(psf (string-append (assoc-ref outputs "psf")
|
||||
"/share/consolefonts"))
|
||||
(bin (assoc-ref outputs "bin")))
|
||||
;; This directory isn't created in fonts/Makefile.
|
||||
(mkdir-p otf)
|
||||
(apply invoke "make" "install"
|
||||
(string-append "PREFIX=" bin)
|
||||
(string-append "TTFDEST=" ttf)
|
||||
(string-append "OTFDEST=" otf)
|
||||
(string-append "PCFDEST=" pcf)
|
||||
(string-append "CONSOLEDEST=" psf)
|
||||
make-flags)
|
||||
;; Move Texinfo file to the right place.
|
||||
(mkdir (string-append bin "/share/info"))
|
||||
(invoke "gzip" "-9n" "doc/unifont.info")
|
||||
(install-file "doc/unifont.info.gz"
|
||||
(string-append bin "/share/info"))))))))
|
||||
make-flags)))))))
|
||||
(native-inputs
|
||||
(list bdftopcf console-setup fontforge))
|
||||
(inputs
|
||||
|
|
|
@ -266,6 +266,9 @@ directory comparison and more.")
|
|||
(arguments
|
||||
`(#:make-flags
|
||||
(list (string-append "CC=" ,(cc-for-target))
|
||||
;; Work around, e.g., “ssl.c:149:7: error: ‘EC_KEY_free’ is
|
||||
;; deprecated: Since OpenSSL 3.0 [-Werror=deprecated-declarations]”
|
||||
"CFLAGS=-Wno-deprecated-declarations"
|
||||
;; vsf_findlibs.sh looks only for hard-coded {/usr,}/lib file names
|
||||
;; that will never exist on Guix. Manage libraries ourselves.
|
||||
"LDFLAGS=-lcap -lpam"
|
||||
|
|
|
@ -1646,53 +1646,61 @@ games.")
|
|||
(license license:expat)))
|
||||
|
||||
(define-public python-pyxel
|
||||
(package
|
||||
(name "python-pyxel")
|
||||
(version "1.4.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/kitao/pyxel")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bwsgb5yq5s479cnf046v379zsn5ybp5195kbfvzr9l11qbaicm9"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "pyxel/core/bin")))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; "Tests" are actually example programs that never halt.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-build-files
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "setup.py"
|
||||
(("\"pyxel\\.core\\.bin\\.(.*)\"," all arch)
|
||||
(if (string=? arch "linux")
|
||||
all
|
||||
"")))
|
||||
(substitute* "pyxel/core/Makefile"
|
||||
(("`sdl2-config")
|
||||
(string-append "`sdl2-config --prefix="
|
||||
(assoc-ref inputs "sdl2"))))))
|
||||
(add-before 'build 'prebuild
|
||||
(lambda _
|
||||
(invoke "make" "-C" "pyxel/core"))))))
|
||||
(inputs
|
||||
`(("gifsicle" ,gifsicle)
|
||||
("sdl2" ,(sdl-union (list sdl2 sdl2-image)))))
|
||||
(home-page "https://github.com/kitao/pyxel")
|
||||
(synopsis "Retro game engine for Python")
|
||||
(description "Pyxel is a game engine inspired by retro gaming consoles.
|
||||
;; Note to updaters: Use commit and revision even if you're bumping
|
||||
;; to a release, as upstream is known to "reuse" tags.
|
||||
;; See <https://bugs.gnu.org/66015> for more information.
|
||||
(let ((commit "be75b724cae9e10e56a82a5421f9dd65390f1a06")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "python-pyxel")
|
||||
;; This is the latest version to not require Rust…
|
||||
(version (git-version "1.4.3" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/kitao/pyxel")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"03ch79cmh9fxvq6c2f3zc2snzczhqi2n01f254lsigckc7d5wz08"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(substitute* "pyxel/__init__.py"
|
||||
(("from collections import MutableSequence")
|
||||
"from collections.abc import MutableSequence"))))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; "Tests" are actually example programs that never halt.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-build-files
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "setup.py"
|
||||
(("\"pyxel\\.core\\.bin\\.(.*)\"," all arch)
|
||||
(if (string=? arch "linux")
|
||||
all
|
||||
"")))
|
||||
(substitute* "pyxel/core/Makefile"
|
||||
(("`sdl2-config")
|
||||
(string-append "`sdl2-config --prefix="
|
||||
(assoc-ref inputs "sdl2"))))))
|
||||
(add-before 'build 'prebuild
|
||||
(lambda _
|
||||
(invoke "make" "-C" "pyxel/core"))))))
|
||||
(inputs
|
||||
`(("gifsicle" ,gifsicle)
|
||||
("sdl2" ,(sdl-union (list sdl2 sdl2-image)))))
|
||||
(home-page "https://github.com/kitao/pyxel")
|
||||
(synopsis "Retro game engine for Python")
|
||||
(description "Pyxel is a game engine inspired by retro gaming consoles.
|
||||
It has a fixed 16-color palette, can hold up to 3 image banks and 8 tilemaps
|
||||
(256x256 pixels each) and 4 sound channels with 64 definable sounds. It
|
||||
also comes with a built-in image and sound editor.")
|
||||
(license license:expat)))
|
||||
(license license:expat))))
|
||||
|
||||
(define-public grafx2
|
||||
(package
|
||||
|
|
|
@ -491,27 +491,25 @@ Doom clone shooter game.")
|
|||
(define-public armagetronad
|
||||
(package
|
||||
(name "armagetronad")
|
||||
(version "0.2.9.1.0")
|
||||
(version "0.2.9.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/armagetronad/stable/"
|
||||
version "/armagetronad-" version ".tbz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18gn4sg4j5sw38ngb90sl50raliplrsgjcvy8fjwry733k0cgdjr"))))
|
||||
"0cpxvzbssyf45fmanp1d6l992wln8zkjx4z2flgx27fg1rqdw5zn"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list libxml2
|
||||
sdl
|
||||
sdl-image
|
||||
freeglut
|
||||
libpng
|
||||
libjpeg-turbo))
|
||||
(native-inputs (list pkg-config))
|
||||
(inputs (list libxml2
|
||||
(sdl-union (list sdl sdl-image sdl-mixer))
|
||||
freeglut
|
||||
libpng
|
||||
libjpeg-turbo))
|
||||
(home-page "https://www.armagetronad.org")
|
||||
(synopsis "Tron clone in 3D")
|
||||
(description "Armagetron Advanced is a multiplayer game in 3d that
|
||||
(description
|
||||
"Armagetron Advanced is a multiplayer game in 3d that
|
||||
attempts to emulate and expand on the lightcycle sequence from the movie Tron.
|
||||
It's an old school arcade game slung into the 21st century. Highlights
|
||||
include a customizable playing arena, HUD, unique graphics, and AI bots. For
|
||||
|
@ -1148,6 +1146,7 @@ want what you have.")
|
|||
qtsvg-5
|
||||
qttools-5
|
||||
qtwebsockets-5
|
||||
qtwayland-5
|
||||
xz
|
||||
zlib))
|
||||
(home-page "https://cockatrice.github.io")
|
||||
|
@ -3314,7 +3313,7 @@ that beneath its ruins lay buried an ancient evil.")
|
|||
(define-public angband
|
||||
(package
|
||||
(name "angband")
|
||||
(version "4.2.4")
|
||||
(version "4.2.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -3323,7 +3322,7 @@ that beneath its ruins lay buried an ancient evil.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1x0qqsv7xa3figcl4v35sin64ffgz32652vk541d8qaq4qcc378n"))
|
||||
(base32 "0kg6npbfy42mhggsqvs04khc8198i980z52xm59pws29698qazaw"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; So, some of the sounds/graphics/tilesets are under different
|
||||
|
@ -5571,65 +5570,57 @@ fullscreen, use F5 or Alt+Enter.")
|
|||
(define-public tennix
|
||||
(package
|
||||
(name "tennix")
|
||||
(version "1.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://repo.or.cz/tennix.git")
|
||||
(commit (string-append "tennix-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "02cj4lrdrisal5s9pnbf2smx7qz9czczjzndfkhfx0qy67b957sk"))
|
||||
;; Remove non-free images.
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(for-each delete-file
|
||||
'("data/loc_training_camp.png"
|
||||
"data/loc_austrian_open.png"
|
||||
"data/loc_olympic_green_tennis.png"))
|
||||
#t))))
|
||||
(version "1.3.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://repo.or.cz/tennix.git")
|
||||
(commit (string-append "tennix-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fmg0vw8c2spyxy4k64nwky80jsw9mc3vnlch49q6cagjsg9y8dj"))
|
||||
;; Remove non-free images.
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(begin
|
||||
(for-each delete-file
|
||||
'("data/loc_training_camp.png"
|
||||
"data/loc_austrian_open.png"
|
||||
"data/loc_olympic_green_tennis.png")) #t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no test
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-include
|
||||
(lambda _
|
||||
(substitute* '("src/graphics.h" "src/sound.h")
|
||||
(("#include \"(SDL_(image|ttf|mixer)\\.h)\"" _ header)
|
||||
(string-append "#include \"SDL/" header "\"")))
|
||||
(substitute* '("src/tennix.h" "src/network.h" "src/SDL_rotozoom.h")
|
||||
(("#include <SDL.h>") "#include <SDL/SDL.h>")
|
||||
(("#include <SDL_net.h>") "#include <SDL/SDL_net.h>"))
|
||||
#t))
|
||||
(add-after 'unpack 'locate-install
|
||||
;; Build process cannot expand "$(INSTALL)" in Makefile.
|
||||
(lambda _
|
||||
(substitute* "makefile"
|
||||
(("^CONFIGURE_OUTPUT :=.*" all)
|
||||
(string-append "INSTALL := install -c\n" all)))
|
||||
#t))
|
||||
(replace 'configure
|
||||
;; The "configure" script is picky about the arguments it
|
||||
;; gets. Call it ourselves.
|
||||
(lambda _
|
||||
(invoke "./configure" "--prefix" (assoc-ref %outputs "out")))))))
|
||||
(native-inputs
|
||||
(list which))
|
||||
(inputs
|
||||
`(("python" ,python-wrapper)
|
||||
("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf sdl-net)))))
|
||||
(list
|
||||
#:tests? #f ;no tests
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'locate-install
|
||||
;; Build process cannot expand "$(INSTALL)" in Makefile.
|
||||
(lambda _
|
||||
(substitute* "makefile"
|
||||
(("^CONFIGURE_OUTPUT :=.*" all)
|
||||
(string-append "INSTALL := install -c\n" all))) #t))
|
||||
(replace 'configure
|
||||
;; The "configure" script is picky about the arguments it
|
||||
;; gets. Call it ourselves.
|
||||
(lambda _
|
||||
(invoke "./configure" "--prefix"
|
||||
(assoc-ref %outputs "out")))))))
|
||||
(native-inputs (list which))
|
||||
(inputs (list python
|
||||
(sdl-union (list sdl2
|
||||
sdl2-image
|
||||
sdl2-mixer
|
||||
sdl2-ttf
|
||||
sdl2-net
|
||||
sdl2-gfx))))
|
||||
(home-page "https://icculus.org/tennix/")
|
||||
(synopsis "Play tennis against the computer or a friend")
|
||||
(description "Tennix is a 2D tennis game. You can play against the
|
||||
(description
|
||||
"Tennix is a 2D tennis game. You can play against the
|
||||
computer or against another player using the keyboard. The game runs
|
||||
in-window at 640x480 resolution or fullscreen.")
|
||||
;; Project is licensed under GPL2+ terms. It includes images
|
||||
;; released under Public Domain terms, and SDL_rotozoom, released
|
||||
;; under LGPL2.1 terms.
|
||||
(license (list license:gpl2+ license:public-domain license:lgpl2.1))))
|
||||
;; released under Public Domain terms.
|
||||
(license (list license:gpl2+ license:public-domain))))
|
||||
|
||||
(define-public warzone2100
|
||||
(package
|
||||
|
@ -11059,7 +11050,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.")
|
|||
(define-public vcmi
|
||||
(package
|
||||
(name "vcmi")
|
||||
(version "1.2.1")
|
||||
(version "1.3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -11068,7 +11059,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0f3fk1fc2wb7f2j4pxz89dzr8zjnrdh435mijia483a3bq59w7pk"))
|
||||
"0jq84i6lxp96xkzq9mq8n2bbmincjzi39vijj9ws8i59c7xvjw5f"))
|
||||
(patches (search-patches "vcmi-disable-privacy-breach.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
|
|
|
@ -617,7 +617,7 @@ Go. It also includes runtime support libraries for these languages.")
|
|||
"btver1" "btver2" ;AMD
|
||||
|
||||
;; psABI micro-architecture levels
|
||||
"x86_64-v1" "x86_64-v2" "x86_64-v3" "x86_64-v4")))
|
||||
"x86-64-v1" "x86-64-v2" "x86-64-v3" "x86-64-v4")))
|
||||
|
||||
;; Suitable '-march' values for GCC 12.
|
||||
(define %gcc-12-aarch64-micro-architectures
|
||||
|
|
|
@ -89,6 +89,7 @@
|
|||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gps)
|
||||
#:use-module (gnu packages graphics)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages haskell-apps)
|
||||
#:use-module (gnu packages haskell-xyz)
|
||||
|
@ -1535,60 +1536,54 @@ visualizing and performing calculations with weather data.")
|
|||
(define-public libosmium
|
||||
(package
|
||||
(name "libosmium")
|
||||
(version "2.18.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/osmcode/libosmium")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0fh57mpii1ksacwfx5rz213j896aklib53jbybld2i517q2mmxr0"))))
|
||||
(version "2.19.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/osmcode/libosmium")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0d69xzd29hk846g049y2g668mr8kaf05f6a26s3qn6az062hxfa7"))))
|
||||
(build-system cmake-build-system)
|
||||
(propagated-inputs
|
||||
(list boost
|
||||
bzip2
|
||||
expat
|
||||
gdal
|
||||
geos
|
||||
lz4
|
||||
proj
|
||||
protozero
|
||||
sparsehash
|
||||
utfcpp
|
||||
zlib))
|
||||
(native-inputs
|
||||
(list doxygen))
|
||||
(propagated-inputs (list boost
|
||||
bzip2
|
||||
expat
|
||||
gdal
|
||||
geos
|
||||
lz4
|
||||
proj-7
|
||||
protozero
|
||||
zlib))
|
||||
(native-inputs (list doxygen graphviz-minimal))
|
||||
(home-page "https://osmcode.org/libosmium/")
|
||||
(synopsis "C++ library for working with OpenStreetMap data")
|
||||
(description "Libosmium is a fast and flexible C++ library for working with
|
||||
(description
|
||||
"Libosmium is a fast and flexible C++ library for working with
|
||||
OpenStreetMap data.")
|
||||
(license license:boost1.0)))
|
||||
|
||||
(define-public osmium-tool
|
||||
(package
|
||||
(name "osmium-tool")
|
||||
(version "1.14.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/osmcode/osmium-tool")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0zgyqyrs89vch0qnkh9m5xq079sr2wmydy5zz4l8xbysbjf6xry5"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
'(delete-file-recursively "include/rapidjson"))))
|
||||
(version "1.15.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/osmcode/osmium-tool")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0d90vz316xdl3c416nicgdw7ybw17l2125wgxglbzl7jaqngapy5"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
'(delete-file-recursively "include/rapidjson"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
(list libosmium
|
||||
rapidjson))
|
||||
(native-inputs
|
||||
(list pandoc))
|
||||
(inputs (list libosmium rapidjson))
|
||||
(native-inputs (list pandoc))
|
||||
(home-page "https://osmcode.org/osmium-tool/")
|
||||
(synopsis "Osmium command-line tool")
|
||||
(description "Command line tool for working with OpenStreetMap data
|
||||
|
@ -1598,43 +1593,44 @@ based on the Osmium library.")
|
|||
(define-public osm2pgsql
|
||||
(package
|
||||
(name "osm2pgsql")
|
||||
(version "1.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/openstreetmap/osm2pgsql")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ssz7ny4wx8dzl3027p37xc5h7m1aj6bzxzdc6g8fbp7q57ykvxz"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
'(delete-file-recursively "contrib"))))
|
||||
(version "1.9.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/openstreetmap/osm2pgsql")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"198qcgl42pb8lk1bn41ncp8hc9gcg9k2p0ny42vak019w5l6jcj7"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
'(delete-file-recursively "contrib"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f; tests fail because we need to setup a database
|
||||
#:configure-flags
|
||||
(list "-DEXTERNAL_LIBOSMIUM=ON"
|
||||
"-DEXTERNAL_PROTOZERO=ON"
|
||||
"-DEXTERNAL_FMT=ON")))
|
||||
(inputs
|
||||
(list boost
|
||||
bzip2
|
||||
expat
|
||||
fmt-8
|
||||
libosmium
|
||||
lua
|
||||
postgresql
|
||||
proj
|
||||
protozero
|
||||
zlib))
|
||||
(native-inputs
|
||||
(list python python-psycopg2))
|
||||
(home-page "https://github.com/openstreetmap/osm2pgsql")
|
||||
(synopsis "OSM data importer to postgresql")
|
||||
(description "Osm2pgsql is a tool for loading OpenStreetMap data into a
|
||||
(list #:tests? #f ;tests fail because we need to setup a database
|
||||
#:configure-flags #~(list "-DUSE_PROJ_LIB=4" ;use API version 4
|
||||
"-DWITH_LUAJIT=ON"
|
||||
"-DEXTERNAL_LIBOSMIUM=ON"
|
||||
"-DEXTERNAL_PROTOZERO=ON"
|
||||
"-DEXTERNAL_FMT=ON")))
|
||||
(inputs (list boost
|
||||
bzip2
|
||||
expat
|
||||
fmt-8
|
||||
libosmium
|
||||
luajit
|
||||
nlohmann-json
|
||||
postgresql
|
||||
proj-7
|
||||
protozero
|
||||
zlib))
|
||||
(native-inputs (list pandoc python python-argparse-manpage))
|
||||
(home-page "https://osm2pgsql.org/")
|
||||
(synopsis "OSM data importer to PostgreSQL")
|
||||
(description
|
||||
"Osm2pgsql is a tool for loading OpenStreetMap data into a
|
||||
PostgreSQL / PostGIS database suitable for applications like rendering into a
|
||||
map, geocoding with Nominatim, or general analysis.")
|
||||
(license license:gpl2+)))
|
||||
|
@ -2161,43 +2157,40 @@ The API also works with MaxMind’s free GeoLite2 databases.")
|
|||
|
||||
(define-public routino
|
||||
(package
|
||||
(name "routino")
|
||||
(version "3.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.routino.org/download/routino-"
|
||||
version ".tgz"))
|
||||
(sha256
|
||||
(base32 "1xa7l2bjn832nk6bc7b481nv8hd2gj41jwhg0d2qy10lqdvjpn5b"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list perl))
|
||||
(inputs
|
||||
(list bzip2 xz zlib))
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "Makefile.conf"
|
||||
(("prefix=/usr/local")
|
||||
(string-append "prefix=" (assoc-ref outputs "out")))
|
||||
(("LDFLAGS_LDSO=-Wl,-R\\.")
|
||||
"LDFLAGS_LDSO=-Wl,-R$(libdir)")
|
||||
(("#CFLAGS\\+=-DUSE_XZ")
|
||||
"CFLAGS+=-DUSE_XZ")
|
||||
(("#LDFLAGS\\+=-llzma")
|
||||
"LDFLAGS+=-llzma"))
|
||||
#t)))))
|
||||
(synopsis "Routing application for OpenStreetMap data")
|
||||
(description
|
||||
"Routino is an application for finding a route between two points
|
||||
(name "routino")
|
||||
(version "3.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.routino.org/download/routino-"
|
||||
version ".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0aw5idqz7nv458llgwp5wcgikf34xcblpq46mq7msxfib0m8vahb"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list perl))
|
||||
(inputs (list bzip2 xz zlib))
|
||||
(arguments
|
||||
(list #:test-target "test"
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "Makefile.conf"
|
||||
(("prefix=/usr/local")
|
||||
(string-append "prefix="
|
||||
(assoc-ref outputs "out")))
|
||||
(("LDFLAGS_LDSO=-Wl,-R\\.")
|
||||
"LDFLAGS_LDSO=-Wl,-R$(libdir)")
|
||||
(("#CFLAGS\\+=-DUSE_XZ")
|
||||
"CFLAGS+=-DUSE_XZ")
|
||||
(("#LDFLAGS\\+=-llzma")
|
||||
"LDFLAGS+=-llzma")))))))
|
||||
(synopsis "Routing application for OpenStreetMap data")
|
||||
(description
|
||||
"Routino is an application for finding a route between two points
|
||||
using the dataset of topographical information collected by
|
||||
@url{https://www.OpenStreetMap.org}.")
|
||||
(home-page "https://www.routino.org/")
|
||||
(license license:agpl3+)))
|
||||
(home-page "https://www.routino.org/")
|
||||
(license license:agpl3+)))
|
||||
|
||||
(define-public r-rnaturalearthhires
|
||||
(let ((commit "c3785a8c44738de6ae8f797080c0a337ebed929d")
|
||||
|
@ -2775,6 +2768,7 @@ growing set of geoscientific methods.")
|
|||
"ProcessingGrass7AlgorithmsRasterTestPt1"
|
||||
"ProcessingGrass7AlgorithmsRasterTestPt2"
|
||||
"ProcessingGrass7AlgorithmsVectorTest"
|
||||
"test_core_authconfig"
|
||||
"test_core_authmanager"
|
||||
"test_core_compositionconverter"
|
||||
"test_core_expression"
|
||||
|
|
|
@ -532,7 +532,21 @@ functions for strings and common data structures.")
|
|||
(string-append "//" all "\n"))
|
||||
(("^ g_assert_cmpfloat \\(elapsed, ==.*" all)
|
||||
(string-append "//" all "\n"))))
|
||||
'())))))))
|
||||
'())
|
||||
#$@(if (system-hurd?)
|
||||
'((with-directory-excursion "gio/tests"
|
||||
;; FAIL
|
||||
(substitute* '("appmonitor.c"
|
||||
"gdbus-server-auth.c"
|
||||
"live-g-file.c"
|
||||
"socket.c")
|
||||
(("return (g_test_run|session_bus_run)" all call)
|
||||
(string-append "return 0;// " call))
|
||||
((" (ret|rtv|result) = (g_test_run|session_bus_run)"
|
||||
all var call)
|
||||
(string-append " " var " = 0;// " call))
|
||||
(("[ \t]*g_test_add_func.*;") ""))))
|
||||
'())))))))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs glib)
|
||||
(append desktop-file-utils)))
|
||||
|
|
|
@ -142,6 +142,7 @@
|
|||
#:use-module (gnu packages geo)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages groff)
|
||||
#:use-module (gnu packages gstreamer)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
|
@ -7336,6 +7337,28 @@ jQuery.Syntax JavaScript libraries.")
|
|||
(base32
|
||||
"0h9vf4fx056imjf8ibmn03wg1c3hniipy1nsm2jqi62lp1m19c95"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-man-file-name
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Invoke 'man' directly instead of searching $PATH.
|
||||
(substitute* '("libyelp/yelp-man-parser.c"
|
||||
"libyelp/yelp-uri.c")
|
||||
(("\"man\"")
|
||||
(string-append "\""
|
||||
(search-input-file inputs "bin/man")
|
||||
"\""))
|
||||
(("G_SPAWN_SEARCH_PATH")
|
||||
"0"))))
|
||||
(add-after 'install 'help-man-find-its-dependencies
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; XXX: Currently 'man' looks for 'groff' in $PATH in one
|
||||
;; case. This should be fixed in 'man-db' proper.
|
||||
(wrap-program (string-append (assoc-ref outputs "out")
|
||||
"/bin/yelp")
|
||||
`("PATH" ":" prefix
|
||||
(,(dirname (search-input-file inputs "bin/groff"))))))))))
|
||||
(native-inputs
|
||||
(list `(,glib "bin") ; for glib-genmarshal, etc.
|
||||
intltool
|
||||
|
@ -7347,6 +7370,8 @@ jQuery.Syntax JavaScript libraries.")
|
|||
(list gsettings-desktop-schemas
|
||||
libhandy
|
||||
libxslt
|
||||
man-db ;for URIs like "man:ls"
|
||||
groff-minimal ;ditto
|
||||
sqlite
|
||||
webkitgtk
|
||||
yelp-xsl))
|
||||
|
@ -10472,7 +10497,9 @@ like automatic language detection, text-to-speech and clipboard buttons.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"))))
|
||||
"1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"))
|
||||
(patches
|
||||
(search-patches "gnome-dictionary-meson-i18n.patch"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
|
|
|
@ -518,7 +518,7 @@ variable defined below. It requires guile-json to be installed."
|
|||
;; XXXX: Workaround 'snippet' limitations.
|
||||
(define computed-origin-method (@@ (guix packages) computed-origin-method))
|
||||
|
||||
(define %icecat-base-version "102.15.0")
|
||||
(define %icecat-base-version "102.15.1")
|
||||
(define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
|
||||
(define %icecat-build-id "20230829000000") ;must be of the form YYYYMMDDhhmmss
|
||||
|
||||
|
@ -540,7 +540,7 @@ variable defined below. It requires guile-json to be installed."
|
|||
"firefox-" upstream-firefox-version ".source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bs6hxfsb77cbi238wvizq2iw4mlgz29m0sd027sz8zm1025kyl1"))))
|
||||
"04q1fjninm9lw721xgv0c2fknicc24s8iaimkabwcfwmcnvly689"))))
|
||||
|
||||
;; The upstream-icecat-base-version may be older than the
|
||||
;; %icecat-base-version.
|
||||
|
|
|
@ -3673,7 +3673,7 @@ per-goroutine.")
|
|||
(define-public go-github-com-tdewolff-minify-v2
|
||||
(package
|
||||
(name "go-github-com-tdewolff-minify-v2")
|
||||
(version "2.12.6")
|
||||
(version "2.12.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -3682,7 +3682,7 @@ per-goroutine.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0h006wpfkl0ls0skqxblwcanrhmphgq5q0ii26l2ayh7s99cgmy3"))))
|
||||
"0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:import-path "github.com/tdewolff/minify/v2"
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
|
||||
;;; Copyright © 2023 Eric Bavier <bavier@posteo.net>
|
||||
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -2643,7 +2644,12 @@ a tetrahedral mesh, isovalue discretization and Lagrangian movement;
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pkzv75kavkhrbdd2kvq755jyr0vamgrfr7lc33dq3ipkzmqvs2l"))))
|
||||
"1pkzv75kavkhrbdd2kvq755jyr0vamgrfr7lc33dq3ipkzmqvs2l"))
|
||||
;; This patch required to build PrusaSlicer 2.6.
|
||||
;;
|
||||
;; It is taken from
|
||||
;; <https://github.com/fltk/nanosvg/commit/abcd277ea45e9098bed752cf9c6875b533c0892f.patch>
|
||||
(patches (search-patches "nanosvg-prusa-slicer.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments (list #:tests? #f ;no test suite
|
||||
#:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
|
||||
|
|
|
@ -3856,7 +3856,7 @@ debugging code.")
|
|||
(define-public guile-png
|
||||
(package
|
||||
(name "guile-png")
|
||||
(version "0.7.0")
|
||||
(version "0.7.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -3865,10 +3865,13 @@ debugging code.")
|
|||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nkim662lb48y8n5hik8rrj76600v2inwaxwnfpdny7h2j0yq1wm"))))
|
||||
"0y65795s9bs69msqvdbq8h34n00bkfs5v1d44wz21nwdffvq6557"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
|
||||
(list
|
||||
#:make-flags #~(list "GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(delete 'strip))))
|
||||
(native-inputs (list autoconf
|
||||
automake
|
||||
pkg-config
|
||||
|
@ -3884,9 +3887,9 @@ debugging code.")
|
|||
(synopsis "PNG file parsing library for Guile")
|
||||
(description
|
||||
"@code{guile-png} is a GNU Guile library for working with the
|
||||
@url{https://en.wikipedia.org/wiki/PNG, PNG format}. This library provides
|
||||
API for reading and writing PNG data, as well as some basic image processing
|
||||
filters.")
|
||||
@url{https://en.wikipedia.org/wiki/PNG, PNG format}. This library provides API for
|
||||
reading and writing PNG data, as well as some graphic primitives and basic image
|
||||
processing filters.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public nomad
|
||||
|
|
|
@ -294,13 +294,13 @@ to @code{cabal repl}).")
|
|||
(define-public git-annex
|
||||
(package
|
||||
(name "git-annex")
|
||||
(version "10.20230626")
|
||||
(version "10.20230828")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hackage-uri "git-annex" version))
|
||||
(sha256
|
||||
(base32 "1z16alb5193y4m70rq0bcxx1rn6lnlgswigdnv5lqybjq1fw1z99"))))
|
||||
(base32 "0pb6834dwjs9kdki977rfkdyg58dfzy8wfwvswrz3n7h6bcnjd0b"))))
|
||||
(build-system haskell-build-system)
|
||||
(properties '((upstream-name . "git-annex")))
|
||||
(arguments
|
||||
|
|
|
@ -158,6 +158,7 @@ done
|
|||
(uri "http://www.musl-libc.org/releases/musl-1.1.24.tar.gz")
|
||||
(sha256
|
||||
(base32 "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"))))))
|
||||
(supported-systems (delete "i586-gnu" %supported-systems))
|
||||
(home-page "https://github.com/osresearch/heads")
|
||||
(synopsis "Musl-cross gcc 5 toolchain")
|
||||
(description "Musl-cross toolchain: binutils, gcc 5 and musl.")
|
||||
|
|
|
@ -177,7 +177,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.")
|
|||
(define-public feh
|
||||
(package
|
||||
(name "feh")
|
||||
(version "3.9")
|
||||
(version "3.10")
|
||||
(home-page "https://feh.finalrewind.org/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -185,7 +185,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.")
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"185wwqd60r2rk6lzcvd6sl58589qfqrfnf7lqd6friyj84n9cjc6"))))
|
||||
"166cayf1zh84y5bfaykxmi7ypxvq36hnjsbnwbjzx7zyvkvd2w8x"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
|
|
|
@ -1475,7 +1475,7 @@ channels.")
|
|||
(package
|
||||
(inherit libwebp)
|
||||
(name "libwebp")
|
||||
(version "1.3.1")
|
||||
(version "1.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1485,7 +1485,7 @@ channels.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1aas6gwy7kfcq34cil781kcsl286khh9grwcx7k4d2n1g7zcpl3m"))))))
|
||||
"1x37795gpc63g1ma9kqw4q3dikwhrjklixqzjjsj6viqksa19z41"))))))
|
||||
|
||||
(define-public libmng
|
||||
(package
|
||||
|
@ -1931,6 +1931,91 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI
|
|||
(home-page "https://niftilib.sourceforge.net")
|
||||
(license license:public-domain)))
|
||||
|
||||
(define-public mini
|
||||
(package
|
||||
(name "mini")
|
||||
(version "0.9.14")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pulzed/mINI")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"01wn7h9rjz9h6cr11dd62jsb3315d1h6c33pdmwi2l7d8a4n3h8d"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'build)
|
||||
(delete 'configure)
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(with-directory-excursion "tests"
|
||||
(for-each (lambda (test)
|
||||
(let ((test-name (basename test
|
||||
".cpp")))
|
||||
(invoke "./build.sh" test-name)
|
||||
(invoke "./run.sh" test-name)))
|
||||
(find-files "." ".cpp"))))))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(install-file "src/mini/ini.h"
|
||||
(string-append #$output "/include/mini")))))))
|
||||
(home-page "https://github.com/pulzed/mINI")
|
||||
(synopsis "INI file reader and writer header library")
|
||||
(description
|
||||
"This is a tiny, header-only C++ library for manipulating INI files.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public picket
|
||||
(package
|
||||
(name "picket")
|
||||
(version "1.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rajter/picket")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zhpynyakjx9nc51b1j80b4y3138p3l380kp1cqmmjx2n9430144"))
|
||||
(snippet '(begin
|
||||
;; bundled mINI header library.
|
||||
(delete-file "src/cfg/ini.h")))))
|
||||
(native-inputs (list pkg-config))
|
||||
(inputs (list gtkmm-3 mini))
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-mini-includes
|
||||
(lambda _
|
||||
(substitute* '("src/cfg/config.h"
|
||||
"src/cfg/config.cpp")
|
||||
(("#include \"ini.h\"")
|
||||
"#include \"mini/ini.h\""))
|
||||
(substitute* "src/main.cpp"
|
||||
(("/usr")
|
||||
#$output))))
|
||||
(add-after 'unpack 'fix-cmake-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("src/cfg/ini.h")
|
||||
(search-input-file inputs
|
||||
"/include/mini/ini.h"))
|
||||
(("/usr/")
|
||||
#$output)))))))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "https://github.com/rajter/picket")
|
||||
(synopsis "Screen color picker with custom format output")
|
||||
(description
|
||||
"Picket is a screen color picker that includes a magnifier and supports
|
||||
custom formats for representing color values..")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public gpick
|
||||
(package
|
||||
(name "gpick")
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021, 2022 Olivier Dion <olivier.dion@polymtl.ca>
|
||||
;;; Copyright © 2023 Andy Tai <atai@atai.org>
|
||||
;;; Copyright © 2023 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -24,7 +25,7 @@
|
|||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages commencement)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cpio)
|
||||
#:use-module (gnu packages datastructures)
|
||||
|
@ -47,6 +48,7 @@
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages popt)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-build)
|
||||
#:use-module (gnu packages python-check)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages sphinx)
|
||||
|
@ -58,6 +60,7 @@
|
|||
#:use-module (guix build-system copy)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system linux-module)
|
||||
#:use-module (guix build-system pyproject)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
|
@ -141,21 +144,38 @@ bindings, and the command-line tool @command{babeltrace2}.")
|
|||
(define-public barectf
|
||||
(package
|
||||
(name "barectf")
|
||||
(version "3.1.1")
|
||||
(version "3.1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "barectf" version))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/efficios/barectf")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zhc9d4qnnl4fjj6354qb4bng4ykywn8x3l3acpv6sx439q6ylwd"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs (list gcc-toolchain
|
||||
gnu-make
|
||||
python-jinja2
|
||||
python-jsonschema
|
||||
python-pyyaml-5
|
||||
python-termcolor
|
||||
python-tox))
|
||||
"0v7w830dqi46bq753x84d0z75dw4cf4r93gpfrv4sjynvmylbs95"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'relax-requirements
|
||||
(lambda _
|
||||
;; Remove version constraints as the program appears
|
||||
;; to work (tests pass!) with later versions.
|
||||
;; Try removing these when updating barectf.
|
||||
(substitute* "pyproject.toml"
|
||||
(("pyyaml = '\\^5")
|
||||
"pyyaml = '>=5")
|
||||
(("jsonschema = '\\^3")
|
||||
"jsonschema = '>=3"))))
|
||||
(add-before 'check 'set-CC
|
||||
(lambda _
|
||||
;; Some tests invoke a compiler.
|
||||
(setenv "CC" "gcc"))))))
|
||||
(native-inputs
|
||||
(list python-poetry-core python-pytest))
|
||||
(propagated-inputs
|
||||
(list python-jinja2 python-jsonschema python-pyyaml python-termcolor))
|
||||
(home-page "https://barectf.org")
|
||||
(synopsis "CTF tracer generator")
|
||||
(description
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
|
||||
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
|
||||
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -220,7 +221,7 @@ written in Go.")
|
|||
(define-public go-ipfs
|
||||
(package
|
||||
(name "go-ipfs")
|
||||
(version "0.11.0")
|
||||
(version "0.13.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/tarbomb)
|
||||
|
@ -228,7 +229,7 @@ written in Go.")
|
|||
"https://dist.ipfs.io/go-ipfs/v" version
|
||||
"/go-ipfs-source.tar.gz"))
|
||||
(sha256
|
||||
(base32 "13pmj83hwpz6mk7x52qn0cjnfqxqw2qri3r0k4b270w3bafcccwm"))
|
||||
(base32 "1cx47ais2zn62c0r7lmrpfzia2gjyr61qi8my5wg3pj3dfr0fhkq"))
|
||||
(file-name (string-append name "-" version "-source"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(for-each delete-file-recursively
|
||||
|
@ -350,6 +351,8 @@ written in Go.")
|
|||
go-golang-org-x-term
|
||||
go-golang-org-x-tools
|
||||
go-golang-org-x-xerrors
|
||||
go-golang-org-x-exp
|
||||
go-golang-org-x-text
|
||||
go-lukechampine-com-blake3))
|
||||
(native-inputs
|
||||
(append (if (%current-target-system)
|
||||
|
|
|
@ -102,62 +102,154 @@
|
|||
|
||||
(define-public glirc
|
||||
(package
|
||||
(name "glirc")
|
||||
(version "2.39.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hackage-uri "glirc" version))
|
||||
(sha256
|
||||
(base32 "0jaywb43jfv6kzyz540k02mxdgw1shc6hn7kia21alssszkilh4r"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'install-extra-documentation
|
||||
(lambda _
|
||||
(install-file "glirc.1"
|
||||
(string-append #$output "/share/man/man1"))
|
||||
;; The man page is very terse and punts to the GitHub wiki for real
|
||||
;; information. Some of that is also in the README, so install it.
|
||||
(install-file "README.md"
|
||||
(string-append #$output "/share/doc/"
|
||||
#$name "-" #$version)))))))
|
||||
(native-inputs
|
||||
(list ghc-hunit))
|
||||
(inputs
|
||||
(list ghc-async
|
||||
ghc-attoparsec
|
||||
ghc-base64-bytestring
|
||||
ghc-config-schema
|
||||
ghc-config-value
|
||||
ghc-curve25519
|
||||
ghc-free
|
||||
ghc-githash
|
||||
ghc-hashable
|
||||
ghc-hookup
|
||||
ghc-hsopenssl
|
||||
ghc-irc-core
|
||||
ghc-kan-extensions
|
||||
ghc-lens
|
||||
ghc-network
|
||||
ghc-psqueues
|
||||
ghc-random
|
||||
ghc-regex-tdfa
|
||||
ghc-split
|
||||
ghc-unordered-containers
|
||||
ghc-vector
|
||||
ghc-vty))
|
||||
(home-page "https://github.com/glguy/irc-core")
|
||||
(synopsis "Console IRC client")
|
||||
(description
|
||||
"Glirc is a console IRC client that focuses on providing both high-detail
|
||||
(name "glirc")
|
||||
(version "2.39.0.1") ; inherited by glirc-* extensions below
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hackage-uri "glirc" version))
|
||||
(sha256
|
||||
(base32 "0jaywb43jfv6kzyz540k02mxdgw1shc6hn7kia21alssszkilh4r"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'install-extra-documentation
|
||||
(lambda _
|
||||
(install-file "glirc.1"
|
||||
(string-append #$output "/share/man/man1"))
|
||||
;; The man page is very terse and punts to the GitHub wiki for real
|
||||
;; information. Some of that is also in the README, so install it.
|
||||
(install-file "README.md"
|
||||
(string-append #$output "/share/doc/"
|
||||
#$name "-" #$version)))))))
|
||||
(native-inputs
|
||||
(list ghc-hunit))
|
||||
(inputs
|
||||
(list ghc-async
|
||||
ghc-attoparsec
|
||||
ghc-base64-bytestring
|
||||
ghc-config-schema
|
||||
ghc-config-value
|
||||
ghc-curve25519
|
||||
ghc-free
|
||||
ghc-githash
|
||||
ghc-hashable
|
||||
ghc-hookup
|
||||
ghc-hsopenssl
|
||||
ghc-irc-core
|
||||
ghc-kan-extensions
|
||||
ghc-lens
|
||||
ghc-network
|
||||
ghc-psqueues
|
||||
ghc-random
|
||||
ghc-regex-tdfa
|
||||
ghc-split
|
||||
ghc-unordered-containers
|
||||
ghc-vector
|
||||
ghc-vty))
|
||||
(home-page "https://github.com/glguy/irc-core")
|
||||
(synopsis "Console IRC client")
|
||||
(description
|
||||
"Glirc is a console IRC client that focuses on providing both high-detail
|
||||
and concise views of an IRC connection. All views and transformation are
|
||||
dynamic and don't change the underlying model. It also provides advanced
|
||||
line-editing features including syntax-highlighting, multi-line buffering,
|
||||
and argument placeholders.")
|
||||
(license license:isc)))
|
||||
(license license:isc)))
|
||||
|
||||
(define-public glirc-lua
|
||||
(package
|
||||
(name "glirc-lua")
|
||||
(version (package-version glirc))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/glguy/irc-core")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1hadxsahl30jhgk8vvcg7lwndzc282iybcjam87xx5c0lh0mfzan"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:modules
|
||||
'((guix build meson-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 match))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-subdirectory
|
||||
(lambda _
|
||||
(chdir "lua-extension")))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(install-file "glirc-lua.so" (string-append #$output "/lib"))))
|
||||
(add-after 'install 'set-lua-paths
|
||||
(lambda _
|
||||
(let ((x.y #$(version-major+minor
|
||||
(package-version
|
||||
(this-package-native-input "lua"))))
|
||||
(libraries (filter (match-lambda
|
||||
((label . _)
|
||||
(string-prefix? "lua-" label)))
|
||||
'#$(package-native-inputs
|
||||
this-package))))
|
||||
(setenv "LUA_PATH"
|
||||
(string-join
|
||||
(map (match-lambda
|
||||
((_ dir)
|
||||
(string-append
|
||||
dir "/share/lua/" x.y "/?.lua;"
|
||||
dir "/share/lua/" x.y "/?/?.lua")))
|
||||
libraries)
|
||||
";"))
|
||||
(setenv "LUA_CPATH"
|
||||
(string-join
|
||||
(map (match-lambda
|
||||
((_ dir)
|
||||
(string-append
|
||||
dir "/lib/lua/" x.y "/?.so;"
|
||||
dir "/lib/lua/" x.y "/?/?.so")))
|
||||
libraries)
|
||||
";")))))
|
||||
(add-after 'set-lua-paths 'document
|
||||
(lambda _
|
||||
(with-directory-excursion "../lua-extension/doc"
|
||||
;; Guix's ldoc command is a shell script without a shebang.
|
||||
(invoke "sh" "ldoc" ".")
|
||||
(let ((doc (string-append #$output "/share/doc/" #$name)))
|
||||
(mkdir-p doc)
|
||||
(copy-recursively "api" doc)))))
|
||||
(add-after 'document 'leave-subdirectory
|
||||
;; Let default phases like 'install-license-files do their thing.
|
||||
(lambda _
|
||||
(chdir ".."))))))
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
;; For building the API documentation.
|
||||
lua lua-filesystem lua-ldoc lua-penlight))
|
||||
(inputs
|
||||
(list lua))
|
||||
(home-page (package-home-page glirc))
|
||||
(synopsis "Lua scripting extension to the glirc IRC client")
|
||||
(description
|
||||
"This extension lets you script the glirc IRC client using Lua.
|
||||
To use it, you must tell @command{glirc} exactly where to find
|
||||
@file{glirc-lua.so} by adding something like this to your
|
||||
@file{~/.config/glirc/config}:
|
||||
|
||||
@example
|
||||
extensions:
|
||||
* path: \"../../.guix-profile/lib/glirc-lua.so\"
|
||||
args: [\"example.lua\", @dots{}]
|
||||
@end example
|
||||
|
||||
Also ensure that @file{example.lua} finds any Lua libraries it needs, e.g., by
|
||||
setting @env{LUA_PATH} and @env{LUA_CPATH} in glirc's run-time environment.")
|
||||
(license (package-license glirc))))
|
||||
|
||||
(define-public quassel
|
||||
(package
|
||||
|
|
|
@ -61,6 +61,7 @@
|
|||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages elf)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop) ; wayland
|
||||
#:use-module (gnu packages gawk)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages gettext)
|
||||
|
@ -1546,6 +1547,27 @@ blacklisted.certs.pem"
|
|||
;; Fix for "valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z".
|
||||
(setenv "SOURCE_DATE_EPOCH" "1234567890")))))))))
|
||||
|
||||
(define-public openjdk20
|
||||
(make-openjdk openjdk19 "20"
|
||||
"0pk5lpwijfv9qv7vwpsq2xfklbnqdfs6xbdhc5aamrpar4xi4ykx"))
|
||||
|
||||
(define-public openjdk21
|
||||
(make-openjdk openjdk20 "21"
|
||||
"06wjfwrkqykjdkis2s1nh91cy8vwincnmc699cxvyk3fc12jf3vw"
|
||||
(source (origin
|
||||
(inherit (package-source base))
|
||||
(patches (search-patches "openjdk-21-fix-rpath.patch"
|
||||
"openjdk-15-xcursor-no-dynamic.patch"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base)
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(replace 'fix-java-shebangs
|
||||
(lambda _
|
||||
;; 'blacklisted' was renamed back to 'blocked'.
|
||||
(substitute* "src/java.base/share/data/blockedcertsconverter/blocked.certs.pem"
|
||||
(("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
|
||||
|
||||
;;; Convenience alias to point to the latest version of OpenJDK.
|
||||
(define-public openjdk openjdk19)
|
||||
|
||||
|
@ -1620,6 +1642,44 @@ OpenJDK.")
|
|||
(home-page "https://www.jetbrains.com/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public jbr21
|
||||
(package
|
||||
(inherit openjdk21)
|
||||
(name "jbr")
|
||||
(version "21-b240.22")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JetBrains/JetBrainsRuntime.git")
|
||||
(commit (string-append "jb" version))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sx48mm5vap4ab1qr6hy25wlgxljmhvpvrqiqiq692izr8dh7j4c"))
|
||||
(patches (search-patches "openjdk-21-fix-rpath.patch"
|
||||
"jbr-17-xcursor-no-dynamic.patch"))))
|
||||
(inputs
|
||||
`(("wayland" ,wayland)
|
||||
,@(package-inputs openjdk21)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openjdk21)
|
||||
((#:configure-flags configure-flags)
|
||||
#~(append #$configure-flags
|
||||
(list "--with-jvm-features=shenandoahgc"
|
||||
"--enable-cds=yes"
|
||||
"--with-vendor-name=JetBrains s.r.o"
|
||||
"--with-vendor-url=https://www.jetbrains.com/"
|
||||
"--with-vendor-bug-url=https://youtrack.jetbrains.com/issues/JBR")))))
|
||||
(synopsis "JetBrains Java Runtime")
|
||||
(description "This package provides a Java runtime environment for
|
||||
and Java development kit. It supports enhanced class redefinition (DCEVM),
|
||||
includes a number of improvements in font rendering, keyboards support,
|
||||
windowing/focus subsystems, HiDPI, accessibility, and performance,
|
||||
provides better desktop integration and bugfixes not yet present in
|
||||
OpenJDK.")
|
||||
(home-page "https://www.jetbrains.com/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
|
||||
(define-public ant/java8
|
||||
(package
|
||||
|
|
|
@ -401,7 +401,7 @@ build tree Yggdrasil.")
|
|||
(define-public julia-freetype2-jll
|
||||
(package
|
||||
(name "julia-freetype2-jll")
|
||||
(version "2.10.4+0")
|
||||
(version "2.13.1+0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -410,7 +410,7 @@ build tree Yggdrasil.")
|
|||
(commit (string-append "FreeType2-v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "03lgmb59lipc3bi7z22j4a53bbjmcwkf0xzpwan889p1ix3ry1lr"))))
|
||||
(base32 "1kngkk3kkf6dam8g4g2ajvzvydzxbgpgxlcpsg7nm7q6r5b4b4db"))))
|
||||
(build-system julia-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; No runtests.jl
|
||||
|
@ -426,8 +426,7 @@ build tree Yggdrasil.")
|
|||
"generate_wrapper_header(\"FreeType2\", \""
|
||||
(assoc-ref inputs "freetype") "\")\n"))))
|
||||
;; There's a Julia file for each platform, override them all
|
||||
(find-files "src/wrappers/" "\\.jl$"))
|
||||
#t)))))
|
||||
(find-files "src/wrappers/" "\\.jl$")))))))
|
||||
(inputs
|
||||
(list freetype))
|
||||
(propagated-inputs
|
||||
|
|
|
@ -1591,6 +1591,8 @@ to represent missing data.")
|
|||
(sha256
|
||||
(base32 "1gsbxb1d67g05h5bvzz3swdfih6404jrydy724a8dvbdgqvm3sds"))))
|
||||
(build-system julia-build-system)
|
||||
;; This package seems unmaintained but still has dependant packages.
|
||||
(arguments (list #:tests? #f))
|
||||
(home-page "https://github.com/ssfrr/DeepDiffs.jl")
|
||||
(synopsis "Compute and pretty-print diffs for data structures")
|
||||
(description "@code{DeepDiffs.jl} provides the @code{deepdiff} function,
|
||||
|
@ -2353,7 +2355,7 @@ c-style numerical formatting.")
|
|||
(define-public julia-forwarddiff
|
||||
(package
|
||||
(name "julia-forwarddiff")
|
||||
(version "0.10.34")
|
||||
(version "0.10.36")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -2362,7 +2364,7 @@ c-style numerical formatting.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1lwjw2jzkffwk06hfc30vxhv36ng3gf12qjc43swmqiakkd3m5jx"))))
|
||||
(base32 "0mg9b5p3farc05wdxzciykrlx9hy7ivm0dq50hwp0dgd600hdjxy"))))
|
||||
(build-system julia-build-system)
|
||||
(arguments
|
||||
;; XXXX: Unexpected and non-deterministic failures for i686, e.g.,
|
||||
|
@ -2380,6 +2382,7 @@ c-style numerical formatting.")
|
|||
julia-diffresults
|
||||
julia-diffrules
|
||||
julia-difftests
|
||||
julia-logexpfunctions
|
||||
julia-nanmath
|
||||
julia-specialfunctions
|
||||
julia-staticarrays))
|
||||
|
@ -6084,7 +6087,8 @@ with ANSI escape sequences.")
|
|||
"test/runtests.jl")
|
||||
(("Int64") "Int32"))))))))
|
||||
(propagated-inputs
|
||||
(list julia-dataapi
|
||||
(list julia-adapt
|
||||
julia-dataapi
|
||||
julia-staticarrays
|
||||
julia-tables))
|
||||
(native-inputs
|
||||
|
|
|
@ -1210,6 +1210,7 @@ KDE Frameworks components.")
|
|||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(patches (search-patches "kwin-unwrap-executable-name-for-dot-desktop-search.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bssp76lzqqlan5pfg6wjf4z9c6pl6p66ri8p82vqqw406x5bzyb"))))
|
||||
|
|
|
@ -36,13 +36,11 @@
|
|||
(define-module (gnu packages kde)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system qt)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages apr)
|
||||
|
@ -69,7 +67,6 @@
|
|||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages gimp)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gperf)
|
||||
|
|
|
@ -25,10 +25,8 @@
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages gstreamer)
|
||||
#:use-module (gnu packages gtk)
|
||||
|
@ -36,9 +34,7 @@
|
|||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module ((srfi srfi-1) #:select (alist-delete)))
|
||||
#:use-module (gnu packages xiph))
|
||||
|
||||
(define-public libcanberra
|
||||
(package
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2023 Simon South <simon@simonsouth.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -18,32 +19,86 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages libftdi)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (guix build-system cmake))
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages swig)
|
||||
#:use-module (gnu packages textutils))
|
||||
|
||||
(define-public libftdi
|
||||
(package
|
||||
(name "libftdi")
|
||||
(version "1.4")
|
||||
(version "1.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://www.intra2net.com/en/developer/libftdi/download/libftdi1-"
|
||||
version ".tar.bz2"))
|
||||
"https://www.intra2net.com/en/developer/libftdi/download/"
|
||||
"libftdi1-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"))))
|
||||
"0jdh5r499wbz83vmpskczq5m3cfc1mcv8xqisj5i95k1r3lr2w3w"))
|
||||
(patches
|
||||
(search-patches "libftdi-fix-paths-when-FTDIPP-set.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(outputs '("out" "doc" "python"))
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list (string-append "-DCMAKE_INSTALL_DOCDIR="
|
||||
#$output "/share/doc/" #$name "-" #$version)
|
||||
"-DDOCUMENTATION=ON"
|
||||
"-DEXAMPLES=OFF"
|
||||
"-DFTDIPP=ON"
|
||||
"-DLIB_SUFFIX=''" ; place libraries in /lib, not /lib64
|
||||
"-DPYTHON_BINDINGS=ON")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'install-python-binding
|
||||
(lambda _
|
||||
(let* ((python-version
|
||||
#$(version-major+minor (package-version python)))
|
||||
(python-lib-path
|
||||
(string-append "/lib/python" python-version)))
|
||||
(mkdir-p (string-append #$output:python "/lib"))
|
||||
(mkdir-p (string-append #$output:python "/share/libftdi"))
|
||||
(rename-file (string-append #$output python-lib-path)
|
||||
(string-append #$output:python python-lib-path))
|
||||
(rename-file (string-append #$output
|
||||
"/share/libftdi/examples")
|
||||
(string-append #$output:python
|
||||
"/share/libftdi/examples")))))
|
||||
(add-after 'install-python-binding 'install-documentation
|
||||
(lambda _
|
||||
(let ((share (string-append #$output:doc "/share")))
|
||||
(copy-recursively "doc/man"
|
||||
(string-append share "/man"))
|
||||
(copy-recursively "doc/html"
|
||||
(string-append share "/doc/"
|
||||
#$name "-" #$version
|
||||
"/html"))))))
|
||||
#:test-target "check"
|
||||
#:tests? #f)) ; tests fail without access to USB
|
||||
(native-inputs
|
||||
(list doxygen graphviz pkg-config python swig))
|
||||
(inputs
|
||||
(list boost libconfuse))
|
||||
(propagated-inputs
|
||||
(list libusb)) ; required by libftdi1.pc
|
||||
(list libusb)) ; required by libftdi1.pc
|
||||
(home-page "https://www.intra2net.com/en/developer/libftdi/")
|
||||
(synopsis "FTDI USB driver with bitbang mode")
|
||||
(description
|
||||
"libFTDI is a library to talk to FTDI chips: FT232BM,
|
||||
FT245BM, FT2232C, FT2232D, FT245R and FT232H including the popular
|
||||
bitbangmode.")
|
||||
(license lgpl2.1)))
|
||||
"libFTDI is a library to talk to FTDI chips: FT232BM, FT245BM, FT2232C,
|
||||
FT2232D, FT245R and FT232H including the popular bitbangmode.")
|
||||
(license (list license:gpl2 ; ftdi_eeprom, C++ bindings
|
||||
license:lgpl2.1)))) ; main library
|
||||
|
|
|
@ -44,7 +44,6 @@
|
|||
#:use-module (ice-9 match)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages aidc)
|
||||
#:use-module (gnu packages aspell)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bison)
|
||||
|
@ -73,10 +72,8 @@
|
|||
#:use-module (gnu packages hunspell)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages java)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages logging)
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages nss)
|
||||
#:use-module (gnu packages openldap)
|
||||
|
@ -87,7 +84,6 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages rdf)
|
||||
#:use-module (gnu packages scanner)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages xml)
|
||||
|
|
|
@ -34,11 +34,8 @@
|
|||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnome-xyz)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages ncurses)
|
||||
|
@ -49,7 +46,6 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages java)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages telephony)
|
||||
#:use-module (gnu packages tls)
|
||||
|
|
|
@ -490,17 +490,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
;; The current "stable" kernels. That is, the most recently released major
|
||||
;; versions that are still supported upstream.
|
||||
|
||||
(define-public linux-libre-6.4-version "6.4.14")
|
||||
(define-public linux-libre-6.4-version "6.4.16")
|
||||
(define-public linux-libre-6.4-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.4
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-6.4-version
|
||||
linux-libre-6.4-gnu-revision
|
||||
(base32 "012d16rjprxdv9frf7kcakpikvw7l0s3kvj4kkp9flzdg3j8wxpz")
|
||||
(base32 "1rwm09anyn4py1g877f9vh6ya86y2hfvlqx51bpa53dci5k0b0ds")))
|
||||
(base32 "02zizxf0dp4291hbvjrif04m19h8rrc55c11qinlrm0p19s9srcx")))
|
||||
(define-public linux-libre-6.4-pristine-source
|
||||
(let ((version linux-libre-6.4-version)
|
||||
(hash (base32 "1rjh0jrn5qvxwzmyg478n08vckkld8r52nkc102ppqvsfhiy7skm")))
|
||||
(hash (base32 "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.4)))
|
||||
|
@ -508,7 +508,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
;; The "longterm" kernels — the older releases with long-term upstream support.
|
||||
;; Here are the support timelines:
|
||||
;; <https://www.kernel.org/category/releases.html>
|
||||
(define-public linux-libre-6.1-version "6.1.51")
|
||||
(define-public linux-libre-6.1-version "6.1.53")
|
||||
(define-public linux-libre-6.1-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.1
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -518,12 +518,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1c73516nbhnz0cxjz38b5794dxygb8sznv9idiibw7ablmjbhd11")))
|
||||
(define-public linux-libre-6.1-pristine-source
|
||||
(let ((version linux-libre-6.1-version)
|
||||
(hash (base32 "0fqhmb6v28rssd44z7jw57mwvvskpl4kabjylck0pg54irnl9c2q")))
|
||||
(hash (base32 "0zpdg3fcc12iyjhfs5w7cw75700z4i8m9jcg38mlzlhh92hf0msz")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.1)))
|
||||
|
||||
(define-public linux-libre-5.15-version "5.15.130")
|
||||
(define-public linux-libre-5.15-version "5.15.131")
|
||||
(define-public linux-libre-5.15-gnu-revision "gnu")
|
||||
(define deblob-scripts-5.15
|
||||
(linux-libre-deblob-scripts
|
||||
|
@ -533,7 +533,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(base32 "1c3lm0j401lv2lk39dmr4mlf5ic173snm7cc0cckl6czyvxr5ysy")))
|
||||
(define-public linux-libre-5.15-pristine-source
|
||||
(let ((version linux-libre-5.15-version)
|
||||
(hash (base32 "0qix62jsn3z9yccakac7fvqnip19zi05qn0w5wkgb7rj0x0lwimb")))
|
||||
(hash (base32 "0sacnbw48lblnqaj56nybh588sq4k84gwf0r5zinzyrryj8k6z4r")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.15)))
|
||||
|
@ -739,6 +739,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(format p "~a-default~%" ,version)))))))
|
||||
#:allowed-references ()
|
||||
#:tests? #f))
|
||||
(supported-systems (delete "i586-gnu" %supported-systems))
|
||||
(home-page "https://www.gnu.org/software/linux-libre/")
|
||||
(synopsis "GNU Linux-Libre kernel headers")
|
||||
(description "Headers of the Linux-Libre kernel.")
|
||||
|
@ -1071,6 +1072,7 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
|
|||
elfutils ;needed to enable CONFIG_STACK_VALIDATION
|
||||
flex
|
||||
bison
|
||||
util-linux ;needed for hexdump
|
||||
;; These are needed to compile the GCC plugins.
|
||||
gmp
|
||||
mpfr
|
||||
|
@ -1546,32 +1548,66 @@ is also needed for the @code{tuxedo-control-center} (short tcc) package.")
|
|||
(define-public evdi
|
||||
(package
|
||||
(name "evdi")
|
||||
(version "1.12.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/DisplayLink/evdi")
|
||||
(commit "bdc258b25df4d00f222fde0e3c5003bf88ef17b5")))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "evdi-fix-build-with-linux-6.2.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yi7mbyvxm9lsx6i1xbwp2bihwgzhwxkydk1kbngw5a5kw9azpws"))))
|
||||
(version "1.14.1") ;inherited by libevdi
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/DisplayLink/evdi")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0vfbph6bdb206zgdp0bvpqck2zvkx1367xdxbavv41qsmgkxhvbs"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;no test suite
|
||||
(list #:tests? #f ;no test suite
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir "module"))))))
|
||||
(home-page "https://github.com/DisplayLink/evdi")
|
||||
(synopsis "EVDI Linux kernel module")
|
||||
(synopsis
|
||||
"@acronym{EVDI, Extensible Virtual Display Interface} Linux kernel module")
|
||||
(description
|
||||
"The @acronym{EVDI, Extensible Virtual Display Interface} is a Linux kernel module
|
||||
that enables management of multiple screens, allowing user-space programs to
|
||||
take control over what happens with the image.")
|
||||
"The @acronym{EVDI, Extensible Virtual Display Interface} is a Linux kernel
|
||||
module that enables management of multiple screens, allowing user-space programs
|
||||
to take control over what happens with the image. It is essentially a virtual
|
||||
display for which applications using the @code{libevdi} library can add, remove,
|
||||
and receive screen updates.
|
||||
|
||||
The EVDI driver uses the standard Linux @acronym{DRM, Direct Rendering Manager}.
|
||||
Its displays can be controlled by standard tools such as @command{xrandr} and
|
||||
display settings applets in graphical environments")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public libevdi
|
||||
(package
|
||||
(inherit evdi)
|
||||
(name "libevdi")
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;no test suite
|
||||
#:make-flags
|
||||
#~(list (string-append "CC=" #$(cc-for-target)))
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir "library")))
|
||||
(replace 'install
|
||||
(lambda* _
|
||||
(let* ((lib (string-append #$output "/lib")))
|
||||
(mkdir-p lib)
|
||||
(install-file "libevdi.so" lib)))))))
|
||||
(inputs (list libdrm))
|
||||
(synopsis
|
||||
"@acronym{EVDI, Extensible Virtual Display Interface} user-space library")
|
||||
(description
|
||||
"Libevdi is a library that gives applications easy access to
|
||||
@acronym{EVDI, Extensible Virtual Display Interface} devices provided by the
|
||||
@code{evdi} driver package. ")
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
(define-public ec
|
||||
(package
|
||||
(name "ec")
|
||||
|
@ -1600,7 +1636,7 @@ registers of the @acronym{EC, Embedded Controller} supported by the
|
|||
(define-public lkrg
|
||||
(package
|
||||
(name "lkrg")
|
||||
(version "0.9.3")
|
||||
(version "0.9.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -1609,7 +1645,7 @@ registers of the @acronym{EC, Embedded Controller} supported by the
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0yirb7n4mqv8cn0gziz1m7ymq00dhhy79j59jdgrx00b8rj57cfw"))))
|
||||
"0k0z9caj48nqjwk3bapgfcdzi1lkizxcjj4r1dvkvwsk38mbk1c4"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(list #:linux linux-libre
|
||||
|
@ -1684,7 +1720,7 @@ graphics card on Optimus laptops.")
|
|||
(define-public ddcci-driver-linux
|
||||
(package
|
||||
(name "ddcci-driver-linux")
|
||||
(version "0.4.2")
|
||||
(version "0.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1694,7 +1730,7 @@ graphics card on Optimus laptops.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1lww3mnqhxqzj0qbxzbwbq93v9zw49myp7p9ib873a5izbq8nadi"))))
|
||||
(base32 "19vi7dk4jv5wm18cznz4lj2fb1c7m7j3ig62x4a6qy9djxf9z472"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ; no tests
|
||||
|
@ -2062,19 +2098,25 @@ deviation, and minimum and maximum values. It can show a nice histogram too.")
|
|||
(base32 "12z5786dnf37n8wvv73wdcqp3nvsqzhwdk3ajna0mag4yz1fqdyw"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(,@(if (%current-target-system)
|
||||
'(#:configure-flags
|
||||
(list
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes"))
|
||||
'())))
|
||||
(list
|
||||
#:configure-flags
|
||||
(if (%current-target-system)
|
||||
#~(list "ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes")
|
||||
#~'())))
|
||||
(inputs (list ncurses))
|
||||
(home-page "https://gitlab.com/psmisc/psmisc")
|
||||
(synopsis "Small utilities that use the proc file system")
|
||||
(description
|
||||
"This PSmisc package is a set of some small useful utilities that
|
||||
use the proc file system. We're not about changing the world, but
|
||||
providing the system administrator with some help in common tasks.")
|
||||
"psmisc is a set of small utilities that use the proc file system.
|
||||
@itemize @bullet
|
||||
@item @command{fuser} identifies processes using files or sockets;
|
||||
@item @command{killall} kills processes by name;
|
||||
@item @command{prtstat} prints statistics of a process;
|
||||
@item @command{pslog} prints the log file(s) of a process;
|
||||
@item @command{pstree} shows the currently running processes as a tree;
|
||||
@item @command{peekfd} shows the data travelling over a file descriptor.
|
||||
@end itemize")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public util-linux
|
||||
|
@ -5547,7 +5589,7 @@ arrays when needed.")
|
|||
(define-public multipath-tools
|
||||
(package
|
||||
(name "multipath-tools")
|
||||
(version "0.9.3")
|
||||
(version "0.9.6")
|
||||
(home-page "https://github.com/opensvc/multipath-tools")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
@ -5555,7 +5597,7 @@ arrays when needed.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zcnr1135znizbnfqhqv3by9i2qwn5vg6kgmj6ma3yy1x1krx0d4"))
|
||||
"1933iqh9r54pdl95yck0n4bw7jiiblymc964vlc1787qd4q012sz"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -5573,7 +5615,7 @@ arrays when needed.")
|
|||
(string-append "prefix=" #$output)
|
||||
;; Install Udev rules below this directory, relative
|
||||
;; to the prefix.
|
||||
"SYSTEMDPATH=lib")
|
||||
(string-append "systemd_prefix=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-source
|
||||
|
@ -5605,6 +5647,16 @@ arrays when needed.")
|
|||
(("CFLAGS \\+= " match)
|
||||
(string-append match "-Wno-error=unused-function ")))))
|
||||
(delete 'configure) ;no configure script
|
||||
(add-before 'build 'no-fortify-3
|
||||
(lambda _
|
||||
;; NOTE: The check made seems to wrongly assume the
|
||||
;; FORTIFY_SOURCE=3 is valid. However, when compiling, warnings
|
||||
;; are emitted from glibc, resulting in failed build. Fix this
|
||||
;; by forcing the usage of FORTIFY_SOURCE=2.
|
||||
(substitute* "create-config.mk"
|
||||
(("FORTIFY_SOURCE=3")
|
||||
"FORTIFY_SOURCE=2"))
|
||||
))
|
||||
(add-before 'build 'set-LDFLAGS
|
||||
(lambda _
|
||||
;; Note: this cannot be passed as a make flag because that will
|
||||
|
@ -5622,7 +5674,9 @@ arrays when needed.")
|
|||
liburcu
|
||||
lvm2
|
||||
readline
|
||||
eudev))
|
||||
eudev
|
||||
;; For libmount.
|
||||
`(,util-linux "lib")))
|
||||
(synopsis "Access block devices through multiple paths")
|
||||
(description
|
||||
"This package provides the following binaries to drive the
|
||||
|
@ -7102,7 +7156,7 @@ the @code{mce-inject} module loaded if it exists.")
|
|||
(define-public mcelog
|
||||
(package
|
||||
(name "mcelog")
|
||||
(version "191")
|
||||
(version "195")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -7111,7 +7165,7 @@ the @code{mce-inject} module loaded if it exists.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0vx0lziw6g20vh42ngs66fiq2bm714llx5xx6f0m1hbjcihi1afy"))
|
||||
(base32 "1bg2bj8flybd8kzmmaaslisc6lc1fs9nbv09im6r32dq48skx5aj"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
`(begin
|
||||
|
@ -7783,14 +7837,14 @@ re-use code and to avoid re-inventing the wheel.")
|
|||
(define-public libnftnl
|
||||
(package
|
||||
(name "libnftnl")
|
||||
(version "1.2.4")
|
||||
(version "1.2.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://netfilter.org/libnftnl/"
|
||||
"libnftnl-" version ".tar.bz2"))
|
||||
"libnftnl-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0zs7c8swlirxnbhl8q1b0p8g3jrzns7fyxsrglz71zfdwhxj7zn0"))))
|
||||
(base32 "1x3pqxclpxcw8x5qx0vyi7znf9xwlkqsfd9sy4cxlir1v4nfmsnf"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
|
@ -7829,7 +7883,7 @@ used by nftables.")
|
|||
(define-public nftables
|
||||
(package
|
||||
(name "nftables")
|
||||
(version "1.0.6")
|
||||
(version "1.0.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -7838,7 +7892,7 @@ used by nftables.")
|
|||
(string-append "https://www.nftables.org/projects/nftables"
|
||||
"/files/nftables-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32 "0k2y03dz77b0inqlmh5yg8qaifl0walzvhldwiq7d642vl6l61r4"))))
|
||||
(base32 "0l1xpwr9qfbl3bxa97v8s2lbibiz0xma9q0qi34xp0hswh6p8wwk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:configure-flags
|
||||
'("--disable-static"
|
||||
|
@ -8340,14 +8394,14 @@ available in the kernel Linux.")
|
|||
(define-public cpuid
|
||||
(package
|
||||
(name "cpuid")
|
||||
(version "20221201")
|
||||
(version "20230614")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.etallen.com/cpuid/cpuid-"
|
||||
version ".src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vlg5zc0dayyn9bzyb25fcaxid9svrsjjza11afplrhh50wdrzh8"))))
|
||||
"1s54qc1j10d765r05kw9pzwzaxq2b0nndq2ifwq7cq62xx2k1j5i"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:make-flags
|
||||
|
@ -9557,7 +9611,7 @@ modification of BPF objects on the system.")
|
|||
(define-public bpftrace
|
||||
(package
|
||||
(name "bpftrace")
|
||||
(version "0.18.0")
|
||||
(version "0.18.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -9566,7 +9620,7 @@ modification of BPF objects on the system.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0n0mm5vlaildilq5nmjymmq8ijif1lcyfin76wcmhzwfriq4n87r"))
|
||||
(base32 "0j8ba2j98d3j8lilgx3z2n162r26ryg7zw5ldwd9m36xnjp40347"))
|
||||
(patches (search-patches "bpftrace-disable-bfd-disasm.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
|
@ -9961,42 +10015,6 @@ system.")
|
|||
libraries are found or why they cannot be located.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public libevdi
|
||||
(package
|
||||
(name "libevdi")
|
||||
(version "1.12.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/DisplayLink/evdi")
|
||||
(commit "bdc258b25df4d00f222fde0e3c5003bf88ef17b5")))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1yi7mbyvxm9lsx6i1xbwp2bihwgzhwxkydk1kbngw5a5kw9azpws"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs (list libdrm))
|
||||
(arguments
|
||||
(list #:tests? #f ;no test suite
|
||||
#:make-flags #~'("CC=gcc")
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir "library")))
|
||||
(replace 'install
|
||||
(lambda* _
|
||||
(let* ((lib (string-append #$output "/lib")))
|
||||
(mkdir-p lib)
|
||||
(install-file "libevdi.so" lib)))))))
|
||||
(home-page "https://github.com/DisplayLink/evdi")
|
||||
(synopsis "User-space EVDI library")
|
||||
(description
|
||||
"Libevdi is a library that gives applications easy access to
|
||||
@acronym{EVDI, Extensible Virtual Display Interface} devices on
|
||||
various operating systems.")
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
(define-public touchegg
|
||||
(package
|
||||
(name "touchegg")
|
||||
|
|
|
@ -25824,12 +25824,11 @@ change since last write.
|
|||
(inputs
|
||||
(cons (list "iolib" cl-iolib)
|
||||
(package-inputs sbcl-nfiles)))))
|
||||
|
||||
(define-public sbcl-nasdf
|
||||
(let ((commit "dd9fb2df7174464b54561b2a2f3c3e00fdd5d4f7"))
|
||||
(let ((commit "ab7a018f3a67a999c72710644b10b4545130c139"))
|
||||
(package
|
||||
(name "sbcl-nasdf")
|
||||
(version "0.1.7")
|
||||
(version "0.1.8")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -25838,7 +25837,7 @@ change since last write.
|
|||
(commit commit)))
|
||||
(file-name (git-file-name "cl-ntemplate" version))
|
||||
(sha256
|
||||
(base32 "1q8ky8hz8xrr37h7yyc6ysvrcwlsp1i6r2x44c060drspgjbqj70"))))
|
||||
(base32 "15j7kqxvn0blr0i2xgk0il0ia91p28clfqxdh00vlp423v9a2wbx"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -26529,7 +26528,7 @@ in a native template application).")
|
|||
(define-public sbcl-nkeymaps
|
||||
(package
|
||||
(name "sbcl-nkeymaps")
|
||||
(version "1.0.0")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -26538,11 +26537,12 @@ in a native template application).")
|
|||
(commit version)))
|
||||
(file-name (git-file-name "cl-nkeymaps" version))
|
||||
(sha256
|
||||
(base32 "1f7s9g5s9riyyrbj8lyvzlvymdbh9x9sknxmjzfrkbz3iqlpanc3"))))
|
||||
(base32 "08q3bmb3i7mjpm83msp1qgpifpzf019ggikbxwc2dk04i3c2w0vv"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(inputs
|
||||
(list sbcl-alexandria
|
||||
sbcl-fset
|
||||
sbcl-cl-str
|
||||
sbcl-trivial-package-local-nicknames))
|
||||
(native-inputs
|
||||
(list sbcl-lisp-unit2))
|
||||
|
@ -26603,7 +26603,7 @@ instead of #'FOO.
|
|||
(define-public sbcl-njson
|
||||
(package
|
||||
(name "sbcl-njson")
|
||||
(version "1.1.1")
|
||||
(version "1.2.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -26612,7 +26612,7 @@ instead of #'FOO.
|
|||
(file-name (git-file-name "cl-njson" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zdf6mlbpc2j95qm000ljf642af18sfz45yxh6rnxrbf8m4laxxa"))))
|
||||
"0p3zvn3jfzcdzpvikdaw3g14wfsklq0msw0rjaxin3aa7vmqpyqk"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(inputs (list sbcl-cl-json sbcl-jzon))
|
||||
(native-inputs (list sbcl-lisp-unit2))
|
||||
|
|
|
@ -346,6 +346,7 @@ interface to the Tk widget system.")
|
|||
(files '("etc")))))
|
||||
(home-page "https://ecl.common-lisp.dev/")
|
||||
(synopsis "Embeddable Common Lisp")
|
||||
(supported-systems (delete "i586-gnu" %supported-systems))
|
||||
(description "ECL is an implementation of the Common Lisp language as
|
||||
defined by the ANSI X3J13 specification. Its most relevant features are: a
|
||||
bytecode compiler and interpreter, being able to compile Common Lisp with any
|
||||
|
@ -668,6 +669,7 @@ an interpreter, a compiler, a debugger, and much more.")
|
|||
(variable "XDG_CONFIG_DIRS")
|
||||
(files '("etc")))))
|
||||
(home-page "https://www.sbcl.org/")
|
||||
(supported-systems (delete "i586-gnu" %supported-systems))
|
||||
(synopsis "Common Lisp implementation")
|
||||
(description "Steel Bank Common Lisp (SBCL) is a high performance Common
|
||||
Lisp compiler. In addition to the compiler and runtime system for ANSI Common
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages c)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages cyrus-sasl)
|
||||
|
@ -212,7 +213,7 @@ output in multiple windows in a terminal.")
|
|||
(define-public spdlog
|
||||
(package
|
||||
(name "spdlog")
|
||||
(version "1.11.0")
|
||||
(version "1.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -222,7 +223,7 @@ output in multiple windows in a terminal.")
|
|||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "spdlog-fix-tests.patch"))
|
||||
(sha256
|
||||
(base32 "0i3a1cqrg1sz0w50g7zz9x73rf838igqri12q8ijh4rzpq0qq3ch"))))
|
||||
(base32 "0yyncv6wjs5rqm76rkqyxpfbsingk1dq5zfcqhy1a7fpw8xdl53k"))))
|
||||
(build-system cmake-build-system)
|
||||
;; TODO run benchmark. Currently not possible, as adding
|
||||
;; (gnu packages benchmark) forms a dependency cycle
|
||||
|
@ -231,6 +232,7 @@ output in multiple windows in a terminal.")
|
|||
(list "-DSPDLOG_BUILD_BENCH=OFF"
|
||||
"-DSPDLOG_BUILD_SHARED=ON"
|
||||
"-DSPDLOG_BUILD_TESTS=ON")))
|
||||
(native-inputs (list catch2-3.3))
|
||||
(home-page "https://github.com/gabime/spdlog")
|
||||
(synopsis "Fast C++ logging library")
|
||||
(description "Spdlog is a very fast header-only/compiled C++ logging
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
|
||||
;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
|
||||
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
|
||||
;;; Copyright © 2023 Valter Nazianzeno <manipuladordedados@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -50,14 +51,18 @@
|
|||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages build-tools)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pretty-print)
|
||||
#:use-module (gnu packages rdf)
|
||||
#:use-module (gnu packages re2c)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages tls)
|
||||
|
@ -114,13 +119,13 @@ for configuration, scripting, and rapid prototyping.")
|
|||
|
||||
(define-public lua-5.4
|
||||
(package (inherit lua)
|
||||
(version "5.4.3")
|
||||
(version "5.4.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.lua.org/ftp/lua-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq"))
|
||||
(base32 "125dncwz8syhxk034m4fpahq7vsprfnwdqfxlffbb83arfws2pkx"))
|
||||
(patches (search-patches "lua-5.4-pkgconfig.patch"
|
||||
"lua-5.4-liblua-so.patch"))))))
|
||||
|
||||
|
@ -1129,63 +1134,101 @@ shell command executions.")
|
|||
|
||||
(define-public emilua
|
||||
(package
|
||||
(name "emilua")
|
||||
(version "0.3.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/emilua/emilua.git")
|
||||
(commit (string-append "v" version))
|
||||
;; Current version requires Trial.Protocol and the HTTP lib
|
||||
;; developed as part of GSoC 2014 for Boost, and these are
|
||||
;; dependencies unlikely to be "unbundled" in future releases.
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1999bgrh52124a5g4qizav3x257ff2brjr855srpm1jv1nxzbygv"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(;; Tests are disabled for now due to an issue that affecs guix:
|
||||
;; <https://gitlab.com/emilua/emilua/-/issues/22>
|
||||
(name "emilua")
|
||||
(version "0.4.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/emilua/emilua.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1dwag2pyqc0g86rris4w4fzafmz9a6kiqd47vdq7hl3a1lyi74mx"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "src/emilua_gperf.awk"
|
||||
(("/usr/bin/env") (which "env")))
|
||||
(substitute* "src/system.cpp"
|
||||
(("P_PIDFD") "P_PID"))
|
||||
|
||||
(copy-recursively
|
||||
(assoc-ref inputs "emilua-http")
|
||||
"emilua-http")
|
||||
(copy-recursively
|
||||
(assoc-ref inputs "trial-protocol")
|
||||
"trial-protocol")
|
||||
|
||||
(with-directory-excursion "subprojects"
|
||||
(symlink "../emilua-http" "emilua-http")
|
||||
(copy-file "packagefiles/emilua-http/meson.build"
|
||||
"emilua-http/meson.build")
|
||||
(symlink "../trial-protocol" "trial-protocol")
|
||||
(copy-file "packagefiles/trial.protocol/meson.build"
|
||||
"trial-protocol/meson.build")))))
|
||||
#:configure-flags
|
||||
(list "-Denable_http=true"
|
||||
"-Denable_tests=false"
|
||||
"-Denable_manpages=false"
|
||||
"-Dversion_suffix=-guix1")))
|
||||
(native-inputs
|
||||
(list luajit-lua52-openresty
|
||||
pkg-config
|
||||
re2c
|
||||
xxd))
|
||||
(inputs
|
||||
(list boost
|
||||
boost-static
|
||||
fmt-7
|
||||
;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty
|
||||
;; fork. Emilua is severely affected by this limit, so the upstream package
|
||||
;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT
|
||||
;; configure flag[2] for some features to work (e.g. __pairs on HTTP
|
||||
;; headers).
|
||||
;;
|
||||
;; [1] <http://hacksoflife.blogspot.com/2012/12/integrating-luajit-with-x-plane-64-bit.html>
|
||||
;; [2] <http://luajit.org/extensions.html#lua52>
|
||||
luajit-lua52-openresty
|
||||
ncurses
|
||||
openssl))
|
||||
(native-search-paths
|
||||
(list
|
||||
(search-path-specification
|
||||
(variable "EMILUA_PATH")
|
||||
(files
|
||||
(list (string-append "lib/emilua-" (version-major+minor version)))))))
|
||||
(home-page "https://gitlab.com/emilua/emilua")
|
||||
(synopsis "Lua execution engine")
|
||||
(description
|
||||
"Emilua is a LuaJIT-based Lua execution engine that supports async IO,
|
||||
#~(list "-Denable_http=true"
|
||||
"-Denable_file_io=true"
|
||||
"-Denable_io_uring=true"
|
||||
;; TODO: Linux namespaces are disabled for now due to conflict
|
||||
;; with some packages in guix.
|
||||
"-Denable_linux_namespaces=false"
|
||||
"-Denable_manpages=false"
|
||||
"-Dversion_suffix=-guix1")))
|
||||
(native-inputs
|
||||
(list luajit-lua52-openresty
|
||||
re2c
|
||||
gperf
|
||||
xxd
|
||||
pkg-config))
|
||||
(inputs
|
||||
`(("emilua-http"
|
||||
,(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/BoostGSoC14/boost.http")
|
||||
(commit "93ae527c89ffc517862e1f5f54c8a257278f1195")))
|
||||
(sha256
|
||||
(base32
|
||||
"0jm7fw0cjd3s9zkkvyh6mcj6z32hcy7l9bszv74l92qk15ivvp9h"))))
|
||||
("trial-protocol"
|
||||
,(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/breese/trial.protocol")
|
||||
(commit "79149f604a49b8dfec57857ca28aaf508069b669")))
|
||||
(sha256
|
||||
(base32
|
||||
"0k42i5b4v3zz5x0r3dssiymgmn2x8zg4fzdksya9aggxgigippsx"))))
|
||||
("boost" ,boost)
|
||||
("boost-static" ,boost-static)
|
||||
("fmt" ,fmt-8)
|
||||
("gcc" ,gcc-12)
|
||||
("luajit-lua52-openresty" ,luajit-lua52-openresty)
|
||||
("ncurses" ,ncurses)
|
||||
("serd" ,serd)
|
||||
("sord" ,sord)
|
||||
("libcap" ,libcap)
|
||||
("liburing" ,liburing)
|
||||
("openssl" ,openssl)))
|
||||
(native-search-paths
|
||||
(list
|
||||
(search-path-specification
|
||||
(variable "EMILUA_PATH")
|
||||
(files
|
||||
(list (string-append "lib/emilua-" (version-major+minor version)))))))
|
||||
(home-page "https://gitlab.com/emilua/emilua")
|
||||
(synopsis "Lua execution engine")
|
||||
(description
|
||||
"Emilua is a LuaJIT-based Lua execution engine that supports async IO,
|
||||
fibers and actor-inspired threading. The experimental builtin HTTP module is
|
||||
enabled.")
|
||||
(license license:boost1.0)))
|
||||
(license license:boost1.0)))
|
||||
|
||||
(define-public fennel
|
||||
(package
|
||||
|
|
|
@ -2060,6 +2060,31 @@ physics-informed learning. It includes implementations for the PINN
|
|||
MFNN (multifidelity neural network) algorithms.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public python-jaxtyping
|
||||
(package
|
||||
(name "python-jaxtyping")
|
||||
(version "0.2.21")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "jaxtyping" version))
|
||||
(sha256
|
||||
(base32
|
||||
"19qmsnbn4wv2jl99lpn622qs49mrfxmx8s9pr5y8izzgdjq1fvii"))))
|
||||
(build-system pyproject-build-system)
|
||||
;; Tests require JAX, but JAX can't be packaged because it uses the Bazel
|
||||
;; build system.
|
||||
(arguments (list #:tests? #f))
|
||||
(native-inputs (list python-hatchling))
|
||||
(propagated-inputs (list python-numpy python-typeguard
|
||||
python-typing-extensions))
|
||||
(home-page "https://github.com/google/jaxtyping")
|
||||
(synopsis
|
||||
"Type annotations and runtime checking for JAX arrays and others")
|
||||
(description "@code{jaxtyping} provides type annotations and runtime
|
||||
checking for shape and dtype of JAX arrays, PyTorch, NumPy, TensorFlow, and
|
||||
PyTrees.")
|
||||
(license license:expat)))
|
||||
|
||||
;; There have been no proper releases yet.
|
||||
(define-public kaldi
|
||||
(let ((commit "be22248e3a166d9ec52c78dac945f471e7c3a8aa")
|
||||
|
@ -2972,7 +2997,7 @@ advanced research.")
|
|||
(define-public tensorflow-lite
|
||||
(package
|
||||
(name "tensorflow-lite")
|
||||
(version "2.12.1")
|
||||
(version "2.13.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -2982,7 +3007,8 @@ advanced research.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0jkgljdagdqllnxygl35r5bh3f9qmbczymfj357gm9krh59g2kmd"))))
|
||||
"07g6vlrs0aayrg2mfdl15gxg5dy103wx2xlqkran15dib40nkbj6"))
|
||||
(patches (search-patches "tensorflow-lite-unbundle.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -3025,6 +3051,7 @@ advanced research.")
|
|||
"-DTFLITE_ENABLE_XNNPACK=OFF"
|
||||
|
||||
;; Don't fetch the sources. We have these already
|
||||
"-Dgemmlowp_POPULATED=TRUE"
|
||||
"-Degl_headers_POPULATED=TRUE"
|
||||
"-Dfp16_headers_POPULATED=TRUE"
|
||||
"-Dopencl_headers_POPULATED=TRUE"
|
||||
|
@ -3037,7 +3064,7 @@ advanced research.")
|
|||
|
||||
"-DFFT2D_SOURCE_DIR=/tmp/fft2d"
|
||||
"-DFARMHASH_SOURCE_DIR=/tmp/farmhash"
|
||||
"-Dgemmlowp_SOURCE_DIR=/tmp/gemmlowp")
|
||||
(string-append "-Dgemmlowp_ROOT=" #$(this-package-input "gemmlowp")))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
|
@ -3067,11 +3094,7 @@ advanced research.")
|
|||
(mkdir-p "/tmp/fft2d")
|
||||
(with-directory-excursion "/tmp/fft2d"
|
||||
(invoke "tar" "--strip-components=1"
|
||||
"-xf" (assoc-ref inputs "fft2d-src")))
|
||||
|
||||
(copy-recursively (assoc-ref inputs "gemmlowp-src")
|
||||
"/tmp/gemmlowp/")))
|
||||
|
||||
"-xf" (assoc-ref inputs "fft2d-src")))))
|
||||
(add-after 'build 'build-shared-library
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
(mkdir-p "c")
|
||||
|
@ -3101,7 +3124,7 @@ advanced research.")
|
|||
("eigen" ,eigen)
|
||||
("fp16" ,fp16)
|
||||
("flatbuffers-shared" ,flatbuffers-next-shared)
|
||||
;;("gemmlowp" ,gemmlowp) ; TODO
|
||||
("gemmlowp" ,gemmlowp)
|
||||
("mesa-headers" ,mesa-headers)
|
||||
("neon2sse" ,neon2sse)
|
||||
("nsync" ,nsync)
|
||||
|
@ -3117,19 +3140,6 @@ advanced research.")
|
|||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("googletest" ,googletest)
|
||||
("gemmlowp-src"
|
||||
;; The commit hash is taken from
|
||||
;; "tensorflow/lite/tools/cmake/modules/gemmlowp.cmake".
|
||||
,(let ((commit "fda83bdc38b118cc6b56753bd540caa49e570745"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/google/gemmlowp")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name "gemmlowp" (string-take commit 8)))
|
||||
(sha256
|
||||
(base32
|
||||
"1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl")))))
|
||||
("farmhash-src"
|
||||
,(let ((commit "816a4ae622e964763ca0862d9dbd19324a1eaf45"))
|
||||
(origin
|
||||
|
@ -3151,7 +3161,7 @@ advanced research.")
|
|||
(sha256
|
||||
(base32
|
||||
"1jfflzi74fag9z4qmgwvp90aif4dpbr1657izmxlgvf4hy8fk9xd"))))))
|
||||
(home-page "https://tensorflow.org")
|
||||
(home-page "https://www.tensorflow.org")
|
||||
(synopsis "Machine learning framework")
|
||||
(description
|
||||
"TensorFlow is a flexible platform for building and training machine
|
||||
|
@ -4546,6 +4556,63 @@ and Numpy.")
|
|||
inference.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public python-linear-operator
|
||||
(package
|
||||
(name "python-linear-operator")
|
||||
(version "0.5.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "linear_operator" version))
|
||||
(sha256
|
||||
(base32
|
||||
"03drb4hn9nn8jrqd9vbalihhahgpdm956hbs05bix7svradhknaw"))))
|
||||
(build-system pyproject-build-system)
|
||||
(propagated-inputs (list python-jaxtyping
|
||||
python-pytorch
|
||||
python-scipy
|
||||
python-typeguard))
|
||||
(native-inputs (list python-flake8
|
||||
python-flake8-print
|
||||
python-pytest
|
||||
python-setuptools-scm
|
||||
python-twine))
|
||||
(home-page "https://github.com/cornellius-gp/linear_operator/")
|
||||
(synopsis "Linear operator implementation")
|
||||
(description "LinearOperator is a PyTorch package for abstracting away the
|
||||
linear algebra routines needed for structured matrices (or operators).")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-gpytorch
|
||||
(package
|
||||
(name "python-gpytorch")
|
||||
(version "1.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "gpytorch" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0q17bml53vixk3cwj3p893809927hz81fprwsmxpxqv5i4mvgyvj"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:test-flags
|
||||
;; The error message in test_t_matmul_matrix suggests the error may
|
||||
;; be due to a bug in gpytorch. test_deprecated_methods fails with
|
||||
;; an AssertionError.
|
||||
#~(list "-k" (string-append "not test_deprecated_methods"
|
||||
" and not test_t_matmul_matrix"))))
|
||||
(propagated-inputs (list python-linear-operator python-scikit-learn))
|
||||
(native-inputs (list python-coverage
|
||||
python-flake8
|
||||
python-flake8-print
|
||||
python-nbval
|
||||
python-pytest
|
||||
python-twine))
|
||||
(home-page "https://gpytorch.ai")
|
||||
(synopsis "Implementation of Gaussian Processes in PyTorch")
|
||||
(description
|
||||
"GPyTorch is a Gaussian process library implemented using PyTorch.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public vosk-api
|
||||
(let* ((openfst openfst-for-vosk)
|
||||
(kaldi kaldi-for-vosk))
|
||||
|
|
|
@ -601,7 +601,7 @@ aliasing facilities to work just as they would on normal mail.")
|
|||
(define-public mutt
|
||||
(package
|
||||
(name "mutt")
|
||||
(version "2.2.10")
|
||||
(version "2.2.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list
|
||||
|
@ -611,7 +611,7 @@ aliasing facilities to work just as they would on normal mail.")
|
|||
version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"121xrns9b0n5cdjb7nv5a6idjjk58pp7pdclgdphjy9g88i3yxsd"))
|
||||
"0f6f32xlfp36axj5in8b0fcc9m05la27zxqbzpvmd3jbyq9g6fh4"))
|
||||
(patches (search-patches "mutt-store-references.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
@ -1203,14 +1203,14 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
|
|||
(define-public mu
|
||||
(package
|
||||
(name "mu")
|
||||
(version "1.10.5")
|
||||
(version "1.10.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/djcb/mu/releases/download/v"
|
||||
version "/mu-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0bfclmffcqpb7hsgzvg7ailnnrcpvfv4ljcq7ds0z66n37f97xhs"))))
|
||||
(base32 "089w1m6sd0nk9l9j40d357fjym8kxmz7kwh3bclk58jxa6xckapa"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
|
@ -1993,7 +1993,7 @@ facilities for checking incoming mail.")
|
|||
(package
|
||||
(name "dovecot")
|
||||
;; Also update dovecot-pigeonhole when updating to a new minor version.
|
||||
(version "2.3.20")
|
||||
(version "2.3.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2001,7 +2001,7 @@ facilities for checking incoming mail.")
|
|||
(version-major+minor version) "/"
|
||||
"dovecot-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ll546dldhxqk8yr2jnfq0rag7vp9d9hz7gf6pgsnj41jvmk5a6a"))
|
||||
(base32 "0bah6rn5ihczai8q50p6pqxwj73j21smib89ycp7q8qwly9i1c85"))
|
||||
(patches
|
||||
(search-patches "dovecot-opensslv3.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
@ -2063,7 +2063,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.")
|
|||
(let ((dovecot-version (version-major+minor (package-version dovecot))))
|
||||
(package
|
||||
(name "dovecot-pigeonhole")
|
||||
(version "0.5.20")
|
||||
(version "0.5.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2071,7 +2071,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.")
|
|||
"https://pigeonhole.dovecot.org/releases/" dovecot-version "/"
|
||||
"dovecot-" dovecot-version "-pigeonhole-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "163wc5spzvy9pcpsbz3adl22h8f1krp21fh9mql16b7af14bscmf"))
|
||||
(base32 "09zd7n6ljqaj3i3m6r1hn1vb1cjhy64040vji82i4rq7b4k1v9qw"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
@ -253,13 +253,13 @@ implementation.
|
|||
(define-public python-cmarkgfm
|
||||
(package
|
||||
(name "python-cmarkgfm")
|
||||
(version "0.8.0")
|
||||
(version "2022.10.27")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cmarkgfm" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jxk9cdir4q1bpjla7b7y1qfjmr7mkd0f802b2sb88njk079p1gy"))
|
||||
"16875bazqd7p7qiky343w0fzasqziyvf72nipyh1r47a2rvsrnck"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -270,13 +270,6 @@ implementation.
|
|||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'relax-requirements
|
||||
(lambda _
|
||||
;; Don't depend on bleeding-edge CFFI, as it is
|
||||
;; apparently only needed for Python >= 3.10.
|
||||
(substitute* "setup.py"
|
||||
(("cffi>=1\\.15\\.0")
|
||||
"cffi>=1.0"))))
|
||||
(add-after 'unpack 'copy-cmark-gfm
|
||||
(lambda _
|
||||
;; This package needs the cmark-gfm source files
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2023 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2014-2022 Eric Bavier <bavier@posteo.net>
|
||||
|
@ -1321,18 +1321,16 @@ computations.")
|
|||
(define-public hdf4
|
||||
(package
|
||||
(name "hdf4")
|
||||
(version "4.2.14")
|
||||
(version "4.2.16-2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://support.hdfgroup.org/ftp/HDF/releases/HDF"
|
||||
version "/src/hdf-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l"))
|
||||
(patches (search-patches "hdf4-architectures.patch"
|
||||
"hdf4-reproducibility.patch"
|
||||
"hdf4-shared-fortran.patch"
|
||||
"hdf4-tirpc.patch"))))
|
||||
(base32 "0b395czhqr43mmbiifmg2mhb488wnd4zccj45vpql98ja15j7hy5"))
|
||||
(patches (search-patches "hdf4-reproducibility.patch"
|
||||
"hdf4-shared-fortran.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list gfortran bison flex))
|
||||
|
@ -1345,9 +1343,7 @@ computations.")
|
|||
#:configure-flags (list "--enable-shared"
|
||||
"FCFLAGS=-fallow-argument-mismatch"
|
||||
"FFLAGS=-fallow-argument-mismatch"
|
||||
(string-append "CPPFLAGS=-I"
|
||||
(assoc-ref %build-inputs "libtirpc")
|
||||
"/include/tirpc"))
|
||||
"--enable-hdf4-xdr")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; This is inspired by two of Debian's patches.
|
||||
|
@ -1362,14 +1358,7 @@ computations.")
|
|||
(substitute*
|
||||
'("mfhdf/hdfimport/testutil.sh.in" "hdf/util/testutil.sh.in")
|
||||
(("/bin/rm") "rm")
|
||||
(("/bin/mkdir") "mkdir"))
|
||||
(substitute* (find-files "." "^Makefile\\.in$")
|
||||
(("@HDF_BUILD_XDR_TRUE@XDR_ADD = \
|
||||
-R\\$\\(abs_top_builddir\\)/mfhdf/xdr/\\.libs") "")
|
||||
(("@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = \
|
||||
-R\\$\\(abs_top_builddir\\)/mfhdf/libsrc/\\.libs \
|
||||
-R\\$\\(abs_top_builddir\\)/hdf/src/\\.libs \\$\\(XDR_ADD\\)") ""))
|
||||
#t))
|
||||
(("/bin/mkdir") "mkdir"))))
|
||||
(add-after 'configure 'patch-settings
|
||||
(lambda _
|
||||
;; libhdf4.settings contains the full path of the
|
||||
|
@ -1389,8 +1378,7 @@ computations.")
|
|||
;; files. Fix it manually to avoid having to propagate it.
|
||||
(substitute* (find-files (string-append out "/lib") "\\.la$")
|
||||
(("-ljpeg")
|
||||
(string-append "-L" libjpeg "/lib -ljpeg")))
|
||||
#t))))))
|
||||
(string-append "-L" libjpeg "/lib -ljpeg")))))))))
|
||||
(home-page "https://www.hdfgroup.org/products/hdf4/")
|
||||
(synopsis
|
||||
"Library and multi-object file format for storing and managing data")
|
||||
|
@ -2791,7 +2779,7 @@ can solve two kinds of problems:
|
|||
(define-public octave-cli
|
||||
(package
|
||||
(name "octave-cli")
|
||||
(version "8.2.0")
|
||||
(version "8.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2799,7 +2787,7 @@ can solve two kinds of problems:
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pkh4vmq4hcrmyl2gybd54i3qamyvmcjmpgy1i2kkw2g03jxdfdp"))))
|
||||
"1aav8i88y2yl11g5d44wpjngkpldvzk90ja7wghkb91cy2a9974i"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list alsa-lib
|
||||
|
|
|
@ -171,6 +171,13 @@ homeserver and generally help bootstrap the ecosystem.")
|
|||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'relax-requirements
|
||||
(lambda _
|
||||
(substitute* "pyproject.toml"
|
||||
;; Remove upper bounds of cachetool pin.
|
||||
(("cachetools (.*version = )\"\\^4" _ match)
|
||||
(string-append "cachetools " match
|
||||
"\">=4")))))
|
||||
(add-before 'check 'install-tests
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(copy-recursively (string-append
|
||||
|
|
|
@ -24,15 +24,10 @@
|
|||
(define-module (gnu packages mes)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bootstrap)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cross-base)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages package-management)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages texinfo)
|
||||
|
|
|
@ -22,16 +22,10 @@
|
|||
(define-module (gnu packages mingw)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages cross-base)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages multiprecision)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (ice-9 match)
|
||||
#:export (make-mingw-w64))
|
||||
|
||||
(define* (make-mingw-w64 machine
|
||||
|
|
|
@ -454,14 +454,14 @@ and persisting them to disk using the Whisper time-series library.")
|
|||
(define-public graphite-web
|
||||
(package
|
||||
(name "graphite-web")
|
||||
(version "1.1.7")
|
||||
(version "1.1.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "graphite-web" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1l5a5rry9cakqxamvlx4xq63jifmncb6815bg9vy7fg1zyd3pjxk"))))
|
||||
"0nnk3kwn0b6bq9xnmv9bac6hpcbdgpgwf283c1ck5nm80panh61z"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;XXX: not in PyPI release & requires database
|
||||
|
@ -471,22 +471,20 @@ and persisting them to disk using the Whisper time-series library.")
|
|||
(lambda _
|
||||
(substitute* "setup.py"
|
||||
;; Allow newer versions of django-tagging.
|
||||
(("django-tagging==")
|
||||
"django-tagging>="))
|
||||
#t))
|
||||
(("django-tagging==") "django-tagging>=")
|
||||
;; And Django.
|
||||
(("Django>=1\\.8,<3\\.1") "Django>=1.8,<4"))))
|
||||
;; Don't install to /opt
|
||||
(add-after 'unpack 'do-not-install-to-/opt
|
||||
(lambda _ (setenv "GRAPHITE_NO_PREFIX" "1") #t)))))
|
||||
(propagated-inputs
|
||||
(list python-cairocffi
|
||||
python-pytz
|
||||
python-whisper
|
||||
python-django-2.2
|
||||
python-django-3.2
|
||||
python-django-tagging
|
||||
python-scandir
|
||||
python-urllib3
|
||||
python-pyparsing
|
||||
python-txamqp))
|
||||
python-pytz
|
||||
python-six
|
||||
python-urllib3))
|
||||
(home-page "https://graphiteapp.org/")
|
||||
(synopsis "Scalable realtime graphing system")
|
||||
(description "Graphite is a scalable real-time graphing system that does
|
||||
|
|
|
@ -247,6 +247,12 @@ bind processes, and much more.")
|
|||
"--enable-openib-rdmacm"
|
||||
"--enable-openib-rdmacm-ibaddr"
|
||||
|
||||
;; Enable support for the 'Process Management
|
||||
;; Interface for Exascale' (PMIx) used e.g. by
|
||||
;; Slurm for the management communication and
|
||||
;; coordination of MPI processes.
|
||||
"--with-pmix=internal"
|
||||
|
||||
;; Enable support for SLURM's Process Manager
|
||||
;; Interface (PMI).
|
||||
,(string-append "--with-pmi="
|
||||
|
|
|
@ -2371,7 +2371,7 @@ perform creative live mixes with digital music files.")
|
|||
(define-public synthv1
|
||||
(package
|
||||
(name "synthv1")
|
||||
(version "0.9.31")
|
||||
(version "0.9.32")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -2379,7 +2379,7 @@ perform creative live mixes with digital music files.")
|
|||
"/synthv1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06yfiwnxdawyby63zqm1jv4ihi4fxzabpkba7v4d8lgwvhxa014k"))))
|
||||
"1i76d4w2anccyp70vylxxrmqgf1i3znl98ag82wz8lxb5sh34i4x"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; there are no tests
|
||||
|
@ -2403,7 +2403,7 @@ oscillators and stereo effects.")
|
|||
(define-public drumkv1
|
||||
(package
|
||||
(name "drumkv1")
|
||||
(version "0.9.31")
|
||||
(version "0.9.32")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -2411,7 +2411,7 @@ oscillators and stereo effects.")
|
|||
"/drumkv1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cw0lqxd4igkb25vlivbi0hamn33d26nl96mzm59cda158r0jayl"))))
|
||||
"15csm09wjgzdkvy2wqq1jzq7b1m8zzchl5s8fb4ir5rg395jkxai"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; there are no tests
|
||||
|
@ -2436,7 +2436,7 @@ effects.")
|
|||
(define-public samplv1
|
||||
(package
|
||||
(name "samplv1")
|
||||
(version "0.9.31")
|
||||
(version "0.9.32")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -2444,7 +2444,7 @@ effects.")
|
|||
"/samplv1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jqblmb24vbnpm4a4wlvasz45h3zy00rrpf850yxaplyf0qb8klx"))))
|
||||
"17w5m5sk8fcnnph1njz9sz031kk0aid8mhs64myc2jvpvwm5snlb"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; there are no tests
|
||||
|
@ -2469,7 +2469,7 @@ effects.")
|
|||
(define-public padthv1
|
||||
(package
|
||||
(name "padthv1")
|
||||
(version "0.9.31")
|
||||
(version "0.9.32")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -2477,7 +2477,7 @@ effects.")
|
|||
"/padthv1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1iqmjdxihil039c8g9kywd5dx3rd47ph2fs6f6kcyfwj9jz4aprh"))))
|
||||
"0qpdyczgqblf3sxjkvxn2g8qyx1hm0pmiqhncncrijbaalazsp7m"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; there are no tests
|
||||
|
@ -3482,14 +3482,14 @@ from the command line.")
|
|||
(define-public qtractor
|
||||
(package
|
||||
(name "qtractor")
|
||||
(version "0.9.34")
|
||||
(version "0.9.35")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.sourceforge.net/qtractor/"
|
||||
"qtractor-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w6g51jhj9c72j6qjjkjhiq0vwklb6q4cr3xgj4mzp0iw279hbjz"))))
|
||||
"1v3w8x9dfqldfa8gjxxszzclnhqlgyanpr7b4dhva68qyxmp4m7v"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no "check" target
|
||||
|
@ -5517,7 +5517,7 @@ for the DSSI Soft Synth Interface. A brief list of features:
|
|||
(define-public libdiscid
|
||||
(package
|
||||
(name "libdiscid")
|
||||
(version "0.6.2")
|
||||
(version "0.6.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -5525,8 +5525,7 @@ for the DSSI Soft Synth Interface. A brief list of features:
|
|||
"http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"))))
|
||||
(base32 "10mj1hwv1598nsi7jw5di0pfcwk36g4rr6kl7gi45m7ak8f8ypnx"))))
|
||||
(arguments `(#:test-target "check"))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "https://musicbrainz.org/doc/libdiscid")
|
||||
|
@ -6517,7 +6516,7 @@ curl/include/curl/curl.h")
|
|||
(define-public dpf-plugins
|
||||
(package
|
||||
(name "dpf-plugins")
|
||||
(version "1.4")
|
||||
(version "1.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -6527,7 +6526,7 @@ curl/include/curl/curl.h")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0y7qvpfm34g6f7d786c6c9043dlbg5c4h71l2s24dsc9m8i7x2ww"))))
|
||||
(base32 "082f3f78x6k58j78mqr57qhw40f5s8fmcbkhl36nn3vbcsa07bzg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no "check" target
|
||||
|
|
|
@ -28,14 +28,14 @@
|
|||
(define-public musl
|
||||
(package
|
||||
(name "musl")
|
||||
(version "1.2.3")
|
||||
(version "1.2.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.musl-libc.org/releases/"
|
||||
"musl-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"196lrzw0qy5axiz9p5ay50q2mls8hbfckr4rw0klc7jjc9h0nnvx"))))
|
||||
"0fgh2hhsbaksx7my6yiva4jqixi6hxwxx20ivb0afwjk7piyldbs"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; musl has no tests
|
||||
|
|
|
@ -286,6 +286,44 @@ strict standards compliance. The code does, however, fairly closely follow
|
|||
the RFC.")
|
||||
(license (list license:gpl2 license:gpl3))))
|
||||
|
||||
(define-public netperf
|
||||
(let ((version "2.7.0")
|
||||
(revision "1")
|
||||
(commit "3bc455b23f901dae377ca0a558e1e32aa56b31c4"))
|
||||
(package
|
||||
(name "netperf")
|
||||
(version (git-version version revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/HewlettPackard/netperf")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1msbhbvf39r1a0c9b9myla5i6235fvnp7r6021fl8b5svxjbb0dk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
;; Without -fcommon the build fails on newer gcc.
|
||||
;; See: https://gcc.gnu.org/gcc-10/porting_to.html
|
||||
(list "CFLAGS=-fcommon"
|
||||
;; --enable-demo is needed for flent (not yet packaged).
|
||||
"--enable-demo")))
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake))
|
||||
(home-page "https://hewlettpackard.github.io/netperf/")
|
||||
(synopsis "Benchmarking tool to measure network performance")
|
||||
(description
|
||||
"Netperf is a benchmark that can be used to measure the performance of
|
||||
many different types of networking. It provides tests for both unidirectional
|
||||
throughput, and end-to-end latency. The environments currently measureable
|
||||
by netperf include: TCP and UDP via BSD Sockets for both IPv4 and IPv6, DLPI,
|
||||
Unix Domain Sockets, SCTP for both IPv4 and IPv6.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public lcsync
|
||||
(package
|
||||
(name "lcsync")
|
||||
|
@ -1194,7 +1232,7 @@ or server shell scripts with network connections.")
|
|||
(define-public mbuffer
|
||||
(package
|
||||
(name "mbuffer")
|
||||
(version "20220418")
|
||||
(version "20230301")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1202,7 +1240,7 @@ or server shell scripts with network connections.")
|
|||
version ".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1iq0lcl350r7qja7yyv911aay26d0dd8n0h33mfl84gzypwh2n3f"))))
|
||||
"009d4m48yjidb91vdnrfv84nnd76n0i57g607llan3y0vq4n5xsk"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list which))
|
||||
|
@ -1928,15 +1966,16 @@ transmission protocol (SCTP) in a Go application.")
|
|||
(define-public httping
|
||||
(package
|
||||
(name "httping")
|
||||
(version "2.5")
|
||||
(version "2.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.vanheusden.com/httping/httping-"
|
||||
version ".tgz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/folkertvanheusden/HTTPing")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"))))
|
||||
(base32 "1gbpirzih0zr93fm71scqjji9wwkfp64q8z36857blsngdfm6k38"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:make-flags
|
||||
|
@ -1998,14 +2037,14 @@ TCP connection, TLS handshake and so on) in the terminal.")
|
|||
(define-public squid
|
||||
(package
|
||||
(name "squid")
|
||||
(version "4.17")
|
||||
(version "6.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.squid-cache.org/Versions/v4/squid-"
|
||||
(uri (string-append "http://www.squid-cache.org/Versions/v6/squid-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "060lwghn6q982bay11ia38c86kd8w6mjgy68n58v31kwik08m4nb"))))
|
||||
(base32 "1yj869jnbdv1fb604j6g602dyvfnw7ahh9sh7mbqjpbsd9cgb83l"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
|
@ -2654,7 +2693,7 @@ that block port 22.")
|
|||
(define-public iperf
|
||||
(package
|
||||
(name "iperf")
|
||||
(version "3.14")
|
||||
(version "3.15")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -2663,7 +2702,7 @@ that block port 22.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0xy7q508yrraa8q3bxdsc2fwacc6qm7l6p44a07jp7ki8bwdcs8z"))))
|
||||
(base32 "10fzz3j2kx36yhqd0mvwlawvhdbcm0qc41i3f6jf6a5whm70177q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -3426,14 +3465,14 @@ Features:
|
|||
(define-public net-snmp
|
||||
(package
|
||||
(name "net-snmp")
|
||||
(version "5.9.3")
|
||||
(version "5.9.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/net-snmp/net-snmp/"
|
||||
version "/net-snmp-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02pgl89s8qll5zhdp61rbn6vpl084gx55bjb1cqg3wqvgsdz55r0"))
|
||||
"0i05bds30jazb2wq0hn3mh1zmmnnl9hkkd5y2iq3qkp7j49y0kcb"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -4252,14 +4291,14 @@ cables.")
|
|||
(define-public lldpd
|
||||
(package
|
||||
(name "lldpd")
|
||||
(version "1.0.16")
|
||||
(version "1.0.17")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1ab5hkgi2iwqpfw6xy2wxjhqmz6pnkynfkg85zm7r9kv1ijr3cz3"))
|
||||
(base32 "1ki7c7ffys42s2wy5c94qriicgwx0wl9bm83xxkclasx2izifhwk"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -4524,7 +4563,7 @@ Further information on the usage could be found on the Wikibooks page
|
|||
(define-public putty
|
||||
(package
|
||||
(name "putty")
|
||||
(version "0.77")
|
||||
(version "0.79")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -4533,7 +4572,7 @@ Further information on the usage could be found on the Wikibooks page
|
|||
(string-append "http://www.putty.be/" version
|
||||
"/putty-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32 "1rgabc447a5aa9h16krpg3x78vh5jf4l6hkbqzr4bz9qabs7d6j1"))))
|
||||
(base32 "1n7h1vprayfgjr21ccsv77g71k8dk10n69y99azqx4xvdxkci322"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -219,7 +219,7 @@ This package produces a native @command{ocamlc} and a bytecode @command{ocamllex
|
|||
(arguments
|
||||
`(#:configure-flags '("--enable-ocamltest")
|
||||
#:test-target "tests"
|
||||
#:make-flags '("world.opt")
|
||||
#:make-flags '("defaultentry")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-/bin/sh-references
|
||||
|
@ -5324,82 +5324,86 @@ necessary set of rewriters.")
|
|||
(license license:expat)))
|
||||
|
||||
(define-public bap
|
||||
(package
|
||||
(name "bap")
|
||||
(version "2.5.0-alpha")
|
||||
(home-page "https://github.com/BinaryAnalysisPlatform/bap")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fw9pp0xnssc08qqfkcafffap4f46hw7zmk80gif5yc4nazga8w5"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:use-make? #t
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'configure 'fix-ncurses
|
||||
(lambda _
|
||||
(substitute* "oasis/llvm"
|
||||
(("-lcurses") "-lncurses"))
|
||||
#t))
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs inputs #:allow-other-keys)
|
||||
(for-each make-file-writable (find-files "." "."))
|
||||
;; Package name changed
|
||||
(substitute* "oasis/elf-loader"
|
||||
(("bitstring.ppx") "ppx_bitstring"))
|
||||
;; We don't have a monolithic llvm
|
||||
(substitute* "oasis/llvm.setup.ml.in"
|
||||
(("llvm_static = \"true\"") "true"))
|
||||
(invoke "./configure" "--prefix"
|
||||
(assoc-ref outputs "out")
|
||||
"--libdir"
|
||||
(string-append
|
||||
(let (;; Let pin one commit because -alpha is subject to change.
|
||||
;; The last stable release v2.5.0 is from July 2022.
|
||||
(revision "0")
|
||||
(commit "f995d28a4a34abb4cef8e0b3bd3c41cd710ccf1a"))
|
||||
(package
|
||||
(name "bap")
|
||||
(version (git-version "2.6.0-alpha" revision commit))
|
||||
(home-page "https://github.com/BinaryAnalysisPlatform/bap")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zfkc8nagf8kvxbypalbhf6gs0c7i48zx53hlpak2ipjwhvm5im5"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:use-make? #t
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'configure 'fix-ncurses
|
||||
(lambda _
|
||||
(substitute* "oasis/llvm"
|
||||
(("-lcurses") "-lncurses"))
|
||||
#t))
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs inputs #:allow-other-keys)
|
||||
(for-each make-file-writable (find-files "." "."))
|
||||
;; Package name changed
|
||||
(substitute* "oasis/elf-loader"
|
||||
(("bitstring.ppx") "ppx_bitstring"))
|
||||
;; We don't have a monolithic llvm
|
||||
(substitute* "oasis/llvm.setup.ml.in"
|
||||
(("llvm_static = \"true\"") "true"))
|
||||
(invoke "./configure" "--prefix"
|
||||
(assoc-ref outputs "out")
|
||||
"/lib/ocaml/site-lib")
|
||||
(string-append "--with-llvm-version=" #$(package-version llvm))
|
||||
"--with-llvm-config=llvm-config"
|
||||
"--disable-ghidra"
|
||||
"--disable-llvm-static"
|
||||
"--enable-llvm"
|
||||
"--enable-everything"))))))
|
||||
(native-inputs (list clang ocaml-oasis ocaml-ounit))
|
||||
(propagated-inputs
|
||||
(list
|
||||
camlzip
|
||||
ocaml-bitstring
|
||||
ocaml-cmdliner
|
||||
ocaml-core-kernel
|
||||
ocaml-ezjsonm
|
||||
ocaml-fileutils
|
||||
ocaml-frontc
|
||||
ocaml-graph
|
||||
ocaml-linenoise
|
||||
ocaml-ocurl
|
||||
ocaml-piqi
|
||||
ocaml-ppx-bap
|
||||
ocaml-ppx-bitstring
|
||||
ocaml-re
|
||||
ocaml-uri
|
||||
ocaml-utop
|
||||
ocaml-uuidm
|
||||
ocaml-yojson
|
||||
ocaml-z3
|
||||
ocaml-zarith))
|
||||
(inputs
|
||||
(list gmp llvm ncurses))
|
||||
(synopsis "Binary Analysis Platform")
|
||||
(description "Binary Analysis Platform is a framework for writing program
|
||||
"--libdir"
|
||||
(string-append
|
||||
(assoc-ref outputs "out")
|
||||
"/lib/ocaml/site-lib")
|
||||
(string-append "--with-llvm-version=" #$(package-version llvm))
|
||||
"--with-llvm-config=llvm-config"
|
||||
"--disable-ghidra"
|
||||
"--disable-llvm-static"
|
||||
"--enable-llvm"
|
||||
"--enable-everything"))))))
|
||||
(native-inputs (list clang ocaml-oasis ocaml-ounit))
|
||||
(propagated-inputs
|
||||
(list
|
||||
camlzip
|
||||
ocaml-bitstring
|
||||
ocaml-cmdliner
|
||||
ocaml-core-kernel
|
||||
ocaml-ezjsonm
|
||||
ocaml-fileutils
|
||||
ocaml-frontc
|
||||
ocaml-graph
|
||||
ocaml-linenoise
|
||||
ocaml-ocurl
|
||||
ocaml-piqi
|
||||
ocaml-ppx-bap
|
||||
ocaml-ppx-bitstring
|
||||
ocaml-re
|
||||
ocaml-uri
|
||||
ocaml-utop
|
||||
ocaml-uuidm
|
||||
ocaml-yojson
|
||||
ocaml-z3
|
||||
ocaml-zarith))
|
||||
(inputs
|
||||
(list gmp llvm ncurses))
|
||||
(synopsis "Binary Analysis Platform")
|
||||
(description "Binary Analysis Platform is a framework for writing program
|
||||
analysis tools, that target binary files. The framework consists of a plethora
|
||||
of libraries, plugins, and frontends. The libraries provide code reusability,
|
||||
the plugins facilitate extensibility, and the frontends serve as entry points.")
|
||||
(license license:expat)))
|
||||
(license license:expat))))
|
||||
|
||||
(define-public ocaml-camomile
|
||||
(package
|
||||
|
|
|
@ -161,9 +161,6 @@ implementation. The ICD Loader is responsible for:
|
|||
This package contains the Khronos official OpenCL ICD Loader.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public ocl-icd
|
||||
(deprecated-package "ocl-icd" opencl-icd-loader))
|
||||
|
||||
(define-public clinfo
|
||||
(package
|
||||
(name "clinfo")
|
||||
|
@ -197,6 +194,31 @@ possible (known) properties of the OpenCL platform and devices available on
|
|||
the system.")
|
||||
(license license:cc0)))
|
||||
|
||||
(define-public ocl-icd
|
||||
(package
|
||||
(name "ocl-icd")
|
||||
(version "2.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/OCL-dev/ocl-icd")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0y0lnxb6zlhfb5vxxib5n1vvxa4b23qc0j3lsih6yjz9j37mj7wz"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf automake libtool ruby))
|
||||
(home-page "https://github.com/OCL-dev/ocl-icd")
|
||||
(synopsis "Generic OpenCL @acronym{ICD, Installable Client Driver} loader")
|
||||
(description
|
||||
"This package provides an OpenCL @acronym{ICD, Installable Client Driver}
|
||||
loader. It maintains a YAML database of all known and guessed function pointers
|
||||
from vendor-specific drivers. It also delivers a skeleton of bindings to
|
||||
incorporate inside an OpenCL implementation to give it ICD functionalities.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public beignet
|
||||
(package
|
||||
(name "beignet")
|
||||
|
@ -230,6 +252,7 @@ the system.")
|
|||
("libxext" ,libxext)
|
||||
("mesa-utils" ,mesa-utils)
|
||||
("ncurses" ,ncurses)
|
||||
("ocl-icd" ,ocl-icd)
|
||||
("opencl-icd-loader" ,opencl-icd-loader)
|
||||
("opencl-headers" ,opencl-headers)
|
||||
("xextproto" ,xextproto)
|
||||
|
|
|
@ -961,6 +961,57 @@ transactions from C or Python.")
|
|||
;; The whole is GPLv2+; librpm itself is dual-licensed LGPLv2+ | GPLv2+.
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public bffe
|
||||
(let ((commit "722c37ec8a23835edfc85cba3d89868592a2ed2d")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "bffe")
|
||||
(version (git-version "0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.cbaines.net/guix/bffe")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"05i4awyirp440pk4vwa0sf46gi801zv839qm1i2z7jipm1xfwaxx"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
autoconf
|
||||
automake
|
||||
|
||||
;; Guile libraries are needed here for cross-compilation.
|
||||
guile-next
|
||||
guile-gnutls
|
||||
guile-json-4
|
||||
guix
|
||||
guix-data-service
|
||||
guix-build-coordinator
|
||||
guile-fibers-1.3
|
||||
guile-prometheus
|
||||
guile-lib))
|
||||
(propagated-inputs
|
||||
(list guile-gnutls
|
||||
guile-json-4
|
||||
guix
|
||||
guix-data-service
|
||||
guix-build-coordinator
|
||||
guile-fibers-1.3
|
||||
guile-prometheus
|
||||
guile-lib))
|
||||
(home-page "https://git.cbaines.net/guix/bffe")
|
||||
(synopsis "Build Farm Front-end for Guix")
|
||||
(description
|
||||
"The BFFE of Build Farm Front-end is an experimental frontend for Guix
|
||||
build farms. It works together with the Guix Data Service and Guix Build
|
||||
Coordinator to submit builds and monitor the activity.
|
||||
|
||||
It functions as a Guile library, with the @code{run-bffe-service} procedure in
|
||||
the @code{(bffe)} module as the entry point.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public python-anaconda-client
|
||||
(package
|
||||
(name "python-anaconda-client")
|
||||
|
@ -1450,8 +1501,8 @@ environments.")
|
|||
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
|
||||
|
||||
(define-public guix-build-coordinator
|
||||
(let ((commit "cbded42c284cca4ecaaebbf0a666cf89efc465a7")
|
||||
(revision "88"))
|
||||
(let ((commit "9c42dcb726fc925606b12695e195ae1dc7e28cc3")
|
||||
(revision "89"))
|
||||
(package
|
||||
(name "guix-build-coordinator")
|
||||
(version (git-version "0" revision commit))
|
||||
|
@ -1462,7 +1513,7 @@ environments.")
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1z2wdf5h4dxq9g7a6j7nvmrsqcibrfm8nmkakqgz7ipcxyk0vzjx"))
|
||||
"18m368rgmaiscmr1jlz77qkfw5fp4m8szgh90l6wbi9w68yfmr4n"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
@ -1771,7 +1822,7 @@ in an isolated environment, in separate namespaces.")
|
|||
guile-gnutls
|
||||
|
||||
;; Guile libraries are needed here for cross-compilation.
|
||||
(car (assoc-ref (package-native-inputs guix) "guile"))
|
||||
guile-next
|
||||
guile-json-4
|
||||
guile-gcrypt
|
||||
guix
|
||||
|
@ -1783,7 +1834,7 @@ in an isolated environment, in separate namespaces.")
|
|||
guile-sqlite3))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
(car (assoc-ref (package-native-inputs guix) "guile"))))
|
||||
guile-next))
|
||||
(propagated-inputs
|
||||
(list guile-json-4
|
||||
guile-gcrypt
|
||||
|
@ -1870,7 +1921,7 @@ for packaging and deployment of cross-compiled Windows applications.")
|
|||
(define-public libostree
|
||||
(package
|
||||
(name "libostree")
|
||||
(version "2022.7")
|
||||
(version "2023.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1878,7 +1929,7 @@ for packaging and deployment of cross-compiled Windows applications.")
|
|||
"https://github.com/ostreedev/ostree/releases/download/v"
|
||||
(version-major+minor version) "/libostree-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "07s14awf9ynlp84s08dkbwj9i18g93y0yf0k87nbks4l3hkakqlb"))))
|
||||
(base32 "056v7bz40dx8k2j2pfypc4shl6ijzvx1gy8r0kaw66py67xklndw"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
@ -145,7 +145,7 @@ human.")
|
|||
(define-public keepassxc
|
||||
(package
|
||||
(name "keepassxc")
|
||||
(version "2.7.5")
|
||||
(version "2.7.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -153,7 +153,7 @@ human.")
|
|||
"/releases/download/" version "/keepassxc-"
|
||||
version "-src.tar.xz"))
|
||||
(sha256
|
||||
(base32 "03002fncllr658mgl5s6an5wnh0a333qnkxad6aw85hqj004iqpd"))))
|
||||
(base32 "0w6nh2lnzfqcxasfsppmh4q309p1flzgfiv25hahzsd8kx879055"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
|
@ -0,0 +1,30 @@
|
|||
Source: https://gitlab.archlinux.org/archlinux/packaging/packages/alure/-/blob/main/dumb-2.patch
|
||||
|
||||
diff -Naur a/src/codec_dumb.cpp b/src/codec_dumb.cpp
|
||||
--- a/src/codec_dumb.cpp 2011-07-29 09:37:48.000000000 +0100
|
||||
+++ b/src/codec_dumb.cpp 2020-05-10 15:59:48.502632496 +0100
|
||||
@@ -272,7 +272,11 @@
|
||||
|
||||
private:
|
||||
// DUMBFILE iostream callbacks
|
||||
+#if DUMB_VERSION >= 2*10000
|
||||
+ static int skip(void *user_data, dumb_off_t offset)
|
||||
+#else
|
||||
static int skip(void *user_data, long offset)
|
||||
+#endif
|
||||
{
|
||||
std::istream *stream = static_cast<dumbStream*>(user_data)->fstream;
|
||||
stream->clear();
|
||||
@@ -282,7 +286,11 @@
|
||||
return -1;
|
||||
}
|
||||
|
||||
+#if DUMB_VERSION >= 2*10000
|
||||
+ static dumb_ssize_t read(char *ptr, size_t size, void *user_data)
|
||||
+#else
|
||||
static long read(char *ptr, long size, void *user_data)
|
||||
+#endif
|
||||
{
|
||||
std::istream *stream = static_cast<dumbStream*>(user_data)->fstream;
|
||||
stream->clear();
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
# HG changeset patch
|
||||
# User Bernhard M. Wiedemann <bwiedemann@suse.de>
|
||||
# Date 1502609999 -7200
|
||||
# Sun Aug 13 09:39:59 2017 +0200
|
||||
# Node ID a98e00eed893f62dd8349fc2894abca3aff4b33a
|
||||
# Parent 41ce01b7d413b3654211da0147857e7d6a1495de
|
||||
Facilitate reproducible builds
|
||||
by allowing to externally hold constant the build date and time.
|
||||
See
|
||||
https://reproducible-builds.org/specs/source-date-epoch/
|
||||
|
||||
Backport asap.
|
||||
|
||||
diff -r 41ce01b7d413 -r a98e00eed893 NEWS
|
||||
--- a/NEWS Sun Aug 13 09:39:56 2017 +0200
|
||||
+++ b/NEWS Sun Aug 13 09:39:59 2017 +0200
|
||||
@@ -48,6 +48,12 @@
|
||||
https://github.com/akrzemi1/Optional
|
||||
where only "optional.hpp" is needed.
|
||||
|
||||
+- The environment variable SOURCE_DATE_EPOCH overrides the build
|
||||
+ timestamp as recorded by the signatures. See
|
||||
+ https://reproducible-builds.org/specs/source-date-epoch/
|
||||
+ for details.
|
||||
+
|
||||
+
|
||||
|
||||
* Version 4.2 "Compressor Road"
|
||||
|
||||
diff -r 41ce01b7d413 -r a98e00eed893 src/DefaultSig.pm
|
||||
--- a/src/DefaultSig.pm Sun Aug 13 09:39:56 2017 +0200
|
||||
+++ b/src/DefaultSig.pm Sun Aug 13 09:39:59 2017 +0200
|
||||
@@ -109,9 +109,10 @@
|
||||
sub update_date_and_time {
|
||||
my $self = shift;
|
||||
|
||||
+ my $now = $ENV{SOURCE_DATE_EPOCH} || time;
|
||||
my ($second, $minute, $hour,
|
||||
$day_of_month, $month, $year,
|
||||
- $day_of_week) = $self->is_using_gmt() ? gmtime : localtime;
|
||||
+ $day_of_week) = $self->is_using_gmt() ? gmtime($now) : localtime($now);
|
||||
|
||||
$self->{DATE} = $self->format_date($day_of_month, $month, $year + 1900, $day_of_week,
|
||||
$self->weekdays->[$day_of_week],
|
|
@ -1,72 +0,0 @@
|
|||
Fix the build with Linux 6.2:
|
||||
|
||||
https://github.com/DisplayLink/evdi/issues/402
|
||||
|
||||
Patch copied from upstream pull request:
|
||||
|
||||
https://github.com/DisplayLink/evdi/pull/401
|
||||
|
||||
From a90ecd5f0f09e976e4b8784fa16b92804138b1bd Mon Sep 17 00:00:00 2001
|
||||
From: listout <listout@protonmail.com>
|
||||
Date: Wed, 22 Feb 2023 13:09:40 +0530
|
||||
Subject: [PATCH] Original patch was suggested by Crashdummyy.
|
||||
|
||||
Since commit 9877d8f6bc374912b08dfe862cddbb78b395a5ef
|
||||
feild fbdev has been renamed to info in struct drm_fb_helper.
|
||||
|
||||
Fixes: https://github.com/DisplayLink/evdi/issues/402
|
||||
Fixes: https://github.com/DisplayLink/evdi/issues/394
|
||||
Fixes: https://github.com/DisplayLink/evdi/issues/384
|
||||
Signed-off-by: listout <listout@protonmail.com>
|
||||
---
|
||||
module/evdi_fb.c | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/module/evdi_fb.c b/module/evdi_fb.c
|
||||
index 6b367fe8..f5de81f1 100644
|
||||
--- a/module/evdi_fb.c
|
||||
+++ b/module/evdi_fb.c
|
||||
@@ -405,7 +405,11 @@ static int evdifb_create(struct drm_fb_helper *helper,
|
||||
fb = &efbdev->efb.base;
|
||||
|
||||
efbdev->helper.fb = fb;
|
||||
+#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE
|
||||
+ efbdev->helper.info = info;
|
||||
+#else
|
||||
efbdev->helper.fbdev = info;
|
||||
+#endif
|
||||
|
||||
strcpy(info->fix.id, "evdidrmfb");
|
||||
|
||||
@@ -459,8 +463,13 @@ static void evdi_fbdev_destroy(__always_unused struct drm_device *dev,
|
||||
{
|
||||
struct fb_info *info;
|
||||
|
||||
+#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE
|
||||
+ if (efbdev->helper.info) {
|
||||
+ info = efbdev->helper.info;
|
||||
+#else
|
||||
if (efbdev->helper.fbdev) {
|
||||
info = efbdev->helper.fbdev;
|
||||
+#endif
|
||||
unregister_framebuffer(info);
|
||||
if (info->cmap.len)
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
@@ -537,10 +546,17 @@ void evdi_fbdev_unplug(struct drm_device *dev)
|
||||
return;
|
||||
|
||||
efbdev = evdi->fbdev;
|
||||
+#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE
|
||||
+ if (efbdev->helper.info) {
|
||||
+ struct fb_info *info;
|
||||
+
|
||||
+ info = efbdev->helper.info;
|
||||
+#else
|
||||
if (efbdev->helper.fbdev) {
|
||||
struct fb_info *info;
|
||||
|
||||
info = efbdev->helper.fbdev;
|
||||
+#endif
|
||||
#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || defined(EL8)
|
||||
unregister_framebuffer(info);
|
||||
#else
|
|
@ -0,0 +1,34 @@
|
|||
Taken from https://salsa.debian.org/glibc-team/glibc/-/blob/5af8e3701c63ad202b652b5051bec592b8385820/debian/patches/hurd-i386/unsubmitted-getaux_at_secure.diff
|
||||
|
||||
This fixes gdk-pixbuf, gobject-introspection.
|
||||
|
||||
FIXME: sysdeps/mach/hurd/i386/init-first.c should instead pass an auxv
|
||||
to __libc_start_main
|
||||
|
||||
Index: glibc-2.33/misc/getauxval.c
|
||||
===================================================================
|
||||
--- glibc-2.33.orig/misc/getauxval.c
|
||||
+++ glibc-2.33/misc/getauxval.c
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <errno.h>
|
||||
#include <ldsodefs.h>
|
||||
#include <stdbool.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
bool
|
||||
__getauxval2 (unsigned long int type, unsigned long int *result)
|
||||
@@ -27,6 +28,14 @@ __getauxval2 (unsigned long int type, un
|
||||
ElfW(auxv_t) *p;
|
||||
#endif
|
||||
|
||||
+#ifdef AT_SECURE
|
||||
+ if (type == AT_SECURE)
|
||||
+ {
|
||||
+ *result = __libc_enable_secure;
|
||||
+ return true;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if (type == AT_HWCAP)
|
||||
{
|
||||
*result = GLRO(dl_hwcap);
|
|
@ -0,0 +1,52 @@
|
|||
From 71933f6586475b36c70ef325373fe6d50c7a034f Mon Sep 17 00:00:00 2001
|
||||
From: Jan Beich <jbeich@FreeBSD.org>
|
||||
Date: Mon, 24 Jan 2022 11:13:54 +0000
|
||||
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
|
||||
|
||||
Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
|
||||
|
||||
data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
|
||||
data/meson.build:6:5: ERROR: Function does not take positional arguments.
|
||||
data/meson.build:49:5: ERROR: Function does not take positional arguments.
|
||||
---
|
||||
data/appdata/meson.build | 2 +-
|
||||
data/meson.build | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
|
||||
index 1dc4ed7..e44a58e 100644
|
||||
--- a/data/appdata/meson.build
|
||||
+++ b/data/appdata/meson.build
|
||||
@@ -1,6 +1,6 @@
|
||||
appdata_conf = configuration_data()
|
||||
appdata_conf.set('application_id', application_id)
|
||||
-i18n.merge_file('appdata',
|
||||
+appdata_file = i18n.merge_file(
|
||||
input: configure_file(
|
||||
input: 'org.gnome.Dictionary.appdata.xml.in.in',
|
||||
output: 'org.gnome.Dictionary.appdata.xml.in',
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 660e6b8..7ec7251 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -3,7 +3,7 @@ subdir('appdata')
|
||||
desktop_conf = configuration_data()
|
||||
desktop_conf.set('icon', application_id)
|
||||
desktop_conf.set('application_id', application_id)
|
||||
-i18n.merge_file('desktop',
|
||||
+desktop_file = i18n.merge_file(
|
||||
input: configure_file(
|
||||
input: 'org.gnome.Dictionary.desktop.in.in',
|
||||
output: 'org.gnome.Dictionary.desktop.in',
|
||||
@@ -45,7 +45,7 @@ sources = [
|
||||
]
|
||||
|
||||
foreach s: sources
|
||||
- i18n.merge_file('sources',
|
||||
+ i18n.merge_file(
|
||||
input: '@0@.in'.format(s),
|
||||
output: s,
|
||||
install: true,
|
||||
--
|
||||
2.41.0
|
||||
|
|
@ -1,632 +0,0 @@
|
|||
Copied from Debian.
|
||||
|
||||
Description: Support additional architectures.
|
||||
Author: Francesco Paolo Lovergine <frankie@debian.org>
|
||||
|
||||
--- a/hdf/src/hdfi.h
|
||||
+++ b/hdf/src/hdfi.h
|
||||
@@ -48,6 +48,7 @@
|
||||
/* 8 - Cray IEEE */
|
||||
/* (i.e. Big-Endian, all 64-bit architecture w/IEEE Floats) */
|
||||
/*--------------------------------------------------------------------------*/
|
||||
+#define DFMT_S390 0x1111
|
||||
#define DFMT_SUN 0x1111
|
||||
#define DFMT_SUN_INTEL 0x4441
|
||||
#define DFMT_ALLIANT 0x1111
|
||||
@@ -62,6 +63,7 @@
|
||||
#define DFMT_CTSS 0x3331
|
||||
#define DFMT_VAX 0x2221
|
||||
#define DFMT_MIPSEL 0x4441
|
||||
+#define DFMT_MIPSEB 0x1111
|
||||
#define DFMT_PC 0x4441
|
||||
#define DFMT_APPLE 0x1111
|
||||
#define DFMT_APPLE_INTEL 0x4441
|
||||
@@ -75,6 +77,13 @@
|
||||
#define DFMT_IA64 0x4441
|
||||
#define DFMT_LINUX64 0x4441
|
||||
#define DFMT_POWERPC64 0x1111
|
||||
+#define DFMT_POWERPC64LE 0x4441
|
||||
+#define DFMT_ARMV4L 0x4441
|
||||
+#define DFMT_AARCH64 0x4441
|
||||
+#define DFMT_X86_64 0x4441
|
||||
+#define DFMT_SH 0x4441
|
||||
+#define DFMT_SHEB 0x1111
|
||||
+#define DFMT_RISCV64 0x4441
|
||||
|
||||
/* I/O library constants */
|
||||
#define UNIXUNBUFIO 1
|
||||
@@ -288,7 +297,7 @@ typedef int hdf_pint_t;
|
||||
|
||||
#endif /* IBM6000 */
|
||||
|
||||
-#if defined(HP9000) || (!defined(__convexc__) && (defined(hpux) || defined(__hpux)))
|
||||
+#if defined(HP9000) || (!defined(__convexc__) && (defined(hpux) || defined(__hpux) || defined(__hppa__)))
|
||||
|
||||
#ifndef HP9000
|
||||
#define HP9000
|
||||
@@ -347,6 +356,10 @@ typedef int hdf_pint_t;
|
||||
/* what each does */
|
||||
#define JMEMSYS MEM_ANSI
|
||||
|
||||
+#ifdef __linux__
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#endif
|
||||
+
|
||||
#endif /* HP9000 */
|
||||
|
||||
|
||||
@@ -670,6 +683,462 @@ typedef int hdf_pint_t;
|
||||
#endif /* !(defined(__APPLE__)) */
|
||||
|
||||
/*-----------------------------------------------------*/
|
||||
+#if defined (__linux__) && defined (__mc68000__)
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#define DF_MT DFMT_MOTOROLA
|
||||
+
|
||||
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
|
||||
+typedef void VOID;
|
||||
+#endif /* end VOID */
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+typedef long int int32;
|
||||
+typedef unsigned long int uint32;
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef long intf; /* size of INTEGERs in Fortran compiler */
|
||||
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+
|
||||
+#ifdef HAVE_FMPOOL
|
||||
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
||||
+#else
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/m68k */
|
||||
+
|
||||
+#if defined (__linux__) && defined (__sparc__)
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#define DF_MT DFMT_SUN
|
||||
+
|
||||
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
|
||||
+typedef void VOID;
|
||||
+#endif /* end VOID */
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+#ifdef _LP64 /* 64-bit environment */
|
||||
+typedef int int32;
|
||||
+typedef unsigned int uint32;
|
||||
+#else /* 32-bit environment */
|
||||
+typedef long int int32;
|
||||
+typedef unsigned long int uint32;
|
||||
+#endif
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef long intf; /* size of INTEGERs in Fortran compiler */
|
||||
+#ifdef _LP64 /* 64-bit environment */
|
||||
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#else /* 32-bit environment */
|
||||
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#endif
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+
|
||||
+#ifdef HAVE_FMPOOL
|
||||
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
||||
+#else
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/Sparc */
|
||||
+
|
||||
+#if defined (__linux__) && defined (__powerpc__) && !defined(__powerpc64__)
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#define DF_MT DFMT_MOTOROLA
|
||||
+
|
||||
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
|
||||
+typedef void VOID;
|
||||
+#endif /* end VOID */
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef signed char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+typedef long int int32;
|
||||
+typedef unsigned long int uint32;
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef long intf; /* size of INTEGERs in Fortran compiler */
|
||||
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+
|
||||
+#ifdef HAVE_FMPOOL
|
||||
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
||||
+#else
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/powerpc */
|
||||
+
|
||||
+#if defined (__linux__) && defined (__s390__)
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#define DF_MT DFMT_S390
|
||||
+
|
||||
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
|
||||
+typedef void VOID;
|
||||
+#endif /* end VOID */
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef signed char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+#ifdef _LP64 /* 64-bit environment */
|
||||
+typedef int int32;
|
||||
+typedef unsigned int uint32;
|
||||
+#else /* 32-bit environment */
|
||||
+typedef long int int32;
|
||||
+typedef unsigned long int uint32;
|
||||
+#endif
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef long intf; /* size of INTEGERs in Fortran compiler */
|
||||
+#ifdef _LP64 /* 64-bit environment */
|
||||
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#else /* 32-bit environment */
|
||||
+typedef int hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#endif
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+
|
||||
+#ifdef HAVE_FMPOOL
|
||||
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
||||
+#else
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/s390 */
|
||||
+
|
||||
+#if defined (__linux__) && (defined (__MIPSEB__) || defined(__MIPSEL__))
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#if defined (__MIPSEB__)
|
||||
+#define DF_MT DFMT_MIPSEB
|
||||
+#elif defined(__MIPSEL__)
|
||||
+#define DF_MT DFMT_MIPSEL
|
||||
+#endif
|
||||
+
|
||||
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
|
||||
+typedef void VOID;
|
||||
+#endif /* end VOID */
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef signed char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+typedef int int32;
|
||||
+typedef unsigned int uint32;
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef long intf; /* size of INTEGERs in Fortran compiler */
|
||||
+typedef long int hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+
|
||||
+#ifdef HAVE_FMPOOL
|
||||
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
||||
+#else
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/mips */
|
||||
+
|
||||
+#if defined (__linux__) && defined (__arm__)
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#define DF_MT DFMT_ARMV4L
|
||||
+
|
||||
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
|
||||
+typedef void VOID;
|
||||
+#endif /* end VOID */
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef signed char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+typedef int int32;
|
||||
+typedef unsigned int uint32;
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef long intf; /* size of INTEGERs in Fortran compiler */
|
||||
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+
|
||||
+#ifdef HAVE_FMPOOL
|
||||
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
||||
+#else
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/arm */
|
||||
+
|
||||
+#if defined (__linux__) && defined (__aarch64__)
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#define DF_MT DFMT_AARCH64
|
||||
+
|
||||
+typedef void VOID;
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef signed char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+typedef int int32;
|
||||
+typedef unsigned int uint32;
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef int intf; /* size of INTEGERs in Fortran compiler */
|
||||
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+
|
||||
+#ifndef BIG_LONGS
|
||||
+#define BIG_LONGS
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/aarch64 */
|
||||
+
|
||||
+#if defined (__linux__) && defined (__riscv) && (__riscv_xlen == 64)
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#define DF_MT DFMT_RISCV64
|
||||
+
|
||||
+typedef void VOID;
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef signed char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+typedef int int32;
|
||||
+typedef unsigned int uint32;
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef int intf; /* size of INTEGERs in Fortran compiler */
|
||||
+typedef long hdf_pint_t; /* an integer the same size as a pointer */
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+
|
||||
+#ifndef BIG_LONGS
|
||||
+#define BIG_LONGS
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/riscv64 */
|
||||
+
|
||||
#if defined(NEXT) || defined(NeXT)
|
||||
|
||||
#ifndef NEXT
|
||||
@@ -932,7 +1401,11 @@ Please check your Makefile.
|
||||
|
||||
#include <sys/file.h> /* for unbuffered i/o stuff */
|
||||
#include <sys/stat.h>
|
||||
-#define DF_MT DFMT_POWERPC64
|
||||
+#ifdef __LITTLE_ENDIAN__
|
||||
+#define DF_MT DFMT_POWERPC64LE
|
||||
+#else
|
||||
+#define DF_MT DFMT_POWERPC64
|
||||
+#endif
|
||||
typedef void VOID;
|
||||
typedef void *VOIDP;
|
||||
typedef char *_fcd;
|
||||
@@ -956,6 +1429,11 @@ typedef long hdf_pint_t;
|
||||
#define _fcdtocp(desc) (desc)
|
||||
#define FILELIB UNIXBUFIO
|
||||
|
||||
+#ifndef BIG_LONGS
|
||||
+#define BIG_LONGS
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
|
||||
/* Determine the memory manager we are going to use. Valid values are: */
|
||||
@@ -1101,6 +1579,8 @@ typedef long hdf_pint_t;
|
||||
#define _fcdtocp(desc) (desc)
|
||||
#define FILELIB UNIXBUFIO
|
||||
|
||||
+#define BIG_LONGS
|
||||
+
|
||||
/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
|
||||
/* Determine the memory manager we are going to use. Valid values are: */
|
||||
@@ -1115,6 +1595,66 @@ typedef long hdf_pint_t;
|
||||
|
||||
#endif /* IA64 */
|
||||
|
||||
+/* Renesas SuperH SH3(little/big)/SH4(little/big) */
|
||||
+#if defined (__linux__) && defined(__sh__)
|
||||
+
|
||||
+#ifdef GOT_MACHINE
|
||||
+If you get an error on this line more than one machine type has been defined.
|
||||
+Please check your Makefile.
|
||||
+#endif
|
||||
+#define GOT_MACHINE 1
|
||||
+
|
||||
+#include <fcntl.h>
|
||||
+#include <sys/types.h> /* for unbuffered file I/O */
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#include <ctype.h> /* for character macros */
|
||||
+
|
||||
+#if defined (__LITTLE_ENDIAN__)
|
||||
+#define DF_MT DFMT_SH
|
||||
+#elif defined(__BIG_ENDIAN__)
|
||||
+#define DF_MT DFMT_SHEB
|
||||
+#endif
|
||||
+
|
||||
+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
|
||||
+typedef void VOID;
|
||||
+#endif /* end VOID */
|
||||
+
|
||||
+typedef void * VOIDP;
|
||||
+typedef char * _fcd;
|
||||
+typedef char char8;
|
||||
+typedef unsigned char uchar8;
|
||||
+typedef signed char int8;
|
||||
+typedef unsigned char uint8;
|
||||
+typedef short int int16;
|
||||
+typedef unsigned short int uint16;
|
||||
+typedef long int int32;
|
||||
+typedef unsigned long int uint32;
|
||||
+typedef int intn;
|
||||
+typedef unsigned int uintn;
|
||||
+typedef float float32;
|
||||
+typedef double float64;
|
||||
+typedef long intf;
|
||||
+typedef int hdf_pint_t;
|
||||
+#define FNAME_POST_UNDERSCORE
|
||||
+#define _fcdtocp(desc) (desc)
|
||||
+
|
||||
+#ifdef HAVE_FMPOOL
|
||||
+#define FILELIB PAGEBUFIO /* enable page buffering */
|
||||
+#else
|
||||
+#define FILELIB UNIXBUFIO
|
||||
+#endif
|
||||
+
|
||||
+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
|
||||
+/* Determine the memory manager we are going to use. Valid values are: */
|
||||
+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
|
||||
+/* what each does */
|
||||
+#define JMEMSYS MEM_ANSI
|
||||
+#define HAVE_STDC
|
||||
+#define INCLUDES_ARE_ANSI
|
||||
+
|
||||
+#endif /* Linux/sh */
|
||||
+
|
||||
#ifndef GOT_MACHINE
|
||||
No machine type has been defined. Your Makefile needs to have someing like
|
||||
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
|
||||
--- a/hdf/src/hconv.h
|
||||
+++ b/hdf/src/hconv.h
|
||||
@@ -59,7 +59,7 @@
|
||||
/* CONSTANT DEFINITIONS */
|
||||
/*****************************************************************************/
|
||||
/* Generally Big-Endian machines */
|
||||
-#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__)
|
||||
+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !(defined(__powerpc__) && defined(__LITTLE_ENDIAN__)) && !defined(__aarch64__) && !defined(__ARM_EABI__) && !defined(__riscv)
|
||||
# define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
|
||||
# define UI8_OUT DFKnb1b
|
||||
# define SI16_IN DFKnb2b /* S = Signed */
|
|
@ -1,33 +0,0 @@
|
|||
Build with libtirpc on all architectures because glibc no longer provides
|
||||
SunRPC support.
|
||||
|
||||
diff --git a/configure b/configure
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -23635,10 +23635,13 @@
|
||||
*-pc-cygwin*)
|
||||
LIBS="$LIBS -ltirpc"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;;
|
||||
+ *-linux-gnu)
|
||||
+ LIBS="$LIBS -ltirpc"
|
||||
+ CPPFLAGS="$CPPFLAGS" ;;
|
||||
*) ;;
|
||||
esac
|
||||
|
||||
-if test "X$BUILD_XDR" != "Xyes"; then
|
||||
+if test "X$BUILD_XDR" = "Xyes"; then
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -23693,9 +23696,9 @@
|
||||
## but we need to make sure that it is present on the system. Do that here,
|
||||
## The SunRPC of the glibc has been replaced by a TI-RPC (Transport Independent RPC) library for IPv6 support
|
||||
case "$host" in
|
||||
- *-pc-cygwin*)
|
||||
+ *)
|
||||
HAVE_RPC="yes"
|
||||
- ac_fn_c_check_header_mongrel "$LINENO" "rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default"
|
||||
+ ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_rpc_h" = xyes; then :
|
||||
:
|
||||
else
|
|
@ -0,0 +1,89 @@
|
|||
origin patch from nixos.
|
||||
|
||||
see https://github.com/NixOS/nixpkgs/blob/2457551a54ffbd93b7d8f84af8b8fb3aac5cbdd5/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
|
||||
|
||||
---
|
||||
src/guix_utils.h | 41 +++++++++++++++++++++++++++++++++++++++++
|
||||
src/service_utils.h | 4 +++-
|
||||
src/waylandwindow.cpp | 5 ++++-
|
||||
3 files changed, 48 insertions(+), 2 deletions(-)
|
||||
create mode 100644 src/guix_utils.h
|
||||
|
||||
diff a/src/guix_utils.h b/src/guix_utils.h
|
||||
new file mode 100644
|
||||
index 0000000..726065d
|
||||
--- /dev/null
|
||||
+++ b/src/guix_utils.h
|
||||
@@ -0,0 +1,24 @@
|
||||
+#ifndef GUIX_UTILS_H
|
||||
+#define GUIX_UTILS_H
|
||||
+
|
||||
+// kwin
|
||||
+#include <kwinglobals.h>
|
||||
+
|
||||
+namespace KWin
|
||||
+{
|
||||
+
|
||||
+static QString unwrapExecutablePath(const QString &in_executablePath)
|
||||
+{
|
||||
+ QString executablePath(in_executablePath);
|
||||
+
|
||||
+ while (executablePath.endsWith("-real") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) {
|
||||
+ executablePath.remove(executablePath.length() - 5, 5);
|
||||
+ executablePath.remove(executablePath.lastIndexOf("/")+1, 1);
|
||||
+ }
|
||||
+
|
||||
+ return executablePath;
|
||||
+}
|
||||
+
|
||||
+}// namespace
|
||||
+
|
||||
+#endif // GUIX_UTILS_H
|
||||
diff a/src/utils/serviceutils.h b/src/utils/serviceutils.h
|
||||
index 8a70c1f..475b15d 100644
|
||||
--- a/src/utils/serviceutils.h
|
||||
+++ b/src/utils/serviceutils.h
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <QLoggingCategory>
|
||||
//KF
|
||||
#include <KApplicationTrader>
|
||||
+#include "guix_utils.h"
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
@@ -26,8 +27,9 @@ namespace KWin
|
||||
const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
|
||||
const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
|
||||
|
||||
-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
|
||||
+static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
|
||||
{
|
||||
+ const QString executablePath = unwrapExecutablePath(in_executablePath);
|
||||
// needed to be able to use the logging category in a header static function
|
||||
static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
|
||||
const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
|
||||
diff a/src/waylandwindow.cpp b/src/waylandwindow.cpp
|
||||
index fd2c0c1..ae8cf96 100644
|
||||
--- a/src/waylandwindow.cpp
|
||||
+++ b/src/waylandwindow.cpp
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "screens.h"
|
||||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
+#include "guix_utils.h"
|
||||
|
||||
#include <KWaylandServer/display.h>
|
||||
#include <KWaylandServer/clientbuffer.h>
|
||||
@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon()
|
||||
|
||||
void WaylandWindow::updateResourceName()
|
||||
{
|
||||
- const QFileInfo fileInfo(surface()->client()->executablePath());
|
||||
+ const QString in_path = surface()->client()->executablePath();
|
||||
+ const QString path = unwrapExecutablePath(in_path);
|
||||
+ const QFileInfo fileInfo(path);
|
||||
if (fileInfo.exists()) {
|
||||
const QByteArray executableFileName = fileInfo.fileName().toUtf8();
|
||||
setResourceClass(executableFileName, executableFileName);
|
||||
--
|
||||
2.32.0
|
|
@ -0,0 +1,39 @@
|
|||
commit cdb28383402d248dbc6062f4391b038375c52385
|
||||
Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri Jul 17 21:25:03 2020 +0200
|
||||
|
||||
CMakeLists.txt: fix paths when FTDIPP is set
|
||||
|
||||
Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
|
||||
is enabled as suggested by Aurelien Jarno in
|
||||
http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
|
||||
|
||||
Without this change, the libftdi1.pc config file defines the include
|
||||
path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
|
||||
installed in /usr/local/include/libftdi1
|
||||
|
||||
This is an issue for example for libsigrok which will fail on:
|
||||
|
||||
In file included from src/hardware/asix-sigma/protocol.c:27:
|
||||
src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
|
||||
28 | #include <ftdi.h>
|
||||
| ^~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5aecafc..3b0b87c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -136,7 +136,7 @@ endif ()
|
||||
|
||||
add_subdirectory(src)
|
||||
if ( FTDIPP )
|
||||
- project(libftdipp1 C CXX)
|
||||
+ project(libftdi1 C CXX)
|
||||
add_subdirectory(ftdipp)
|
||||
endif ()
|
||||
if ( PYTHON_BINDINGS )
|
|
@ -0,0 +1,248 @@
|
|||
From abcd277ea45e9098bed752cf9c6875b533c0892f Mon Sep 17 00:00:00 2001
|
||||
From: AlbrechtS <AlbrechtS.svn@fltk.example.org>
|
||||
Date: Sun, 4 Feb 2018 23:47:38 +0100
|
||||
Subject: [PATCH] Modify rasterizer to support non-square X,Y axes scaling.
|
||||
|
||||
Add new function nsvgRasterizeXY() similar to nsvgRasterize() but with
|
||||
separate scaling factors for x-axis and y-axis.
|
||||
---
|
||||
src/nanosvgrast.h | 78 +++++++++++++++++++++++++++++++----------------
|
||||
1 file changed, 51 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/src/nanosvgrast.h b/src/nanosvgrast.h
|
||||
index 17ba3b0..a83db27 100644
|
||||
--- a/src/nanosvgrast.h
|
||||
+++ b/src/nanosvgrast.h
|
||||
@@ -22,6 +22,12 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+/* Modified by FLTK to support non-square X,Y axes scaling.
|
||||
+ *
|
||||
+ * Added: nsvgRasterizeXY()
|
||||
+*/
|
||||
+
|
||||
+
|
||||
#ifndef NANOSVGRAST_H
|
||||
#define NANOSVGRAST_H
|
||||
|
||||
@@ -46,6 +52,9 @@ typedef struct NSVGrasterizer NSVGrasterizer;
|
||||
unsigned char* img = malloc(w*h*4);
|
||||
// Rasterize
|
||||
nsvgRasterize(rast, image, 0,0,1, img, w, h, w*4);
|
||||
+
|
||||
+ // For non-square X,Y scaling, use
|
||||
+ nsvgRasterizeXY(rast, image, 0,0,1,1, img, w, h, w*4);
|
||||
*/
|
||||
|
||||
// Allocated rasterizer context.
|
||||
@@ -55,7 +64,7 @@ NSVGrasterizer* nsvgCreateRasterizer(void);
|
||||
// r - pointer to rasterizer context
|
||||
// image - pointer to image to rasterize
|
||||
// tx,ty - image offset (applied after scaling)
|
||||
-// scale - image scale
|
||||
+// scale - image scale (assumes square aspect ratio)
|
||||
// dst - pointer to destination image data, 4 bytes per pixel (RGBA)
|
||||
// w - width of the image to render
|
||||
// h - height of the image to render
|
||||
@@ -64,6 +73,12 @@ void nsvgRasterize(NSVGrasterizer* r,
|
||||
NSVGimage* image, float tx, float ty, float scale,
|
||||
unsigned char* dst, int w, int h, int stride);
|
||||
|
||||
+// As above, but allow X and Y axes to scale independently for non-square aspects
|
||||
+void nsvgRasterizeXY(NSVGrasterizer* r,
|
||||
+ NSVGimage* image, float tx, float ty,
|
||||
+ float sx, float sy,
|
||||
+ unsigned char* dst, int w, int h, int stride);
|
||||
+
|
||||
// Deletes rasterizer context.
|
||||
void nsvgDeleteRasterizer(NSVGrasterizer*);
|
||||
|
||||
@@ -370,7 +385,7 @@ static void nsvg__flattenCubicBez(NSVGrasterizer* r,
|
||||
nsvg__flattenCubicBez(r, x1234,y1234, x234,y234, x34,y34, x4,y4, level+1, type);
|
||||
}
|
||||
|
||||
-static void nsvg__flattenShape(NSVGrasterizer* r, NSVGshape* shape, float scale)
|
||||
+static void nsvg__flattenShape(NSVGrasterizer* r, NSVGshape* shape, float sx, float sy)
|
||||
{
|
||||
int i, j;
|
||||
NSVGpath* path;
|
||||
@@ -378,13 +393,13 @@ static void nsvg__flattenShape(NSVGrasterizer* r, NSVGshape* shape, float scale)
|
||||
for (path = shape->paths; path != NULL; path = path->next) {
|
||||
r->npoints = 0;
|
||||
// Flatten path
|
||||
- nsvg__addPathPoint(r, path->pts[0]*scale, path->pts[1]*scale, 0);
|
||||
+ nsvg__addPathPoint(r, path->pts[0]*sx, path->pts[1]*sy, 0);
|
||||
for (i = 0; i < path->npts-1; i += 3) {
|
||||
float* p = &path->pts[i*2];
|
||||
- nsvg__flattenCubicBez(r, p[0]*scale,p[1]*scale, p[2]*scale,p[3]*scale, p[4]*scale,p[5]*scale, p[6]*scale,p[7]*scale, 0, 0);
|
||||
+ nsvg__flattenCubicBez(r, p[0]*sx,p[1]*sy, p[2]*sx,p[3]*sy, p[4]*sx,p[5]*sy, p[6]*sx,p[7]*sy, 0, 0);
|
||||
}
|
||||
// Close path
|
||||
- nsvg__addPathPoint(r, path->pts[0]*scale, path->pts[1]*scale, 0);
|
||||
+ nsvg__addPathPoint(r, path->pts[0]*sx, path->pts[1]*sy, 0);
|
||||
// Build edges
|
||||
for (i = 0, j = r->npoints-1; i < r->npoints; j = i++)
|
||||
nsvg__addEdge(r, r->points[j].x, r->points[j].y, r->points[i].x, r->points[i].y);
|
||||
@@ -734,7 +749,7 @@ static void nsvg__prepareStroke(NSVGrasterizer* r, float miterLimit, int lineJoi
|
||||
}
|
||||
}
|
||||
|
||||
-static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float scale)
|
||||
+static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float sx, float sy)
|
||||
{
|
||||
int i, j, closed;
|
||||
NSVGpath* path;
|
||||
@@ -742,15 +757,16 @@ static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float
|
||||
float miterLimit = shape->miterLimit;
|
||||
int lineJoin = shape->strokeLineJoin;
|
||||
int lineCap = shape->strokeLineCap;
|
||||
- float lineWidth = shape->strokeWidth * scale;
|
||||
+ const float sw = (sx + sy) / 2; // average scaling factor
|
||||
+ const float lineWidth = shape->strokeWidth * sw; // FIXME (?)
|
||||
|
||||
for (path = shape->paths; path != NULL; path = path->next) {
|
||||
// Flatten path
|
||||
r->npoints = 0;
|
||||
- nsvg__addPathPoint(r, path->pts[0]*scale, path->pts[1]*scale, NSVG_PT_CORNER);
|
||||
+ nsvg__addPathPoint(r, path->pts[0]*sx, path->pts[1]*sy, NSVG_PT_CORNER);
|
||||
for (i = 0; i < path->npts-1; i += 3) {
|
||||
float* p = &path->pts[i*2];
|
||||
- nsvg__flattenCubicBez(r, p[0]*scale,p[1]*scale, p[2]*scale,p[3]*scale, p[4]*scale,p[5]*scale, p[6]*scale,p[7]*scale, 0, NSVG_PT_CORNER);
|
||||
+ nsvg__flattenCubicBez(r, p[0]*sx,p[1]*sy, p[2]*sx,p[3]*sy, p[4]*sx,p[5]*sy, p[6]*sx,p[7]*sy, 0, NSVG_PT_CORNER);
|
||||
}
|
||||
if (r->npoints < 2)
|
||||
continue;
|
||||
@@ -796,7 +812,7 @@ static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float
|
||||
dashOffset -= shape->strokeDashArray[idash];
|
||||
idash = (idash + 1) % shape->strokeDashCount;
|
||||
}
|
||||
- dashLen = (shape->strokeDashArray[idash] - dashOffset) * scale;
|
||||
+ dashLen = (shape->strokeDashArray[idash] - dashOffset) * sw;
|
||||
|
||||
for (j = 1; j < r->npoints2; ) {
|
||||
float dx = r->points2[j].x - cur.x;
|
||||
@@ -818,7 +834,7 @@ static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float
|
||||
// Advance dash pattern
|
||||
dashState = !dashState;
|
||||
idash = (idash+1) % shape->strokeDashCount;
|
||||
- dashLen = shape->strokeDashArray[idash] * scale;
|
||||
+ dashLen = shape->strokeDashArray[idash] * sw;
|
||||
// Restart
|
||||
cur.x = x;
|
||||
cur.y = y;
|
||||
@@ -987,7 +1003,7 @@ static inline int nsvg__div255(int x)
|
||||
}
|
||||
|
||||
static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* cover, int x, int y,
|
||||
- float tx, float ty, float scale, NSVGcachedPaint* cache)
|
||||
+ float tx, float ty, float sx, float sy, NSVGcachedPaint* cache)
|
||||
{
|
||||
|
||||
if (cache->type == NSVG_PAINT_COLOR) {
|
||||
@@ -1028,9 +1044,9 @@ static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* co
|
||||
int i, cr, cg, cb, ca;
|
||||
unsigned int c;
|
||||
|
||||
- fx = ((float)x - tx) / scale;
|
||||
- fy = ((float)y - ty) / scale;
|
||||
- dx = 1.0f / scale;
|
||||
+ fx = ((float)x - tx) / sx;
|
||||
+ fy = ((float)y - ty) / sy;
|
||||
+ dx = 1.0f / sx;
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
int r,g,b,a,ia;
|
||||
@@ -1073,9 +1089,9 @@ static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* co
|
||||
int i, cr, cg, cb, ca;
|
||||
unsigned int c;
|
||||
|
||||
- fx = ((float)x - tx) / scale;
|
||||
- fy = ((float)y - ty) / scale;
|
||||
- dx = 1.0f / scale;
|
||||
+ fx = ((float)x - tx) / sx;
|
||||
+ fy = ((float)y - ty) / sy;
|
||||
+ dx = 1.0f / sx;
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
int r,g,b,a,ia;
|
||||
@@ -1114,7 +1130,7 @@ static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* co
|
||||
}
|
||||
}
|
||||
|
||||
-static void nsvg__rasterizeSortedEdges(NSVGrasterizer *r, float tx, float ty, float scale, NSVGcachedPaint* cache, char fillRule)
|
||||
+static void nsvg__rasterizeSortedEdges(NSVGrasterizer *r, float tx, float ty, float sx, float sy, NSVGcachedPaint* cache, char fillRule)
|
||||
{
|
||||
NSVGactiveEdge *active = NULL;
|
||||
int y, s;
|
||||
@@ -1196,7 +1212,7 @@ static void nsvg__rasterizeSortedEdges(NSVGrasterizer *r, float tx, float ty, fl
|
||||
if (xmin < 0) xmin = 0;
|
||||
if (xmax > r->width-1) xmax = r->width-1;
|
||||
if (xmin <= xmax) {
|
||||
- nsvg__scanlineSolid(&r->bitmap[y * r->stride] + xmin*4, xmax-xmin+1, &r->scanline[xmin], xmin, y, tx,ty, scale, cache);
|
||||
+ nsvg__scanlineSolid(&r->bitmap[y * r->stride] + xmin*4, xmax-xmin+1, &r->scanline[xmin], xmin, y, tx,ty, sx, sy, cache);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1364,8 +1380,9 @@ static void dumpEdges(NSVGrasterizer* r, const char* name)
|
||||
}
|
||||
*/
|
||||
|
||||
-void nsvgRasterize(NSVGrasterizer* r,
|
||||
- NSVGimage* image, float tx, float ty, float scale,
|
||||
+void nsvgRasterizeXY(NSVGrasterizer* r,
|
||||
+ NSVGimage* image, float tx, float ty,
|
||||
+ float sx, float sy,
|
||||
unsigned char* dst, int w, int h, int stride)
|
||||
{
|
||||
NSVGshape *shape = NULL;
|
||||
@@ -1396,7 +1413,7 @@ void nsvgRasterize(NSVGrasterizer* r,
|
||||
r->freelist = NULL;
|
||||
r->nedges = 0;
|
||||
|
||||
- nsvg__flattenShape(r, shape, scale);
|
||||
+ nsvg__flattenShape(r, shape, sx, sy);
|
||||
|
||||
// Scale and translate edges
|
||||
for (i = 0; i < r->nedges; i++) {
|
||||
@@ -1414,14 +1431,14 @@ void nsvgRasterize(NSVGrasterizer* r,
|
||||
// now, traverse the scanlines and find the intersections on each scanline, use non-zero rule
|
||||
nsvg__initPaint(&cache, &shape->fill, shape->opacity);
|
||||
|
||||
- nsvg__rasterizeSortedEdges(r, tx,ty,scale, &cache, shape->fillRule);
|
||||
+ nsvg__rasterizeSortedEdges(r, tx,ty, sx, sy, &cache, shape->fillRule);
|
||||
}
|
||||
- if (shape->stroke.type != NSVG_PAINT_NONE && (shape->strokeWidth * scale) > 0.01f) {
|
||||
+ if (shape->stroke.type != NSVG_PAINT_NONE && (shape->strokeWidth * sx) > 0.01f) {
|
||||
nsvg__resetPool(r);
|
||||
r->freelist = NULL;
|
||||
r->nedges = 0;
|
||||
|
||||
- nsvg__flattenShapeStroke(r, shape, scale);
|
||||
+ nsvg__flattenShapeStroke(r, shape, sx, sy);
|
||||
|
||||
// dumpEdges(r, "edge.svg");
|
||||
|
||||
@@ -1441,7 +1458,7 @@ void nsvgRasterize(NSVGrasterizer* r,
|
||||
// now, traverse the scanlines and find the intersections on each scanline, use non-zero rule
|
||||
nsvg__initPaint(&cache, &shape->stroke, shape->opacity);
|
||||
|
||||
- nsvg__rasterizeSortedEdges(r, tx,ty,scale, &cache, NSVG_FILLRULE_NONZERO);
|
||||
+ nsvg__rasterizeSortedEdges(r, tx,ty,sx, sy, &cache, NSVG_FILLRULE_NONZERO);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1453,6 +1470,13 @@ void nsvgRasterize(NSVGrasterizer* r,
|
||||
r->stride = 0;
|
||||
}
|
||||
|
||||
+void nsvgRasterize(NSVGrasterizer* r,
|
||||
+ NSVGimage* image, float tx, float ty, float scale,
|
||||
+ unsigned char* dst, int w, int h, int stride)
|
||||
+{
|
||||
+ nsvgRasterizeXY(r,image, tx, ty, scale, scale, dst, w, h, stride);
|
||||
+}
|
||||
+
|
||||
#endif // NANOSVGRAST_IMPLEMENTATION
|
||||
|
||||
#endif // NANOSVGRAST_H
|
|
@ -0,0 +1,16 @@
|
|||
Author: Danny Milosavljevic <dannym@scratchpost.org>
|
||||
Date: 2023-09-20
|
||||
|
||||
diff -ru openjdk-21/make/modules/jdk.internal.le/Lib.gmk.orig openjdk-21.drv-4/source/make/modules/jdk.internal.le/Lib.gmk
|
||||
--- openjdk-21/make/modules/jdk.internal.le/Lib.gmk.orig 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ openjdk-21/make/modules/jdk.internal.le/Lib.gmk 2023-09-20 21:42:04.626821839 +0200
|
||||
@@ -34,7 +34,8 @@
|
||||
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CXXFLAGS_JDKLIB), \
|
||||
- LDFLAGS := $(LDFLAGS_JDKLIB), \
|
||||
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LIBS_unix := $(JDKLIB_LIBS) $(LIBCXX), \
|
||||
LIBS_windows := $(JDKLIB_LIBS) user32.lib, \
|
||||
))
|
|
@ -0,0 +1,27 @@
|
|||
Disable local CMake build code for bundled 3rdparty components.
|
||||
|
||||
diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt
|
||||
index 0476170e075..90abea00e8c 100644
|
||||
--- a/tensorflow/lite/CMakeLists.txt
|
||||
+++ b/tensorflow/lite/CMakeLists.txt
|
||||
@@ -564,7 +564,7 @@ set(_ALL_TFLITE_HDRS ${_ALL_TFLITE_SRCS})
|
||||
list(FILTER _ALL_TFLITE_HDRS INCLUDE REGEX ".*\\.h$")
|
||||
target_include_directories(tensorflow-lite
|
||||
PUBLIC $<BUILD_INTERFACE:${TENSORFLOW_SOURCE_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
- ${CMAKE_BINARY_DIR}/gemmlowp
|
||||
+ ${gemmlowp_ROOT}/include/gemmlowp
|
||||
)
|
||||
target_link_libraries(tensorflow-lite
|
||||
PUBLIC
|
||||
diff --git a/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake b/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake
|
||||
index 70331ad0a69..a9bd8a0f3bd 100644
|
||||
--- a/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake
|
||||
+++ b/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake
|
||||
@@ -18,7 +18,6 @@
|
||||
include(gemmlowp)
|
||||
if(gemmlowp_POPULATED)
|
||||
set(GEMMLOWP_FOUND TRUE)
|
||||
- get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp INTERFACE_DIRECTORIES)
|
||||
set(GEMMLOWP_LIBRARIES
|
||||
gemmlowp
|
||||
gemmlowp_fixedpoint
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue