Merge remote-tracking branch 'origin/master' into core-updates
This commit is contained in:
Andreas Enge
commit
ccb62d8feb
341 changed files with 302900 additions and 224714 deletions
|
|
@ -43,7 +43,7 @@
|
|||
;; Hence the following "when", which might otherwise be unnecessary;
|
||||
;; it prevents causing an error when root-dir-unexpanded is nil.
|
||||
(when root-dir-unexpanded
|
||||
(let* ((root-dir (expand-file-name root-dir-unexpanded))
|
||||
(let* ((root-dir (file-local-name (expand-file-name root-dir-unexpanded)))
|
||||
;; Workaround for bug https://issues.guix.gnu.org/43818.
|
||||
(root-dir* (directory-file-name root-dir)))
|
||||
|
||||
|
|
@ -97,8 +97,6 @@
|
|||
(eval . (put 'origin 'scheme-indent-function 0))
|
||||
(eval . (put 'build-system 'scheme-indent-function 0))
|
||||
(eval . (put 'bag 'scheme-indent-function 0))
|
||||
(eval . (put 'computed-file 'scheme-indent-function 1))
|
||||
(eval . (put 'gexp->derivation 'scheme-indent-function 1))
|
||||
(eval . (put 'graft 'scheme-indent-function 0))
|
||||
(eval . (put 'operating-system 'scheme-indent-function 0))
|
||||
(eval . (put 'file-system 'scheme-indent-function 0))
|
||||
|
|
|
|||
|
|
@ -405,6 +405,10 @@ AUX_FILES = \
|
|||
gnu/packages/aux-files/chromium/master-preferences.json \
|
||||
gnu/packages/aux-files/emacs/guix-emacs.el \
|
||||
gnu/packages/aux-files/guix.vim \
|
||||
gnu/packages/aux-files/linux-libre/6.2-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/6.2-arm64.conf \
|
||||
gnu/packages/aux-files/linux-libre/6.2-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/6.2-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/6.1-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/6.1-arm64.conf \
|
||||
gnu/packages/aux-files/linux-libre/6.1-i686.conf \
|
||||
|
|
|
|||
|
|
@ -1170,6 +1170,16 @@ Please write commit logs in the ChangeLog format (@pxref{Change Logs,,,
|
|||
standards, GNU Coding Standards}); you can check the commit history for
|
||||
examples.
|
||||
|
||||
You can help make the review process more efficient, and increase the
|
||||
chance that your patch will be reviewed quickly, by describing the
|
||||
context of your patch and the impact you expect it to have. For
|
||||
example, if your patch is fixing something that is broken, describe the
|
||||
problem and how your patch fixes it. Tell us how you have tested your
|
||||
patch. Will users of the code changed by your patch have to adjust
|
||||
their workflow at all? If so, tell us how. In general, try to imagine
|
||||
what questions a reviewer will ask, and answer those questions in
|
||||
advance.
|
||||
|
||||
Before submitting a patch that adds or modifies a package definition,
|
||||
please run through this check list:
|
||||
|
||||
|
|
@ -1478,7 +1488,7 @@ Due to an apparent bug in @command{git send-email},
|
|||
@end quotation
|
||||
|
||||
You can find out @var{ISSUE_NUMBER} either by searching on the mumi
|
||||
interface at @url{issues.guix.gnu.org} for the name of your patch or
|
||||
interface at @url{https://issues.guix.gnu.org} for the name of your patch or
|
||||
reading the acknowledgement email sent automatically by Debbugs in
|
||||
reply to incoming bugs and patches, which contains the bug number.
|
||||
|
||||
|
|
|
|||
1773
doc/guix.texi
1773
doc/guix.texi
File diff suppressed because it is too large
Load diff
16
etc/news.scm
16
etc/news.scm
|
|
@ -26,6 +26,22 @@
|
|||
(channel-news
|
||||
(version 0)
|
||||
|
||||
(entry (commit "0e18c5e5bcb9204c278cfc75493d3b02b746d5c3")
|
||||
(title
|
||||
(en "Linux-libre kernel updated to 6.2")
|
||||
(de "Linux-libre-Kernel wird auf 6.2 aktualisiert")
|
||||
(fr "Le noyau linux-libre est mis à jour vers la 6.2")
|
||||
(pt "Kernel linux-libre atualizado para 6.2"))
|
||||
(body
|
||||
(en "The default version of the linux-libre kernel has been updated to
|
||||
the 6.2 release series.")
|
||||
(de "Der standardmäßig verwendete @code{linux-libre}-Kernel basiert
|
||||
jetzt auf der 6.2-Versionsreihe.")
|
||||
(fr "La version par défaut du noyau linux-libre est mise à jour
|
||||
vers la série des 6.2.")
|
||||
(pt "A versão padrão do kernel linux-libre foi atualizada para a
|
||||
série do kernel 6.2.")))
|
||||
|
||||
(entry (commit "598f4c509bbfec2b983a8ee246cce0a0fe45ec7f")
|
||||
(title
|
||||
(de "Neues Format @samp{rpm} für den Befehl @command{guix pack}")
|
||||
|
|
|
|||
|
|
@ -56,12 +56,12 @@ scheme-mode
|
|||
(git-reference...
|
||||
"(git-reference"
|
||||
n> "(url \"" p "\")"
|
||||
n> "(commit \"" p "\"))")
|
||||
n> "(commit " (p "commit") "))")
|
||||
|
||||
(svn-reference...
|
||||
"(svn-reference"
|
||||
n> "(url \"" p "\")"
|
||||
n> "(revision \"" p "\"))")
|
||||
n> "(revision " (p "revision") "))")
|
||||
|
||||
(cvs-reference...
|
||||
"(cvs-reference"
|
||||
|
|
@ -72,12 +72,12 @@ scheme-mode
|
|||
(hg-reference...
|
||||
"(hg-reference"
|
||||
n> "(url \"" p "\")"
|
||||
n> "(changeset \"" p "\"))")
|
||||
n> "(changeset " (p "changeset") "))")
|
||||
|
||||
(bzr-reference...
|
||||
"(bzr-reference"
|
||||
n> "(url \"" p "\")"
|
||||
n> "(revision \"" p "\"))")
|
||||
n> "(revision " (p "revision") "))")
|
||||
|
||||
(:phases\ "#:phases (modify-phases %standard-phases"
|
||||
n> p ")")
|
||||
|
|
|
|||
|
|
@ -436,6 +436,18 @@ importer."
|
|||
"Reproducible Builds tooling and issues that affect any guix packages."
|
||||
#:scope (list "gnu/packages/diffoscope.scm")))
|
||||
|
||||
(define-team xfce
|
||||
(team 'xfce
|
||||
#:name "Xfce team"
|
||||
#:description "Xfce desktop environment."
|
||||
#:scope (list "gnu/packages/xfce.scm")))
|
||||
|
||||
(define-team lxqt
|
||||
(team 'lxqt
|
||||
#:name "LXQt team"
|
||||
#:description "LXQt desktop environment."
|
||||
#:scope (list "gnu/packages/lxqt.scm")))
|
||||
|
||||
|
||||
(define-member (person "Eric Bavier"
|
||||
"bavier@posteo.net")
|
||||
|
|
@ -535,7 +547,7 @@ importer."
|
|||
|
||||
(define-member (person "宋文武"
|
||||
"iyzsong@envs.net")
|
||||
games localization)
|
||||
games localization lxqt xfce)
|
||||
|
||||
(define-member (person "Vagrant Cascadian"
|
||||
"vagrant@reproducible-builds.org")
|
||||
|
|
|
|||
|
|
@ -1123,6 +1123,7 @@ an exception in such cases but perform the nearest sane action."
|
|||
"Return the number suitable for the 'flags' argument of 'mount' that
|
||||
corresponds to the symbols listed in FLAGS."
|
||||
(let loop ((flags flags))
|
||||
;; Note: Keep in sync with ‘invalid-file-system-flags’.
|
||||
(match flags
|
||||
(('read-only rest ...)
|
||||
(logior MS_RDONLY (loop rest)))
|
||||
|
|
|
|||
17
gnu/home.scm
17
gnu/home.scm
|
|
@ -35,6 +35,7 @@
|
|||
this-home-environment
|
||||
|
||||
home-environment-derivation
|
||||
home-environment-packages
|
||||
home-environment-user-services
|
||||
home-environment-essential-services
|
||||
home-environment-services
|
||||
|
|
@ -102,7 +103,21 @@
|
|||
#:target-type home-service-type)))
|
||||
(service-value home)))
|
||||
|
||||
(define* (home-environment-with-provenance he config-file)
|
||||
|
||||
(define (home-environment-configuration-file he)
|
||||
"Return the configuration file of HE, based on its 'location' field, or #f
|
||||
if it could not be determined."
|
||||
(let ((file (and=> (home-environment-location he)
|
||||
location-file)))
|
||||
(and file
|
||||
(or (and (string-prefix? "/" file) file)
|
||||
(search-path %load-path file)))))
|
||||
|
||||
(define* (home-environment-with-provenance he
|
||||
#:optional
|
||||
(config-file
|
||||
(home-environment-configuration-file
|
||||
he)))
|
||||
"Return a variant of HE that stores its own provenance information,
|
||||
including CONFIG-FILE, if available. This is achieved by adding an instance
|
||||
of HOME-PROVENANCE-SERVICE-TYPE to its services."
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2022 ( <paren@disroot.org>
|
||||
;;; Copyright © 2023 conses <contact@conses.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -22,7 +23,8 @@
|
|||
#:use-module (gnu home services shepherd)
|
||||
#:use-module (gnu services configuration)
|
||||
#:autoload (gnu packages glib) (dbus)
|
||||
#:autoload (gnu packages xdisorg) (redshift)
|
||||
#:autoload (gnu packages xdisorg) (redshift unclutter)
|
||||
#:autoload (gnu packages xorg) (setxkbmap xmodmap)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (srfi srfi-1)
|
||||
|
|
@ -32,7 +34,10 @@
|
|||
home-redshift-service-type
|
||||
|
||||
home-dbus-configuration
|
||||
home-dbus-service-type))
|
||||
home-dbus-service-type
|
||||
|
||||
home-unclutter-configuration
|
||||
home-unclutter-service-type))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
@ -226,3 +231,104 @@ according to time of day.")))
|
|||
(default-value (home-dbus-configuration))
|
||||
(description
|
||||
"Run the session-specific D-Bus inter-process message bus.")))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Unclutter.
|
||||
;;;
|
||||
|
||||
(define-configuration/no-serialization home-unclutter-configuration
|
||||
(unclutter
|
||||
(file-like unclutter)
|
||||
"The @code{unclutter} package to use.")
|
||||
(idle-timeout
|
||||
(integer 5)
|
||||
"Timeout in seconds after which to hide the cursor."))
|
||||
|
||||
(define (home-unclutter-shepherd-service config)
|
||||
(list
|
||||
(shepherd-service
|
||||
(provision '(unclutter))
|
||||
(requirement '())
|
||||
(one-shot? #t)
|
||||
(start #~(make-forkexec-constructor
|
||||
(list
|
||||
#$(file-append
|
||||
(home-unclutter-configuration-unclutter config)
|
||||
"/bin/unclutter")
|
||||
"-idle"
|
||||
(number->string
|
||||
#$(home-unclutter-configuration-idle-timeout config)))
|
||||
#:log-file (string-append
|
||||
(or (getenv "XDG_LOG_HOME")
|
||||
(format #f "~a/.local/var/log"
|
||||
(getenv "HOME")))
|
||||
"/unclutter.log"))))))
|
||||
|
||||
(define home-unclutter-service-type
|
||||
(service-type
|
||||
(name 'home-unclutter)
|
||||
(extensions
|
||||
(list
|
||||
(service-extension home-shepherd-service-type
|
||||
home-unclutter-shepherd-service)))
|
||||
(default-value (home-unclutter-configuration))
|
||||
(description "Run the @code{unclutter} daemon, which, on systems using the
|
||||
Xorg graphical display server, automatically hides the cursor after a
|
||||
user-defined timeout has expired.")))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Xmodmap.
|
||||
;;;
|
||||
|
||||
(define-configuration/no-serialization home-xmodmap-configuration
|
||||
(xmodmap
|
||||
(file-like xmodmap)
|
||||
"The @code{xmodmap} package to use.")
|
||||
(key-map
|
||||
(list '())
|
||||
"List of expressions to be read by @code{xmodmap} on service startup."))
|
||||
|
||||
(define (serialize-xmodmap-configuration field-name val)
|
||||
(define serialize-field
|
||||
(match-lambda
|
||||
((key . value)
|
||||
(format #f "~a = ~a" key value))
|
||||
(e e)))
|
||||
|
||||
#~(string-append
|
||||
#$@(interpose (map serialize-field val) "\n" 'suffix)))
|
||||
|
||||
(define (xmodmap-shepherd-service config)
|
||||
(define config-file
|
||||
(mixed-text-file
|
||||
"config"
|
||||
(serialize-xmodmap-configuration
|
||||
#f (home-xmodmap-configuration-key-map config))))
|
||||
|
||||
(list
|
||||
(shepherd-service
|
||||
(provision '(xmodmap))
|
||||
(start #~(make-system-constructor
|
||||
(string-join
|
||||
(list #$(file-append
|
||||
(home-xmodmap-configuration-xmodmap config)
|
||||
"/bin/xmodmap")
|
||||
#$config-file))))
|
||||
(stop #~(make-system-constructor
|
||||
#$(file-append setxkbmap "/bin/setxkbmap")))
|
||||
(documentation "On startup, run @code{xmodmap} and read the expressions in
|
||||
the configuration file. On stop, reset all the mappings back to the
|
||||
defaults."))))
|
||||
|
||||
(define home-xmodmap-service-type
|
||||
(service-type
|
||||
(name 'home-xmodmap)
|
||||
(extensions
|
||||
(list
|
||||
(service-extension home-shepherd-service-type
|
||||
xmodmap-shepherd-service)))
|
||||
(default-value (home-xmodmap-configuration))
|
||||
(description "Run the @code{xmodmap} utility to modify keymaps and pointer
|
||||
buttons under the Xorg display server via user-defined expressions.")))
|
||||
|
|
|
|||
68
gnu/home/services/media.scm
Normal file
68
gnu/home/services/media.scm
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu home services media)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (gnu home services)
|
||||
#:use-module (gnu home services shepherd)
|
||||
#:use-module (gnu packages kodi)
|
||||
#:use-module (gnu services configuration)
|
||||
#:use-module (gnu services shepherd)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix gexp)
|
||||
#:export (home-kodi-configuration
|
||||
home-kodi-service-type))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Kodi.
|
||||
;;;
|
||||
|
||||
(define-record-type* <home-kodi-configuration>
|
||||
home-kodi-configuration make-home-kodi-configuration
|
||||
home-kodi-configuration?
|
||||
(kodi home-kodi-kodi ;file-like
|
||||
(default kodi))
|
||||
(extra-options home-kodi-extra-options ;list of string
|
||||
(default '())))
|
||||
|
||||
(define (home-kodi-services config)
|
||||
"Return a <shepherd-service> for kodi with CONFIG."
|
||||
(match-record config <home-kodi-configuration>
|
||||
(kodi extra-options)
|
||||
(let* ((kodi (file-append kodi "/bin/kodi"))
|
||||
(command #~'(#$kodi "-fs" #$@extra-options))
|
||||
(log-file #~(string-append %user-log-dir "/kodi.log")))
|
||||
(list (shepherd-service
|
||||
(documentation "Run the kodi media center.")
|
||||
(provision '(kodi))
|
||||
(modules '((shepherd support))) ;for '%user-log-dir'
|
||||
(start #~(make-forkexec-constructor #$command
|
||||
#:log-file #$log-file))
|
||||
(stop #~(make-kill-destructor)))))))
|
||||
|
||||
(define home-kodi-service-type
|
||||
(service-type
|
||||
(name 'home-kodi)
|
||||
(default-value (home-kodi-configuration))
|
||||
(extensions
|
||||
(list (service-extension home-shepherd-service-type
|
||||
home-kodi-services)))
|
||||
(description
|
||||
"Install and configure the Kodi media center so that it runs as a Shepherd
|
||||
service.")))
|
||||
66
gnu/home/services/messaging.scm
Normal file
66
gnu/home/services/messaging.scm
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu home services messaging)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (gnu home services)
|
||||
#:use-module (gnu home services shepherd)
|
||||
#:use-module (gnu packages messaging)
|
||||
#:use-module (gnu services configuration)
|
||||
#:use-module (gnu services shepherd)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix gexp)
|
||||
#:export (home-znc-configuration
|
||||
home-znc-service-type))
|
||||
|
||||
;;;
|
||||
;;; Znc.
|
||||
;;;
|
||||
(define-record-type* <home-znc-configuration>
|
||||
home-znc-configuration make-home-znc-configuration
|
||||
home-znc-configuration?
|
||||
(znc home-znc-znc ;string
|
||||
(default znc))
|
||||
(extra-options home-znc-extra-options ;list of string
|
||||
(default '())))
|
||||
|
||||
(define (home-znc-services config)
|
||||
"Return a <shepherd-service> for znc with CONFIG."
|
||||
(match-record config <home-znc-configuration>
|
||||
(znc extra-options)
|
||||
(let* ((znc (file-append znc "/bin/znc"))
|
||||
(command #~'(#$znc "--foreground" #$@extra-options))
|
||||
(log-file #~(string-append %user-log-dir "/znc.log")))
|
||||
(list (shepherd-service
|
||||
(documentation "Run the znc IRC bouncer.")
|
||||
(provision '(znc))
|
||||
(modules '((shepherd support))) ;for '%user-log-dir'
|
||||
(start #~(make-forkexec-constructor #$command
|
||||
#:log-file #$log-file))
|
||||
(stop #~(make-kill-destructor)))))))
|
||||
|
||||
(define home-znc-service-type
|
||||
(service-type
|
||||
(name 'home-znc)
|
||||
(default-value (home-znc-configuration))
|
||||
(extensions
|
||||
(list (service-extension home-shepherd-service-type
|
||||
home-znc-services)))
|
||||
(description
|
||||
"Install and configure @command{znc}, an @acronym{IRC, Internet Relay
|
||||
Chat} bouncer, as a Shepherd service.")))
|
||||
151
gnu/home/services/sound.scm
Normal file
151
gnu/home/services/sound.scm
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu home services sound)
|
||||
#:use-module (gnu home services)
|
||||
#:use-module (gnu home services shepherd)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (ice-9 match)
|
||||
#:export (home-pulseaudio-rtp-sink-service-type
|
||||
home-pulseaudio-rtp-source-service-type
|
||||
%pulseaudio-rtp-multicast-address))
|
||||
|
||||
|
||||
;;;
|
||||
;;; PulseAudio support.
|
||||
;;;
|
||||
|
||||
(define (with-pulseaudio-connection sock exp)
|
||||
;; Wrap EXP in an expression where SOCK is bound to a socket connected to
|
||||
;; the user's PulseAudio command-line interface socket.
|
||||
#~(let* ((#$sock (socket AF_UNIX SOCK_STREAM 0))
|
||||
(pulse-user-file
|
||||
(lambda (name)
|
||||
(string-append "/run/user/" (number->string (getuid))
|
||||
"/pulse/" name)))
|
||||
(file (pulse-user-file "cli")))
|
||||
(let loop ((tries 0))
|
||||
(catch #t
|
||||
(lambda ()
|
||||
(connect #$sock AF_UNIX file)
|
||||
(let ((result #$exp))
|
||||
(close-port #$sock)
|
||||
result))
|
||||
(lambda (key . args)
|
||||
(if (and (eq? key 'system-error)
|
||||
(= ENOENT (system-error-errno (cons key args)))
|
||||
(< tries 3))
|
||||
;; The CLI socket doesn't exist yet, so send pulseaudio
|
||||
;; SIGUSR2 so that it creates it and listens to it.
|
||||
(let ((pid (call-with-input-file (pulse-user-file "pid")
|
||||
read)))
|
||||
(when (and (integer? pid) (> pid 1))
|
||||
(kill pid SIGUSR2))
|
||||
((@ (fibers) sleep) 1)
|
||||
(loop (+ tries 1)))
|
||||
(begin
|
||||
(close-port #$sock)
|
||||
(apply throw key args))))))))
|
||||
|
||||
(define %pulseaudio-rtp-multicast-address
|
||||
;; Default address used by 'module-rtp-sink' and 'module-rtp-recv'. This is
|
||||
;; a multicast address, for the Session Announcement Protocol (SAP) and the
|
||||
;; Session Description Protocol (SDP).
|
||||
"224.0.0.56")
|
||||
|
||||
(define (pulseaudio-rtp-sink-shepherd-services destination-ip)
|
||||
(list (shepherd-service
|
||||
(provision '(pulseaudio-rtp-sink))
|
||||
(start
|
||||
#~(lambda* (#:optional (destination-ip #$destination-ip))
|
||||
#$(with-pulseaudio-connection
|
||||
#~sock
|
||||
#~(begin
|
||||
(display "\
|
||||
load-module module-null-sink \
|
||||
sink_name=rtp sink_properties=\"device.description='RTP network output'\"\n"
|
||||
sock)
|
||||
(display (string-append "\
|
||||
load-module module-rtp-send source=rtp.monitor"
|
||||
(if destination-ip
|
||||
(string-append
|
||||
" destination_ip="
|
||||
destination-ip)
|
||||
"")
|
||||
"\n")
|
||||
sock)
|
||||
#t))))
|
||||
(stop
|
||||
#~(lambda (_)
|
||||
#$(with-pulseaudio-connection
|
||||
#~sock
|
||||
#~(begin
|
||||
(display "unload-module module-rtp-send\n"
|
||||
sock)
|
||||
(display "unload-module module-null-sink\n"
|
||||
sock)
|
||||
#f))))
|
||||
(auto-start? #f))))
|
||||
|
||||
(define home-pulseaudio-rtp-sink-service-type
|
||||
(service-type
|
||||
(name 'pulseaudio-rtp-sink)
|
||||
(extensions
|
||||
(list (service-extension home-shepherd-service-type
|
||||
pulseaudio-rtp-sink-shepherd-services)))
|
||||
(description
|
||||
"Define a PulseAudio sink to broadcast audio output over RTP, which can
|
||||
then by played by another PulseAudio instance.")
|
||||
|
||||
;; By default, send to the SAP multicast address, 224.0.0.56, which can be
|
||||
;; network-intensive.
|
||||
(default-value %pulseaudio-rtp-multicast-address)))
|
||||
|
||||
(define (pulseaudio-rtp-source-shepherd-services source-ip)
|
||||
(list (shepherd-service
|
||||
(provision '(pulseaudio-rtp-source))
|
||||
(start
|
||||
#~(lambda* (#:optional (source-ip #$source-ip))
|
||||
#$(with-pulseaudio-connection
|
||||
#~sock
|
||||
#~(begin
|
||||
(format sock "\
|
||||
load-module module-rtp-recv sap_address=~a\n" source-ip)
|
||||
#t))))
|
||||
(stop
|
||||
#~(lambda (_)
|
||||
#$(with-pulseaudio-connection
|
||||
#~sock
|
||||
#~(begin
|
||||
(display "unload-module module-rtp-recv\n"
|
||||
sock)
|
||||
#f))))
|
||||
(auto-start? #f))))
|
||||
|
||||
(define home-pulseaudio-rtp-source-service-type
|
||||
(service-type
|
||||
(name 'pulseaudio-rtp-source)
|
||||
(extensions
|
||||
(list (service-extension home-shepherd-service-type
|
||||
pulseaudio-rtp-source-shepherd-services)))
|
||||
(description
|
||||
"Define a PulseAudio source to receive audio broadcasted over RTP by
|
||||
another PulseAudio instance.")
|
||||
(default-value %pulseaudio-rtp-multicast-address)))
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -25,9 +26,11 @@
|
|||
#:use-module (gnu services configuration)
|
||||
#:use-module (guix modules)
|
||||
#:use-module (gnu home services)
|
||||
#:use-module (gnu home services shepherd)
|
||||
#:use-module ((gnu home services utils)
|
||||
#:select (object->camel-case-string))
|
||||
#:autoload (gnu packages base) (glibc-utf8-locales)
|
||||
#:use-module (gnu packages ssh)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-34)
|
||||
#:use-module (srfi srfi-35)
|
||||
|
|
@ -36,6 +39,7 @@
|
|||
home-openssh-configuration-authorized-keys
|
||||
home-openssh-configuration-known-hosts
|
||||
home-openssh-configuration-hosts
|
||||
home-ssh-agent-configuration
|
||||
|
||||
openssh-host
|
||||
openssh-host-host-name
|
||||
|
|
@ -52,7 +56,8 @@
|
|||
openssh-host-accepted-key-types
|
||||
openssh-host-extra-content
|
||||
|
||||
home-openssh-service-type))
|
||||
home-openssh-service-type
|
||||
home-ssh-agent-service-type))
|
||||
|
||||
(define (serialize-field-name name)
|
||||
(match name
|
||||
|
|
@ -254,3 +259,54 @@ inserted after each of them."
|
|||
by providing a @file{~/.ssh/config} file, which is honored by the OpenSSH
|
||||
client,@command{ssh}, and by other tools such as @command{guix deploy}.")
|
||||
(default-value (home-openssh-configuration))))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Ssh-agent.
|
||||
;;;
|
||||
(define-record-type* <home-ssh-agent-configuration>
|
||||
home-ssh-agent-configuration make-home-ssh-agent-configuration
|
||||
home-ssh-agent-configuration?
|
||||
(openssh home-ssh-agent-openssh ;file-like
|
||||
(default openssh))
|
||||
(socket-directory home-ssh-agent-socket-directory ;string
|
||||
(default #~(string-append %user-runtime-dir "/ssh-agent")))
|
||||
(extra-options home-ssh-agent-extra-options ;list of string
|
||||
(default '())))
|
||||
|
||||
(define (home-ssh-agent-services config)
|
||||
"Return a <shepherd-service> for an ssh-agent with CONFIG."
|
||||
(match-record config <home-ssh-agent-configuration>
|
||||
(openssh socket-directory extra-options)
|
||||
(let* ((ssh-agent (file-append openssh "/bin/ssh-agent"))
|
||||
(socket-file #~(string-append #$socket-directory "/socket"))
|
||||
(command #~`(#$ssh-agent
|
||||
"-D" "-a" ,#$socket-file
|
||||
#$@extra-options))
|
||||
(log-file #~(string-append %user-log-dir "/ssh-agent.log")))
|
||||
(list (shepherd-service
|
||||
(documentation "Run the ssh-agent.")
|
||||
(provision '(ssh-agent))
|
||||
(modules '((shepherd support))) ;for '%user-runtime-dir', etc.
|
||||
(start #~(lambda _
|
||||
(unless (file-exists? #$socket-directory)
|
||||
(mkdir-p #$socket-directory)
|
||||
(chmod #$socket-directory #o700))
|
||||
(fork+exec-command #$command #:log-file #$log-file)))
|
||||
(stop #~(make-kill-destructor)))))))
|
||||
|
||||
(define (home-ssh-agent-environment-variables config)
|
||||
'(("SSH_AUTH_SOCK"
|
||||
. "${SSH_AUTH_SOCK-${XDG_RUNTIME_DIR-$HOME/.cache}/ssh-agent/socket}")))
|
||||
|
||||
(define home-ssh-agent-service-type
|
||||
(service-type
|
||||
(name 'home-ssh-agent)
|
||||
(default-value (home-ssh-agent-configuration))
|
||||
(extensions
|
||||
(list (service-extension home-shepherd-service-type
|
||||
home-ssh-agent-services)
|
||||
(service-extension home-environment-variables-service-type
|
||||
home-ssh-agent-environment-variables)))
|
||||
(description
|
||||
"Install and configure @command{ssh-agent} as a Shepherd service.")))
|
||||
|
|
|
|||
36
gnu/local.mk
36
gnu/local.mk
|
|
@ -1,6 +1,6 @@
|
|||
# GNU Guix --- Functional package management for GNU
|
||||
# Copyright © 2012-2021, 2021-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023 Andreas Enge <andreas@enge.fr>
|
||||
# Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022 Andreas Enge <andreas@enge.fr>
|
||||
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw@netris.org>
|
||||
# Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
|
||||
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
|
|
@ -56,6 +56,7 @@
|
|||
# Copyright © 2022 Alex Griffin <a@ajgrf.com>
|
||||
# Copyright © 2022 ( <paren@disroot.org>
|
||||
# Copyright © 2022 jgart <jgart@dismail.de>
|
||||
# Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
#
|
||||
# This file is part of GNU Guix.
|
||||
#
|
||||
|
|
@ -91,9 +92,12 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/home/services/symlink-manager.scm \
|
||||
%D%/home/services/fontutils.scm \
|
||||
%D%/home/services/guix.scm \
|
||||
%D%/home/services/media.scm \
|
||||
%D%/home/services/messaging.scm \
|
||||
%D%/home/services/pm.scm \
|
||||
%D%/home/services/shells.scm \
|
||||
%D%/home/services/shepherd.scm \
|
||||
%D%/home/services/sound.scm \
|
||||
%D%/home/services/ssh.scm \
|
||||
%D%/home/services/mcron.scm \
|
||||
%D%/home/services/utils.scm \
|
||||
|
|
@ -947,6 +951,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/binutils-mingw-w64-deterministic.patch \
|
||||
%D%/packages/patches/bloomberg-bde-cmake-module-path.patch \
|
||||
%D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \
|
||||
%D%/packages/patches/boolector-find-googletest.patch \
|
||||
%D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
|
||||
%D%/packages/patches/breezy-fix-gio.patch \
|
||||
%D%/packages/patches/byobu-writable-status.patch \
|
||||
|
|
@ -958,6 +963,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/calibre-remove-test-unrar.patch \
|
||||
%D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch \
|
||||
%D%/packages/patches/catdoc-CVE-2017-11110.patch \
|
||||
%D%/packages/patches/ccextractor-add-missing-header.patch \
|
||||
%D%/packages/patches/ccextractor-autoconf-tesseract.patch \
|
||||
%D%/packages/patches/ccextractor-fix-ocr.patch \
|
||||
%D%/packages/patches/chez-scheme-bin-sh.patch \
|
||||
%D%/packages/patches/circos-remove-findbin.patch \
|
||||
%D%/packages/patches/cdparanoia-fpic.patch \
|
||||
|
|
@ -1041,7 +1049,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/dstat-skip-devices-without-io.patch \
|
||||
%D%/packages/patches/dvd+rw-tools-add-include.patch \
|
||||
%D%/packages/patches/dynaconf-unvendor-deps.patch \
|
||||
%D%/packages/patches/efibootmgr-remove-extra-decl.patch \
|
||||
%D%/packages/patches/efivar-211.patch \
|
||||
%D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \
|
||||
%D%/packages/patches/einstein-build.patch \
|
||||
|
|
@ -1057,7 +1064,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/emacs-git-email-missing-parens.patch \
|
||||
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
|
||||
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
|
||||
%D%/packages/patches/emacs-helpful-fix-docstring-test.patch \
|
||||
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
|
||||
%D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \
|
||||
%D%/packages/patches/emacs-native-comp-driver-options.patch \
|
||||
|
|
@ -1077,6 +1083,7 @@ 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 \
|
||||
|
|
@ -1112,6 +1119,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/flashrom-fix-building-on-aarch64.patch \
|
||||
%D%/packages/patches/flatpak-fix-path.patch \
|
||||
%D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \
|
||||
%D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch \
|
||||
%D%/packages/patches/fontconfig-cache-ignore-mtime.patch \
|
||||
%D%/packages/patches/foobillard++-pkg-config.patch \
|
||||
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
|
||||
|
|
@ -1338,7 +1346,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
|
||||
%D%/packages/patches/intltool-perl-compatibility.patch \
|
||||
%D%/packages/patches/iputils-libcap-compat.patch \
|
||||
%D%/packages/patches/ipxe-reproducible-geniso.patch \
|
||||
%D%/packages/patches/irrlicht-use-system-libs.patch \
|
||||
%D%/packages/patches/irrlicht-link-against-needed-libs.patch \
|
||||
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
|
||||
|
|
@ -1555,6 +1562,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
|
||||
%D%/packages/patches/musl-cross-locale.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/nautilus-extension-search-path.patch \
|
||||
%D%/packages/patches/ncompress-fix-softlinks.patch \
|
||||
%D%/packages/patches/ncftp-reproducible.patch \
|
||||
|
|
@ -1598,15 +1606,12 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/onnx-use-system-googletest.patch \
|
||||
%D%/packages/patches/onnx-shared-libraries.patch \
|
||||
%D%/packages/patches/onnx-skip-model-downloads.patch \
|
||||
%D%/packages/patches/openbios-aarch64-riscv64-support.patch \
|
||||
%D%/packages/patches/openboardview-use-system-imgui.patch \
|
||||
%D%/packages/patches/openboardview-use-system-utf8.patch \
|
||||
%D%/packages/patches/openbox-python3.patch \
|
||||
%D%/packages/patches/openfoam-4.1-cleanup.patch \
|
||||
%D%/packages/patches/openjdk-9-hotspot-pointer-comparison.patch \
|
||||
%D%/packages/patches/openjdk-9-hotspot-stack-size.patch \
|
||||
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
|
||||
%D%/packages/patches/openjdk-10-hotspot-pointer-comparison.patch \
|
||||
%D%/packages/patches/openjdk-10-hotspot-stack-size.patch \
|
||||
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
|
||||
%D%/packages/patches/openmpi-mtl-priorities.patch \
|
||||
%D%/packages/patches/openssh-hurd.patch \
|
||||
|
|
@ -1731,6 +1736,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-docopt-pytest6-compat.patch \
|
||||
%D%/packages/patches/python-execnet-read-only-fix.patch \
|
||||
%D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \
|
||||
%D%/packages/patches/python-hiredis-fix-header.patch \
|
||||
%D%/packages/patches/python-hiredis-use-system-hiredis.patch \
|
||||
%D%/packages/patches/python-ipython-documentation-chars.patch \
|
||||
%D%/packages/patches/python-ipython-documentation-repro.patch \
|
||||
%D%/packages/patches/python-keras-integration-test.patch \
|
||||
|
|
@ -1738,6 +1745,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-peachpy-determinism.patch \
|
||||
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
|
||||
%D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch \
|
||||
%D%/packages/patches/python-pillow-CVE-2022-45199.patch \
|
||||
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
|
||||
%D%/packages/patches/python-pyflakes-test-location.patch \
|
||||
%D%/packages/patches/python2-pyopenssl-openssl-compat.patch \
|
||||
|
|
@ -1804,11 +1812,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/racket-zuo-bin-sh.patch \
|
||||
%D%/packages/patches/remake-impure-dirs.patch \
|
||||
%D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \
|
||||
%D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch \
|
||||
%D%/packages/patches/r-mixedpower-r2power.patch \
|
||||
%D%/packages/patches/rnp-add-version.cmake.patch \
|
||||
%D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \
|
||||
%D%/packages/patches/rnp-unbundle-googletest.patch \
|
||||
%D%/packages/patches/rng-tools-revert-build-randstat.patch \
|
||||
%D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \
|
||||
%D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \
|
||||
%D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
|
||||
|
|
@ -1835,6 +1840,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \
|
||||
%D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \
|
||||
%D%/packages/patches/sbcl-clml-fix-types.patch \
|
||||
%D%/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch \
|
||||
%D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \
|
||||
%D%/packages/patches/scalapack-gcc-10-compilation.patch \
|
||||
%D%/packages/patches/scheme48-tests.patch \
|
||||
|
|
@ -1997,8 +2003,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \
|
||||
%D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \
|
||||
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
|
||||
%D%/packages/patches/widelands-add-missing-map-include.patch \
|
||||
%D%/packages/patches/widelands-system-wide_minizip.patch \
|
||||
%D%/packages/patches/wmctrl-64-fix.patch \
|
||||
%D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \
|
||||
%D%/packages/patches/wordnet-CVE-2008-2149.patch \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
|
||||
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
|
|
@ -40,6 +40,7 @@
|
|||
#:use-module (gnu packages ots)
|
||||
#:use-module (gnu packages popt)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages wv)
|
||||
#:use-module (gnu packages xml))
|
||||
|
|
@ -73,7 +74,14 @@
|
|||
"latex " "loadbindings " "mht " "mif " "mswrite " "opendocument "
|
||||
"openwriter " "openxml " "opml " "ots " "paint " "passepartout "
|
||||
"pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
|
||||
"wikipedia " "wml " "xslfo"))
|
||||
"wikipedia " "wml " "xslfo")
|
||||
"--enable-introspection"
|
||||
(string-append "--with-gir-dir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/gir-1.0")
|
||||
(string-append "--with-typelib-dir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/girepository-1.0"))
|
||||
;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen:
|
||||
;; assertion 'GDK_IS_SCREEN (screen)' failed
|
||||
;; GLib-GObject-CRITICAL **: g_object_get_qdata:
|
||||
|
|
@ -84,32 +92,34 @@
|
|||
#:make-flags
|
||||
(list "gtk_update_icon_cache=true")))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("enchant" ,enchant)
|
||||
("fontconfig" ,fontconfig)
|
||||
("fribidi" ,fribidi)
|
||||
("glib" ,glib)
|
||||
("goffice" ,goffice)
|
||||
("gtk+" ,gtk+)
|
||||
("libchamplain" ,libchamplain)
|
||||
("libglade" ,libglade)
|
||||
("libgsf" ,libgsf)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("librsvg" ,librsvg)
|
||||
("libxml2" ,libxml2)
|
||||
("libxslt" ,libxslt)
|
||||
("ots" ,ots)
|
||||
("popt" ,popt)
|
||||
("readline" ,readline)
|
||||
("telepathy" ,telepathy-glib)
|
||||
("wv" ,wv)
|
||||
("zlib" ,zlib)))
|
||||
(list boost
|
||||
enchant
|
||||
fontconfig
|
||||
fribidi
|
||||
glib
|
||||
goffice
|
||||
gtk+
|
||||
libchamplain
|
||||
libglade
|
||||
libgsf
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
(librsvg-for-system)
|
||||
libxml2
|
||||
libxslt
|
||||
ots
|
||||
popt
|
||||
readline
|
||||
telepathy-glib
|
||||
wv
|
||||
zlib))
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
("glib:bin" ,glib "bin")
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(list gobject-introspection
|
||||
intltool
|
||||
`(,glib "bin")
|
||||
libtool
|
||||
pkg-config
|
||||
python-wrapper))
|
||||
(home-page "https://www.abisource.com/")
|
||||
(synopsis "Word processing program")
|
||||
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@
|
|||
;;; Copyright © 2022 jgart <jgart@dismail.de>
|
||||
;;; Copyright © 2023 Juliana Sims <jtsims@protonmail.com>
|
||||
;;; Copyright © 2023 Lu Hui <luhux76@gmail.com>
|
||||
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -4927,14 +4928,14 @@ Netgear devices.")
|
|||
(define-public atop
|
||||
(package
|
||||
(name "atop")
|
||||
(version "2.7.1")
|
||||
(version "2.8.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.atoptool.nl/download/atop-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kjwgf94skbrndv1krlmsrq34smzi3iwk73fbsnyw787gvqx4j6a"))))
|
||||
"07nsw168aw3mhgzkfw2z5pf92f76l1r4b18zjx7l9hvrkfhmh04p"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
@ -5703,7 +5704,7 @@ file or files to several hosts.")
|
|||
(define-public doctl
|
||||
(package
|
||||
(name "doctl")
|
||||
(version "1.92.1")
|
||||
(version "1.93.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -5712,7 +5713,7 @@ file or files to several hosts.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zb7vx7nqg8q9vdgb90cwmrr1cijv8gfryni8yrd99bb9vgg6pyv"))))
|
||||
"18l0avbq1la1wsfwj13kq5prqz6mydhs3ihvf0f3s3vr2y9h71aq"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:import-path "github.com/digitalocean/doctl/cmd/doctl"
|
||||
|
|
|
|||
|
|
@ -1257,7 +1257,7 @@ xtensor provides:
|
|||
(define-public gap
|
||||
(package
|
||||
(name "gap")
|
||||
(version "4.11.1")
|
||||
(version "4.12.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -1267,14 +1267,13 @@ xtensor provides:
|
|||
version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32 "01535s81h254zcs84zi95xqmhvvn6fn9qss8761myxc2gpdcadb6"))
|
||||
(base32 "1a47slldnjq6mib69k3g8lqw6nyxdrwdd3gfjhj252mpbrs0h8v7"))
|
||||
(modules '((guix build utils) (ice-9 ftw) (srfi srfi-1)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete the external gmp and zlib libraries
|
||||
;; and a subdirectory not needed for our build.
|
||||
;; Delete bundled external libraries.
|
||||
(for-each delete-file-recursively
|
||||
'("extern" "hpcgap"))
|
||||
'("extern" "hpcgap/extern"))
|
||||
;; Delete a failing test.
|
||||
;; FIXME: This might be fixed in the next release, see
|
||||
;; https://github.com/gap-system/gap/issues/3292
|
||||
|
|
@ -1288,47 +1287,69 @@ xtensor provides:
|
|||
(scandir ".")
|
||||
'("." ".."
|
||||
;; Necessary packages.
|
||||
"GAPDoc-"
|
||||
"primgrp-"
|
||||
"SmallGrp-" ; artistic2.0
|
||||
"transgrp" ; artistic2.0 for data,
|
||||
; gpl2 or gpl3 for code
|
||||
"gapdoc"
|
||||
"primgrp"
|
||||
"smallgrp" ; artistic2.0
|
||||
"transgrp" ; artistic2.0 for data,
|
||||
; gpl2 or gpl3 for code
|
||||
;; Optional packages.
|
||||
"alnuth-"
|
||||
"AutoDoc-"
|
||||
"automata-"
|
||||
"autpgrp-"
|
||||
"crime-"
|
||||
"crisp-" ; bsd-2
|
||||
"ctbllib" ; gpl3+
|
||||
"4ti2interface"
|
||||
"alnuth"
|
||||
"autodoc"
|
||||
"automata"
|
||||
"autpgrp"
|
||||
"cap"
|
||||
"crime"
|
||||
"crisp" ; bsd-2
|
||||
"ctbllib" ; gpl3+
|
||||
"datastructures"
|
||||
"FactInt-"
|
||||
"examplesforhomalg"
|
||||
"factint"
|
||||
"fga"
|
||||
"format"
|
||||
"groupoids-"
|
||||
"gauss"
|
||||
"gaussforhomalg"
|
||||
"generalizedmorphismsforcap"
|
||||
"gradedmodules"
|
||||
"gradedringforhomalg"
|
||||
"groupoids"
|
||||
"guarana"
|
||||
"idrel-"
|
||||
"images-" ; mpl2.0
|
||||
"IntPic-"
|
||||
"io-" ; gpl3+
|
||||
"irredsol-" ; bsd-2
|
||||
"laguna-"
|
||||
"liering-"
|
||||
"MapClass-"
|
||||
"nilmat-"
|
||||
"NumericalSgps-"
|
||||
"OpenMath-"
|
||||
"orb-" ; gpl3+
|
||||
"polenta-"
|
||||
"polycyclic-"
|
||||
"radiroot-"
|
||||
"repsn-"
|
||||
"resclasses-"
|
||||
"homalg"
|
||||
"homalgtocas"
|
||||
"idrel"
|
||||
"images" ; mpl2.0
|
||||
"intpic"
|
||||
"io" ; gpl3+
|
||||
"ioforhomalg"
|
||||
"irredsol" ; bsd-2
|
||||
"laguna"
|
||||
"liering"
|
||||
"linearalgebraforcap"
|
||||
"localizeringforhomalg"
|
||||
"mapclass"
|
||||
"matricesforhomalg"
|
||||
"modulepresentationsforcap"
|
||||
"modules"
|
||||
"monoidalcategories"
|
||||
"nconvex"
|
||||
"nilmat"
|
||||
"numericalsgps"
|
||||
"openmath"
|
||||
"orb" ; gpl3+
|
||||
"polenta"
|
||||
"polycyclic"
|
||||
"radiroot"
|
||||
"recog" ; gpl3+
|
||||
"repsn"
|
||||
"resclasses"
|
||||
"ringsforhomalg"
|
||||
"sco"
|
||||
"simpcomp"
|
||||
"sophus-"
|
||||
"tomlib-"
|
||||
"unipot-"
|
||||
"utils-"))))))))
|
||||
"sophus"
|
||||
"tomlib"
|
||||
"toolsforhomalg"
|
||||
"unipot"
|
||||
"utils"))))))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list gmp readline zlib))
|
||||
|
|
@ -1351,41 +1372,10 @@ xtensor provides:
|
|||
(lambda _
|
||||
(with-directory-excursion "doc"
|
||||
(invoke "./make_doc"))))
|
||||
(replace 'install
|
||||
(add-after 'install 'install-packages
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(prog (string-append bin "/gap"))
|
||||
(prog-real (string-append bin "/.gap-real"))
|
||||
(share (string-append out "/share/gap")))
|
||||
;; Install only the gap binary; the gac compiler is left
|
||||
;; for maybe later. "Wrap" it in a shell script that calls
|
||||
;; the binary with the correct parameter.
|
||||
;; The make target install-bin is supposed to do that, but
|
||||
;; is not currently working.
|
||||
(mkdir-p bin)
|
||||
(copy-file "gap" prog-real)
|
||||
(call-with-output-file prog
|
||||
(lambda (port)
|
||||
(format port
|
||||
"#!~a~%exec ~a -l ~a \"$@\"~%"
|
||||
(which "bash")
|
||||
prog-real
|
||||
share)))
|
||||
(chmod prog #o755)
|
||||
;; Install the headers and library, which are needed by Sage.
|
||||
(invoke "make" "install-headers")
|
||||
(install-file "gen/config.h"
|
||||
(string-append out "/include/gap"))
|
||||
(invoke "make" "install-libgap")
|
||||
;; Remove information on the build directory from sysinfo.gap.
|
||||
(substitute* "sysinfo.gap"
|
||||
(("GAP_BIN_DIR=\".*\"") "GAP_BIN_DIR=\"\"")
|
||||
(("GAP_LIB_DIR=\".*\"") "GAP_LIB_DIR=\"\"")
|
||||
(("GAP_CPPFLAGS=\".*\"") "GAP_CPPFLAGS=\"\""))
|
||||
(invoke "make" "install-gaproot")
|
||||
;; Copy the directory of compiled packages; the make target
|
||||
;; install-pkg is currently empty.
|
||||
(copy-recursively "pkg" (string-append share "/pkg"))))))))
|
||||
(home-page "https://www.gap-system.org/")
|
||||
(synopsis
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gps)
|
||||
#:use-module (gnu packages graph)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
|
|
@ -210,6 +211,63 @@ moment, supported SPICE files are:
|
|||
@end itemize\n")
|
||||
(license license:cecill)))
|
||||
|
||||
(define-public calcmysky
|
||||
(package
|
||||
(name "calcmysky")
|
||||
(version "0.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/10110111/CalcMySky")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0bib5shy8wzc7j5ph218dl9hqrqip491mn25gakyghbvaqxgm27d"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~(list "-DQT_VERSION=6"
|
||||
"-DCMAKE_CXX_FLAGS=-fPIC")))
|
||||
(inputs
|
||||
(list eigen glm qtbase))
|
||||
(home-page "https://10110111.github.io/CalcMySky/")
|
||||
(synopsis "Simulator of light scattering by planetary atmospheres")
|
||||
(description
|
||||
"CalcMySky is a software package that simulates scattering of light by the
|
||||
atmosphere to render daytime and twilight skies (without stars). Its primary
|
||||
purpose is to enable realistic view of the sky in applications such as
|
||||
planetaria. Secondary objective is to make it possible to explore atmospheric
|
||||
effects such as glories, fogbows etc., as well as simulate unusual environments
|
||||
such as on Mars or an exoplanet orbiting a star with a non-solar spectrum of
|
||||
radiation.
|
||||
|
||||
This package consists of three parts:
|
||||
|
||||
@itemize
|
||||
@item @code{calcmysky} utility that does the precomputation of the atmosphere
|
||||
model to enable rendering.
|
||||
|
||||
@item @code{libShowMySky} library that lets the applications render the
|
||||
atmosphere model.
|
||||
|
||||
@item @code{ShowMySky} preview GUI that makes it possible to preview the
|
||||
rendering of the atmosphere model and examine its properties.
|
||||
@end itemize")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public calcmysky-qt5
|
||||
(package/inherit calcmysky
|
||||
(name "calcmysky-qt5")
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~(list "-DQT_VERSION=5"
|
||||
"-DCMAKE_CXX_FLAGS=-fPIC")))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs calcmysky)
|
||||
(replace "qtbase" qtbase-5)))
|
||||
(synopsis "Qt5 build for the CalcMySky library.")))
|
||||
|
||||
(define-public aoflagger
|
||||
(package
|
||||
(name "aoflagger")
|
||||
|
|
@ -704,7 +762,7 @@ image formats.")
|
|||
(define-public splash
|
||||
(package
|
||||
(name "splash")
|
||||
(version "3.5.1")
|
||||
(version "3.7.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -712,7 +770,7 @@ image formats.")
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"12s3w96wzd4zpxw4adzhalkr57fgdk7cjp6bj596jnd87pz3rhyd"))
|
||||
"0nsm6rk0bi99xz7wclk0zy4bpqf0qcsdln5cdjb30lhpf37i2fpa"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
@ -861,8 +919,6 @@ deconvolution). Such post-processing is not performed by Stackistry.")
|
|||
#~(list "-DENABLE_GPS=1"
|
||||
;; TODO: Enable when all of the dependencies are availalbe for Qt6.
|
||||
"-DENABLE_QT6=0"
|
||||
;; TODO: Pack missing in Guix https://10110111.github.io/CalcMySky/
|
||||
"-DENABLE_SHOWMYSKY=0"
|
||||
"-DENABLE_TESTING=0"
|
||||
(string-append "-DCMAKE_CXX_FLAGS=-isystem "
|
||||
#$(this-package-input "qtserialport") "/include/qt5"))
|
||||
|
|
@ -873,7 +929,8 @@ deconvolution). Such post-processing is not performed by Stackistry.")
|
|||
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||
(setenv "HOME" "/tmp"))))))
|
||||
(inputs
|
||||
(list gpsd
|
||||
(list calcmysky-qt5
|
||||
gpsd
|
||||
indi
|
||||
libnova
|
||||
openssl
|
||||
|
|
@ -886,7 +943,7 @@ deconvolution). Such post-processing is not performed by Stackistry.")
|
|||
qtserialport
|
||||
qttranslations
|
||||
qtwebengine-5
|
||||
qxlsx
|
||||
qxlsx-qt5
|
||||
zlib))
|
||||
(native-inputs
|
||||
(list doxygen
|
||||
|
|
@ -1225,6 +1282,37 @@ attempting to maintain ISTP compliance
|
|||
@end itemize")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-czml3
|
||||
(package
|
||||
(name "python-czml3")
|
||||
(version "0.7.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/poliastro/czml3")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pbwcsmc9nw591rck586ca9hwwhmm54rjjmp8gflhzq8b7f48lkc"))))
|
||||
(build-system pyproject-build-system)
|
||||
(propagated-inputs
|
||||
(list python-attrs
|
||||
python-dateutil
|
||||
python-w3lib))
|
||||
(native-inputs
|
||||
(list python-astropy
|
||||
python-pytest
|
||||
python-pytest-cov
|
||||
python-pytest-mypy))
|
||||
(home-page "https://github.com/poliastro/czml3")
|
||||
(synopsis "Python library to write CZML")
|
||||
(description
|
||||
"CZML3 is a Python library to write CZML, a JSON format for describing
|
||||
a time-dynamic graphical scene, primarily for display in a web browser running
|
||||
Cesium.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-drms
|
||||
(package
|
||||
(name "python-drms")
|
||||
|
|
@ -1366,6 +1454,81 @@ the easy construction of interactive matplotlib widget based animations.")
|
|||
of astronomical sources.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-poliastro
|
||||
(package
|
||||
(name "python-poliastro")
|
||||
(version "0.17.0")
|
||||
(source
|
||||
(origin
|
||||
;; PyPi tarball lacks tests.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/poliastro/poliastro")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1iclyjp0cvm6hp5qf4fzklszxvhj3idkxgb6a9h7xzg9bf5j5gi2"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; NOTE: Tests take about 7-10 minutes to pass.
|
||||
(add-before 'check 'prepare-test-environment
|
||||
(lambda _
|
||||
(setenv "HOME" "/tmp")
|
||||
;; TODO: Review failing tests later when any upstream
|
||||
;; suggestions are provided:
|
||||
;; https://github.com/poliastro/poliastro/issues/1618
|
||||
(substitute* "tests/test_czml.py"
|
||||
(("def test_czml_add_trajectory") "def __off_test_czml_add_trajectory")
|
||||
(("def test_czml_custom_packet") "def __off_test_czml_custom_packet")
|
||||
(("def test_czml_ground_station") "def __off_test_czml_ground_station")
|
||||
(("def test_czml_groundtrack") "def __off_test_czml_groundtrack")
|
||||
(("def test_czml_preamble") "def __off_test_czml_preamble"))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "python" "-m" "pytest"
|
||||
;; Skip tests that need remote data.
|
||||
"-m" "not remote_data")))))))
|
||||
(native-inputs
|
||||
(list python-coverage
|
||||
python-hypothesis
|
||||
python-mypy
|
||||
python-flit-core
|
||||
python-pytest
|
||||
python-pytest-cov
|
||||
python-pytest-doctestplus
|
||||
python-pytest-mpl
|
||||
python-pytest-mypy))
|
||||
(propagated-inputs
|
||||
(list python-astropy
|
||||
python-astroquery
|
||||
python-czml3
|
||||
python-jplephem
|
||||
python-matplotlib
|
||||
python-numba
|
||||
python-numpy
|
||||
python-pandas
|
||||
python-plotly
|
||||
python-pyerfa
|
||||
python-scipy))
|
||||
(home-page "https://www.poliastro.space/")
|
||||
(synopsis "Astrodynamics in Python")
|
||||
(description
|
||||
"POLIASTRO is a Python library for interactive Astrodynamics and Orbital
|
||||
Mechanics, with a focus on ease of use, speed, and quick visualization. It
|
||||
provides a simple and intuitive API, and handles physical quantities with
|
||||
units.
|
||||
|
||||
Some features include orbit propagation, solution of the Lambert's problem,
|
||||
conversion between position and velocity vectors and classical orbital
|
||||
elements and orbit plotting, among others. It focuses on interplanetary
|
||||
applications, but can also be used to analyze artificial satellites in
|
||||
Low-Earth Orbit (LEO).")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-poppy
|
||||
(package
|
||||
(name "python-poppy")
|
||||
|
|
|
|||
|
|
@ -990,6 +990,117 @@ and editing digital audio. It features digital effects and spectrum analysis
|
|||
tools.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public tenacity
|
||||
(package
|
||||
(name "tenacity")
|
||||
(version "1.3-beta2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://codeberg.org/tenacityteam/tenacity")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0pd2vxzqzq7ikz7l2a1h9qwq08276xicvphrpn47gvmwaslah1gn"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:imported-modules `((guix build glib-or-gtk-build-system)
|
||||
,@%cmake-build-system-modules)
|
||||
#:modules
|
||||
'((guix build utils)
|
||||
(guix build cmake-build-system)
|
||||
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'use-upstream-headers
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* '("libraries/lib-files/FileNames.cpp")
|
||||
(("\"/usr/include/linux/magic.h\"") "<linux/magic.h>"))))
|
||||
(add-after 'unpack
|
||||
'i-spy-with-my-little-eye-something-in-the-wrong-folder
|
||||
(lambda _
|
||||
(symlink (string-append (getcwd) "/images")
|
||||
"src/images")))
|
||||
(add-after 'unpack 'fix-cmake-rpath
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("\\$ORIGIN/\\.\\./\\$\\{_PKGLIB\\}")
|
||||
(string-append (assoc-ref outputs "out") "/lib/tenacity"))
|
||||
(("CMAKE_BUILD_WITH_INSTALL_RPATH [A-Z]*")
|
||||
"CMAKE_BUILD_WITH_INSTALL_RPATH TRUE")
|
||||
(("CMAKE_INSTALL_RPATH_USE_LINK_PATH [A-Z]*")
|
||||
"CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE"))
|
||||
(substitute* "src/CMakeLists.txt"
|
||||
;; Despite the name, this script breaks rpath. Don't run it.
|
||||
(("install.*linux/fix_rpath\\.cmake.*")
|
||||
"")
|
||||
(("-Wl,--disable-new-dtags") "-Wl,--enable-new-dtags"))))
|
||||
(replace 'configure
|
||||
(lambda args
|
||||
(define %configure (assoc-ref %standard-phases 'configure))
|
||||
(with-exception-handler
|
||||
(lambda (error)
|
||||
(unless (invoke-error? error)
|
||||
(raise error))
|
||||
;; Have you tried turning it off and on again?
|
||||
(apply invoke (invoke-error-program error)
|
||||
(invoke-error-arguments error)))
|
||||
(lambda ()
|
||||
(apply %configure args))
|
||||
#:unwind? #t)))
|
||||
(add-after 'wrap-program 'glib-or-gtk-wrap
|
||||
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))
|
||||
;; Test suite? Which test suite?
|
||||
#:tests? #f))
|
||||
(inputs
|
||||
(list wxwidgets
|
||||
gtk+
|
||||
alsa-lib
|
||||
jack-1
|
||||
expat
|
||||
lame
|
||||
flac
|
||||
ffmpeg
|
||||
libid3tag
|
||||
libjpeg-turbo
|
||||
;;("libsbsms" ,libsbsms) ;bundled version is modified
|
||||
libsndfile
|
||||
mpg123
|
||||
soundtouch
|
||||
soxr ;replaces libsamplerate
|
||||
sqlite
|
||||
twolame
|
||||
vamp
|
||||
libvorbis
|
||||
lv2
|
||||
lilv ;for lv2
|
||||
suil ;for lv2
|
||||
portaudio
|
||||
portmidi
|
||||
wavpack))
|
||||
(native-inputs
|
||||
(list gettext-minimal ;for msgfmt
|
||||
libtool
|
||||
pkg-config
|
||||
python
|
||||
which))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "TENACITY_MODULES_PATH")
|
||||
(files '("lib/tenacity/modules")))
|
||||
(search-path-specification
|
||||
(variable "TENACITY_PATH")
|
||||
(files '("share/tenacity")))))
|
||||
(home-page "https://tenacityaudio.org/")
|
||||
(synopsis "Software for recording and editing sounds")
|
||||
(description
|
||||
"Tenacity is a multi-track audio editor designed for recording, playing
|
||||
and editing digital audio. It features digital effects and spectrum analysis
|
||||
tools.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public audiofile
|
||||
(package
|
||||
(name "audiofile")
|
||||
|
|
|
|||
10724
gnu/packages/aux-files/linux-libre/6.2-arm.conf
Normal file
10724
gnu/packages/aux-files/linux-libre/6.2-arm.conf
Normal file
File diff suppressed because it is too large
Load diff
11276
gnu/packages/aux-files/linux-libre/6.2-arm64.conf
Normal file
11276
gnu/packages/aux-files/linux-libre/6.2-arm64.conf
Normal file
File diff suppressed because it is too large
Load diff
11602
gnu/packages/aux-files/linux-libre/6.2-i686.conf
Normal file
11602
gnu/packages/aux-files/linux-libre/6.2-i686.conf
Normal file
File diff suppressed because it is too large
Load diff
11764
gnu/packages/aux-files/linux-libre/6.2-x86_64.conf
Normal file
11764
gnu/packages/aux-files/linux-libre/6.2-x86_64.conf
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1211,14 +1211,14 @@ backup.")
|
|||
(define-public disarchive
|
||||
(package
|
||||
(name "disarchive")
|
||||
(version "0.4.0")
|
||||
(version "0.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://files.ngyro.com/disarchive/"
|
||||
"disarchive-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pql8cspsxyx8cpw3xyhirnisv6rb4vj5mxr1d7w9la72q740n8s"))))
|
||||
"16sjplkn9nr7zhfrqll7l1m2b2j4hg8k29p6bqjap9fkj6zpn2q2"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
|
|
|
|||
|
|
@ -1482,6 +1482,47 @@ genomation package. Included are Chip Seq, Methylation and Cage data,
|
|||
downloaded from Encode.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public r-hdcytodata
|
||||
(package
|
||||
(name "r-hdcytodata")
|
||||
(version "1.18.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "HDCytoData" version 'experiment))
|
||||
(sha256
|
||||
(base32
|
||||
"1fn8q6ds10z3ymdarkfyh88pcqnrry9yhzammp84vf86f0bl8mrc"))))
|
||||
(properties `((upstream-name . "HDCytoData")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-HOME
|
||||
(lambda _
|
||||
(setenv "HOME" "/tmp")))
|
||||
(add-after 'unpack 'avoid-internet-access
|
||||
(lambda _
|
||||
(setenv "GUIX_BUILD" "yes")
|
||||
(substitute* "R/zzz.R"
|
||||
(("createHubAccessors.*" m)
|
||||
(string-append
|
||||
"if (Sys.getenv(\"GUIX_BUILD\") == \"\") {" m "}"))))))))
|
||||
(propagated-inputs
|
||||
(list r-experimenthub r-flowcore r-summarizedexperiment))
|
||||
(native-inputs (list r-knitr))
|
||||
(home-page "https://github.com/lmweber/HDCytoData")
|
||||
(synopsis
|
||||
"Set of high-dimensional flow cytometry and mass cytometry benchmark datasets")
|
||||
(description
|
||||
"HDCytoData contains a set of high-dimensional cytometry benchmark
|
||||
datasets. These datasets are formatted into SummarizedExperiment and flowSet
|
||||
Bioconductor object formats, including all required metadata. Row metadata
|
||||
includes sample IDs, group IDs, patient IDs, reference cell population or
|
||||
cluster labels and labels identifying spiked in cells. Column metadata
|
||||
includes channel names, protein marker names, and protein marker classes.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-italicsdata
|
||||
(package
|
||||
(name "r-italicsdata")
|
||||
|
|
@ -2775,18 +2816,19 @@ data.")
|
|||
(define-public r-alpsnmr
|
||||
(package
|
||||
(name "r-alpsnmr")
|
||||
(version "4.0.2")
|
||||
(version "4.0.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "AlpsNMR" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1y4qqc6l8flv5ns4qwzjwmcykm6zcm4jg097mn8xyp7mnxymy7pl"))))
|
||||
"19j97qsa1vnxw05dlllbwzdap0xgnmgxyqbi5dy8w2ppwdzxgsfv"))))
|
||||
(properties `((upstream-name . "AlpsNMR")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-baseline
|
||||
r-biocparallel
|
||||
r-cli
|
||||
r-dplyr
|
||||
r-fs
|
||||
r-future
|
||||
|
|
@ -3225,13 +3267,13 @@ variant.")
|
|||
(define-public r-atena
|
||||
(package
|
||||
(name "r-atena")
|
||||
(version "1.4.0")
|
||||
(version "1.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "atena" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1a3qv66caz2pg67ff9c5424pygsgqnfx67ybzc3zkzaw4fj8cp54"))))
|
||||
"0j6jq1cll8440i2srmy4lbvvyqawailk9byl9bnnzln1mdgys8r7"))))
|
||||
(properties `((upstream-name . "atena")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -3243,6 +3285,7 @@ variant.")
|
|||
r-genomicranges
|
||||
r-iranges
|
||||
r-matrix
|
||||
r-matrixstats
|
||||
r-rsamtools
|
||||
r-s4vectors
|
||||
r-scales
|
||||
|
|
@ -3519,13 +3562,13 @@ Various visual and textual types of output are available.")
|
|||
(define-public r-bambu
|
||||
(package
|
||||
(name "r-bambu")
|
||||
(version "3.0.5")
|
||||
(version "3.0.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "bambu" version))
|
||||
(sha256
|
||||
(base32
|
||||
"12rcbspy4ly714cyxbgd5v2m92vasksxm19m6hd4avasrhcr4d6l"))))
|
||||
"072rys45f9nl4b2dq559qakjcp2990ncdw49j49761izxgc7byzs"))))
|
||||
(properties `((upstream-name . "bambu")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -3562,13 +3605,13 @@ usage.")
|
|||
(define-public r-bandits
|
||||
(package
|
||||
(name "r-bandits")
|
||||
(version "1.14.1")
|
||||
(version "1.14.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "BANDITS" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0dbiz7zgdl3bqrwf4ffb73sc2dd8ygh76fakx5887a14azj8pk8x"))))
|
||||
"11w0azh2g0y331imqpllnb0csjxf3gs1767cc67c1zp0ykg6yq8l"))))
|
||||
(properties `((upstream-name . "BANDITS")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -4441,14 +4484,14 @@ arbitrary genomic intervals along chromosomal ideogram.")
|
|||
(define-public r-infercnv
|
||||
(package
|
||||
(name "r-infercnv")
|
||||
(version "1.14.0")
|
||||
(version "1.14.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "infercnv" version))
|
||||
(sha256
|
||||
(base32
|
||||
"11hgw6c67gd3ih5q14a520sjmnlv56qw19z0i6s5pz2slmgflpry"))))
|
||||
"04m51jdahhmj31cs2af9il5zijkpb255f9p06i8ga0v3g79gj1bp"))))
|
||||
(properties `((upstream-name . "infercnv")))
|
||||
(build-system r-build-system)
|
||||
(inputs (list python))
|
||||
|
|
@ -5000,13 +5043,13 @@ microarrays.")
|
|||
(define-public r-annotationdbi
|
||||
(package
|
||||
(name "r-annotationdbi")
|
||||
(version "1.60.0")
|
||||
(version "1.60.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "AnnotationDbi" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1srv0jizmwgmsmgb9cfgy5nbgd3jsgxgzzax6wfsahckb5zihrqp"))))
|
||||
"1c7f2vgdnh99zp83pvmghb7l0rihdijlhdj6ff992h7wrrha8lhg"))))
|
||||
(properties
|
||||
`((upstream-name . "AnnotationDbi")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -6181,13 +6224,13 @@ names in their natural, rather than lexicographic, order.")
|
|||
(define-public r-genomicalignments
|
||||
(package
|
||||
(name "r-genomicalignments")
|
||||
(version "1.34.0")
|
||||
(version "1.34.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "GenomicAlignments" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0y9yjyzch0cn2j4yrwfp0z8qw3yqvl8h1dlrl7ylzy9mwsqc6wg5"))))
|
||||
"1c784ic85v64gflwwk22dh3f0m60q3z6y23d9jy3w8ydhda6gw0s"))))
|
||||
(properties
|
||||
`((upstream-name . "GenomicAlignments")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -6548,13 +6591,13 @@ Shiny-based display methods for Bioconductor objects.")
|
|||
(define-public r-lfa
|
||||
(package
|
||||
(name "r-lfa")
|
||||
(version "1.28.1")
|
||||
(version "1.28.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "lfa" version))
|
||||
(sha256
|
||||
(base32 "0047wspvarbnbawrwvfjfz5y6i36l2r2k2501zjya09rjpiq101m"))))
|
||||
(base32 "0z8aa2435f7v2l6zwv47v2a6p9hal156dsh8v1iri233d1qx7fax"))))
|
||||
(properties `((upstream-name . "lfa")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-corpcor))
|
||||
|
|
@ -6569,13 +6612,13 @@ Binomial data via estimation of latent structure in the natural parameter.")
|
|||
(define-public r-limma
|
||||
(package
|
||||
(name "r-limma")
|
||||
(version "3.54.1")
|
||||
(version "3.54.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "limma" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0x6wkbw8v0hq9dfr433165jmii05rswjsm97dpxvyvxvya3sxqa1"))))
|
||||
"1qch34znld9i8sy1xwpy23z2zs07nj39wkfmgfi7qw141vn6gr8b"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://bioinf.wehi.edu.au/limma")
|
||||
(synopsis "Package for linear models for microarray and RNA-seq data")
|
||||
|
|
@ -6880,6 +6923,75 @@ resolution 5hmC data from experimental protocols such as oxBS-Seq and
|
|||
TAB-Seq.")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public r-mmuphin
|
||||
(package
|
||||
(name "r-mmuphin")
|
||||
(version "1.12.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "MMUPHin" version))
|
||||
(sha256
|
||||
(base32 "0vpap3avmrjy187s3dva6f008al6d935kpdf816xzl5gxl7zvf62"))
|
||||
;; Delete generated files.
|
||||
(snippet
|
||||
'(for-each delete-file
|
||||
'("inst/doc/MMUPHin.R"
|
||||
"inst/doc/MMUPHin.html")))))
|
||||
(properties `((upstream-name . "MMUPHin")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-includes
|
||||
(lambda _
|
||||
(substitute* "inst/doc/MMUPHin.Rmd"
|
||||
(("\\.\\./man/figures")
|
||||
(string-append (getcwd) "/man/figures"))
|
||||
(("bibliography: references.bib")
|
||||
(string-append "bibliography: "
|
||||
(getcwd) "/vignettes/references.bib")))))
|
||||
;; Maaslin2 generates log files with timestamps. We don't need to
|
||||
;; keep them. The generated PDF files also contain timestamps, so
|
||||
;; we replace them with arbitrary fixed timestamps.
|
||||
(add-after 'check 'make-reproducible
|
||||
(lambda _
|
||||
(for-each delete-file
|
||||
(find-files #$output "maaslin2.log"))
|
||||
(with-fluids ((%default-port-encoding "ISO-8859-1"))
|
||||
(substitute* (find-files #$output "\\.pdf$")
|
||||
(("/CreationDate \\(D:.*\\)")
|
||||
"/CreationDate (D:20230301143558)")
|
||||
(("/ModDate \\(D:.*\\)")
|
||||
"/ModDate (D:20230301143558)"))))))))
|
||||
;; The DESCRIPTION file says that glpk is needed, but this package does
|
||||
;; not seem to reference the library directly.
|
||||
(propagated-inputs
|
||||
(list r-cowplot
|
||||
r-biocstyle
|
||||
r-dplyr
|
||||
r-fpc
|
||||
r-ggplot2
|
||||
r-igraph
|
||||
r-maaslin2
|
||||
r-metafor
|
||||
r-stringr
|
||||
r-tidyr))
|
||||
(native-inputs (list r-knitr))
|
||||
(home-page "https://bioconductor.org/packages/MMUPHin")
|
||||
(synopsis "Meta-analysis with uniform pipeline for heterogeneity in microbiome")
|
||||
(description
|
||||
"MMUPHin is an R package for meta-analysis tasks of microbiome cohorts.
|
||||
It has function interfaces for:
|
||||
@itemize
|
||||
@item covariate-controlled batch- and cohort effect adjustment;
|
||||
@item meta-analysis differential abundance testing;
|
||||
@item meta-analysis unsupervised discrete structure (clustering) discovery;
|
||||
@item meta-analysis unsupervised continuous structure discovery.
|
||||
@end itemize")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-motifrg
|
||||
(package
|
||||
(name "r-motifrg")
|
||||
|
|
@ -6910,14 +7022,14 @@ throughput genetic sequencing data sets using regression methods.")
|
|||
(define-public r-muscat
|
||||
(package
|
||||
(name "r-muscat")
|
||||
(version "1.12.0")
|
||||
(version "1.12.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "muscat" version))
|
||||
(sha256
|
||||
(base32
|
||||
"07b1z8rd0zibmv3rm4zggjf49lh37p2bp1h919zcw3n0fy2hax1k"))))
|
||||
"061dgs3ygvr4vrc6mrmikqn4a7a5qajn7k8crbskdkg4svg8qv1a"))))
|
||||
(properties `((upstream-name . "muscat")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -6960,14 +7072,14 @@ platform that mimics both single and multi-sample scRNA-seq data.")
|
|||
(define-public r-mutationalpatterns
|
||||
(package
|
||||
(name "r-mutationalpatterns")
|
||||
(version "3.8.0")
|
||||
(version "3.8.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "MutationalPatterns" version))
|
||||
(sha256
|
||||
(base32
|
||||
"071s1hfxln8zdr303g0ifmajd3kcfxxb6dds0pz67chc2gmgnd9q"))))
|
||||
"0d0fsc4x8psfd93asi2d5kq1888s963d3s8kcihd5knqah000mh8"))))
|
||||
(build-system r-build-system)
|
||||
(native-inputs
|
||||
(list r-knitr))
|
||||
|
|
@ -7222,13 +7334,13 @@ previously been used in XCMS.")
|
|||
(define-public r-numbat
|
||||
(package
|
||||
(name "r-numbat")
|
||||
(version "1.2.1")
|
||||
(version "1.2.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "numbat" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jkz24j99cd333mvisp8x5swwr0iyix1kc962d2yx3mv5cn28xdb"))))
|
||||
"06qq7i8k1mi7yg1irfbk3d2fmk7awvzj7h7r54hnr6pzywk7nmhc"))))
|
||||
(properties `((upstream-name . "numbat")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-ape
|
||||
|
|
@ -7356,6 +7468,32 @@ annotation packages each of which has its own schema by taking advantage of
|
|||
the fact that each of these packages implements a select methods.")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public r-oscope
|
||||
(package
|
||||
(name "r-oscope")
|
||||
(version "1.28.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Oscope" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0454f9yc0jmg3mcq9264wb5v2n8n0kaf801hlvsiy1xa3baj3h29"))))
|
||||
(properties `((upstream-name . "Oscope")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-biocparallel r-cluster r-ebseq r-testthat))
|
||||
(home-page "https://bioconductor.org/packages/Oscope")
|
||||
(synopsis
|
||||
"Oscillatory genes identifier in unsynchronized single cell RNA-seq")
|
||||
(description
|
||||
"Oscope is a oscillatory genes identifier in unsynchronized single cell
|
||||
RNA-seq. This statistical pipeline has been developed to identify and recover
|
||||
the base cycle profiles of oscillating genes in an unsynchronized single cell
|
||||
RNA-seq experiment. The Oscope pipeline includes three modules: a sine model
|
||||
module to search for candidate oscillator pairs; a K-medoids clustering module
|
||||
to cluster candidate oscillators into groups; and an extended nearest
|
||||
insertion module to recover the base cycle order for each oscillator group.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public r-pcaexplorer
|
||||
(package
|
||||
(name "r-pcaexplorer")
|
||||
|
|
@ -7972,13 +8110,13 @@ method applicable to massive single-cell datasets (>10,000 cells).")
|
|||
(define-public r-scmap
|
||||
(package
|
||||
(name "r-scmap")
|
||||
(version "1.20.1")
|
||||
(version "1.20.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "scmap" version))
|
||||
(sha256
|
||||
(base32 "0rq185ynk874vgw4a5s2n92381dj6kxxnx2fcx2v7b2ahr3ybys7"))))
|
||||
(base32 "00zqvjfn1pqza5gl3jfr10fvcrq6gpw9hfjcxjsm4f5p7ldnhpw0"))))
|
||||
(properties `((upstream-name . "scmap")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -8612,14 +8750,14 @@ of gene-level counts.")
|
|||
(define-public r-valr
|
||||
(package
|
||||
(name "r-valr")
|
||||
(version "0.6.6")
|
||||
(version "0.6.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "valr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0w3j8fkssp9s4ybaw8hvqbmsh5m991xkgr4nji3zar2pgmgk3qph"))))
|
||||
"1s8bjbban2a3cqhwgykmhkv5b748nscamfbv67v4cppjbdvlhb5s"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-broom
|
||||
|
|
@ -9132,14 +9270,14 @@ signal in the input, that lead to spurious peaks during peak calling.")
|
|||
(define-public r-diffbind
|
||||
(package
|
||||
(name "r-diffbind")
|
||||
(version "3.8.3")
|
||||
(version "3.8.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "DiffBind" version))
|
||||
(sha256
|
||||
(base32
|
||||
"039gy9ll6ingh3y5h2hp3rhbh2imaryjxzgf8ysk87irlbpnx1qs"))))
|
||||
"1gil19qk4wc695sl7r789xnqyv748n4jdhaighkjy5hfp9xaaax7"))))
|
||||
(properties `((upstream-name . "DiffBind")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -9850,13 +9988,13 @@ information.")
|
|||
(define-public r-glmgampoi
|
||||
(package
|
||||
(name "r-glmgampoi")
|
||||
(version "1.10.1")
|
||||
(version "1.10.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "glmGamPoi" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qxzbh5i208cpghmysailachj8xpx4g4iqk8552xjpjkn54pkpbd"))))
|
||||
"1ihjqzdhx6k99gdd4556xxn9822sblg6vmblcmbzml01bhv6xzar"))))
|
||||
(properties `((upstream-name . "glmGamPoi")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -10712,16 +10850,28 @@ the numbers of cells across batches.")
|
|||
(define-public r-mast
|
||||
(package
|
||||
(name "r-mast")
|
||||
(version "1.24.0")
|
||||
(version "1.24.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "MAST" version))
|
||||
(sha256
|
||||
(base32
|
||||
"133ijkw5sd0gl38dfr7qfqvvp2df7lg6j8vkvy54zlpamkg6l2x1"))))
|
||||
"1c0lc4abnb859x481ky6d3kc9zzxwvf4kqgwxyqapc4g72b4vh65"))
|
||||
(snippet
|
||||
'(delete-file "docs/jquery.sticky-kit.min.js"))))
|
||||
(properties `((upstream-name . "MAST")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'process-javascript
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(invoke "esbuild"
|
||||
(assoc-ref inputs "js-jquery-sticky-kit")
|
||||
"--minify"
|
||||
"--outfile=docs/jquery.sticky-kit.min.js"))))))
|
||||
(propagated-inputs
|
||||
(list r-abind
|
||||
r-biobase
|
||||
|
|
@ -10736,7 +10886,16 @@ the numbers of cells across batches.")
|
|||
r-stringr
|
||||
r-summarizedexperiment))
|
||||
(native-inputs
|
||||
(list r-knitr))
|
||||
`(("esbuild" ,esbuild)
|
||||
("js-jquery-sticky-kit"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
"https://cdn.jsdelivr.net/gh/leafo/sticky-kit@v1.1.2/jquery.sticky-kit.js")
|
||||
(sha256
|
||||
(base32
|
||||
"17c3a1hqc3ybwj7hpw8prazajp2x98aq7nyfn71h6lzjvblq297g"))))
|
||||
("r-knitr" ,r-knitr)))
|
||||
(home-page "https://github.com/RGLab/MAST/")
|
||||
(synopsis "Model-based analysis of single cell transcriptomics")
|
||||
(description
|
||||
|
|
@ -11424,14 +11583,14 @@ especially Illumina Infinium methylation microarrays.")
|
|||
(define-public r-linnorm
|
||||
(package
|
||||
(name "r-linnorm")
|
||||
(version "2.22.1")
|
||||
(version "2.22.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Linnorm" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16d7viyidqbsy3mbr2cpq9p291yf362a4blhvs05qxcwm3fjllij"))))
|
||||
"0snsvyy8d85panizm848mrmjpgyc06iqp39d19rny3fphq3adwn5"))))
|
||||
(properties `((upstream-name . "Linnorm")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -11526,14 +11685,14 @@ surface of a flowcell.")
|
|||
(define-public r-mutoss
|
||||
(package
|
||||
(name "r-mutoss")
|
||||
(version "0.1-12")
|
||||
(version "0.1-13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mutoss" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"))))
|
||||
"0hgi9wpy3ai23dk6cdba6r118vvmgw210racsg3n1p24rv6ny3xn"))))
|
||||
(properties `((upstream-name . "mutoss")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -11772,14 +11931,14 @@ the data set is suitable for such analysis.")
|
|||
(define-public r-sigpathway
|
||||
(package
|
||||
(name "r-sigpathway")
|
||||
(version "1.66.1")
|
||||
(version "1.66.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "sigPathway" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ln1n4zwmjw1ils45vix93q3h19xlg4q894yhhxkphgyj0qcy00b"))))
|
||||
"0k86hlz7zbbw7559bd2sl59pr441kihgwvg8nr75mj8d50n783sy"))))
|
||||
(properties `((upstream-name . "sigPathway")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://www.pnas.org/cgi/doi/10.1073/pnas.0506577102")
|
||||
|
|
@ -11934,14 +12093,14 @@ All the visualization methods are developed based on ggplot2 graphics.")
|
|||
(define-public r-clusterprofiler
|
||||
(package
|
||||
(name "r-clusterprofiler")
|
||||
(version "4.6.0")
|
||||
(version "4.6.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "clusterProfiler" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fm2cz2464xh075p4yl6bha9m6didc41ng4a3flkw1f1cvvpi4g0"))))
|
||||
"017wqd1nwcrhbpzvhcqc3if0n084dspq7y3fbc5dnik6yi04q0dg"))))
|
||||
(properties
|
||||
`((upstream-name . "clusterProfiler")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -11972,13 +12131,13 @@ profiles (GO and KEGG) of gene and gene clusters.")
|
|||
(define-public r-clusterexperiment
|
||||
(package
|
||||
(name "r-clusterexperiment")
|
||||
(version "2.18.1")
|
||||
(version "2.18.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "clusterExperiment" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1f3f56d88yiqyj45rhcwqb04wbxr9m4fxhbbckw1j7nykm8100ps"))))
|
||||
"03flqixy6flaqynpaf3nz42kwf71v53wxs5vywj3bqmninzywmbk"))))
|
||||
(build-system r-build-system)
|
||||
(native-inputs
|
||||
(list r-knitr))
|
||||
|
|
@ -12401,12 +12560,12 @@ frequency matrices from nine public sources, for multiple organisms.")
|
|||
(define-public r-motifbreakr
|
||||
(package
|
||||
(name "r-motifbreakr")
|
||||
(version "2.12.0")
|
||||
(version "2.12.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "motifbreakR" version))
|
||||
(sha256
|
||||
(base32 "0lq79as9gb48hf3v2xj895s0nsjr37fqah4p405kdybzry56gvrq"))))
|
||||
(base32 "073xv26yaksqa0j2vyqf8ak5yqsxg5s86izdlmlwdidnxdnd16si"))))
|
||||
(properties `((upstream-name . "motifbreakR")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -13463,14 +13622,14 @@ This algorithm is based on the publication by Hart et al., 2013 (Pubmed ID
|
|||
(define-public r-rbowtie2
|
||||
(package
|
||||
(name "r-rbowtie2")
|
||||
(version "2.4.0")
|
||||
(version "2.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Rbowtie2" version))
|
||||
(sha256
|
||||
(base32
|
||||
"05cczwkhv7kfnhlr0qznk6vdjncaj907895923f8mwx4j4cy5gcz"))))
|
||||
"0cbm6q4v9ddyx4gnw2p47ssyhnmjfxahvzbzwjzn0my3ixssy0aj"))))
|
||||
(properties `((upstream-name . "Rbowtie2")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -13578,14 +13737,14 @@ and data files used across sessions.")
|
|||
(define-public r-iclusterplus
|
||||
(package
|
||||
(name "r-iclusterplus")
|
||||
(version "1.34.2")
|
||||
(version "1.34.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "iClusterPlus" version))
|
||||
(sha256
|
||||
(base32
|
||||
"05y4jmbf8sxl32f3g5lw9ycxky0rw69gax3n2z0kif7xcb5qf3qv"))))
|
||||
"0d7qsdjry5avflrvgjj287xqn9dr54pqiqvpgywzdmdwn82m0dfp"))))
|
||||
(properties `((upstream-name . "iClusterPlus")))
|
||||
(build-system r-build-system)
|
||||
(native-inputs (list gfortran))
|
||||
|
|
@ -14018,14 +14177,14 @@ annotations.")
|
|||
(define-public r-rsubread
|
||||
(package
|
||||
(name "r-rsubread")
|
||||
(version "2.12.2")
|
||||
(version "2.12.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "Rsubread" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gvd8vmglvzc3bixqxrm4k7yikl2as5l4x6bvvvnwsgx2i7vz7dm"))))
|
||||
"0lhmva8yghlbb44h1fvbcqfp8zvdn4pd4nwyd2drh6b271f8qjdd"))))
|
||||
(properties `((upstream-name . "Rsubread")))
|
||||
(build-system r-build-system)
|
||||
(inputs (list zlib))
|
||||
|
|
@ -14775,14 +14934,14 @@ expression space.")
|
|||
(define-public r-cicero
|
||||
(package
|
||||
(name "r-cicero")
|
||||
(version "1.16.0")
|
||||
(version "1.16.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "cicero" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0grzp9k06dz04bw07nf9qka19mara1kplyd24y8mg8208wk949f6"))))
|
||||
"1gf359x6lvm3kc4mlsh7vxf8lmvhp080fi0cksvb4mcypafp67cv"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-assertthat
|
||||
|
|
@ -14842,14 +15001,14 @@ accessibility data.")
|
|||
(define-public r-circrnaprofiler
|
||||
(package
|
||||
(name "r-circrnaprofiler")
|
||||
(version "1.12.0")
|
||||
(version "1.12.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "circRNAprofiler" version))
|
||||
(sha256
|
||||
(base32
|
||||
"07l8vaqbw36hvs8pyn1gk6dglnmkcmbafvd4rdrhg2wqwnlpsf40"))))
|
||||
"1i954hn7xyajpkg4fks04jd86flcmy2326nzpmxgy8h69jkzdc8q"))))
|
||||
(properties
|
||||
`((upstream-name . "circRNAprofiler")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -15430,14 +15589,14 @@ arrays based on fast wavelet-based functional models.")
|
|||
(define-public r-variancepartition
|
||||
(package
|
||||
(name "r-variancepartition")
|
||||
(version "1.28.4")
|
||||
(version "1.28.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "variancePartition" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ii4r0c76b7rnisy4qba2cp5686j73s6b3s6pj66w91wq65dykpd"))))
|
||||
"0iv5c5p0g4axhanc62mmk0c43qcwdsxzslxh5qdck0v1kb7bd1d9"))))
|
||||
(properties
|
||||
`((upstream-name . "variancePartition")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -16324,13 +16483,13 @@ monograph.")
|
|||
(define-public r-bioccheck
|
||||
(package
|
||||
(name "r-bioccheck")
|
||||
(version "1.34.2")
|
||||
(version "1.34.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "BiocCheck" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zj43kbzvi2ws8c182fp6vn5r6iiqsr6p2iyy3k8n3ifm2acqw2h"))))
|
||||
"00z2l5jnc028bmd3rl3qmgkd6k1mfa4p68kls34mkn29ic9ls22m"))))
|
||||
(properties
|
||||
`((upstream-name . "BiocCheck")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -16399,13 +16558,13 @@ functionality.")
|
|||
(define-public r-biocviews
|
||||
(package
|
||||
(name "r-biocviews")
|
||||
(version "1.66.2")
|
||||
(version "1.66.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "biocViews" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fdxlixwf4d3p1prq37cgfvaiym44h2yd4bym6wp4dl8h648v99y"))))
|
||||
"0ddxz7a8csf1l4srnjcgg5ps00fkcbv99y5wa0yrl6p9zr2d61qy"))))
|
||||
(properties
|
||||
`((upstream-name . "biocViews")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -16598,16 +16757,50 @@ gene selection, testing relationships, and so on.")
|
|||
(define-public r-biocpkgtools
|
||||
(package
|
||||
(name "r-biocpkgtools")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "BiocPkgTools" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1av7vnw6z9cw7j4d3vpi8mfs5h4pn4yr2wc8ybg7ad1d686ah845"))))
|
||||
"0cl88adkbxv7sz07b8h5qpwwkwg85jx6xjinkd0yjac4xm7s4lyf"))
|
||||
(snippet
|
||||
'(for-each delete-file
|
||||
'("inst/htmlwidgets/lib/bioc_explore/bootstrap.min.js"
|
||||
"inst/htmlwidgets/lib/bioc_explore/d3.v3.min.js"
|
||||
"inst/htmlwidgets/lib/bioc_explore/jquery-2.2.4.min.js"
|
||||
"inst/htmlwidgets/lib/bioc_explore/underscore-min.js")))))
|
||||
(properties `((upstream-name . "BiocPkgTools")))
|
||||
(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)
|
||||
(with-directory-excursion "inst/htmlwidgets/lib/bioc_explore"
|
||||
(call-with-values
|
||||
(lambda ()
|
||||
(unzip2
|
||||
`((,(assoc-ref inputs "js-bootstrap")
|
||||
"bootstrap.min.js")
|
||||
(,(assoc-ref inputs "js-d3")
|
||||
"d3.v3.min.js")
|
||||
(,(assoc-ref inputs "js-jquery")
|
||||
"jquery-2.2.4.min.js")
|
||||
(,(search-input-file inputs "/underscore.js")
|
||||
"underscore-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-biocfilecache
|
||||
r-biocmanager
|
||||
|
|
@ -16631,7 +16824,40 @@ gene selection, testing relationships, and so on.")
|
|||
r-tibble
|
||||
r-xml2))
|
||||
(native-inputs
|
||||
(list r-knitr))
|
||||
`(("esbuild" ,esbuild)
|
||||
("r-knitr" ,r-knitr)
|
||||
("js-bootstrap"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
"https://raw.githubusercontent.com/twbs/bootstrap/v3.3.6/dist/js/bootstrap.js")
|
||||
(sha256
|
||||
(base32
|
||||
"07fm28xbkb7a5n7zgmfxgbl2g5j010r4gvc54y79v1f119s3kz6y"))))
|
||||
("js-d3"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://d3js.org/d3.v3.js")
|
||||
(sha256
|
||||
(base32
|
||||
"1arr7sr08vy7wh0nvip2mi7dpyjw4576vf3bm45rp4g5lc1k1x41"))))
|
||||
("js-jquery"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://code.jquery.com/jquery-2.2.4.js")
|
||||
(sha256
|
||||
(base32
|
||||
"18m6qmmsm3knvybf6gpwmwiasi05y98gcpb364if8qh94gv90gl9"))))
|
||||
("js-underscore"
|
||||
,(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jashkenas/underscore")
|
||||
(commit "1.8.3")))
|
||||
(file-name (git-file-name "underscorejs" "1.8.3"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r54smxpl3c6jg6py29xjc2l1z49rlm1h48vr9i57wvnkbnbl0h3"))))))
|
||||
(home-page "https://github.com/seandavi/BiocPkgTools")
|
||||
(synopsis "Collection of tools for learning about Bioconductor packages")
|
||||
(description
|
||||
|
|
@ -17007,13 +17233,13 @@ routines.")
|
|||
(define-public r-s4vectors
|
||||
(package
|
||||
(name "r-s4vectors")
|
||||
(version "0.36.1")
|
||||
(version "0.36.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "S4Vectors" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16lssnmhy3klqp4sw1328f38cixkjh9317gdyikcrmsbcwg2ak6v"))))
|
||||
"131cg5fzrqgyp4kv260yn8hpr0zv5mxjhdnpl50ydgc2k0l43d38"))))
|
||||
(properties
|
||||
`((upstream-name . "S4Vectors")))
|
||||
(build-system r-build-system)
|
||||
|
|
@ -17112,13 +17338,13 @@ objects from the @code{graph} package.")
|
|||
(define-public r-fishpond
|
||||
(package
|
||||
(name "r-fishpond")
|
||||
(version "2.4.0")
|
||||
(version "2.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "fishpond" version))
|
||||
(sha256
|
||||
(base32
|
||||
"112jd53wbiv1w0n8dc4qn6257wbbbg5i20s9wlvaw98jma94afa6"))))
|
||||
"0kc1xzq03kz548rfinxhc7gxm6021502b6v7bg2har0aq4vx79ml"))))
|
||||
(properties `((upstream-name . "fishpond")))
|
||||
(build-system r-build-system)
|
||||
(inputs (list zlib))
|
||||
|
|
@ -17131,7 +17357,6 @@ objects from the @code{graph} package.")
|
|||
r-matrix
|
||||
r-matrixstats
|
||||
r-qvalue
|
||||
r-rcpp
|
||||
r-s4vectors
|
||||
r-singlecellexperiment
|
||||
r-summarizedexperiment
|
||||
|
|
@ -17517,13 +17742,13 @@ This package wraps C++ code from the MOODS motif calling library.")
|
|||
(define-public r-chromvar
|
||||
(package
|
||||
(name "r-chromvar")
|
||||
(version "1.20.1")
|
||||
(version "1.20.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "chromVAR" version))
|
||||
(sha256
|
||||
(base32 "1nhhpqhpvmw6b0nwxdwsjnakmfpxzpii8fmabwwg9bk8ni3zj5dq"))))
|
||||
(base32 "034in81lsdxa8j1na2zymck2y67235qprin8hak3dwa7lwzbm12z"))))
|
||||
(properties `((upstream-name . "chromVAR")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
@ -18947,14 +19172,14 @@ Python environments in a single R session.")
|
|||
(define-public r-biocthis
|
||||
(package
|
||||
(name "r-biocthis")
|
||||
(version "1.8.1")
|
||||
(version "1.8.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "biocthis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zmiaixknwxv72l4fygrn0qr3mvl7kqfbqgflnavs0wxx6xdjqgn"))))
|
||||
"0h1cwir6m3zg728vdxxz03rfwysw92m9djdfj0vayixli2j4xz5a"))))
|
||||
(properties `((upstream-name . "biocthis")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -719,6 +719,40 @@ suite native in R.")
|
|||
for all types of microbial diversity analyses.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public r-codeandroll2
|
||||
(let ((commit "d58e258851a5c0b430e8620d34dbeefb597c548f")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-codeandroll2")
|
||||
(version (git-version "2.3.6" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vertesy/CodeAndRoll2")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0sy88mfgw6qqhpnlc5020qzr1jllkcrxfhl2lw42bkl5nb56is71"))))
|
||||
(properties `((upstream-name . "CodeAndRoll2")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-colorramps
|
||||
r-dplyr
|
||||
r-gplots
|
||||
r-gtools
|
||||
r-plyr
|
||||
r-rcolorbrewer
|
||||
r-sessioninfo
|
||||
r-sm
|
||||
r-stringendo
|
||||
r-stringr))
|
||||
(home-page "https://github.com/vertesy/CodeAndRoll2")
|
||||
(synopsis "CodeAndRoll2 for vector, matrix and list manipulations")
|
||||
(description
|
||||
"CodeAndRoll2 is a set of more than 130 productivity functions.
|
||||
These functions are used by MarkdownReports, ggExpress, and SeuratUtils.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-conospanel
|
||||
(let ((commit "39e76b201a783b4e92fd615010a735a61746fbb9")
|
||||
(revision "1"))
|
||||
|
|
@ -743,6 +777,47 @@ each with 3000 cells. There are two samples which are bone marrow (BM), and
|
|||
two samples which are cord blood (CB).")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-conqur
|
||||
(let ((commit "c7a88794efd4ecfe4d96988dceeec3b410222e48")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-conqur")
|
||||
(version (git-version "2.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/wdl2459/ConQuR")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"19a7p2l67mgjy99i5ksjxlhzaqmrnyi1vzvwnhgnx2jrr6crj7rq"))))
|
||||
(properties `((upstream-name . "ConQuR")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-ade4
|
||||
r-ape
|
||||
r-compositions
|
||||
r-cqrreg
|
||||
r-doparallel
|
||||
r-dplyr
|
||||
r-fastdummies
|
||||
r-glmnet
|
||||
r-gplots
|
||||
r-gunifrac
|
||||
r-quantreg
|
||||
r-randomforest
|
||||
r-rocr
|
||||
r-vegan))
|
||||
(native-inputs (list r-knitr))
|
||||
(home-page "https://github.com/wdl2459/ConQuR")
|
||||
(synopsis "Batch effects removal for microbiome data")
|
||||
(description
|
||||
"This package conducts batch effects removal from a taxa read count
|
||||
table by a conditional quantile regression method. The distributional
|
||||
attributes of microbiome data - zero-inflation and over-dispersion, are
|
||||
simultaneously considered.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-p2data
|
||||
(let ((commit "7d4c0e17d7899f9d9b08ab2bf455abe150912f4c")
|
||||
(revision "1"))
|
||||
|
|
@ -793,6 +868,57 @@ high-throughput sequence analysis. The package is primarily useful to
|
|||
developers of other R packages who wish to make use of HTSlib.")
|
||||
(license license:lgpl2.0+))))
|
||||
|
||||
(define-public r-stringendo
|
||||
(let ((commit "83b8f2d82a09b33b9e895438bb523a021138be01")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-stringendo")
|
||||
(version (git-version "0.3.4" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vertesy/Stringendo")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ap0nhbyd6xx0yl2vgmwk38p22yrkv4k9hw13r35z4wf343rry6v"))))
|
||||
(properties `((upstream-name . "Stringendo")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-devtools r-usethis))
|
||||
(home-page "https://github.com/vertesy/Stringendo")
|
||||
(synopsis "Stringendo is a string parsing library")
|
||||
(description
|
||||
"This package provides string parsing functionalites for generating
|
||||
plotnames, filenames and paths.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-readwriter
|
||||
(let ((commit "71454f4aa706f5d2fbe606acd95abc14224e7058")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-readwriter")
|
||||
(version (git-version "0.2.9" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vertesy/ReadWriter")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0sp27smhdva2hi2x0svia2l56k8xrh7p5akn78g5b0lcvz4x3hd7"))))
|
||||
(properties `((upstream-name . "ReadWriter")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-gdata r-gtools r-openxlsx r-readr r-stringendo))
|
||||
(home-page "https://github.com/vertesy/ReadWriter")
|
||||
(synopsis "Functions to read and write files conveniently")
|
||||
(description
|
||||
"ReadWriter is a set of R functions to read and write files
|
||||
conveniently.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-streamgraph
|
||||
(let ((commit "76f7173ec89d456ace5943a512e20b1f6810bbcb")
|
||||
(revision "1"))
|
||||
|
|
@ -1262,8 +1388,7 @@ demultiplexing step.")
|
|||
(list python-black
|
||||
python-flake8
|
||||
python-poetry-core
|
||||
python-pytest
|
||||
python-pre-commit))
|
||||
python-pytest))
|
||||
(home-page "https://github.com/JonathanShor/DoubletDetection")
|
||||
(synopsis
|
||||
"This is a package to detect doublets in single-cell RNA-seq count matrices")
|
||||
|
|
@ -3846,6 +3971,80 @@ sequencing data. It uses paired-ends and split-reads to sensitively and
|
|||
accurately delineate genomic rearrangements throughout the genome.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public transanno
|
||||
(package
|
||||
(name "transanno")
|
||||
(version "0.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/informationsea/transanno")
|
||||
;; Corresponds to tag v0.3.0
|
||||
(commit "df49050c92644ea12d9d5c6fae2186ca436dbca3")))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jpn7s3cnd9ybk4lmfbhj2arhf6cmrv7jp74n7n87m3a3irkaif1"))
|
||||
(snippet
|
||||
'(with-output-to-file "liftover-rs/build.rs"
|
||||
(lambda _
|
||||
(format #true
|
||||
"fn main() {~@
|
||||
println!(\"cargo:rustc-link-lib=lzma\");~@
|
||||
}~%"))))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:install-source? #false ;fails
|
||||
#:tests? #false ;"cargo test" ignores build.rs
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'prepare-test-files
|
||||
(lambda _
|
||||
(delete-file "Cargo.lock")
|
||||
(substitute* "liftover-rs/Cargo.toml"
|
||||
(("anyhow = \"1\"") "anyhow = \"1.0.65\""))
|
||||
(substitute* "liftover-rs/prepare-test.sh"
|
||||
(("/bin/bash")
|
||||
(string-append #$(this-package-native-input "bash")
|
||||
"/bin/bash")))
|
||||
(invoke "bash" "prepare-test-files.sh")))
|
||||
(add-before 'patch-cargo-checksums 'do-not-build-xz
|
||||
(lambda _
|
||||
;; Detection of liblzma (in rust-lzma-sys, pulled in by
|
||||
;; rust-hts-sys) doesn't seem to work, or perhaps it really does
|
||||
;; request a static build somewhere.
|
||||
(substitute* "guix-vendor/rust-lzma-sys-0.1.17.tar.xz/build.rs"
|
||||
(("if .want_static && .msvc && pkg_config::probe_library\\(\"liblzma\"\\).is_ok\\(\\)") ""))))
|
||||
(add-before 'install 'chdir
|
||||
(lambda _ (chdir "transanno"))))
|
||||
#:cargo-inputs
|
||||
`(("rust-anyhow" ,rust-anyhow-1)
|
||||
("rust-autocompress" ,rust-autocompress-0.2)
|
||||
("rust-bio" ,rust-bio-0.41)
|
||||
("rust-clap" ,rust-clap-2)
|
||||
("rust-csv" ,rust-csv-1)
|
||||
("rust-flate2" ,rust-flate2-1)
|
||||
("rust-indexmap" ,rust-indexmap-1)
|
||||
("rust-log" ,rust-log-0.4)
|
||||
("rust-nom" ,rust-nom-5)
|
||||
("rust-once-cell" ,rust-once-cell-1)
|
||||
("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3)
|
||||
("rust-regex" ,rust-regex-1)
|
||||
("rust-thiserror" ,rust-thiserror-1)
|
||||
("rust-serde" ,rust-serde-1)
|
||||
("rust-serde-json" ,rust-serde-json-1))
|
||||
#:cargo-development-inputs
|
||||
`(("rust-clap" ,rust-clap-2)
|
||||
("rust-lazy-static" ,rust-lazy-static-1))))
|
||||
(native-inputs (list bash))
|
||||
(home-page "https://github.com/informationsea/transanno")
|
||||
(synopsis "LiftOver tool for new genome assemblies")
|
||||
(description "This package provides an accurate VCF/GFF3/GTF LiftOver tool
|
||||
for new genome assemblies.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public trf
|
||||
(package
|
||||
(name "trf")
|
||||
|
|
@ -8219,6 +8418,43 @@ sequence.")
|
|||
(supported-systems '("i686-linux" "x86_64-linux"))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public r-ggexpress
|
||||
(let ((commit "82f169385f87af328ff971195c2f64ff3c573a8a")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-ggexpress")
|
||||
(version (git-version "0.6.6" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vertesy/ggExpress")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"122hnw8xv33ngcd4fd7hmf817a06ih1knrxxi0cgklj1fwinm0z4"))))
|
||||
(properties `((upstream-name . "ggExpress")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-cowplot
|
||||
r-ggplot2
|
||||
r-ggpubr
|
||||
r-markdownhelpers
|
||||
r-markdownreports
|
||||
r-rcolorbrewer
|
||||
r-sessioninfo
|
||||
r-seurat
|
||||
r-sm
|
||||
r-stringendo
|
||||
r-tidyverse))
|
||||
(home-page "https://github.com/vertesy/ggExpress")
|
||||
(synopsis
|
||||
"This is a fast tool to create, annotate and export plots in R")
|
||||
(description
|
||||
"This package is a set of R functions for generating precise figures.
|
||||
This tool helps you to create clean markdown reports about what you just
|
||||
discovered with your analysis script.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-gg3d
|
||||
(let ((commit "ffdd837d30c1671cd0895db94bdd7b1594dbfcb0")
|
||||
(revision "1"))
|
||||
|
|
@ -8535,7 +8771,10 @@ Pore-C concatemers.")
|
|||
r-seurat
|
||||
r-singlecellexperiment
|
||||
r-slingshot
|
||||
r-summarizedexperiment))
|
||||
r-summarizedexperiment
|
||||
python
|
||||
python-scrublet
|
||||
python-doubletdetection))
|
||||
(home-page "https://github.com/xnnba1984/DoubletCollection")
|
||||
(synopsis "Tool for finding doublets in scRNA-seq data")
|
||||
(description
|
||||
|
|
@ -8544,6 +8783,46 @@ doublet-detection methods. In addition, this tool is used for execution and
|
|||
benchmark of those eight mentioned methods.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public r-plsdabatch
|
||||
(let ((commit "4aadf3a99709afae462db310386b6cf5db20088c")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-plsdabatch")
|
||||
(version (git-version "0.2.3" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/EvaYiwenWang/PLSDAbatch")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"047l923lq2ji7rwybh9b9zkblzvvhkpli5gb2x8g2q9f2n5022nr"))))
|
||||
(properties `((upstream-name . "PLSDAbatch")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-ggplot2
|
||||
r-ggpubr
|
||||
r-gridextra
|
||||
r-lmertest
|
||||
r-mixomics
|
||||
r-mvtnorm
|
||||
r-performance
|
||||
r-rdpack
|
||||
r-scales))
|
||||
(native-inputs (list r-knitr))
|
||||
(home-page "https://github.com/EvaYiwenWang/PLSDAbatch")
|
||||
(synopsis "PLSDA-batch")
|
||||
(description
|
||||
"This package provides a new batch effect correction method based on
|
||||
Projection to Latent Structures Discriminant Analysis named “PLSDA-batch” to
|
||||
correct data prior to any downstream analysis. PLSDA-batch estimates latent
|
||||
components related to treatment and batch effects to remove batch variation.
|
||||
The method is multivariate, non-parametric and performs dimension reduction.
|
||||
Combined with centered log ratio transformation for addressing uneven library
|
||||
sizes and compositional structure, PLSDA-batch addresses all characteristics
|
||||
of microbiome data that existing correction methods have ignored so far.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-psupertime
|
||||
(let ((commit "73825a28d3bd9bc881c15ee0c4c218eec1c9c207")
|
||||
(revision "1"))
|
||||
|
|
@ -8639,6 +8918,62 @@ target genes, Pando simultaneously infers gene modules and sets of regulatory
|
|||
regions for each transcription factor.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-premessa
|
||||
(let ((commit "68b42bb984637d0f3ad6a0ecc83e9278994afc85")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-premessa")
|
||||
(version (git-version "0.3.4" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ParkerICI/premessa")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1l0q431zk0lvg22130nx84gdqi7cpl05yah4am63lbx6m4c769pb"))
|
||||
(snippet
|
||||
'(delete-file "inst/normalizer_shinyGUI/www/d3.min.js"))))
|
||||
(properties `((upstream-name . "premessa")))
|
||||
(build-system r-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'process-javascript
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(with-directory-excursion "inst/normalizer_shinyGUI/www/"
|
||||
(invoke "esbuild" (assoc-ref inputs "d3.v4.js")
|
||||
"--minify" "--outfile=d3.min.js")))))))
|
||||
(propagated-inputs
|
||||
(list r-data-table
|
||||
r-flowcore
|
||||
r-ggplot2
|
||||
r-gridextra
|
||||
r-hexbin
|
||||
r-jsonlite
|
||||
r-reshape
|
||||
r-rhandsontable
|
||||
r-shiny
|
||||
r-shinyjqui))
|
||||
(native-inputs
|
||||
`(("esbuild" ,esbuild)
|
||||
("d3.v4.js"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://d3js.org/d3.v4.js")
|
||||
(sha256
|
||||
(base32
|
||||
"0y7byf6kcinfz9ac59jxc4v6kppdazmnyqfav0dm4h550fzfqqlg"))))))
|
||||
(home-page "https://github.com/ParkerICI/premessa")
|
||||
(synopsis "Pre-processing of flow and mass cytometry data")
|
||||
(description
|
||||
"This is an R package for pre-processing of flow and mass cytometry
|
||||
data. This package includes panel editing or renaming for FCS files,
|
||||
bead-based normalization and debarcoding.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-presto
|
||||
(let ((commit "052085db9c88aa70a28d11cc58ebc807999bf0ad")
|
||||
(revision "0"))
|
||||
|
|
@ -8730,6 +9065,70 @@ auROC analysis.")
|
|||
visualization and analysis of single-cell data using R.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public r-markdownhelpers
|
||||
(let ((commit "793372d28ebed607cc1d35f909a1caedb2b41ffe")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-markdownhelpers")
|
||||
(version (git-version "0.2.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vertesy/MarkdownHelpers")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1d18s2ydhfjm3hjkxz42dirhwrrv792m6mvkmypallaa2qnwrmkg"))))
|
||||
(properties `((upstream-name . "MarkdownHelpers")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-devtools r-stringendo r-usethis))
|
||||
(home-page "https://github.com/vertesy/MarkdownHelpers")
|
||||
(synopsis "Helper functions for MarkdownReports and ggExpress")
|
||||
(description
|
||||
"This package provides a set of R functions to parse markdown and other
|
||||
generic helpers.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-markdownreports
|
||||
(let ((commit "3ba1103e3ddc6df3a0c090eb884f5e65c461eb31")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-markdownreports")
|
||||
(version (git-version "4.5.9" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vertesy/MarkdownReports")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xmasdb630b6nvxi5m1i8pyxiy49nxpzyxf9h8spdppx92rhdkc8"))))
|
||||
(properties `((upstream-name . "MarkdownReports")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-clipr
|
||||
r-codeandroll2
|
||||
r-colorramps
|
||||
r-devtools
|
||||
r-gplots
|
||||
r-markdownhelpers
|
||||
r-rcolorbrewer
|
||||
r-readwriter
|
||||
r-sessioninfo
|
||||
r-sm
|
||||
r-stringendo
|
||||
r-venndiagram
|
||||
r-vioplot))
|
||||
(home-page "https://github.com/vertesy/MarkdownReports")
|
||||
(synopsis "Tool for generating cientific figures and reports")
|
||||
(description
|
||||
"This is a set of R functions that allows you to generate precise
|
||||
figures. This tool will create clean markdown reports about what you just
|
||||
discovered.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-snapatac
|
||||
(package
|
||||
(name "r-snapatac")
|
||||
|
|
@ -8779,6 +9178,30 @@ clustering analysis, differential analysis, motif inference and exploration of
|
|||
single cell ATAC-seq sequencing data.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public r-tictoc
|
||||
(package
|
||||
(name "r-tictoc")
|
||||
(version "1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "tictoc" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ka7zd857xfqb5afn0psn0yzfv2qjb0ddxfyiq6aggbnla5qc3qj"))))
|
||||
(properties `((upstream-name . "tictoc")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/jabiru/tictoc")
|
||||
(synopsis
|
||||
"Time R scripts and implementations of stack and list structures")
|
||||
(description
|
||||
"The tictoc package provides the timing functions @code{tic} and
|
||||
@code{toc} that can be nested. It provides an alternative to
|
||||
@code{system.time()} with a different syntax similar to that in another
|
||||
well-known software package. @code{tic} and @code{toc} are easy to use, and
|
||||
are especially useful when timing several sections in more than a few lines of
|
||||
code.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public r-tsis
|
||||
(let ((commit "24460298fbe1d26e4da390f6e4f3d4d9d62334dc")
|
||||
(revision "1"))
|
||||
|
|
@ -15729,6 +16152,60 @@ information... The package can also be used to extract data from @code{.loom}
|
|||
files.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public r-seurat-utils
|
||||
(let ((commit "0b6f5b548a49148cfbeaa654e8a618c0a020afa5")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-seurat-utils")
|
||||
(version (git-version "1.6.5" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vertesy/Seurat.utils")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mn64h375mkj6x4ix5493z32gqg96yc507j5jr0lx9g5wk1bf762"))))
|
||||
(properties `((upstream-name . "Seurat.utils")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-codeandroll2
|
||||
r-cowplot
|
||||
r-dplyr
|
||||
r-ggcorrplot
|
||||
r-ggexpress
|
||||
r-ggplot2
|
||||
r-ggpubr
|
||||
r-ggrepel
|
||||
r-hgnchelper
|
||||
r-htmlwidgets
|
||||
r-markdownhelpers
|
||||
r-markdownreports
|
||||
r-matrix
|
||||
r-matrixstats
|
||||
r-princurve
|
||||
r-r-utils
|
||||
r-readr
|
||||
r-readwriter
|
||||
r-reshape2
|
||||
r-scales
|
||||
r-seurat
|
||||
r-soupx
|
||||
r-sparsematrixstats
|
||||
r-stringendo
|
||||
r-stringr
|
||||
r-tibble
|
||||
r-tictoc
|
||||
r-vroom))
|
||||
(home-page "https://github.com/vertesy/Seurat.utils")
|
||||
(synopsis "Collection of utility functions for Seurat")
|
||||
(description
|
||||
"This is a collection of utility functions for Seurat. These functions
|
||||
allow the automation and multiplexing of plotting, 3D plotting, visualization
|
||||
of statistics & QC, interaction with the Seurat object. Some functionalities
|
||||
require functions from CodeAndRoll and MarkdownReports libraries.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-seuratwrappers
|
||||
;; There are no releases or tags.
|
||||
(let ((commit "d28512f804d5fe05e6d68900ca9221020d52cf1d")
|
||||
|
|
@ -17846,7 +18323,6 @@ aligner.")
|
|||
(list python-black
|
||||
python-flake8
|
||||
python-hypothesis
|
||||
python-pre-commit
|
||||
python-pytest
|
||||
python-setuptools-scm
|
||||
python-wheel))
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ desktops.")
|
|||
(define-public qbittorrent
|
||||
(package
|
||||
(name "qbittorrent")
|
||||
(version "4.4.1")
|
||||
(version "4.5.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -449,7 +449,7 @@ desktops.")
|
|||
(commit (string-append "release-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "00whc4p209g2krsggxyq4sna01djbk1rbzkyjbq4qczvya01xn0w"))))
|
||||
(base32 "07s0ypkd1zzkw9qhfwxxx7s6zizjz0448al17xmc1b48phn46hjk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2016-2018, 2021-2023 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017, 2018, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 nee <nee@cock.li>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
|
|
@ -305,6 +305,10 @@ menu to select one of the installed operating systems.")
|
|||
(inputs
|
||||
(modify-inputs (package-inputs grub)
|
||||
(prepend efibootmgr mtools)))
|
||||
(native-inputs
|
||||
;; The tests are skipped in this package so we remove some test dependencies.
|
||||
(modify-inputs (package-native-inputs grub)
|
||||
(delete "parted" "qemu" "xorriso")))
|
||||
(arguments
|
||||
`(;; TODO: Tests need a UEFI firmware for qemu. There is one at
|
||||
;; https://github.com/tianocore/edk2/tree/master/OvmfPkg .
|
||||
|
|
@ -1706,20 +1710,21 @@ order to add a suitable bootloader menu entry.")
|
|||
;;
|
||||
;; TODO: Bump this timestamp at each modifications of the package (not only
|
||||
;; for updates) by running: date +%s.
|
||||
(let ((timestamp "1671715380"))
|
||||
(let ((timestamp "1678285400")
|
||||
(commit "9e1f7a3659071004f4b8c76f2593da6287f0d575")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "ipxe")
|
||||
(version "1.21.1")
|
||||
(version (git-version "1.21.1" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ipxe/ipxe")
|
||||
(commit (string-append "v" version))))
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "ipxe-reproducible-geniso.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9"))))
|
||||
"1fp4bgwzy923m11dkkhk9dik7al7shzmmpqhp339z786z8bjzmkb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
@ -1753,15 +1758,6 @@ order to add a suitable bootloader menu entry.")
|
|||
(list "ECHO_E_BIN_ECHO=echo"
|
||||
"ECHO_E_BIN_ECHO_E=echo -e"
|
||||
|
||||
;; cdrtools' mkisofs will silently ignore a missing isolinux.bin!
|
||||
;; Luckily xorriso is more strict.
|
||||
#$@(if (or (target-x86-64?) (target-x86?))
|
||||
'((string-append "ISOLINUX_BIN=" syslinux
|
||||
"/share/syslinux/isolinux.bin")
|
||||
(string-append "SYSLINUX_MBR_DISK_PATH=" syslinux
|
||||
"/share/syslinux/isohdpfx.bin"))
|
||||
'())
|
||||
|
||||
;; Build reproducibly.
|
||||
(string-append "BUILD_ID_CMD=echo -n " (build-id #$output))
|
||||
(string-append "BUILD_TIMESTAMP=" #$timestamp)
|
||||
|
|
@ -1788,6 +1784,24 @@ order to add a suitable bootloader menu entry.")
|
|||
(string-append "#define " option))
|
||||
(("^#undef.*(DOWNLOAD_PROTO_NFS.*)" _ option)
|
||||
(string-append "#define " option)))))
|
||||
;; It is not entirely clear why these fail to compile.
|
||||
(add-after 'enter-source-directory 'skip-i386-tap-linux
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("bin-i386-linux/tap.linux") "")
|
||||
(("bin-i386-linux/tests.linux") ""))))
|
||||
#$@(if (target-x86?)
|
||||
#~((add-after 'enter-source-directory 'set-syslinux-path
|
||||
;; cdrtools' mkisofs will silently ignore a missing isolinux.bin!
|
||||
;; Luckily xorriso is more strict.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "util/genfsimg"
|
||||
(("\t/usr/lib/syslinux " all)
|
||||
(string-append
|
||||
"\t" #$(this-package-native-input "syslinux")
|
||||
"/share/syslinux \\\n"
|
||||
all))))))
|
||||
#~())
|
||||
(delete 'configure) ; no configure script
|
||||
(replace 'install
|
||||
(lambda _
|
||||
|
|
@ -1813,10 +1827,10 @@ order to add a suitable bootloader menu entry.")
|
|||
(lambda _ (chdir ".."))))
|
||||
#:tests? #f)) ; no test suite
|
||||
(native-inputs
|
||||
(append (if (or (target-x86-64?) (target-x86?))
|
||||
;; Syslinux only supports i686 and x86_64.
|
||||
(list syslinux)
|
||||
'())
|
||||
(append (if (target-x86?)
|
||||
;; Syslinux only supports i686 and x86_64.
|
||||
(list syslinux)
|
||||
'())
|
||||
(list perl xorriso)))
|
||||
(home-page "https://ipxe.org")
|
||||
(synopsis "PXE-compliant network boot firmware")
|
||||
|
|
|
|||
|
|
@ -193,11 +193,14 @@ by APL.")
|
|||
(let* ((bin (string-append (assoc-ref outputs "out")
|
||||
"/bin"))
|
||||
(lib (string-append (assoc-ref outputs "lib")
|
||||
"/lib")))
|
||||
"/lib"))
|
||||
(include (string-append (assoc-ref outputs "lib")
|
||||
"/include")))
|
||||
(mkdir-p bin)
|
||||
(rename-file "BQN" "bqn")
|
||||
(install-file "bqn" bin)
|
||||
(install-file "libcbqn.so" lib))))))))
|
||||
(install-file "libcbqn.so" lib)
|
||||
(install-file "include/bqnffi.h" include))))))))
|
||||
(native-inputs (list dbqn
|
||||
bqn-sources
|
||||
libffi))
|
||||
|
|
|
|||
|
|
@ -972,12 +972,25 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
|
|||
("NormalizationTest.txt" . "uninorm")
|
||||
("auxiliary/GraphemeBreakTest.txt" . "unigbrk")
|
||||
("auxiliary/WordBreakTest.txt" . "uniwbrk")))
|
||||
(delete-file "gen-uni-tables")))))))
|
||||
(inputs ;; Shebangs for some auxiliary build files.
|
||||
(list python perl clisp))
|
||||
(delete-file "gen-uni-tables"))))
|
||||
(add-after 'install 'restore-shebangs
|
||||
(lambda _
|
||||
(substitute* (find-files
|
||||
(string-append #$output "/src/gnulib")
|
||||
(lambda (fname stat)
|
||||
(and (not (string-suffix? "/lib/javaversion.class" fname))
|
||||
(not (string-suffix? ".mo" fname)))))
|
||||
(("^#! ?(.*)/bin/sh" _ prefix)
|
||||
"#!/bin/sh")
|
||||
(("^#! ?(.*)/bin/python3" _ prefix)
|
||||
"#!/usr/bin/env python3")
|
||||
(("^#! ?(.*)/bin/([a-zA-Z0-9-]+)" _ prefix program)
|
||||
(string-append "#!/usr/bin/" program))))))))
|
||||
(inputs
|
||||
(list bash-minimal)) ;shebang for gnulib-tool
|
||||
(native-inputs
|
||||
(list
|
||||
python perl clisp
|
||||
bash-minimal python perl clisp
|
||||
;; Unicode data:
|
||||
ucd-next
|
||||
;; Programs for the tests:
|
||||
|
|
|
|||
|
|
@ -1030,24 +1030,6 @@ C++ but is used in C and C++ projects and frequently used in embedded systems
|
|||
but it works for any C/C++ project.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
;; Required by actionlint. The version of `go-github-com-robfig-cron'
|
||||
;; packaged in Guix is newer and changed some error messages, causing
|
||||
;; unit tests in actionlint to fail.
|
||||
(define-public go-github-com-robfig-cron-1.2
|
||||
(package
|
||||
(inherit go-github-com-robfig-cron)
|
||||
(name "go-github-com-robfig-cron")
|
||||
(version "1.2.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/robfig/cron")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva"))))))
|
||||
|
||||
(define-public actionlint
|
||||
(package
|
||||
(name "actionlint")
|
||||
|
|
@ -3477,7 +3459,6 @@ directories and files.")
|
|||
python-numpy
|
||||
python-pandas
|
||||
python-pillow
|
||||
python-pre-commit
|
||||
python-restructuredtext-lint
|
||||
python-tox
|
||||
python-setuptools-scm
|
||||
|
|
|
|||
|
|
@ -2621,6 +2621,7 @@ memoized as a function of '%current-system'."
|
|||
("flex" ,flex-boot0)))
|
||||
(inputs `(("flex" ,flex-boot0)))
|
||||
(arguments
|
||||
;; TODO: On next rebuild cycle, reuse phases from 'mig'.
|
||||
`(#:configure-flags
|
||||
`(,(string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %build-inputs "flex") "/lib/")))))))
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -21,7 +21,7 @@
|
|||
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2021 muradm <mail@muradm.net>
|
||||
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;; Copyright © 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2021-2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2021 Jacob Hrbek <kreyren@rixotstudio.cz>
|
||||
;;; Copyright © 2021, 2022 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
|
||||
|
|
@ -5086,6 +5086,53 @@ they're not available.")
|
|||
("rust-termion" ,rust-termion-1)
|
||||
("rust-winapi" ,rust-winapi-0.3))))))
|
||||
|
||||
(define-public rust-autocompress-0.2
|
||||
(package
|
||||
(name "rust-autocompress")
|
||||
(version "0.2.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "autocompress" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16pjdfr5b2ixs2xk3h6mvxprxr84rpaips624d6vbap5vsdkvzx4"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #false ;The crate does not include test files
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-before 'patch-cargo-checksums 'do-not-build-xz
|
||||
(lambda _
|
||||
;; Detection of liblzma (in rust-lzma-sys, pulled in by
|
||||
;; rust-hts-sys) doesn't seem to work, or perhaps it really does
|
||||
;; request a static build somewhere.
|
||||
(substitute* "guix-vendor/rust-lzma-sys-0.1.17.tar.xz/build.rs"
|
||||
(("if .want_static && .msvc && pkg_config::probe_library\\(\"liblzma\"\\).is_ok\\(\\)") "")))))
|
||||
#:cargo-inputs
|
||||
`(("rust-brotli" ,rust-brotli-3)
|
||||
("rust-bzip2" ,rust-bzip2-0.4)
|
||||
("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
|
||||
("rust-flate2" ,rust-flate2-1)
|
||||
("rust-log" ,rust-log-0.4)
|
||||
("rust-lz4" ,rust-lz4-1)
|
||||
("rust-snap" ,rust-snap-1)
|
||||
("rust-xz2" ,rust-xz2-0.1)
|
||||
("rust-zstd" ,rust-zstd-0.9))
|
||||
#:cargo-development-inputs
|
||||
`(("rust-clap" ,rust-clap-2)
|
||||
("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)
|
||||
("rust-rand" ,rust-rand-0.8)
|
||||
("rust-temp-testdir" ,rust-temp-testdir-0.2))))
|
||||
(inputs (list xz))
|
||||
(home-page "https://github.com/informationsea/autocompress-rs")
|
||||
(synopsis "Select decoder from magic bytes or encoder from file extension")
|
||||
(description
|
||||
"This crate lets you automatically select a suitable decoder from magic
|
||||
bytes or encoder from file extension.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public rust-autocfg-1
|
||||
(package
|
||||
(name "rust-autocfg")
|
||||
|
|
@ -6726,6 +6773,59 @@ provides implementations of many algorithms and data structures that are
|
|||
useful for bioinformatics, but also in other fields.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-bio-0.41
|
||||
(package
|
||||
(inherit rust-bio-0.39)
|
||||
(name "rust-bio")
|
||||
(version "0.41.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "bio" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11kmdd5rslnqjndldh7c2lzxsyapwz7fqm2yrkn3his460z44saa"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-anyhow" ,rust-anyhow-1)
|
||||
("rust-approx" ,rust-approx-0.5)
|
||||
("rust-bio-types" ,rust-bio-types-0.12)
|
||||
("rust-bit-set" ,rust-bit-set-0.5)
|
||||
("rust-bv" ,rust-bv-0.11)
|
||||
("rust-bytecount" ,rust-bytecount-0.6)
|
||||
("rust-csv" ,rust-csv-1)
|
||||
("rust-custom-derive" ,rust-custom-derive-0.1)
|
||||
("rust-enum-map" ,rust-enum-map-0.6)
|
||||
("rust-fxhash" ,rust-fxhash-0.2)
|
||||
("rust-getset" ,rust-getset-0.1)
|
||||
("rust-itertools" ,rust-itertools-0.10)
|
||||
("rust-itertools-num" ,rust-itertools-num-0.1)
|
||||
("rust-lazy-static" ,rust-lazy-static-1)
|
||||
("rust-multimap" ,rust-multimap-0.8)
|
||||
("rust-ndarray" ,rust-ndarray-0.15)
|
||||
("rust-newtype-derive" ,rust-newtype-derive-0.1)
|
||||
("rust-num-integer" ,rust-num-integer-0.1)
|
||||
("rust-num-traits" ,rust-num-traits-0.2)
|
||||
("rust-ordered-float" ,rust-ordered-float-1)
|
||||
("rust-pest" ,rust-pest-2)
|
||||
("rust-pest-derive" ,rust-pest-derive-2)
|
||||
("rust-petgraph" ,rust-petgraph-0.6)
|
||||
("rust-rand" ,rust-rand-0.8)
|
||||
("rust-regex" ,rust-regex-1)
|
||||
("rust-serde" ,rust-serde-1)
|
||||
("rust-serde-derive" ,rust-serde-derive-1)
|
||||
("rust-statrs" ,rust-statrs-0.15)
|
||||
("rust-strum" ,rust-strum-0.21)
|
||||
("rust-strum-macros" ,rust-strum-macros-0.21)
|
||||
("rust-thiserror" ,rust-thiserror-1)
|
||||
("rust-triple-accel" ,rust-triple-accel-0.4)
|
||||
("rust-vec-map" ,rust-vec-map-0.8))
|
||||
#:cargo-development-inputs
|
||||
(("rust-proptest" ,rust-proptest-1)
|
||||
("rust-rand" ,rust-rand-0.8)
|
||||
("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-bit-field-0.10
|
||||
(package
|
||||
(name "rust-bit-field")
|
||||
|
|
@ -58598,6 +58698,28 @@ loading and layout routines of XeTeX as a crate, currently providing only
|
|||
a C API.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-temp-testdir-0.2
|
||||
(package
|
||||
(name "rust-temp-testdir")
|
||||
(version "0.2.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "temp_testdir" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z5yv6d9944md5zg6g0sbahv7xjga2k232x40x4l20kq8af1w7wj"))))
|
||||
(build-system cargo-build-system)
|
||||
#;
|
||||
(arguments
|
||||
`(#:skip-build? #t))
|
||||
(home-page "https://github.com/la10736/temp_testdir")
|
||||
(synopsis "Use a temp directory")
|
||||
(description
|
||||
"This is a little crate to use a temp directory in crate. You can chose
|
||||
whether to delete it after use or not for debugging purposes.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-tempdir-0.3
|
||||
(package
|
||||
(name "rust-tempdir")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013-2018, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
|
|
@ -38,6 +38,7 @@
|
|||
#:use-module (guix i18n)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (ice-9 match)
|
||||
|
|
@ -398,39 +399,40 @@ target that libc."
|
|||
("cross-binutils" ,xbinutils)
|
||||
,@(package-native-inputs linux-headers)))))
|
||||
|
||||
(define xgnumach-headers-name
|
||||
(string-append (package-name gnumach-headers) "-cross-" target))
|
||||
|
||||
(define xgnumach-headers
|
||||
(package
|
||||
(inherit gnumach-headers)
|
||||
(name (string-append (package-name gnumach-headers)
|
||||
"-cross-" target))
|
||||
|
||||
(native-inputs `(("cross-gcc" ,xgcc)
|
||||
("cross-binutils" ,xbinutils)
|
||||
,@(package-native-inputs gnumach-headers)))))
|
||||
(name xgnumach-headers-name)
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs gnumach-headers)
|
||||
(prepend xgcc xbinutils)))))
|
||||
|
||||
(define xmig
|
||||
(package
|
||||
(inherit mig)
|
||||
(name (string-append "mig-cross"))
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'set-cross-headers-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((mach (assoc-ref inputs "cross-gnumach-headers"))
|
||||
(cpath (string-append mach "/include")))
|
||||
(for-each (cut setenv <> cpath)
|
||||
',%gcc-cross-include-paths)
|
||||
#t))))
|
||||
#:configure-flags (list ,(string-append "--target=" target))
|
||||
#:tests? #f))
|
||||
|
||||
(propagated-inputs `(("cross-gnumach-headers" ,xgnumach-headers)))
|
||||
(native-inputs `(("cross-gcc" ,xgcc)
|
||||
("cross-binutils" ,xbinutils)
|
||||
,@(package-native-inputs mig)))))
|
||||
(substitute-keyword-arguments (package-arguments mig)
|
||||
((#:configure-flags flags #~'())
|
||||
#~(list #$(string-append "--target=" target)))
|
||||
((#:tests? _ #f)
|
||||
#f)
|
||||
((#:phases phases #~%standard-phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-before 'configure 'set-cross-headers-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((mach #+(this-package-input xgnumach-headers-name))
|
||||
(cpath (string-append mach "/include")))
|
||||
(for-each (lambda (variable)
|
||||
(setenv variable cpath))
|
||||
'#$%gcc-cross-include-paths))))))))
|
||||
(propagated-inputs (list xgnumach-headers))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs mig)
|
||||
(prepend xgcc xbinutils)))))
|
||||
|
||||
(define xhurd-headers
|
||||
(package
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017, 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
|
||||
;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
|
||||
|
|
@ -2442,57 +2442,63 @@ similar to BerkeleyDB, LevelDB, etc.")
|
|||
(define-public redis
|
||||
(package
|
||||
(name "redis")
|
||||
(version "6.2.6")
|
||||
(version "7.0.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.redis.io/releases/redis-"
|
||||
version".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ariw5x33hmmm3d5al0j3307l5kf3vhmn78wpyaz67hia1x8nasv"))
|
||||
"0rczzcy2mwy6hjdgg10l9lr4vavh8jrs7zlb0ba534bwlk13awgp"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Delete bundled jemalloc, as the package will use the libc one
|
||||
'(begin (delete-file-recursively "deps/jemalloc")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list procps ; for tests
|
||||
tcl)) ; for tests
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'use-correct-tclsh
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "runtest"
|
||||
(("^TCLSH=.*")
|
||||
(string-append "TCLSH="
|
||||
(assoc-ref inputs "tcl")
|
||||
"/bin/tclsh")))))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda _
|
||||
;; Disable failing tests
|
||||
(substitute* "tests/test_helper.tcl"
|
||||
(("integration/failover") "")
|
||||
(("integration/replication-4") "")
|
||||
(("integration/replication-psync") "")
|
||||
(("integration/replication[^-]") "")))))
|
||||
#:make-flags `("CC=gcc"
|
||||
"MALLOC=libc"
|
||||
"LDFLAGS=-ldl"
|
||||
,(string-append "PREFIX="
|
||||
(assoc-ref %outputs "out")))))
|
||||
(list
|
||||
#:make-flags #~(list #$(string-append "CC=" (cc-for-target))
|
||||
"MALLOC=libc"
|
||||
"LDFLAGS=-ldl"
|
||||
(string-append "PREFIX=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda _
|
||||
(substitute* "runtest"
|
||||
(("^TCLSH=.*")
|
||||
(string-append "TCLSH=" (which "tclsh"))))
|
||||
(substitute* "tests/support/server.tcl"
|
||||
(("/usr/bin/env")
|
||||
(which "env")))))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda _
|
||||
;; Disable failing tests
|
||||
(substitute* "tests/test_helper.tcl"
|
||||
;; The AOF tests cause the test suite to hang waiting for a
|
||||
;; "background AOF rewrite to finish", perhaps because dead
|
||||
;; processes persist as zombies in the build environment.
|
||||
(("unit/aofrw") "")
|
||||
(("integration/aof(-multi-part)?") "")
|
||||
(("integration/failover") "")
|
||||
(("integration/replication-4") "")
|
||||
(("integration/replication-psync") "")
|
||||
(("integration/replication[^-]") "")))))))
|
||||
(native-inputs (list pkg-config procps tcl which))
|
||||
(synopsis "Key-value cache and store")
|
||||
(description "Redis is an advanced key-value cache and store. Redis
|
||||
supports many data structures including strings, hashes, lists, sets, sorted
|
||||
sets, bitmaps and hyperloglogs.")
|
||||
(home-page "https://redis.io/")
|
||||
;; These two CVEs have long been fixed.
|
||||
(properties `((lint-hidden-cve . ("CVE-2022-3647" "CVE-2022-33105"))))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public hiredis
|
||||
(package
|
||||
(name "hiredis")
|
||||
(version "1.0.2")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -2501,7 +2507,7 @@ sets, bitmaps and hyperloglogs.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0a55zk3qrw9yl27i87h3brg2hskmmzbfda77dhq9a4if7y70xnfb"))))
|
||||
(base32 "1zld30j3kpzqr9w3vkpd6mm3f1b1yk3dlgp9lp6gpsybjjfr2i6h"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
;; needed for testing
|
||||
|
|
@ -3273,14 +3279,14 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
|
|||
(define-public virtuoso-ose
|
||||
(package
|
||||
(name "virtuoso-ose")
|
||||
(version "7.2.7")
|
||||
(version "7.2.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/"
|
||||
"virtuoso-opensource-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1853ln0smiilf3pni70gq6nmi9ps039cy44g6b5i9d2z1n9hnj02"))
|
||||
(base32 "145s4lqixdxa3j0lp9lgzbb664zzy1imw04hmgia5y5679i8r0xy"))
|
||||
(patches (search-patches "virtuoso-ose-remove-pre-built-jar-files.patch"))
|
||||
(modules '((guix build utils)))
|
||||
;; This snippet removes pre-built Java archives.
|
||||
|
|
@ -3353,7 +3359,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
|
|||
(native-inputs
|
||||
(list autoconf automake bison flex gperf libtool))
|
||||
(inputs
|
||||
(list openssl net-tools readline zlib))
|
||||
(list openssl net-tools readline which zlib))
|
||||
(home-page "https://vos.openlinksw.com/owiki/wiki/VOS/")
|
||||
(synopsis "Multi-model database system")
|
||||
(description "Virtuoso is a scalable cross-platform server that combines
|
||||
|
|
@ -3898,77 +3904,60 @@ for Python. The design goals are:
|
|||
(define-public python-hiredis
|
||||
(package
|
||||
(name "python-hiredis")
|
||||
(version "0.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "hiredis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1dfm2k9l9zar9nw9fwmm74zrgraxdxs04vx9li56fjcf289qx5fa"))))
|
||||
(build-system python-build-system)
|
||||
(version "2.2.2")
|
||||
(source (origin
|
||||
(method git-fetch) ;for tests
|
||||
(uri (git-reference
|
||||
(url "https://github.com/redis/hiredis-py")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"066rm5m7aa8skm0a57cf45153bwmbl9yyi4s60an14hb25n947gi"))
|
||||
(patches
|
||||
(search-patches "python-hiredis-fix-header.patch"
|
||||
"python-hiredis-use-system-hiredis.patch"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
;; no tests
|
||||
`(#:tests? #f))
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(add-before 'check 'delete-extraneous-__init__.py
|
||||
(lambda _
|
||||
;; The fix was forwarded upstream, see:
|
||||
;; https://github.com/redis/hiredis-py/pull/160.
|
||||
(delete-file "tests/__init__.py"))))))
|
||||
(native-inputs (list python-pytest))
|
||||
(inputs (list hiredis))
|
||||
(home-page "https://github.com/redis/hiredis-py")
|
||||
(synopsis "Python extension that wraps protocol parsing code in hiredis")
|
||||
(description "Python-hiredis is a python extension that wraps protocol
|
||||
parsing code in hiredis. It primarily speeds up parsing of multi bulk replies.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-aioredis
|
||||
(package
|
||||
(name "python-aioredis")
|
||||
(version "2.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "aioredis" version))
|
||||
(sha256
|
||||
(base32 "13nrkk45az6qdiwfpbw80ls6bfip0i27qlkh9gsp2b9zk6pim9ga"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(add-before 'check 'start-redis
|
||||
(lambda _
|
||||
(invoke "redis-server" "--daemonize" "yes")))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "pytest" "-vv")))))))
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-pytest-asyncio
|
||||
python-uvloop
|
||||
redis))
|
||||
(propagated-inputs
|
||||
(list python-async-timeout
|
||||
python-hiredis
|
||||
python-typing-extensions))
|
||||
(home-page "https://github.com/aio-libs/aioredis-py")
|
||||
(synopsis "Redis support for Python's @code{asyncio} module")
|
||||
(description "This package provides Redis support for the Python
|
||||
@code{asyncio} (PEP 3156) module.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-fakeredis
|
||||
(package
|
||||
(name "python-fakeredis")
|
||||
(version "1.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "fakeredis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1v68my2v7fg44zwky3k5d52nn1bi0szpgdslghrpa2ifnjhlnb3w"))))
|
||||
(build-system python-build-system)
|
||||
(version "2.10.1")
|
||||
(source (origin
|
||||
(method git-fetch) ;for tests
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cunla/fakeredis-py")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1imsi9dswvkda894sm53lfzdsna0qlrgxszczlq2sam68zn4hfz6"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
;; no tests
|
||||
`(#:tests? #f))
|
||||
(propagated-inputs
|
||||
(list python-aioredis python-packaging python-redis python-sortedcontainers))
|
||||
(home-page "https://github.com/jamesls/fakeredis")
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'relax-requirements
|
||||
(lambda _
|
||||
(substitute* "pyproject.toml"
|
||||
(("sortedcontainers = \"\\^2\\.4\"")
|
||||
"sortedcontainers = \"^2.1\"")))))))
|
||||
(native-inputs (list python-poetry-core python-pytest
|
||||
python-pytest-asyncio python-pytest-mock))
|
||||
(propagated-inputs (list python-redis python-sortedcontainers))
|
||||
(home-page "https://github.com/cunla/fakeredis-py")
|
||||
(synopsis "Fake implementation of redis API for testing purposes")
|
||||
(description
|
||||
"Fakeredis is a pure-Python implementation of the redis-py Python client
|
||||
|
|
@ -3983,25 +3972,63 @@ reasonable substitute.")
|
|||
(define-public python-redis
|
||||
(package
|
||||
(name "python-redis")
|
||||
(version "3.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "redis" version))
|
||||
(sha256
|
||||
(base32 "18h5b87g15x3j6pb1h2q27ri37p2qpvc9n2wgn5yl3b6m3y0qzhf"))))
|
||||
(build-system python-build-system)
|
||||
;; Tests require a running Redis server.
|
||||
(arguments '(#:tests? #f))
|
||||
;; As long as we are not running test, we do not need this input :-)
|
||||
;;(native-inputs
|
||||
;; `(("python-pytest" ,python-pytest)))
|
||||
(home-page "https://github.com/andymccurdy/redis-py")
|
||||
(version "4.5.2")
|
||||
(source (origin
|
||||
;; The PyPI archive lacks some test resources such as the TLS
|
||||
;; certificates under docker/stunnel/keys.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/redis/redis-py")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cz3gji3rb1h5dczyl11hm42wgsbz5v896cgbi14dij160b7m35i"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-flags
|
||||
#~(list "-m"
|
||||
;; These tests are disabled in the official CI run (see:
|
||||
;; https://raw.githubusercontent.com/redis/redis-py/master/
|
||||
;; .github/workflows/install_and_test.sh).
|
||||
(string-append "not onlycluster "
|
||||
"and not redismod "
|
||||
"and not ssl")
|
||||
"-k" (string-append
|
||||
;; The autoclaim test fails with "AssertionError: assert
|
||||
;; [b'0-0', [], []] == [b'0-0', []]".
|
||||
"not test_xautoclaim "
|
||||
;; These tests cause the following error: "Error 111
|
||||
;; connecting to localhost:6380. Connection refused."
|
||||
;; (see: https://github.com/redis/redis-py/issues/2109).
|
||||
"and not test_sync "
|
||||
"and not test_psync"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Tests require a running Redis server.
|
||||
(add-before 'check 'start-redis
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "redis-server" "--daemonize" "yes"
|
||||
"--enable-debug-command" "yes"
|
||||
"--enable-module-command" "local")))))))
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-pytest-asyncio
|
||||
python-pytest-timeout
|
||||
redis))
|
||||
(propagated-inputs
|
||||
(list python-async-timeout))
|
||||
(home-page "https://github.com/redis/redis-py")
|
||||
(synopsis "Redis Python client")
|
||||
(description
|
||||
"This package provides a Python interface to the Redis key-value store.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-aioredis
|
||||
(deprecated-package "python-aioredis" python-redis))
|
||||
|
||||
(define-public python-rq
|
||||
(package
|
||||
(name "python-rq")
|
||||
|
|
@ -4163,7 +4190,7 @@ the SQL language using a syntax that reflects the resulting query.")
|
|||
(define-public apache-arrow
|
||||
(package
|
||||
(name "apache-arrow")
|
||||
(version "10.0.1")
|
||||
(version "11.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -4173,7 +4200,7 @@ the SQL language using a syntax that reflects the resulting query.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0skw6x888i804pg35xaxqwkkb36z9hj966zs3ckhkbp4mcll9q9v"))))
|
||||
"06d3jjxagj5f14j9c48rh63x7pr9f96v69anjnpc6lakr0gkpi1d"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018, 2019, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018, 2019, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2021 Tanguy Le Carrour <tanguy@bioneland.org>
|
||||
|
|
@ -122,13 +122,13 @@ efficient syncing
|
|||
(define-public vdirsyncer
|
||||
(package
|
||||
(name "vdirsyncer")
|
||||
(version "0.19.0")
|
||||
(version "0.19.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf"))))
|
||||
"1bh3kz0d8g07xnlkb5l2fj6fdakqps1wviab6zv139x5b9rcfxma"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; The test suite is very flakey.
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
(define-public diffoscope
|
||||
(package
|
||||
(name "diffoscope")
|
||||
(version "233")
|
||||
(version "238")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb"))))
|
||||
(base32 "11bib2h149b4jzxqhdi3dwivk6m4rvzjl8kg2n68sykgwa2fv24p"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
@ -194,7 +194,7 @@
|
|||
openssh
|
||||
openssl
|
||||
pgpdump
|
||||
poppler
|
||||
poppler-next
|
||||
python-jsbeautifier
|
||||
r-minimal
|
||||
rpm
|
||||
|
|
@ -239,7 +239,7 @@ install.")
|
|||
(define-public reprotest
|
||||
(package
|
||||
(name "reprotest")
|
||||
(version "0.7.22")
|
||||
(version "0.7.23")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -248,7 +248,7 @@ install.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0qpjg37x2ha7lb113fb5cic5if3zv30zqijsmkq91ld909x30ggd"))))
|
||||
(base32 "0hkzh4i3c5hrbvdkhbmwm5vmb4msnlm5rvhjin6h2ni40kix69g0"))))
|
||||
(inputs
|
||||
(list python-debian python-distro python-libarchive-c python-rstr))
|
||||
(native-inputs
|
||||
|
|
@ -272,9 +272,7 @@ install.")
|
|||
(add-after 'unpack 'adjust-locales
|
||||
(lambda _
|
||||
(substitute* "reprotest/build.py"
|
||||
(("'C.UTF-8'") "'en_US.UTF-8'")
|
||||
(("'ru_RU.CP1251'") "'ru_RU.KOI8-R'")
|
||||
(("'kk_KZ.RK1048'") "'kk_KZ'"))
|
||||
(("'C.UTF-8'") "'en_US.UTF-8'"))
|
||||
(substitute* "reprotest/lib/adt_testbed.py"
|
||||
(("export LANG=C.UTF-8") "export LANG=en_US.UTF-8"))
|
||||
#t))
|
||||
|
|
|
|||
|
|
@ -868,13 +868,13 @@ support, and optional data-URI image and font embedding.")
|
|||
(define-public python-django-rq
|
||||
(package
|
||||
(name "python-django-rq")
|
||||
(version "2.3.2")
|
||||
(version "2.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-rq" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0lksnjn3q3f7y72bj2yr8870w28a5b6x0vjnd9nhpq2ah6xfz6pf"))))
|
||||
"0aw0fi0lg80qgdp9fhjbnlhvfh2p09rgy1nj6hxpyhi37kihni2h"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
@ -882,7 +882,7 @@ support, and optional data-URI image and font embedding.")
|
|||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "redis-server" "--daemonize" "yes")
|
||||
(invoke "django-admin.py" "test" "django_rq"
|
||||
(invoke "django-admin" "test" "django_rq"
|
||||
"--settings=django_rq.tests.settings"
|
||||
"--pythonpath=."))))))
|
||||
(native-inputs
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -24,6 +24,7 @@
|
|||
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2023 Declan Tsien <declantsien@riseup.net>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -424,54 +425,43 @@ languages.")
|
|||
(let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
|
||||
(revision "0"))
|
||||
(package
|
||||
(inherit emacs)
|
||||
(inherit emacs-next)
|
||||
(name "emacs-next-tree-sitter")
|
||||
(version (git-version "30.0.50" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source emacs))
|
||||
(inherit (package-source emacs-next))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.gnu.org/git/emacs.git/")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
;; emacs-source-date-epoch.patch is no longer necessary
|
||||
(patches (search-patches "emacs-exec-path.patch"
|
||||
"emacs-fix-scheme-indent-function.patch"
|
||||
"emacs-native-comp-driver-options.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs emacs)
|
||||
(modify-inputs (package-inputs emacs-next)
|
||||
(prepend sqlite tree-sitter)))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs emacs)
|
||||
(prepend autoconf))))))
|
||||
(synopsis "Emacs text editor with @code{tree-sitter} support")
|
||||
(description "This Emacs build supports tree-sitter."))))
|
||||
|
||||
(define-public emacs-next-pgtk
|
||||
(package
|
||||
(inherit emacs-next)
|
||||
(inherit emacs-next-tree-sitter)
|
||||
(name "emacs-next-pgtk")
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source emacs-next))
|
||||
(inherit (package-source emacs-next-tree-sitter))
|
||||
(patches
|
||||
(append (search-patches "emacs-pgtk-super-key-fix.patch")
|
||||
(origin-patches (package-source emacs-next))))))
|
||||
(origin-patches (package-source emacs-next-tree-sitter))))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments emacs-next)
|
||||
(substitute-keyword-arguments (package-arguments emacs-next-tree-sitter)
|
||||
((#:configure-flags flags #~'())
|
||||
#~(cons* "--with-pgtk" "--with-xwidgets" #$flags))))
|
||||
(propagated-inputs
|
||||
(list gsettings-desktop-schemas glib-networking))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs emacs-next)
|
||||
(prepend webkitgtk-with-libsoup2)))
|
||||
(home-page "https://github.com/masm11/emacs")
|
||||
(synopsis "Emacs text editor with @code{pgtk} and @code{xwidgets} support")
|
||||
(description "This Emacs build implements graphical UI purely in terms of
|
||||
GTK and also enables xwidgets.")))
|
||||
#~(cons* "--with-pgtk" #$flags))))
|
||||
(synopsis "Emacs text editor with @code{pgtk} and @code{tree-sitter} support")
|
||||
(description "This Emacs build implements graphical UI purely in terms
|
||||
of GTK and supports tree-sitter.")))
|
||||
|
||||
(define-public emacs-minimal
|
||||
;; This is the version that you should use as an input to packages that just
|
||||
|
|
@ -641,7 +631,7 @@ editor (with wide ints)" )
|
|||
(base32
|
||||
"0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
@ -674,8 +664,16 @@ This package contains the library database.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"))))
|
||||
"0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"))
|
||||
(patches (search-patches "m17n-lib-1.8.0-use-pkg-config-for-freetype.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(if (%current-target-system)
|
||||
(list pkg-config
|
||||
libtool
|
||||
gettext-minimal
|
||||
autoconf automake)
|
||||
'()))
|
||||
(inputs
|
||||
(list fribidi
|
||||
gd
|
||||
|
|
@ -684,7 +682,20 @@ This package contains the library database.")
|
|||
libxml2
|
||||
m17n-db))
|
||||
(arguments
|
||||
`(#:parallel-build? #f))
|
||||
`(#:parallel-build? #f
|
||||
,@(if (%current-target-system)
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; AC_FUNC_MALLOC and AC_FUNC_REALLOC usually unneeded
|
||||
;; see https://lists.gnu.org/archive/html/autoconf/2003-02/msg00017.html
|
||||
(add-after 'unpack 'fix-rpl_malloc
|
||||
(lambda _
|
||||
(substitute* "configure.ac"
|
||||
(("AC_FUNC_MALLOC") "")
|
||||
(("AC_FUNC_REALLOC") ""))
|
||||
;; let bootstrap phase run.
|
||||
(delete-file "./configure")))))
|
||||
'())))
|
||||
;; With `guix lint' the home-page URI returns a small page saying
|
||||
;; that your browser does not handle frames. This triggers the "URI
|
||||
;; returns suspiciously small file" warning.
|
||||
|
|
|
|||
|
|
@ -1420,7 +1420,7 @@ as RetroArch.")
|
|||
(define-public retroarch
|
||||
(package
|
||||
(name "retroarch")
|
||||
(version "1.9.11")
|
||||
(version "1.15.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1429,9 +1429,7 @@ as RetroArch.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0hd77kw1f655s40qcz1righdhd9czqyy40rf7gigdag1bkchdx6z"))
|
||||
(patches
|
||||
(search-patches "retroarch-LIBRETRO_DIRECTORY.patch"))))
|
||||
(base32 "1ii31mc7wfd386rzyxqk8nmx5a13f9iqz47991z4zx0d8gqcchzg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
|
@ -1449,13 +1447,6 @@ as RetroArch.")
|
|||
(substitute* "gfx/common/wayland/generate_wayland_protos.sh"
|
||||
(("/usr/local/share/wayland-protocols")
|
||||
(string-append wayland-protocols "/share/wayland-protocols")))
|
||||
(substitute* "qb/qb.libs.sh"
|
||||
(("/bin/true") (which "true")))
|
||||
|
||||
;; Use shared zlib.
|
||||
(substitute* '("libretro-common/file/archive_file_zlib.c"
|
||||
"libretro-common/streams/trans_stream_zlib.c")
|
||||
(("<compat/zlib.h>") "<zlib.h>"))
|
||||
|
||||
;; The configure script does not yet accept the extra arguments
|
||||
;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
|
||||
|
|
@ -1469,7 +1460,7 @@ as RetroArch.")
|
|||
;; Non-free software are available through the core updater,
|
||||
;; disable it. See <https://issues.guix.gnu.org/38360>.
|
||||
"--disable-update_cores"
|
||||
"--disable-builtinminiupnpc")))))))
|
||||
"--disable-builtinzlib")))))))
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
("ffmpeg" ,ffmpeg-4)
|
||||
|
|
@ -1480,7 +1471,6 @@ as RetroArch.")
|
|||
("libxrandr" ,libxrandr)
|
||||
("libxv" ,libxv)
|
||||
("mesa" ,mesa)
|
||||
("miniupnpc" ,miniupnpc)
|
||||
("openal" ,openal)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("python" ,python)
|
||||
|
|
@ -1561,14 +1551,14 @@ that compiles to WebAssembly.")
|
|||
(define-public scummvm
|
||||
(package
|
||||
(name "scummvm")
|
||||
(version "2.6.1")
|
||||
(version "2.7.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
|
||||
"/scummvm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1s8psdn3a3hqvvfgmlfxrqqdw8hbr0zyrvirzsnzh6yxmgpvkbwg"))))
|
||||
(base32 "14wrrzai25mh8qra3lsfibx8z6f96cqbnmsfh9kyhkvpc7yiyjs4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
|
||||
;;; Copyright © 2016, 2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
|
|
@ -302,112 +302,115 @@ utilities.")
|
|||
(home-page "https://github.com/lepton-eda/lepton-eda")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit version)))
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"0kyq0g6271vlwraw98637fn8bq2l6q4rll6748nn8rwsmfz71d0m"))
|
||||
(file-name (git-file-name name version))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("desktop-file-utils" ,desktop-file-utils)
|
||||
("libtool" ,libtool)
|
||||
("gettext" ,gettext-minimal)
|
||||
("texinfo" ,texinfo)
|
||||
("groff" ,groff)
|
||||
("which" ,which)
|
||||
,@(package-native-inputs geda-gaf)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("gtk" ,gtk+)
|
||||
("gtksheet" ,gtksheet)
|
||||
("guile" ,guile-3.0)
|
||||
("shared-mime-info" ,shared-mime-info)
|
||||
("m4" ,m4)
|
||||
("pcb" ,pcb)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(let ((pcb (assoc-ref %build-inputs "pcb")))
|
||||
;; When running "make", the POT files are built with the build time as
|
||||
;; their "POT-Creation-Date". Later on, "make" notices that .pot
|
||||
;; files were updated and goes on to run "msgmerge"; as a result, the
|
||||
;; non-deterministic POT-Creation-Date finds its way into .po files,
|
||||
;; and then in .gmo files. To avoid that, simply make sure 'msgmerge'
|
||||
;; never runs. See <https://bugs.debian.org/792687>.
|
||||
(list "ac_cv_path_MSGMERGE=true"
|
||||
"--with-gtk3"
|
||||
(string-append "--with-pcb-datadir=" pcb "/share")
|
||||
(string-append "--with-pcb-lib-path="
|
||||
pcb "/share/pcb/pcblib-newlib:"
|
||||
pcb "/share/pcb/newlib")
|
||||
"CFLAGS=-fcommon"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'fix-dynamic-link
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(substitute* "libleptongui/scheme/schematic/ffi.scm.in"
|
||||
(("@LIBLEPTONGUI@")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/lib/libleptongui.so")))
|
||||
(substitute* '("libleptongui/scheme/schematic/ffi/gtk.scm.in"
|
||||
"utils/attrib/lepton-attrib.scm")
|
||||
(("@LIBGTK@")
|
||||
(search-input-file inputs "/lib/libgtk-3.so")))
|
||||
(substitute* '("libleptongui/scheme/schematic/ffi/gobject.scm.in")
|
||||
(("@LIBGOBJECT@")
|
||||
(search-input-file inputs "/lib/libgobject-2.0.so")))
|
||||
(substitute* "liblepton/scheme/lepton/ffi.scm.in"
|
||||
(("@LIBLEPTON@")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/lib/liblepton.so")))
|
||||
(substitute* "utils/attrib/lepton-attrib.scm"
|
||||
(("@LIBLEPTONATTRIB@")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/lib/libleptonattrib.so")))
|
||||
(substitute* "liblepton/scheme/lepton/log.scm.in"
|
||||
(("@LIBGLIB@")
|
||||
(search-input-file inputs "/lib/libglib-2.0.so")))
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(let ((pcb #$(this-package-input "pcb")))
|
||||
;; When running "make", the POT files are built with the build time as
|
||||
;; their "POT-Creation-Date". Later on, "make" notices that .pot
|
||||
;; files were updated and goes on to run "msgmerge"; as a result, the
|
||||
;; non-deterministic POT-Creation-Date finds its way into .po files,
|
||||
;; and then in .gmo files. To avoid that, simply make sure 'msgmerge'
|
||||
;; never runs. See <https://bugs.debian.org/792687>.
|
||||
(list "ac_cv_path_MSGMERGE=true" "--with-gtk3"
|
||||
(string-append "--with-pcb-datadir=" pcb
|
||||
"/share")
|
||||
(string-append "--with-pcb-lib-path=" pcb
|
||||
"/share/pcb/pcblib-newlib:"
|
||||
pcb "/share/pcb/newlib")
|
||||
"CFLAGS=-fcommon"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'build 'fix-dynamic-link
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(substitute* "libleptongui/scheme/schematic/ffi.scm.in"
|
||||
(("@LIBLEPTONGUI@")
|
||||
(string-append #$output "/lib/libleptongui.so")))
|
||||
(substitute* '("libleptongui/scheme/schematic/ffi/gtk.scm.in"
|
||||
"utils/attrib/lepton-attrib.scm")
|
||||
(("@LIBGTK@")
|
||||
(search-input-file inputs "/lib/libgtk-3.so")))
|
||||
(substitute* '("libleptongui/scheme/schematic/ffi/gobject.scm.in")
|
||||
(("@LIBGOBJECT@")
|
||||
(search-input-file inputs "/lib/libgobject-2.0.so")))
|
||||
(substitute* "liblepton/scheme/lepton/ffi.scm.in"
|
||||
(("@LIBLEPTON@")
|
||||
(string-append #$output "/lib/liblepton.so")))
|
||||
(substitute* "utils/attrib/lepton-attrib.scm"
|
||||
(("@LIBLEPTONATTRIB@")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/lib/libleptonattrib.so")))
|
||||
(substitute* "liblepton/scheme/lepton/log.scm.in"
|
||||
(("@LIBGLIB@")
|
||||
(search-input-file inputs "/lib/libglib-2.0.so")))
|
||||
|
||||
;; For finding libraries when running tests before installation.
|
||||
(setenv "LIBLEPTONGUI"
|
||||
(string-append (getcwd)
|
||||
"/libleptongui/src/.libs/libleptongui.so"))
|
||||
(setenv "LIBLEPTON"
|
||||
(string-append (getcwd)
|
||||
"/libleptongui/src/.libs/liblepton.so"))
|
||||
(setenv "LD_LIBRARY_PATH"
|
||||
(string-append (getcwd) "/libleptonattrib/src/.libs/:"
|
||||
(getenv "LIBRARY_PATH")))
|
||||
#t))
|
||||
(add-before 'bootstrap 'prepare
|
||||
(lambda _
|
||||
;; Some of the scripts there are invoked by autogen.sh.
|
||||
(for-each patch-shebang (find-files "build-tools"))
|
||||
;; For finding libraries when running tests before installation.
|
||||
(setenv "LIBLEPTONGUI"
|
||||
(string-append (getcwd)
|
||||
"/libleptongui/src/.libs/libleptongui.so"))
|
||||
(setenv "LIBLEPTON"
|
||||
(string-append (getcwd)
|
||||
"/libleptongui/src/.libs/liblepton.so"))
|
||||
(setenv "LD_LIBRARY_PATH"
|
||||
(string-append (getcwd)
|
||||
"/libleptonattrib/src/.libs/:"
|
||||
(getenv "LIBRARY_PATH")))))
|
||||
(add-before 'bootstrap 'prepare
|
||||
(lambda _
|
||||
;; Some of the scripts there are invoked by autogen.sh.
|
||||
(for-each patch-shebang
|
||||
(find-files "build-tools"))
|
||||
|
||||
;; Make sure 'msgmerge' can modify the PO files.
|
||||
(for-each (lambda (po)
|
||||
(chmod po #o666))
|
||||
(find-files "." "\\.po$"))
|
||||
;; Make sure 'msgmerge' can modify the PO files.
|
||||
(for-each (lambda (po)
|
||||
(chmod po #o666))
|
||||
(find-files "." "\\.po$"))
|
||||
|
||||
;; This would normally be created by invoking 'git', but it
|
||||
;; doesn't work here.
|
||||
(call-with-output-file "version.h"
|
||||
(lambda (port)
|
||||
(format port "#define PACKAGE_DATE_VERSION \"~a\"~%"
|
||||
,(string-drop version
|
||||
(+ 1 (string-index version #\-))))
|
||||
(format port "#define PACKAGE_DOTTED_VERSION \"~a\"~%"
|
||||
,(string-take version
|
||||
(string-index version #\-)))
|
||||
(format port "#define PACKAGE_GIT_COMMIT \"cabbag3\"~%")))
|
||||
#t))
|
||||
(add-after 'install 'compile-scheme-files
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(unsetenv "LIBLEPTONGUI")
|
||||
(unsetenv "LIBLEPTON")
|
||||
(unsetenv "LD_LIBRARY_PATH")
|
||||
(invoke "make" "precompile")
|
||||
#t)))))
|
||||
;; This would normally be created by invoking 'git', but it
|
||||
;; doesn't work here.
|
||||
(call-with-output-file "version.h"
|
||||
(lambda (port)
|
||||
(format port "#define PACKAGE_DATE_VERSION \"~a\"~%"
|
||||
#$(string-drop version
|
||||
(+ 1
|
||||
(string-index version #\-))))
|
||||
(format port
|
||||
"#define PACKAGE_DOTTED_VERSION \"~a\"~%"
|
||||
#$(string-take version
|
||||
(string-index version #\-)))
|
||||
(format port
|
||||
"#define PACKAGE_GIT_COMMIT \"cabbag3\"~%")))))
|
||||
(add-after 'install 'compile-scheme-files
|
||||
(lambda _
|
||||
(unsetenv "LIBLEPTONGUI")
|
||||
(unsetenv "LIBLEPTON")
|
||||
(unsetenv "LD_LIBRARY_PATH")
|
||||
(invoke "make" "precompile"))))))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs geda-gaf)
|
||||
(prepend autoconf
|
||||
automake
|
||||
desktop-file-utils
|
||||
libtool
|
||||
gettext-minimal
|
||||
texinfo
|
||||
groff
|
||||
which)))
|
||||
(inputs
|
||||
(list glib
|
||||
gtk+
|
||||
gtksheet
|
||||
guile-3.0
|
||||
shared-mime-info
|
||||
m4
|
||||
pcb))
|
||||
(description
|
||||
"Lepton EDA ia an @dfn{electronic design automation} (EDA) tool set
|
||||
forked from gEDA/gaf in late 2016. EDA tools are used for electrical circuit
|
||||
|
|
@ -417,71 +420,85 @@ materials (BOM) generation, netlisting into over 20 netlist formats, analog
|
|||
and digital simulation, and printed circuit board (PCB) layout, and many other
|
||||
features.")))
|
||||
|
||||
(define-public librnd
|
||||
(package
|
||||
(name "librnd")
|
||||
(version "4.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.repo.hu/projects/librnd/releases/"
|
||||
"librnd-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fqh7gf9imhghlfajrsgzjx61mynfmdasciwpcajk7pn85d4ymql"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #false ;no check target
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'cc-is-gcc
|
||||
(lambda _ (setenv "CC" "gcc")))
|
||||
(replace 'configure
|
||||
;; The configure script doesn't tolerate most of our configure flags.
|
||||
(lambda _
|
||||
(invoke "sh" "configure"
|
||||
(string-append "--prefix=" #$output)))))))
|
||||
(inputs
|
||||
(list gd gtk glib glu))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(home-page "http://repo.hu/projects/librnd/")
|
||||
(synopsis "Two-dimensional CAD engine")
|
||||
(description "This is a flexible, modular two-dimensional CAD engine
|
||||
@itemize
|
||||
@item with transparent multiple GUI toolkit support;
|
||||
@item a flexible, dynamic menu system;
|
||||
@item a flexible, dynamic configuration system; and
|
||||
@item support for user scripting in a dozen languages.
|
||||
@end itemize")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public pcb
|
||||
(package
|
||||
(name "pcb")
|
||||
(version "4.0.2")
|
||||
(version "4.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/pcb/pcb/pcb-" version
|
||||
"/pcb-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a7rilp75faidny0r4fdwdxkflyrqp6svxv9lbg7h868293962iz"))))
|
||||
"0ppv8cblw0h70laly4zp8gmbxkbzzhbbjgw13pssgaw4mx32z1df"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'use-wish8.6
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("wish85") "wish8.6"))
|
||||
#t))
|
||||
;; It checks for "xhost", which we don't have. This shouldn't
|
||||
;; matter, because the test is supposed to be skipped, but it causes
|
||||
;; "run_tests.sh" (and thus the "check" phase) to fail.
|
||||
(add-after 'unpack 'fix-check-for-display
|
||||
(lambda _
|
||||
(substitute* "tests/run_tests.sh"
|
||||
(("have_display=no") "have_display=yes"))
|
||||
#t))
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a
|
||||
;; fix of the mesa package we wrap the pcb executable such that
|
||||
;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(path (dirname
|
||||
(search-input-file inputs "/lib/libudev.so"))))
|
||||
(wrap-program (string-append out "/bin/pcb")
|
||||
`("LD_LIBRARY_PATH" ":" prefix (,path))))
|
||||
#t))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1"))))))
|
||||
(inputs
|
||||
`(("dbus" ,dbus)
|
||||
("mesa" ,mesa)
|
||||
("udev" ,eudev) ;FIXME: required by mesa
|
||||
("glu" ,glu)
|
||||
("gd" ,gd)
|
||||
("gtk" ,gtk+-2)
|
||||
("gtkglext" ,gtkglext)
|
||||
("shared-mime-info" ,shared-mime-info)
|
||||
("tk" ,tk)))
|
||||
(list dbus
|
||||
mesa
|
||||
glu
|
||||
gd
|
||||
gtk+-2
|
||||
gtkglext
|
||||
shared-mime-info
|
||||
tk))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)
|
||||
("bison" ,bison)
|
||||
("desktop-file-utils" ,desktop-file-utils)
|
||||
("flex" ,flex)
|
||||
;; For tests
|
||||
("imagemagick" ,imagemagick)
|
||||
("gerbv" ,gerbv)
|
||||
("ghostscript" ,ghostscript)
|
||||
("xvfb" ,xorg-server-for-tests)))
|
||||
(list bison
|
||||
desktop-file-utils
|
||||
flex
|
||||
intltool
|
||||
pkg-config
|
||||
;; For tests
|
||||
imagemagick
|
||||
gerbv
|
||||
ghostscript
|
||||
xorg-server-for-tests))
|
||||
(home-page "http://pcb.geda-project.org/")
|
||||
(synopsis "Design printed circuit board layouts")
|
||||
(description
|
||||
|
|
@ -494,26 +511,30 @@ optimizer; and it can produce photorealistic and design review images.")
|
|||
(define-public pcb-rnd
|
||||
(package (inherit pcb)
|
||||
(name "pcb-rnd")
|
||||
(version "2.2.4")
|
||||
(version "3.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://repo.hu/projects/pcb-rnd/releases/"
|
||||
"pcb-rnd-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06ylc2rd4yvzp3krk62q9dbi13h0yq1x257fbjkh10vfjn0ga5c2"))))
|
||||
"0yw4sf4qrmmai48f3f5byn2fphc453myjszh3sy9z0dnfcz3x7fw"))))
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'cc-is-gcc
|
||||
(lambda _ (setenv "CC" "gcc") #t))
|
||||
(replace 'configure
|
||||
;; The configure script doesn't tolerate most of our configure flags.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(invoke "sh" "configure"
|
||||
(string-append "--prefix="
|
||||
(assoc-ref outputs "out"))))))))
|
||||
(list
|
||||
#:tests? #false ;no check target
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'cc-is-gcc
|
||||
(lambda _ (setenv "CC" "gcc")))
|
||||
(replace 'configure
|
||||
;; The configure script doesn't tolerate most of our configure flags.
|
||||
(lambda _
|
||||
(setenv "LIBRND_PREFIX" #$(this-package-input "librnd"))
|
||||
(invoke "sh" "configure"
|
||||
(string-append "--prefix=" #$output)))))))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs pcb)
|
||||
(append librnd)))
|
||||
(home-page "http://repo.hu/projects/pcb-rnd/")
|
||||
(description "PCB RND is a fork of the GNU PCB circuit board editing tool
|
||||
featuring various improvements and bug fixes.")))
|
||||
|
|
@ -947,7 +968,7 @@ Emacs).")
|
|||
(define-public kicad
|
||||
(package
|
||||
(name "kicad")
|
||||
(version "7.0.0")
|
||||
(version "7.0.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -955,7 +976,7 @@ Emacs).")
|
|||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw"))
|
||||
"021safxvyq9qzs08jy3jvpazmhvix4kyl05s9y9hwmyzdmdl2smn"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
|
|
@ -1055,7 +1076,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0xsj3fl6gkvyr97gx3nvy4ylcr6sc4byj4hbgcdwl2zx3wm02ifz"))))
|
||||
"1cy9w10wzdjm9z9vzv88ija6l3pp894hwcgz5jggjrnyazhpklvj"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "-DBUILD_FORMATS=html")
|
||||
|
|
@ -1089,7 +1110,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm"))))
|
||||
"14c5gci13m30xv0cmic5jxsmfx9lq3fnd8hyq3mmgkrw7443zy30"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no tests exist
|
||||
|
|
@ -1118,7 +1139,7 @@ libraries.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry"))))
|
||||
"0k0z40wmaq665hjxb6kp1yl3v7clxz49r6ki0chyphsxv1cnixmy"))))
|
||||
(synopsis "Official KiCad footprint libraries")
|
||||
(description "This package contains the official KiCad footprint libraries.")))
|
||||
|
||||
|
|
@ -1135,7 +1156,7 @@ libraries.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n"))))
|
||||
"0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"))))
|
||||
(synopsis "Official KiCad 3D model libraries")
|
||||
(description "This package contains the official KiCad 3D model libraries.")))
|
||||
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ and dynamically with report tools based on filtering and graphical charts.")
|
|||
(define-public ledger
|
||||
(package
|
||||
(name "ledger")
|
||||
(version "3.2.1")
|
||||
(version "3.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -321,14 +321,7 @@ and dynamically with report tools based on filtering and graphical charts.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"))
|
||||
(snippet '(begin
|
||||
;; Remove test that fails due to difference in
|
||||
;; reported error message (missing leading "./" in the
|
||||
;; file name); started some time after Guix commit
|
||||
;; 727f05e1e285aa52f5a19ec923fdc2259859b4b1
|
||||
(delete-file "test/regress/BF3C1F82-2.test")
|
||||
#true))))
|
||||
(base32 "13bbnfb08ymm54wg12dapqhalh7iialfs66qdbk2adl1aaq36wqa"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:modules (,@%cmake-build-system-modules
|
||||
|
|
@ -370,10 +363,6 @@ and dynamically with report tools based on filtering and graphical charts.")
|
|||
(setenv "TZDIR"
|
||||
(search-input-directory inputs
|
||||
"share/zoneinfo"))
|
||||
;; Skip failing test BaselineTest_cmd-org.
|
||||
;; This is a known upstream issue. See
|
||||
;; https://github.com/ledger/ledger/issues/550
|
||||
(setenv "ARGS" "-E BaselineTest_cmd-org")
|
||||
#t)))))
|
||||
(inputs
|
||||
(list boost
|
||||
|
|
|
|||
|
|
@ -410,7 +410,8 @@ utilites used to process FCODE, OpenFirmware's byte code, consisting of:
|
|||
(file-name (git-file-name "openbios" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xp1b6xgx40i0j3a5y3id0d1p8vdvapai8szganxg3zrvj53fh0n"))))
|
||||
"1xp1b6xgx40i0j3a5y3id0d1p8vdvapai8szganxg3zrvj53fh0n"))
|
||||
(patches (search-patches "openbios-aarch64-riscv64-support.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;no tests
|
||||
|
|
@ -422,8 +423,9 @@ utilites used to process FCODE, OpenFirmware's byte code, consisting of:
|
|||
(("TZ=UTC date \\+")
|
||||
"TZ=UTC date --date=@1 +"))))
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(invoke "./config/scripts/switch-arch" #$arch)))
|
||||
(lambda* (#:key (configure-flags #~'()) #:allow-other-keys)
|
||||
(apply invoke "./config/scripts/switch-arch" #$arch
|
||||
configure-flags)))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(let ((build-target
|
||||
|
|
@ -456,11 +458,6 @@ provide OpenFirmware functionality on top of an already running system.")
|
|||
(inherit base)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base)
|
||||
((#:system system (%current-system))
|
||||
(if (string-prefix? "aarch64-linux" (or (%current-system)
|
||||
(%current-target-system)))
|
||||
"armhf-linux"
|
||||
system))
|
||||
;; No need to cross-compile, package produces reproducible firmware.
|
||||
((#:target _ #f) #f)
|
||||
((#:phases phases)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
|
||||
;;; Copyright © 2021 Sergiu Ivanov <sivanov@colimite.fr>
|
||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||
;;; Copyright © 2021 Paul A. Patience <paul@apatience.com>
|
||||
;;; Copyright © 2021-2023 Paul A. Patience <paul@apatience.com>
|
||||
;;; Copyright © 2021, 2022 Taiju HIGASHI <higashi@taiju.info>
|
||||
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
|
||||
;;; Copyright © 2022 Kitzman <kitzman@disroot.org>
|
||||
|
|
@ -1581,7 +1581,7 @@ guix repl <<EOF
|
|||
(ice-9 string-fun)
|
||||
(gnu packages fonts))
|
||||
|
||||
(let ((new-version "16.4.0")
|
||||
(let ((new-version "20.0.0")
|
||||
(iosevka-hashes #nil)
|
||||
(iosevka-fails #nil))
|
||||
(for-each (lambda (font)
|
||||
|
|
@ -1603,7 +1603,9 @@ guix repl <<EOF
|
|||
font-iosevka-aile
|
||||
font-iosevka-curly
|
||||
font-iosevka-curly-slab
|
||||
font-iosevka-etoile))
|
||||
font-iosevka-etoile
|
||||
font-iosevka-ss08
|
||||
font-iosevka-ss09))
|
||||
(for-each (lambda (hash)
|
||||
(format #t "~a: ~a~%" (car hash) (cdr hash)))
|
||||
(reverse iosevka-hashes))
|
||||
|
|
@ -1615,7 +1617,7 @@ EOF
|
|||
(define-public font-iosevka
|
||||
(package
|
||||
(name "font-iosevka")
|
||||
(version "16.4.0")
|
||||
(version "20.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/zipbomb)
|
||||
|
|
@ -1623,7 +1625,7 @@ EOF
|
|||
"/releases/download/v" version
|
||||
"/ttc-iosevka-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "07v98pr0anqbxn1yc55245k5ixxzfk2wmfq67zhz84aa18viqhbc"))))
|
||||
(base32 "19f8p7zw7wbm8xbxm0kxv8k979bkqvx51hrckkc6nvddmigq1848"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "https://be5invis.github.io/Iosevka/")
|
||||
(synopsis "Coders' typeface, built from code")
|
||||
|
|
@ -1646,7 +1648,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/ttc-iosevka-slab-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "063qk1d75l1jq7gdwzqxd7j8j56g7da0aagsqm0lvwl217l7x48b"))))))
|
||||
(base32 "0c8pxdz98xwd8sj1yc8gx2g2wfjyxk4951wmg55dibd3wj106rjp"))))))
|
||||
|
||||
(define-public font-iosevka-term
|
||||
(package
|
||||
|
|
@ -1660,7 +1662,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/ttf-iosevka-term-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "17465bvg6fap53xfqwrg2g4fasv01w86wh658n1rf6djs3yzn1gx"))))
|
||||
(base32 "1rln8cl1ah201ai2p34s6a52ggkgmgcx9gnvdnfgv4430bmnrpwc"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
@ -1681,7 +1683,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"releases/download/v" version "/"
|
||||
"ttf-iosevka-term-slab-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "00pc4d8awdiziyzncah3fnh0ppvcdvi9cd7vyknl68f6fj283fvm"))))
|
||||
(base32 "1sjz6h3w2c15jdfhqiibjshq5zfdjng28vcsl2dyxrb5wdxs7a01"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
@ -1702,7 +1704,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/ttc-iosevka-aile-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "03y0xijb7c0kampm3gjb69mv8hikhsgqhlw1w3zfcjhr2vc62g6q"))))))
|
||||
(base32 "0jcyx8wpw18d8igqr1hfrybrldkr0r9qs24jw4z0x5k4gbah7mmf"))))))
|
||||
|
||||
(define-public font-iosevka-curly
|
||||
(package
|
||||
|
|
@ -1716,7 +1718,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"releases/download/v" version "/"
|
||||
"ttc-iosevka-curly-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1i31zj0j8npgx7wn2qibih48s76qjxakz14sa2hgx908p8xyfwq5"))))))
|
||||
(base32 "0hj4lx8cyvib21cp065a56ag9jkwpzs74a93cf557j0x91k3wja0"))))))
|
||||
|
||||
(define-public font-iosevka-curly-slab
|
||||
(package
|
||||
|
|
@ -1730,7 +1732,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"releases/download/v" version "/"
|
||||
"ttc-iosevka-curly-slab-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1xijhk5vbgs3c89a7g9cfjqjqv801gimjja4wqpvaficab692jh2"))))))
|
||||
(base32 "10h58x5c32chvz4gdx8pifs1nd4ysnd4zq7pbjqsfv3h4lxz4r5h"))))))
|
||||
|
||||
(define-public font-iosevka-etoile
|
||||
(package
|
||||
|
|
@ -1744,7 +1746,35 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/ttc-iosevka-etoile-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1rqagk6gyja15fa4m107ylbjwbhn811gbl9lbr9yzashw4drjpp9"))))))
|
||||
(base32 "16lbcms4rnx7dh016c15wpz94b932hfvlng78jv1lhdr13w7s60z"))))))
|
||||
|
||||
(define-public font-iosevka-ss08
|
||||
(package
|
||||
(inherit font-iosevka)
|
||||
(name "font-iosevka-ss08")
|
||||
(version (package-version font-iosevka))
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append "https://github.com/be5invis/Iosevka"
|
||||
"/releases/download/v" version
|
||||
"/ttc-iosevka-ss08-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "195w4nd0901zlyjq7a6n7pwjwi2b5vnm4gj4y6692axi660jdv4j"))))))
|
||||
|
||||
(define-public font-iosevka-ss09
|
||||
(package
|
||||
(inherit font-iosevka)
|
||||
(name "font-iosevka-ss09")
|
||||
(version (package-version font-iosevka))
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append "https://github.com/be5invis/Iosevka"
|
||||
"/releases/download/v" version
|
||||
"/ttc-iosevka-ss09-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1h5jfrpply7ypc4h6ivxs30qkrbni51zkj78xz6nz4zbnp923yi0"))))))
|
||||
|
||||
(define-public font-sarasa-gothic
|
||||
(package
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2015, 2017 Andy Wingo <wingo@pobox.com>
|
||||
;;; Copyright © 2015-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
|
||||
;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
|
||||
|
|
@ -67,6 +67,7 @@
|
|||
#:use-module (gnu packages acl)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages avahi)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages boost)
|
||||
|
|
@ -122,6 +123,7 @@
|
|||
#:use-module (gnu packages samba)
|
||||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages valgrind)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages w3m)
|
||||
|
|
@ -1842,6 +1844,86 @@ modems and setup connections with them.")
|
|||
'((upstream-name . "ModemManager")))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public telepathy-gabble
|
||||
;; telepathy-gabble bundles wocky, an unreleased library. The latest commit
|
||||
;; includes a more recent version.
|
||||
(let ((commit "f1c762df6328916b811a834047fedac8529cf157")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "telepathy-gabble")
|
||||
(version (git-version "0.18.4" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/TelepathyIM/telepathy-gabble/")
|
||||
(commit commit)
|
||||
(recursive? #true)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"00ss14hf1qwb42648cldghmfjfn1nkjvpy508b7vaz322fj37qa4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; Parallel tests freeze.
|
||||
#:parallel-tests? #false
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-autogen
|
||||
(lambda _ (delete-file "autogen.sh")))
|
||||
(add-before 'configure 'configure-wocky
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
(with-directory-excursion "lib/ext/wocky"
|
||||
(invoke "gtkdocize")
|
||||
(invoke "bash" "autoreconf" "-vif")
|
||||
(substitute* "configure"
|
||||
(("/bin/sh") (which "sh")))
|
||||
(apply invoke "bash" "configure" configure-flags)))))
|
||||
#:configure-flags
|
||||
#~(list (string-append "--prefix=" #$output)
|
||||
"--disable-avahi-tests"
|
||||
"--disable-dependency-tracking"
|
||||
"--disable-Werror"
|
||||
"--without-ca-certificates")))
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake
|
||||
libtool
|
||||
`(,glib "bin") ;for glib-compile-schemas, etc.
|
||||
gtk-doc
|
||||
pkg-config))
|
||||
(inputs
|
||||
(list dbus
|
||||
glib
|
||||
gnutls
|
||||
gobject-introspection
|
||||
libnice
|
||||
libsoup-minimal-2
|
||||
libxslt
|
||||
python))
|
||||
(propagated-inputs
|
||||
(list telepathy-glib))
|
||||
(home-page "https://telepathy.freedesktop.org/components/telepathy-gabble/")
|
||||
(synopsis "XMPP connection manager for Telepathy")
|
||||
(description
|
||||
"Gabble is a Jabber/XMPP connection manager for the Telepathy
|
||||
framework, currently supporting:
|
||||
|
||||
@itemize
|
||||
@item single-user chats
|
||||
@item multi-user chats
|
||||
@item voice/video calling
|
||||
@item file transfer
|
||||
@end itemize
|
||||
|
||||
with Jabber/XMPP interoperability.
|
||||
|
||||
Telepathy is a D-Bus framework for unifying real time communication, including
|
||||
instant messaging, voice calls and video calls. It abstracts differences
|
||||
between protocols to provide a unified interface for applications.")
|
||||
(license license:lgpl2.1))))
|
||||
|
||||
(define-public telepathy-logger
|
||||
(package
|
||||
(name "telepathy-logger")
|
||||
|
|
@ -1936,6 +2018,81 @@ for the Telepathy framework, allowing user interfaces and other clients to
|
|||
share connections to real-time communication services without conflicting.")
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
(define-public telepathy-salut
|
||||
;; telepathy-salut bundles wocky, an unreleased library. The latest commit
|
||||
;; includes a more recent version.
|
||||
(let ((commit "90dbe5e74ccdd063cb123212a754f994c9d2019f")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "telepathy-salut")
|
||||
(version (git-version "0.8.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/TelepathyIM/telepathy-salut")
|
||||
(commit commit)
|
||||
(recursive? #true)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"195pz8dgwhyy1cygd0rlncyr3c4wzhnf99sfjj5qmc8j195j1k7a"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-autogen
|
||||
(lambda _ (delete-file "autogen.sh")))
|
||||
;; The twisted tests all fail, but there are no logs, so we can't
|
||||
;; tell what's wrong.
|
||||
(add-after 'unpack 'disable-twisted-tests
|
||||
(lambda _
|
||||
(substitute* "tests/Makefile.am"
|
||||
(("SUBDIRS = twisted") ""))))
|
||||
(add-before 'configure 'configure-wocky
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
(with-directory-excursion "lib/ext/wocky"
|
||||
(invoke "gtkdocize")
|
||||
(invoke "bash" "autoreconf" "-vif")
|
||||
(substitute* "configure"
|
||||
(("/bin/sh") (which "sh")))
|
||||
(apply invoke "bash" "configure" configure-flags)))))
|
||||
#:configure-flags
|
||||
#~(list (string-append "--prefix=" #$output)
|
||||
"--disable-avahi-tests"
|
||||
"--without-ca-certificates"
|
||||
"--disable-Werror"
|
||||
"--enable-olpc")))
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake
|
||||
libtool
|
||||
`(,glib "bin") ;for glib-compile-schemas, etc.
|
||||
gtk-doc
|
||||
pkg-config))
|
||||
(inputs
|
||||
(list avahi
|
||||
dbus
|
||||
glib
|
||||
gnutls
|
||||
gobject-introspection
|
||||
libxml2
|
||||
libxslt
|
||||
libsoup-minimal-2
|
||||
python
|
||||
`(,util-linux "lib")))
|
||||
(propagated-inputs
|
||||
(list telepathy-glib))
|
||||
(home-page "https://telepathy.freedesktop.org/wiki/Components/")
|
||||
(synopsis "Link-local XMPP connection manager")
|
||||
(description
|
||||
"Salut is a link-local XMPP (XEP-0174) connection manager for the
|
||||
Telepathy framework, currently supporting presence and single-user chats with
|
||||
iChat interoperability, and multi-user chats and Tubes using the
|
||||
@url{https://telepathy.freedesktop.org/wiki/Clique,Clique} protocol.")
|
||||
(license license:lgpl2.1))))
|
||||
|
||||
(define-public colord-gtk
|
||||
(package
|
||||
(name "colord-gtk")
|
||||
|
|
|
|||
|
|
@ -2847,12 +2847,15 @@ progresses the level, or you may regenerate tiles as the world changes.")
|
|||
(url "https://github.com/raysan5/raylib/")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
;; TODO: Unbundle src/external
|
||||
(sha256
|
||||
(base32
|
||||
"14v5iwxh8grywiyw9agpd2sfpyriq1rwwkd9f2s4iihh0z5j7hk8"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f)) ;no test
|
||||
(list #:tests? #f ;no test
|
||||
#:configure-flags
|
||||
#~(list "-DBUILD_SHARED_LIBS=ON" )))
|
||||
(inputs (list alsa-lib
|
||||
libx11
|
||||
libxrandr
|
||||
|
|
|
|||
|
|
@ -942,7 +942,7 @@ high a score as possible.")
|
|||
(define-public cataclysm-dda
|
||||
(package
|
||||
(name "cataclysm-dda")
|
||||
(version "0.F-3")
|
||||
(version "0.G")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -950,47 +950,44 @@ high a score as possible.")
|
|||
(url "https://github.com/CleverRaven/Cataclysm-DDA")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32 "1qnsz6az9qp4sbr3y4rcqhlmadrrdzafvd2xwf3db5wn0swvbjys"))
|
||||
(base32 "0y8513yflxfqblk42h5ad0dq5lx5s8k6hhjy65yfcda7amsv9mhx"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags
|
||||
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
"USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
|
||||
"LOCALIZE=1" "LANGUAGES=all")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
;; Apparently we can't do make on both tiles and a console version at
|
||||
;; the same time anymore, so we have to either "make clean" between
|
||||
;; builds or do some other hackery. See:
|
||||
;; https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746
|
||||
(add-after 'install 'make-clean-pre-tiles
|
||||
(lambda* (#:key make-flags outputs #:allow-other-keys)
|
||||
;; Change prefix directory and enable tile graphics and sound.
|
||||
(invoke "make" "clean")))
|
||||
(add-after 'make-clean-pre-tiles 'build-tiles
|
||||
(lambda* (#:key make-flags outputs #:allow-other-keys)
|
||||
;; Change prefix directory and enable tile graphics and sound.
|
||||
(apply invoke "make" "TILES=1" "SOUND=1"
|
||||
(string-append "PREFIX="
|
||||
(assoc-ref outputs "tiles"))
|
||||
(cdr make-flags))))
|
||||
(add-after 'build-tiles 'install-tiles
|
||||
(lambda* (#:key make-flags outputs #:allow-other-keys)
|
||||
(apply invoke "make" "install" "TILES=1" "SOUND=1"
|
||||
(string-append "PREFIX="
|
||||
(assoc-ref outputs "tiles"))
|
||||
(cdr make-flags)))))
|
||||
;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native
|
||||
;; input in order to support tests.
|
||||
#:tests? #f))
|
||||
(list
|
||||
#:make-flags
|
||||
#~(list (string-append "PREFIX=" #$output)
|
||||
"USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
|
||||
"LOCALIZE=1" "LANGUAGES=all")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
;; Apparently we can't do make on both tiles and a console version at
|
||||
;; the same time anymore, so we have to either "make clean" between
|
||||
;; builds or do some other hackery. See:
|
||||
;; https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746
|
||||
(add-after 'install 'make-clean-pre-tiles
|
||||
(lambda* (#:key make-flags outputs #:allow-other-keys)
|
||||
;; Change prefix directory and enable tile graphics and sound.
|
||||
(invoke "make" "clean")))
|
||||
(add-after 'make-clean-pre-tiles 'build-tiles
|
||||
(lambda* (#:key make-flags outputs #:allow-other-keys)
|
||||
;; Change prefix directory and enable tile graphics and sound.
|
||||
(apply invoke "make" "TILES=1" "SOUND=1"
|
||||
(string-append "PREFIX=" #$output:tiles)
|
||||
(cdr make-flags))))
|
||||
(add-after 'build-tiles 'install-tiles
|
||||
(lambda* (#:key make-flags outputs #:allow-other-keys)
|
||||
(apply invoke "make" "install" "TILES=1" "SOUND=1"
|
||||
(string-append "PREFIX=" #$output:tiles)
|
||||
(cdr make-flags)))))
|
||||
;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native
|
||||
;; input in order to support tests.
|
||||
#:tests? #f))
|
||||
(outputs '("out"
|
||||
"tiles")) ;for tile graphics and sound support
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)
|
||||
("astyle" ,astyle)))
|
||||
(list astyle gettext-minimal pkg-config))
|
||||
(inputs
|
||||
(list freetype
|
||||
libogg
|
||||
|
|
@ -5267,7 +5264,7 @@ in-window at 640x480 resolution or fullscreen.")
|
|||
(define-public warzone2100
|
||||
(package
|
||||
(name "warzone2100")
|
||||
(version "4.0.1")
|
||||
(version "4.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -5275,7 +5272,7 @@ in-window at 640x480 resolution or fullscreen.")
|
|||
version
|
||||
"/warzone2100_src.tar.xz"))
|
||||
(sha256
|
||||
(base32 "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik"))
|
||||
(base32 "17p58wxwva0qp267hm1alas52jd9h74494wh01ahz880hscbjg1w"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -5312,31 +5309,32 @@ in-window at 640x480 resolution or fullscreen.")
|
|||
(string-append "iV_DrawTextRotated(\"Press ESC to exit.\", "
|
||||
"100, 100, 0.0f, font_regular);")))
|
||||
#t)))))
|
||||
(native-inputs `(("asciidoc" ,asciidoc)
|
||||
("asciidoctor" ,ruby-asciidoctor)
|
||||
("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)
|
||||
("unzip" ,unzip)
|
||||
(native-inputs (list asciidoc
|
||||
ruby-asciidoctor
|
||||
gettext-minimal
|
||||
pkg-config
|
||||
unzip
|
||||
;; 7z is used to create .zip archive, not `zip' as in version 3.2.*.
|
||||
("p7zip" ,p7zip)))
|
||||
(inputs `(("curl" ,curl)
|
||||
("fontconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
("glew" ,glew)
|
||||
("harfbuzz" ,harfbuzz)
|
||||
("libtheora" ,libtheora)
|
||||
("libvorbis" ,libvorbis)
|
||||
("libxrandr" ,libxrandr)
|
||||
("libsodium" ,libsodium)
|
||||
("miniupnpc" ,miniupnpc)
|
||||
("openal" ,openal)
|
||||
("physfs" ,physfs)
|
||||
("qtbase" ,qtbase-5)
|
||||
("qtscript" ,qtscript)
|
||||
("openssl" ,openssl)
|
||||
("sdl2" ,sdl2)
|
||||
("sqlite" ,sqlite)
|
||||
("utfcpp" ,utfcpp)))
|
||||
p7zip))
|
||||
(inputs (list opus
|
||||
curl
|
||||
fontconfig
|
||||
freetype
|
||||
glew
|
||||
harfbuzz
|
||||
libtheora
|
||||
libvorbis
|
||||
libxrandr
|
||||
libsodium
|
||||
miniupnpc
|
||||
openal
|
||||
physfs
|
||||
qtbase-5
|
||||
qtscript
|
||||
openssl
|
||||
sdl2
|
||||
sqlite
|
||||
utfcpp))
|
||||
(home-page "https://wz2100.net")
|
||||
(synopsis "3D Real-time strategy and real-time tactics game")
|
||||
(description
|
||||
|
|
@ -5355,7 +5353,7 @@ tactics.")
|
|||
(define-public widelands
|
||||
(package
|
||||
(name "widelands")
|
||||
(version "1.0")
|
||||
(version "1.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -5364,17 +5362,12 @@ tactics.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1hw51binnbia15mj1gzx1cbk3cw9r91sisqci2qzcy4ahxiadnw0"))
|
||||
(base32 "07wbalwdmml9vdh9nh50svnsw4sdj9nnp32azbss8vzq5mxmzvbx"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "src/third_party/minizip")
|
||||
#t))
|
||||
(patches
|
||||
;; Use system Minizip. Patch is provided by Debian, and discussed
|
||||
;; upstream at <https://github.com/widelands/widelands/issues/399>.
|
||||
(search-patches "widelands-system-wide_minizip.patch"
|
||||
"widelands-add-missing-map-include.patch"))))
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
@ -5403,9 +5396,11 @@ tactics.")
|
|||
#t)))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)))
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
`(("asio" ,asio)
|
||||
("curl" ,curl)
|
||||
("boost" ,boost)
|
||||
("glew" ,glew)
|
||||
("icu4c" ,icu4c)
|
||||
|
|
@ -10152,16 +10147,16 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
|
|||
(define-public xmoto
|
||||
(package
|
||||
(name "xmoto")
|
||||
(version "0.6.1")
|
||||
(version "0.6.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/xmoto/xmoto")
|
||||
(commit version)))
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n"))
|
||||
(base32 "14z3yqpiyv4y5l37b12kf8ipgsmb9krb4b5d9adlrry0j43hd7wz"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-1)))
|
||||
|
|
@ -10177,58 +10172,54 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
|
|||
(cons* "." ".." keep))))
|
||||
(substitute* "src/CMakeLists.txt"
|
||||
(("add_subdirectory\\(.*?/vendor/(.+?)\".*" line library)
|
||||
(if (member library keep) line ""))))
|
||||
#t))))
|
||||
(if (member library keep) line ""))))))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no test
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-hard-coded-directory
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "src/common/VFileIO.cpp"
|
||||
(("/usr/share")
|
||||
(string-append (assoc-ref outputs "out") "/share")))
|
||||
#t))
|
||||
(add-before 'build 'set-SDL
|
||||
;; Set correct environment for SDL.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "CPATH"
|
||||
(string-append
|
||||
(assoc-ref inputs "sdl") "/include/SDL:"
|
||||
(or (getenv "CPATH") "")))
|
||||
#t))
|
||||
(add-after 'install 'unbundle-fonts
|
||||
;; Unbundle DejaVuSans TTF files.
|
||||
(lambda* (#:key outputs inputs #:allow-other-keys)
|
||||
(let ((font-dir (string-append (assoc-ref inputs "font-dejavu")
|
||||
"/share/fonts/truetype/"))
|
||||
(target-dir (string-append (assoc-ref outputs "out")
|
||||
"/share/xmoto/Textures/Fonts/")))
|
||||
(for-each (lambda (f)
|
||||
(let ((font (string-append font-dir f))
|
||||
(target (string-append target-dir f)))
|
||||
(delete-file target)
|
||||
(symlink font target)))
|
||||
'("DejaVuSans.ttf" "DejaVuSansMono.ttf"))
|
||||
#t))))))
|
||||
(list
|
||||
#:tests? #f ;no tests
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-hard-coded-directory
|
||||
(lambda _
|
||||
(substitute* "src/common/VFileIO.cpp"
|
||||
(("/usr/share") (string-append #$output "/share")))))
|
||||
(add-before 'build 'set-SDL
|
||||
;; Set correct environment for SDL.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "CPATH"
|
||||
(string-append
|
||||
(search-input-directory inputs "/include/SDL2")
|
||||
":"
|
||||
(or (getenv "CPATH") "")))))
|
||||
(add-after 'install 'unbundle-fonts
|
||||
;; Unbundle DejaVuSans TTF files.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((font-dir (search-input-directory inputs
|
||||
"/share/fonts/truetype/"))
|
||||
(target-dir (string-append #$output
|
||||
"/share/xmoto/Textures/Fonts/")))
|
||||
(for-each (lambda (f)
|
||||
(let ((font (string-append font-dir f))
|
||||
(target (string-append target-dir f)))
|
||||
(delete-file target)
|
||||
(symlink font target)))
|
||||
'("DejaVuSans.ttf" "DejaVuSansMono.ttf"))))))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(list gettext-minimal pkg-config))
|
||||
(inputs
|
||||
`(("bzip2" ,bzip2)
|
||||
("curl" ,curl)
|
||||
("font-dejavu" ,font-dejavu)
|
||||
("glu" ,glu)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libxdg-basedir" ,libxdg-basedir)
|
||||
("libxml2" ,libxml2)
|
||||
("lua" ,lua-5.1)
|
||||
("ode" ,ode)
|
||||
("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf)))
|
||||
("sqlite" ,sqlite)
|
||||
("zlib" ,zlib)))
|
||||
(list bzip2
|
||||
curl
|
||||
font-dejavu
|
||||
glu
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
libxdg-basedir
|
||||
libxml2
|
||||
lua
|
||||
ode
|
||||
(sdl-union (list sdl2 sdl2-mixer sdl2-net sdl2-ttf))
|
||||
sqlite
|
||||
zlib))
|
||||
(home-page "https://xmoto.tuxfamily.org/")
|
||||
(synopsis "2D motocross platform game")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -221,7 +221,6 @@ color, font attributes (weight, posture), or underlining.")
|
|||
python-flake8-implicit-str-concat
|
||||
python-flake8-print
|
||||
python-isort
|
||||
python-pre-commit
|
||||
python-pytest
|
||||
python-pytest-cov
|
||||
python-sphinx
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ provided, as well as a framework to add new color models and data types.")
|
|||
(define-public gegl
|
||||
(package
|
||||
(name "gegl")
|
||||
(version "0.4.36")
|
||||
(version "0.4.42")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -229,7 +229,7 @@ provided, as well as a framework to add new color models and data types.")
|
|||
(version-major+minor version)
|
||||
"/gegl-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32 "19ic3fv0j8ysxxw7bx7gy3l8l8l9ldrvbzxfmmc24w67vh68mmbg"))))
|
||||
(base32 "0bg0vlmj4n9x1291b9fsjqxsal192zlg48pa57f6xid6p863ma5b"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
|||
|
|
@ -2724,7 +2724,7 @@ forgotten when the session ends.")
|
|||
gobject-introspection
|
||||
pkg-config
|
||||
libxml2))
|
||||
(home-page " https://wiki.gnome.org/Apps")
|
||||
(home-page "https://wiki.gnome.org/Apps/Evince")
|
||||
(synopsis "GNOME's document viewer")
|
||||
(description
|
||||
"Evince is a document viewer for multiple document formats. It
|
||||
|
|
@ -4280,7 +4280,7 @@ Hints specification (EWMH).")
|
|||
(assoc-ref %outputs "doc")
|
||||
"/share/gtk-doc/html"))))
|
||||
(inputs
|
||||
(list gtk+ libgsf librsvg libxslt libxml2))
|
||||
(list gtk+ libgsf (librsvg-for-system) libxslt libxml2))
|
||||
(native-inputs
|
||||
(list intltool `(,glib "bin") pkg-config))
|
||||
(home-page "https://developer.gnome.org/goffice/")
|
||||
|
|
@ -9486,7 +9486,7 @@ easy, safe, and automatic.")
|
|||
(define-public tracker
|
||||
(package
|
||||
(name "tracker")
|
||||
(version "3.3.3")
|
||||
(version "3.4.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/tracker/"
|
||||
|
|
@ -9494,44 +9494,56 @@ easy, safe, and automatic.")
|
|||
"tracker-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r144kdqxdzs51qn495vablzf1zxkhkk6imrlrzj9wiqwc2gg520"))))
|
||||
"0c8ppm03b9r6lyxalama8sjmw3km4jibbswqra7qf17pli1g2vaf"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
#:test-options (list ,@(if (target-riscv64?)
|
||||
`("--timeout-multiplier" "5")
|
||||
'()))
|
||||
#:configure-flags
|
||||
;; Otherwise, the RUNPATH will lack the final path component.
|
||||
(list (string-append "-Dc_link_args=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib:"
|
||||
(assoc-ref %outputs "out") "/lib/tracker-3.0")
|
||||
"-Ddocs=false"
|
||||
"-Dsystemd_user_services=false")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "utils/trackertestutils/__main__.py"
|
||||
(("/bin/bash")
|
||||
(search-input-file inputs "bin/bash")))))
|
||||
(add-before 'configure 'set-shell
|
||||
(lambda _
|
||||
(setenv "SHELL" (which "bash"))))
|
||||
(add-before 'configure 'fix-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((manpage "/etc/asciidoc/docbook-xsl/manpage.xsl")
|
||||
(file (search-input-file inputs manpage)))
|
||||
(substitute* "docs/manpages/meson.build"
|
||||
(("/etc/asciidoc[^']+")
|
||||
file)))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? test-options #:allow-other-keys)
|
||||
(when tests?
|
||||
;; Some tests expect to write to $HOME.
|
||||
(setenv "HOME" "/tmp")
|
||||
(apply invoke "dbus-run-session" "--" "meson" "test"
|
||||
"--print-errorlogs" test-options)))))))
|
||||
(list
|
||||
#:glib-or-gtk? #t
|
||||
#:test-options `(list ,@(if (target-riscv64?)
|
||||
`("--timeout-multiplier" "10")
|
||||
'("--timeout-multiplier" "2")))
|
||||
#:configure-flags
|
||||
;; Otherwise, the RUNPATH will lack the final path component.
|
||||
#~(list (string-append "-Dc_link_args=-Wl,-rpath="
|
||||
#$output "/lib:"
|
||||
#$output "/lib/tracker-3.0")
|
||||
"-Ddocs=false"
|
||||
"-Dsystemd_user_services=false")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "utils/trackertestutils/__main__.py"
|
||||
(("/bin/bash")
|
||||
(search-input-file inputs "bin/bash")))))
|
||||
(add-before 'configure 'set-shell
|
||||
(lambda _
|
||||
(setenv "SHELL" (which "bash"))))
|
||||
(add-before 'configure 'fix-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((manpage "/etc/asciidoc/docbook-xsl/manpage.xsl")
|
||||
(file (search-input-file inputs manpage)))
|
||||
(substitute* "docs/manpages/meson.build"
|
||||
(("/etc/asciidoc[^']+")
|
||||
file)))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? test-options #:allow-other-keys)
|
||||
(when tests?
|
||||
;; Some tests expect to write to $HOME.
|
||||
(setenv "HOME" "/tmp")
|
||||
(apply invoke "dbus-run-session" "--" "meson" "test"
|
||||
"--print-errorlogs" test-options))))
|
||||
(add-after 'glib-or-gtk-wrap 'unwrap-libexec
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(with-directory-excursion (string-append (assoc-ref outputs "out")
|
||||
"/libexec/tracker3")
|
||||
(for-each
|
||||
(lambda (f)
|
||||
(let ((real (string-append "." (basename f) "-real")))
|
||||
(when (file-exists? real)
|
||||
(delete-file f)
|
||||
(rename-file real f))))
|
||||
(find-files "."))))))))
|
||||
(native-inputs
|
||||
(list gettext-minimal
|
||||
`(,glib "bin")
|
||||
|
|
@ -12072,7 +12084,7 @@ repository and commit your work.")
|
|||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; The 'config.sub' is too old to recognise aarch64.
|
||||
,@(if (and=> (%current-target-system) target-aarch64?)
|
||||
,@(if (or (target-aarch64?) (target-riscv64?))
|
||||
`((add-after 'unpack 'replace-config.sub
|
||||
(lambda _
|
||||
(delete-file "config.sub")
|
||||
|
|
@ -12114,7 +12126,7 @@ repository and commit your work.")
|
|||
(list glib))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
,@(if (and=> (%current-target-system) target-aarch64?)
|
||||
,@(if (or (target-aarch64?) (target-riscv64?))
|
||||
`(("config" ,config))
|
||||
'())))
|
||||
(home-page "https://people.gnome.org/~veillard/gamin/")
|
||||
|
|
@ -13094,7 +13106,7 @@ profiler via Sysprof, debugging support, and more.")
|
|||
(define-public komikku
|
||||
(package
|
||||
(name "komikku")
|
||||
(version "1.11.1")
|
||||
(version "1.14.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -13104,7 +13116,7 @@ profiler via Sysprof, debugging support, and more.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0wvz7ca427x16vrjqzq7b9k1xlgdyhykdix41f48b1m3ry4wcqp2"))))
|
||||
"1pknm3xz2hai8y6ynlyz7y1k1kaay7mkpm1svx66ggjhz8jzcrj5"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015, 2017, 2019-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nikita <nikita@n0.is>
|
||||
|
|
@ -165,14 +165,14 @@ tool to extract metadata from a file and print the results.")
|
|||
(define-public libmicrohttpd
|
||||
(package
|
||||
(name "libmicrohttpd")
|
||||
(version "0.9.75")
|
||||
(version "0.9.76")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fz3ljqfvfyfb5inzihy66bys22id9jgsi4nmcd3j6spdxx90y4j"))))
|
||||
"0k7b3h0ka3ckp60dgrwmnigw7i79bk5w3qg84kvw19j2b9xm9cgh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
|
|
|
|||
|
|
@ -50,8 +50,9 @@
|
|||
#:use-module (guix modules)
|
||||
#:use-module (guix monads)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cargo)
|
||||
#:use-module (guix build-system copy)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix build-system mozilla)
|
||||
#:use-module (gnu packages admin)
|
||||
|
|
@ -516,9 +517,9 @@ 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.8.0")
|
||||
(define %icecat-base-version "102.9.0")
|
||||
(define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
|
||||
(define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss
|
||||
(define %icecat-build-id "20230314000000") ;must be of the form YYYYMMDDhhmmss
|
||||
|
||||
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
|
||||
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
|
||||
|
|
@ -538,12 +539,12 @@ variable defined below. It requires guile-json to be installed."
|
|||
"firefox-" upstream-firefox-version ".source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27"))))
|
||||
"1l8xlbba8sa9dg132k96ch8mz97i5lyhpvkxi8d85jh97xi79c1i"))))
|
||||
|
||||
;; The upstream-icecat-base-version may be older than the
|
||||
;; %icecat-base-version.
|
||||
(upstream-icecat-base-version "102.8.0")
|
||||
(gnuzilla-commit "f23f8b609ef4afcc7d8ac5fa795093f1c403f8da")
|
||||
(upstream-icecat-base-version "102.9.0")
|
||||
(gnuzilla-commit "f55ede39713d1533734f37e39927cbb78abe1604")
|
||||
(gnuzilla-source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -555,7 +556,7 @@ variable defined below. It requires guile-json to be installed."
|
|||
(string-take gnuzilla-commit 8)))
|
||||
(sha256
|
||||
(base32
|
||||
"1zvvgjvsj7k8753f7xmpmkq35dqzyik95943hzl84v2j5mnahhj4"))))
|
||||
"0z15h3lxfn9pmj5bj62qim3h320dcd2v69xrg1phb7lh5gq0bylf"))))
|
||||
|
||||
;; 'search-patch' returns either a valid file name or #f, so wrap it
|
||||
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
|
||||
|
|
@ -1136,8 +1137,8 @@ standards of the IceCat project.")
|
|||
"ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl"
|
||||
"tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
|
||||
|
||||
(define %icedove-build-id "20230207000000") ;must be of the form YYYYMMDDhhmmss
|
||||
(define %icedove-version "102.7.2")
|
||||
(define %icedove-build-id "20230314000000") ;must be of the form YYYYMMDDhhmmss
|
||||
(define %icedove-version "102.9.0")
|
||||
|
||||
;; Provides the "comm" folder which is inserted into the icecat source.
|
||||
;; Avoids the duplication of Icecat's source tarball.
|
||||
|
|
@ -1146,11 +1147,11 @@ standards of the IceCat project.")
|
|||
(method hg-fetch)
|
||||
(uri (hg-reference
|
||||
(url "https://hg.mozilla.org/releases/comm-esr102")
|
||||
(changeset "0f6deed0752b618055c34e06c268af3da9d1548d")))
|
||||
(changeset "db735c436e680abf21cc67f9a29b42fdf30d416d")))
|
||||
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"071q0pcfvfpzx741ly1sl8anlmzx02h17w4ylfnrkwrpaclq3p6p"))))
|
||||
"114vvwlrmjilczwsg9nfcg08560vijlydw1pdrbkvxjbfgsxny71"))))
|
||||
|
||||
(define (comm-source->locales+changeset source)
|
||||
"Given SOURCE, a checkout of the Thunderbird 'comm' component, return the
|
||||
|
|
@ -1178,7 +1179,7 @@ list of languages supported as well as the currently used changeset."
|
|||
;;; of the IceCat source, instead of only the 'calendar', chat and mail
|
||||
;;; directories that it provides.
|
||||
(define thunderbird-comm-l10n
|
||||
(let* ((changeset "5b6788295358")
|
||||
(let* ((changeset "95b46b8428d5")
|
||||
(version (git-version %icedove-version "0" changeset)))
|
||||
(origin
|
||||
(method hg-fetch)
|
||||
|
|
@ -1188,7 +1189,7 @@ list of languages supported as well as the currently used changeset."
|
|||
(file-name (git-file-name "comm-l10n" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jrsmkscjjllcfawi3788vwm53wn25inbhdis5nk4vfpr7wk5ill")))))
|
||||
"0hfsiv9p7s2ik6648gm1774d187vlm1i1c9xwyd8g8ihk2dzyn5i")))))
|
||||
|
||||
(define icedove-source
|
||||
(let ((name (string-append "icedove-" %icedove-version)))
|
||||
|
|
@ -1701,51 +1702,55 @@ associated with their name."))
|
|||
(package
|
||||
(inherit base)
|
||||
(name (symbol->string project))
|
||||
(build-system trivial-build-system)
|
||||
;; Use the copy-build-system, as it provides the necessary UTF-8 locales
|
||||
;; support.
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:modules '((guix build union)
|
||||
#:imported-modules `(,@%copy-build-system-modules
|
||||
(guix build union))
|
||||
#:modules '((guix build copy-build-system)
|
||||
(guix build union)
|
||||
(guix build utils))
|
||||
#:builder
|
||||
#~(begin
|
||||
(use-modules (guix build union)
|
||||
(guix build utils))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(union-build #$output (list #$base #$l10n-package)
|
||||
#:create-all-directories? #t)
|
||||
|
||||
(union-build #$output (list #$base #$l10n-package)
|
||||
#:create-all-directories? #t)
|
||||
(define* (expose name #:optional (proc copy-file)
|
||||
#:key (source #$base))
|
||||
(let ((dest (string-append #$output "/" name)))
|
||||
(mkdir-p (dirname dest))
|
||||
(proc (string-append source "/" name) dest)))
|
||||
|
||||
(define* (expose name #:optional (proc copy-file)
|
||||
#:key (source #$base))
|
||||
(let ((dest (string-append #$output "/" name)))
|
||||
(mkdir-p (dirname dest))
|
||||
(proc (string-append source "/" name) dest)))
|
||||
(let ((wrapper (string-append "lib/" #$name "/" #$name))
|
||||
(real-binary (string-append "lib/" #$name "/." #$name
|
||||
"-real"))
|
||||
(desktop-file (string-append "share/applications/"
|
||||
#$name ".desktop")))
|
||||
;; Copy wrapper file.
|
||||
(delete-file (string-append #$output "/" wrapper))
|
||||
(expose wrapper)
|
||||
|
||||
(let ((wrapper (string-append "lib/" #$name "/" #$name))
|
||||
(real-binary (string-append "lib/" #$name "/." #$name
|
||||
"-real"))
|
||||
(desktop-file (string-append "share/applications/"
|
||||
#$name ".desktop")))
|
||||
;; Copy wrapper file.
|
||||
(delete-file (string-append #$output "/" wrapper))
|
||||
(expose wrapper)
|
||||
;; Recreate bin symlink.
|
||||
(delete-file (string-append #$output "/bin/" #$name))
|
||||
(symlink (string-append #$output "/" wrapper)
|
||||
(string-append #$output "/bin/" #$name))
|
||||
|
||||
;; Recreate bin symlink.
|
||||
(delete-file (string-append #$output "/bin/" #$name))
|
||||
(symlink (string-append #$output "/" wrapper)
|
||||
(string-append #$output "/bin/" #$name))
|
||||
;; Copy actual binary.
|
||||
(delete-file (string-append #$output "/" real-binary))
|
||||
(expose real-binary)
|
||||
|
||||
;; Copy actual binary.
|
||||
(delete-file (string-append #$output "/" real-binary))
|
||||
(expose real-binary)
|
||||
;; Copy desktop file.
|
||||
(delete-file (string-append #$output "/" desktop-file))
|
||||
(expose desktop-file)
|
||||
|
||||
;; Copy desktop file.
|
||||
(delete-file (string-append #$output "/" desktop-file))
|
||||
(expose desktop-file)
|
||||
|
||||
;; Adjust the references in the desktop file and wrapper.
|
||||
(substitute* (list (string-append #$output "/" desktop-file)
|
||||
(string-append #$output "/" wrapper))
|
||||
((#$base) #$output)))))))))
|
||||
;; Adjust the references in the desktop file and wrapper.
|
||||
(substitute* (list (string-append #$output "/" desktop-file)
|
||||
(string-append #$output "/" wrapper))
|
||||
((#$base) #$output)))))))))))
|
||||
|
||||
(define-public icecat
|
||||
(make-mozilla-with-l10n 'icecat icecat-minimal icecat-l10n))
|
||||
|
|
|
|||
|
|
@ -6882,6 +6882,24 @@ and aid debugging.")
|
|||
a cron spec parser and job runner.")
|
||||
(license license:expat)))
|
||||
|
||||
;; Required by actionlint. The version of `go-github-com-robfig-cron'
|
||||
;; packaged in Guix is newer and changed some error messages, causing
|
||||
;; unit tests in actionlint to fail.
|
||||
(define-public go-github-com-robfig-cron-1.2
|
||||
(package
|
||||
(inherit go-github-com-robfig-cron)
|
||||
(name "go-github-com-robfig-cron")
|
||||
(version "1.2.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/robfig/cron")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva"))))))
|
||||
|
||||
(define-public go-github-com-shirou-gopsutil
|
||||
(let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399")
|
||||
(revision "0"))
|
||||
|
|
@ -9645,7 +9663,7 @@ JSON data to the machine.")
|
|||
(define-public go-golang-zx2c4-com-wireguard
|
||||
(package
|
||||
(name "go-golang-zx2c4-com-wireguard")
|
||||
(version "0.0.20200320")
|
||||
(version "0.0.20211016")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -9658,7 +9676,7 @@ JSON data to the machine.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"))))
|
||||
"09a4gsh75a8bj71wr042afrma9frriqp60cm0cx6c9a8lv5yzzi0"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "golang.zx2c4.com/wireguard"))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016-2023 Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
|
||||
|
|
@ -139,7 +139,7 @@ between two other data points.")
|
|||
(define-public gama
|
||||
(package
|
||||
(name "gama")
|
||||
(version "2.23")
|
||||
(version "2.24")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -147,7 +147,7 @@ between two other data points.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03cwx83q788xlnpj0m4dgpf8scwn7m8p5c20vq90m1fxc614199q"))
|
||||
"04y9x3dcxmlrz5m8n5sx0xhvr30qq0vwcc749nxcvmdv4c2nm100"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
|||
|
|
@ -230,24 +230,30 @@ lines.")
|
|||
"0kc9v5ampq2paw6sls6zdchvqvis7b1z8xhdvlhz5xxdr1vj5xnn"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'build 'skip-npm
|
||||
;; npm is not packaged so build without it
|
||||
(lambda _
|
||||
(setenv "SKIP_NPM" "T")))
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir "packages/python/plotly")
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "pytest" "-x" "plotly/tests/test_core")
|
||||
(invoke "pytest" "-x" "plotly/tests/test_io")
|
||||
;; FIXME: Add optional dependencies and enable their tests.
|
||||
;; (invoke "pytest" "-x" "plotly/tests/test_optional")
|
||||
(invoke "pytest" "_plotly_utils/tests")))))))
|
||||
(add-after 'unpack 'fix-version
|
||||
;; Versioneer is useless when there is no git metadata.
|
||||
(lambda _
|
||||
(substitute* "packages/python/plotly/setup.py"
|
||||
(("version=versioneer.get_version\\(),")
|
||||
(format #f "version=~s," #$version)))))
|
||||
(add-after 'fix-version 'chdir
|
||||
(lambda _
|
||||
(chdir "packages/python/plotly")))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "pytest" "-x" "plotly/tests/test_core")
|
||||
(invoke "pytest" "-x" "plotly/tests/test_io")
|
||||
;; FIXME: Add optional dependencies and enable their tests.
|
||||
;; (invoke "pytest" "-x" "plotly/tests/test_optional")
|
||||
(invoke "pytest" "_plotly_utils/tests")))))))
|
||||
(native-inputs
|
||||
(list python-ipywidgets python-pytest python-xarray))
|
||||
(propagated-inputs
|
||||
|
|
@ -605,7 +611,7 @@ transformed into common image formats for display or printing.")
|
|||
(define-public python-graph-tool
|
||||
(package
|
||||
(name "python-graph-tool")
|
||||
(version "2.45")
|
||||
(version "2.46")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
|
@ -613,7 +619,7 @@ transformed into common image formats for display or printing.")
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0s46qqg454kwq2px7x1a4ckryclkxnrz1r7gj6bv40nsrynafbgr"))))
|
||||
"0x9jgnq9xcja3q954y7nhdzd374p4h203pymxh51b6lqqbq0hm9h"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:imported-modules (,@%gnu-build-system-modules
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -32,7 +33,6 @@
|
|||
#:use-module (guix gexp)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system trivial)
|
||||
|
|
@ -171,49 +171,48 @@ module for the DMA capture of the video flow.")
|
|||
(define-public ccextractor
|
||||
(package
|
||||
(name "ccextractor")
|
||||
(version "0.88")
|
||||
(version "0.94")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/CCExtractor/ccextractor")
|
||||
(commit (string-append "v" version))))
|
||||
(uri (git-reference
|
||||
(url "https://github.com/CCExtractor/ccextractor")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
;; FIXME: Delete the 'src/thirdparty directory and unbundle the
|
||||
;; libraries it contains, such as freetype, libpng, zlib, and others.
|
||||
(patches (search-patches "ccextractor-add-missing-header.patch"
|
||||
"ccextractor-autoconf-tesseract.patch"
|
||||
"ccextractor-fix-ocr.patch"))
|
||||
(sha256
|
||||
(base32 "1sya45hvv4d46bk7541yimmafgvgyhkpsvwfz9kv6pm4yi1lz6nb"))))
|
||||
(build-system cmake-build-system)
|
||||
(base32 "1hrk4xlzkvk9pnv0yr4whcsh8h4fzk42mrf30dsr3xzh1lgpfslg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; No target
|
||||
#:configure-flags
|
||||
(list
|
||||
"-DWITH_FFMPEG=ON"
|
||||
"-DWITH_OCR=ON"
|
||||
"-DWITH_SHARING=ON"
|
||||
"-DWITH_HARDSUBX=ON")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; The package is in a sub-dir of this repo.
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir "src")
|
||||
#t))
|
||||
(add-after 'chdir 'fix-build-errors
|
||||
(lambda _
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("libnanomsg")
|
||||
"nanomsg"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)))
|
||||
(inputs
|
||||
`(("ffmeg" ,ffmpeg-3.4)
|
||||
("nanomsg" ,nanomsg)
|
||||
("leptonica" ,leptonica)
|
||||
("ocr" ,tesseract-ocr)
|
||||
("zlib" ,zlib)))
|
||||
(list #:configure-flags
|
||||
#~(list "--enable-ffmpeg"
|
||||
"--enable-ocr"
|
||||
"--enable-hardsubx"
|
||||
;; Disable Rust support, as there's no rust source included
|
||||
;; and cargo wants to fetch the crates from the network
|
||||
;; (see:
|
||||
;; https://github.com/CCExtractor/ccextractor/issues/1502).
|
||||
"--without-rust")
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir "linux")))
|
||||
(add-after 'chdir 'patch-pre-build.sh
|
||||
(lambda _
|
||||
(substitute* "pre-build.sh"
|
||||
(("/usr/bin/env") (which "env")))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; There is no test suite; simply run the binary
|
||||
;; to validate there are no obvious problems.
|
||||
(invoke "./ccextractor" "--help")))))))
|
||||
(native-inputs (list autoconf automake pkg-config))
|
||||
(inputs (list ffmpeg-3.4 leptonica-1.80 tesseract-ocr-4))
|
||||
(synopsis "Closed Caption Extractor")
|
||||
(description "CCExtractor is a tool that analyzes video files and produces
|
||||
independent subtitle files from the closed captions data. It is portable, small,
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -2051,7 +2052,7 @@ so that they can be used normally in signals and properties.")
|
|||
"0ry9jfvfgdwzalxcvwsgr7plhk3agx7p40l0fqdf3vrf7ds47i29"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
(list perl-extutils-depends perl-extutils-pkgconfig))
|
||||
(list perl-extutils-depends perl-extutils-pkgconfig pkg-config))
|
||||
(inputs
|
||||
(list gtk+-2))
|
||||
(propagated-inputs
|
||||
|
|
@ -2421,7 +2422,7 @@ Parcellite and adds bugfixes and features.")
|
|||
"-Dinstalled_tests=false"
|
||||
,@(if (%current-target-system)
|
||||
;; Introspection requires running binaries for 'host' on 'build'.
|
||||
'("-Dintrospection=false")
|
||||
'("-Dintrospection=disabled")
|
||||
'()))))
|
||||
(native-inputs
|
||||
`(("git" ,git-minimal/pinned)
|
||||
|
|
|
|||
|
|
@ -2560,35 +2560,35 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")))))))
|
|||
modules, allowing for people to cooperate integrating their generic Guile
|
||||
modules into a coherent library. Think \"a down-scaled, limited-scope CPAN
|
||||
for Guile\". It provides the following modules:
|
||||
+@itemize
|
||||
+@item (apicheck) Describe and verify library programming interfaces.
|
||||
+@item (config load) Loading configuration files.
|
||||
+@item (container async-queue) A thread-safe message queue.
|
||||
+@item (container nodal-tree) A tree consisting of nodes with attributes.
|
||||
+@item (container delay-tree) A nodal tree with lazily evaluated fields.
|
||||
+@item (debugging assert) Helpful assert macro.
|
||||
+@item (debugging time) A simple macro to time the execution of an expression.
|
||||
+@item (graph topological-sort) Routines to perform topological sorts.
|
||||
+@item (htmlprag) Neil Van Dyke's permissive (\"pragmatic\") HTML parser.
|
||||
+@item (io string) SLIB's IO routines dealing with strings.
|
||||
+@item (logging logger) A flexible logging system.
|
||||
+@item (logging port-log) A logger that outputs to a port.
|
||||
+@item (logging rotating-log) A logger that rotates its output files.
|
||||
+@item (match-bind) Nifty and concise regular expression routines.
|
||||
+@item (math minima) A golden-section minimum finder.
|
||||
+@item (math primes) Functions related to prime numbers and factorization.
|
||||
+@item (os process) Spawning processes and capturing their output.
|
||||
+@item (scheme documentation) Macros to define different kinds of variables
|
||||
+with documentation.
|
||||
+@item (scheme kwargs) Defining functions with flexible keyword arguments.
|
||||
+@item (search basic) Classic search functions.
|
||||
+@item (string completion) Building blocks for tab completion.
|
||||
+@item (string soundex) The SOUNDEX string categorization algorithm.
|
||||
+@item (string transform) Beyond SRFI-13.
|
||||
+@item (string wrap) A versatile string formatter.
|
||||
+@item (term ansi-color) Generate ANSI color escape sequences.
|
||||
+@item (unit-test) A JUnit-style unit testing framework.
|
||||
+@end itemize")
|
||||
@itemize
|
||||
@item (apicheck) Describe and verify library programming interfaces.
|
||||
@item (config load) Loading configuration files.
|
||||
@item (container async-queue) A thread-safe message queue.
|
||||
@item (container nodal-tree) A tree consisting of nodes with attributes.
|
||||
@item (container delay-tree) A nodal tree with lazily evaluated fields.
|
||||
@item (debugging assert) Helpful assert macro.
|
||||
@item (debugging time) A simple macro to time the execution of an expression.
|
||||
@item (graph topological-sort) Routines to perform topological sorts.
|
||||
@item (htmlprag) Neil Van Dyke's permissive (\"pragmatic\") HTML parser.
|
||||
@item (io string) SLIB's IO routines dealing with strings.
|
||||
@item (logging logger) A flexible logging system.
|
||||
@item (logging port-log) A logger that outputs to a port.
|
||||
@item (logging rotating-log) A logger that rotates its output files.
|
||||
@item (match-bind) Nifty and concise regular expression routines.
|
||||
@item (math minima) A golden-section minimum finder.
|
||||
@item (math primes) Functions related to prime numbers and factorization.
|
||||
@item (os process) Spawning processes and capturing their output.
|
||||
@item (scheme documentation) Macros to define different kinds of variables
|
||||
with documentation.
|
||||
@item (scheme kwargs) Defining functions with flexible keyword arguments.
|
||||
@item (search basic) Classic search functions.
|
||||
@item (string completion) Building blocks for tab completion.
|
||||
@item (string soundex) The SOUNDEX string categorization algorithm.
|
||||
@item (string transform) Beyond SRFI-13.
|
||||
@item (string wrap) A versatile string formatter.
|
||||
@item (term ansi-color) Generate ANSI color escape sequences.
|
||||
@item (unit-test) A JUnit-style unit testing framework.
|
||||
@end itemize")
|
||||
;; The whole is under GPLv3+, but some modules are under laxer
|
||||
;; distribution terms such as LGPL and public domain. See `COPYING' for
|
||||
;; details.
|
||||
|
|
@ -4390,7 +4390,7 @@ over, or update a value in arbitrary data structures.")
|
|||
(define-public guile-xapian
|
||||
(package
|
||||
(name "guile-xapian")
|
||||
(version "0.3.0")
|
||||
(version "0.3.1")
|
||||
(home-page "https://git.systemreboot.net/guile-xapian")
|
||||
(source
|
||||
(origin
|
||||
|
|
@ -4400,7 +4400,7 @@ over, or update a value in arbitrary data structures.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0k18navsd0rqx2zbqgvhzscvbls2sxs9k06n195s4bvyd50acfm5"))))
|
||||
"0axbahbi52ji0fxhykn642265v58rdp2yqliqv456nqs038wb5ja"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings
|
||||
|
|
@ -4518,6 +4518,32 @@ WebSocket protocol as defined by RFC 6455.")
|
|||
(home-page "https://dthompson.us/projects/guile-websocket.html")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public guile-gemini
|
||||
(package
|
||||
(name "guile-gemini")
|
||||
(version "0.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/flatwhatson/guile-gemini")
|
||||
(commit "6d70c5dc6b35c26103f560f7e63c770a424dbca2")))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rvqqirwsqn3nspr6z1smfp3rj7gc7hfq7cmadx7zxbr3yg5y04x"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
'(#:source-directory "src"))
|
||||
(inputs (list guile-3.0-latest))
|
||||
(propagated-inputs (list guile-fibers-1.1 guile-gnutls))
|
||||
(home-page "https://github.com/flatwhatson/guile-gemini")
|
||||
(synopsis "Guile implementation of the Gemini protocol")
|
||||
(description
|
||||
"Guile Gemini is an implementation of the Gemini protocol in Guile Scheme,
|
||||
providing both client and server functionality. It uses GnuTLS to meet
|
||||
Gemini's TLS requirements, and Guile Fibers for concurrency.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public guile-rdf
|
||||
(package
|
||||
(name "guile-rdf")
|
||||
|
|
|
|||
|
|
@ -294,13 +294,13 @@ to @code{cabal repl}).")
|
|||
(define-public git-annex
|
||||
(package
|
||||
(name "git-annex")
|
||||
(version "10.20230126")
|
||||
(version "10.20230227")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hackage-uri "git-annex" version))
|
||||
(sha256
|
||||
(base32 "06b5gnj0dxiz7lkc75xmmzi50svwbqhs5az01lfmw27r3ibcicpm"))))
|
||||
(base32 "03cnx63gcrza9sshk9fvwq8c2p7cb7hj8h81g5dc1x56syigdpgi"))))
|
||||
(build-system haskell-build-system)
|
||||
(properties '((upstream-name . "git-annex")))
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -276,7 +276,7 @@ spell-checking library.")
|
|||
(#\_ #\-)
|
||||
(chr chr))
|
||||
(string-downcase dict-name))))
|
||||
(version "7.5.0.3")
|
||||
(version "7.5.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2018, 2020-2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
|
|
@ -122,19 +122,21 @@ GNU/Hurd."
|
|||
"1gyda8sq6b379nx01hkpbd85lz39irdvz2b9wbr63gicicx8i706"))))
|
||||
(build-system gnu-build-system)
|
||||
;; Flex is needed both at build and run time.
|
||||
(inputs (list gnumach-headers flex perl))
|
||||
(native-inputs
|
||||
(list flex bison))
|
||||
(arguments `(#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'patch-non-shebang-references
|
||||
(lambda* (#:key build inputs outputs #:allow-other-keys)
|
||||
(let ((perl (assoc-ref inputs "perl"))
|
||||
(out (assoc-ref outputs "out")))
|
||||
(substitute* (string-append out "/bin/mig")
|
||||
(("perl ") (string-append perl "/bin/perl ")))
|
||||
#t))))))
|
||||
(inputs (list gnumach-headers flex))
|
||||
(native-inputs (list flex bison))
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'avoid-perl-dependency
|
||||
(lambda* (#:key build inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
;; By default 'mig' (or 'TARGET-mig') uses Perl to
|
||||
;; compute 'libexecdir_rel'. Avoid it.
|
||||
(substitute* (find-files bin "mig$")
|
||||
(("^libexecdir_rel=.*")
|
||||
"libexecdir_rel=../libexec\n"))))))))
|
||||
(home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html")
|
||||
(synopsis "Mach 3.0 interface generator for the Hurd")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -845,24 +845,24 @@ including 2D color images.")
|
|||
(lambda _
|
||||
(setenv "HOME" "/tmp") #t)))))
|
||||
(inputs
|
||||
`(("vips" ,vips)
|
||||
("glib" ,glib)
|
||||
("libtiff" ,libtiff)
|
||||
("gtk+-2" ,gtk+-2)
|
||||
("libxml2" ,libxml2)
|
||||
("libexif" ,libexif)
|
||||
("libjpeg" ,libjpeg-turbo) ;required by vips.pc
|
||||
("librsvg" ,librsvg)
|
||||
("fftw" ,fftw)
|
||||
("libgsf" ,libgsf)
|
||||
("imagemagick" ,imagemagick)
|
||||
("orc" ,orc)
|
||||
("matio" ,matio)
|
||||
("lcms" ,lcms)
|
||||
("libwebp" ,libwebp)
|
||||
("openexr" ,openexr-2)
|
||||
("poppler" ,poppler)
|
||||
("gsl" ,gsl)))
|
||||
(list vips
|
||||
glib
|
||||
libtiff
|
||||
gtk+-2
|
||||
libxml2
|
||||
libexif
|
||||
libjpeg-turbo ;required by vips.pc
|
||||
librsvg
|
||||
fftw
|
||||
libgsf
|
||||
imagemagick
|
||||
orc
|
||||
matio
|
||||
lcms
|
||||
libwebp
|
||||
openexr-2
|
||||
poppler
|
||||
gsl))
|
||||
(native-inputs
|
||||
(list flex bison pkg-config))
|
||||
(home-page "https://github.com/libvips/nip2")
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net>
|
||||
|
|
@ -656,6 +656,39 @@ scale and pixel depth, and pixelwise masking, blending, enhancement, and
|
|||
arithmetic ops.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public leptonica-1.80
|
||||
(package
|
||||
(inherit leptonica)
|
||||
(name "leptonica")
|
||||
(version "1.80.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/DanBloomberg/leptonica")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"12ddln72z5l3icz0i9rpsfkg5xik8fcwcn8lb0cp3jigjxi8gvkg"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments leptonica)
|
||||
((#:tests? _ #t)
|
||||
;; The pngio_reg test fails, probably because the libpng used is
|
||||
;; newer.
|
||||
#f)
|
||||
((#:phases phases '%standard-phases)
|
||||
#~(modify-phases #$phases
|
||||
(replace 'provide-absolute-giflib-reference
|
||||
(lambda _
|
||||
(let ((giflib #$(this-package-input "giflib")))
|
||||
;; Add an absolute reference to giflib to avoid propagation.
|
||||
;; This is the same as for the parent package, but at that
|
||||
;; time the file name was 'liblept.la, not libleptonica.la.
|
||||
(with-directory-excursion (string-append #$output "/lib")
|
||||
(substitute* '("liblept.la" "pkgconfig/lept.pc")
|
||||
(("-lgif")
|
||||
(string-append "-L" giflib "/lib -lgif")))))))))))))
|
||||
|
||||
(define-public jbig2dec
|
||||
(package
|
||||
(name "jbig2dec")
|
||||
|
|
|
|||
|
|
@ -861,21 +861,17 @@ new Date();"))
|
|||
(name "openjdk")
|
||||
(version "9.181")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "https://hg.openjdk.java.net/jdk/jdk/archive/3cc80be736f2.tar.bz2")
|
||||
(file-name (string-append name "-" version ".tar.bz2"))
|
||||
(method hg-fetch)
|
||||
(uri (hg-reference (url "https://hg.openjdk.org/jdk/jdk")
|
||||
(changeset "jdk-9+181")))
|
||||
(file-name (hg-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet `(begin
|
||||
(for-each delete-file
|
||||
(find-files "." ".*.(bin|exe|jar)$"))))
|
||||
(sha256
|
||||
(base32
|
||||
"01ihmyf7k5z17wbr7xig7y40l9f01d5zjgkcmawn1102hw5kchpq"))
|
||||
(patches (search-patches
|
||||
"openjdk-9-hotspot-pointer-comparison.patch"
|
||||
"openjdk-9-hotspot-stack-size.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
`(begin
|
||||
(for-each delete-file
|
||||
(find-files "." ".*.(bin|exe|jar)$"))
|
||||
#t))))
|
||||
"1v92nzdqx07c35x945awzir4yk0fk22vky6fpp8mq9js930sxsz0"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "jdk" "doc"))
|
||||
(arguments
|
||||
|
|
@ -1036,7 +1032,7 @@ new Date();"))
|
|||
("unzip" ,unzip)
|
||||
("which" ,which)
|
||||
("zip" ,zip)))
|
||||
(home-page "https://openjdk.java.net/projects/jdk9/")
|
||||
(home-page "https://openjdk.org/projects/jdk9/")
|
||||
(synopsis "Java development kit")
|
||||
(description
|
||||
"This package provides the Java development kit OpenJDK.")
|
||||
|
|
@ -1048,19 +1044,17 @@ new Date();"))
|
|||
(name "openjdk")
|
||||
(version "10.46")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "http://hg.openjdk.java.net/jdk/jdk/archive/6fa770f9f8ab.tar.bz2")
|
||||
(file-name (string-append name "-" version ".tar.bz2"))
|
||||
(method hg-fetch)
|
||||
(uri (hg-reference (url "https://hg.openjdk.org/jdk/jdk")
|
||||
(changeset "jdk-10+46")))
|
||||
(file-name (hg-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet `(begin
|
||||
(for-each delete-file
|
||||
(find-files "." ".*.(bin|exe|jar)$"))))
|
||||
(sha256
|
||||
(base32
|
||||
"0zywq2203b4hx4jms9vbwvjcj1d3k2v3qpx4s33729fkpmid97r4"))
|
||||
(patches (search-patches
|
||||
"openjdk-10-idlj-reproducibility.patch"
|
||||
"openjdk-10-hotspot-pointer-comparison.patch"
|
||||
"openjdk-10-hotspot-stack-size.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))))
|
||||
"0i47ar8lxzjrkkiwbzybfxs473390h4jq9ahm3xqdvy5zpchxy3y"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openjdk9)
|
||||
((#:phases phases)
|
||||
|
|
@ -1432,8 +1426,7 @@ new Date();"))
|
|||
"0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))
|
||||
(patches (search-patches "openjdk-10-hotspot-stack-size.patch"))))
|
||||
'(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openjdk11)
|
||||
((#:phases phases)
|
||||
|
|
@ -1460,8 +1453,6 @@ blacklisted.certs.pem"
|
|||
"07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"
|
||||
(source (origin
|
||||
(inherit (package-source base))
|
||||
(patches
|
||||
(search-patches "openjdk-10-hotspot-stack-size.patch"))
|
||||
(snippet ;override snippet
|
||||
'(begin
|
||||
;; The m4 macro uses 'help' to search for builtins, which is
|
||||
|
|
@ -1493,9 +1484,7 @@ blacklisted.certs.pem"
|
|||
(make-openjdk openjdk15 "16.0.2"
|
||||
"0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz"
|
||||
(source (origin
|
||||
(inherit (package-source base))
|
||||
(patches
|
||||
(search-patches "openjdk-10-hotspot-stack-size.patch"))))))
|
||||
(inherit (package-source base))))))
|
||||
|
||||
(define-public openjdk17
|
||||
(make-openjdk
|
||||
|
|
|
|||
|
|
@ -147,6 +147,42 @@ ANSI escape codes to another format.")
|
|||
provides functions to run a few automatable checks for Julia packages.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-arnoldimethod
|
||||
(package
|
||||
(name "julia-arnoldimethod")
|
||||
(version "0.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JuliaLinearAlgebra/ArnoldiMethod.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1gs7pikgdg436srxxfywpnp12ay1mf45f7z80wym92rfrjzakwh2"))))
|
||||
(build-system julia-build-system)
|
||||
(propagated-inputs
|
||||
(list julia-genericschur julia-staticarrays))
|
||||
(home-page "https://github.com/JuliaLinearAlgebra/ArnoldiMethod.jl")
|
||||
(synopsis "Implicitly Restarted Arnoldi Method, natively in Julia")
|
||||
(description
|
||||
"@code{ArnoldiMethod.jl} provides an iterative method to find a few
|
||||
approximate solutions to the eigenvalue problem in standard form with main
|
||||
goals:
|
||||
|
||||
@itemize
|
||||
@item Having a native Julia implementation of the @code{eigs} function that
|
||||
performs as well as ARPACK. With native we mean that its implementation should
|
||||
be generic and support any number type. Currently the partialschur function
|
||||
does not depend on LAPACK, and removing the last remnants of direct calls to
|
||||
BLAS is in the pipeline.
|
||||
|
||||
@item Removing the dependency of the Julia language on ARPACK. This goal was
|
||||
already achieved before the package was stable enough, since ARPACK moved to a
|
||||
separate repository @code{Arpack.jl}.
|
||||
@end itemize")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-arrayinterface
|
||||
(package
|
||||
(name "julia-arrayinterface")
|
||||
|
|
@ -226,6 +262,36 @@ appropriate BLAS or optimised Julia linear algebra routines. This supports a
|
|||
much wider class of matrix types than Julia's in-built @code{StridedArray}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-astrotime
|
||||
(package
|
||||
(name "julia-astrotime")
|
||||
(version "0.7.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JuliaAstro/AstroTime.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "032hlanan49ypqh4lwlf91pg7052c8h5sgbxqc1771b8j9srbyd2"))))
|
||||
(build-system julia-build-system)
|
||||
(native-inputs
|
||||
(list julia-measurements))
|
||||
(propagated-inputs
|
||||
(list julia-erfa
|
||||
julia-earthorientation
|
||||
julia-itemgraphs
|
||||
julia-macrotools
|
||||
julia-muladdmacro
|
||||
julia-reexport))
|
||||
(home-page "https://github.com/JuliaAstro/AstroTime.jl")
|
||||
(synopsis "Astronomical time keeping in Julia")
|
||||
(description "@code{AstroTime.jl} provides a high-precision, time-scale
|
||||
aware, @code{DateTime}-like data type which supports all commonly used
|
||||
astronomical time scales.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-automa
|
||||
(package
|
||||
(name "julia-automa")
|
||||
|
|
@ -1252,6 +1318,40 @@ both the 256 color and 24 bit true color extensions, and the different text
|
|||
styles available to terminals.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-cstparser
|
||||
(package
|
||||
(name "julia-cstparser")
|
||||
(version "3.3.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/julia-vscode/CSTParser.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "162jpcdph26ybg7rajbvfcbpnngygybpzk5bry4c4ppda3m1dl1i"))))
|
||||
(build-system julia-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-or-ignore-tests
|
||||
(lambda _
|
||||
(substitute* "test/iterate.jl"
|
||||
(("parser.jl")
|
||||
(string-append #$output "/share/julia/loadpath/CSTParser/test/parser.jl"))
|
||||
(("../src")
|
||||
(string-append #$output "/share/julia/loadpath/CSTParser/src")))
|
||||
(substitute* "test/check_base.jl"
|
||||
(("testset.*" all)
|
||||
(string-append all "return\n"))))))))
|
||||
(inputs (list julia-tokenize))
|
||||
(home-page "https://github.com/julia-vscode/CSTParser.jl")
|
||||
(synopsis "Parser for Julia")
|
||||
(description "This package provides a parser for Julia code.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-csv
|
||||
(package
|
||||
(name "julia-csv")
|
||||
|
|
@ -1829,6 +1929,31 @@ them. Conversions and promotions are defined to allow performing operations on
|
|||
combinations of dual numbers with predefined Julia numeric types.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-earthorientation
|
||||
(package
|
||||
(name "julia-earthorientation")
|
||||
(version "0.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JuliaAstro/EarthOrientation.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1fschx4qmfd83q0ymgbzqi1dl0drbh45cd7hlcbqnm9lfmw2d847"))))
|
||||
(build-system julia-build-system)
|
||||
(propagated-inputs
|
||||
(list julia-leapseconds
|
||||
julia-optionaldata
|
||||
julia-remotefiles))
|
||||
(home-page "https://github.com/JuliaAstro/EarthOrientation.jl")
|
||||
(synopsis "Calculate Earth orientation parameters from IERS tables in Julia")
|
||||
(description
|
||||
"This package provides a functionality to calculate Earth orientation parameters
|
||||
with data retrieved from @acronym{IERS, International Earth Rotation Service}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-ellipsisnotation
|
||||
(package
|
||||
(name "julia-ellipsisnotation")
|
||||
|
|
@ -3051,6 +3176,33 @@ assigned its own index, which is used to retrieve the value from the
|
|||
indexed images, sometimes called \"colormap images\" or \"paletted images.\"")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-inflate
|
||||
(package
|
||||
(name "julia-inflate")
|
||||
(version "0.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/GunnarFarneback/Inflate.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "16nbl40b819yzmfqs860xbcbx8nnxm0pkvzj49qmxibv5jnsj47q"))))
|
||||
(build-system julia-build-system)
|
||||
(arguments
|
||||
;; FIXME: Tests fail hard with a lot of errors.
|
||||
'(#:tests? #f))
|
||||
(propagated-inputs
|
||||
(list julia-codeczlib))
|
||||
(home-page "https://github.com/GunnarFarneback/Inflate.jl")
|
||||
(synopsis "Julia implementation of zlib decompression")
|
||||
(description "Inflate provides a pure Julia implementation of zlib decompression
|
||||
functionality, with both in- memory and streaming interfaces. This covers
|
||||
decompression of the Deflate algorithm and the Zlib and Gzip wrapper formats, as
|
||||
specified in RFC 1950, RFC 1951, and RFC 1952.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-infinity
|
||||
(package
|
||||
(name "julia-infinity")
|
||||
|
|
@ -3378,6 +3530,31 @@ external IRs. It can be used with Julia metaprogramming tools such as
|
|||
Cassette.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-itemgraphs
|
||||
(package
|
||||
(name "julia-itemgraphs")
|
||||
(version "0.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/helgee/ItemGraphs.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "16w30y7s922dzp7i64wxdrafv4gy13v3rl4k1z5jkvnmnw68kygg"))))
|
||||
(build-system julia-build-system)
|
||||
(propagated-inputs
|
||||
(list julia-lightgraphs))
|
||||
(home-page "https://github.com/helgee/ItemGraphs.jl")
|
||||
(synopsis "Shortest paths between items")
|
||||
(description
|
||||
"ItemGraphs is a simple wrapper around LightGraphs that enables most
|
||||
common use case for graph-like data structures: with collection of items that
|
||||
are in relations between each other providing the shortest path between two
|
||||
items.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-iteratorinterfaceextensions
|
||||
(package
|
||||
(name "julia-iteratorinterfaceextensions")
|
||||
|
|
@ -3576,6 +3753,100 @@ equations in string literals in the Julia language.")
|
|||
implementation of matrix-free methods for iterative solvers.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-leapseconds
|
||||
(package
|
||||
(name "julia-leapseconds")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JuliaTime/LeapSeconds.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "13xa49dx11n7ii77rw6300h1rfl4qlq05ypsprvfmvyww81angkp"))))
|
||||
(build-system julia-build-system)
|
||||
(native-inputs
|
||||
(list julia-erfa))
|
||||
(home-page "https://github.com/JuliaTime/LeapSeconds.jl")
|
||||
(synopsis "Leap seconds in Julia")
|
||||
(description
|
||||
"@code{LeapSeconds} provides a functionality to return the difference
|
||||
between @acronym{TAI, International Atomic Time} and @acronym{UTC, Coordinated
|
||||
Universal Time} or vice versa for a given date. For dates after 1972-01-01, this
|
||||
is the number of leap seconds.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-lightgraphs
|
||||
(package
|
||||
(name "julia-lightgraphs")
|
||||
(version "1.3.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sbromberger/LightGraphs.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ygnbzx32b9ciwgg0rn5i0m33dvrb6dh3an6bnmzac1w67sy2vxq"))))
|
||||
(build-system julia-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; FIXME: 8x tests fails adjusting for now.
|
||||
;; ERROR: LoadError: Some tests did not pass: 29548 passed, 0 failed,
|
||||
;; 8 errored, 0 broken.
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda _
|
||||
(substitute* "test/runtests.jl"
|
||||
;; Got exception outside of a @test BoundsError: attempt to
|
||||
;; access 1-element Vector{SubString{String}} at index [2]
|
||||
((".*degeneracy.*") "")
|
||||
;; Got exception outside of a @test type DataType has no field
|
||||
;; mutable
|
||||
((".*shortestpaths.*") ""))
|
||||
(substitute* "test/experimental/experimental.jl"
|
||||
;; Got exception outside of a @test type DataType has no field mutable
|
||||
(("\"shortestpaths\",") ""))
|
||||
(substitute* "test/linalg/runtests.jl"
|
||||
;; ArgumentError: Illegal buffers for SparseMatrixCSC
|
||||
;; construction 5 [1, 3, 5, 7, 9, 10] [1, 2, 1, 3, 2, 4, 3, 5,
|
||||
;; 4] [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
|
||||
;;
|
||||
;; ArgumentError: Illegal buffers for SparseMatrixCSC
|
||||
;; construction 5 UInt16[0x0001, 0x0003, 0x0005, 0x0007,
|
||||
;; 0x0009, 0x000a] UInt16[0x0001, 0x0002, 0x0001, 0x0003,
|
||||
;; 0x0002, 0x0004, 0x0003, 0x0005, 0x0004] [1, 1, 1, 1, 1, 1,
|
||||
;; 1, 1, 1, 1]
|
||||
;;
|
||||
;; ArgumentError: Illegal buffers for SparseMatrixCSC
|
||||
;; construction 5 Int32[1, 3, 5, 7, 9, 10] Int32[1, 2, 1, 3,
|
||||
;; 2, 4, 3, 5, 4] [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
|
||||
((".*spectral.*") ""))
|
||||
(substitute* "test/parallel/runtests.jl"
|
||||
;; Got exception outside of a @test type DataType has no field
|
||||
;; mutable
|
||||
((".*shortestpaths/johnson.*") "")
|
||||
;; Got exception outside of a @test TaskFailedException nested
|
||||
;; task error: On worker 2: UndefVarError: nv not defined
|
||||
((".*utils.*") "")))))))
|
||||
(propagated-inputs
|
||||
(list julia-arnoldimethod
|
||||
julia-datastructures
|
||||
julia-inflate
|
||||
julia-simpletraits))
|
||||
(home-page "https://github.com/sbromberger/LightGraphs.jl")
|
||||
(synopsis "Optimized graphs package for Julia")
|
||||
(description
|
||||
"LightGraphs offers both (a) a set of simple, concrete graph implementations --
|
||||
Graph (for undirected graphs) and DiGraph (for directed graphs), and (b) an API
|
||||
for the development of more sophisticated graph implementations under the
|
||||
AbstractGraph type.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public julia-linesearches
|
||||
(package
|
||||
(name "julia-linesearches")
|
||||
|
|
@ -4016,6 +4287,33 @@ aims to provide easy-to-use tools for such tasks.")
|
|||
Julia, with type-driven, overloadable packing/unpacking functionality.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-muladdmacro
|
||||
(package
|
||||
(name "julia-muladdmacro")
|
||||
(version "0.2.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/SciML/MuladdMacro.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0pvmfw7f3igpwx0w8c8i40pls0wfm248b1i662wnlrkqiw56j0yq"))))
|
||||
(build-system julia-build-system)
|
||||
(home-page "https://github.com/SciML/MuladdMacro.jl")
|
||||
(synopsis "Julia macro to convert expressions to use muladd calls and FMA operations")
|
||||
(description
|
||||
"This package provides the @code{@@muladd} macro. It automatically converts
|
||||
expressions with multiplications and additions or subtractions to calls with
|
||||
muladd which then fuse via FMA when it would increase the performance of the
|
||||
code. The @code{@@muladd} macro can be placed on code blocks and it will automatically
|
||||
find the appropriate expressions and nest muladd expressions when necessary. In
|
||||
mixed expressions summands without multiplication will be grouped together and
|
||||
evaluated first but otherwise the order of evaluation of multiplications and
|
||||
additions is not changed.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-mutablearithmetics
|
||||
(package
|
||||
(name "julia-mutablearithmetics")
|
||||
|
|
@ -4259,6 +4557,29 @@ optimisation rules, and tools for applying them to deeply nested models.")
|
|||
JuliaNLSolvers packages.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-optionaldata
|
||||
(package
|
||||
(name "julia-optionaldata")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/helgee/OptionalData.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "11js258j7cz6362ijsi24nih3lx90aalf8k1n3fv6v7iqas8bz5s"))))
|
||||
(build-system julia-build-system)
|
||||
(home-page "https://github.com/helgee/OptionalData.jl")
|
||||
(synopsis "Work with global data that might not be available")
|
||||
(description
|
||||
"This package provides the @code{@@OptionalData} macro and the corresponding
|
||||
OptData type which is a thin wrapper around a nullable value (of type @code{Union{T,
|
||||
Nothing} where T)}. It allows you to load and access globally available data at
|
||||
runtime in a type-stable way.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-orderedcollections
|
||||
(package
|
||||
(name "julia-orderedcollections")
|
||||
|
|
@ -4953,6 +5274,31 @@ recursive arrays like arrays of arrays.")
|
|||
(description "This package provides tools to re-export modules and symbols.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-remotefiles
|
||||
(package
|
||||
(name "julia-remotefiles")
|
||||
(version "0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/helgee/RemoteFiles.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1zpklzpd4ckp7s4wbf93qmq3dyyrx4pzl41x5i9zbiskadhniqnh"))))
|
||||
(build-system julia-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; Tests try to download from Internet.
|
||||
(propagated-inputs
|
||||
(list julia-fileio julia-http))
|
||||
(home-page "https://github.com/helgee/RemoteFiles.jl")
|
||||
(synopsis "Download files from the Internet and keep them up-to-date")
|
||||
(description
|
||||
"This package provides a functionality of files download with cURL, wget or
|
||||
@code{HTTP.jl} backends.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-referencetests
|
||||
(package
|
||||
(name "julia-referencetests")
|
||||
|
|
@ -5928,6 +6274,26 @@ standard named test images and example images for the internal usage in
|
|||
package.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-tokenize
|
||||
(package
|
||||
(name "julia-tokenize")
|
||||
(version "0.5.24")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/JuliaLang/Tokenize.jl")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1l3dy6nad0viavzy26lfnhzpd3gcxgaq7yvm7h1ja280xsh60p3i"))))
|
||||
(build-system julia-build-system)
|
||||
(home-page "https://github.com/JuliaGPU/Tokenize.jl")
|
||||
(synopsis "Tokenize a string or buffer containing Julia code")
|
||||
(description "This package takes a string or buffer containing Julia code,
|
||||
performs lexical analysis and returns a stream of tokens.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public julia-tracker
|
||||
(package
|
||||
(name "julia-tracker")
|
||||
|
|
|
|||
|
|
@ -460,8 +460,8 @@ and provide an easily usable interface. Features include burning audio CDs
|
|||
from .WAV and .MP3 audio files, configuring external programs and configuring
|
||||
devices.
|
||||
|
||||
The @code{udisks-service} should be enabled for @command{k3b} to discover the
|
||||
available CD drives.")
|
||||
The @code{udisks-service-type} should be enabled for @command{k3b} to discover
|
||||
the available CD drives.")
|
||||
(license ;; GPL for programs, FDL for documentation
|
||||
(list license:gpl2+ license:fdl1.2+))))
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2022 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
|
||||
;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
|
||||
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
|
||||
|
|
@ -569,7 +569,7 @@ expression library, that is used in Krita.")
|
|||
(define-public krita
|
||||
(package
|
||||
(name "krita")
|
||||
(version "5.0.8")
|
||||
(version "5.1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -577,7 +577,7 @@ expression library, that is used in Krita.")
|
|||
"mirror://kde/stable/krita/" version "/krita-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32 "2iaypyv21zxvhr989r9j9nlhx642jc89xphz1qaw9q1y0yjiy7gd"))))
|
||||
(base32 "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
|
||||
;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -157,6 +158,21 @@ resolution, asynchronous file system operations, and threading primitives.")
|
|||
"0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3"))))
|
||||
(properties '((hidden? . #t)))))
|
||||
|
||||
(define-public libuv-for-r-httpuv
|
||||
;; When upgrading r-httpuv, also upgrade this.
|
||||
(package
|
||||
(inherit libuv)
|
||||
(name "libuv")
|
||||
(version "1.43.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dist.libuv.org/dist/v" version
|
||||
"/libuv-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh"))))
|
||||
(properties '((hidden? . #t)))))
|
||||
|
||||
(define-public libuv-julia
|
||||
(let ((commit "e6f0e4900e195c8352f821abe2b3cffc3089547b")
|
||||
(revision "4"))
|
||||
|
|
|
|||
|
|
@ -888,21 +888,6 @@ of decimal representation of the input floating-point number, the procedure
|
|||
commonly called @code{ftoa} or @code{dtoa}.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public dragonbox-for-libreoffice
|
||||
(package
|
||||
(inherit dragonbox)
|
||||
(name "dragonbox")
|
||||
(version "1.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jk-jeon/dragonbox")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"11h9xhpzp61rfyh1nnca5shzi40skgpdql080k5cb6cfy672s1qz"))))))
|
||||
|
||||
(define dtoa
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -915,7 +900,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
|||
(define-public libreoffice
|
||||
(package
|
||||
(name "libreoffice")
|
||||
(version "7.5.0.3")
|
||||
(version "7.5.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -924,7 +909,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
|||
"https://download.documentfoundation.org/libreoffice/src/"
|
||||
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0fq0fxwhbhikqzfl2z5xg2swlnrkg1p8l0shh6qdx9w0msihy4pm"))))
|
||||
(base32 "1dy0lvrvgkr7mbmiag26a38pivcddav8piph7jin1kw4phaxs3cj"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
@ -970,10 +955,10 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
|||
(string-append "GPGMEPP_CFLAGS=-I"
|
||||
(search-input-directory inputs
|
||||
"include/gpgme++")))
|
||||
(("DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.0.0")
|
||||
(("DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1\\.1\\.3")
|
||||
(string-append "DRAGONBOX_CFLAGS=-I"
|
||||
(search-input-directory inputs
|
||||
"include/dragonbox-1.0.0"))))
|
||||
"include/dragonbox-1.1.3"))))
|
||||
|
||||
;; /usr/bin/xdg-open doesn't exist on Guix System.
|
||||
(substitute* '("shell/source/unix/exec/shellexec.cxx"
|
||||
|
|
@ -1048,8 +1033,6 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
|||
(dirname
|
||||
(search-input-file %build-inputs
|
||||
"lib/libboost_system.so")))
|
||||
;; Avoid a dependency on ucpp.
|
||||
"--with-idlc-cpp=cpp"
|
||||
;; The fonts require an external tarball (crosextrafonts).
|
||||
;; They should not be needed when system fonts are available.
|
||||
"--without-fonts"
|
||||
|
|
@ -1086,7 +1069,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
|||
clucene
|
||||
cups
|
||||
dbus-glib
|
||||
dragonbox-for-libreoffice
|
||||
dragonbox
|
||||
firebird
|
||||
fontconfig
|
||||
fontforge
|
||||
|
|
@ -1100,7 +1083,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
|||
graphite2
|
||||
gst-plugins-base
|
||||
gtk+
|
||||
harfbuzz
|
||||
harfbuzz-5
|
||||
hunspell
|
||||
hyphen
|
||||
libabw
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
|
||||
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2016, 2018-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2016, 2018-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2016, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
|
|
@ -68,7 +68,8 @@
|
|||
;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz@gmail.com>
|
||||
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
|
||||
;;; Copyright © 2022 Stefan <stefan-guix@vodafonemail.de>
|
||||
;;; Copyright © 2022 Demis Balbach <db@minikn.xyz>
|
||||
;;; Copyright © 2022, 2023 Demis Balbach <db@minikn.xyz>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -481,17 +482,32 @@ 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.1-version "6.1.14")
|
||||
(define-public linux-libre-6.2-version "6.2.7")
|
||||
(define-public linux-libre-6.2-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.2
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-6.2-version
|
||||
linux-libre-6.2-gnu-revision
|
||||
(base32 "15wrksnimwb099qgqc631rp8dgv5b61l6s5kknk23frqdwkp4shp")
|
||||
(base32 "0ir5vvbdh6dly5ld8mfp7285g8k88w5bb32hj4wmgyqsbfqc6rf2")))
|
||||
(define-public linux-libre-6.2-pristine-source
|
||||
(let ((version linux-libre-6.2-version)
|
||||
(hash (base32 "138dpmj8qr5fcji99kmi3sj34ah21bgqgzsz2lbhn37v059100s3")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.2)))
|
||||
|
||||
(define-public linux-libre-6.1-version "6.1.20")
|
||||
(define-public linux-libre-6.1-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.1
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-6.1-version
|
||||
linux-libre-6.1-gnu-revision
|
||||
(base32 "0p1cg5khpp8xkfaqy0cnp1m273z3xiz0m97rkrkggz9gr2klrjym")
|
||||
(base32 "1g9xqc8ajs0g2yq9xizlgr7k47x75rk3y99yicky01fm13rvfvv3")))
|
||||
(base32 "10igxhqvlh5ar98i68xf5w9ywfb9l05vg20s8yxmgc62pj72h0yi")
|
||||
(base32 "0cchdhjra74zanyk14brv2l2dvxpg8dn58rn477lgfb44mcnhq33")))
|
||||
(define-public linux-libre-6.1-pristine-source
|
||||
(let ((version linux-libre-6.1-version)
|
||||
(hash (base32 "03c1pszgm0qwwz7l5fnmbr6ank632bsl81pdx48svizy3q0pcw52")))
|
||||
(hash (base32 "1w1iy1i3bpzrs5rhvqbn2awxv5qqgng9n7jd5js66g0sq3l2sckn")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.1)))
|
||||
|
|
@ -499,77 +515,77 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
;; The "longterm" kernels — the older releases with long-term upstream support.
|
||||
;; Here are the support timelines:
|
||||
;; <https://www.kernel.org/category/releases.html>
|
||||
(define-public linux-libre-5.15-version "5.15.96")
|
||||
(define-public linux-libre-5.15-version "5.15.103")
|
||||
(define-public linux-libre-5.15-gnu-revision "gnu")
|
||||
(define deblob-scripts-5.15
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.15-version
|
||||
linux-libre-5.15-gnu-revision
|
||||
(base32 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg")
|
||||
(base32 "1lwmax7078w5p6li1gf66m494xijy4bwa7nm5dlx0k09cfif9q2f")))
|
||||
(base32 "03hwhwbcicwyx5i30d6m715kwgrxz4h21xhk55wnawlk8zhx3r35")))
|
||||
(define-public linux-libre-5.15-pristine-source
|
||||
(let ((version linux-libre-5.15-version)
|
||||
(hash (base32 "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l")))
|
||||
(hash (base32 "01fpipy8skmp4dyxgk8fk9k6hc0w0gvk7mm8f8pm7jhwcf0vlxh8")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.15)))
|
||||
|
||||
(define-public linux-libre-5.10-version "5.10.170")
|
||||
(define-public linux-libre-5.10-version "5.10.175")
|
||||
(define-public linux-libre-5.10-gnu-revision "gnu1")
|
||||
(define deblob-scripts-5.10
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.10-version
|
||||
linux-libre-5.10-gnu-revision
|
||||
(base32 "0mw7qn77y9c6wrnw4rjvf75cpm1w6n1aqqhf8cnghcb97p2yxxrf")
|
||||
(base32 "0fk954nniva8a7s423fnfn2wz9j9jdhscc4pqyvwn0wlxxbjgyap")))
|
||||
(base32 "1g4vabfswxzf9ahxc06k2ffksf84kcr2csx4m5kx680w0jqqnk80")))
|
||||
(define-public linux-libre-5.10-pristine-source
|
||||
(let ((version linux-libre-5.10-version)
|
||||
(hash (base32 "0pw2jnsnq2yxxvl4dkx6f7a8gczj8l484qpd4ibw737vprv1idd2")))
|
||||
(hash (base32 "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.10)))
|
||||
|
||||
(define-public linux-libre-5.4-version "5.4.233")
|
||||
(define-public linux-libre-5.4-version "5.4.237")
|
||||
(define-public linux-libre-5.4-gnu-revision "gnu1")
|
||||
(define deblob-scripts-5.4
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.4-version
|
||||
linux-libre-5.4-gnu-revision
|
||||
(base32 "1nlgk8ajb5wl3aa96h9a0pb9j5a5wmrbpk63varn557x1d00r7wj")
|
||||
(base32 "19yydaws3vfiz9qilg665q3lysf1hy9pzx0414dis01ikyd27qr2")))
|
||||
(base32 "1d6as1yk9svysh07hdybs8glvn8s9f8gwlbjl7f9m920pdam2r60")))
|
||||
(define-public linux-libre-5.4-pristine-source
|
||||
(let ((version linux-libre-5.4-version)
|
||||
(hash (base32 "09vnp4qcv7kwahbbvjznnv7pxq1cvbn11n0rn5rzx97jnia5f7js")))
|
||||
(hash (base32 "09smq8jsbpqfh135snljack2wj41anx8f8i0lmjcqcq5zzhgw25p")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.4)))
|
||||
|
||||
(define-public linux-libre-4.19-version "4.19.274")
|
||||
(define-public linux-libre-4.19-version "4.19.278")
|
||||
(define-public linux-libre-4.19-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.19
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-4.19-version
|
||||
linux-libre-4.19-gnu-revision
|
||||
(base32 "06pqv050bkii0hc2v7ymny5264w1bca8db0dp1pw9mfmjg865am5")
|
||||
(base32 "0g1yhzxm3ixfll6n630v7lddcyvf888sg114nimh0lkvzd180s99")))
|
||||
(base32 "1q0fgpbdwc21wj9wnjjb49dp84ch6ymd5na3iaabadwjs2nmb6bd")))
|
||||
(define-public linux-libre-4.19-pristine-source
|
||||
(let ((version linux-libre-4.19-version)
|
||||
(hash (base32 "1a2w6knszfqg7ilnvxrs0kbgcviq90iqw9wp2d6y3qy9jfhnb8k4")))
|
||||
(hash (base32 "0miyadgnd52cgw3bgpmx66kr1pgxh14b2f52fasy57b6wysv0lnv")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.19)))
|
||||
|
||||
(define-public linux-libre-4.14-version "4.14.307")
|
||||
(define-public linux-libre-4.14-version "4.14.310")
|
||||
(define-public linux-libre-4.14-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.14
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-4.14-version
|
||||
linux-libre-4.14-gnu-revision
|
||||
(base32 "02rxvr0gmxb3zfsyyzdmzgfq04gkdkv1cc38md0xfl0mxzdzdfyk")
|
||||
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
|
||||
(base32 "1ccggm19nl7pdcxmsm08fkqy8phz8rqfmww5ypizibdmnrmpn2v9")))
|
||||
(define-public linux-libre-4.14-pristine-source
|
||||
(let ((version linux-libre-4.14-version)
|
||||
(hash (base32 "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f")))
|
||||
(hash (base32 "0r91f3jj3y0cca4sfs0xa12lbrc62q2yzgval5ainwr74bk7dwlb")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.14)))
|
||||
|
|
@ -602,6 +618,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(patches (append (origin-patches source)
|
||||
patches))))
|
||||
|
||||
(define-public linux-libre-6.2-source
|
||||
(source-with-patches linux-libre-6.2-pristine-source
|
||||
(list %boot-logo-patch
|
||||
%linux-libre-arm-export-__sync_icache_dcache-patch)))
|
||||
|
||||
(define-public linux-libre-6.1-source
|
||||
(source-with-patches linux-libre-6.1-pristine-source
|
||||
(list %boot-logo-patch
|
||||
|
|
@ -713,6 +734,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||
(description "Headers of the Linux-Libre kernel.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public linux-libre-headers-6.2
|
||||
(make-linux-libre-headers* linux-libre-6.2-version
|
||||
linux-libre-6.2-gnu-revision
|
||||
linux-libre-6.2-source))
|
||||
|
||||
(define-public linux-libre-headers-6.1
|
||||
(make-linux-libre-headers* linux-libre-6.1-version
|
||||
linux-libre-6.1-gnu-revision
|
||||
|
|
@ -863,10 +889,12 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
|
|||
;;; Kernel package utilities.
|
||||
;;;
|
||||
|
||||
(define (doc-supported? version)
|
||||
(define (apply-infodoc-patch? version)
|
||||
;; Versions older than 5.10 have different enough build scripts that the
|
||||
;; infodocs patch doesn't apply.
|
||||
(version>=? version "5.10"))
|
||||
(and (version>=? version "5.10")
|
||||
(not (version>=? version "6.2")))) ;patch applied upstream
|
||||
|
||||
|
||||
(define* (make-linux-libre version gnu-revision hash-string supported-systems
|
||||
#:key
|
||||
|
|
@ -879,7 +907,7 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
|
|||
(extra-options %default-extra-linux-options)
|
||||
(patches
|
||||
`(,%boot-logo-patch
|
||||
,@(if (doc-supported? version)
|
||||
,@(if (apply-infodoc-patch? version)
|
||||
(list (search-patch
|
||||
"linux-libre-infodocs-target.patch"))
|
||||
'()))))
|
||||
|
|
@ -1049,6 +1077,20 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||
;;; Generic kernel packages.
|
||||
;;;
|
||||
|
||||
(define-public linux-libre-6.2
|
||||
(make-linux-libre* linux-libre-6.2-version
|
||||
linux-libre-6.2-gnu-revision
|
||||
linux-libre-6.2-source
|
||||
'("x86_64-linux" "i686-linux" "armhf-linux"
|
||||
"aarch64-linux" "powerpc64le-linux" "riscv64-linux")
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-version linux-libre-6.2-version)
|
||||
(define-public linux-libre-gnu-revision linux-libre-6.2-gnu-revision)
|
||||
(define-public linux-libre-pristine-source linux-libre-6.2-pristine-source)
|
||||
(define-public linux-libre-source linux-libre-6.2-source)
|
||||
(define-public linux-libre linux-libre-6.2)
|
||||
|
||||
(define-public linux-libre-6.1
|
||||
(make-linux-libre* linux-libre-6.1-version
|
||||
linux-libre-6.1-gnu-revision
|
||||
|
|
@ -1057,12 +1099,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||
"aarch64-linux" "powerpc64le-linux" "riscv64-linux")
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-version linux-libre-6.1-version)
|
||||
(define-public linux-libre-gnu-revision linux-libre-6.1-gnu-revision)
|
||||
(define-public linux-libre-pristine-source linux-libre-6.1-pristine-source)
|
||||
(define-public linux-libre-source linux-libre-6.1-source)
|
||||
(define-public linux-libre linux-libre-6.1)
|
||||
|
||||
(define-public linux-libre-5.15
|
||||
(make-linux-libre* linux-libre-5.15-version
|
||||
linux-libre-5.15-gnu-revision
|
||||
|
|
@ -1284,9 +1320,9 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||
(define-public linux-libre-with-bpf
|
||||
(let ((base-linux-libre
|
||||
(make-linux-libre*
|
||||
linux-libre-6.1-version
|
||||
linux-libre-6.1-gnu-revision
|
||||
linux-libre-6.1-source
|
||||
linux-libre-6.2-version
|
||||
linux-libre-6.2-gnu-revision
|
||||
linux-libre-6.2-source
|
||||
'("x86_64-linux" "i686-linux" "armhf-linux"
|
||||
"aarch64-linux" "powerpc64le-linux" "riscv64-linux")
|
||||
#:extra-version "bpf"
|
||||
|
|
@ -1442,7 +1478,7 @@ This package provides the @command{corefreqd} data collection daemon, the
|
|||
(define-public librem-ec-acpi-linux-module
|
||||
(package
|
||||
(name "librem-ec-acpi-linux-module")
|
||||
(version "0.9.1")
|
||||
(version "0.9.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1451,7 +1487,7 @@ This package provides the @command{corefreqd} data collection daemon, the
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1qnbfj60i8nn2ahgj2zp5ixd79bb0wl1ld36x3igws2f3c0f5pfi"))))
|
||||
(base32 "0m8hamf0550083jnk5q4hv20l8lfiardnkxbib4hhvqghpzzbxl0"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f)) ; no test suite
|
||||
|
|
@ -1468,7 +1504,7 @@ and the notification, WiFi, and Bluetooth LED.")
|
|||
(define-public tuxedo-keyboard
|
||||
(package
|
||||
(name "tuxedo-keyboard")
|
||||
(version "3.1.1")
|
||||
(version "3.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1477,7 +1513,7 @@ and the notification, WiFi, and Bluetooth LED.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "17n14yh55yrxx4qbx4ph9drbzx2ll4kdsfmlngrdgizhyzk7z7zv"))))
|
||||
(base32 "00yq3bk4ss60q8zgykid6gzsi3n6grdnkk6dkdr8n42gwaprpbw7"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f)) ; no test suite
|
||||
|
|
@ -1492,6 +1528,35 @@ backlight only models are currently not supported. The @code{tuxedo_io} module
|
|||
is also needed for the @code{tuxedo-control-center} (short tcc) package.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(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"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(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")
|
||||
(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.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public ec
|
||||
(package
|
||||
(name "ec")
|
||||
|
|
@ -1859,11 +1924,14 @@ GnuPG-based password manager like @code{pass}.")
|
|||
#:phases #~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(lambda* (#:key parallel-build? #:allow-other-keys)
|
||||
(substitute* "Documentation/Makefile"
|
||||
;; Remove problematic environment check script.
|
||||
((".*scripts/sphinx-pre-install.*") ""))
|
||||
(invoke "make" "infodocs")))
|
||||
(invoke "make" "infodocs"
|
||||
"-j" (if parallel-build?
|
||||
(number->string (parallel-job-count))
|
||||
"1"))))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(let* ((info-dir (string-append #$output "/share/info"))
|
||||
|
|
@ -3183,7 +3251,7 @@ configuration (iptunnel, ipmaddr).")
|
|||
Linux-based operating systems.")
|
||||
|
||||
;; License is BSD-3 or GPLv2, at the user's choice.
|
||||
(license license:gpl2)))
|
||||
(license (list license:bsd-3 license:gpl2))))
|
||||
|
||||
(define-public bridge-utils
|
||||
(package
|
||||
|
|
@ -6574,7 +6642,7 @@ The collection contains a set of bandwidth and latency benchmark such as:
|
|||
(package
|
||||
(name "rng-tools")
|
||||
(home-page "https://github.com/nhorman/rng-tools")
|
||||
(version "6.15")
|
||||
(version "6.16")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page)
|
||||
|
|
@ -6582,27 +6650,32 @@ The collection contains a set of bandwidth and latency benchmark such as:
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0i00if7xknpm0dhkrm60rxzyyvq0vdibq7dvsd2ncm9pg098qvwj"))))
|
||||
"1rsk8nxs0j32b9hr88qk8hv029fb1q0hcrw0mfdywvm7dn2d15gn"))
|
||||
(patches
|
||||
(search-patches "rng-tools-revert-build-randstat.patch"))
|
||||
(patch-flags '("-p0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(;; Disable support for various hardware entropy sources as they need
|
||||
;; dependencies that are not yet in Guix, and would significantly
|
||||
;; increase closure size.
|
||||
#:configure-flags '("--without-nistbeacon"
|
||||
"--without-pkcs11"
|
||||
"--without-rtlsdr")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'disable-failing-test
|
||||
(lambda _
|
||||
(substitute* "tests/Makefile"
|
||||
;; This test requires a hwrng, rdrand, or tpm device.
|
||||
;; Worse, it appears to fail if that isn't sufficiently random.
|
||||
(("\\brngtestjitter\\.sh\\b") " ")))))))
|
||||
(list
|
||||
;; Disable support for various hardware entropy sources as they need
|
||||
;; dependencies that are not yet in Guix, and would significantly
|
||||
;; increase closure size.
|
||||
#:configure-flags #~(list "--without-nistbeacon"
|
||||
"--without-pkcs11"
|
||||
"--without-rtlsdr"
|
||||
"--without-qrypt")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'check 'disable-failing-test
|
||||
(lambda _
|
||||
(substitute* "tests/Makefile"
|
||||
;; This test requires a hwrng, rdrand, or tpm device.
|
||||
;; Worse, it appears to fail if that isn't sufficiently random.
|
||||
(("\\brngtestjitter\\.sh\\b") " ")))))))
|
||||
(native-inputs
|
||||
(list autoconf automake pkg-config))
|
||||
(inputs
|
||||
(list sysfsutils openssl))
|
||||
(list libcap sysfsutils openssl))
|
||||
(synopsis "Random number generator daemon")
|
||||
(description
|
||||
"Monitor a hardware random number generator, and supply entropy
|
||||
|
|
@ -7160,7 +7233,7 @@ interface to the variable facility of UEFI boot firmware.")
|
|||
(define-public efibootmgr
|
||||
(package
|
||||
(name "efibootmgr")
|
||||
(version "17")
|
||||
(version "18")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -7169,16 +7242,7 @@ interface to the variable facility of UEFI boot firmware.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"))
|
||||
(patches (search-patches "efibootmgr-remove-extra-decl.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Cast the first argument to the correct type. Extracted
|
||||
;; from upstream commit e8ce9fecebd15adb4.
|
||||
(substitute* '("src/efibootdump.c" "src/efibootmgr.c")
|
||||
(("efidp_format_device_path\\(text_path,")
|
||||
"efidp_format_device_path((unsigned char *)text_path,"))))))
|
||||
(base32 "1j19m3dngcb7jl88ib32phbh5r7c02dhhakq8jk6z7y408c111hd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
@ -7193,12 +7257,12 @@ interface to the variable facility of UEFI boot firmware.")
|
|||
;; nothing else is specified on the command line.
|
||||
"EFIDIR=gnu")
|
||||
#$(if (%current-target-system)
|
||||
#~(list
|
||||
(string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PKG_CONFIG=" #$(pkg-config-for-target))
|
||||
(string-append "EXTRAINCDIRS="
|
||||
#$(this-package-input "efivar") "/include"))
|
||||
#~'()))
|
||||
#~(list
|
||||
(string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PKG_CONFIG=" #$(pkg-config-for-target))
|
||||
(string-append "EXTRAINCDIRS="
|
||||
#$(this-package-input "efivar") "/include"))
|
||||
#~'()))
|
||||
#:phases #~(modify-phases %standard-phases (delete 'configure))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
|
|
@ -7507,7 +7571,7 @@ every time the power supply source is changed.")
|
|||
(define-public tlpui
|
||||
(package
|
||||
(name "tlpui")
|
||||
(version "1.5.0-1")
|
||||
(version "1.5.0-6")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -7516,7 +7580,7 @@ every time the power supply source is changed.")
|
|||
(commit (string-append "tlpui-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "16a6x733szsggn23ns7bj3gpvb80675plh96v4llrz0s8p3h47pg"))))
|
||||
(base32 "0zxiciafq1xmb047jlyhipkkj4vaiw4jzbx71f6xgx559dy96paq"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
@ -7527,16 +7591,31 @@ every time the power supply source is changed.")
|
|||
(lambda _
|
||||
(substitute* "setup.py"
|
||||
(("/usr/") ""))))
|
||||
(add-after 'unpack 'use-tlp-input
|
||||
;; Hard-code tlp-stat filename to avoid propagating "tlp".
|
||||
(add-after 'unpack 'set-absolute-locations
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((tlp-stat (search-input-file inputs "/bin/tlp-stat")))
|
||||
(let ((defaults.conf
|
||||
(search-input-file inputs "/share/tlp/defaults.conf"))
|
||||
(lspci (search-input-file inputs "/sbin/lspci"))
|
||||
(lsusb (search-input-file inputs "/bin/lsusb"))
|
||||
(tlp-stat (search-input-file inputs "/bin/tlp-stat")))
|
||||
(with-directory-excursion "tlpui"
|
||||
(substitute* '("file.py" "settingshelper.py" "statui.py")
|
||||
(("which\\(\"tlp-stat\"\\)")
|
||||
(string-append "'" tlp-stat "'"))
|
||||
(("\"tlp-stat\"")
|
||||
(string-append "'" tlp-stat "'")))))))
|
||||
(string-append "'" tlp-stat "'"))
|
||||
(("/usr/share/tlp/defaults.conf")
|
||||
(string-append "'" defaults.conf "'")))
|
||||
(substitute* "ui_config_objects/gtkusblist.py"
|
||||
(("\"lsusb\"")
|
||||
(string-append "'" lsusb "'")))
|
||||
(substitute* "ui_config_objects/gtkpcilist.py"
|
||||
(("\"lspci\"")
|
||||
(string-append "'" lspci "'")))
|
||||
;; Settings check if various tlp executables, lspci and
|
||||
;; usbutils are available. Skip this phase since we know
|
||||
;; for sure they are (and it avoids patching each location).
|
||||
(substitute* "settingshelper.py"
|
||||
(("(command_exists = ).*" _ lead)
|
||||
(string-append lead "True\n")))))))
|
||||
(add-before 'check 'fix-home-directory
|
||||
(lambda _
|
||||
;; Tests fail with "Permission denied:
|
||||
|
|
@ -7547,6 +7626,13 @@ every time the power supply source is changed.")
|
|||
;; Connection refused" and "Error: cannot read user
|
||||
;; configuration from /etc/tlp.conf or /etc/default/tlp".
|
||||
(delete 'sanity-check)
|
||||
;; Skip two failing tests (out of 10) about configuration file
|
||||
;; issues.
|
||||
(add-before 'check 'skip-failing-tests
|
||||
(lambda _
|
||||
(substitute* "test/test_tlp_settings.py"
|
||||
((".*?windowxsize = 900.*") "")
|
||||
((".*?windowysize = 600.*") ""))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
|
|
@ -7559,7 +7645,7 @@ every time the power supply source is changed.")
|
|||
(native-inputs
|
||||
(list `(,glib "bin") gobject-introspection python-discover))
|
||||
(inputs
|
||||
(list gtk+ python-pygobject tlp))
|
||||
(list gtk+ pciutils python-pygobject tlp usbutils))
|
||||
(home-page "https://github.com/d4nj1/TLPUI")
|
||||
(synopsis "User interface for TLP written in Python")
|
||||
(description
|
||||
|
|
@ -9522,7 +9608,7 @@ provides user-space tools for creating EROFS file systems.")
|
|||
(define-public rasdaemon
|
||||
(package
|
||||
(name "rasdaemon")
|
||||
(version "0.7.0")
|
||||
(version "0.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -9531,9 +9617,9 @@ provides user-space tools for creating EROFS file systems.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1a3ycx1g2zyshlna9fg8c9329m8wia42vkmlh2awfab0ngwi3g50"))))
|
||||
(native-inputs (list autoconf automake libtool))
|
||||
(inputs (list perl perl-dbd-sqlite sqlite dmidecode kmod))
|
||||
(base32 "0m3j1hz9rqcvwmrimpakd239s0ppzaplkykhf9wyh55xmmry8z85"))))
|
||||
(native-inputs (list autoconf automake libtool pkg-config))
|
||||
(inputs (list libtraceevent perl perl-dbd-sqlite sqlite dmidecode kmod))
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags
|
||||
|
|
@ -9543,27 +9629,25 @@ provides user-space tools for creating EROFS file systems.")
|
|||
"--localstatedir=/var")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'rename-README
|
||||
(lambda _
|
||||
;; Required by autoreconf
|
||||
(rename-file "README.md" "README")))
|
||||
(add-before 'configure 'munge-autotools
|
||||
(lambda _
|
||||
;; For some reason upstream forces sysconfdir=/etc. This results
|
||||
;; in EPERM during the install phase. Removing the offending
|
||||
;; line lets sysconfdir correctly pick up DESTDIR.
|
||||
(substitute* "configure.ac"
|
||||
(("^test .* sysconfdir=/etc\n$") ""))
|
||||
;; Upstream tries to create /var/lib/rasdaemon at install time.
|
||||
;; This results in EPERM on guix. Instead, the service should
|
||||
;; create this at activation time.
|
||||
(substitute* "Makefile.am"
|
||||
(("^\\s*\\$\\(install_sh\\) -d .*@RASSTATEDIR@.*$") ""))))
|
||||
(add-after 'install 'fix-dmidecode-and-modprobe
|
||||
(lambda _
|
||||
(substitute* (string-append #$output "/sbin/ras-mc-ctl")
|
||||
(("find_prog \\(\"dmidecode\"\\).*$") (format #f "~s;~%" (string-append #$dmidecode "/sbin/dmidecode")))
|
||||
(("find_prog \\(\"modprobe\"\\).*$") (format #f "~s;~%" (string-append #$kmod "/bin/modprobe"))))))
|
||||
(("^test .* sysconfdir=/etc\n$") ""))))
|
||||
(add-after 'wrap 'wrap-rasdaemon
|
||||
(lambda _
|
||||
(wrap-program (string-append #$output "/sbin/ras-mc-ctl")
|
||||
`("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:))))))))
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((path (map dirname
|
||||
(list (search-input-file inputs "/sbin/dmidecode")
|
||||
(search-input-file inputs "/bin/modprobe")))))
|
||||
(wrap-program (string-append #$output "/sbin/ras-mc-ctl")
|
||||
`("PATH" ":" prefix ,path)
|
||||
`("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:)))))))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://github.com/mchehab/rasdaemon")
|
||||
(synopsis "Platform Reliability, Availability, and Serviceability tools")
|
||||
|
|
@ -9610,6 +9694,45 @@ older system-wide @file{/sys} interface.")
|
|||
license:gpl2+ ;; gpio-tools
|
||||
license:lgpl3+)))) ;; C++ bindings
|
||||
|
||||
(define-public libtraceevent
|
||||
(package
|
||||
(name "libtraceevent")
|
||||
(version "1.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git")
|
||||
(commit (string-append name "-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1kbl11lqh8cadi6r3qqxx68idr7597l6i50pr5p5mdgsf6k2i83c"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(substitute* "Makefile"
|
||||
(("/bin/pwd") "pwd"))
|
||||
(substitute* "scripts/utils.mk"
|
||||
(("/bin/pwd") "pwd"))))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;no test suite
|
||||
#:make-flags
|
||||
#~(list
|
||||
(string-append "pkgconfig_dir=" #$output "/lib/pkgconfig")
|
||||
(string-append "prefix=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(home-page "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/")
|
||||
(synopsis "Linux kernel trace event library")
|
||||
(description "This package provides library to parse raw trace event
|
||||
formats.")
|
||||
(license (list license:gpl2
|
||||
license:lgpl2.1))))
|
||||
|
||||
(define-public libtree
|
||||
(package
|
||||
(name "libtree")
|
||||
|
|
@ -9649,6 +9772,42 @@ older system-wide @file{/sys} interface.")
|
|||
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")
|
||||
|
|
|
|||
|
|
@ -718,8 +718,8 @@ by Chris Riesbeck.")
|
|||
(sbcl-package->cl-source-package sbcl-nst))
|
||||
|
||||
(define-public sbcl-parachute
|
||||
(let ((commit "8bc3e1b5a1808341967aeb89516f9fab23cd1d9e")
|
||||
(revision "0"))
|
||||
(let ((commit "bd072b0e4d0ff3ee2201eca3eb28c287686ab49e")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "sbcl-parachute")
|
||||
(version (git-version "1.5.0" revision commit))
|
||||
|
|
@ -732,7 +732,7 @@ by Chris Riesbeck.")
|
|||
(commit commit)))
|
||||
(file-name (git-file-name "cl-parachute" version))
|
||||
(sha256
|
||||
(base32 "0cppp1sp9xqkgxgkwidhqzlsj03ywnar7z9mzwcliww8y0kv5555"))))
|
||||
(base32 "0srjsklhr04snlv98021mb0a5lb8dlypv1lnjdhsdhjbbiwbw2n9"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(inputs
|
||||
(list sbcl-documentation-utils
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -14,7 +14,7 @@
|
|||
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
|
||||
;;; Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2019-2023 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
|
|
@ -139,117 +139,124 @@ Definition Facility.")
|
|||
(license license:expat)))
|
||||
|
||||
(define-public gcl
|
||||
(let ((commit "ff7ef981765cc0efdb4b1db27c292f5c11a72753")
|
||||
(revision "3")) ;Guix package revision
|
||||
(package
|
||||
(name "gcl")
|
||||
(version (git-version "2.6.12" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.gnu.org/r/gcl.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0z64fxxcaial2i1s1hms8r095dm1ff3wd8ivwdx894a3yln9c0an"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:parallel-build? #f ; The build system seems not to be thread safe.
|
||||
#:test-target "ansi-tests/test_results"
|
||||
#:configure-flags ,#~(list
|
||||
"--enable-ansi" ; required by the maxima package
|
||||
(string-append "CFLAGS=-I"
|
||||
#$(this-package-input "libtirpc")
|
||||
"/include/tirpc")
|
||||
(string-append "LDFLAGS=-L"
|
||||
#$(this-package-input "libtirpc")
|
||||
"/lib")
|
||||
"LIBS=-ltirpc")
|
||||
#:make-flags ,#~(let ((gcc (search-input-file %build-inputs "/bin/gcc")))
|
||||
(list (string-append "GCL_CC=" gcc)
|
||||
(string-append "CC=" gcc)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'realpath-workaround
|
||||
;; Calls to the realpath function can set errno even if the return
|
||||
;; value of the function indicates that there is no error, which
|
||||
;; make massert consider that there was an error.
|
||||
(lambda _
|
||||
(substitute* "gcl/o/main.c"
|
||||
(("massert\\(realpath\\(s,o\\)\\);" all)
|
||||
"massert((realpath(s, o) != NULL) && ((errno = 0) == 0));"))))
|
||||
(add-after 'unpack 'fix-makefile
|
||||
;; The "final" target doesn't exist.
|
||||
(lambda _
|
||||
(substitute* "gcl/makefile"
|
||||
(("\\$\\(MAKE\\) -C \\$\\(PORTDIR\\) final")
|
||||
"$(MAKE) -C $(PORTDIR)"))))
|
||||
(add-before 'configure 'pre-conf
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(chdir "gcl")
|
||||
(substitute*
|
||||
(append
|
||||
'("pcl/impl/kcl/makefile.akcl"
|
||||
"add-defs"
|
||||
"unixport/makefile.dos"
|
||||
"add-defs.bat"
|
||||
"gcl-tk/makefile.prev"
|
||||
"add-defs1")
|
||||
(find-files "h" "\\.defs"))
|
||||
(("SHELL=/bin/bash")
|
||||
(string-append "SHELL=" (which "bash")))
|
||||
(("SHELL=/bin/sh")
|
||||
(string-append "SHELL=" (which "sh"))))
|
||||
(substitute* "h/linux.defs"
|
||||
(("#CC") "CC")
|
||||
(("-fwritable-strings") "")
|
||||
(("-Werror") ""))
|
||||
(substitute* "lsp/gcl_top.lsp"
|
||||
(("\"cc\"")
|
||||
(string-append "\"" (assoc-ref %build-inputs "gcc")
|
||||
"/bin/gcc\""))
|
||||
(("\\(or \\(get-path \\*cc\\*\\) \\*cc\\*\\)") "*cc*")
|
||||
(("\"ld\"")
|
||||
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||
"/bin/ld\""))
|
||||
(("\\(or \\(get-path \\*ld\\*\\) \\*ld\\*\\)") "*ld*")
|
||||
(("\\(get-path \"objdump --source \"\\)")
|
||||
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||
"/bin/objdump --source \"")))
|
||||
#t))
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((gcl (assoc-ref outputs "out"))
|
||||
(input-path (lambda (lib path)
|
||||
(string-append
|
||||
(assoc-ref inputs lib) path)))
|
||||
(binaries '("binutils")))
|
||||
;; GCC and the GNU binutils are necessary for GCL to be
|
||||
;; able to compile Lisp functions and programs (this is
|
||||
;; a standard feature in Common Lisp). While the
|
||||
;; the location of GCC is specified in the make-flags,
|
||||
;; the GNU binutils must be available in GCL's $PATH.
|
||||
(wrap-program (string-append gcl "/bin/gcl")
|
||||
`("PATH" prefix ,(map (lambda (binary)
|
||||
(input-path binary "/bin"))
|
||||
binaries))))
|
||||
#t))
|
||||
;; drop strip phase to make maxima build, see
|
||||
;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html
|
||||
(delete 'strip))))
|
||||
(inputs
|
||||
(list bash-minimal gmp libtirpc readline))
|
||||
(native-inputs
|
||||
(list m4 texinfo))
|
||||
(home-page "https://www.gnu.org/software/gcl/")
|
||||
(synopsis "Common Lisp implementation")
|
||||
(description "GCL is an implementation of the Common Lisp language. It
|
||||
(package
|
||||
(name "gcl")
|
||||
(version "2.6.14")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.gnu.org/r/gcl.git")
|
||||
(commit (string-append "Version_"
|
||||
(string-map (lambda (c)
|
||||
(if (char=? c #\.) #\_ c))
|
||||
version)))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1b9m02rfnyflsr8n57v7llxz5m3mi7ip3ypwdww4pdhbgh0lzyg7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:parallel-build? #f ; The build system seems not to be thread safe.
|
||||
#:test-target "ansi-tests/test_results"
|
||||
#:configure-flags #~(list
|
||||
"--enable-ansi" ; required by the maxima package
|
||||
(string-append "CFLAGS=-I"
|
||||
#$(this-package-input "libtirpc")
|
||||
"/include/tirpc")
|
||||
(string-append "LDFLAGS=-L"
|
||||
#$(this-package-input "libtirpc")
|
||||
"/lib")
|
||||
"LIBS=-ltirpc")
|
||||
#:make-flags #~(let ((gcc (search-input-file %build-inputs "/bin/gcc")))
|
||||
(list (string-append "GCL_CC=" gcc)
|
||||
(string-append "CC=" gcc)))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'realpath-workaround
|
||||
;; Calls to the realpath function can set errno even if the return
|
||||
;; value of the function indicates that there is no error, which
|
||||
;; make massert consider that there was an error.
|
||||
(lambda _
|
||||
(substitute* "gcl/o/main.c"
|
||||
(("massert\\(realpath\\(s,o\\)\\);" all)
|
||||
"massert((realpath(s, o) != NULL) && ((errno = 0) == 0));"))))
|
||||
(add-after 'unpack 'fix-missing-enum
|
||||
(lambda _
|
||||
;; The 'disassembler_style' enum is not defined anywhere,
|
||||
;; and the parameter is not used...
|
||||
(substitute* "gcl/o/main.c"
|
||||
(("my_fprintf_styled\\(void \\*v,enum disassembler_style,")
|
||||
"my_fprintf_styled(void *v,int disassembler_style,"))))
|
||||
(add-after 'unpack 'fix-makefile
|
||||
;; The "final" target doesn't exist.
|
||||
(lambda _
|
||||
(substitute* "gcl/makefile"
|
||||
(("\\$\\(MAKE\\) -C \\$\\(PORTDIR\\) final")
|
||||
"$(MAKE) -C $(PORTDIR)"))))
|
||||
(add-before 'configure 'pre-conf
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(chdir "gcl")
|
||||
(substitute*
|
||||
(append
|
||||
'("pcl/impl/kcl/makefile.akcl"
|
||||
"add-defs"
|
||||
"unixport/makefile.dos"
|
||||
"add-defs.bat"
|
||||
"gcl-tk/makefile.prev"
|
||||
"add-defs1")
|
||||
(find-files "h" "\\.defs"))
|
||||
(("SHELL=/bin/bash")
|
||||
(string-append "SHELL=" (which "bash")))
|
||||
(("SHELL=/bin/sh")
|
||||
(string-append "SHELL=" (which "sh"))))
|
||||
(substitute* "h/linux.defs"
|
||||
(("#CC") "CC")
|
||||
(("-fwritable-strings") "")
|
||||
(("-Werror") ""))
|
||||
(substitute* "lsp/gcl_top.lsp"
|
||||
(("\"cc\"")
|
||||
(string-append "\"" (assoc-ref %build-inputs "gcc")
|
||||
"/bin/gcc\""))
|
||||
(("\\(or \\(get-path \\*cc\\*\\) \\*cc\\*\\)") "*cc*")
|
||||
(("\"ld\"")
|
||||
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||
"/bin/ld\""))
|
||||
(("\\(or \\(get-path \\*ld\\*\\) \\*ld\\*\\)") "*ld*")
|
||||
(("\\(get-path \"objdump --source \"\\)")
|
||||
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||
"/bin/objdump --source \"")))))
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((gcl #$output)
|
||||
(input-path (lambda (lib path)
|
||||
(string-append
|
||||
(assoc-ref inputs lib) path)))
|
||||
(binaries '("binutils")))
|
||||
;; GCC and the GNU binutils are necessary for GCL to be
|
||||
;; able to compile Lisp functions and programs (this is
|
||||
;; a standard feature in Common Lisp). While the
|
||||
;; the location of GCC is specified in the make-flags,
|
||||
;; the GNU binutils must be available in GCL's $PATH.
|
||||
(wrap-program (string-append gcl "/bin/gcl")
|
||||
`("PATH" prefix ,(map (lambda (binary)
|
||||
(input-path binary "/bin"))
|
||||
binaries))))))
|
||||
;; drop strip phase to make maxima build, see
|
||||
;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html
|
||||
(delete 'strip))))
|
||||
(inputs
|
||||
(list bash-minimal gmp libtirpc readline))
|
||||
(native-inputs
|
||||
(list m4 texinfo))
|
||||
(home-page "https://www.gnu.org/software/gcl/")
|
||||
(synopsis "Common Lisp implementation")
|
||||
(description "GCL is an implementation of the Common Lisp language. It
|
||||
features the ability to compile to native object code and to load native
|
||||
object code modules directly into its lisp core. It also features a
|
||||
stratified garbage collection strategy, a source-level debugger and a built-in
|
||||
interface to the Tk widget system.")
|
||||
(license license:lgpl2.0+))))
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public ecl
|
||||
(package
|
||||
|
|
@ -421,14 +428,14 @@ an interpreter, a compiler, a debugger, and much more.")
|
|||
(define-public sbcl
|
||||
(package
|
||||
(name "sbcl")
|
||||
(version "2.2.11")
|
||||
(version "2.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
|
||||
version "-source.tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1pwnhjp0fmkcgq11a6hj36gw8k05qramspgdbj28063k2s0dc1rn"))))
|
||||
(base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(native-inputs
|
||||
|
|
@ -1421,7 +1428,7 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
|
|||
(define-public eisl
|
||||
(package
|
||||
(name "eisl")
|
||||
(version "2.65")
|
||||
(version "2.72")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1430,7 +1437,7 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1cnis1v70k4wmvw1gmvj3l9qajzncaa9ka8rx67vx12bgrr0811g"))))
|
||||
(base32 "12dc6b70dcfalyq3h5i7lmz39xh310k5p83x5q6j18knd6ql9ik9"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list bash-minimal freeglut gdbm libiconv ncurses tcl tk))
|
||||
|
|
@ -1448,8 +1455,8 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
|
|||
(("\"cc ")
|
||||
"\"gcc "))
|
||||
(substitute* "library/tcltk.lsp"
|
||||
(("c-include \"<tcl/tcl\\.h>\"")
|
||||
"c-include \"<tcl.h>\"")
|
||||
(("include <tcl/tcl\\.h>")
|
||||
"include <tcl.h>")
|
||||
(("c-option \"-ltcl -ltk\" linux")
|
||||
"c-option \"-ltcl8.6 -ltk8.6\" linux"))))
|
||||
(delete 'configure)
|
||||
|
|
|
|||
|
|
@ -3816,3 +3816,45 @@ fi"
|
|||
original-exe
|
||||
original-exe)))
|
||||
(chmod exe #o555)))))))
|
||||
|
||||
(define-public python-brian2
|
||||
(package
|
||||
(name "python-brian2")
|
||||
(version "2.5.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Brian2" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1g48hzn3cdsvfjgz64s3kvh5d5287ggjxdyacb7wh2n5nd5iqlf7"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(setenv "HOME" "/tmp")
|
||||
;; Must be run in a different directory, otherwise compiled
|
||||
;; modules are not found.
|
||||
(with-directory-excursion "/tmp"
|
||||
;; Invoking brian2.test() is preferred to running pytest.
|
||||
(invoke "python" "-c"
|
||||
"import brian2, sys; sys.exit(0 if brian2.test() else 1)"))))))))
|
||||
(propagated-inputs (list python-cython ; Required by codegen.
|
||||
python-jinja2
|
||||
python-numpy
|
||||
python-py-cpuinfo
|
||||
python-pyparsing
|
||||
;; Required by codegen.
|
||||
python-setuptools
|
||||
python-sympy))
|
||||
(native-inputs (list python-pytest python-pytest-xdist))
|
||||
(home-page "https://briansimulator.org/")
|
||||
(synopsis "Clock-driven simulator for spiking neural networks")
|
||||
(description
|
||||
"Brian is a simulator for spiking neural networks written in Python. It
|
||||
is therefore designed to be easy to learn and use, highly flexible and
|
||||
easily extensible.")
|
||||
(license license:cecill)))
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
#:test-target "test"))
|
||||
(native-inputs
|
||||
`(("python" ,python-2)
|
||||
("tidy" ,tidy)))
|
||||
("tidy" ,tidy-html)))
|
||||
(synopsis "Markdown processing library")
|
||||
(description "Hoedown is a standards compliant, fast, secure markdown
|
||||
processing library written in C.")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019-2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
|
||||
;;;
|
||||
|
|
@ -42,13 +42,13 @@
|
|||
(define-public toot
|
||||
(package
|
||||
(name "toot")
|
||||
(version "0.32.1")
|
||||
(version "0.35.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "toot" version))
|
||||
(sha256
|
||||
(base32 "0diskgvqmnkjl4k6sdda8f1sfz0c4w0j8ppv1q7p84phh9vgml6g"))))
|
||||
(base32 "07vhirr3isi1bisqa5vgj13a4y9cj539c0djkd2dsa80g98g8xmi"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
|||
|
|
@ -1470,6 +1470,23 @@ MATE Desktop to monitor your system resources and usage.")
|
|||
used to bring up authentication dialogs.")
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
(define-public mate-polkit-for-xfce
|
||||
(package/inherit mate-polkit
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'patch-desktop
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((common (string-append
|
||||
(assoc-ref outputs "out") "/etc/xdg/autostart/"
|
||||
"polkit-mate-authentication-agent-"))
|
||||
(old (string-append common "1.desktop"))
|
||||
(new (string-append common "for-xfce-1.desktop")))
|
||||
(substitute* old (("MATE;") "XFCE;"))
|
||||
;; To avoid a conflict if both MATE and XFCE are installed.
|
||||
(rename-file old new)))))))
|
||||
(properties `((hidden? . #t)))))
|
||||
|
||||
(define-public mate
|
||||
(package
|
||||
(name "mate")
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
|
||||
;;; Copyright © 2022 Marek Felšöci <marek@felsoci.sk>
|
||||
;;; Copyright © 2022 vicvbcun <guix@ikherbers.com>
|
||||
;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
;;; Copyright © 2022 Maximilian Heisinger <mail@maxheisinger.at>
|
||||
;;; Copyright © 2022 Akira Kyle <akira@akirakyle.com>
|
||||
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
|
||||
|
|
@ -87,7 +87,9 @@
|
|||
#:use-module (guix gexp)
|
||||
#:use-module (guix utils)
|
||||
#:use-module ((guix build utils) #:select (alist-replace))
|
||||
#:use-module (guix build-system ant)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system copy)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system meson)
|
||||
|
|
@ -123,6 +125,7 @@
|
|||
#:use-module (gnu packages gd)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages icu4c)
|
||||
|
|
@ -151,6 +154,7 @@
|
|||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages popt)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages prolog)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages python)
|
||||
|
|
@ -2802,6 +2806,41 @@ into Python programs easier.")
|
|||
logic programs based on clingo.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public scasp
|
||||
(let ((commit "89a427aa04ec6346425a40111c99b310901ffe51")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "scasp")
|
||||
(version (git-version "0.21.11.26" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/SWI-Prolog/sCASP")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ijqv9xr3imrdmz6nq7zqwsmmaxn638icig19m8900m7mjfpizs4"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:install-plan #~`(("scasp" "bin/")
|
||||
("prolog" "lib/swipl/library"))
|
||||
#:modules `((guix build copy-build-system)
|
||||
((guix build gnu-build-system) #:prefix gnu:)
|
||||
(guix build utils)
|
||||
(ice-9 regex))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'install 'build (assoc-ref gnu:%standard-phases 'build))
|
||||
(add-after 'build 'check (assoc-ref gnu:%standard-phases 'check)))))
|
||||
(native-inputs (list swi-prolog))
|
||||
(home-page "https://github.com/SWI-Prolog/sCASP")
|
||||
(synopsis "Interpreter for ASP programs with constraints")
|
||||
(description "@code{s(CASP)} is a top-down interpreter for ASP programs
|
||||
with constraints.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public ceres
|
||||
(package
|
||||
(name "ceres-solver")
|
||||
|
|
@ -6088,6 +6127,177 @@ as equations, scalars, vectors, and matrices.")
|
|||
(home-page "https://www.gnu.org/software/jacal/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public boolector
|
||||
(package
|
||||
(name "boolector")
|
||||
(version "3.2.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Boolector/boolector")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "boolector-find-googletest.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"07rvp3iry7a7ixwl0q7nc47fwky1s1cyia7gqrjsg46syqlxbz2c"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~(list "-DBUILD_SHARED_LIBS=on"
|
||||
(string-append
|
||||
"-DBtor2Tools_INCLUDE_DIR="
|
||||
(dirname (search-input-file %build-inputs
|
||||
"include/btor2parser.h")))
|
||||
(string-append
|
||||
"-DBtor2Tools_LIBRARIES="
|
||||
(search-input-file %build-inputs
|
||||
"lib/libbtor2parser.so")))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-cmake
|
||||
(lambda _
|
||||
(delete-file "cmake/FindCryptoMiniSat.cmake")
|
||||
(substitute* (list "CMakeLists.txt" "src/CMakeLists.txt")
|
||||
(("find_package\\(CryptoMiniSat\\)")
|
||||
"find_package(cryptominisat5 CONFIG)
|
||||
find_package(louvain_communities)")
|
||||
(("CryptoMiniSat_FOUND") "cryptominisat5_FOUND")
|
||||
(("CryptoMiniSat_INCLUDE_DIR")
|
||||
"CRYPTOMINISAT5_INCLUDE_DIRS")
|
||||
(("CryptoMiniSat_LIBRARIES")
|
||||
"CRYPTOMINISAT5_LIBRARIES"))))
|
||||
(add-after 'unpack 'fix-sources
|
||||
(lambda _
|
||||
(substitute* (find-files "." "\\.c$")
|
||||
(("\"btor2parser/btor2parser\\.h\"") "<btor2parser.h>")))))))
|
||||
(inputs (list btor2tools
|
||||
boost cryptominisat louvain-community sqlite))
|
||||
(native-inputs (list googletest pkg-config python-wrapper))
|
||||
(home-page "http://boolector.github.io/")
|
||||
(synopsis "Bitvector-based theory solver")
|
||||
(description "Boolector is a @acronym{SMT, satisfiability modulo theories}
|
||||
solver for the theories of fixed-size bit-vectors, arrays and uninterpreted
|
||||
functions.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public java-smtinterpol
|
||||
(package
|
||||
(name "java-smtinterpol")
|
||||
(version "2.5")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ultimate-pa/smtinterpol")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet #~(begin
|
||||
(delete-file-recursively "jacoco")
|
||||
(delete-file-recursively "libs")
|
||||
(delete-file-recursively "sonar")))
|
||||
(sha256
|
||||
(base32
|
||||
"0bq5l7g830a8hxw1xyyfp2ph6jqk8ak0ichlymdglpnpngf6322f"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
(list #:build-target "dist"
|
||||
#:test-target "runtests"
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-build.xml
|
||||
(lambda _
|
||||
(substitute* "build.xml"
|
||||
(("<tstamp>") "<!--")
|
||||
(("</tstamp>") "-->")
|
||||
(("executable=\"git\"")
|
||||
(string-append "executable=\""
|
||||
(which "sh")
|
||||
"\""))
|
||||
(("<property file=.*/>" all)
|
||||
(string-append all
|
||||
"<property environment=\"env\" />"))
|
||||
(("<classpath>" all)
|
||||
(string-append
|
||||
all
|
||||
"<pathelement path=\"${env.CLASSPATH}\" />"))
|
||||
(("<fileset file=\".*/libs/.*/>") "")
|
||||
(("<junit")
|
||||
"<junit haltonfailure=\"yes\""))
|
||||
(call-with-output-file "describe"
|
||||
(lambda (port)
|
||||
(format port "echo ~a" #$version)))))
|
||||
(add-before 'check 'delete-failing-tests
|
||||
(lambda _
|
||||
(delete-file
|
||||
(string-append "SMTInterpolTest/src/de/uni_freiburg"
|
||||
"/informatik/ultimate/smtinterpol/convert/"
|
||||
"EqualityDestructorTest.java"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(java (string-append out "/share/java")))
|
||||
(for-each (lambda (f) (install-file f java))
|
||||
(find-files "dist" "\\.jar$"))))))))
|
||||
(native-inputs (list java-junit))
|
||||
(home-page "http://ultimate.informatik.uni-freiburg.de/smtinterpol/")
|
||||
(synopsis "Interpolating SMT solver")
|
||||
(description "SMTInterpol is an @acronym{SMT, Satisfiability Modulo Theories}
|
||||
solver, that can compute Craig interpolants for various theories.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public yices
|
||||
(package
|
||||
(name "yices")
|
||||
(version "2.6.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://yices.csl.sri.com/releases/"
|
||||
version "/yices-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jvqvf35gv2dj936yzl8w98kc68d8fcdard90d6dddzc43h28fjk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~(list #$@(if (%current-target-system)
|
||||
'()
|
||||
(list (string-append "--build="
|
||||
(%current-system))))
|
||||
"--enable-mcsat"
|
||||
;; XXX: Ewww, static linkage
|
||||
(string-append
|
||||
"--with-static-libpoly="
|
||||
(search-input-file %build-inputs "lib/libpoly.a"))
|
||||
(string-append
|
||||
"--with-static-gmp="
|
||||
(search-input-file %build-inputs "lib/libgmp.a"))
|
||||
(string-append
|
||||
"--with-pic-libpoly="
|
||||
(search-input-file %build-inputs "lib/libpicpoly.a")))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-build-files
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "Makefile.build"
|
||||
(("SHELL=.*") "")
|
||||
(("/sbin/ldconfig") (which "ldconfig")))
|
||||
(substitute* (find-files "etc" "install-yices.*")
|
||||
(("/usr/bin/install") (which "install"))
|
||||
(("/bin/ln") (which "ln"))
|
||||
(("/sbin/ldconfig") (which "ldconfig"))
|
||||
(("install_dir=.*")
|
||||
(string-append "install_dir="
|
||||
(assoc-ref outputs "out")))))))))
|
||||
(inputs (list cudd gmp gperf libpoly))
|
||||
(native-inputs (list autoconf automake bash-minimal))
|
||||
(home-page "https://yices.csl.sri.com/")
|
||||
(synopsis "Satisfiability modulo theories solver")
|
||||
(description "Yices is a solver for @acronym{SMT, satisfiability modulo
|
||||
theories} problems. It can process input in SMT-LIB format or its own
|
||||
s-expression-based format.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public z3
|
||||
(package
|
||||
(name "z3")
|
||||
|
|
@ -7562,6 +7772,85 @@ generic reader and writer API.")
|
|||
(license (list license:expat
|
||||
license:bsd-3)))) ; blif2aig
|
||||
|
||||
(define-public btor2tools
|
||||
(let ((commit "b8456dda4780789e882f5791eb486f295ade4da4")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "btor2tools")
|
||||
(version (git-version "1.0.0-pre" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Boolector/btor2tools")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0r3cm69q5xhnbxa74yvdfrsf349s4cxmiqlb4aq8appi7yg3qhww"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:out-of-source? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "sh" "test/runtests.sh")))))))
|
||||
(home-page "http://boolector.github.io/")
|
||||
(synopsis "Parser for BTOR2 format")
|
||||
(description "This package provides a parser for the BTOR2 format used by
|
||||
Boolector.")
|
||||
(license license:lgpl3+))))
|
||||
|
||||
(define-public cudd
|
||||
(package
|
||||
(name "cudd")
|
||||
(version "3.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ivmai/cudd")
|
||||
(commit (string-append "cudd-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0hyw9q42ir92vcaa7bwv6f631n85rfsxp463rnmklniq1wf6dyn9"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments (list #:configure-flags #~(list "--enable-shared")))
|
||||
;; The original home-page was lost to time, so we reference the "unofficial"
|
||||
;; Github mirror. For what it's worth, the author of the library appears to
|
||||
;; have been involved with this mirror at some point in time.
|
||||
(home-page "https://github.com/ivmai/cudd")
|
||||
(synopsis "Manipulate decision diagrams")
|
||||
(description "@acronym{CUDD, Colorado University Decision Diagrams} is a
|
||||
library for manipulating decision diagrams. It supports binary decision
|
||||
diagrams, algebraic decision diagrams, and zero-suppressed binary decision
|
||||
diagrams.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public libpoly
|
||||
(package
|
||||
(name "libpoly")
|
||||
(version "0.1.11")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/SRI-CSL/libpoly")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qylmg30rklvg00a0h1b3pb52cj9ki98yd27cylihjhq2klh3dmy"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags #~(list "-DLIBPOLY_BUILD_PYTHON_API=off")))
|
||||
(inputs (list gmp))
|
||||
(home-page "https://github.com/SRI-CSL/libpoly")
|
||||
(synopsis "Manipulate polynomials")
|
||||
(description "LibPoly is a C library for manipulating polynomials to support
|
||||
symbolic reasoning engines that need to reason about polynomial constraints.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public lingeling
|
||||
(let ((commit "72d2b13eea5fbd95557a3d0d199cd98dfbdc76ee")
|
||||
(revision "1"))
|
||||
|
|
|
|||
|
|
@ -2351,7 +2351,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
|
|||
(define-public nheko
|
||||
(package
|
||||
(name "nheko")
|
||||
(version "0.11.1")
|
||||
(version "0.11.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -2360,7 +2360,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0j5y5jfimmflynrg7003wr7i75b102cpv3afyp3j7z69b2apkhys"))
|
||||
(base32 "0yjbxyba87nkpjmql7s6nv2r2i9s956zgwlfhdi4jjg96v2rgmnr"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
@ -2654,21 +2654,6 @@ support for high performance Telegram Bot creation.")
|
|||
(home-page "https://core.telegram.org/tdlib")
|
||||
(license license:boost1.0)))
|
||||
|
||||
(define-public tdlib-1.8.0
|
||||
(package
|
||||
(inherit tdlib)
|
||||
(name "tdlib-1.8.0")
|
||||
(version "1.8.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tdlib/td")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "tdlib" version))
|
||||
(sha256
|
||||
(base32
|
||||
"19psqpyh9a2kzfdhgqkirpif4x8pzy89phvi59dq155y30a3661q"))))))
|
||||
|
||||
(define-public purple-mm-sms
|
||||
(package
|
||||
(name "purple-mm-sms")
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@ playing your music.")
|
|||
(define-public strawberry
|
||||
(package
|
||||
(name "strawberry")
|
||||
(version "1.0.14")
|
||||
(version "1.0.15")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -490,7 +490,7 @@ playing your music.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0q8pmf7vr5yxzvfmw86f3m462s8ixaixwdv1z9x9ldkj5rqz45sf"))
|
||||
"04ddplldlls0gxw8qppw6dsqhfnxamxfnnyq0i04mbs5hi83pcrz"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 regex)))
|
||||
(snippet
|
||||
|
|
@ -1386,7 +1386,7 @@ and auto-mapping slices to MIDI note numbers.")
|
|||
(define-public lilypond
|
||||
(package
|
||||
(name "lilypond")
|
||||
(version "2.24.0")
|
||||
(version "2.24.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -1394,7 +1394,7 @@ and auto-mapping slices to MIDI note numbers.")
|
|||
"v" (version-major+minor version) "/"
|
||||
"lilypond-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0scbyzbxqnzgibls62npg2i3sywnb146gw7jlvinj9dhj8xvxv9w"))))
|
||||
(base32 "028m31fjcfgsq3f8ahz4hp2r36shsvkq1fjjibqdcp2aas3r1ifm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;out-test/collated-files.html fails
|
||||
|
|
|
|||
|
|
@ -56,6 +56,8 @@
|
|||
;;; Copyright © 2022 Reza Alizadeh Majd <r.majd@pantherx.org>
|
||||
;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -3057,56 +3059,54 @@ The filters can be aggregated and exported in the most common formats.")
|
|||
license:bsd-2)))) ; everything else, but missing headers
|
||||
|
||||
(define-public thc-ipv6
|
||||
(let ((revision "0")
|
||||
(commit "4bb72573e0950ce6f8ca2800a10748477020029e"))
|
||||
(package
|
||||
(name "thc-ipv6")
|
||||
(version (git-version "3.4" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vanhauser-thc/thc-ipv6")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1x5i6vbsddqc2yks7r1a2fw2fk16qxvd6hpzh1lykjfpkal8fdir"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
#:tests? #f ; No test suite.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'use-source-date-epoch-in-manpages
|
||||
;; For reproducible builds
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("date --iso-8601")
|
||||
"date --iso-8601 --utc --date=@$(SOURCE_DATE_EPOCH)"))))
|
||||
(delete 'configure) ; No ./configure script.
|
||||
(add-before 'build 'patch-paths
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("/bin/echo") "echo"))
|
||||
#t))
|
||||
(add-after 'install 'install-more-docs
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(doc (string-append out "/share/thc-ipv6/doc")))
|
||||
(install-file "README" doc)
|
||||
(install-file "HOWTO-INJECT" doc)
|
||||
#t))))))
|
||||
;; TODO Add libnetfilter-queue once packaged.
|
||||
(inputs
|
||||
(list libpcap openssl perl))
|
||||
(home-page "https://github.com/vanhauser-thc/thc-ipv6")
|
||||
(synopsis "IPv6 security research toolkit")
|
||||
(description "The THC IPv6 Toolkit provides command-line tools and a library
|
||||
(package
|
||||
(name "thc-ipv6")
|
||||
(version "3.8")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/vanhauser-thc/thc-ipv6")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "07kwika1zdq62s5p5z94xznm77dxjxdg8k0hrg7wygz50151nzmx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ; No test suite.
|
||||
#:make-flags
|
||||
#~(list (string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PREFIX=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-makefile
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
;; For reproducible builds
|
||||
(("date --iso-8601")
|
||||
"date --iso-8601 --utc --date=@$(SOURCE_DATE_EPOCH)")
|
||||
(("/bin/echo") "echo"))))
|
||||
(delete 'configure) ; No ./configure script.
|
||||
(add-after 'install 'install-more-docs
|
||||
(lambda _
|
||||
(let ((doc (string-append #$output "/share/thc-ipv6/doc")))
|
||||
(install-file "README" doc)
|
||||
(install-file "HOWTO-INJECT" doc)))))))
|
||||
(inputs
|
||||
(list libnetfilter-queue
|
||||
libnfnetlink
|
||||
libpcap
|
||||
openssl
|
||||
perl))
|
||||
(home-page "https://github.com/vanhauser-thc/thc-ipv6")
|
||||
(synopsis "IPv6 security research toolkit")
|
||||
(description "The THC IPv6 Toolkit provides command-line tools and a library
|
||||
for researching IPv6 implementations and deployments. It requires Linux 2.6 or
|
||||
newer and only works on Ethernet network interfaces.")
|
||||
;; AGPL 3 with exception for linking with OpenSSL. See the 'LICENSE' file in
|
||||
;; the source distribution for more information.
|
||||
(license license:agpl3))))
|
||||
;; AGPL 3 with exception for linking with OpenSSL. See the 'LICENSE' file in
|
||||
;; the source distribution for more information.
|
||||
(license license:agpl3)))
|
||||
|
||||
(define-public bmon
|
||||
(package
|
||||
|
|
@ -4507,7 +4507,7 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send
|
|||
(define-public phantomsocks
|
||||
(package
|
||||
(name "phantomsocks")
|
||||
(version "0.0.0-20221222155609-14291e2c889e")
|
||||
(version "0.0.0-20230223180716-34d21f24a9eb")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -4516,7 +4516,7 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"13lllmh46xwns5ksqqdkl2p7vvnbzkzb6va005nk37bx6c4x2ixp"))))
|
||||
"0zfkqiimqwg89njqm9qbwki3fgy0rqx8wr95hq813zk0rf3bj1ka"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:install-source? #f
|
||||
|
|
@ -4619,3 +4619,31 @@ interface statistics provided by the kernel as information source. This means
|
|||
that vnStat won't actually be sniffing any traffic and also ensures light use
|
||||
of system resources regardless of network traffic rate.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public dropwatch
|
||||
(package
|
||||
(name "dropwatch")
|
||||
(version "1.5.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/nhorman/dropwatch.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1r653y7bx763fpxl1vrflx8bzcrbds98zk4z7yhfikjngrqn1f2d"))))
|
||||
(build-system gnu-build-system)
|
||||
;; XXX: bfd support isn't finished.
|
||||
;; https://github.com/nhorman/dropwatch/issues/76#issuecomment-1328345444
|
||||
(arguments
|
||||
(list #:configure-flags #~(list "--without-bfd")))
|
||||
(native-inputs (list autoconf automake pkg-config))
|
||||
(inputs (list libnl libpcap readline))
|
||||
(home-page "https://github.com/nhorman/dropwatch")
|
||||
(synopsis "Monitor for network packets dropped by the kernel")
|
||||
(description
|
||||
"Dropwatch is an interactive utility for monitoring and
|
||||
recording packets that are dropped by the kernel. It provides the commands
|
||||
@command{dropwatch} and @command{dwdump}.")
|
||||
(license license:gpl2+)))
|
||||
|
|
|
|||
|
|
@ -2372,14 +2372,14 @@ manipulate such data.")
|
|||
(define-public ocaml-mtime
|
||||
(package
|
||||
(name "ocaml-mtime")
|
||||
(version "1.4.0")
|
||||
(version "2.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://erratique.ch/software/mtime/releases/"
|
||||
(uri (string-append "https://erratique.ch/software/mtime/releases/"
|
||||
"mtime-" version ".tbz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xy6lg52n2zynp4p164ym9j0f1b95j5n4bi5y4mbdrry9w99h32m"))))
|
||||
"1ss4w3qxsfp51d88r0j7dzqs05dbb1xdx11hn1jl9cvd03ma0g9z"))))
|
||||
(build-system ocaml-build-system)
|
||||
(native-inputs
|
||||
(list ocamlbuild opam))
|
||||
|
|
@ -2847,7 +2847,7 @@ to which allows adding and looking up bindings in a type safe manner.")
|
|||
(define ocaml-eio
|
||||
(package
|
||||
(name "ocaml-eio")
|
||||
(version "0.7")
|
||||
(version "0.8.1")
|
||||
(home-page "https://github.com/ocaml-multicore/eio")
|
||||
(source
|
||||
(origin
|
||||
|
|
@ -2857,7 +2857,7 @@ to which allows adding and looking up bindings in a type safe manner.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"118raxdwv6pn5b152ffdhmwdi0l4wlwflcj2nmckfmm7v1z2fq4s"))))
|
||||
"02q9i5wbb2497vd4ypc9d9p4zi3lmx0rsv8faiy7h8dnnzbjjf4z"))))
|
||||
(build-system dune-build-system)
|
||||
(arguments `(#:package "eio"))
|
||||
(propagated-inputs (list ocaml-bigstringaf
|
||||
|
|
@ -2871,7 +2871,10 @@ to which allows adding and looking up bindings in a type safe manner.")
|
|||
ocaml-hmap
|
||||
ocaml-mtime
|
||||
ocaml-odoc))
|
||||
(native-inputs (list ocaml-astring ocaml-crowbar ocaml-alcotest))
|
||||
(native-inputs (list ocaml-astring
|
||||
ocaml-crowbar
|
||||
ocaml-alcotest
|
||||
ocaml-mdx))
|
||||
(synopsis "Effect-based direct-style IO API for OCaml")
|
||||
(description "This package provides an effect-based IO API for multicore
|
||||
OCaml with fibers.")
|
||||
|
|
@ -2897,7 +2900,7 @@ OCaml with fibers.")
|
|||
(define-public ocaml-uring
|
||||
(package
|
||||
(name "ocaml-uring")
|
||||
(version "0.4")
|
||||
(version "0.5")
|
||||
(home-page "https://github.com/ocaml-multicore/ocaml-uring")
|
||||
(source
|
||||
(origin
|
||||
|
|
@ -2907,7 +2910,7 @@ OCaml with fibers.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"0k70y7nb2wrk2yql0pwnrhsp1x7k9ld4gd8iihbv6r34kcm3a5m1"))))
|
||||
"0ygx8v01bb5808wy6nppg40h1ns8b1f2l585lwc4389z4wrppk95"))))
|
||||
(build-system dune-build-system)
|
||||
(propagated-inputs
|
||||
(list ocaml-cstruct
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2021 Andy Tai <atai@atai.org>
|
||||
;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -103,7 +103,7 @@ models for the Tesseract OCR Engine.")
|
|||
(define-public tesseract-ocr
|
||||
(package
|
||||
(name "tesseract-ocr")
|
||||
(version "5.2.0")
|
||||
(version "5.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -113,7 +113,7 @@ models for the Tesseract OCR Engine.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0dai539h07lqj8lyhznd3wbwdpqr78qrsczq78rsmsryqvmdbyaa"))))
|
||||
"0vylcba8w5ljnr6pf3ilc2wjq72k660h71b7mlbjz3a2f0x5kr33"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
@ -197,10 +197,29 @@ default. To add support for more languages, the
|
|||
@code{tesseract-ocr-tessdata-fast} package should be installed.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public tesseract-ocr-4
|
||||
(package
|
||||
(inherit tesseract-ocr)
|
||||
(name "tesseract-ocr")
|
||||
(version "4.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tesseract-ocr/tesseract")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ksds8n26kq0acprjn4ycdr163hr9kmkwij7fc973mrjg7kz0pdi"))))
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs tesseract-ocr)
|
||||
(replace "leptonica" leptonica-1.80)))))
|
||||
|
||||
(define-public gimagereader
|
||||
(package
|
||||
(name "gimagereader")
|
||||
(version "3.4.0")
|
||||
(version "3.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -209,7 +228,7 @@ default. To add support for more languages, the
|
|||
"/download/v" version "/"
|
||||
"gimagereader-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "09glxh7b4ivrd4samm67b8k2p0aljiagr83wb8nvy5ps2a9gwp5m"))))
|
||||
(base32 "1972bvnk2bkgbh70vy2prcmdzf4wlna862p2vja9yjxi2c0scmwc"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
@ -226,7 +245,7 @@ default. To add support for more languages, the
|
|||
sane-backends
|
||||
qtbase-5
|
||||
qtspell
|
||||
quazip-0
|
||||
quazip
|
||||
tesseract-ocr))
|
||||
(home-page "https://github.com/manisandro/gImageReader")
|
||||
(synopsis "Qt front-end to tesseract-ocr")
|
||||
|
|
|
|||
|
|
@ -97,63 +97,44 @@ environments.")
|
|||
(license license:gpl2+)))
|
||||
|
||||
(define-public rnp
|
||||
;; Packaging the currently released version requires a large number of
|
||||
;; patches. For now, we package a snapshot instead.
|
||||
(let ((commit "203224f0b1505dba17837c03da603e5b98ab125a")
|
||||
(revision "0")
|
||||
(last-version "0.13.1")
|
||||
(day-of-release "2020-07-21"))
|
||||
(let ((day-of-release "2022-09-22"))
|
||||
(package
|
||||
(name "rnp")
|
||||
(version (git-version last-version revision commit))
|
||||
(version "0.16.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rnpgp/rnp")
|
||||
(commit commit)))
|
||||
(file-name
|
||||
(string-append name "-" (string-take commit 7) "-checkout"))
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rnwhc9ys4v4mv584hmmrl0ycnqmsaigpffzm31qq337hz24zqya"))
|
||||
(patches
|
||||
(search-patches "rnp-unbundle-googletest.patch"
|
||||
"rnp-disable-ruby-rnp-tests.patch"
|
||||
"rnp-add-version.cmake.patch"))))
|
||||
"13z5kxm48a72w4m2crwgdjdng4a4pwxsd72r2z3a4pcakfp2swi8"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments `(#:configure-flags
|
||||
'("-DBUILD_SHARED_LIBS=on"
|
||||
"-DBUILD_TESTING=on")
|
||||
"-DBUILD_TESTING=on"
|
||||
"-DDOWNLOAD_GTEST=off"
|
||||
"-DDOWNLOAD_RUBYRNP=off")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fixes
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(copy-recursively (assoc-ref inputs "googletest-source")
|
||||
"src/tests/googletest-src")
|
||||
(substitute* "src/tests/support.cpp"
|
||||
(("\"cp\"") (string-append "\"" (which "cp") "\"")))
|
||||
;; Produce a version stamp in the format the upstream
|
||||
;; project uses for unreleased revisions.
|
||||
(with-output-to-file "version.txt"
|
||||
(lambda _
|
||||
(display
|
||||
(string-append ,last-version
|
||||
"-" ,revision
|
||||
"-g" ,(string-take commit 7)))))
|
||||
#t))
|
||||
(replace 'check
|
||||
(add-after 'unpack 'patch-tests
|
||||
(lambda _
|
||||
;; Some OpenPGP certificates used by the tests expire.
|
||||
;; To work around that, set the time to roughly the
|
||||
;; release date.
|
||||
(invoke "faketime" ,day-of-release "make" "test"))))))
|
||||
(substitute* "src/tests/support.cpp"
|
||||
(("\"cp\"") (search-input-file inputs "/bin/cp")))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; Some OpenPGP certificates used by the tests expire.
|
||||
;; To work around that, set the time to roughly the
|
||||
;; release date.
|
||||
(invoke "faketime" ,day-of-release "make" "test")))))))
|
||||
(native-inputs
|
||||
`(("gnupg" ,gnupg) ; for tests
|
||||
("googletest-source" ,(package-source googletest)) ; for tests
|
||||
("libfaketime" ,libfaketime) ; for tests
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)
|
||||
("python2" ,python-2.7)))
|
||||
(list gnupg ; for tests
|
||||
googletest ; for tests
|
||||
libfaketime ; for tests
|
||||
pkg-config
|
||||
python))
|
||||
(inputs (list botan bzip2 json-c zlib))
|
||||
(synopsis
|
||||
"RFC4880-compliant OpenPGP library written in C++")
|
||||
|
|
@ -165,7 +146,7 @@ NetPGP, itself originally written for NetBSD.
|
|||
librnp is the library used by rnp for all OpenPGP functions, useful for
|
||||
developers to build against. It is a “real” library, not a wrapper like GPGME
|
||||
of GnuPG.")
|
||||
(home-page "https://www.rnpgp.com/")
|
||||
(home-page "https://www.rnpgp.org/")
|
||||
(license
|
||||
;; RNP contains code written by Ribose and code derived from netpgp.
|
||||
(list
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
|
||||
;;; Copyright © 2018, 2019 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
|
|
@ -1363,19 +1363,19 @@ environments.")
|
|||
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
|
||||
|
||||
(define-public guix-build-coordinator
|
||||
(let ((commit "c29a46e8d298d3a1f16b2d4f75fa96759741afb8")
|
||||
(revision "71"))
|
||||
(let ((commit "7c1eedfba9ef5ccc5651cd5e88662c158e594a2c")
|
||||
(revision "73"))
|
||||
(package
|
||||
(name "guix-build-coordinator")
|
||||
(version (git-version "0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.cbaines.net/git/guix/build-coordinator")
|
||||
(url "https://git.savannah.gnu.org/git/guix/build-coordinator.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1wzgl2naymps9k51ggsw8099da81b0skqjamj9r7jkcvg7i46avm"))
|
||||
"1prsxj3n8ggv28fqk00yvnbvy0da0lq6m553fs636s8b2yjka8nj"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
@ -1672,19 +1672,19 @@ in an isolated environment, in separate namespaces.")
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public nar-herder
|
||||
(let ((commit "8b888de4cff44b42b8215afac5dcdadba9b7394d")
|
||||
(revision "17"))
|
||||
(let ((commit "659543cd9ad78f712b4b067863db0613423dd23b")
|
||||
(revision "18"))
|
||||
(package
|
||||
(name "nar-herder")
|
||||
(version (git-version "0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.cbaines.net/git/guix/nar-herder")
|
||||
(url "https://git.savannah.gnu.org/git/guix/nar-herder.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"19j8dbn9c25x8lj3sa7b0b9v8lxxlkhvb4qpmwc4kkizpkwrqp2a"))
|
||||
"09ghbbrk5gazkpqxcvfnn56pp11sndn7hw00ipc8d95wqk53g9qg"))
|
||||
(file-name (string-append name "-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
@ -1901,14 +1901,14 @@ the boot loader configuration.")
|
|||
(define-public flatpak
|
||||
(package
|
||||
(name "flatpak")
|
||||
(version "1.14.1")
|
||||
(version "1.14.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
|
||||
version "/flatpak-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "17ykbp5lmlbv6241vw55zgqdp34wc12jbj5nhs4wb3018crq4g0a"))
|
||||
(base32 "1gpfax92kpchmbr3cp1w0cw5xjdwv11i1g3g9hp8akc9rc64gw2r"))
|
||||
(patches
|
||||
(search-patches "flatpak-fix-path.patch"
|
||||
"flatpak-unset-gdk-pixbuf-for-sandbox.patch"))))
|
||||
|
|
|
|||
204
gnu/packages/patches/boolector-find-googletest.patch
Normal file
204
gnu/packages/patches/boolector-find-googletest.patch
Normal file
|
|
@ -0,0 +1,204 @@
|
|||
From 91533caf29a2c5b10b4912fd352e7af82c787598 Mon Sep 17 00:00:00 2001
|
||||
From: Aina Niemetz <aina.niemetz@gmail.com>
|
||||
Date: Wed, 16 Jun 2021 16:17:27 -0700
|
||||
Subject: [PATCH] Configure google test as external project.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 7 ----
|
||||
cmake/FindGoogleTest.cmake | 60 +++++++++++++++++++++++++++++++++
|
||||
cmake/googletest-download.cmake | 28 ---------------
|
||||
cmake/googletest.cmake | 41 ----------------------
|
||||
test/CMakeLists.txt | 5 ++-
|
||||
5 files changed, 64 insertions(+), 77 deletions(-)
|
||||
create mode 100644 cmake/FindGoogleTest.cmake
|
||||
delete mode 100644 cmake/googletest-download.cmake
|
||||
delete mode 100644 cmake/googletest.cmake
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 38056ede6..d30475bcd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -440,13 +440,6 @@ configure_file(
|
||||
#-----------------------------------------------------------------------------#
|
||||
# Regression tests
|
||||
|
||||
-# Get and configure google test
|
||||
-include(cmake/googletest.cmake)
|
||||
-fetch_googletest(
|
||||
- ${PROJECT_SOURCE_DIR}/cmake
|
||||
- ${PROJECT_BINARY_DIR}/googletest
|
||||
- )
|
||||
-
|
||||
enable_testing()
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
diff --git a/cmake/FindGoogleTest.cmake b/cmake/FindGoogleTest.cmake
|
||||
new file mode 100644
|
||||
index 000000000..c6eecd179
|
||||
--- /dev/null
|
||||
+++ b/cmake/FindGoogleTest.cmake
|
||||
@@ -0,0 +1,60 @@
|
||||
+# Boolector: Satisfiablity Modulo Theories (SMT) solver.
|
||||
+#
|
||||
+# Copyright (C) 2007-2021 by the authors listed in the AUTHORS file.
|
||||
+#
|
||||
+# This file is part of Boolector.
|
||||
+# See COPYING for more information on using this software.
|
||||
+#
|
||||
+
|
||||
+# Find GTest
|
||||
+#
|
||||
+# GTest_FOUND - Found GTest
|
||||
+# GTest::GTest - GTest library
|
||||
+
|
||||
+find_package(GTest 1.10.0)
|
||||
+
|
||||
+if(NOT GTest_FOUND)
|
||||
+ include(ExternalProject)
|
||||
+
|
||||
+ set(GTest_VERSION "1.10.0")
|
||||
+
|
||||
+ ExternalProject_Add(
|
||||
+ GTest-EP
|
||||
+ PREFIX "${CMAKE_BINARY_DIR}/deps"
|
||||
+ URL https://github.com/google/googletest/archive/refs/tags/release-${GTest_VERSION}.tar.gz
|
||||
+ URL_HASH SHA1=9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770
|
||||
+ DOWNLOAD_NAME gtest.tar.gz
|
||||
+ CMAKE_ARGS
|
||||
+ -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
|
||||
+ BUILD_COMMAND ${CMAKE_COMMAND} --build .
|
||||
+ BUILD_BYPRODUCTS
|
||||
+ <INSTALL_DIR>/lib/libgtest.a
|
||||
+ <INSTALL_DIR>/lib/libgtest_main.a
|
||||
+ LOG_DOWNLOAD ON
|
||||
+ LOG_UPDATE ON
|
||||
+ LOG_CONFIGURE ON
|
||||
+ LOG_BUILD ON
|
||||
+ LOG_INSTALL ON
|
||||
+ LOG_OUTPUT_ON_FAILURE TRUE
|
||||
+ )
|
||||
+
|
||||
+ set(GTest_INCLUDE_DIR "${CMAKE_BINARY_DIR}/deps/include/")
|
||||
+ set(GTest_MAIN_LIBRARY "${CMAKE_BINARY_DIR}/deps/lib/libgtest_main.a")
|
||||
+ set(GTest_LIBRARY "${CMAKE_BINARY_DIR}/deps/lib/libgtest.a")
|
||||
+ file(MAKE_DIRECTORY "${GTest_INCLUDE_DIR}")
|
||||
+
|
||||
+ add_library(GTest::gtest_main STATIC IMPORTED GLOBAL)
|
||||
+ set_target_properties(GTest::gtest_main
|
||||
+ PROPERTIES
|
||||
+ IMPORTED_LOCATION "${GTest_MAIN_LIBRARY}"
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${GTest_INCLUDE_DIR}"
|
||||
+ INTERFACE_LINK_LIBRARIES "${GTest_LIBRARY}"
|
||||
+ )
|
||||
+ set(GTest_FOUND TRUE)
|
||||
+ add_dependencies(GTest::gtest_main GTest-EP)
|
||||
+ message(STATUS "Building GTest ${GTest_VERSION}: ${GTest_MAIN_LIBRARY}")
|
||||
+
|
||||
+ mark_as_advanced(GTest_FOUND)
|
||||
+ mark_as_advanced(GTest_INCLUDE_DIR)
|
||||
+ mark_as_advanced(GTest_LIBRARIES)
|
||||
+endif()
|
||||
diff --git a/cmake/googletest-download.cmake b/cmake/googletest-download.cmake
|
||||
deleted file mode 100644
|
||||
index 8dca59539..000000000
|
||||
--- a/cmake/googletest-download.cmake
|
||||
+++ /dev/null
|
||||
@@ -1,28 +0,0 @@
|
||||
-# Boolector: Satisfiablity Modulo Theories (SMT) solver.
|
||||
-#
|
||||
-# Copyright (C) 2007-2021 by the authors listed in the AUTHORS file.
|
||||
-#
|
||||
-# This file is part of Boolector.
|
||||
-# See COPYING for more information on using this software.
|
||||
-#
|
||||
-
|
||||
-# code copied from https://crascit.com/2015/07/25/cmake-gtest/
|
||||
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
|
||||
-
|
||||
-project(googletest-download NONE)
|
||||
-
|
||||
-include(ExternalProject)
|
||||
-
|
||||
-ExternalProject_Add(
|
||||
- googletest
|
||||
- SOURCE_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-src"
|
||||
- BINARY_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-build"
|
||||
- GIT_REPOSITORY
|
||||
- https://github.com/google/googletest.git
|
||||
- GIT_TAG
|
||||
- release-1.10.0
|
||||
- CONFIGURE_COMMAND ""
|
||||
- BUILD_COMMAND ""
|
||||
- INSTALL_COMMAND ""
|
||||
- TEST_COMMAND ""
|
||||
- )
|
||||
diff --git a/cmake/googletest.cmake b/cmake/googletest.cmake
|
||||
deleted file mode 100644
|
||||
index af5a5bc36..000000000
|
||||
--- a/cmake/googletest.cmake
|
||||
+++ /dev/null
|
||||
@@ -1,41 +0,0 @@
|
||||
-# Boolector: Satisfiablity Modulo Theories (SMT) solver.
|
||||
-#
|
||||
-# Copyright (C) 2007-2021 by the authors listed in the AUTHORS file.
|
||||
-#
|
||||
-# This file is part of Boolector.
|
||||
-# See COPYING for more information on using this software.
|
||||
-#
|
||||
-
|
||||
-# the following code to fetch googletest
|
||||
-# is inspired by and adapted after https://crascit.com/2015/07/25/cmake-gtest/
|
||||
-# download and unpack googletest at configure time
|
||||
-
|
||||
-macro(fetch_googletest _download_module_path _download_root)
|
||||
- set(GOOGLETEST_DOWNLOAD_ROOT ${_download_root})
|
||||
- configure_file(
|
||||
- ${_download_module_path}/googletest-download.cmake
|
||||
- ${_download_root}/CMakeLists.txt
|
||||
- @ONLY
|
||||
- )
|
||||
- unset(GOOGLETEST_DOWNLOAD_ROOT)
|
||||
-
|
||||
- execute_process(
|
||||
- COMMAND
|
||||
- "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
|
||||
- WORKING_DIRECTORY
|
||||
- ${_download_root}
|
||||
- )
|
||||
- execute_process(
|
||||
- COMMAND
|
||||
- "${CMAKE_COMMAND}" --build .
|
||||
- WORKING_DIRECTORY
|
||||
- ${_download_root}
|
||||
- )
|
||||
-
|
||||
- # adds the targers: gtest, gtest_main, gmock, gmock_main
|
||||
- add_subdirectory(
|
||||
- ${_download_root}/googletest-src
|
||||
- ${_download_root}/googletest-build
|
||||
- EXCLUDE_FROM_ALL
|
||||
- )
|
||||
-endmacro()
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 13f87d5e0..f2e14fd81 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -5,6 +5,9 @@
|
||||
# This file is part of Boolector.
|
||||
# See COPYING for more information on using this software.
|
||||
#
|
||||
+
|
||||
+find_package(GoogleTest REQUIRED)
|
||||
+
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests)
|
||||
|
||||
set(test_names
|
||||
@@ -47,7 +50,7 @@ foreach(test ${test_names})
|
||||
add_executable (test${test} test_${test}.cpp)
|
||||
target_include_directories(test${test} PRIVATE ${PROJECT_SOURCE_DIR}/test/new_test)
|
||||
target_link_libraries(test${test} boolector m)
|
||||
- target_link_libraries(test${test} gtest_main)
|
||||
+ target_link_libraries(test${test} GTest::gtest_main)
|
||||
set_target_properties(test${test} PROPERTIES OUTPUT_NAME test${test})
|
||||
add_test(${test} ${CMAKE_BINARY_DIR}/bin/tests/test${test})
|
||||
endforeach()
|
||||
33
gnu/packages/patches/ccextractor-add-missing-header.patch
Normal file
33
gnu/packages/patches/ccextractor-add-missing-header.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
Upstream status: https://github.com/CCExtractor/ccextractor/pull/1505
|
||||
|
||||
From 272e0e1410135c3a5de105cecce400c7b2a9ed5b Mon Sep 17 00:00:00 2001
|
||||
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
Date: Fri, 17 Mar 2023 09:49:29 -0400
|
||||
Subject: [PATCH] linux/Makefile.am: Add missing generated header.
|
||||
|
||||
This header is generated by the pre-build.sh script. The compilation
|
||||
fails if it is missing.
|
||||
|
||||
* linux/Makefile.am (ccextractor_SOURCES): Add
|
||||
../src/lib_ccx/compile_info_real.h.
|
||||
---
|
||||
linux/Makefile.am | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/linux/Makefile.am b/linux/Makefile.am
|
||||
index fddc26a5..f83f1eff 100644
|
||||
--- a/linux/Makefile.am
|
||||
+++ b/linux/Makefile.am
|
||||
@@ -118,6 +118,7 @@ ccextractor_SOURCES = \
|
||||
../src/lib_ccx/bitstream.h \
|
||||
../src/lib_ccx/ccx_common_option.c \
|
||||
../src/lib_ccx/ccx_common_common.c \
|
||||
+ ../src/lib_ccx/compile_info_real.h \
|
||||
../src/lib_ccx/utility.c \
|
||||
../src/lib_ccx/activity.c \
|
||||
../src/lib_ccx/asf_functions.c \
|
||||
|
||||
base-commit: cb496a711923c984251483776e652ca9c027513c
|
||||
--
|
||||
2.39.1
|
||||
|
||||
37
gnu/packages/patches/ccextractor-autoconf-tesseract.patch
Normal file
37
gnu/packages/patches/ccextractor-autoconf-tesseract.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
Upstream status: https://github.com/CCExtractor/ccextractor/pull/1504
|
||||
|
||||
From f587050c2b5805ff5feb667736381dcc9991a5d3 Mon Sep 17 00:00:00 2001
|
||||
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
Date: Fri, 17 Mar 2023 00:57:13 -0400
|
||||
Subject: [PATCH] linux/configure.ac: Fix tesseract conditional problem.
|
||||
|
||||
For tesseract-ocr's stock pkg-config, it would produce an error due to
|
||||
unquoted whitespace:
|
||||
|
||||
$ test ! -z `pkg-config --libs-only-l --silence-errors tesseract`
|
||||
bash: test: syntax error: `-larchive' unexpected
|
||||
|
||||
* linux/configure.ac: Use a positive test, and double-quote the $() command
|
||||
substitution.
|
||||
---
|
||||
linux/configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/linux/configure.ac b/linux/configure.ac
|
||||
index 45fc11f3..118ee7fa 100644
|
||||
--- a/linux/configure.ac
|
||||
+++ b/linux/configure.ac
|
||||
@@ -149,7 +149,7 @@ AS_IF([ (test x$ocr = xtrue || test x$hardsubx = xtrue) && test ! $HAS_LEPT -gt
|
||||
AM_CONDITIONAL(HARDSUBX_IS_ENABLED, [ test x$hardsubx = xtrue ])
|
||||
AM_CONDITIONAL(OCR_IS_ENABLED, [ test x$ocr = xtrue || test x$hardsubx = xtrue ])
|
||||
AM_CONDITIONAL(FFMPEG_IS_ENABLED, [ test x$ffmpeg = xtrue ])
|
||||
-AM_CONDITIONAL(TESSERACT_PRESENT, [ test ! -z `pkg-config --libs-only-l --silence-errors tesseract` ])
|
||||
+AM_CONDITIONAL(TESSERACT_PRESENT, [ test -n "$(pkg-config --libs-only-l --silence-errors tesseract)" ])
|
||||
AM_CONDITIONAL(TESSERACT_PRESENT_RPI, [ test -d "/usr/include/tesseract" && test `ls -A /usr/include/tesseract | wc -l` -gt 0 ])
|
||||
AM_CONDITIONAL(SYS_IS_LINUX, [ test `uname -s` = "Linux"])
|
||||
AM_CONDITIONAL(SYS_IS_MAC, [ test `uname -s` = "Darwin"])
|
||||
|
||||
base-commit: cb496a711923c984251483776e652ca9c027513c
|
||||
--
|
||||
2.39.1
|
||||
|
||||
29
gnu/packages/patches/ccextractor-fix-ocr.patch
Normal file
29
gnu/packages/patches/ccextractor-fix-ocr.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
Extracted from upstream commit 0264e7da2be67182deb031228eb07e6ed4943c81.
|
||||
|
||||
diff --git a/src/lib_ccx/ocr.c b/src/lib_ccx/ocr.c
|
||||
index 31cc1c5c..73bd4818 100644
|
||||
--- a/src/lib_ccx/ocr.c
|
||||
+++ b/src/lib_ccx/ocr.c
|
||||
@@ -331,6 +331,11 @@ char *ocr_bitmap(void *arg, png_color *palette, png_byte *alpha, unsigned char *
|
||||
}
|
||||
|
||||
BOX *crop_points = ignore_alpha_at_edge(copy->alpha, copy->data, w, h, color_pix, &color_pix_out);
|
||||
+
|
||||
+ l_int32 x, y, _w, _h;
|
||||
+
|
||||
+ boxGetGeometry(crop_points, &x, &y, &_w, &_h);
|
||||
+
|
||||
// Converting image to grayscale for OCR to avoid issues with transparency
|
||||
cpix_gs = pixConvertRGBToGray(cpix, 0.0, 0.0, 0.0);
|
||||
|
||||
@@ -426,8 +431,8 @@ char *ocr_bitmap(void *arg, png_color *palette, png_byte *alpha, unsigned char *
|
||||
{
|
||||
for (int j = x1; j <= x2; j++)
|
||||
{
|
||||
- if (copy->data[(crop_points->y + i) * w + (crop_points->x + j)] != firstpixel)
|
||||
- histogram[copy->data[(crop_points->y + i) * w + (crop_points->x + j)]]++;
|
||||
+ if (copy->data[(y + i) * w + (x + j)] != firstpixel)
|
||||
+ histogram[copy->data[(y + i) * w + (x + j)]]++;
|
||||
}
|
||||
}
|
||||
/* sorted in increasing order of intensity */
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Wed, 13 Jun 2018 09:41:01 -0400
|
||||
Subject: [PATCH] remove extra decl
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
src/efibootmgr.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
|
||||
index de38f01..4e1a680 100644
|
||||
--- a/src/efibootmgr.c
|
||||
+++ b/src/efibootmgr.c
|
||||
@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
|
||||
"invalid numeric value %s\n",
|
||||
optarg);
|
||||
}
|
||||
- /* XXX efivar-36 accidentally doesn't have a public
|
||||
- * header for this */
|
||||
- extern int efi_set_verbose(int verbosity, FILE *errlog);
|
||||
efi_set_verbose(opts.verbose - 2, stderr);
|
||||
break;
|
||||
case 'V':
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
This patch fixing a build failure has been cherry-picked from upstream.
|
||||
Originally submitted as pull request by Erik Šabič.
|
||||
See also <https://github.com/Wilfred/helpful/pull/296>.
|
||||
diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el
|
||||
index a07aa8e..8a95129 100644
|
||||
--- a/test/helpful-unit-test.el
|
||||
+++ b/test/helpful-unit-test.el
|
||||
@@ -119,7 +119,9 @@ bar")))
|
||||
(should
|
||||
(equal
|
||||
(helpful--docstring #'test-foo-advised t)
|
||||
- "Docstring here too.")))
|
||||
+ (if (version< emacs-version "28")
|
||||
+ "Docstring here too."
|
||||
+ "Docstring here too.\n\nThis function has :around advice: `ad-Advice-test-foo-advised'."))))
|
||||
|
||||
(defun test-foo-no-docstring ()
|
||||
nil)
|
||||
72
gnu/packages/patches/evdi-fix-build-with-linux-6.2.patch
Normal file
72
gnu/packages/patches/evdi-fix-build-with-linux-6.2.patch
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
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
|
||||
|
|
@ -9,10 +9,10 @@ of host system.
|
|||
|
||||
--- a/common/flatpak-run.c
|
||||
+++ b/common/flatpak-run.c
|
||||
@@ -1853,6 +1853,7 @@ static const ExportData default_exports[] = {
|
||||
{"GST_PTP_HELPER", NULL},
|
||||
{"GST_PTP_HELPER_1_0", NULL},
|
||||
{"GST_INSTALL_PLUGINS_HELPER", NULL},
|
||||
@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = {
|
||||
{"XKB_CONFIG_ROOT", NULL},
|
||||
{"GIO_EXTRA_MODULES", NULL},
|
||||
{"GDK_BACKEND", NULL},
|
||||
+ {"GDK_PIXBUF_MODULE_FILE", NULL},
|
||||
};
|
||||
|
||||
|
|
|
|||
163
gnu/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch
Normal file
163
gnu/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch
Normal file
|
|
@ -0,0 +1,163 @@
|
|||
From: Danny Milosavljevic <dannym@scratchpost.org>
|
||||
Date: Sun, 19 Feb 2023 15:48:23 +0100
|
||||
Subject: Make fluxbox use libxcursor directly
|
||||
|
||||
This patch makes fluxbox use libxcursor directly. This way, big cursors work.
|
||||
Without it, libx11 would try to dlopen("libXcursor.so.1") and fail.
|
||||
|
||||
--- orig/fluxbox-1.3.7/configure.ac 2015-02-08 11:44:45.333187008 +0100
|
||||
+++ fluxbox-1.3.7/configure.ac 2023-02-19 15:42:50.595886984 +0100
|
||||
@@ -214,6 +214,18 @@
|
||||
CXXFLAGS="$X11_CFLAGS $CXXFLAGS"
|
||||
LIBS="$X11_LIBS $LIBS"
|
||||
|
||||
+dnl Check for Xcursor
|
||||
+PKG_CHECK_MODULES([XCURSOR], [ xcursor ],
|
||||
+ [AC_DEFINE([HAVE_XCURSOR], [1], [Define if xcursor is available]) have_cursor=yes],
|
||||
+ [have_xcursor=no])
|
||||
+AM_CONDITIONAL([XCURSOR], [test "$have_xcursor" = "yes"], AC_MSG_ERROR([Could not find XOpenDisplay in -lXcursor.]))
|
||||
+AS_IF([test x$have_xcursor = "xno"], [
|
||||
+ AC_MSG_ERROR([Fluxbox requires the Xcursor libraries and headers.])
|
||||
+])
|
||||
+
|
||||
+CXXFLAGS="$XCURSOR_CFLAGS $CXXFLAGS"
|
||||
+LIBS="$XCURSOR_LIBS $LIBS"
|
||||
+
|
||||
dnl Check for xpg4
|
||||
AC_CHECK_LIB([xpg4], [setlocale], [LIBS="-lxpg4 $LIBS"])
|
||||
AC_CHECK_PROGS([gencat_cmd], [gencat])
|
||||
diff -ru orig/fluxbox-1.3.7/src/FbWinFrameTheme.cc fluxbox-1.3.7/src/FbWinFrameTheme.cc
|
||||
--- orig/fluxbox-1.3.7/src/FbWinFrameTheme.cc 2015-02-08 11:44:45.365187009 +0100
|
||||
+++ fluxbox-1.3.7/src/FbWinFrameTheme.cc 2023-02-19 15:28:56.183284901 +0100
|
||||
@@ -20,6 +20,7 @@
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#include "FbWinFrameTheme.hh"
|
||||
+#include "Xutil.hh"
|
||||
#include "IconbarTheme.hh"
|
||||
|
||||
#include "FbTk/App.hh"
|
||||
@@ -53,15 +54,15 @@
|
||||
|
||||
// create cursors
|
||||
Display *disp = FbTk::App::instance()->display();
|
||||
- m_cursor_move = XCreateFontCursor(disp, XC_fleur);
|
||||
- m_cursor_lower_left_angle = XCreateFontCursor(disp, XC_bottom_left_corner);
|
||||
- m_cursor_lower_right_angle = XCreateFontCursor(disp, XC_bottom_right_corner);
|
||||
- m_cursor_upper_right_angle = XCreateFontCursor(disp, XC_top_right_corner);
|
||||
- m_cursor_upper_left_angle = XCreateFontCursor(disp, XC_top_left_corner);
|
||||
- m_cursor_left_side = XCreateFontCursor(disp, XC_left_side);
|
||||
- m_cursor_top_side = XCreateFontCursor(disp, XC_top_side);
|
||||
- m_cursor_right_side = XCreateFontCursor(disp, XC_right_side);
|
||||
- m_cursor_bottom_side = XCreateFontCursor(disp, XC_bottom_side);
|
||||
+ m_cursor_move = Xutil::hidpiCreateFontCursor(disp, XC_fleur);
|
||||
+ m_cursor_lower_left_angle = Xutil::hidpiCreateFontCursor(disp, XC_bottom_left_corner);
|
||||
+ m_cursor_lower_right_angle = Xutil::hidpiCreateFontCursor(disp, XC_bottom_right_corner);
|
||||
+ m_cursor_upper_right_angle = Xutil::hidpiCreateFontCursor(disp, XC_top_right_corner);
|
||||
+ m_cursor_upper_left_angle = Xutil::hidpiCreateFontCursor(disp, XC_top_left_corner);
|
||||
+ m_cursor_left_side = Xutil::hidpiCreateFontCursor(disp, XC_left_side);
|
||||
+ m_cursor_top_side = Xutil::hidpiCreateFontCursor(disp, XC_top_side);
|
||||
+ m_cursor_right_side = Xutil::hidpiCreateFontCursor(disp, XC_right_side);
|
||||
+ m_cursor_bottom_side = Xutil::hidpiCreateFontCursor(disp, XC_bottom_side);
|
||||
|
||||
FbTk::ThemeManager::instance().loadTheme(*this);
|
||||
reconfigTheme();
|
||||
diff -ru orig/fluxbox-1.3.7/src/Screen.cc fluxbox-1.3.7/src/Screen.cc
|
||||
--- orig/fluxbox-1.3.7/src/Screen.cc 2015-02-08 11:44:45.369187009 +0100
|
||||
+++ fluxbox-1.3.7/src/Screen.cc 2023-02-19 15:28:23.783092203 +0100
|
||||
@@ -53,6 +53,7 @@
|
||||
#include "SystemTray.hh"
|
||||
#endif
|
||||
#include "Debug.hh"
|
||||
+#include "Xutil.hh"
|
||||
|
||||
#include "FbTk/I18n.hh"
|
||||
#include "FbTk/FbWindow.hh"
|
||||
@@ -306,7 +307,7 @@
|
||||
if (keys)
|
||||
keys->registerWindow(rootWindow().window(), *this,
|
||||
Keys::GLOBAL|Keys::ON_DESKTOP);
|
||||
- rootWindow().setCursor(XCreateFontCursor(disp, XC_left_ptr));
|
||||
+ rootWindow().setCursor(Xutil::hidpiCreateFontCursor(disp, XC_left_ptr));
|
||||
|
||||
// load this screens resources
|
||||
fluxbox->load_rc(*this);
|
||||
diff -ru orig/fluxbox-1.3.7/src/Xutil.cc fluxbox-1.3.7/src/Xutil.cc
|
||||
--- orig/fluxbox-1.3.7/src/Xutil.cc 2015-02-08 11:44:45.377187009 +0100
|
||||
+++ fluxbox-1.3.7/src/Xutil.cc 2023-02-19 15:47:29.009541689 +0100
|
||||
@@ -28,6 +28,10 @@
|
||||
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xatom.h>
|
||||
+#include <X11/Xlibint.h>
|
||||
+#undef min
|
||||
+#undef max
|
||||
+#include <X11/Xcursor/Xcursor.h>
|
||||
#include <iostream>
|
||||
|
||||
#ifdef HAVE_CSTRING
|
||||
@@ -133,5 +137,19 @@
|
||||
return class_name;
|
||||
}
|
||||
|
||||
+static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */
|
||||
+static XColor _Xconst background = { 0, 65535, 65535, 65535 }; /* white */
|
||||
+Cursor hidpiCreateFontCursor(Display* dpy, unsigned int shape) {
|
||||
+ if (dpy->cursor_font == None) {
|
||||
+ dpy->cursor_font = XLoadFont(dpy, "cursor");
|
||||
+ if (dpy->cursor_font == None) return None;
|
||||
+ }
|
||||
+
|
||||
+ Cursor result = XcursorTryShapeCursor(dpy, dpy->cursor_font, dpy->cursor_font, (int) shape, (int) shape + 1, &foreground, &background);
|
||||
+ if (!result)
|
||||
+ result = XCreateFontCursor(dpy, (int) shape);
|
||||
+ return result;
|
||||
+}
|
||||
+
|
||||
} // end namespace Xutil
|
||||
|
||||
diff -ru orig/fluxbox-1.3.7/src/Xutil.hh fluxbox-1.3.7/src/Xutil.hh
|
||||
--- orig/fluxbox-1.3.7/src/Xutil.hh 2015-02-08 11:44:45.377187009 +0100
|
||||
+++ fluxbox-1.3.7/src/Xutil.hh 2023-02-19 15:26:37.495619659 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
FbTk::FbString getWMClassName(Window win);
|
||||
FbTk::FbString getWMClassClass(Window win);
|
||||
-
|
||||
+Cursor hidpiCreateFontCursor(Display* dpy, unsigned int shape);
|
||||
|
||||
} // end namespace Xutil
|
||||
|
||||
diff -ru orig/fluxbox-1.3.7/util/fbrun/FbRun.cc fluxbox-1.3.7/util/fbrun/FbRun.cc
|
||||
--- orig/fluxbox-1.3.7/util/fbrun/FbRun.cc 2015-02-08 11:44:45.377187009 +0100
|
||||
+++ fluxbox-1.3.7/util/fbrun/FbRun.cc 2023-02-19 15:28:18.532468099 +0100
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "FbTk/Color.hh"
|
||||
#include "FbTk/KeyUtil.hh"
|
||||
#include "FbTk/FileUtil.hh"
|
||||
+#include "Xutil.hh"
|
||||
|
||||
#ifdef HAVE_XPM
|
||||
#include <X11/xpm.h>
|
||||
@@ -67,7 +68,7 @@
|
||||
m_current_history_item(0),
|
||||
m_last_completion_prefix(""),
|
||||
m_current_apps_item(0),
|
||||
- m_cursor(XCreateFontCursor(FbTk::App::instance()->display(), XC_xterm)) {
|
||||
+ m_cursor(Xutil::hidpiCreateFontCursor(FbTk::App::instance()->display(), XC_xterm)) {
|
||||
|
||||
setGC(m_gc.gc());
|
||||
setCursor(m_cursor);
|
||||
diff -ru orig/fluxbox-1.3.7/util/fbrun/Makemodule.am fluxbox-1.3.7/util/fbrun/Makemodule.am
|
||||
--- orig/fluxbox-1.3.7/util/fbrun/Makemodule.am 2015-02-08 11:44:45.377187009 +0100
|
||||
+++ fluxbox-1.3.7/util/fbrun/Makemodule.am 2023-02-19 15:50:33.029069099 +0100
|
||||
@@ -8,7 +8,8 @@
|
||||
util/fbrun/FbRun.hh \
|
||||
util/fbrun/FbRun.cc \
|
||||
util/fbrun/main.cc \
|
||||
- util/fbrun/fbrun.xpm
|
||||
+ util/fbrun/fbrun.xpm \
|
||||
+ src/Xutil.cc
|
||||
|
||||
fbrun_LDADD = libFbTk.a \
|
||||
$(FRIBIDI_LIBS) \
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
From 052d24d8217c51c572c2f6cbb4a687be2e8ba52d Mon Sep 17 00:00:00 2001
|
||||
From: Brice Waegeneire <brice@waegenei.re>
|
||||
Date: Fri, 5 Jun 2020 14:38:43 +0200
|
||||
Subject: [PATCH] [geniso] Make it reproducible
|
||||
|
||||
Some timestamps get embedded in the generated ISO, making it
|
||||
unreproducible so we overwrite those timestamps to be at the UNIX epoch.
|
||||
---
|
||||
src/util/geniso | 24 +++++++++++++++++++++---
|
||||
1 file changed, 21 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/util/geniso b/src/util/geniso
|
||||
index ff090d4a..e032ffb0 100755
|
||||
--- a/src/util/geniso
|
||||
+++ b/src/util/geniso
|
||||
@@ -11,6 +11,13 @@ function help() {
|
||||
echo " -o FILE save iso image to file"
|
||||
}
|
||||
|
||||
+function reset_timestamp() {
|
||||
+ for f in "$1"/*; do
|
||||
+ touch -t 197001010100 "$f"
|
||||
+ done
|
||||
+ touch -t 197001010100 "$1"
|
||||
+}
|
||||
+
|
||||
LEGACY=0
|
||||
FIRST=""
|
||||
|
||||
@@ -37,8 +44,9 @@ if [ -z "${OUT}" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-# There should either be mkisofs or the compatible genisoimage program
|
||||
-for command in genisoimage mkisofs; do
|
||||
+# There should either be mkisofs, xorriso or the compatible genisoimage
|
||||
+# program
|
||||
+for command in xorriso genisoimage mkisofs; do
|
||||
if ${command} --version >/dev/null 2>/dev/null; then
|
||||
mkisofs=(${command})
|
||||
break
|
||||
@@ -46,8 +54,10 @@ for command in genisoimage mkisofs; do
|
||||
done
|
||||
|
||||
if [ -z "${mkisofs}" ]; then
|
||||
- echo "${0}: mkisofs or genisoimage not found, please install or set PATH" >&2
|
||||
+ echo "${0}: mkisofs, xorriso or genisoimage not found, please install or set PATH" >&2
|
||||
exit 1
|
||||
+elif [ "$mkisofs" = "xorriso" ]; then
|
||||
+ mkisofs+=(-as mkisofs)
|
||||
fi
|
||||
|
||||
dir=$(mktemp -d bin/iso.dir.XXXXXX)
|
||||
@@ -115,6 +125,8 @@ case "${LEGACY}" in
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+ reset_timestamp "$dir"
|
||||
+
|
||||
# generate the iso image
|
||||
"${mkisofs[@]}" -b boot.img -output ${OUT} ${dir}
|
||||
;;
|
||||
@@ -127,6 +139,12 @@ case "${LEGACY}" in
|
||||
cp ${LDLINUX_C32} ${dir}
|
||||
fi
|
||||
|
||||
+ reset_timestamp "$dir"
|
||||
+
|
||||
+ if [ "${mkisofs[0]}" = "xorriso" ]; then
|
||||
+ mkisofs+=(-isohybrid-mbr "$SYSLINUX_MBR_DISK_PATH")
|
||||
+ fi
|
||||
+
|
||||
# generate the iso image
|
||||
"${mkisofs[@]}" -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir}
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -0,0 +1,125 @@
|
|||
backport from upstream.
|
||||
|
||||
From b468fc95150b7ca0e766e7c385a60879e65322d4 Mon Sep 17 00:00:00 2001
|
||||
From: "K. Handa" <handa@gnu.org>
|
||||
Date: Tue, 23 Oct 2018 00:05:46 +0900
|
||||
Subject: Use pkg-config for freetype, use %p to print a pointer
|
||||
|
||||
---
|
||||
ChangeLog | 5 +++++
|
||||
configure.ac | 48 +++++++++++++++++++-----------------------------
|
||||
src/ChangeLog | 5 +++++
|
||||
src/chartab.c | 4 ++--
|
||||
4 files changed, 31 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index b069d89..9dfc0b0 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,3 +1,8 @@
|
||||
+2018-10-22 K. Handa <handa@gnu.org>
|
||||
+
|
||||
+ * configure.ac: Do not use the program freetype-config, use
|
||||
+ PKG_CHECK_MODULES for checking freetype2.
|
||||
+
|
||||
2018-02-08 K. Handa <handa@gnu.org>
|
||||
|
||||
Version 1.8.0 released.
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7f8b08e..3516bad 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -204,36 +204,26 @@ fi
|
||||
AC_SUBST(OTF_LD_FLAGS)
|
||||
|
||||
dnl Check for Freetype2 usability.
|
||||
-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
|
||||
-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
|
||||
- FREETYPE_INC=`freetype-config --cflags`
|
||||
- save_CPPFLAGS="$CPPFLAGS"
|
||||
- CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
|
||||
- AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
|
||||
- HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS")
|
||||
- if test "x$HAVE_FREETYPE" = "xyes" ; then
|
||||
- save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS `freetype-config --libs`"
|
||||
- AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
|
||||
- HAVE_FREETYPE=no)
|
||||
- LIBS="$save_LIBS"
|
||||
- if test "x$HAVE_FREETYPE" = "xyes"; then
|
||||
- FREETYPE_LD_FLAGS=`freetype-config --libs`
|
||||
- AC_DEFINE(HAVE_FREETYPE, 1,
|
||||
- [Define to 1 if you have FreeType library and header file.])
|
||||
- M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"
|
||||
- AC_CHECK_HEADER(freetype/ftbdf.h, HAVE_FTBDF_H=yes, HAVE_FTBDF_H=no,
|
||||
- [#include <ft2build.h>
|
||||
+PKG_CHECK_MODULES([FREETYPE], [freetype2], [HAVE_FREETYPE=yes],
|
||||
+ [HAVE_FREETYPE=no])
|
||||
+AS_IF([test "x$HAVE_FREETYPE" = "xyes"],
|
||||
+ [CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS";
|
||||
+ FREETYPE_LD_FLAGS=FREETYPE_LIBS;
|
||||
+ AC_DEFINE([HAVE_FREETYPE], [1],
|
||||
+ [Define to 1 if you have FreeType library and header file.])
|
||||
+ M17N_EXT_LIBS="$M17N_EXT_LIBS freetype";
|
||||
+ AC_CHECK_HEADER([freetype/ftbdf.h], [HAVE_FTBDF_H=yes], [HAVE_FTBDF_H=no],
|
||||
+ [#include <ft2build.h>
|
||||
#include FT_FREETYPE_H])
|
||||
- if test "x$HAVE_FTBDF_H" = "xyes"; then
|
||||
- AC_DEFINE(HAVE_FTBDF_H, 1,
|
||||
- [Define to 1 if you have freetype/ftbdf.h.])
|
||||
- fi
|
||||
- CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_FREETYPE"
|
||||
- fi
|
||||
- fi
|
||||
-fi
|
||||
-AC_SUBST(FREETYPE_LD_FLAGS)
|
||||
+ AS_IF([test "x$HAVE_FTBDF_H" = "xyes"],
|
||||
+ [AC_DEFINE([HAVE_FTBDF_H], [1],
|
||||
+ [Define to 1 if you have freetype/ftbdf.h.])],
|
||||
+ [])
|
||||
+ CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_FREETYPE"
|
||||
+ ],
|
||||
+ []
|
||||
+ )
|
||||
+AC_SUBST([FREETYPE_LD_FLAGS])
|
||||
|
||||
dnl Check for Xft2 usability.
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
diff --git a/src/ChangeLog b/src/ChangeLog
|
||||
index ee28ea6..8cb91c1 100644
|
||||
--- a/src/ChangeLog
|
||||
+++ b/src/ChangeLog
|
||||
@@ -1,3 +1,8 @@
|
||||
+2018-10-22 K. Handa <handa@gnu.org>
|
||||
+
|
||||
+ * chartab.c (dump_sub_chartab): Use %p directive to print a
|
||||
+ pointer value.
|
||||
+
|
||||
2018-02-08 K. Handa <handa@gnu.org>
|
||||
|
||||
Version 1.8.0 released.
|
||||
diff --git a/src/chartab.c b/src/chartab.c
|
||||
index d58aa65..8aeb6d7 100644
|
||||
--- a/src/chartab.c
|
||||
+++ b/src/chartab.c
|
||||
@@ -558,7 +558,7 @@ dump_sub_chartab (MSubCharTable *table, void *default_value,
|
||||
fprintf (mdebug__output, "(default nil)");
|
||||
}
|
||||
else
|
||||
- fprintf (mdebug__output, "(default #x%X)", (unsigned) table->default_value);
|
||||
+ fprintf (mdebug__output, "(default #x%p)", table->default_value);
|
||||
|
||||
default_value = table->default_value;
|
||||
if (table->contents.tables)
|
||||
@@ -589,7 +589,7 @@ dump_sub_chartab (MSubCharTable *table, void *default_value,
|
||||
fprintf (mdebug__output, "nil)");
|
||||
}
|
||||
else
|
||||
- fprintf (mdebug__output, " #xx%X)", (unsigned) default_value);
|
||||
+ fprintf (mdebug__output, " #x%p)", default_value);
|
||||
}
|
||||
}
|
||||
fprintf (mdebug__output, ")");
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
17
gnu/packages/patches/openbios-aarch64-riscv64-support.patch
Normal file
17
gnu/packages/patches/openbios-aarch64-riscv64-support.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
This was submitted upstream
|
||||
https://github.com/openbios/openbios/pull/12
|
||||
|
||||
diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch
|
||||
index b5acc6c..a96ef4b 100755
|
||||
--- a/config/scripts/switch-arch
|
||||
+++ b/config/scripts/switch-arch
|
||||
@@ -38,7 +38,8 @@ longbits()
|
||||
if test "$cpu" = "sparc64" -o "$cpu" = "ia64" \
|
||||
-o "$cpu" = "amd64" -o "$cpu" = "x86_64" \
|
||||
-o "$cpu" = "powerpc64" -o "$cpu" = "ppc64" \
|
||||
- -o "$cpu" = "ppc64le" -o "$cpu" = "alpha" ; then
|
||||
+ -o "$cpu" = "ppc64le" -o "$cpu" = "alpha" \
|
||||
+ -o "$cpu" = "aarch64" -o "$cpu" = "riscv64" ; then
|
||||
echo 64
|
||||
else
|
||||
echo 32
|
||||
Some files were not shown because too many files have changed in this diff Show more
Reference in a new issue