me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Christopher Baines 2021-02-03 09:14:43 +00:00
commit e740cc6140
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
257 changed files with 34256 additions and 29477 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Makefile.am
View file

@ -103,6 +103,7 @@ MODULES = \
guix/profiles.scm \ guix/profiles.scm \
guix/serialization.scm \ guix/serialization.scm \
guix/nar.scm \ guix/nar.scm \
guix/narinfo.scm \
guix/derivations.scm \ guix/derivations.scm \
guix/grafts.scm \ guix/grafts.scm \
guix/repl.scm \ guix/repl.scm \
@ -988,9 +989,12 @@ download-po.$(1):
fi ; \ fi ; \
for lang in $$$$LINGUAS; do \ for lang in $$$$LINGUAS; do \
if wget -nv -O "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" \ if wget -nv -O "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" \
"https://translationproject.org/latest/$(1)/$$$$lang.po" ; \ "https://translate.fedoraproject.org/api/translations/guix/$(1)/$$$$lang/file/" ; \
then \ then \
mv "$(top_srcdir)/$(2)/$(3)$$$$lang.po"{.tmp,} ; \ msgfilter --no-wrap -i "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" \
cat > "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp2" ; \
rm "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" ; \
mv "$(top_srcdir)/$(2)/$(3)$$$$lang.po"{.tmp2,} ; \
else \ else \
rm "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" ; \ rm "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" ; \
fi ; \ fi ; \
@ -1000,13 +1004,49 @@ download-po.$(1):
endef endef
$(eval $(call make-download-po-rule,guix,po/guix)) # Checking po files for issues. This is useful to run after downloading new
$(eval $(call make-download-po-rule,guix-packages,po/packages)) # po files.
$(eval $(call make-download-po-rule,guix-manual,po/doc,guix-manual.))
download-po: $(foreach domain,guix guix-packages guix-manual,download-po.$(domain)) # make-check-po-rule DOMAIN DIRECTORY [FILE-NAME-PREFIX]
define make-check-po-rule
check-po.$(1):
if [ -f "$(top_srcdir)/$(2)/LINGUAS" ]; then \
LINGUAS="`grep -v '^[[:blank:]]*#' < $(top_srcdir)/$(2)/LINGUAS`" ; \
else \
LINGUAS="`(cd $(top_srcdir)/$(2); \
for i in *.po; do echo $$$$i; done) | cut -d . -f 2`" ; \
fi ; \
for lang in $$$$LINGUAS; do \
if [ -f "$(top_srcdir)/$(2)/$(3)$$$$lang.po" ]; \
then \
if ! msgfmt -c "$(top_srcdir)/$(2)/$(3)$$$$lang.po" ; \
then \
exit 1 ; \
fi ; \
fi ; \
done
.PHONY: check-po.$(1)
endef
$(eval $(call make-download-po-rule,documentation-cookbook,po/doc,guix-cookbook.))
$(eval $(call make-download-po-rule,documentation-manual,po/doc,guix-manual.))
$(eval $(call make-download-po-rule,guix,po/guix))
$(eval $(call make-download-po-rule,packages,po/packages))
$(eval $(call make-check-po-rule,documentation-cookbook,po/doc,guix-cookbook.))
$(eval $(call make-check-po-rule,documentation-manual,po/doc,guix-manual.))
$(eval $(call make-check-po-rule,guix,po/guix))
$(eval $(call make-check-po-rule,packages,po/packages))
download-po: $(foreach domain,guix packages documentation-manual documentation-cookbook,download-po.$(domain))
.PHONY: download-po .PHONY: download-po
check-po: $(foreach domain,guix packages documentation-manual documentation-cookbook,check-po.$(domain))
.PHONY: check-po
## -------------- ## ## -------------- ##
## Silent rules. ## ## Silent rules. ##
## -------------- ## ## -------------- ##

3
build-aux/build-self.scm
View file

@ -245,8 +245,11 @@ interface (FFI) of Guile.")
"Return a program that computes the derivation to build Guix from SOURCE." "Return a program that computes the derivation to build Guix from SOURCE."
(define select? (define select?
;; Select every module but (guix config) and non-Guix modules. ;; Select every module but (guix config) and non-Guix modules.
;; Also exclude (guix channels): it is autoloaded by (guix describe), but
;; only for peripheral functionality.
(match-lambda (match-lambda
(('guix 'config) #f) (('guix 'config) #f)
(('guix 'channels) #f)
(('guix _ ...) #t) (('guix _ ...) #t)
(('gnu _ ...) #t) (('gnu _ ...) #t)
(_ #f))) (_ #f)))

162
build-aux/test-driver.scm Normal file → Executable file
View file

@ -1,8 +1,12 @@
#!/bin/sh
exec guile --no-auto-compile -e main -s "$0" "$@"
!#
;;;; test-driver.scm - Guile test driver for Automake testsuite harness ;;;; test-driver.scm - Guile test driver for Automake testsuite harness
(define script-version "2017-03-22.13") ;UTC (define script-version "2021-02-02.05") ;UTC
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This program is free software; you can redistribute it and/or modify it ;;; This program is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by ;;; under the terms of the GNU General Public License as published by
@ -24,8 +28,12 @@
;;; ;;;
;;;; Code: ;;;; Code:
(use-modules (ice-9 getopt-long) (use-modules (ice-9 format)
(ice-9 getopt-long)
(ice-9 pretty-print) (ice-9 pretty-print)
(ice-9 regex)
(srfi srfi-1)
(srfi srfi-19)
(srfi srfi-26) (srfi srfi-26)
(srfi srfi-64)) (srfi srfi-64))
@ -33,18 +41,30 @@
(display "Usage: (display "Usage:
test-driver --test-name=NAME --log-file=PATH --trs-file=PATH test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
[--expect-failure={yes|no}] [--color-tests={yes|no}] [--expect-failure={yes|no}] [--color-tests={yes|no}]
[--enable-hard-errors={yes|no}] [--brief={yes|no}}] [--] [--select=REGEXP] [--exclude=REGEXP] [--errors-only={yes|no}]
[--enable-hard-errors={yes|no}] [--brief={yes|no}}]
[--show-duration={yes|no}] [--]
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
The '--test-name', '--log-file' and '--trs-file' options are mandatory.\n")) The '--test-name' option is mandatory. The '--select' and '--exclude' options
allow selecting or excluding individual test cases via a regexp, respectively.
The '--errors-only' option can be set to \"yes\" to limit the logged test case
metadata to only those test cases that failed. When set to \"yes\", the
'--brief' option disables printing the individual test case result to the
console. When '--show-duration' is set to \"yes\", the time elapsed per test
case is shown.\n"))
(define %options (define %options
'((test-name (value #t)) '((test-name (value #t))
(log-file (value #t)) (log-file (value #t))
(trs-file (value #t)) (trs-file (value #t))
(select (value #t))
(exclude (value #t))
(errors-only (value #t))
(color-tests (value #t)) (color-tests (value #t))
(expect-failure (value #t)) ;XXX: not implemented yet (expect-failure (value #t)) ;XXX: not implemented yet
(enable-hard-errors (value #t)) ;not implemented in SRFI-64 (enable-hard-errors (value #t)) ;not implemented in SRFI-64
(brief (value #t)) (brief (value #t))
(show-duration (value #t))
(help (single-char #\h) (value #f)) (help (single-char #\h) (value #f))
(version (single-char #\V) (value #f)))) (version (single-char #\V) (value #f))))
@ -75,33 +95,67 @@ The '--test-name', '--log-file' and '--trs-file' options are mandatory.\n"))
"") ;no color "") ;no color
result))) result)))
(define* (test-runner-gnu test-name #:key color? brief? out-port trs-port)
;;;
;;; SRFI 64 custom test runner.
;;;
(define* (test-runner-gnu test-name #:key color? brief? errors-only?
show-duration?
(out-port (current-output-port))
(trs-port (%make-void-port "w"))
select exclude)
"Return an custom SRFI-64 test runner. TEST-NAME is a string specifying the "Return an custom SRFI-64 test runner. TEST-NAME is a string specifying the
file name of the current the test. COLOR? specifies whether to use colors, file name of the current the test. COLOR? specifies whether to use colors.
and BRIEF?, well, you know. OUT-PORT and TRS-PORT must be output ports. The When BRIEF? is true, the individual test cases results are masked and only the
current output port is supposed to be redirected to a '.log' file." summary is shown. ERRORS-ONLY? reduces the amount of test case metadata
logged to only that of the failed test cases. OUT-PORT and TRS-PORT must be
output ports. OUT-PORT defaults to the current output port, while TRS-PORT
defaults to a void port, which means no TRS output is logged. SELECT and
EXCLUDE may take a regular expression to select or exclude individual test
cases based on their names."
(define test-cases-start-time (make-hash-table))
(define (test-on-test-begin-gnu runner) (define (test-on-test-begin-gnu runner)
;; Procedure called at the start of an individual test case, before the ;; Procedure called at the start of an individual test case, before the
;; test expression (and expected value) are evaluated. ;; test expression (and expected value) are evaluated.
(let ((result (cute assq-ref (test-result-alist runner) <>))) (let ((test-case-name (test-runner-test-name runner))
(format #t "test-name: ~A~%" (result 'test-name)) (start-time (current-time time-monotonic)))
(format #t "location: ~A~%" (hash-set! test-cases-start-time test-case-name start-time)))
(string-append (result 'source-file) ":"
(number->string (result 'source-line)))) (define (test-skipped? runner)
(test-display "source" (result 'source-form) #:pretty? #t))) (eq? 'skip (test-result-kind runner)))
(define (test-failed? runner)
(not (or (test-passed? runner)
(test-skipped? runner))))
(define (test-on-test-end-gnu runner) (define (test-on-test-end-gnu runner)
;; Procedure called at the end of an individual test case, when the result ;; Procedure called at the end of an individual test case, when the result
;; of the test is available. ;; of the test is available.
(let* ((results (test-result-alist runner)) (let* ((results (test-result-alist runner))
(result? (cut assq <> results)) (result? (cut assq <> results))
(result (cut assq-ref results <>))) (result (cut assq-ref results <>))
(unless brief? (test-case-name (test-runner-test-name runner))
(start (hash-ref test-cases-start-time test-case-name))
(end (current-time time-monotonic))
(time-elapsed (time-difference end start))
(time-elapsed-seconds (+ (time-second time-elapsed)
(* 1e-9 (time-nanosecond time-elapsed)))))
(unless (or brief? (and errors-only? (test-skipped? runner)))
;; Display the result of each test case on the console. ;; Display the result of each test case on the console.
(format out-port "~A: ~A - ~A~%" (format out-port "~a: ~a - ~a ~@[[~,3fs]~]~%"
(result->string (test-result-kind runner) #:colorize? color?) (result->string (test-result-kind runner) #:colorize? color?)
test-name (test-runner-test-name runner))) test-name test-case-name
(and show-duration? time-elapsed-seconds)))
(unless (and errors-only? (not (test-failed? runner)))
(format #t "test-name: ~A~%" (result 'test-name))
(format #t "location: ~A~%"
(string-append (result 'source-file) ":"
(number->string (result 'source-line))))
(test-display "source" (result 'source-form) #:pretty? #t)
(when (result? 'expected-value) (when (result? 'expected-value)
(test-display "expected-value" (result 'expected-value))) (test-display "expected-value" (result 'expected-value)))
(when (result? 'expected-error) (when (result? 'expected-error)
@ -111,10 +165,11 @@ current output port is supposed to be redirected to a '.log' file."
(when (result? 'actual-error) (when (result? 'actual-error)
(test-display "actual-error" (result 'actual-error) #:pretty? #t)) (test-display "actual-error" (result 'actual-error) #:pretty? #t))
(format #t "result: ~a~%" (result->string (result 'result-kind))) (format #t "result: ~a~%" (result->string (result 'result-kind)))
(newline) (newline))
(format trs-port ":test-result: ~A ~A~%"
(format trs-port ":test-result: ~A ~A [~,3fs]~%"
(result->string (test-result-kind runner)) (result->string (test-result-kind runner))
(test-runner-test-name runner)))) (test-runner-test-name runner) time-elapsed-seconds)))
(define (test-on-group-end-gnu runner) (define (test-on-group-end-gnu runner)
;; Procedure called by a 'test-end', including at the end of a test-group. ;; Procedure called by a 'test-end', including at the end of a test-group.
@ -144,6 +199,34 @@ current output port is supposed to be redirected to a '.log' file."
(test-runner-on-bad-end-name! runner test-on-bad-end-name-simple) (test-runner-on-bad-end-name! runner test-on-bad-end-name-simple)
runner)) runner))
;;;
;;; SRFI 64 test specifiers.
;;;
(define (test-match-name* regexp)
"Return a test specifier that matches a test name against REGEXP."
(lambda (runner)
(string-match regexp (test-runner-test-name runner))))
(define (test-match-name*/negated regexp)
"Return a negated test specifier version of test-match-name*."
(lambda (runner)
(not (string-match regexp (test-runner-test-name runner)))))
;;; XXX: test-match-all is a syntax, which isn't convenient to use with a list
;;; of test specifiers computed at run time. Copy this SRFI 64 internal
;;; definition here, which is the procedural equivalent of 'test-match-all'.
(define (%test-match-all . pred-list)
(lambda (runner)
(let ((result #t))
(let loop ((l pred-list))
(if (null? l)
result
(begin
(if (not ((car l) runner))
(set! result #f))
(loop (cdr l))))))))
;;; ;;;
;;; Entry point. ;;; Entry point.
@ -154,22 +237,39 @@ current output port is supposed to be redirected to a '.log' file."
(option (cut option-ref opts <> <>))) (option (cut option-ref opts <> <>)))
(cond (cond
((option 'help #f) (show-help)) ((option 'help #f) (show-help))
((option 'version #f) (format #t "test-driver.scm ~A" script-version)) ((option 'version #f) (format #t "test-driver.scm ~A~%" script-version))
(else (else
(let ((log (open-file (option 'log-file "") "w0")) (let* ((log (and=> (option 'log-file #f) (cut open-file <> "w0")))
(trs (open-file (option 'trs-file "") "wl")) (trs (and=> (option 'trs-file #f) (cut open-file <> "wl")))
(out (duplicate-port (current-output-port) "wl"))) (out (duplicate-port (current-output-port) "wl"))
(test-name (option 'test-name #f))
(select (option 'select #f))
(exclude (option 'exclude #f))
(test-specifiers (filter-map
identity
(list (and=> select test-match-name*)
(and=> exclude test-match-name*/negated))))
(test-specifier (apply %test-match-all test-specifiers))
(color-tests (if (assoc 'color-tests opts)
(option->boolean opts 'color-tests)
#t)))
(when log
(redirect-port log (current-output-port)) (redirect-port log (current-output-port))
(redirect-port log (current-warning-port)) (redirect-port log (current-warning-port))
(redirect-port log (current-error-port)) (redirect-port log (current-error-port)))
(test-with-runner (test-with-runner
(test-runner-gnu (option 'test-name #f) (test-runner-gnu test-name
#:color? (option->boolean opts 'color-tests) #:color? color-tests
#:brief? (option->boolean opts 'brief) #:brief? (option->boolean opts 'brief)
#:errors-only? (option->boolean opts 'errors-only)
#:show-duration? (option->boolean
opts 'show-duration)
#:out-port out #:trs-port trs) #:out-port out #:trs-port trs)
(load-from-path (option 'test-name #f))) (test-apply test-specifier
(close-port log) (lambda _
(close-port trs) (load-from-path test-name))))
(and=> log close-port)
(and=> trs close-port)
(close-port out)))) (close-port out))))
(exit 0))) (exit 0)))

12
doc/contributing.texi
View file

@ -593,8 +593,8 @@ such as @command{guix package --show} take care of rendering it
appropriately. appropriately.
Synopses and descriptions are translated by volunteers Synopses and descriptions are translated by volunteers
@uref{https://translationproject.org/domain/guix-packages.html, at the @uref{https://translate.fedoraproject.org/projects/guix/packages, at
Translation Project} so that as many users as possible can read them in Weblate} so that as many users as possible can read them in
their native language. User interfaces search them and display them in their native language. User interfaces search them and display them in
the language specified by the current locale. the language specified by the current locale.
@ -802,10 +802,10 @@ To prevent namespace collisions we prefix all other Rust packages with the
dashes should remain in place. dashes should remain in place.
In the rust ecosystem it is common for multiple incompatible versions of a In the rust ecosystem it is common for multiple incompatible versions of a
package to be used at any given time, so all packages should have a versioned package to be used at any given time, so all package definitions should have a
suffix. If a package has passed version 1.0.0 then just the major version versioned suffix. The versioned suffix is the left-most non-zero digit (and
number is sufficient (e.g.@: @code{rust-clap-2}), otherwise the version suffix any leading zeros, of course). This follows the ``caret'' version scheme
should contain both the major and minor version (e.g.@: @code{rust-rand-0.6}). intended by Cargo. Examples@: @code{rust-clap-2}, @code{rust-rand-0.6}.
Because of the difficulty in reusing rust packages as pre-compiled inputs for Because of the difficulty in reusing rust packages as pre-compiled inputs for
other packages the Cargo build system (@pxref{Build Systems, other packages the Cargo build system (@pxref{Build Systems,

217
doc/guix-cookbook.texi
View file

@ -57,8 +57,9 @@ its API, and related concepts.
@c how to join your own translation team and how to report issues with the @c how to join your own translation team and how to report issues with the
@c translation. @c translation.
If you would like to translate this document in your native language, consider If you would like to translate this document in your native language, consider
joining the @uref{https://translationproject.org/domain/guix-cookbook.html, joining
Translation Project}. @uref{https://translate.fedoraproject.org/projects/guix/documentation-cookbook,
Weblate}.
@menu @menu
* Scheme tutorials:: Meet your new favorite language! * Scheme tutorials:: Meet your new favorite language!
@ -1353,6 +1354,7 @@ reference.
@menu @menu
* Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System. * Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System.
* Guix System Image API:: Customizing images to target specific platforms.
* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Connecting to Wireguard VPN:: Connecting to a Wireguard VPN.
* Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
* Running Guix on a Linode Server:: Running Guix on a Linode Server * Running Guix on a Linode Server:: Running Guix on a Linode Server
@ -1601,6 +1603,217 @@ likely that you'll need to modify the initrd on a machine using a custom
kernel, since certain modules which are expected to be built may not be kernel, since certain modules which are expected to be built may not be
available for inclusion into the initrd. available for inclusion into the initrd.
@node Guix System Image API
@section Guix System Image API
Historically, Guix System is centered around an @code{operating-system}
structure. This structure contains various fields ranging from the
bootloader and kernel declaration to the services to install.
Depending on the target machine, that can go from a standard
@code{x86_64} machine to a small ARM single board computer such as the
Pine64, the image constraints can vary a lot. The hardware
manufacturers will impose different image formats with various partition
sizes and offsets.
To create images suitable for all those machines, a new abstraction is
necessary: that's the goal of the @code{image} record. This record
contains all the required information to be transformed into a
standalone image, that can be directly booted on any target machine.
@lisp
(define-record-type* <image>
image make-image
image?
(name image-name ;symbol
(default #f))
(format image-format) ;symbol
(target image-target
(default #f))
(size image-size ;size in bytes as integer
(default 'guess))
(operating-system image-operating-system ;<operating-system>
(default #f))
(partitions image-partitions ;list of <partition>
(default '()))
(compression? image-compression? ;boolean
(default #t))
(volatile-root? image-volatile-root? ;boolean
(default #t))
(substitutable? image-substitutable? ;boolean
(default #t)))
@end lisp
This record contains the operating-system to instantiate. The
@code{format} field defines the image type and can be @code{efi-raw},
@code{qcow2} or @code{iso9660} for instance. In the future, it could be
extended to @code{docker} or other image types.
A new directory in the Guix sources is dedicated to images definition. For now
there are four files:
@itemize @bullet
@item @file{gnu/system/images/hurd.scm}
@item @file{gnu/system/images/pine64.scm}
@item @file{gnu/system/images/novena.scm}
@item @file{gnu/system/images/pinebook-pro.scm}
@end itemize
Let's have a look to @file{pine64.scm}. It contains the
@code{pine64-barebones-os} variable which is a minimal definition of an
operating-system dedicated to the @b{Pine A64 LTS} board.
@lisp
(define pine64-barebones-os
(operating-system
(host-name "vignemale")
(timezone "Europe/Paris")
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader u-boot-pine64-lts-bootloader)
(target "/dev/vda")))
(initrd-modules '())
(kernel linux-libre-arm64-generic)
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")
(type "ext4"))
%base-file-systems))
(services (cons (service agetty-service-type
(agetty-configuration
(extra-options '("-L")) ; no carrier detect
(baud-rate "115200")
(term "vt100")
(tty "ttyS0")))
%base-services))))
@end lisp
The @code{kernel} and @code{bootloader} fields are pointing to packages
dedicated to this board.
Right below, the @code{pine64-image-type} variable is also defined.
@lisp
(define pine64-image-type
(image-type
(name 'pine64-raw)
(constructor (cut image-with-os arm64-disk-image <>))))
@end lisp
It's using a record we haven't talked about yet, the @code{image-type} record,
defined this way:
@lisp
(define-record-type* <image-type>
image-type make-image-type
image-type?
(name image-type-name) ;symbol
(constructor image-type-constructor)) ;<operating-system> -> <image>
@end lisp
The main purpose of this record is to associate a name to a procedure
transforming an @code{operating-system} to an image. To understand why
it is necessary, let's have a look to the command producing an image
from an @code{operating-system} configuration file:
@example
guix system image my-os.scm
@end example
This command expects an @code{operating-system} configuration but how
should we indicate that we want an image targeting a Pine64 board? We
need to provide an extra information, the @code{image-type}, by passing
the @code{--image-type} or @code{-t} flag, this way:
@example
guix system image --image-type=pine64-raw my-os.scm
@end example
This @code{image-type} parameter points to the @code{pine64-image-type}
defined above. Hence, the @code{operating-system} declared in
@code{my-os.scm} will be applied the @code{(cut image-with-os
arm64-disk-image <>)} procedure to turn it into an image.
The resulting image looks like:
@lisp
(image
(format 'disk-image)
(target "aarch64-linux-gnu")
(operating-system my-os)
(partitions
(list (partition
(inherit root-partition)
(offset root-offset)))))
@end lisp
which is the aggregation of the @code{operating-system} defined in
@code{my-os.scm} to the @code{arm64-disk-image} record.
But enough Scheme madness. What does this image API bring to the Guix user?
One can run:
@example
mathieu@@cervin:~$ guix system --list-image-types
The available image types are:
- pinebook-pro-raw
- pine64-raw
- novena-raw
- hurd-raw
- hurd-qcow2
- qcow2
- uncompressed-iso9660
- efi-raw
- arm64-raw
- arm32-raw
- iso9660
@end example
and by writing an @code{operating-system} file based on
@code{pine64-barebones-os}, you can customize your image to your
preferences in a file (@file{my-pine-os.scm}) like this:
@lisp
(use-modules (gnu services linux)
(gnu system images pine64))
(let ((base-os pine64-barebones-os))
(operating-system
(inherit base-os)
(timezone "America/Indiana/Indianapolis")
(services
(cons
(service earlyoom-service-type
(earlyoom-configuration
(prefer-regexp "icecat|chromium")))
(operating-system-user-services base-os)))))
@end lisp
run:
@example
guix system image --image-type=pine64-raw my-pine-os.scm
@end example
or,
@example
guix system image --image-type=hurd-raw my-hurd-os.scm
@end example
to get an image that can be written directly to a hard drive and booted
from.
Without changing anything to @code{my-hurd-os.scm}, calling:
@example
guix system image --image-type=hurd-qcow2 my-hurd-os.scm
@end example
will instead produce a Hurd QEMU image.
@node Connecting to Wireguard VPN @node Connecting to Wireguard VPN
@section Connecting to Wireguard VPN @section Connecting to Wireguard VPN

581
doc/guix.texi
View file

File diff suppressed because it is too large Load diff

141
etc/news.scm
View file

@ -1,11 +1,11 @@
;; GNU Guix news, for use by 'guix pull'. ;; GNU Guix news, for use by 'guix pull'.
;; ;;
;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com> ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net> ;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;; Copyright © 2019, 2020 Julien Lepiller <julien@lepiller.eu> ;; Copyright © 2019, 2020 Julien Lepiller <julien@lepiller.eu>
;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;; Copyright © 2019, 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -18,6 +18,143 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "aedbc5ff32a62f45aeed74c6833399a6cf2c22dc")
(title
(en "Create a manifest with @command{guix package --export-manifest}")
(fr "Créer un manifeste avec @command{guix package --export-manifest}"))
(body
(en "The @command{guix package --export-manifest} command outputs a
@dfn{manifest} from your profile. This manifest is a code snippet that can
then be passed to @command{guix package --manifest} (or any other command that
accepts the @option{--manifest} option) to deploy these packages.
The goal of this new @option{--export-manifest} option is to make it easier to
migrate from an ``imperative'' style where you repeatedly invoke @command{guix
install} and similar commands, to the declarative style where you write in a
manifest file the list of packages you want to have.
Similarly, the new @option{--export-channels} option outputs a @dfn{channel
specification} suitable for @command{guix pull --channels} from your profile.
This allows you to ``pin'' Guix to the revision that was used to build the
profile.
Run @command{info \"(guix) Invoking guix package\"} for more info.")
(fr "La commande @command{guix package --export-manifest} affiche un
@dfn{manifeste} pour le profil choisi. Ce manifeste est un bout de code qu'on
peut passer à @command{guix package --manifest} (ou n'importe qu'elle commande
qui accepte l'option @option{--manifest}) pour déployer ces paquets.
L'objectif de cette nouvelle option @option{--export-manifest} est de
faciliter la migration du modèle ``impératif'', où on utilise @command{guix
install} et les commandes de ce genre, au modèle déclaratif où on écrit dans
un fichier la liste des paquets que l'on veut avoir.
De même, la nouvelle option @option{--export-channels} produit une
@dfn{spécification de canaux} pour @command{guix pull --channels} à partir du
profil. Cela permet de ``figer'' Guix à la révision qui a été utilisée pour
produire le profil.
Voir @command{info \"(guix.fr) Invoquer guix package\"} pour plus
d'informations.")))
(entry (commit "9ab817b2a4601b4a6755983590ed7d93ebdc8d09")
(title (en "New @option{--with-latest} package transformation option")
(de "Neue Paketumwandlungsoption @option{--with-latest}")
(fr "Nouvelle option de transformation @option{--with-latest}"))
(body
(en "The new @option{--with-latest} package transformation option
gets the latest release of a package, as would be identified by @command{guix
refresh}, and uses it instead of the currently-packaged version. For example,
to install the latest release of GNOME Weather linked against the latest
version of libgweather, run:
@example
guix install gnome-weather \\
--with-latest=gnome-weather --with-latest=libgweather
@end example
Run @command{info \"(guix) Package Transformation Options\"} for more info.")
(de "Mit der neuen Paketumwandlungsoption @option{--with-latest} wird
die neueste Veröffentlichung für ein Paket verwendet. Diese wird wie bei
@command{guix refresh} bestimmt und anstelle der zurzeit im Paket festgelegten
Version verwendet. Um zum Beispiel die neuste Veröffentlichung von GNOME
Weather gebunden an die neuste Version von libgweather zu installieren, führen
Sie dies aus:
@example
guix install gnome-weather \\
--with-latest=gnome-weather --with-latest=libgweather
@end example
Führen Sie für mehr Informationen @command{info \"(guix.de)
Paketumwandlungsoptionen\"} aus.")
(fr "La nouvelle option de transformation de paquets
@option{--with-latest} récupère la dernière version d'un logiciel telle
qu'elle serait trouvée par @command{guix refresh} et l'utilise à la place la
version actuellement fournie par le paquet. Par exemple, pour installer la
dernière version de GNOME Weather, elle-même compilée avec la dernière version
de libgweather, on lancera :
@example
guix install gnome-weather \\
--with-latest=gnome-weather --with-latest=libgweather
@end example
Voir @command{info \"(guix.fr) Options de transformation de paquets\"} pour
plus de détails.")))
(entry (commit "a879e35116043d5daf3d9d175b697d10b9177fd5")
(title (en "Substitutes can now be compressed with zstd")
(de "Substitute können nun mit zstd komprimiert werden")
(fr "Les substituts peuvent maintenant être compressés avec zstd"))
(body
(en "The @command{guix publish} command now supports substitute
compression with zstd and @command{guix-daemon} can now fetch and decompress
them.
The advantage of zstd over the other options is its high compression and
decompression throughput, with good compression ratios (not as good as lzip,
but slightly better than gzip). Its high decompression throughput makes it a
good choice in situations where substitute downloads would otherwise be
CPU-bound, typically when having a high-speed connection to the substitute
server. Run @command{info \"(guix) Invoking guix publish\"} for more info.
To be able to fetch zstd-compressed substitutes (if the substitute servers you
chose provide them), you need to upgrade your daemon. Run @command{info
\"(guix) Upgrading Guix\"} to learn how to do it.")
(de "Mit dem Befehl @command{guix publish} können Sie jetzt auch
Substitute mit zstd komprimieren und @command{guix-daemon} kann sie laden und
dekomprimieren.
zstd bietet gegenüber den anderen Optionen einen hohen Durchsatz bei
Kompression und Dekompression mit guten Kompressionsverhältnissen (nicht so
gut wie lzip, aber etwas besser als gzip). Wegen des hohen Durchsatzes bei
der Dekompression ist zstd eine gute Wahl, wenn beim Herunterladen von
Substituten ansonsten der Engpass bei der Prozessorleistung läge, etwa weil
eine schnelle Netzwerkverbindung zum Substitutserver besteht. Führen Sie für
mehr Informationen @command{info \"(guix.de) Aufruf von guix publish\"} aus.
Um zstd-komprimierte Substitute benutzen zu können (wenn der Substitutserver
sie anbietet), müssen Sie Ihren Daemon aktualisieren. Führen Sie
@command{info \"(guix.de) Aktualisieren von Guix\"} aus, um zu erfahren, wie
Sie ihn aktualisieren.")
(fr "La commande @command{guix publish} peut maintenant compresser
les substituts avec zstd et @command{guix-daemon} est capable de les récupérer
et de les décompresser.
L'avantage de zstd par rapport aux autres méthodes est son haut débit en
compression et décompression, avec un taux de compression correct (pas aussi
bon que lzip, mais légèrement meilleur que gzip). Sa vitesse de décompression
en fait un bon choix dans les situations où le temps de téléchargement des
substituts se retrouve sinon limité par le temps de calcul comme c'est le cas
lorsqu'on bénéficie d'une connexion rapide au serveur de substitut. Lancer
@command{info \"(guix.fr) Invoquer guix publish\"} pour plus d'informations.
Pour pouvoir télécharger des substituts compressés avec zstd (si les serveurs
de substituts choisis les fournissent), il faudra d'abord mettre à jour le
démon. Lancer @command{info \"(guix.fr) Mettre à niveau Guix\"} pour voir
comment faire.")))
(entry (commit "e38d90d497e19e00263fa28961c688a433154386") (entry (commit "e38d90d497e19e00263fa28961c688a433154386")
(title (en "New @option{--with-patch} package transformation option") (title (en "New @option{--with-patch} package transformation option")
(de "Neue Paketumwandlungsoption @option{--with-patch}") (de "Neue Paketumwandlungsoption @option{--with-patch}")

24
gnu/bootloader/grub.scm
View file

@ -168,15 +168,14 @@ STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is
its mount point; these are used to determine where the background image and its mount point; these are used to determine where the background image and
fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory prefix to fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory prefix to
prepend to any store file name." prepend to any store file name."
(define (setup-gfxterm config font-file) (define (setup-gfxterm config)
(if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config))
#~(format #f " #~(format #f "
if loadfont ~a; then if loadfont unicode; then
set gfxmode=~a set gfxmode=~a
insmod all_video insmod all_video
insmod gfxterm insmod gfxterm
fi~%" fi~%"
#+font-file
#$(string-join #$(string-join
(grub-theme-gfxmode (bootloader-theme config)) (grub-theme-gfxmode (bootloader-theme config))
";")) ";"))
@ -188,13 +187,6 @@ fi~%"
(string-append (symbol->string (assoc-ref colors 'fg)) "/" (string-append (symbol->string (assoc-ref colors 'fg)) "/"
(symbol->string (assoc-ref colors 'bg))))) (symbol->string (assoc-ref colors 'bg)))))
(define font-file
(let* ((bootloader (bootloader-configuration-bootloader config))
(grub (bootloader-package bootloader)))
(normalize-file (file-append grub "/share/grub/unicode.pf2")
store-mount-point
store-directory-prefix)))
(define image (define image
(normalize-file (grub-background-image config) (normalize-file (grub-background-image config)
store-mount-point store-mount-point
@ -216,8 +208,8 @@ else
set menu_color_normal=cyan/blue set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue set menu_color_highlight=white/blue
fi~%" fi~%"
#$(grub-root-search store-device font-file) #$(grub-root-search store-device image)
#$(setup-gfxterm config font-file) #$(setup-gfxterm config)
#$(grub-setup-io config) #$(grub-setup-io config)
#$image #$image
@ -545,9 +537,13 @@ fi~%"))))
(invoke/quiet grub "--no-floppy" "--target=i386-pc" (invoke/quiet grub "--no-floppy" "--target=i386-pc"
"--boot-directory" install-dir "--boot-directory" install-dir
device)) device))
;; When creating a disk-image, only install GRUB modules. ;; When creating a disk-image, only install a font and GRUB modules.
(let* ((fonts (string-append install-dir "/grub/fonts")))
(mkdir-p fonts)
(copy-file (string-append bootloader "/share/grub/unicode.pf2")
(string-append fonts "/unicode.pf2"))
(copy-recursively (string-append bootloader "/lib/") (copy-recursively (string-append bootloader "/lib/")
install-dir))))) install-dir))))))
(define install-grub-disk-image (define install-grub-disk-image
#~(lambda (bootloader root-index image) #~(lambda (bootloader root-index image)

7
gnu/ci.scm
View file

@ -234,7 +234,7 @@ passing the PERIOD argument."
system.") system.")
(license . ,(license-name gpl3+)) (license . ,(license-name gpl3+))
(period . ,(hours 48)) (period . ,(hours 48))
(max-silent-time . 600) (max-silent-time . 3600)
(timeout . 3600) (timeout . 3600)
(home-page . ,%guix-home-page-url) (home-page . ,%guix-home-page-url)
(maintainers . ("bug-guix@gnu.org")))) (maintainers . ("bug-guix@gnu.org"))))
@ -349,7 +349,7 @@ system.")
(long-description . ,(system-test-description test)) (long-description . ,(system-test-description test))
(license . ,(license-name gpl3+)) (license . ,(license-name gpl3+))
(period . ,(hours 48)) (period . ,(hours 48))
(max-silent-time . 600) (max-silent-time . 3600)
(timeout . 3600) (timeout . 3600)
(home-page . ,%guix-home-page-url) (home-page . ,%guix-home-page-url)
(maintainers . ("bug-guix@gnu.org"))))) (maintainers . ("bug-guix@gnu.org")))))
@ -412,8 +412,7 @@ all its dependencies, and ready to be installed on \"foreign\" distributions.")
(define job-name (define job-name
;; Return the name of a package's job. ;; Return the name of a package's job.
(compose string->symbol (compose string->symbol package-name))
(cut package-full-name <> "-")))
(define package->job (define package->job
(let ((base-packages (let ((base-packages

2
gnu/installer.scm
View file

@ -187,7 +187,7 @@ selected keymap."
(lambda (models layouts) (lambda (models layouts)
((installer-keymap-page current-installer) ((installer-keymap-page current-installer)
layouts '#$context))))) layouts '#$context)))))
(#$apply-keymap result) (and result (#$apply-keymap result))
result))) result)))
(define (installer-steps) (define (installer-steps)

21
gnu/installer/newt/keymap.scm
View file

@ -56,7 +56,7 @@ different layout at any time from the parameters menu.")))
(else (G_ "Exit"))) (else (G_ "Exit")))
#:button-callback-procedure #:button-callback-procedure
(case context (case context
((param) (const #t)) ((param) (const #f))
(else (else
(lambda _ (lambda _
(raise (raise
@ -183,7 +183,9 @@ options."
(compute (compute
(lambda (result _) (lambda (result _)
(let* ((layout (result-step result 'layout)) (let* ((layout (result-step result 'layout))
(variants (x11-keymap-layout-variants layout))) (variants (if layout
(x11-keymap-layout-variants layout)
'())))
;; Return #f if the layout does not have any variant. ;; Return #f if the layout does not have any variant.
(and (not (null? variants)) (and (not (null? variants))
(run-variant-page (run-variant-page
@ -196,16 +198,19 @@ options."
(gettext (x11-keymap-layout-description layout) (gettext (x11-keymap-layout-description layout)
"xkeyboard-config"))))))))))) "xkeyboard-config")))))))))))
(define (format-result result) (define (format-result layout variant)
(let ((layout (x11-keymap-layout-name (let ((layout (x11-keymap-layout-name layout))
(result-step result 'layout))) (variant (and=> variant
(variant (and=> (result-step result 'variant)
(lambda (variant) (lambda (variant)
(gettext (x11-keymap-variant-name variant) (gettext (x11-keymap-variant-name variant)
"xkeyboard-config"))))) "xkeyboard-config")))))
(toggleable-latin-layout layout variant))) (toggleable-latin-layout layout variant)))
(format-result
(run-installer-steps #:steps keymap-steps))) (let* ((result (run-installer-steps #:steps keymap-steps))
(layout (result-step result 'layout))
(variant (result-step result 'variant)))
(and layout
(format-result layout variant))))
(define (keyboard-layout->configuration keymap) (define (keyboard-layout->configuration keymap)
"Return the operating system configuration snippet to install KEYMAP." "Return the operating system configuration snippet to install KEYMAP."

7
gnu/installer/newt/services.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -34,9 +35,9 @@
environments." environments."
(let ((items (filter desktop-system-service? %system-services))) (let ((items (filter desktop-system-service? %system-services)))
(run-checkbox-tree-page (run-checkbox-tree-page
#:info-text (G_ "Please select the desktop(s) environment(s) you wish to \ #:info-text (G_ "Please select the desktop environment(s) you wish to \
install. If you select multiple desktops environments, you will be able to \ install. If you select multiple desktop environments here, you will be able \
choose the one to use on the log-in screen.") to choose from them later when you log in.")
#:title (G_ "Desktop environment") #:title (G_ "Desktop environment")
#:items items #:items items
#:selection (map system-service-recommended? items) #:selection (map system-service-recommended? items)

29
gnu/local.mk
View file

@ -7,17 +7,17 @@
# Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net> # Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
# Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org> # Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
# Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com> # Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2016, 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # Copyright © 2016, 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> # Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com> # Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
# Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> # Copyright © 2018, 2019, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
# Copyright © 2018, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> # Copyright © 2018, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
# Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net> # Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
@ -537,6 +537,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/task-management.scm \ %D%/packages/task-management.scm \
%D%/packages/tbb.scm \ %D%/packages/tbb.scm \
%D%/packages/tcl.scm \ %D%/packages/tcl.scm \
%D%/packages/telegram.scm \
%D%/packages/telephony.scm \ %D%/packages/telephony.scm \
%D%/packages/terminals.scm \ %D%/packages/terminals.scm \
%D%/packages/terraform.scm \ %D%/packages/terraform.scm \
@ -633,6 +634,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/sddm.scm \ %D%/services/sddm.scm \
%D%/services/spice.scm \ %D%/services/spice.scm \
%D%/services/ssh.scm \ %D%/services/ssh.scm \
%D%/services/syncthing.scm \
%D%/services/sysctl.scm \ %D%/services/sysctl.scm \
%D%/services/telephony.scm \ %D%/services/telephony.scm \
%D%/services/version-control.scm \ %D%/services/version-control.scm \
@ -684,6 +686,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests.scm \ %D%/tests.scm \
%D%/tests/audio.scm \ %D%/tests/audio.scm \
%D%/tests/base.scm \ %D%/tests/base.scm \
%D%/tests/cuirass.scm \
%D%/tests/cups.scm \ %D%/tests/cups.scm \
%D%/tests/databases.scm \ %D%/tests/databases.scm \
%D%/tests/desktop.scm \ %D%/tests/desktop.scm \
@ -823,9 +826,6 @@ dist_patch_DATA = \
%D%/packages/patches/audiofile-function-signature.patch \ %D%/packages/patches/audiofile-function-signature.patch \
%D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \
%D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avahi-localstatedir.patch \
%D%/packages/patches/avogadro-boost148.patch \
%D%/packages/patches/avogadro-eigen3-update.patch \
%D%/packages/patches/avogadro-python-eigen-lib.patch \
%D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \
%D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/awesome-reproducible-png.patch \
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
@ -918,6 +918,7 @@ dist_patch_DATA = \
%D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
%D%/packages/patches/c++-gsl-find-system-gtest.patch \
%D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \
%D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \
%D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \
@ -1000,6 +1001,7 @@ dist_patch_DATA = \
%D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/fplll-std-fenv.patch \ %D%/packages/patches/fplll-std-fenv.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
%D%/packages/patches/freebayes-devendor-deps.patch \
%D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
@ -1129,6 +1131,7 @@ dist_patch_DATA = \
%D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
%D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/gst-plugins-good-fix-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-2.2-skip-so-test.patch \ %D%/packages/patches/guile-2.2-skip-so-test.patch \
@ -1180,12 +1183,14 @@ dist_patch_DATA = \
%D%/packages/patches/icedtea-6-extend-hotspot-aarch64-support.patch \ %D%/packages/patches/icedtea-6-extend-hotspot-aarch64-support.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \
%D%/packages/patches/idris-disable-test.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.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-use-system-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/json-c-CVE-2020-12762.patch \ %D%/packages/patches/json-c-CVE-2020-12762.patch \
@ -1348,7 +1353,7 @@ dist_patch_DATA = \
%D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \
%D%/packages/patches/mediastreamer2-srtp2.patch \ %D%/packages/patches/mediastreamer2-srtp2.patch \
%D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/mesa-skip-tests.patch \
%D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/mescc-tools-boot.patch \
%D%/packages/patches/metabat-fix-compilation.patch \ %D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \
@ -1403,6 +1408,7 @@ dist_patch_DATA = \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \
%D%/packages/patches/nvi-db4.patch \ %D%/packages/patches/nvi-db4.patch \
%D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/obs-modules-location.patch \
%D%/packages/patches/ocaml-bitstring-fix-configure.patch \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \
%D%/packages/patches/ocaml-cairo2-caml_ba_array-fix.patch \ %D%/packages/patches/ocaml-cairo2-caml_ba_array-fix.patch \
%D%/packages/patches/ocaml-CVE-2015-8869.patch \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \
@ -1477,7 +1483,6 @@ dist_patch_DATA = \
%D%/packages/patches/pinball-missing-separators.patch \ %D%/packages/patches/pinball-missing-separators.patch \
%D%/packages/patches/pinball-src-deps.patch \ %D%/packages/patches/pinball-src-deps.patch \
%D%/packages/patches/pinball-system-ltdl.patch \ %D%/packages/patches/pinball-system-ltdl.patch \
%D%/packages/patches/pinentry-efl.patch \
%D%/packages/patches/pingus-boost-headers.patch \ %D%/packages/patches/pingus-boost-headers.patch \
%D%/packages/patches/pingus-sdl-libs-config.patch \ %D%/packages/patches/pingus-sdl-libs-config.patch \
%D%/packages/patches/pixman-CVE-2016-5296.patch \ %D%/packages/patches/pixman-CVE-2016-5296.patch \
@ -1488,7 +1493,6 @@ dist_patch_DATA = \
%D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2011-4620.patch \
%D%/packages/patches/plib-CVE-2012-4552.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \
%D%/packages/patches/plotutils-spline-test.patch \ %D%/packages/patches/plotutils-spline-test.patch \
%D%/packages/patches/podofo-cmake-3.12.patch \
%D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \
%D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/portmidi-modular-build.patch \
%D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \
@ -1533,6 +1537,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-flint-includes.patch \
%D%/packages/patches/python-libxml2-python39-compat.patch \ %D%/packages/patches/python-libxml2-python39-compat.patch \
%D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-libxml2-utf8.patch \
%D%/packages/patches/python-mediafile-wavpack.patch \
%D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \
%D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-testtools.patch \
@ -1577,7 +1582,7 @@ dist_patch_DATA = \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/renpy-use-system-fribidi.patch \ %D%/packages/patches/renpy-use-system-fribidi.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch \ %D%/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch \
%D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \
%D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \
@ -1664,8 +1669,10 @@ dist_patch_DATA = \
%D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/thefuck-test-environ.patch \
%D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \
%D%/packages/patches/tinyxml-use-stl.patch \ %D%/packages/patches/tinyxml-use-stl.patch \
%D%/packages/patches/tipp10-disable-downloader.patch \
%D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-fix-compiling.patch \
%D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \
%D%/packages/patches/tipp10-qt5.patch \
%D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transcode-ffmpeg.patch \
%D%/packages/patches/transmission-honor-localedir.patch \ %D%/packages/patches/transmission-honor-localedir.patch \
@ -1700,8 +1707,6 @@ dist_patch_DATA = \
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
%D%/packages/patches/vcflib-use-shared-libraries.patch \
%D%/packages/patches/vlc-qt-5.15.patch \
%D%/packages/patches/vigra-python-compat.patch \ %D%/packages/patches/vigra-python-compat.patch \
%D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \

127
gnu/packages/admin.scm
View file

@ -28,7 +28,7 @@
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -268,7 +268,8 @@ and provides a \"top-like\" mode (monitoring).")
"0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk")))) "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--localstatedir=/var"))) '(#:configure-flags '("--localstatedir=/var")
#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -298,7 +299,8 @@ interface and is based on GNU Guile.")
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("guile" ,guile-2.2))) ("guile" ,guile-2.2)))
(inputs (inputs
`(("guile" ,guile-2.2))))) `(("guile" ,guile-2.2)
("guile2.2-readline" ,guile2.2-readline)))))
(define-public guile3.0-shepherd (define-public guile3.0-shepherd
(deprecated-package "guile3.0-shepherd" shepherd)) (deprecated-package "guile3.0-shepherd" shepherd))
@ -308,10 +310,21 @@ interface and is based on GNU Guile.")
(inherit shepherd) (inherit shepherd)
(name "guile2.0-shepherd") (name "guile2.0-shepherd")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("help2man" ,help2man)
("pkg-config" ,pkg-config)
("guile" ,guile-2.0))) ("guile" ,guile-2.0)))
(inputs (inputs
`(("guile" ,guile-2.0))))) `(("guile" ,guile-2.0)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
;; (ice-9 threads) isn't available in guile-2.0
(substitute* "modules/shepherd.scm"
((".*\\(ice-9 threads\\).*") ""))
#t)))
,@(package-arguments shepherd)))))
(define-public cloud-utils (define-public cloud-utils
(package (package
@ -446,7 +459,7 @@ graphs and can export its output to different formats.")
(define-public facter (define-public facter
(package (package
(name "facter") (name "facter")
(version "4.0.47") (version "4.0.49")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -455,7 +468,7 @@ graphs and can export its output to different formats.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1zz5kk3ad1jj8y939369dfvjh7zqwpkcqzzad7yb6wp01rc5sf88")))) "0l7gic5ql5xiy5s6rb0j9ydyaal5bcxl10bx45khcgdr9zg16pb1"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -517,7 +530,7 @@ or via the @code{facter} Ruby library.")
(define-public htop (define-public htop
(package (package
(name "htop") (name "htop")
(version "3.0.4") (version "3.0.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -525,7 +538,7 @@ or via the @code{facter} Ruby library.")
(url "https://github.com/htop-dev/htop") (url "https://github.com/htop-dev/htop")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9")) (base32 "10lp6cbfvigzp6pq5nwj3s3l4vs7cv92krz2r08nwrz8vl6rqdzp"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -685,7 +698,10 @@ hostname.")
`(;; Assume System V `setpgrp (void)', which is the default on GNU `(;; Assume System V `setpgrp (void)', which is the default on GNU
;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.) ;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
#:configure-flags #:configure-flags
'("--with-libpam" "ac_cv_func_setpgrp_void=yes") '(,@(if (hurd-target?)
'()
'("--with-libpam"))
"ac_cv_func_setpgrp_void=yes")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -710,7 +726,10 @@ hostname.")
(for-each delete-file (find-files man "^groups\\.")) (for-each delete-file (find-files man "^groups\\."))
#t)))))) #t))))))
(inputs `(("linux-pam" ,linux-pam))) (inputs
`(,@(if (hurd-target?)
'()
`(("linux-pam" ,linux-pam)))))
(home-page "https://github.com/shadow-maint/shadow") (home-page "https://github.com/shadow-maint/shadow")
(synopsis "Authentication-related tools such as passwd, su, and login") (synopsis "Authentication-related tools such as passwd, su, and login")
(description (description
@ -1424,7 +1443,7 @@ system administrator.")
(define-public sudo (define-public sudo
(package (package
(name "sudo") (name "sudo")
(version "1.9.4p2") (version "1.9.5p2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1434,7 +1453,7 @@ system administrator.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3")) "0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1502,7 +1521,9 @@ system administrator.")
`(("groff" ,groff))) `(("groff" ,groff)))
(inputs (inputs
`(("coreutils" ,coreutils) `(("coreutils" ,coreutils)
("linux-pam" ,linux-pam) ,@(if (hurd-target?)
'()
`(("linux-pam" ,linux-pam)))
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://www.sudo.ws/") (home-page "https://www.sudo.ws/")
(synopsis "Run commands as root") (synopsis "Run commands as root")
@ -1518,7 +1539,7 @@ commands and their arguments.")
(define-public opendoas (define-public opendoas
(package (package
(name "opendoas") (name "opendoas")
(version "6.8") (version "6.8.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1527,7 +1548,7 @@ commands and their arguments.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb")))) "0gfcssm21vdfg6kcrcc7hz1h4jmhy2zv29rfqyrrj3a6r9b5ah8p"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1881,7 +1902,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica (define-public acpica
(package (package
(name "acpica") (name "acpica")
(version "20201217") (version "20210105")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1889,7 +1910,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06rdpfjmij5nni1x2wi1gnalhsza5yxq1viskjm9r11wmsjnxm2a")))) "1gi7qzfywg118g5nlqn5lawxk25pg2sz01gmbz40vvmikks4ri9r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("flex" ,flex) (native-inputs `(("flex" ,flex)
("bison" ,bison))) ("bison" ,bison)))
@ -2101,7 +2122,7 @@ track changes in important system configuration files.")
(define-public libcap-ng (define-public libcap-ng
(package (package
(name "libcap-ng") (name "libcap-ng")
(version "0.8") (version "0.8.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2109,7 +2130,7 @@ track changes in important system configuration files.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi")))) "1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2630,14 +2651,14 @@ done with the @code{auditctl} utility.")
(define-public nmap (define-public nmap
(package (package
(name "nmap") (name "nmap")
(version "7.91") (version "7.80")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://nmap.org/dist/nmap-" version (uri (string-append "https://nmap.org/dist/nmap-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q")) "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -2715,7 +2736,7 @@ advanced netcat implementation (ncat), a utility for comparing scan
results (ndiff), and a packet generation and response analysis tool (nping).") results (ndiff), and a packet generation and response analysis tool (nping).")
;; This package uses nmap's bundled versions of libdnet and liblinear, which ;; This package uses nmap's bundled versions of libdnet and liblinear, which
;; both use a 3-clause BSD license. ;; both use a 3-clause BSD license.
(license (list license:npsl license:bsd-3)))) (license (list license:nmap license:bsd-3))))
(define-public dstat (define-public dstat
(package (package
@ -3636,7 +3657,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.2.01-1") (version "3.2.02-2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3645,7 +3666,7 @@ Python loading in HPC environments.")
(commit version))) (commit version)))
(file-name (git-file-name real-name version)) (file-name (git-file-name real-name version))
(sha256 (sha256
(base32 "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65")))) (base32 "0fwx798v9kwiwkgbj97w6rjdanwf7ap65vvq1fqy7gd9x78xcxsq"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
`(("bash" ,bash-minimal) `(("bash" ,bash-minimal)
@ -4324,3 +4345,59 @@ This program allows you to view and manipulate this EEPROM list.")
(home-page "https://github.com/xobs/novena-eeprom/") (home-page "https://github.com/xobs/novena-eeprom/")
(supported-systems '("armhf-linux")) (supported-systems '("armhf-linux"))
(license license:bsd-3))) (license license:bsd-3)))
(define-public lrzsz
(package
(name "lrzsz")
(version "0.12.20")
(source (origin
(method url-fetch)
(uri (string-append "https://www.ohse.de/uwe/releases/lrzsz-"
version ".tar.gz"))
(sha256
(base32
"1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(setenv "CONFIG_SHELL" (which "bash"))
(invoke "./configure"
(string-append "--prefix="
(assoc-ref outputs "out"))))))))
(synopsis "Implementation of XMODEM/YMODEM/ZMODEM transfer protocols")
(description "This package provides programs that transfer files using
the XMODEM/YMODEM/ZMODEM file transfer protocols.")
(home-page "https://ohse.de/uwe/software/lrzsz.html")
(license license:gpl2+)))
(define-public nq
(package
(name "nq")
(version "0.3.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/leahneukirchen/nq")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)))
(arguments
`(#:make-flags (list (string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(synopsis "Unix command line queue utility")
(description
"@code{nq} can create very lightweight job queue systems which require no
setup, maintenance, supervision, or any long-running processes.")
(home-page "https://github.com/leahneukirchen/nq")
(license license:public-domain)))

21
gnu/packages/algebra.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
@ -327,8 +327,8 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
(version "1.0") (version "1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append ;; Git repo at <https://gitlab.inria.fr/cmh/cmh>.
"https://gforge.inria.fr/frs/download.php/33497/cmh-" (uri (string-append "http://www.multiprecision.org/downloads/cmh-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
@ -349,13 +349,12 @@ varieties, i.e. Jacobians of hyperelliptic curves.
It can also be used to compute theta constants at arbitrary It can also be used to compute theta constants at arbitrary
precision.") precision.")
(license license:gpl3+) (license license:gpl3+)
(home-page (home-page "http://www.multiprecision.org/cmh/home.html")))
"https://gitlab.inria.fr/cmh/cmh#cmh-computation-of-genus-2-class-polynomials")))
(define-public giac (define-public giac
(package (package
(name "giac") (name "giac")
(version "1.6.0-41") (version "1.6.0-47")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -367,7 +366,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/" "~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz")) "giac_" version ".tar.gz"))
(sha256 (sha256
(base32 "1z5b3jm6ffxk3yvdqzwn9icbna68brkrz5kspgacq823d03jfklc")))) (base32 "15sgsr8l6njp5spagbqclqkdy3x7ra23wi6wvpc8vzlbivy3v43k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
@ -674,9 +673,11 @@ geometry and singularity theory.")
(version "7.0.4") (version "7.0.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; Use the ‘Latest version’ link for a stable URI across releases. (uri
(uri (string-append "https://gforge.inria.fr/frs/download.php/" (let ((hash "00c4c691a1ef8605b65bdf794a71539d"))
"latestfile/160/ecm-" version ".tar.gz")) (string-append "https://gitlab.inria.fr/zimmerma/ecm/"
"uploads/" hash "/ecm-" version
".tar.gz")))
(sha256 (base32 (sha256 (base32
"0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc")))) "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc"))))
(build-system gnu-build-system) (build-system gnu-build-system)

33
gnu/packages/animation.scm
View file

@ -26,10 +26,12 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages dejagnu) #:use-module (gnu packages dejagnu)
@ -53,6 +55,37 @@
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages xiph)) #:use-module (gnu packages xiph))
(define-public rlottie
(package
(name "rlottie")
(version "0.2")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Samsung/rlottie.git")
(commit
(string-append "v" version))))
(file-name
(git-file-name name version))
(sha256
(base32 "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
(list
"-Dlog=true"
"-Dtest=true")))
(native-inputs
`(("googletest" ,googletest)
("pkg-config" ,pkg-config)))
(synopsis "Lottie Animation Library")
(description "Rlottie is a platform independent standalone c++ library for
rendering vector based animations and art in realtime.")
(home-page "https://github.com/Samsung/rlottie/")
(license license:expat)))
;; ETL, synfig, and Synfig Studio are updated in tandem. ;; ETL, synfig, and Synfig Studio are updated in tandem.
(define synfig-version "1.2.2") (define synfig-version "1.2.2")

4
gnu/packages/aspell.scm
View file

@ -476,14 +476,14 @@ under permissive licensing terms. See the 'Copyright' file."))))
(define-public ispell (define-public ispell
(package (package
(name "ispell") (name "ispell")
(version "3.4.01") (version "3.4.02")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-" (uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "103vscg4bc7x2q84y18x1l75k54yhkw8lpza3qh8xxhcz5b0w7jb")))) (base32 "0b6rqzqjdhwf323sf1dv8qzx5pxa5asz618922r59zjp65660yb6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f `(#:parallel-build? #f

35
gnu/packages/assembly.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com> ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2019 Andy Tai <atai@atai.org> ;;; Copyright © 2019 Andy Tai <atai@atai.org>
@ -27,6 +27,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages assembly) (define-module (gnu packages assembly)
#:use-module (guix build-system meson)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
@ -149,6 +150,38 @@ to the clients.")
(home-page "https://www.gnu.org/software/lightning/") (home-page "https://www.gnu.org/software/lightning/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public simde
(package
(name "simde")
(version "0.7.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/simd-everywhere/simde")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1xf5xfzkk9rj47cichgz5ni8xs9hbpz5p6fmxr4ij721ffd002k3"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix the version string
(substitute* "meson.build"
(("0.7.0-rc2") "0.7.0"))
#t))))
(build-system meson-build-system)
;; We really want this for the headers, and the tests require a bundled library.
(arguments '(#:configure-flags '("-Dtests=false")))
(synopsis "Implementations of SIMD instruction sets for foreign systems")
(description "The SIMDe header-only library provides fast, portable
implementations of SIMD intrinsics on hardware which doesn't natively support
them, such as calling SSE functions on ARM. There is no performance penalty if
the hardware supports the native implementation (e.g., SSE/AVX runs at full
speed on x86, NEON on ARM, etc.).")
(home-page "https://simd-everywhere.github.io/blog/")
(license license:expat)))
(define-public fasm (define-public fasm
(package (package
(name "fasm") (name "fasm")

307
gnu/packages/astronomy.scm
View file

@ -1,10 +1,11 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 by Amar Singh <nly@disroot.org> ;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -30,6 +31,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
@ -39,6 +41,7 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libusb)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages netpbm) #:use-module (gnu packages netpbm)
@ -51,6 +54,7 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public cfitsio (define-public cfitsio
@ -86,6 +90,29 @@ in FITS files.")
(license (license:non-copyleft "file://License.txt" (license (license:non-copyleft "file://License.txt"
"See License.txt in the distribution.")))) "See License.txt in the distribution."))))
(define-public eye
(package
(name "eye")
(version "1.4.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.astromatic.net/download/eye/"
"eye-" version ".tar.gz"))
(sha256
(base32 "092qhzcbrkcfidbx4bv9wz42w297n80jk7a6kwyi9a3fjfz81d7k"))))
(build-system gnu-build-system)
(home-page "https://www.astromatic.net/software/eye")
(synopsis "Small image feature detector using machine learning")
(description
"In EyE (Enhance Your Extraction) an artificial neural network connected to
pixels of a moving window (retina) is trained to associate these input stimuli
to the corresponding response in one or several output image(s). The resulting
filter can be loaded in SExtractor to operate complex, wildly non-linear filters
on astronomical images. Typical applications of EyE include adaptive filtering,
feature detection and cosmetic corrections.")
(license license:cecill)))
(define-public wcslib (define-public wcslib
(package (package
(name "wcslib") (name "wcslib")
@ -125,10 +152,30 @@ coordinate systems in a @dfn{FITS} (Flexible Image Transport System) image
header.") header.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public weightwatcher
(package
(name "weightwatcher")
(version "1.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.astromatic.net/download/weightwatcher/"
"weightwatcher-" version ".tar.gz"))
(sha256
(base32 "1zaqd8d9rpgcwjsp92q3lkfaa22i20gppb91dz34ym54swisjc2p"))))
(build-system gnu-build-system)
(home-page "https://www.astromatic.net/software/weightwatcher")
(synopsis "Weight-map/flag-map multiplexer and rasteriser")
(description
"Weightwatcher is a program hat combines weight-maps, flag-maps and
polygon data in order to produce control maps which can directly be used in
astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
(license license:gpl3+)))
(define-public gnuastro (define-public gnuastro
(package (package
(name "gnuastro") (name "gnuastro")
(version "0.13") (version "0.14")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -136,13 +183,15 @@ header.")
version ".tar.lz")) version ".tar.lz"))
(sha256 (sha256
(base32 (base32
"07di6zx2irc5q0zyymx2951ydzxdfjmzd3az5qnk67ncf3hknvj5")))) "1xp6n42qxv0x6yigi2w2l5k8006smv27lhrcssysgsvzbydghzg5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-static"))) '(#:configure-flags '("--disable-static")))
(inputs (inputs
`(("cfitsio" ,cfitsio) `(("cfitsio" ,cfitsio)
("curl" ,curl-minimal)
("gsl" ,gsl) ("gsl" ,gsl)
("libgit2" ,libgit2)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("wcslib" ,wcslib) ("wcslib" ,wcslib)
@ -156,6 +205,82 @@ header.")
programs for the manipulation and analysis of astronomical data.") programs for the manipulation and analysis of astronomical data.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public sextractor
(package
(name "sextractor")
(version "2.25.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/astromatic/sextractor")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0q69n3nyal57h3ik2xirwzrxzljrwy9ivwraxzv9566vi3n4z5mw"))))
(build-system gnu-build-system)
;; NOTE: (Sharlatan-20210124T103117+0000): Building with `atlas' is failing
;; due to missing shared library which required on configure phase. Switch
;; build to use `openblas' instead. It requires FFTW with single precision
;; `fftwf'.
(arguments
`(#:configure-flags
(list
"--enable-openblas"
(string-append
"--with-openblas-libdir=" (assoc-ref %build-inputs "openblas") "/lib")
(string-append
"--with-openblas-incdir=" (assoc-ref %build-inputs "openblas") "/include")
(string-append
"--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib")
(string-append
"--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include"))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(inputs
`(("openblas" ,openblas)
("fftw" ,fftwf)))
(home-page "http://www.astromatic.net/software/sextractor")
(synopsis "Extract catalogs of sources from astronomical images")
(description
"SExtractor is a program that builds a catalogue of objects from an
astronomical image. Although it is particularly oriented towards reduction of
large scale galaxy-survey data, it can perform reasonably well on moderately
crowded star fields.")
(license license:gpl3+)))
(define-public skymaker
(package
(name "skymaker")
(version "3.10.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.astromatic.net/download/skymaker/"
"skymaker-" version ".tar.gz"))
(sha256
(base32 "03zvx7c89plp9559niqv5532r233kza3ir992rg3nxjksqmrqvx1"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list
(string-append
"--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib")
(string-append
"--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include"))))
(inputs
`(("fftw" ,fftwf)))
(home-page "https://www.astromatic.net/software/skymaker")
(synopsis "Astronomical image simulator")
(description
"SkyMaker is a program that simulates astronomical images. It accepts
object lists in ASCII generated by the Stuff program to produce realistic
astronomical fields. SkyMaker is part of the EFIGI
(@url{https://www.astromatic.net/projects/efigi}) development project.")
(license license:gpl3+)))
(define-public stellarium (define-public stellarium
(package (package
(name "stellarium") (name "stellarium")
@ -203,6 +328,46 @@ can be used to control telescopes over a serial port for tracking celestial
objects.") objects.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public stuff
(package
(name "stuff")
(version "1.26.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.astromatic.net/download/stuff/"
"stuff-" version ".tar.gz"))
(sha256
(base32 "1syibi3b86z9pikhicvkkmgxm916j732fdiw0agw0lq6z13fdcjm"))))
(build-system gnu-build-system)
(home-page "https://www.astromatic.net/software/stuff")
(synopsis "Astronomical catalogue simulation")
(description
"Stuff is a program that simulates \"perfect\" astronomical catalogues.
It generates object lists in ASCII which can read by the SkyMaker program to
produce realistic astronomical fields. Stuff is part of the EFIGI development
project.")
(license license:gpl3+)))
(define-public swarp
(package
(name "swarp")
(version "2.38.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.astromatic.net/download/swarp/"
"swarp-" version ".tar.gz"))
(sha256
(base32 "1i670waqp54vin1cn08mqckcggm9zqd69nk7yya2vvqpdizn6jpm"))))
(build-system gnu-build-system)
(home-page "https://www.astromatic.net/software/swarp")
(synopsis "FITS image resampling and co-addition")
(description
"SWarp is a program that resamples and co-adds together FITS images using
any arbitrary astrometric projection defined in the WCS standard.")
(license license:gpl3+)))
(define-public celestia (define-public celestia
(let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce")) (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce"))
(package (package
@ -299,6 +464,82 @@ Mechanics, Astrometry and Astrodynamics library.")
(license (list license:lgpl2.0+ (license (list license:lgpl2.0+
license:gpl2+)))) ; examples/transforms.c & lntest/*.c license:gpl2+)))) ; examples/transforms.c & lntest/*.c
(define-public libpasastro
;; NOTE: (Sharlatan-20210122T215921+0000): the version tag has a build
;; error on spice which is resolved with the latest commit.
(let ((commit "e3c218d1502a18cae858c83a9a8812ab197fcb60")
(revision "1"))
(package
(name "libpasastro")
(version (git-version "1.4.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pchev/libpasastro")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0asp2sn34nds5va2ghppwc41vb6j3d1mf049j949rgrll817kx47"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
#:make-flags
(list
,(match (or (%current-target-system) (%current-system))
((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux")
"OS_TARGET=linux")
(_ #f))
,(match (or (%current-target-system) (%current-system))
("i686-linux" "CPU_TARGET=i386")
("x86_64-linux" "CPU_TARGET=x86_64")
((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l")
(_ #f))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(home-page "https://github.com/pchev/libpasastro")
(synopsis "Interface to astronomy library for use from Pascal program")
(description
"This package provides shared libraries to interface Pascal program with
standard astronomy libraries:
@itemize
@item @code{libpasgetdss.so}: Interface with GetDSS to work with DSS images.
@item @code{libpasplan404.so}: Interface with Plan404 to compute planets position.
@item @code{libpaswcs.so}: Interface with libwcs to work with FITS WCS.
@item @code{libpasspice.so}: To work with NAIF/SPICE kernel.
@end itemize\n")
(license license:gpl2+))))
(define-public missfits
(package
(name "missfits")
(version "2.8.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.astromatic.net/download/missfits/"
"missfits-" version ".tar.gz"))
(sha256
(base32 "04jrd7fsvzr14vdmwgj2f6v97gdcfyjyz6jppml3ghr9xh12jxv5"))))
(build-system gnu-build-system)
(home-page "https://www.astromatic.net/software/missfits")
(synopsis "FITS files Maintenance program")
(description
"MissFITS is a program that performs basic maintenance and packaging tasks
on FITS files:
@itemize
@item add/edit FITS header keywords
@item split/join Multi-Extension-FITS (MEF) files
@item unpack/pack FITS data-cubes
@item create/check/update FITS checksums, using R. Seaman's protocol
(see http://www.adass.org/adass/proceedings/adass94/seamanr.html)
@end itemize\n")
(license license:gpl3+)))
(define-public xplanet (define-public xplanet
(package (package
(name "xplanet") (name "xplanet")
@ -391,3 +632,63 @@ Gpredict can also predict the time of future passes for a satellite, and
provide you with detailed information about each pass.") provide you with detailed information about each pass.")
(home-page "http://gpredict.oz9aec.net/index.php") (home-page "http://gpredict.oz9aec.net/index.php")
(license license:gpl2+))) (license license:gpl2+)))
(define-public indi
(package
(name "indi")
(version "1.8.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/indilib/indi")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "19gm7rbnm3295g2i8mdzfslpz0vrcgfmbl59311qpszvlxbmyd2r"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(let ((out (assoc-ref %outputs "out")))
(list
"-DINDI_BUILD_UNITTESTS=ON"
"-DCMAKE_BUILD_TYPE=Release"
(string-append "-DCMAKE_INSTALL_PREFIX=" out)
(string-append "-DUDEVRULES_INSTALL_DIR=" out "/lib/udev/rules.d")))
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(chdir "test")
(invoke "ctest")
(chdir "..")
#t))
(add-before 'install 'set-install-directories
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/lib/udev/rules.d")))
#t)))))
(native-inputs
`(("googletest" ,googletest)))
(inputs
`(("cfitsio" ,cfitsio)
("curl" ,curl)
("fftw" ,fftw)
("gsl" ,gsl)
("libjpeg-turbo" ,libjpeg-turbo)
("libnova" ,libnova)
("libtiff" ,libtiff)
("libusb" ,libusb)
("zlib" ,zlib)))
(home-page "https://www.indilib.org")
(synopsis "Library for astronimical intrumentation control")
(description
"INDI (Instrument-Neutral Device Interface) is a distributed XML-based
control protocol designed to operate astronomical instrumentation. INDI is
small, flexible, easy to parse, scalable, and stateless. It supports common
DCS functions such as remote control, data acquisition, monitoring, and a lot
more.")
(license (list license:bsd-3
license:gpl2+
license:lgpl2.0+
license:lgpl2.1+))))

71
gnu/packages/audio.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
@ -4134,6 +4134,63 @@ the following features:
") ")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public lv2-speech-denoiser
(let ((commit "04cfba929630404f8d4f4ca5bac8d9b09a99152f")
(revision "1"))
(package
(name "lv2-speech-denoiser")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lucianodato/speech-denoiser/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.55
;; Using a "release" build is recommended for performance
#:build-type "release"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-meson-build
(lambda _
(substitute* "meson.build"
(("install_folder = 'sdenoise.lv2'")
"install_folder = 'lib/lv2/sdenoise.lv2'")
(("build/manifest.ttl") "../build/manifest.ttl"))
#t))
(add-after 'unpack 'build-rnnoise
(lambda _
(with-directory-excursion "rnnoise"
(let ((old-CFLAGS (getenv "CFLAGS")))
(setenv "CFLAGS" "-fvisibility=hidden -fPIC -Wl,--exclude-libs,ALL")
(setenv "CONFIG_SHELL" (which "bash"))
(invoke "autoreconf" "-vif")
(invoke "sh" "configure"
"--disable-examples"
"--disable-doc"
"--disable-shared"
"--enable-static")
(invoke "make")
(setenv "CFLAGS" old-CFLAGS))))))))
(inputs
`(("lv2" ,lv2)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/werman/noise-suppression-for-voice")
(synopsis "Speech denoise LV2 plugin based on Xiph's RNNoise library")
(description "RNNoise is a library that uses deep learning to apply
noise supression to audio sources with voice presence. This package provides
an LV2 audio plugin.")
(license license:lgpl3+))))
(define-public cli-visualizer (define-public cli-visualizer
(package (package
(name "cli-visualizer") (name "cli-visualizer")
@ -4772,11 +4829,13 @@ with the provided metadata and adhere to well-known best practices.")
(base32 (base32
"07xl3cmdaf7k9mm58m93cn8i1jvgimmiifdw1w7v2jl88nx60pm1")))) "07xl3cmdaf7k9mm58m93cn8i1jvgimmiifdw1w7v2jl88nx60pm1"))))
(build-system meson-build-system) (build-system meson-build-system)
(inputs
`(("cairo" ,cairo)
("libx11" ,libx11)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
;; These are listed as propagated inputs because they are dependencies
;; in pkgconfig.
(propagated-inputs
`(("cairo" ,cairo)
("libx11" ,libx11)))
(synopsis "GUI toolkit for LV2 plugins") (synopsis "GUI toolkit for LV2 plugins")
(description "ZToolkit (Ztk) is a cross-platform GUI toolkit heavily (description "ZToolkit (Ztk) is a cross-platform GUI toolkit heavily
inspired by GTK. It handles events and low level drawing on behalf of inspired by GTK. It handles events and low level drawing on behalf of
@ -4825,9 +4884,9 @@ edited, converted, compressed and saved.")
(name "ztoolkit-rsvg") (name "ztoolkit-rsvg")
(arguments (arguments
`(#:configure-flags `("-Denable_rsvg=true"))) `(#:configure-flags `("-Denable_rsvg=true")))
(inputs (propagated-inputs
`(("librsvg" ,librsvg) `(("librsvg" ,librsvg)
,@(package-inputs ztoolkit))) ,@(package-propagated-inputs ztoolkit)))
(synopsis "ZToolkit with SVG support"))) (synopsis "ZToolkit with SVG support")))
(define-public lsp-dsp-lib (define-public lsp-dsp-lib

9
gnu/packages/autotools.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -105,10 +105,11 @@ scripts are self-contained and portable, freeing the user from needing to
know anything about Autoconf or M4.") know anything about Autoconf or M4.")
(license gpl3+))) ; some files are under GPLv2+ (license gpl3+))) ; some files are under GPLv2+
(define-public autoconf-2.70 ;; This is the renaissance version, which is not widely supported yet.
(define-public autoconf-2.71
(package (package
(inherit autoconf-2.69) (inherit autoconf-2.69)
(version "2.70") (version "2.71")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -116,7 +117,7 @@ know anything about Autoconf or M4.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps")))) "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments autoconf-2.69) (substitute-keyword-arguments (package-arguments autoconf-2.69)
((#:tests? _ #f) ((#:tests? _ #f)

6
gnu/packages/backup.scm
View file

@ -1008,7 +1008,7 @@ is format-agnostic, so you can feed virtually any files to it.")
(define-public dump (define-public dump
(package (package
(name "dump") (name "dump")
(version "0.4b46") (version "0.4b47")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1016,7 +1016,7 @@ is format-agnostic, so you can feed virtually any files to it.")
version "/dump-" version ".tar.gz")) version "/dump-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0")))) "1l2gzzxyqhinx1yqvj4yn9k8vx3iyqi1965dxf9kvvdv9zgaq8fh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1026,7 +1026,7 @@ is format-agnostic, so you can feed virtually any files to it.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("openssl" ,openssl-1.0) `(("openssl" ,openssl)
("zlib" ,zlib) ("zlib" ,zlib)
("util-linux" ,util-linux "lib") ("util-linux" ,util-linux "lib")
("e2fsprogs" ,e2fsprogs))) ("e2fsprogs" ,e2fsprogs)))

626
gnu/packages/bioinformatics.scm
View file

@ -1,17 +1,17 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2015, 2016, 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2018, 2019, 2020, 2021 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
@ -57,6 +57,7 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix deprecation) #:use-module (guix deprecation)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages base) #:use-module (gnu packages base)
@ -142,6 +143,7 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public aragorn (define-public aragorn
@ -2770,6 +2772,86 @@ sequencing data. It uses paired-ends and split-reads to sensitively and
accurately delineate genomic rearrangements throughout the genome.") accurately delineate genomic rearrangements throughout the genome.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public trf
(package
(name "trf")
(version "4.09.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Benson-Genomics-Lab/TRF")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0fhwr4s1mf8nw8fr5imwjvjr42b59p97zr961ifm8xl1bajz4wpg"))))
(build-system gnu-build-system)
(home-page "https://github.com/Benson-Genomics-Lab/TRF")
(synopsis "Tandem Repeats Finder: a program to analyze DNA sequences")
(description "A tandem repeat in DNA is two or more adjacent, approximate
copies of a pattern of nucleotides. Tandem Repeats Finder is a program to
locate and display tandem repeats in DNA sequences. In order to use the
program, the user submits a sequence in FASTA format. The output consists of
two files: a repeat table file and an alignment file. Submitted sequences may
be of arbitrary length. Repeats with pattern size in the range from 1 to 2000
bases are detected.")
(license license:agpl3+)))
(define-public repeat-masker
(package
(name "repeat-masker")
(version "4.1.1")
(source (origin
(method url-fetch)
(uri (string-append "http://www.repeatmasker.org/"
"RepeatMasker/RepeatMasker-"
version ".tar.gz"))
(sha256
(base32 "03144sl9kh5ni2i33phi7x2pjndzbm5bjw3r4kqvmm6hxyb4k4x2"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #false ; there are none
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((share (string-append (assoc-ref outputs "out")
"/share/RepeatMasker")))
(mkdir-p share)
(copy-recursively "." share)
(with-directory-excursion share
(invoke "perl" "configure"
"--trf_prgm" (which "trf")
"--hmmer_dir"
(string-append (assoc-ref inputs "hmmer")
"/bin"))))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share/RepeatMasker"))
(bin (string-append out "/bin"))
(path (getenv "PERL5LIB")))
(install-file (string-append share "/RepeatMasker") bin)
(wrap-program (string-append bin "/RepeatMasker")
`("PERL5LIB" ":" prefix (,path ,share)))))))))
(inputs
`(("perl" ,perl)
("perl-text-soundex" ,perl-text-soundex)
("python" ,python)
("python-h5py" ,python-h5py)
("hmmer" ,hmmer)
("trf" ,trf)))
(home-page "https://github.com/Benson-Genomics-Lab/TRF")
(synopsis "Tandem Repeats Finder: a program to analyze DNA sequences")
(description "A tandem repeat in DNA is two or more adjacent, approximate
copies of a pattern of nucleotides. Tandem Repeats Finder is a program to
locate and display tandem repeats in DNA sequences. In order to use the
program, the user submits a sequence in FASTA format. The output consists of
two files: a repeat table file and an alignment file. Submitted sequences may
be of arbitrary length. Repeats with pattern size in the range from 1 to 2000
bases are detected.")
(license license:osl2.1)))
(define-public diamond (define-public diamond
(package (package
(name "diamond") (name "diamond")
@ -3508,61 +3590,60 @@ comment or quality sections.")
(define-public gemma (define-public gemma
(package (package
(name "gemma") (name "gemma")
(version "0.98") (version "0.98.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/xiangzhou/GEMMA") (url "https://github.com/genetics-statistics/GEMMA")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1s3ncnbn45r2hh1cvrqky1kbqq6546biypr4f5mkw1kqlrgyh0yg")))) "1p8a7kkfn1mmrg017aziy544aha8i9h6wd1x2dk3w2794wl33qb7"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "contrib")
#t))))
(build-system gnu-build-system)
(inputs (inputs
`(("eigen" ,eigen) `(("gsl" ,gsl)
("gfortran" ,gfortran "lib")
("gsl" ,gsl)
("lapack" ,lapack)
("openblas" ,openblas) ("openblas" ,openblas)
("zlib" ,zlib))) ("zlib" ,zlib)))
(build-system gnu-build-system) (native-inputs
`(("catch" ,catch-framework2-1)
("perl" ,perl)
("shunit2" ,shunit2)
("which" ,which)))
(arguments (arguments
`(#:make-flags `(#:phases
'(,@(match (%current-system)
("x86_64-linux"
'("FORCE_DYNAMIC=1"))
("i686-linux"
'("FORCE_DYNAMIC=1" "FORCE_32BIT=1"))
(_
'("FORCE_DYNAMIC=1" "NO_INTEL_COMPAT=1"))))
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'find-eigen (add-after 'unpack 'prepare-build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Ensure that Eigen headers can be found
(setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "eigen")
"/include/eigen3"))
#t))
(add-before 'build 'bin-mkdir
(lambda _
(mkdir-p "bin") (mkdir-p "bin")
(substitute* "Makefile"
(("/usr/local/opt/openblas")
(assoc-ref inputs "openblas")))
#t)) #t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; 'make slow-check' expects shunit2-2.0.3.
(with-directory-excursion "test"
(invoke "./test_suite.sh"))
#t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "bin/gemma" (install-file "bin/gemma"
(string-append (string-append (assoc-ref outputs "out") "/bin"))
out "/bin"))) #t)))))
#t))) (home-page "https://github.com/genetics-statistics/GEMMA")
#:tests? #f)) ; no tests included yet
(home-page "https://github.com/xiangzhou/GEMMA")
(synopsis "Tool for genome-wide efficient mixed model association") (synopsis "Tool for genome-wide efficient mixed model association")
(description (description
"Genome-wide Efficient Mixed Model Association (GEMMA) provides a "@acronym{GEMMA, Genome-wide Efficient Mixed Model Association} provides a
standard linear mixed model resolver with application in genome-wide standard linear mixed model resolver with application in @acronym{GWAS,
association studies (GWAS).") genome-wide association studies}.")
(license license:gpl3))) (license license:gpl3)))
(define-public grit (define-public grit
@ -4632,7 +4713,7 @@ sequencing tag position and orientation.")
(define-public mafft (define-public mafft
(package (package
(name "mafft") (name "mafft")
(version "7.471") (version "7.475")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -4641,7 +4722,7 @@ sequencing tag position and orientation.")
(file-name (string-append name "-" version ".tgz")) (file-name (string-append name "-" version ".tgz"))
(sha256 (sha256
(base32 (base32
"0r1973fx2scq4712zdqfy67wkzqj0c0bhrdy4jxhvq40mdxyry30")))) "0i2i2m3blh2xkbkdk48hxfssks30ny0v381gdl7zwhcvp0axs26r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no automated tests, though there are tests in the read me `(#:tests? #f ; no automated tests, though there are tests in the read me
@ -6999,6 +7080,55 @@ sequence.")
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(license license:bsd-3))) (license license:bsd-3)))
(define-public r-snapatac
(package
(name "r-snapatac")
(version "2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/r3fang/SnapATAC")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "037jzlbl436fi7lkpq7d83i2vd1crnrik3vac2x6xj75dbikb2av"))))
(properties `((upstream-name . "SnapATAC")))
(build-system r-build-system)
(propagated-inputs
`(("r-bigmemory" ,r-bigmemory)
("r-doparallel" ,r-doparallel)
("r-dosnow" ,r-dosnow)
("r-edger" ,r-edger)
("r-foreach" ,r-foreach)
("r-genomicranges" ,r-genomicranges)
("r-igraph" ,r-igraph)
("r-iranges" ,r-iranges)
("r-irlba" ,r-irlba)
("r-matrix" ,r-matrix)
("r-plyr" ,r-plyr)
("r-plot3d" ,r-plot3d)
("r-rann" ,r-rann)
("r-raster" ,r-raster)
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-rhdf5" ,r-rhdf5)
("r-rtsne" ,r-rtsne)
("r-scales" ,r-scales)
("r-viridis" ,r-viridis)))
(home-page "https://github.com/r3fang/SnapATAC")
(synopsis "Single nucleus analysis package for ATAC-Seq")
(description
"This package provides a fast and accurate analysis toolkit for single
cell ATAC-seq (Assay for transposase-accessible chromatin using sequencing).
Single cell ATAC-seq can resolve the heterogeneity of a complex tissue and
reveal cell-type specific regulatory landscapes. However, the exceeding data
sparsity has posed unique challenges for the data analysis. This package
@code{r-snapatac} is an end-to-end bioinformatics pipeline for analyzing large-
scale single cell ATAC-seq data which includes quality control, normalization,
clustering analysis, differential analysis, motif inference and exploration of
single cell ATAC-seq sequencing data.")
(license license:gpl3)))
(define-public r-scde (define-public r-scde
(package (package
(name "r-scde") (name "r-scde")
@ -7065,6 +7195,45 @@ between two different types of motif instances using as much relevant
information as possible.") information as possible.")
(license (list license:gpl2+ license:gpl3+)))) (license (list license:gpl2+ license:gpl3+))))
(define-public r-demultiplex
(let ((commit "6e2a1422c8e6f418cfb271997eebc91f9195f299")
(revision "1"))
(package
(name "r-demultiplex")
(version (git-version "1.0.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/chris-mcginnis-ucsf/MULTI-seq")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"01kv88wp8vdaq07sjk0d3d1cb553mq1xqg0war81pgmg63bgi38w"))))
(properties `((upstream-name . "deMULTIplex")))
(build-system r-build-system)
(propagated-inputs
`(("r-kernsmooth" ,r-kernsmooth)
("r-reshape2" ,r-reshape2)
("r-rtsne" ,r-rtsne)
("r-shortread" ,r-shortread)
("r-stringdist" ,r-stringdist)))
(home-page "https://github.com/chris-mcginnis-ucsf/MULTI-seq")
(synopsis "MULTI-seq pre-processing and classification tools")
(description
"deMULTIplex is an R package for analyzing single-cell RNA sequencing
data generated with the MULTI-seq sample multiplexing method. The package
includes software to
@enumerate
@item Convert raw MULTI-seq sample barcode library FASTQs into a sample
barcode UMI count matrix, and
@item Classify cell barcodes into sample barcode groups.
@end enumerate
")
(license license:cc0))))
(define-public r-genefilter (define-public r-genefilter
(package (package
(name "r-genefilter") (name "r-genefilter")
@ -7652,6 +7821,31 @@ BLAST, KEGG, GenBank, MEDLINE and GO.")
;; (LGPLv2.1+) and scripts in samples (which have GPL2 and GPL2+) ;; (LGPLv2.1+) and scripts in samples (which have GPL2 and GPL2+)
(license (list license:ruby license:lgpl2.1+ license:gpl2+ )))) (license (list license:ruby license:lgpl2.1+ license:gpl2+ ))))
(define-public bio-vcf
(package
(name "bio-vcf")
(version "0.9.5")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "bio-vcf" version))
(sha256
(base32
"1glw5pn9s8z13spxk6yyfqaz80n9lga67f33w35nkpq9dwi2vg6g"))))
(build-system ruby-build-system)
(native-inputs
`(("ruby-cucumber" ,ruby-cucumber)))
(synopsis "Smart VCF parser DSL")
(description
"Bio-vcf provides a @acronym{DSL, domain specific language} for processing
the VCF format. Record named fields can be queried with regular expressions.
Bio-vcf is a new generation VCF parser, filter and converter. Bio-vcf is not
only very fast for genome-wide (WGS) data, it also comes with a filtering,
evaluation and rewrite language and can output any type of textual data,
including VCF header and contents in RDF and JSON.")
(home-page "https://github.com/vcflib/bio-vcf")
(license license:expat)))
(define-public r-biocviews (define-public r-biocviews
(package (package
(name "r-biocviews") (name "r-biocviews")
@ -9312,8 +9506,9 @@ group or two ChIP groups run under different conditions.")
(delete 'configure) ; There is no configure phase. (delete 'configure) ; There is no configure phase.
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (let ((out (assoc-ref outputs "out")))
(install-file "filevercmp" bin) (install-file "filevercmp" (string-append out "/bin"))
(install-file "filevercmp.h" (string-append out "/include"))
#t)))))) #t))))))
(home-page "https://github.com/ekg/filevercmp") (home-page "https://github.com/ekg/filevercmp")
(synopsis "This program compares version strings") (synopsis "This program compares version strings")
@ -10440,41 +10635,20 @@ explore and perform basic analysis of single cell sequencing data coming from
droplet sequencing. It has been particularly tailored for Drop-seq.") droplet sequencing. It has been particularly tailored for Drop-seq.")
(license license:gpl3)))) (license license:gpl3))))
(define htslib-for-sambamba
(let ((commit "2f3c3ea7b301f9b45737a793c0b2dcf0240e5ee5"))
(package
(inherit htslib)
(name "htslib-for-sambamba")
(version (string-append "1.3.1-1." (string-take commit 9)))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lomereiter/htslib")
(commit commit)))
(file-name (string-append "htslib-" version "-checkout"))
(sha256
(base32
"0g38g8s3npr0gjm9fahlbhiskyfws9l5i0x1ml3rakzj7az5l9c9"))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
,@(package-native-inputs htslib))))))
(define-public sambamba (define-public sambamba
(package (package
(name "sambamba") (name "sambamba")
(version "0.7.1") (version "0.8.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/lomereiter/sambamba") (url "https://github.com/biod/sambamba")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"111h05b60pj8dxbidiamy4imc92x2962b3lmb7wgysl6lx064qis")))) "07dznzl6m8k7sw84jxw2kx6i3ymrapbmcmyh0fxz8wrybhw8fmwc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there is no test target `(#:tests? #f ; there is no test target
@ -10484,52 +10658,30 @@ droplet sequencing. It has been particularly tailored for Drop-seq.")
(delete 'configure) (delete 'configure)
(add-after 'unpack 'fix-ldc-version (add-after 'unpack 'fix-ldc-version
(lambda _ (lambda _
(substitute* "gen_ldc_version_info.py"
(("/usr/bin/env.*") (which "python3")))
(substitute* "Makefile" (substitute* "Makefile"
;; We use ldc2 instead of ldmd2 to compile sambamba. ;; We use ldc2 instead of ldmd2 to compile sambamba.
(("\\$\\(shell which ldmd2\\)") (which "ldc2"))) (("\\$\\(shell which ldmd2\\)") (which "ldc2")))
#t)) #t))
(add-after 'unpack 'place-biod-and-undead
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "biod") "BioD")
#t))
(add-after 'unpack 'unbundle-prerequisites (add-after 'unpack 'unbundle-prerequisites
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
(("htslib/libhts.a lz4/lib/liblz4.a") (("= lz4/lib/liblz4.a") "= -L-llz4")
"-L-lhts -L-llz4") (("ldc_version_info lz4-static") "ldc_version_info"))
((" lz4-static htslib-static") ""))
#t)) #t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(bin (string-append out "/bin")))
(mkdir-p bin) (mkdir-p bin)
(copy-file (string-append "bin/sambamba-" ,version) (copy-file (string-append "bin/sambamba-" ,version)
(string-append bin "/sambamba")) (string-append bin "/sambamba"))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("ldc" ,ldc) `(("python" ,python)))
("rdmd" ,rdmd)
("python" ,python)
("biod"
,(let ((commit "7969eb0a847b05874e83ffddead26e193ece8101"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/biod/BioD")
(commit commit)))
(file-name (string-append "biod-"
(string-take commit 9)
"-checkout"))
(sha256
(base32
"0mjxsmbmv0jxl3pq21p8j5r829d648if8q58ka50b2956lc6qkpm")))))))
(inputs (inputs
`(("lz4" ,lz4) `(("ldc" ,ldc)
("htslib" ,htslib-for-sambamba))) ("lz4" ,lz4)
(home-page "https://lomereiter.github.io/sambamba/") ("zlib" ,zlib)))
(home-page "https://github.com/biod/sambamba")
(synopsis "Tools for working with SAM/BAM data") (synopsis "Tools for working with SAM/BAM data")
(description "Sambamba is a high performance modern robust and (description "Sambamba is a high performance modern robust and
fast tool (and library), written in the D programming language, for fast tool (and library), written in the D programming language, for
@ -14773,10 +14925,14 @@ some of the details of opening and jumping in tabix-indexed files.")
(delete 'configure) ; There is no configure phase. (delete 'configure) ; There is no configure phase.
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(include (string-append out "/include")))
;; TODO: There are Python modules for these programs too. ;; TODO: There are Python modules for these programs too.
(install-file "multichoose" bin) (install-file "multichoose" bin)
(install-file "multipermute" bin)) (install-file "multipermute" bin)
(install-file "multichoose.h" include)
(install-file "multipermute.h" include))
#t))))) #t)))))
(home-page "https://github.com/ekg/multichoose") (home-page "https://github.com/ekg/multichoose")
(synopsis "Efficient loopless multiset combination generation algorithm") (synopsis "Efficient loopless multiset combination generation algorithm")
@ -14885,32 +15041,44 @@ library automatically handles index file generation and use.")
(define-public vcflib (define-public vcflib
(package (package
(name "vcflib") (name "vcflib")
(version "1.0.1") (version "1.0.2")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/vcflib/vcflib/releases/" (uri (git-reference
"download/v" version (url "https://github.com/vcflib/vcflib")
"/vcflib-" version "-src.tar.gz")) (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "14zzrg8hg8cq9cvq2wdvp21j7nmxxkjrbagw2apd2yqv2kyx42lm")) (base32 "1k1z3876kbzifj1sqfzsf3lgb4rw779hvkg6ryxbyq5bc2paj9kh"))
(patches (search-patches "vcflib-use-shared-libraries.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin '(begin
(substitute* "CMakeLists.txt"
((".*fastahack.*") "")
((".*smithwaterman.*") "")
(("(pkg_check_modules\\(TABIXPP)" text)
(string-append
"pkg_check_modules(FASTAHACK REQUIRED fastahack)\n"
"pkg_check_modules(SMITHWATERMAN REQUIRED smithwaterman)\n"
text))
(("\\$\\{TABIXPP_LIBRARIES\\}" text)
(string-append "${FASTAHACK_LIBRARIES} "
"${SMITHWATERMAN_LIBRARIES} "
text)))
(substitute* (find-files "." "\\.(h|c)(pp)?$") (substitute* (find-files "." "\\.(h|c)(pp)?$")
(("\"SmithWatermanGotoh.h\"") "<smithwaterman/SmithWatermanGotoh.h>") (("\"SmithWatermanGotoh.h\"") "<smithwaterman/SmithWatermanGotoh.h>")
(("\"convert.h\"") "<smithwaterman/convert.h>") (("\"convert.h\"") "<smithwaterman/convert.h>")
(("\"disorder.h\"") "<smithwaterman/disorder.h>") (("\"disorder.h\"") "<smithwaterman/disorder.h>")
(("\"tabix.hpp\"") "<tabix.hpp>") (("Fasta.h") "fastahack/Fasta.h"))
(("\"Fasta.h\"") "<fastahack/Fasta.h>"))
(for-each delete-file-recursively (for-each delete-file-recursively
'("fastahack" "filevercmp" "fsom" "googletest" "intervaltree" '("fastahack" "filevercmp" "fsom" "googletest" "intervaltree"
"libVCFH" "multichoose" "smithwaterman" "tabixpp")) "libVCFH" "multichoose" "smithwaterman"))
#t)))) #t))))
(build-system gnu-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("htslib" ,htslib) `(("bzip2" ,bzip2)
("htslib" ,htslib)
("fastahack" ,fastahack) ("fastahack" ,fastahack)
("perl" ,perl) ("perl" ,perl)
("python" ,python) ("python" ,python)
@ -14923,22 +15091,20 @@ library automatically handles index file generation and use.")
;; Submodules. ;; Submodules.
;; This package builds against the .o files so we need to extract the source. ;; This package builds against the .o files so we need to extract the source.
("filevercmp-src" ,(package-source filevercmp)) ("filevercmp-src" ,(package-source filevercmp))
("fsom-src" ,(package-source fsom))
("intervaltree-src" ,(package-source intervaltree)) ("intervaltree-src" ,(package-source intervaltree))
("multichoose-src" ,(package-source multichoose)))) ("multichoose-src" ,(package-source multichoose))))
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'set-flags (add-after 'unpack 'build-shared-library
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(substitute* "Makefile" (substitute* "CMakeLists.txt"
(("LDFLAGS =") (("vcflib STATIC") "vcflib SHARED"))
(string-append "LDFLAGS = -Wl,-rpath=" (substitute* "test/Makefile"
(assoc-ref outputs "out") "/lib "))) (("libvcflib.a") "libvcflib.so"))
(substitute* "filevercmp/Makefile"
(("-c") "-c -fPIC"))
#t)) #t))
(delete 'configure)
(add-after 'unpack 'unpack-submodule-sources (add-after 'unpack 'unpack-submodule-sources
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((unpack (lambda (source target) (let ((unpack (lambda (source target)
@ -14951,39 +15117,31 @@ library automatically handles index file generation and use.")
"--strip-components=1")))))) "--strip-components=1"))))))
(and (and
(unpack "filevercmp-src" "filevercmp") (unpack "filevercmp-src" "filevercmp")
(unpack "fsom-src" "fsom")
(unpack "intervaltree-src" "intervaltree") (unpack "intervaltree-src" "intervaltree")
(unpack "multichoose-src" "multichoose"))))) (unpack "multichoose-src" "multichoose"))
(replace 'install #t)))
;; This pkg-config file is provided by other distributions.
(add-after 'install 'install-pkg-config-file
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (pkgconfig (string-append out "/lib/pkgconfig")))
(lib (string-append out "/lib"))) (mkdir-p pkgconfig)
(for-each (lambda (file) (with-output-to-file (string-append pkgconfig "/vcflib.pc")
(install-file file bin))
(find-files "bin" ".*"))
(install-file "libvcflib.so" lib)
(install-file "libvcflib.a" lib)
(for-each
(lambda (file)
(install-file file (string-append out "/include")))
(find-files "include" "\\.h(pp)?$"))
(mkdir-p (string-append lib "/pkgconfig"))
(with-output-to-file (string-append lib "/pkgconfig/vcflib.pc")
(lambda _ (lambda _
(format #t "prefix=~a~@ (format #t "prefix=~a~@
exec_prefix=${prefix}~@ exec_prefix=${prefix}~@
libdir=${exec_prefix}/lib~@ libdir=${exec_prefix}/lib~@
includedir=${prefix}/include~@ includedir=${prefix}/include~@
~@ ~@
~@ Name: vcflib~@
Name: libvcflib~@
Version: ~a~@ Version: ~a~@
Requires: smithwaterman, fastahack~@ Requires: smithwaterman, fastahack, tabixpp~@
Description: C++ library for parsing and manipulating VCF files~@ Description: C++ library for parsing and manipulating VCF files~@
Libs: -L${libdir} -lvcflib~@ Libs: -L${libdir} -lvcflib~@
Cflags: -I${includedir}~%" Cflags: -I${includedir}~%"
out ,version)))) out ,version)))
#t))))) #t))))))
(home-page "https://github.com/vcflib/vcflib/") (home-page "https://github.com/vcflib/vcflib/")
(synopsis "Library for parsing and manipulating VCF files") (synopsis "Library for parsing and manipulating VCF files")
(description "Vcflib provides methods to manipulate and interpret (description "Vcflib provides methods to manipulate and interpret
@ -14994,44 +15152,41 @@ manipulations on VCF files.")
(license license:expat))) (license license:expat)))
(define-public freebayes (define-public freebayes
(let ((commit "3ce827d8ebf89bb3bdc097ee0fe7f46f9f30d5fb")
(revision "1")
(version "1.0.2"))
(package (package
(name "freebayes") (name "freebayes")
(version (git-version version revision commit)) (version "1.3.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ekg/freebayes") (url "https://github.com/freebayes/freebayes")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1sbzwmcbn78ybymjnhwk7qc5r912azy5vqz2y7y81616yc3ba2a2")))) (base32 "0myz3giad7jqp6ricdfnig9ymlcps2h67mlivadvx97ngagm85z8"))
(build-system gnu-build-system) (patches (search-patches "freebayes-devendor-deps.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "contrib/htslib")
#t))))
(build-system meson-build-system)
(inputs (inputs
`(("bamtools" ,bamtools) `(("fastahack" ,fastahack)
("htslib" ,htslib) ("htslib" ,htslib)
("smithwaterman" ,smithwaterman)
("tabixpp" ,tabixpp)
("vcflib" ,vcflib)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("bc" ,bc) ; Needed for running tests. `(("bash-tap" ,bash-tap)
("samtools" ,samtools) ; Needed for running tests. ("bc" ,bc)
("parallel" ,parallel) ; Needed for running tests. ("grep" ,grep) ; Built with perl support.
("perl" ,perl) ; Needed for running tests. ("parallel" ,parallel)
("procps" ,procps) ; Needed for running tests. ("perl" ,perl)
("python" ,python-2) ; Needed for running tests. ("pkg-config" ,pkg-config)
("vcflib-src" ,(package-source vcflib)) ("samtools" ,samtools)
;; These are submodules for the vcflib version used in freebayes. ("simde" ,simde)
;; This package builds against the .o files so we need to extract the source. ;; This submodule is needed to run the tests.
("tabixpp-src" ,(package-source tabixpp))
("smithwaterman-src" ,(package-source smithwaterman))
("multichoose-src" ,(package-source multichoose))
("fsom-src" ,(package-source fsom))
("filevercmp-src" ,(package-source filevercmp))
("fastahack-src" ,(package-source fastahack))
("intervaltree-src" ,(package-source intervaltree))
;; These submodules are needed to run the tests.
("bash-tap-src" ,(package-source bash-tap))
("test-simple-bash-src" ("test-simple-bash-src"
,(origin ,(origin
(method git-fetch) (method git-fetch)
@ -15042,77 +15197,49 @@ manipulations on VCF files.")
(sha256 (sha256
(base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga")))))) (base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga"))))))
(arguments (arguments
`(#:make-flags `(#:phases
(list "CC=gcc"
(string-append "BAMTOOLS_ROOT="
(assoc-ref %build-inputs "bamtools")))
#:test-target "test"
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (add-after 'unpack 'patch-source
(add-after 'unpack 'fix-tests (lambda* (#:key inputs #:allow-other-keys)
(lambda _ (let ((bash-tap (assoc-ref inputs "bash-tap")))
(substitute* "test/t/01_call_variants.t" (substitute* (find-files "test/t")
(("grep -P \"\\(\\\\t500\\$\\|\\\\t11000\\$\\|\\\\t1000\\$\\)\"") (("BASH_TAP_ROOT=bash-tap")
"grep -E ' (500|11000|1000)$'")) (string-append "BASH_TAP_ROOT=" bash-tap "/bin"))
#t)) (("bash-tap/bash-tap-bootstrap")
(string-append bash-tap "/bin/bash-tap-bootstrap"))
(("source.*bash-tap-bootstrap")
(string-append "source " bash-tap "/bin/bash-tap-bootstrap")))
(substitute* "meson.build"
;; Some inputs aren't actually needed.
((".*bamtools/src.*") "")
((".*multichoose.*") ""))
(substitute* '("src/BedReader.cpp"
"src/BedReader.h")
(("../intervaltree/IntervalTree.h") "IntervalTree.h"))
#t)))
(add-after 'unpack 'unpack-submodule-sources (add-after 'unpack 'unpack-submodule-sources
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((unpack (lambda (source target) (mkdir-p "test/test-simple-bash")
(with-directory-excursion target (copy-recursively (assoc-ref inputs "test-simple-bash-src")
(if (file-is-directory? (assoc-ref inputs source)) "test/test-simple-bash")
(copy-recursively (assoc-ref inputs source) ".")
(invoke "tar" "xvf"
(assoc-ref inputs source)
"--strip-components=1"))))))
(and
(unpack "vcflib-src" "vcflib")
(unpack "fastahack-src" "vcflib/fastahack")
(unpack "filevercmp-src" "vcflib/filevercmp")
(unpack "fsom-src" "vcflib/fsom")
(unpack "intervaltree-src" "vcflib/intervaltree")
(unpack "multichoose-src" "vcflib/multichoose")
(unpack "smithwaterman-src" "vcflib/smithwaterman")
(unpack "tabixpp-src" "vcflib/tabixpp")
(unpack "test-simple-bash-src" "test/test-simple-bash")
(unpack "bash-tap-src" "test/bash-tap")))))
(add-after 'unpack-submodule-sources 'fix-makefiles
(lambda _
;; We don't have the .git folder to get the version tag from.
(substitute* "vcflib/Makefile"
(("^GIT_VERSION.*")
(string-append "GIT_VERSION = v" ,version)))
(substitute* "src/Makefile"
(("-I\\$\\(BAMTOOLS_ROOT\\)/src")
"-I$(BAMTOOLS_ROOT)/include/bamtools"))
#t)) #t))
(add-before 'build 'build-tabixpp-and-vcflib ;; The slow tests take longer than the specified timeout.
(lambda* (#:key inputs make-flags #:allow-other-keys) ,@(if (any (cute string=? <> (%current-system))
(with-directory-excursion "vcflib" '("armhf-linux" "aarch64-linux"))
(with-directory-excursion "tabixpp" '((replace 'check
(apply invoke "make" (lambda* (#:key tests? #:allow-other-keys)
(string-append "HTS_LIB=" (when tests?
(assoc-ref inputs "htslib") (invoke "meson" "test" "--timeout-multiplier" "5"))
"/lib/libhts.a") #t)))
make-flags)) '()))))
(apply invoke "make" (home-page "https://github.com/freebayes/freebayes")
(string-append "CFLAGS=-Itabixpp")
"all"
make-flags))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "bin/freebayes" bin)
(install-file "bin/bamleftalign" bin))
#t)))))
(home-page "https://github.com/ekg/freebayes")
(synopsis "Haplotype-based variant detector") (synopsis "Haplotype-based variant detector")
(description "FreeBayes is a Bayesian genetic variant detector designed to (description "FreeBayes is a Bayesian genetic variant detector designed to
find small polymorphisms, specifically SNPs (single-nucleotide polymorphisms), find small polymorphisms, specifically SNPs (single-nucleotide polymorphisms),
indels (insertions and deletions), MNPs (multi-nucleotide polymorphisms), and indels (insertions and deletions), MNPs (multi-nucleotide polymorphisms), and
complex events (composite insertion and substitution events) smaller than the complex events (composite insertion and substitution events) smaller than the
length of a short-read sequencing alignment.") length of a short-read sequencing alignment.")
(license license:expat)))) (license license:expat)))
(define-public samblaster (define-public samblaster
(package (package
@ -15398,44 +15525,3 @@ biological processes. SBML is useful for models of metabolism, cell
signaling, and more. It continues to be evolved and expanded by an signaling, and more. It continues to be evolved and expanded by an
international community.") international community.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public grocsvs
;; The last release is out of date and new features have been added.
(let ((commit "ecd956a65093a0b2c41849050e4512d46fecea5d")
(revision "1"))
(package
(name "grocsvs")
(version (git-version "0.2.6.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/grocsvs/grocsvs")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "14505725gr7qxc17cxxf0k6lzcwmgi64pija4mwf29aw70qn35cc"))
(patches (search-patches "grocsvs-dont-use-admiral.patch"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; No test suite.
#:python ,python-2)) ; Only python-2 supported.
(inputs
`(("python2-h5py" ,python2-h5py)
("python2-ipython-cluster-helper" ,python2-ipython-cluster-helper)
("python2-networkx" ,python2-networkx)
("python2-psutil" ,python2-psutil)
("python2-pandas" ,python2-pandas)
("python2-pybedtools" ,python2-pybedtools)
("python2-pyfaidx" ,python2-pyfaidx)
("python2-pygraphviz" ,python2-pygraphviz)
("python2-pysam" ,python2-pysam)
("python2-scipy" ,python2-scipy)))
(home-page "https://github.com/grocsvs/grocsvs")
(synopsis "Genome-wide reconstruction of complex structural variants")
(description
"@dfn{Genome-wide Reconstruction of Complex Structural Variants}
(GROC-SVs) is a software pipeline for identifying large-scale structural
variants, performing sequence assembly at the breakpoints, and reconstructing
the complex structural variants using the long-fragment information from the
10x Genomics platform.")
(license license:expat))))

125
gnu/packages/bootloaders.scm
View file

@ -7,12 +7,14 @@
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 nee <nee@cock.li> ;;; Copyright © 2019 nee <nee@cock.li>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1095,3 +1097,124 @@ systems so that they can be added to the bootloader. It also works out how to
boot existing GNU/Linux systems and detects what distribution is installed in boot existing GNU/Linux systems and detects what distribution is installed in
order to add a suitable bootloader menu entry.") order to add a suitable bootloader menu entry.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public ipxe
;; XXX: 'BUILD_TIMESTAMP' is used to automatically select the newest version
;; of iPXE if multiple iPXE drivers are loaded concurrently in a UEFI system.
;;
;; TODO: Bump this timestamp at each modifications of the package (not only
;; for updates) by running: date +%s.
(let ((timestamp "1591706427"))
(package
(name "ipxe")
(version "1.21.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ipxe/ipxe")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(patches (search-patches "ipxe-reproducible-geniso.patch"))
(sha256
(base32
"1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build utils)
(guix build gnu-build-system)
(guix base32)
(ice-9 string-fun)
(ice-9 regex)
(rnrs bytevectors))
#:imported-modules ((guix base32)
,@%gnu-build-system-modules)
#:make-flags
;; XXX: 'BUILD_ID' is used to determine when another ROM in the
;; system contains identical code in order to save space within the
;; legacy BIOS option ROM area, which is extremely limited in size.
;; It is supposed to be collision-free across all ROMs, to do so we
;; use the truncated output hash of the package.
(let ((build-id
(lambda (out)
(let* ((nix-store (string-append
(or (getenv "NIX_STORE") "/gnu/store")
"/"))
(filename
(string-replace-substring out nix-store ""))
(hash (match:substring (string-match "[0-9a-z]{32}"
filename)))
(bv (nix-base32-string->bytevector hash)))
(format #f "0x~x"
(bytevector-u32-ref bv 0 (endianness big))))))
(out (assoc-ref %outputs "out"))
(syslinux (assoc-ref %build-inputs "syslinux")))
(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.
(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 out))
(string-append "BUILD_TIMESTAMP=" ,timestamp)
"everything"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-source-directory
(lambda _ (chdir "src") #t))
(add-after 'enter-source-directory 'set-options
(lambda _
(substitute* "config/general.h"
(("^//(#define PING_CMD.*)" _ uncommented) uncommented)
(("^//(#define IMAGE_TRUST_CMD.*)" _ uncommented)
uncommented)
(("^#undef.*(DOWNLOAD_PROTO_HTTPS.*)" _ option)
(string-append "#define " option))
(("^#undef.*(DOWNLOAD_PROTO_NFS.*)" _ option)
(string-append "#define " option)))
#t))
(delete 'configure) ; no configure script
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(ipxe (string-append out "/lib/ipxe"))
(exts-re
"\\.(efi|efirom|iso|kkpxe|kpxe|lkrn|mrom|pxe|rom|usb)$")
(dirs '("bin" "bin-i386-linux" "bin-x86_64-pcbios"
"bin-x86_64-efi" "bin-x86_64-linux" "bin-i386-efi"))
(files (apply append
(map (lambda (dir)
(find-files dir exts-re)) dirs))))
(for-each (lambda (file)
(let* ((subdir (dirname file))
(fn (basename file))
(tgtsubdir (cond
((string=? "bin" subdir) "")
((string-prefix? "bin-" subdir)
(string-drop subdir 4)))))
(install-file file
(string-append ipxe "/" tgtsubdir))))
files))
#t))
(add-after 'install 'leave-source-directory
(lambda _ (chdir "..") #t)))
#:tests? #f)) ; no test suite
(native-inputs
`(("perl" ,perl)
("syslinux" ,syslinux)
("xorriso" ,xorriso)))
(home-page "https://ipxe.org")
(synopsis "PXE-compliant network boot firmware")
(description "iPXE is a network boot firmware. It provides a full PXE
implementation enhanced with additional features such as booting from: a web
server via HTTP, an iSCSI SAN, a Fibre Channel SAN via FCoE, an AoE SAN, a
wireless network, a wide-area network, an Infiniband network. It allows to
control the boot process with a script. You can use iPXE to replace the
existing PXE ROM on your network card, or you can chainload into iPXE to obtain
the features of iPXE without the hassle of reflashing.")
(license license:gpl2+))))

10
gnu/packages/browser-extensions.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -49,7 +49,7 @@ supported content to the Kodi media center.")
(make-chromium-extension play-to-kodi)) (make-chromium-extension play-to-kodi))
(define uassets (define uassets
(let ((commit "8e79f25fceb7c27960753de6f4d21491257741ab")) (let ((commit "a5b1e3cae3e63435caa03940eff549133e524970"))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -58,12 +58,12 @@ supported content to the Kodi media center.")
(file-name (git-file-name "uAssets" (string-take commit 9))) (file-name (git-file-name "uAssets" (string-take commit 9)))
(sha256 (sha256
(base32 (base32
"19ymyv6qpmmyw4lnpx6adm6mzf8ygfj0c9ljw24wl239v9vzn46w"))))) "1qjq9x6qb07x4iyha3zzwjcgr0p54c2pdadvcp2kj7h34vjlpksj")))))
(define ublock-origin (define ublock-origin
(package (package
(name "ublock-origin") (name "ublock-origin")
(version "1.32.4") (version "1.33.0")
(home-page "https://github.com/gorhill/uBlock") (home-page "https://github.com/gorhill/uBlock")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -71,7 +71,7 @@ supported content to the Kodi media center.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0v5phzsrav1z0gd7rirmsy7k500xhibw73ffk61754hkqd0l635v")))) "1indr8p4imljgc1d5vyn48cbpzy9ygqmkk4q07czlrhcrz7hb4nx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium")) (outputs '("xpi" "firefox" "chromium"))
(arguments (arguments

6
gnu/packages/busybox.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,7 +33,7 @@
(define-public busybox (define-public busybox
(package (package
(name "busybox") (name "busybox")
(version "1.32.0") (version "1.32.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -41,7 +41,7 @@
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"12g63zsvzfz04wbyga8riyl8ils05riw4xf26cyiaasbs3qqfpf3")))) "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

90
gnu/packages/check.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
@ -289,6 +289,55 @@ unit testing. Test output is in XML for automatic testing and GUI based for
supervised tests.") supervised tests.")
(license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball
(define-public shunit2
(package
(name "shunit2")
(version "2.1.8")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kward/shunit2")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"08vs0jjl3pfh100sjlw31x4638xj7fghr0j2g1zfikba8n1f9491"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(delete 'build)
(add-after 'patch-source-shebangs 'patch-more-shebangs
(lambda _
(substitute* "shunit2"
(("#! /bin/sh") (string-append "#! " (which "sh")))
(("/usr/bin/od") (which "od")))
(substitute* "test_runner"
(("/bin/sh") (which "sh"))
(("/bin/bash") (which "bash")))
#t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; This test is buggy in the build container.
(delete-file "shunit2_misc_test.sh")
(invoke "sh" "test_runner"))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "shunit2"
(string-append (assoc-ref outputs "out")
"/bin"))
#t)))))
(home-page "https://github.com/kward/shunit2")
(synopsis "@code{xUnit} based unit testing for Unix shell scripts")
(description "@code{shUnit2} was originally developed to provide a
consistent testing solution for @code{log4sh}, a shell based logging framework
similar to @code{log4j}. It is designed to work in a similar manner to JUnit,
PyUnit and others.")
(license license:asl2.0)))
;; When dependent packages upgraded to use newer version of catch, this one should ;; When dependent packages upgraded to use newer version of catch, this one should
;; be removed. ;; be removed.
(define-public catch-framework (define-public catch-framework
@ -1316,9 +1365,6 @@ subprocess and see the output as well as any file modifications.")
"This package is only for bootstrapping. Do not use this.") "This package is only for bootstrapping. Do not use this.")
(license license:psfl))) (license license:psfl)))
(define-public python2-testtools-bootstrap
(package-with-python2 python-testtools-bootstrap))
(define-public python-testtools (define-public python-testtools
(package (package
(inherit python-testtools-bootstrap) (inherit python-testtools-bootstrap)
@ -1344,9 +1390,6 @@ subprocess and see the output as well as any file modifications.")
provide matchers, more debugging information, and cross-Python provide matchers, more debugging information, and cross-Python
compatibility."))) compatibility.")))
(define-public python2-testtools
(package-with-python2 python-testtools))
(define-public python-testscenarios-bootstrap (define-public python-testscenarios-bootstrap
(package (package
(name "python-testscenarios-bootstrap") (name "python-testscenarios-bootstrap")
@ -1374,9 +1417,6 @@ compatibility.")))
"This package is only for bootstrapping. Don't use this.") "This package is only for bootstrapping. Don't use this.")
(license (list license:bsd-3 license:asl2.0)))) ; at the user's option (license (list license:bsd-3 license:asl2.0)))) ; at the user's option
(define-public python2-testscenarios-bootstrap
(package-with-python2 python-testscenarios-bootstrap))
(define-public python-testscenarios (define-public python-testscenarios
(package (package
(inherit python-testscenarios-bootstrap) (inherit python-testscenarios-bootstrap)
@ -1388,9 +1428,6 @@ compatibility.")))
"Testscenarios provides clean dependency injection for Python unittest "Testscenarios provides clean dependency injection for Python unittest
style tests."))) style tests.")))
(define-public python2-testscenarios
(package-with-python2 python-testscenarios))
;; Testresources requires python-pbr at runtime, but pbr needs it for its ;; Testresources requires python-pbr at runtime, but pbr needs it for its
;; own tests. Hence this bootstrap variant. ;; own tests. Hence this bootstrap variant.
(define-public python-testresources-bootstrap (define-public python-testresources-bootstrap
@ -1415,9 +1452,6 @@ style tests.")))
testresources package instead.") testresources package instead.")
(license (list license:bsd-3 license:asl2.0)))) ; at the user's option (license (list license:bsd-3 license:asl2.0)))) ; at the user's option
(define-public python2-testresources-bootstrap
(package-with-python2 python-testresources-bootstrap))
(define-public python-testresources (define-public python-testresources
(package (package
(inherit python-testresources-bootstrap) (inherit python-testresources-bootstrap)
@ -1432,9 +1466,6 @@ testresources package instead.")
"Testresources is an extension to Python's unittest to allow declarative "Testresources is an extension to Python's unittest to allow declarative
use of resources by test cases."))) use of resources by test cases.")))
(define-public python2-testresources
(package-with-python2 python-testresources))
(define-public python-subunit-bootstrap (define-public python-subunit-bootstrap
(package (package
(name "python-subunit-bootstrap") (name "python-subunit-bootstrap")
@ -1461,9 +1492,6 @@ use of resources by test cases.")))
python-subunit package instead.") python-subunit package instead.")
(license (list license:bsd-3 license:asl2.0)))) ; at the user's option (license (list license:bsd-3 license:asl2.0)))) ; at the user's option
(define-public python2-subunit-bootstrap
(package-with-python2 python-subunit-bootstrap))
(define-public python-subunit (define-public python-subunit
(package (package
(inherit python-subunit-bootstrap) (inherit python-subunit-bootstrap)
@ -1479,9 +1507,6 @@ python-subunit package instead.")
"Python-subunit is a Python implementation of the subunit test streaming "Python-subunit is a Python implementation of the subunit test streaming
protocol."))) protocol.")))
(define-public python2-subunit
(package-with-python2 python-subunit))
;; Fixtures requires python-pbr at runtime, but pbr uses fixtures for its ;; Fixtures requires python-pbr at runtime, but pbr uses fixtures for its
;; own tests. Hence this bootstrap variant. ;; own tests. Hence this bootstrap variant.
(define-public python-fixtures-bootstrap (define-public python-fixtures-bootstrap
@ -1511,9 +1536,6 @@ protocol.")))
python-fixtures package instead.") python-fixtures package instead.")
(license (list license:bsd-3 license:asl2.0)))) ; at user's option (license (list license:bsd-3 license:asl2.0)))) ; at user's option
(define-public python2-fixtures-bootstrap
(package-with-python2 python-fixtures-bootstrap))
(define-public python-fixtures (define-public python-fixtures
(package (package
(inherit python-fixtures-bootstrap) (inherit python-fixtures-bootstrap)
@ -1536,9 +1558,6 @@ python-fixtures package instead.")
"Fixtures provides a way to create reusable state, useful when writing "Fixtures provides a way to create reusable state, useful when writing
Python tests."))) Python tests.")))
(define-public python2-fixtures
(package-with-python2 python-fixtures))
(define-public python-testrepository-bootstrap (define-public python-testrepository-bootstrap
(package (package
(name "python-testrepository-bootstrap") (name "python-testrepository-bootstrap")
@ -1564,9 +1583,6 @@ Python tests.")))
"Bootstrap package for python-testrepository. Don't use this.") "Bootstrap package for python-testrepository. Don't use this.")
(license (list license:bsd-3 license:asl2.0)))) ; at user's option (license (list license:bsd-3 license:asl2.0)))) ; at user's option
(define-public python2-testrepository-bootstrap
(package-with-python2 python-testrepository-bootstrap))
(define-public python-testrepository (define-public python-testrepository
(package (package
(inherit python-testrepository-bootstrap) (inherit python-testrepository-bootstrap)
@ -1584,9 +1600,6 @@ Python tests.")))
be used as part of a developer's workflow to check things such as what tests be used as part of a developer's workflow to check things such as what tests
have failed since the last commit or what tests are currently failing."))) have failed since the last commit or what tests are currently failing.")))
(define-public python2-testrepository
(package-with-python2 python-testrepository))
(define-public python-coverage (define-public python-coverage
(package (package
(name "python-coverage") (name "python-coverage")
@ -2334,9 +2347,6 @@ tests written in a natural language style, backed up by Python code.")
JSON APIs with Behave.") JSON APIs with Behave.")
(license license:expat))) (license license:expat)))
(define-public python2-behave-web-api
(package-with-python2 python-behave-web-api))
(define-public python-rednose (define-public python-rednose
(package (package
(name "python-rednose") (name "python-rednose")

302
gnu/packages/chemistry.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net> ;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2018, 2021 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
@ -29,6 +29,8 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -43,95 +45,89 @@
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python)) #:use-module (guix build-system python))
(define-public avogadro (define-public avogadrolibs
(package (package
(name "avogadro") (name "avogadrolibs")
(version "1.2.0") (version "1.93.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cryos/avogadro") (url "https://github.com/OpenChemistry/avogadrolibs")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2")) (base32 "1xivga626n5acnmwmym8svl0pdri8hkp59czf04ri2zflnviyh39"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))))
(patches
(search-patches "avogadro-eigen3-update.patch"
"avogadro-python-eigen-lib.patch"
"avogadro-boost148.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments
`(#:tests? #f
#:configure-flags
(list "-DENABLE_GLSL=ON"
(string-append "-DPYTHON_LIBRARIES="
(assoc-ref %build-inputs "python")
"/lib")
(string-append "-DPYTHON_INCLUDE_DIRS="
(assoc-ref %build-inputs "python")
"/include/python"
,(version-major+minor
(package-version python))))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-python-lib-path
(lambda* (#:key outputs #:allow-other-keys)
;; This is necessary to install the Python module in the correct
;; directory.
(substitute* "libavogadro/src/python/CMakeLists.txt"
(("^EXECUTE_PROCESS.*$") "")
(("^.*from sys import stdout.*$") "")
(("^.*OUTPUT_VARIABLE.*")
(string-append "set(PYTHON_LIB_PATH \""
(assoc-ref outputs "out")
"/lib/python"
,(version-major+minor
(package-version python))
"/site-packages\")")))))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'avogadro' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out")))
(setenv "GUIX_PYTHONPATH"
(string-append
(assoc-ref outputs "out")
"/lib/python"
,(version-major+minor
(package-version python))
"/site-packages:"
(getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/avogadro")
`("GUIX_PYTHONPATH" ":" prefix
(,(getenv "GUIX_PYTHONPATH"))))))))))
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("eigen" ,eigen)
("mmtf-cpp" ,mmtf-cpp)
("msgpack" ,msgpack)
("googletest" ,googletest)
("pkg-config" ,pkg-config)
("pybind11" ,pybind11)))
(inputs
`(("glew" ,glew)
("libarchive" ,libarchive)
("libmsym" ,libmsym)
("molequeue" ,molequeue)
("python" ,python)
("spglib" ,spglib)
("qtbase" ,qtbase)))
(arguments
'(#:configure-flags (list "-DENABLE_TESTING=ON"
(string-append "-DSPGLIB_INCLUDE_DIR="
(assoc-ref %build-inputs "spglib")
"/include"))))
(home-page "https://www.openchemistry.org/projects/avogadro2/")
(synopsis "Libraries for chemistry, bioinformatics, and related areas")
(description
"Avogadro libraries provide 3D rendering, visualization, analysis and data
processing useful in computational chemistry, molecular modeling,
bioinformatics, materials science, and related areas.")
(license license:bsd-3)))
(define-public avogadro2
(package
(name "avogadro2")
(version "1.93.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OpenChemistry/avogadroapp")
(commit version)))
(sha256
(base32
"1z3pjlwja778a1dmvx9aqz2hlw5q9g3kqxhm9slz08452600jsv7"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(native-inputs
`(("eigen" ,eigen)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("boost" ,boost) `(("avogadrolibs" ,avogadrolibs)
("eigen" ,eigen) ("hdf5" ,hdf5)
("glew" ,glew) ("molequeue" ,molequeue)
("openbabel" ,openbabel) ("qtbase" ,qtbase)))
("python" ,python-2) ;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
("python-numpy" ,python2-numpy) (arguments
("python-pyqt" ,python2-pyqt-4) '(#:tests? #f))
("python-sip" ,python2-sip) (home-page "https://www.openchemistry.org/projects/avogadro2/")
("qt" ,qt-4)
("zlib" ,zlib)))
(home-page "https://avogadro.cc")
(synopsis "Advanced molecule editor") (synopsis "Advanced molecule editor")
(description (description
"Avogadro is an advanced molecule editor and visualizer designed for use "Avogadro 2 is an advanced molecule editor and visualizer designed for use
in computational chemistry, molecular modeling, bioinformatics, materials in computational chemistry, molecular modeling, bioinformatics, materials
science, and related areas. It offers flexible high quality rendering and a science, and related areas. It offers flexible high quality rendering and a
powerful plugin architecture.") powerful plugin architecture.")
(license license:gpl2+))) (license license:bsd-3)))
(define-public domainfinder (define-public domainfinder
(package (package
@ -165,15 +161,16 @@ only with Python 2 and NumPy < 1.9.")
(define-public inchi (define-public inchi
(package (package
(name "inchi") (name "inchi")
(version "1.05") ;; Update the inchi-doc native input when updating inchi.
(version "1.06")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.inchi-trust.org/download/" (uri (string-append "https://www.inchi-trust.org/download/"
(string-join (string-split version #\.) "") (string-join (string-split version #\.) "")
"/INCHI-1-SRC.zip")) "/INCHI-1-SRC.zip"))
(sha256 (sha256
(base32 (base32
"081pcjx1z5jm23fs1pl2r3bccia0ww8wfkzcjpb7byhn7b513hsa")) "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28"))
(file-name (string-append name "-" version ".zip")))) (file-name (string-append name "-" version ".zip"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -226,7 +223,7 @@ only with Python 2 and NumPy < 1.9.")
"/INCHI-1-DOC.zip")) "/INCHI-1-DOC.zip"))
(sha256 (sha256
(base32 (base32
"1id1qb2y4lwsiw91qr2yqpn6kxbwjwhjk0hb2rwk4fxhdqib6da6")) "1kyda09i9p89xfq90ninwi7w13k1w3ljpl4gqdhpfhi5g8fgxx7f"))
(file-name (string-append name "-" version ".zip")))))) (file-name (string-append name "-" version ".zip"))))))
(home-page "https://www.inchi-trust.org") (home-page "https://www.inchi-trust.org")
(synopsis "Utility for manipulating machine-readable chemical structures") (synopsis "Utility for manipulating machine-readable chemical structures")
@ -240,6 +237,103 @@ analogy is that InChI is the bar-code for chemistry and chemical structures.")
"file://LICENCE" "file://LICENCE"
"See LICENCE in the distribution.")))) "See LICENCE in the distribution."))))
(define-public libmsym
(package
(name "libmsym")
(version "0.2.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mcodev31/libmsym")
(commit (string-append "v" version))))
(sha256
(base32
"0a9j28irdsr461qpzlc9z1yjyb9kp64fh5zw7ylspc9zn3189qwk"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
#:tests? #f)) ; no check target
(home-page "https://github.com/mcodev31/libmsym")
(synopsis "C library dealing with point group symmetry in molecules")
(description "libmsym is a C library dealing with point group symmetry in
molecules.")
(license license:expat)))
(define-public mmtf-cpp
(package
(name "mmtf-cpp")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rcsb/mmtf-cpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"17ylramda69plf5w0v5hxbl4ggkdi5s15z55cv0pljl12yvyva8l"))))
(build-system cmake-build-system)
;; Tests require the soon-to-be-deprecated version 1 of the catch-framework.
(arguments
'(#:tests? #f))
(home-page "https://mmtf.rcsb.org/")
(synopsis "C++ API for the Macromolecular Transmission Format")
(description "This package is a library for the
@acronym{MMTF,macromolecular transmission format}, a binary encoding of
biological structures.")
(license license:expat)))
(define-public molequeue
(package
(name "molequeue")
(version "0.9.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/OpenChemistry/molequeue/"
"releases/download/" version "/molequeue-"
version ".tar.bz2"))
(sha256
(base32
"1w1fgxzqrb5yxvpmnc3c9ymnvixy0z1nfafkd9whg9zw8nbgl998"))))
(build-system cmake-build-system)
(inputs
`(("qtbase" ,qtbase)))
(arguments
'(#:configure-flags '("-DENABLE_TESTING=ON")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-tests
(lambda _
;; TODO: Fix/enable the failing message and clientserver tests.
;; In the message test, the floating-point value "5.36893473232" on
;; line 165 of molequeue/app/testing/messagetest.cpp should
;; (apparently) be truncated, but it is not.
(substitute* "molequeue/app/testing/messagetest.cpp"
(("5\\.36893473232") "5.36893"))
;; It is unclear why the clientserver test fails, so it is
;; completely disabled.
(substitute* "molequeue/app/testing/CMakeLists.txt"
((".*clientserver.*") ""))
#t))
(add-before 'check 'set-display
(lambda _
;; Make Qt render "offscreen" for the sake of tests.
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
(home-page "https://www.openchemistry.org/projects/molequeue/")
(synopsis "Application for coordinating computational jobs")
(description "MoleQueue is a system-tray resident desktop application for
abstracting, managing, and coordinating the execution of tasks both locally and
on remote computational resources. Users can set up local and remote queues
that describe where the task will be executed. Each queue can have programs,
with templates to facilitate the execution of the program. Input files can be
staged, and output files collected using a standard interface.")
(license license:bsd-3)))
(define with-numpy-1.8 (define with-numpy-1.8
(package-input-rewriting `((,python2-numpy . ,python2-numpy-1.8)))) (package-input-rewriting `((,python2-numpy . ,python2-numpy-1.8))))
@ -428,19 +522,23 @@ usual algorithms you expect from a modern molecular dynamics implementation.")
(define-public openbabel (define-public openbabel
(package (package
(name "openbabel") (name "openbabel")
(version "2.4.1") (version "3.1.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/" (uri (string-append "https://github.com/openbabel/openbabel/"
version "/" name "-" version ".tar.gz")) "releases/download/openbabel-"
(string-replace-substring version "." "-")
"/openbabel-" version "-source.tar.bz2"))
(sha256 (sha256
(base32 (base32
"1z3d6xm70dpfikhwdnbzc66j2l49vq105ch041wivrfz5ic3ch90")) "0s0f4zib8vshfaywsr5bjjz55jwsg6yiz2qw4i5jm8wysn0q7v56"))))
(patches
(search-patches "openbabel-fix-crash-on-nwchem-output.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(;; FIXME: Disable tests on i686 to work around
;; https://github.com/openbabel/openbabel/issues/2041.
#:tests? ,(or (%current-target-system)
(not (string=? "i686-linux" (%current-system))))
#:configure-flags
(list "-DOPENBABEL_USE_SYSTEM_INCHI=ON" (list "-DOPENBABEL_USE_SYSTEM_INCHI=ON"
(string-append "-DINCHI_LIBRARY=" (string-append "-DINCHI_LIBRARY="
(assoc-ref %build-inputs "inchi") (assoc-ref %build-inputs "inchi")
@ -463,3 +561,49 @@ chemical data. It's a collaborative project allowing anyone to search, convert,
analyze, or store data from molecular modeling, chemistry, solid-state analyze, or store data from molecular modeling, chemistry, solid-state
materials, biochemistry, or related areas.") materials, biochemistry, or related areas.")
(license license:gpl2))) (license license:gpl2)))
(define-public spglib
(package
(name "spglib")
(version "1.16.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/spglib/spglib")
(commit (string-append "v" version))))
(sha256
(base32 "1kzc956m1pnazhz52vspqridlw72wd8x5l3dsilpdxl491aa2nws"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
'(#:test-target "check"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-header-install-dir
(lambda _
;; As of the writing of this package, CMake and GNU build systems
;; install the header to two different location. This patch makes
;; the CMake build system's choice of header directory compatible
;; with the GNU build system's choice and with what avogadrolibs
;; expects.
;; See https://github.com/spglib/spglib/issues/75 and the relevant
;; part of https://github.com/OpenChemistry/avogadroapp/issues/97.
(substitute* "CMakeLists.txt"
(("\\$\\{CMAKE_INSTALL_INCLUDEDIR\\}" include-dir)
(string-append include-dir "/spglib")))
#t)))))
(home-page "https://spglib.github.io/spglib/index.html")
(synopsis "Library for crystal symmetry search")
(description "Spglib is a library for finding and handling crystal
symmetries written in C. Spglib can be used to:
@enumerate
@item Find symmetry operations
@item Identify space-group type
@item Wyckoff position assignment
@item Refine crystal structure
@item Find a primitive cell
@item Search irreducible k-points
@end enumerate")
(license license:bsd-3)))

44
gnu/packages/chromium.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020, 2021 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -160,6 +160,7 @@
"third_party/dom_distiller_js" ;BSD-3 "third_party/dom_distiller_js" ;BSD-3
"third_party/emoji-segmenter" ;ASL2.0 "third_party/emoji-segmenter" ;ASL2.0
"third_party/flatbuffers" ;ASL2.0 "third_party/flatbuffers" ;ASL2.0
"third_party/fusejs" ;ASL2.0
"third_party/glslang" ;BSD-3, Expat, ASL2.0 "third_party/glslang" ;BSD-3, Expat, ASL2.0
"third_party/google_input_tools" ;ASL2.0 "third_party/google_input_tools" ;ASL2.0
"third_party/google_input_tools/third_party/closure_library" ;ASL2.0 "third_party/google_input_tools/third_party/closure_library" ;ASL2.0
@ -277,6 +278,13 @@
"third_party/woff2" ;ASL2.0 "third_party/woff2" ;ASL2.0
"third_party/xcbproto" ;X11 "third_party/xcbproto" ;X11
"third_party/xdg-utils" ;Expat "third_party/xdg-utils" ;Expat
;; These are forked components of the X11 keybinding code.
"third_party/libxcb-keysyms" ;X11
"third_party/libx11/src/KeyBind.c" ;X11
"third_party/libx11/src/xkb/XKBBind.c" ;X11
"third_party/x11proto/keysymdef.h" ;X11
"third_party/zlib/google" ;BSD-3 "third_party/zlib/google" ;BSD-3
"third_party/zxcvbn-cpp" ;Expat "third_party/zxcvbn-cpp" ;Expat
"url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+ "url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+
@ -302,8 +310,8 @@
(string-append "ungoogled-chromium-" category "-" name)))) (string-append "ungoogled-chromium-" category "-" name))))
(sha256 (base32 hash)))) (sha256 (base32 hash))))
(define %chromium-version "87.0.4280.88") (define %chromium-version "88.0.4324.104")
(define %ungoogled-revision "b78cb927fa8beaee0ddfb4385277edb96444c40f") (define %ungoogled-revision "4e2679ce15a53925b34a95aa3e1731751530dc22")
(define %debian-revision "debian/84.0.4147.105-1") (define %debian-revision "debian/84.0.4147.105-1")
(define %debian-patches (define %debian-patches
@ -321,7 +329,7 @@
(string-take %ungoogled-revision 7))) (string-take %ungoogled-revision 7)))
(sha256 (sha256
(base32 (base32
"0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg")))) "09x6kxd99a274mln3k3ckly6swyp5qdnkkp8p6grs9nr5jrgqqx5"))))
(define %guix-patches (define %guix-patches
(list (local-file (list (local-file
@ -405,6 +413,22 @@
`(cons "--enable-custom-modes" `(cons "--enable-custom-modes"
,flags)))))) ,flags))))))
;; WebRTC in Chromium 88 requires an unreleased version of libvpx. Use the
;; commit mentioned in "third_party/libvpx/README.chromium".
(define libvpx/chromium
(package
(inherit libvpx)
(version "1.9.0-88-g12059d956")
(source (origin
(inherit (package-source libvpx))
(uri (git-reference
(url "https://chromium.googlesource.com/webm/libvpx")
(commit (string-append "v" version))))
(file-name (git-file-name "libvpx" version))
(sha256
(base32
"14knnvfaskfz97vs3lfqrdpcbcx22s6qp16213wdnvnsf4c1lx1b"))))))
;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need ;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need
;; this trick to make it wrap 'lld'. ;; this trick to make it wrap 'lld'.
(define (make-lld-wrapper lld) (define (make-lld-wrapper lld)
@ -443,7 +467,7 @@
%chromium-version ".tar.xz")) %chromium-version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy")) "0iq1rmfiqmxsj6skbi17g007zqgjsb50b59slfni2n4mz06xmgbx"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet)))) (snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -580,6 +604,12 @@
(("third_party/icu/source/(common|i18n)/") (("third_party/icu/source/(common|i18n)/")
"")) ""))
;; Fix faulty ICU call. Likely fixed in M89.
(substitute*
"third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc"
(("ideographicSpaceCharacter")
"kIdeographicSpaceCharacter"))
;; XXX: Should be unnecessary when use_system_lcms2=true. ;; XXX: Should be unnecessary when use_system_lcms2=true.
(substitute* "third_party/pdfium/core/fxcodec/icc/iccmodule.h" (substitute* "third_party/pdfium/core/fxcodec/icc/iccmodule.h"
(("include \"third_party/lcms/include/lcms2\\.h\"") (("include \"third_party/lcms/include/lcms2\\.h\"")
@ -805,14 +835,14 @@
("glib" ,glib) ("glib" ,glib)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("harfbuzz" ,harfbuzz) ("harfbuzz" ,harfbuzz)
("icu4c" ,icu4c-67) ("icu4c" ,icu4c-68)
("lcms" ,lcms) ("lcms" ,lcms)
("libevent" ,libevent) ("libevent" ,libevent)
("libffi" ,libffi) ("libffi" ,libffi)
("libjpeg-turbo" ,libjpeg-turbo) ("libjpeg-turbo" ,libjpeg-turbo)
("libpng" ,libpng) ("libpng" ,libpng)
("libva" ,libva) ("libva" ,libva)
("libvpx" ,libvpx) ("libvpx" ,libvpx/chromium)
("libwebp" ,libwebp) ("libwebp" ,libwebp)
("libx11" ,libx11) ("libx11" ,libx11)
("libxcb" ,libxcb) ("libxcb" ,libxcb)

63
gnu/packages/ci.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; ;;;
@ -26,6 +26,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix download)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
@ -39,7 +40,6 @@
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression) #:use-module (gnu packages perl-compression)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
@ -47,29 +47,9 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
;; Guile-Sqlite3 package adding SQL query logging support.
;; Remove it when next Guile-Sqlite3 release is out.
(define-public guile-sqlite3-dev
(let ((commit "22ef45d268de7707cbbb943c404f9b0c1668e2e1")
(revision "1"))
(package
(inherit guile-sqlite3)
(name "guile-sqlite3")
(version (git-version "0.1.2" revision commit))
(home-page "https://notabug.org/mothacehe/guile-sqlite3.git")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(sha256
(base32
"1q90f8zhw9n1c39szd2ba7aj5fi92m09pnlv0z7jbhnnjam5jwcd"))
(file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass (define-public cuirass
(let ((commit "697fa14584551d9595cd042f1ffeba240e45a127") (let ((commit "6bd940fc24646533ed2c113d9b551d23fe4f030d")
(revision "56")) (revision "65"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -81,43 +61,33 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0gw9cja8fiyra9vnn3y384gwanvsqdq6gwjcvmz91sy5lvfwv34m")))) "0nv8y6dm17m4z28aqr47ch4l4qaqr1zixdv7jajxdky9dqy085vm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
(guix build gnu-build-system) (guix build gnu-build-system)
(ice-9 rdelim) (ice-9 rdelim)
(ice-9 popen)) (ice-9 popen))
#:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
#:tests? #f ;requires a PostgreSQL database.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-repo-tests
(lambda _
;; Disable tests that use a connection to the Guix daemon.
(substitute* "Makefile.am"
(("tests/repo.scm \\\\") "\\"))
#t))
(add-after 'disable-repo-tests 'patch-/bin/sh
(lambda _
(substitute* "build-aux/git-version-gen"
(("#!/bin/sh") (string-append "#!" (which "sh"))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules. ;; Wrap the 'cuirass' command to refer to the right modules.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(avahi (assoc-ref inputs "guile-avahi"))
(gcrypt (assoc-ref inputs "guile-gcrypt")) (gcrypt (assoc-ref inputs "guile-gcrypt"))
(json (assoc-ref inputs "guile-json")) (json (assoc-ref inputs "guile-json"))
(sqlite (assoc-ref inputs "guile-sqlite3")) (zmq (assoc-ref inputs "guile-simple-zmq"))
(squee (assoc-ref inputs "guile-squee"))
(git (assoc-ref inputs "guile-git")) (git (assoc-ref inputs "guile-git"))
(bytes (assoc-ref inputs "guile-bytestructures")) (bytes (assoc-ref inputs "guile-bytestructures"))
(fibers (assoc-ref inputs "guile-fibers")) (fibers (assoc-ref inputs "guile-fibers"))
(zlib (assoc-ref inputs "guile-zlib")) (zlib (assoc-ref inputs "guile-zlib"))
(guix (assoc-ref inputs "guix")) (guix (assoc-ref inputs "guix"))
(deps (list gcrypt json sqlite git bytes fibers (deps (list avahi gcrypt json zmq squee git bytes
zlib guix)) fibers zlib guix))
(guile (assoc-ref %build-inputs "guile")) (guile (assoc-ref %build-inputs "guile"))
(effective (read-line (effective (read-line
(open-pipe* OPEN_READ (open-pipe* OPEN_READ
@ -137,17 +107,22 @@
1))) 1)))
;; Make sure 'cuirass' can find the 'evaluate' command, as ;; Make sure 'cuirass' can find the 'evaluate' command, as
;; well as the relevant Guile modules. ;; well as the relevant Guile modules.
(wrap-program (string-append out "/bin/cuirass") (for-each
(lambda (name)
(wrap-program (string-append out "/bin/" name)
`("PATH" ":" prefix (,(string-append out "/bin"))) `("PATH" ":" prefix (,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix (,mods)) `("GUILE_LOAD_PATH" ":" prefix (,mods))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))))
'("cuirass" "remote-server" "remote-worker"))
#t)))))) #t))))))
(inputs (inputs
`(("guile" ,guile-3.0/libgc-7) `(("guile" ,guile-3.0/libgc-7)
("guile-avahi" ,guile-avahi)
("guile-fibers" ,guile-fibers) ("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4) ("guile-json" ,guile-json-4)
("guile-sqlite3" ,guile-sqlite3-dev) ("guile-simple-zmq" ,guile-simple-zmq)
("guile-squee" ,guile-squee)
("guile-git" ,guile-git) ("guile-git" ,guile-git)
("guile-zlib" ,guile-zlib) ("guile-zlib" ,guile-zlib)
;; FIXME: this is propagated by "guile-git", but it needs to be among ;; FIXME: this is propagated by "guile-git", but it needs to be among

29
gnu/packages/cmake.scm
View file

@ -31,6 +31,7 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix deprecation) #:use-module (guix deprecation)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -43,6 +44,7 @@
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages file) #:use-module (gnu packages file)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
@ -52,6 +54,33 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public cmake-shared
(package
(name "cmake-shared")
(version "1.1.0")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/lirios/cmake-shared.git")
(commit
(string-append "v" version))))
(file-name
(git-file-name name version))
(sha256
(base32 "1srd3jmlalf0szgyp88ymhbnwds4qiywmf8lq1pif9g8irjjhdry"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; No target
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(synopsis "Shared CMake functions and macros")
(description "CMake-Shared are shared functions and macros for projects
using the CMake build system.")
(home-page "https://github.com/lirios/cmake-shared/")
(license license:bsd-3)))
;;; Build phases shared between 'cmake-bootstrap' and the later variants ;;; Build phases shared between 'cmake-bootstrap' and the later variants
;;; that use cmake-build-system. ;;; that use cmake-build-system.
(define %common-build-phases (define %common-build-phases

48
gnu/packages/compression.scm
View file

@ -29,6 +29,7 @@
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net> ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Léo Le Bouter <lle-bout@zaclys.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -55,6 +56,7 @@
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -70,7 +72,9 @@
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages man)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -78,6 +82,7 @@
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (last))) #:use-module ((srfi srfi-1) #:select (last)))
@ -1026,6 +1031,41 @@ smaller than those produced by @code{Xdelta}.")
;; Some source files specify gpl2+, lgpl2+, however COPYING is gpl3. ;; Some source files specify gpl2+, lgpl2+, however COPYING is gpl3.
(license license:gpl3+))) (license license:gpl3+)))
(define-public libjcat
(package
(name "libjcat")
(version "0.1.5")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/hughsie/libjcat")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0rxyqikdhkh2nq1y0hy05df2kkxf3d2cp6lm5x1s5i717k6y3zy5"))))
(build-system meson-build-system)
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
("help2man" ,help2man)
("pkg-config" ,pkg-config)))
(inputs
`(("git" ,git)
("glib" ,glib)
("gnupg" ,gnupg)
("gnutls" ,gnutls)
("gpgme" ,gpgme)
("json-glib" ,json-glib)
("vala" ,vala)))
(home-page "https://github.com/hughsie/libjcat")
(synopsis "Library for reading and writing Jcat files")
(description
"This library allows reading and writing gzip-compressed JSON catalog
files, which can be used to store GPG, PKCS-7 and SHA-256 checksums for each
file.")
(license license:lgpl2.1+)))
(define-public xdelta (define-public xdelta
(package (package
(name "xdelta") (name "xdelta")
@ -1808,14 +1848,14 @@ Clzip is intended to be fully compatible with the regular lzip package.")
(define-public lzlib (define-public lzlib
(package (package
(name "lzlib") (name "lzlib")
(version "1.11") (version "1.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/lzip/lzlib/" (uri (string-append "mirror://savannah/lzip/lzlib/"
"lzlib-" version ".tar.gz")) "lzlib-" version ".tar.gz"))
(sha256 (sha256
(base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c")))) (base32 "1c9pwd6by8is4z8bs6j306jyy6pgm2dvsn4fr7fg2b5m5qj88pcf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2067,13 +2107,13 @@ reading from and writing to ZIP archives. ")
(define-public zutils (define-public zutils
(package (package
(name "zutils") (name "zutils")
(version "1.9") (version "1.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz")) (uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz"))
(sha256 (sha256
(base32 "0y2wm8wqr1wi1b1fv45dn50njv4q81p6ifx0279ji1bq56qkrn2r")))) (base32 "15dimqp8zlqaaa2l46r22srp1py38mlmn69ph1j5fmrd54w43m0d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

8
gnu/packages/connman.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
@ -138,15 +138,15 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
(define-public cmst (define-public cmst
(package (package
(name "cmst") (name "cmst")
(version "2019.01.13") (version "2020.11.01")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/andrew-bibb/cmst/releases/download/cmst-" "https://github.com/andrew-bibb/cmst/releases/download/"
version "/cmst-" version ".tar.xz")) version "/cmst-" version ".tar.xz"))
(sha256 (sha256
(base32 "1cn6xz2rpkf5kx5d6p2x2lh85zppjacp59l6gj3n6x12p90al1vl")))) (base32 "0jn12wxwjznady6aniwmvahg1dj25p902sdwj0070biv6vx5c7dq"))))
(inputs (inputs
`(("qtbase" ,qtbase))) `(("qtbase" ,qtbase)))
(native-inputs (native-inputs

97
gnu/packages/cpp.scm
View file

@ -14,7 +14,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Greg Hogan <code@greghogan.com> ;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -49,6 +49,7 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
@ -63,6 +64,74 @@
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages web)) #:use-module (gnu packages web))
(define-public range-v3
(package
(name "range-v3")
(version "0.11.0")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/ericniebler/range-v3.git")
(commit version)))
(file-name
(git-file-name name version))
(sha256
(base32 "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"))))
(build-system cmake-build-system)
(native-inputs
`(("doxygen" ,doxygen)
("perl" ,perl)))
(inputs
`(("boost" ,boost)))
(synopsis "Range library for C++14/17/20")
(description "Range-v3 is an extension of the Standard Template Library that
makes its iterators and algorithms more powerful by making them composable.
Unlike other range-like solutions which, seek to do away with iterators, in
range-v3 ranges are an abstration layer on top of iterators.")
(home-page "https://github.com/ericniebler/range-v3/")
(license
(list
;; Elements of Programming
(license:x11-style "file:///LICENSE.txt")
;; SGI STL
license:sgifreeb2.0
;;; LibC++ (dual-licensed)
license:expat
license:ncsa
;; Others
license:boost1.0))))
(define-public c++-gsl
(package
(name "c++-gsl")
(version "3.1.0")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/microsoft/GSL.git")
(commit
(string-append "v" version))))
(file-name
(git-file-name name version))
(patches
(search-patches
"c++-gsl-find-system-gtest.patch"))
(sha256
(base32 "0gbvr48f03830g3154bjhw92b8ggmg6wwh5xyb8nppk9v6w752l0"))))
(build-system cmake-build-system)
(native-inputs
`(("googletest" ,googletest)
("pkg-config" ,pkg-config)))
(synopsis "Guidelines Support Library")
(description "c++-gsl contains functions and types that are suggested for
use by the C++ Core Guidelines maintained by the Standard C++ Foundation.")
(home-page "https://github.com/microsoft/GSL/")
(license license:expat)))
(define-public libzen (define-public libzen
(package (package
(name "libzen") (name "libzen")
@ -689,7 +758,7 @@ standard GNU style syntax for options.")
(define-public folly (define-public folly
(package (package
(name "folly") (name "folly")
(version "2020.10.05.00") (version "2021.01.25.00")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -698,7 +767,7 @@ standard GNU style syntax for options.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn")))) "14dl1g6vf7mc90mcync5h2lp14fwcx8n9h91pmiq6rfgv1fjjrwz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(;; Tests must be explicitly enabled '(;; Tests must be explicitly enabled
@ -808,3 +877,25 @@ code will be mixed in with the actual programming logic. This implementation
provides a number of utilities to make coding with expected cleaner.") provides a number of utilities to make coding with expected cleaner.")
(home-page "https://tl.tartanllama.xyz/") (home-page "https://tl.tartanllama.xyz/")
(license license:cc0))) (license license:cc0)))
(define-public magic-enum
(package
(name "magic-enum")
(version "0.7.2")
(home-page "https://github.com/Neargye/magic_enum")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"07j5zdf3vkliwrcv6k663k35akn7qp23794sz2mnvkj9hbv9s8cx"))))
(build-system cmake-build-system)
(native-inputs
`(("gcc" ,gcc-9)))
(synopsis "C++17 header only library for compile time reflection of enums")
(description "Magic Enum offers static reflection of enums, with
conversions to and from strings, iteration and related functionality.")
(license license:expat)))

693
gnu/packages/cran.scm
View file

File diff suppressed because it is too large Load diff

758
gnu/packages/crates-graphics.scm
View file

File diff suppressed because it is too large Load diff

2025
gnu/packages/crates-io.scm
View file

File diff suppressed because it is too large Load diff

72
gnu/packages/cups.scm
View file

@ -1,11 +1,11 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
@ -48,6 +48,7 @@
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages scanner) #:use-module (gnu packages scanner)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
@ -58,6 +59,73 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public brlaser
(let ((commit "9d7ddda8383bfc4d205b5e1b49de2b8bcd9137f1")
(revision "1"))
(package
(name "brlaser")
(version (git-version "6" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pdewacht/brlaser")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1drh0nk7amn9a8wykki4l9maqa4vy7vwminypfy1712alwj31nd4"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCUPS_DATA_DIR="
(assoc-ref %outputs "out")
"/share/cups")
(string-append "-DCUPS_SERVER_BIN="
(assoc-ref %outputs "out")
"/lib/cups"))))
(inputs
`(("ghostscript" ,ghostscript)
("cups" ,cups)
("zlib" ,zlib)))
(home-page "https://github.com/pdewacht/brlaser")
(synopsis "Brother laser printer driver")
(description "Brlaser is a CUPS driver for Brother laser printers. This
driver is known to work with these printers:
@enumerate
@item Brother DCP-1510 series
@item Brother DCP-1600 series
@item Brother DCP-7030
@item Brother DCP-7040
@item Brother DCP-7055
@item Brother DCP-7055W
@item Brother DCP-7060D
@item Brother DCP-7065DN
@item Brother DCP-7080
@item Brother DCP-L2500D series
@item Brother DCP-L2520D series
@item Brother DCP-L2540DW series
@item Brother HL-1110 series
@item Brother HL-1200 series
@item Brother HL-2030 series
@item Brother HL-2140 series
@item Brother HL-2220 series
@item Brother HL-2270DW series
@item Brother HL-5030 series
@item Brother HL-L2300D series
@item Brother HL-L2320D series
@item Brother HL-L2340D series
@item Brother HL-L2360D series
@item Brother MFC-1910W
@item Brother MFC-7240
@item Brother MFC-7360N
@item Brother MFC-7365DN
@item Brother MFC-7840W
@item Brother MFC-L2710DW series
@item Lenovo M7605D
@end enumerate")
(license license:gpl2+))))
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")

125
gnu/packages/databases.scm
View file

@ -23,7 +23,7 @@
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
@ -46,6 +46,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -85,15 +86,16 @@
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages guile)
#:use-module (gnu packages time)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages jemalloc) #:use-module (gnu packages jemalloc)
#:use-module (gnu packages language) #:use-module (gnu packages language)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
@ -110,8 +112,8 @@
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-science) #:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages rdf) #:use-module (gnu packages rdf)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
@ -124,6 +126,7 @@
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages terminals) #:use-module (gnu packages terminals)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages time)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages web) #:use-module (gnu packages web)
@ -1284,6 +1287,89 @@ pictures, sounds, or video.")
(define-public postgresql postgresql-13) (define-public postgresql postgresql-13)
(define-public pgloader
(package
(name "pgloader")
(version "3.6.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dimitri/pgloader")
(commit (string-append "v" version))))
(sha256
(base32 "06i1jd2za3ih5caj2b4vzlzags5j65vv8dfdbz0ggdrp40wfd5lh"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
;; NOTE: (Sharlatan-20210119T211511+0000) Tests are disabled due to being
;; dependent on Quicklisp, main build target is `pgloader-standalone' which
;; does not require Quicklisp workarounds. There is no `install' target
;; configured in Makefile.
`(#:tests? #f
#:strip-binaries? #f
#:make-flags
(list "pgloader-standalone" "BUILDAPP_SBCL=buildapp")
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'set-home
(lambda _
(setenv "HOME" "/tmp")
#t))
(add-after 'unpack 'patch-Makefile
(lambda _
(substitute* "Makefile"
(("--sbcl.*") "--sbcl $(CL) --asdf-path . \\\n"))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(mkdir-p bin)
(install-file "build/bin/pgloader" bin))
#t)))))
(native-inputs
`(("buildapp" ,buildapp)
("sbcl" ,sbcl)))
(inputs
`(("alexandria" ,sbcl-alexandria)
("cl-abnf" ,sbcl-cl-abnf)
("cl-base64" ,sbcl-cl-base64)
("cl-csv" ,sbcl-cl-csv)
("cl-fad" ,sbcl-cl-fad)
("cl-log" ,sbcl-cl-log)
("cl-markdown" ,sbcl-cl-markdown)
("cl-mustache" ,sbcl-cl-mustache)
("cl-ppcre" ,sbcl-cl-ppcre)
("cl-sqlite" ,sbcl-cl-sqlite)
("closer-mop" ,sbcl-closer-mop)
("command-line-arguments" ,sbcl-command-line-arguments)
("db3" ,sbcl-db3)
("drakma" ,sbcl-drakma)
("esrap" ,sbcl-esrap)
("flexi-streams" ,sbcl-flexi-streams)
("ixf" ,sbcl-ixf)
("local-time" ,sbcl-local-time)
("lparallel" ,sbcl-lparallel)
("metabang-bind" ,sbcl-metabang-bind)
("mssql" ,sbcl-mssql)
("postmodern" ,sbcl-postmodern)
("py-configparser" ,sbcl-py-configparser)
("qmynd" ,sbcl-qmynd)
("quri" ,sbcl-quri)
("split-sequence" ,sbcl-split-sequence)
("trivial-backtrace" ,sbcl-trivial-backtrace)
("usocket" ,sbcl-usocket)
("uuid" ,sbcl-uuid)
("yason" ,sbcl-yason)
("zs3" ,sbcl-zs3)))
(home-page "https://pgloader.io/")
(synopsis "Tool to migrate data to PostgreSQL")
(description
"@code{pgloader} is a program that can load data or migrate databases from
CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.")
(license (license:x11-style "file://LICENSE"))))
(define-public python-pymysql (define-public python-pymysql
(package (package
(name "python-pymysql") (name "python-pymysql")
@ -2169,14 +2255,14 @@ similar to BerkeleyDB, LevelDB, etc.")
(define-public redis (define-public redis
(package (package
(name "redis") (name "redis")
(version "6.0.9") (version "6.0.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.redis.io/releases/redis-" (uri (string-append "http://download.redis.io/releases/redis-"
version".tar.gz")) version".tar.gz"))
(sha256 (sha256
(base32 (base32
"1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw")) "1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete bundled jemalloc, as the package will use the libc one ;; Delete bundled jemalloc, as the package will use the libc one
@ -2221,14 +2307,14 @@ sets, bitmaps and hyperloglogs.")
(define-public kyotocabinet (define-public kyotocabinet
(package (package
(name "kyotocabinet") (name "kyotocabinet")
(version "1.2.78") (version "1.2.79")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://fallabs.com/kyotocabinet/pkg/" (uri (string-append "https://fallabs.com/kyotocabinet/pkg/"
"kyotocabinet-" version ".tar.gz")) "kyotocabinet-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1bxkf9kmcavq9rqridb8mvmrk3hj4447ffi24m2admsbm61n6k29")))) "079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -3988,3 +4074,26 @@ The drivers officially supported by @code{libdbi} are:
PostreSQL, SQLite, ODBC and MySQL.") PostreSQL, SQLite, ODBC and MySQL.")
(home-page "http://soci.sourceforge.net/") (home-page "http://soci.sourceforge.net/")
(license license:boost1.0))) (license license:boost1.0)))
(define-public freetds
(package
(name "freetds")
(version "1.2.18")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.freetds.org/files/stable/"
"freetds-" version ".tar.gz"))
(sha256
(base32 "1hspvwxwdd1apadsy2b40dpjik8kfwcvdamvhpg3lnm15n02fb50"))))
(build-system gnu-build-system)
(arguments
;; NOTE: (Sharlatan-20210110213908+0000) some tests require DB connection,
;; disabled for now.
`(#:tests? #f))
(home-page "https://www.freetds.org/")
(synopsis "Client libraries for MS SQL and Sybase servers")
(description
"FreeTDS is an implementation of the Tabular DataStream protocol, used for
connecting to MS SQL and Sybase servers over TCP/IP.")
(license license:lgpl2.0+)))

4
gnu/packages/diffoscope.scm
View file

@ -72,7 +72,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "162") (version "164")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -81,7 +81,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"02wjjbmdbyqpyizw384j50bc2ar4g5m40amz9q102gqbw6sflwbf")))) "0vjxhz8p0k4y19sl1msrl8x4z3v205rlwj52k5hijv2gn9sqh795"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

13
gnu/packages/disk.scm
View file

@ -18,6 +18,7 @@
;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com> ;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2021 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -304,14 +305,14 @@ tables, and it understands a variety of different formats.")
(define-public gptfdisk (define-public gptfdisk
(package (package
(name "gptfdisk") (name "gptfdisk")
(version "1.0.5") (version "1.0.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/" (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
version "/gptfdisk-" version ".tar.gz")) version "/gptfdisk-" version ".tar.gz"))
(sha256 (sha256
(base32 "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f")))) (base32 "1a4c2ss6n2s6x8v11h79jykh96y46apd6i838ka0ngx58gb53ifx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -493,14 +494,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
(define-public gparted (define-public gparted
(package (package
(name "gparted") (name "gparted")
(version "1.1.0") (version "1.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-"
version "/gparted-" version ".tar.gz")) version "/gparted-" version ".tar.gz"))
(sha256 (sha256
(base32 "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2")))) (base32 "06f72hqx5jf2irzsmi7lgpxxj38ncixh0acb4307wyjd4mfp343c"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
;; Tests require access to paths outside the build container, such ;; Tests require access to paths outside the build container, such
@ -860,7 +861,7 @@ to create devices with respective mappings for the ATARAID sets discovered.")
(define-public libblockdev (define-public libblockdev
(package (package
(name "libblockdev") (name "libblockdev")
(version "2.24") (version "2.25")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/storaged-project/" (uri (string-append "https://github.com/storaged-project/"
@ -868,7 +869,7 @@ to create devices with respective mappings for the ATARAID sets discovered.")
version "-1/libblockdev-" version ".tar.gz")) version "-1/libblockdev-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wq7624pnprvfzrf39bq1cybd9lqwawbdg5bm0cchlpgvdq7q86w")))) "0s0nazkpzpn4an00qghjkk9n7gdm5a8dqfr5hfnlk5mk5lma8njm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

25
gnu/packages/dlang.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -83,7 +84,7 @@ and freshness without requiring additional information from the user.")
(define-public ldc-bootstrap (define-public ldc-bootstrap
(package (package
(name "ldc") (name "ldc")
(version "0.17.4") (version "0.17.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -92,7 +93,7 @@ and freshness without requiring additional information from the user.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0nnrjavfmpfp7bib04isqlxvyzh6mlvsdan0gxysdz96hlg4hcq8")))) (base32 "1q6hm4fkrcwys83x0p4kfg9xrc1b9g2qicqif2zy5z4nsfsb5vgs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
(properties (properties
@ -117,14 +118,6 @@ and freshness without requiring additional information from the user.")
(unpack "druntime-src" "runtime/druntime") (unpack "druntime-src" "runtime/druntime")
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite") (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
#t))) #t)))
(add-after 'unpack-submodule-sources 'patch-dmd2
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "dmd2/root/port.c"
((" ::isnan") " isnan")
((" ::isinf") " isinf")
(("#undef isnan") "")
(("#undef isinf") ""))
#t))
(add-after 'unpack-submodule-sources 'patch-phobos (add-after 'unpack-submodule-sources 'patch-phobos
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "runtime/phobos/std/process.d" (substitute* "runtime/phobos/std/process.d"
@ -137,8 +130,6 @@ and freshness without requiring additional information from the user.")
"(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))")) "(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))"))
(substitute* "tests/d2/dmd-testsuite/Makefile" (substitute* "tests/d2/dmd-testsuite/Makefile"
(("/bin/bash") (which "bash"))) (("/bin/bash") (which "bash")))
;; FIXME: this test cannot be linked.
(delete-file "tests/d2/dmd-testsuite/runnable/cppa.d")
;; the following two tests fail on i686 ;; the following two tests fail on i686
(for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d"))))))) (for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d")))))))
(inputs (inputs
@ -147,8 +138,8 @@ and freshness without requiring additional information from the user.")
("tzdata" ,tzdata) ("tzdata" ,tzdata)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("llvm" ,llvm-3.8) `(("llvm" ,llvm-6)
("clang" ,clang-3.8) ("clang" ,clang-6)
("python-lit" ,python-lit) ("python-lit" ,python-lit)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("unzip" ,unzip) ("unzip" ,unzip)
@ -160,7 +151,7 @@ and freshness without requiring additional information from the user.")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "phobos" version)) (file-name (git-file-name "phobos" version))
(sha256 (sha256
(base32 "0i7gh99w4mi0hdv16261jcdiqyv1nkjdcwy9prw32s0lvplx8fdy")) (base32 "15jzs38wanks2jfp2izzl7zqrp4c8ai54ppsgm8ws86p3sbbkmj8"))
(patches (search-patches "ldc-bootstrap-disable-tests.patch")))) (patches (search-patches "ldc-bootstrap-disable-tests.patch"))))
("druntime-src" ("druntime-src"
,(origin ,(origin
@ -170,7 +161,7 @@ and freshness without requiring additional information from the user.")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "druntime" version)) (file-name (git-file-name "druntime" version))
(sha256 (sha256
(base32 "0alabm3bbvs94msvxz5psiwk4f51cw9h82z1p5hhsnf8ja6d0am7")))) (base32 "00wr2kiggwnd8h7by51fhj1xc65hv1ysip5gbgdbkfar58p2d0bb"))))
("dmd-testsuite-src" ("dmd-testsuite-src"
,(origin ,(origin
(method git-fetch) (method git-fetch)
@ -179,7 +170,7 @@ and freshness without requiring additional information from the user.")
(commit (string-append "ldc-v" version)))) (commit (string-append "ldc-v" version))))
(file-name (git-file-name "dmd-testsuite" version)) (file-name (git-file-name "dmd-testsuite" version))
(sha256 (sha256
(base32 "05qr4cgb4scfqzbw1l5pk72kil074mvj9d55b165ljyr51sgwgbl")))))) (base32 "1d1c0979wbippldrkjf7szyj4n87hxz8dwqg1r5b3aai37g9kcky"))))))
(home-page "http://wiki.dlang.org/LDC") (home-page "http://wiki.dlang.org/LDC")
(synopsis "LLVM-based compiler for the D programming language") (synopsis "LLVM-based compiler for the D programming language")
(description (description

33
gnu/packages/dns.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
@ -13,7 +13,7 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
@ -277,7 +277,7 @@ prompt the user with the option to go with insecure DNS only.")
(define-public dnsmasq (define-public dnsmasq
(package (package
(name "dnsmasq") (name "dnsmasq")
(version "2.82") (version "2.84")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -285,7 +285,7 @@ prompt the user with the option to go with insecure DNS only.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4")))) "0305a0c3snwqcv77sipyynr55xip1fp2843yn04pc4vk9g39acb0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -317,7 +317,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
(package (package
(name "bind") (name "bind")
;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; When updating, check whether isc-dhcp's bundled copy should be as well.
(version "9.16.10") (version "9.16.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -325,7 +325,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
"/bind-" version ".tar.xz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1cv26gzbyk3ahidr1fip0pgj28s7l52cafdqpykfc1b2kh0zqixw")))) "1hcr0q6i2mk83yi12zxjs5q21y3gx7683q99l77ibxfqsx6zc481"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs `("out" "utils")) (outputs `("out" "utils"))
(inputs (inputs
@ -375,15 +375,18 @@ and BOOTP/TFTP for network booting of diskless machines.")
(with-directory-excursion "fuzz" (with-directory-excursion "fuzz"
(invoke "make" "check")) (invoke "make" "check"))
#t))))) #t)))))
(synopsis "Domain Name System (DNS) implementation") (synopsis "@acronym{DNS, Domain Name System} implementation")
(description "BIND is an implementation of the @dfn{Domain Name System} (description "BIND implements the @acronym{DNS, Domain Name System}
(DNS) protocols for the Internet. It is a reference implementation of those protocols for the Internet. It is both a reference implementation of those
protocols, but it is also production-grade software, suitable for use in protocols and production-grade software, suitable for use in high-volume and
high-volume and high-reliability applications. The name BIND stands for high-reliability applications.
\"Berkeley Internet Name Domain\", because the software originated in the
early 1980s at the University of California at Berkeley. The @code{utils} The name stands for \"Berkeley Internet Name Domain\" because the software
output of this package contains the following DNS name servers related command originated in the early 1980s at the University of California at Berkeley.
line utilities:
The @code{utils} output of this package contains the following command line
utilities related to DNS name servers:
@table @code @table @code
@item delv @item delv
DNS lookup and validation utility DNS lookup and validation utility

18
gnu/packages/education.scm
View file

@ -2,8 +2,8 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net> ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
@ -230,8 +230,11 @@ Currently available boards include:
(sha256 (sha256
(base32 (base32
"0d387b404j88gsv6kv0rb7wxr23v5g5vl6s5l7602x8pxf7slbbx")) "0d387b404j88gsv6kv0rb7wxr23v5g5vl6s5l7602x8pxf7slbbx"))
;; Apply patches in the order determined by Debian
(patches (search-patches "tipp10-fix-compiling.patch" (patches (search-patches "tipp10-fix-compiling.patch"
"tipp10-remove-license-code.patch")))) "tipp10-remove-license-code.patch"
"tipp10-disable-downloader.patch"
"tipp10-qt5.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; packages has no tests `(#:tests? #f ; packages has no tests
@ -256,8 +259,8 @@ Currently available boards include:
;; Recreate Makefile ;; Recreate Makefile
(invoke "qmake"))))))) (invoke "qmake")))))))
(inputs (inputs
`(("qt4" ,qt-4) `(("qtbase" ,qtbase)
("sqlite" ,sqlite))) ("qtmultimedia" ,qtmultimedia)))
(home-page "https://www.tipp10.com/") (home-page "https://www.tipp10.com/")
(synopsis "Touch typing tutor") (synopsis "Touch typing tutor")
(description "Tipp10 is a touch typing tutor. The ingenious thing about (description "Tipp10 is a touch typing tutor. The ingenious thing about
@ -677,15 +680,14 @@ language and very flexible regarding to new or unknown keyboard layouts.")
(define-public ktouch (define-public ktouch
(package (package
(name "ktouch") (name "ktouch")
(version "20.12.0") (version "20.12.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" (uri (string-append "mirror://kde/stable/release-service/"
version "/src/ktouch-" version ".tar.xz")) version "/src/ktouch-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"))))
"1s8pcwakx94aygfyjmyps5b43j4kv6dmfw7n12japcka2yfp9bi2"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:phases `(#:phases

41
gnu/packages/efi.scm
View file

@ -1,7 +1,8 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -61,6 +62,44 @@ environment presented by Intel's EFI.")
;; Distribution is allowed only when accepting all those licenses. ;; Distribution is allowed only when accepting all those licenses.
(license (list license:bsd-2 license:bsd-3 license:bsd-4 license:expat)))) (license (list license:bsd-2 license:bsd-3 license:bsd-4 license:expat))))
(define-public efi-analyzer
(let ((commit "77c9e3a67cd7c2fca48a4292dad25a5429872f95")
(revision "0"))
(package
(name "efi-analyzer")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xypron/efi_analyzer")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1izdkzybqyvzpzqz6kx4j7y47j6aa2dsdrychzgs65466x1a4br1"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(list (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'support-cross-compilation
(lambda _
(substitute* "Makefile"
(("gcc") ,(cc-for-target)))
#t))
(delete 'configure)))) ; no configure script
(home-page "https://github.com/xypron/efi_analyzer")
(synopsis "Analyze EFI binaries")
(description
"The EFI Analyzer checks EFI binaries and prints out header and section
information.")
(license license:bsd-2))))
(define-public efi_analyzer
;; For a short while the package name contained an underscore.
(deprecated-package "efi_analyzer" efi-analyzer))
(define-public sbsigntools (define-public sbsigntools
(package (package
(name "sbsigntools") (name "sbsigntools")

4
gnu/packages/elf.scm
View file

@ -122,14 +122,14 @@ object or archive file), @command{eu-strip} (for discarding symbols),
(package (package
(name "libabigail") (name "libabigail")
(home-page "https://sourceware.org/libabigail/") (home-page "https://sourceware.org/libabigail/")
(version "1.7") (version "1.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://sourceware.org/pub/libabigail/" (uri (string-append "https://sourceware.org/pub/libabigail/"
"libabigail-" version ".tar.gz")) "libabigail-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7")))) "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-static" `(#:configure-flags '("--disable-static"

5
gnu/packages/elixir.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 nee <nee.git@cock.li> ;;; Copyright © 2017 nee <nee.git@cock.li>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nikita <nikita@n0.is> ;;; Copyright © 2018 Nikita <nikita@n0.is>
;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,7 +34,7 @@
(define-public elixir (define-public elixir
(package (package
(name "elixir") (name "elixir")
(version "1.10.4") (version "1.11.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -42,7 +43,7 @@
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "16j4rmm3ix088fvxhvyjqf1hnfg7wiwa87gml3b2mrwirdycbinv")) (base32 "0ivah4117z75pinvb3gr22d05ihfwcdgw5zvvpv7kbgiqaj8ma8f"))
(patches (search-patches "elixir-path-length.patch")))) (patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

477
gnu/packages/emacs-xyz.scm
View file

@ -19,7 +19,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@ -31,7 +31,7 @@
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com> ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
@ -41,7 +41,7 @@
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com> ;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de> ;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;; Copyright © 2018, 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018, 2019, 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2018, 2019, 2020, 2021 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019, 2020 Dimakakos Dimos <bendersteed@teknik.io> ;;; Copyright © 2019, 2020 Dimakakos Dimos <bendersteed@teknik.io>
;;; Copyright © 2019, 2020 Brian Leung <bkleung89@gmail.com> ;;; Copyright © 2019, 2020 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com> ;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com>
@ -76,7 +76,7 @@
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com> ;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
;;; Copyright © 2020 Ryan Desfosses <rdes@protonmail.com> ;;; Copyright © 2020 Ryan Desfosses <rdes@protonmail.com>
;;; Copyright © 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020 Peng Mei Yu <i@pengmeiyu.com> ;;; Copyright © 2020 Peng Mei Yu <i@pengmeiyu.com>
;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net> ;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net>
;;; Copyright © 2020 Marco Grassi <marco.au.grassi98@protonmail.com> ;;; Copyright © 2020 Marco Grassi <marco.au.grassi98@protonmail.com>
@ -88,7 +88,8 @@
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 André A. Gomes <andremegafone@gmail.com> ;;; Copyright © 2020 André A. Gomes <andremegafone@gmail.com>
;;; Copyright © 2020 Jonathan Rostran <rostranjj@gmail.com> ;;; Copyright © 2020 Jonathan Rostran <rostranjj@gmail.com>
;;; Copyright © 2020 Noah Evans <noah@nevans.me> ;;; Copyright © 2020, 2021 Noah Evans <noah@nevans.me>
;;; Copyright © 2020 Brit Butler <brit@kingcons.io>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -130,6 +131,7 @@
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages dictionaries) #:use-module (gnu packages dictionaries)
#:use-module (gnu packages djvu) #:use-module (gnu packages djvu)
#:use-module (gnu packages ebook)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
@ -723,6 +725,50 @@ this one is much simpler and much more consistent. When using this package,
then only the color of the mode line changes when a window becomes in-/active.") then only the color of the mode line changes when a window becomes in-/active.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-theme-magic
;; No tagged release upstream, but the commit below correspond to the 0.2.3
;; release.
(let ((commit "844c4311bd26ebafd4b6a1d72ddcc65d87f074e3")
(revision "0"))
(package
(name "emacs-theme-magic")
(version "0.2.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jcaw/theme-magic")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "10gkg7jh1s1484gm66a87zr7x8vmv00s7gfd0w2pj47nqf98g8hz"))))
(build-system emacs-build-system)
(arguments
`(
;; Include Pywal interaction scripts.
#:include (cons "^python/" %default-include)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((files '("theme-magic.el" "python/wal_change_colors.py"))
(python (assoc-ref inputs "python"))
(python-pywal (assoc-ref inputs "python-pywal")))
(substitute* files
(("\"python\"") (string-append "\"" python "/bin/python3\""))
(("\"wal\"") (string-append "\"" python-pywal "/bin/wal\""))))
#t)))))
(inputs
`(("python" ,python)
("python-pywal" ,python-pywal)))
(home-page "https://github.com/jcaw/theme-magic")
(synopsis "Generate and apply color palettes based on your Emacs theme")
(description
"This package provides a command to extract the colors from your Emacs
theme and apply them to the rest of Linux with Pywal. Pywal only applies your
theme to the current session.")
(license license:gpl3+))))
(define-public emacs-treepy (define-public emacs-treepy
(package (package
(name "emacs-treepy") (name "emacs-treepy")
@ -1844,6 +1890,34 @@ like. It can be linked with various Emacs mail clients (Message and Mail
mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-counsel-bbdb
(package
(name "emacs-counsel-bbdb")
(version "20181128.1320")
(source
(origin
(method url-fetch)
(uri (string-append "https://melpa.org/packages/counsel-bbdb-"
version ".el"))
(sha256
(base32
"03g3lk8hz9a17vf5r16x054bhyk8xsbnfq0div8ig13fmhqi159q"))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-ivy" ,emacs-ivy)))
(home-page "https://github.com/redguard/counsel-bbdb")
(synopsis "Ivy interface for BBDB")
(description "This Ivy extension enables the use of @code{ivy-mode} to input
email addresses from BBDB efficiently. The main functions are:
@table @code
@item counsel-bbdb-complete-mail to input email addresses;
@item counsel-bbdb-reload' to reload contacts from BBDB database;
@item counsel-bbdb-expand-mail-alias to expand mail alias.
@end table
Since @code{counsel-bbdb} is based on @code{ivy-mode}, all Ivy key bindings
are supported. For example, after @samp{C-u M-x counsel-bbdb-complete-mail},
you can press @samp{C-M-n} to input multiple email addresses.")
(license license:gpl3+)))
(define-public emacs-bluetooth (define-public emacs-bluetooth
(package (package
(name "emacs-bluetooth") (name "emacs-bluetooth")
@ -2071,14 +2145,14 @@ as a library for other Emacs packages.")
(define-public emacs-auctex (define-public emacs-auctex
(package (package
(name "emacs-auctex") (name "emacs-auctex")
(version "13.0.3") (version "13.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"auctex-" version ".tar")) "auctex-" version ".tar"))
(sha256 (sha256
(base32 "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi")))) (base32 "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65"))))
(build-system emacs-build-system) (build-system emacs-build-system)
;; We use 'emacs' because AUCTeX requires dbus at compile time ;; We use 'emacs' because AUCTeX requires dbus at compile time
;; ('emacs-minimal' does not provide dbus). ;; ('emacs-minimal' does not provide dbus).
@ -2253,7 +2327,7 @@ Lock key.")
(define-public emacs-chronometrist (define-public emacs-chronometrist
(package (package
(name "emacs-chronometrist") (name "emacs-chronometrist")
(version "0.5.6") (version "0.6.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2262,7 +2336,7 @@ Lock key.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0g54pxvid1hlynlnfx99sl027q2mr2f4axsvnf0vb3v48zm0n5cw")))) (base32 "0ql72qh0bshv62nksv6awz5nqfhmgs8hkyvm7wvzfq64yrwghw50"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2536,19 +2610,22 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-imenu-list (define-public emacs-imenu-list
(let ((commit "46008738f8fef578a763c308cf6695e5b4d4aa77")
(revision "0")
(version "0.8"))
(package (package
(name "emacs-imenu-list") (name "emacs-imenu-list")
(version "0.8") (version (git-version version revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://github.com/bmag/imenu-list") (url "https://github.com/bmag/imenu-list")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx")))) (base32 "14l3yw9y1nk103s7z5i1fmd6kvlb2p6ayi6sf9l1x1ydg9glrpl8"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/bmag/imenu-list") (home-page "https://github.com/bmag/imenu-list")
(synopsis (synopsis
@ -2558,7 +2635,7 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.")
@code{*Ilist*} that is populated with the current buffer's imenu entries. @code{*Ilist*} that is populated with the current buffer's imenu entries.
This buffer is typically shown as a sidebar (Emacs vertically splits the This buffer is typically shown as a sidebar (Emacs vertically splits the
window).") window).")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-mmm-mode (define-public emacs-mmm-mode
(package (package
@ -3774,19 +3851,18 @@ result.")
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'hardcode-rg-path (add-after 'unpack 'remove-rg-path
;; Hardcode the path to ripgrep. ;; Remove the path to ripgrep so that it works on remote systems.
(lambda _ (lambda _
(let ((file "rg.el")) (let ((file "rg.el"))
(chmod file #o644) (chmod file #o644)
(emacs-substitute-sexps file (emacs-substitute-sexps file
("(defcustom rg-executable" (which "rg"))))))))) ("(defcustom rg-executable" "rg"))))))))
(propagated-inputs (propagated-inputs
`(("emacs-s" ,emacs-s) `(("emacs-s" ,emacs-s)
("emacs-transient" ,emacs-transient) ("emacs-transient" ,emacs-transient)
("emacs-wgrep" ,emacs-wgrep))) ("emacs-wgrep" ,emacs-wgrep)
(inputs ("ripgrep" ,ripgrep)))
`(("ripgrep" ,ripgrep)))
(home-page "https://rgel.readthedocs.io/en/latest/") (home-page "https://rgel.readthedocs.io/en/latest/")
(synopsis "Search tool based on @code{ripgrep}") (synopsis "Search tool based on @code{ripgrep}")
(description (description
@ -4664,18 +4740,19 @@ for Flow files.")
(define-public emacs-flycheck-grammalecte (define-public emacs-flycheck-grammalecte
(package (package
(name "emacs-flycheck-grammalecte") (name "emacs-flycheck-grammalecte")
(version "1.2") (version "1.3")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://git.deparis.io/" (uri (git-reference
"flycheck-grammalecte/snapshot/" (url "https://git.umaneti.net/flycheck-grammalecte/")
"flycheck-grammalecte-" version ".tar.xz")) (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "1mzmzyik843r4j0ibpwqrxmb0g4xmirrf3lxr010bddkmmxf749a")))) (base32 "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:include '("\\.(el|py)$") `(#:include (cons "\\.py$" %default-include)
#:exclude '("^test-profile.el$") #:exclude '("^test-profile.el$")
#:emacs ,emacs ;need libxml support #:emacs ,emacs ;need libxml support
#:phases #:phases
@ -4690,28 +4767,22 @@ for Flow files.")
(substitute* '("conjugueur.py" "flycheck-grammalecte.py") (substitute* '("conjugueur.py" "flycheck-grammalecte.py")
(("/usr/bin/env python3?") python3)) (("/usr/bin/env python3?") python3))
#t))) #t)))
(add-before 'build 'link-to-grammalecte (add-after 'unpack 'specify-grammalecte-location
;; XXX: The Python part of the package requires grammalecte, but (lambda* (#:key inputs #:allow-other-keys)
;; the library is not specified in PYTHONPATH, since we're not (make-file-writable "flycheck-grammalecte.el")
;; using Python build system. As a workaround, we symlink (emacs-substitute-variables "flycheck-grammalecte.el"
;; grammalecte libraries here. ("flycheck-grammalecte-grammalecte-directory"
(lambda* (#:key inputs outputs #:allow-other-keys) (string-append (assoc-ref inputs "grammalecte")
(let* ((out (assoc-ref outputs "out")) "/lib/python"
(grammalecte (assoc-ref inputs "grammalecte")) ,(version-major+minor (package-version python))
(version ,(version-major+minor (package-version python)))) "/site-packages/grammalecte")))
(with-directory-excursion #t)))))
(string-append out "/share/emacs/site-lisp")
(symlink (string-append grammalecte "/lib/"
"python" version "/site-packages/"
"grammalecte")
"grammalecte"))
#t))))))
(inputs (inputs
`(("grammalecte" ,grammalecte) `(("grammalecte" ,grammalecte)
("python" ,python))) ("python" ,python)))
(propagated-inputs (propagated-inputs
`(("emacs-flycheck" ,emacs-flycheck))) `(("emacs-flycheck" ,emacs-flycheck)))
(home-page "https://git.deparis.io/flycheck-grammalecte/") (home-page "https://git.umaneti.net/flycheck-grammalecte/")
(synopsis "Integrate Grammalecte with Flycheck") (synopsis "Integrate Grammalecte with Flycheck")
(description (description
"Integrate the French grammar and typography checker Grammalecte with "Integrate the French grammar and typography checker Grammalecte with
@ -6344,6 +6415,57 @@ drill sessions to aid in memorization. In these sessions you are shown flash
cards created in Org mode.") cards created in Org mode.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-anki-editor
;; Last release was in 2018.
(let ((commit "546774a453ef4617b1bcb0d1626e415c67cc88df")
(revision "0")
(version "0.3.3"))
(package
(name "emacs-anki-editor")
(version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/louietan/anki-editor")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1if610hq5j8rbjh1caw5bwbgnsn231awwxqbpwvrh966kdxzl4qf"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-request" ,emacs-request)))
(home-page "https://github.com/louietan/anki-editor")
(synopsis "Minor mode for making Anki cards with Org mode")
(description
"This package is for people who use Anki as a spaced repetition system
(SRS) but would like to make cards in Org mode.")
(license license:gpl3+))))
(define-public emacs-org-mime
(package
(name "emacs-org-mime")
(version "0.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/org-mime/org-mime")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj"))))
(build-system emacs-build-system)
(home-page "http://github.com/org-mime/org-mime")
(synopsis "Send HTML email using Org mode HTML export")
(description
"This program sends HTML email using Org-mode HTML export.
This approximates a WYSiWYG HTML mail editor from within Emacs, and can be
useful for sending tables, fontified source code, and inline images in
email.")
(license license:gpl3+)))
(define-public emacs-org-superstar (define-public emacs-org-superstar
(package (package
(name "emacs-org-superstar") (name "emacs-org-superstar")
@ -6983,6 +7105,60 @@ any one of several ways: literally, as a regexp, as an initialism, in the flex
style, or as multiple word prefixes.") style, or as multiple word prefixes.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-consult
;; There are no tagged releases upstream on GitHub, instead we are using the
;; most recent commit.
(let ((commit "ef6bb73a4a46e686826968fa25169e2d59b9a087")
(revision "0"))
(package
(name "emacs-consult")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minad/consult")
(commit commit)))
(sha256
(base32 "00cnwg2knd820wwx6zg71rr0whpdhqm64gm3qx1mgklk79g7daih"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-flycheck" ,emacs-flycheck)
("emacs-selectrum" ,emacs-selectrum)))
(home-page "https://github.com/minad/consult")
(synopsis "Consulting completing-read")
(description "This package provides various handy commands based on the
Emacs completion function completing-read, which allows to quickly select from a
list of candidates.")
(license license:gpl3+))))
(define-public emacs-marginalia
;; There are no tagged releases upstream on GitHub, instead we are using the
;; most recent commit.
(let ((commit "401993562dbf636054dd64988e44d19b5030867f")
(revision "0"))
(package
(name "emacs-marginalia")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minad/marginalia")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1j0k9ija5paidj7yvbagkkayz9bjwhia9yhmd2q4490ginbbxshs"))))
(build-system emacs-build-system)
(home-page "https://github.com/minad/marginalia")
(synopsis "Marginalia in the minibuffer")
(description
"This package provides Marginalia mode which adds marginalia to the
minibuffer completions. Marginalia are marks or annotations placed at the
margin of the page of a book or in this case helpful colorful annotations
placed at the margin of the minibuffer for your completion candidates.")
(license license:gpl3+))))
(define-public emacs-smartparens (define-public emacs-smartparens
(package (package
(name "emacs-smartparens") (name "emacs-smartparens")
@ -8622,7 +8798,7 @@ and tooling.")
(define-public emacs-elfeed (define-public emacs-elfeed
(package (package
(name "emacs-elfeed") (name "emacs-elfeed")
(version "3.3.0") (version "3.4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -8631,7 +8807,7 @@ and tooling.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0j8a94val4ml7g1vcjgzk1w89h55sxfdrwnncmz6qbh1y2xsz8c5")))) (base32 "1y95410hrcp23zc84sn79bxla9xr2fqh7wwagza05iaprv7zbbw0"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:tests? #t `(#:tests? #t
@ -9236,6 +9412,28 @@ Dust.js, React/JSX, Angularjs, ejs, etc.")
(home-page "http://web-mode.org/") (home-page "http://web-mode.org/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-templatel
(package
(name "emacs-templatel")
(version "0.1.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/clarete/templatel")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1k33h503038l2bcr8gs020z2cjxfs94lamkdgv52cvd9i20d0kqq"))))
(build-system emacs-build-system)
(home-page "https://clarete.li/templatel")
(synopsis "Jinja inspired template language for Emacs Lisp")
(description
"templatel is the modern templating language. It provides variable
substitution and control flow through a clean and powerful language inspired
by Python's Jinja.")
(license license:gpl3+)))
(define-public emacs-wgrep (define-public emacs-wgrep
(package (package
(name "emacs-wgrep") (name "emacs-wgrep")
@ -9491,7 +9689,7 @@ target will call @code{compile} on it.")
(define-public emacs-cider (define-public emacs-cider
(package (package
(name "emacs-cider") (name "emacs-cider")
(version "0.26.1") (version "1.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -9500,7 +9698,7 @@ target will call @code{compile} on it.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d")))) (base32 "143kh9k34yk0g6kdlkma6g432kmb2r9r1lhyq4irsw6d3vaql7dj"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
'(#:exclude ;don't exclude 'cider-test.el' '(#:exclude ;don't exclude 'cider-test.el'
@ -9923,8 +10121,8 @@ extensions.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-evil-collection (define-public emacs-evil-collection
(let ((commit "8c256263ad100fecd6246c6c55cbb19dab717c39") (let ((commit "323bb7d85848a6a142ae14f39c3a073ce6423e20")
(revision "18")) (revision "19"))
(package (package
(name "emacs-evil-collection") (name "emacs-evil-collection")
(version (git-version "0.0.3" revision commit)) (version (git-version "0.0.3" revision commit))
@ -9936,7 +10134,7 @@ extensions.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hz1yfv5g016dm99bwnibbmyhbi21qlc39ckd7p3s82az89hgf2n")))) "1pf51kj93i1k2ivkjgwcvgxj8shrl8h7rkg578jl4k4awargf0nz"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil) `(("emacs-evil" ,emacs-evil)
@ -9976,9 +10174,9 @@ being deleted, changed, yanked, or pasted when using evil commands")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-goto-chg (define-public emacs-goto-chg
(let ((commit "1829a13026c597e358f716d2c7793202458120b5") (let ((commit "2af612153bc9f5bed135d25abe62f46ddaa9027f")
(version "1.7.3") (version "1.7.3")
(revision "1")) (revision "2"))
(package (package
(name "emacs-goto-chg") (name "emacs-goto-chg")
(version (git-version version revision commit)) (version (git-version version revision commit))
@ -9991,10 +10189,8 @@ being deleted, changed, yanked, or pasted when using evil commands")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1y603maw9xwdj3qiarmf1bp13461f9f5ackzicsbynl0i9la3qki")))) "1awmvihqgw6kspx192bcp9xp56xqbma90wlhxfxmidx3bvxghwpv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs
`(("emacs-undo-tree" ,emacs-undo-tree)))
(home-page "https://github.com/emacs-evil/goto-chg") (home-page "https://github.com/emacs-evil/goto-chg")
(synopsis "Go to the last change in the Emacs buffer") (synopsis "Go to the last change in the Emacs buffer")
(description (description
@ -11575,14 +11771,14 @@ information via a consistent and well-integrated user interface.")
(define-public emacs-adaptive-wrap (define-public emacs-adaptive-wrap
(package (package
(name "emacs-adaptive-wrap") (name "emacs-adaptive-wrap")
(version "0.7") (version "0.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"adaptive-wrap-" version ".el")) "adaptive-wrap-" version ".tar"))
(sha256 (sha256
(base32 "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp")))) (base32 "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/adaptive-wrap.html") (home-page "https://elpa.gnu.org/packages/adaptive-wrap.html")
(synopsis "Smart line-wrapping with wrap-prefix") (synopsis "Smart line-wrapping with wrap-prefix")
@ -12031,14 +12227,14 @@ and cangjie.")
(define-public emacs-posframe (define-public emacs-posframe
(package (package
(name "emacs-posframe") (name "emacs-posframe")
(version "0.8.3") (version "0.8.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"posframe-" version ".el")) "posframe-" version ".tar"))
(sha256 (sha256
(base32 "05m56aw2yxik0pgcvyr5c92j2mwfksxgq1syzvik6161gy8hdd0g")))) (base32 "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp"))))
(build-system emacs-build-system) (build-system emacs-build-system)
;; emacs-minimal does not include the function font-info. ;; emacs-minimal does not include the function font-info.
(arguments (arguments
@ -12766,6 +12962,29 @@ JSONRPC is a generic Remote Procedure Call protocol designed around
JSON objects.") JSON objects.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-jsonnet-mode
(package
(name "emacs-jsonnet-mode")
(version "0.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tminor/jsonnet-mode")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0vi7415n90d1z2ww1hld0gdp6v7z4rd6f70h476dp2x4hydk293i"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)))
(home-page "https://github.com/mgyucht/jsonnet-mode")
(synopsis "Major mode for editing jsonnet files")
(description "This package provides syntax highlighting, indenting,
formatting, and utility methods for jsonnet files.")
(license license:gpl3+)))
(define-public emacs-restclient (define-public emacs-restclient
(let ((commit "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3") (let ((commit "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3")
(version "0") (version "0")
@ -12879,8 +13098,8 @@ the actual transformations.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public emacs-dired-hacks (define-public emacs-dired-hacks
(let ((commit "886befe113fae397407c804f72c45613d1d43535") (let ((commit "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388")
(revision "2")) (revision "3"))
(package (package
(name "emacs-dired-hacks") (name "emacs-dired-hacks")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -12892,7 +13111,7 @@ the actual transformations.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1cvibg90ggyrivpjmcfprpi2fx7dpa68f8kzg08s88gw5ib75djl")))) "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
@ -13512,14 +13731,14 @@ database of references on life sciences.")
(define-public emacs-websocket (define-public emacs-websocket
(package (package
(name "emacs-websocket") (name "emacs-websocket")
(version "1.13") (version "1.13.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"websocket-" version ".tar")) "websocket-" version ".tar"))
(sha256 (sha256
(base32 "0jnarx53csmx5fivzp5vhvvj3m8s03zwc6hjl0spz5zb6icqclsa")))) (base32 "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/websocket.html") (home-page "https://elpa.gnu.org/packages/websocket.html")
(synopsis "Emacs WebSocket client and server") (synopsis "Emacs WebSocket client and server")
@ -13667,6 +13886,36 @@ through them using @key{C-c C-SPC}.")
messaging service.") messaging service.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-helm-slack
(let ((commit "465f6220f3f5bee4d95492991fca1290c89534eb")
(revision "1"))
(package
(name "emacs-helm-slack")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yuya373/helm-slack")
(commit commit)))
(file-name (git-file-name name commit))
(sha256
(base32
"0p1s1kl8v68qjprqkf034cz911qzbqxbscqgpn0c3mbm3yfx81f7"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; HOME needs to exist for source compilation.
(add-before 'build 'set-HOME
(lambda _ (setenv "HOME" "/tmp") #t)))))
(propagated-inputs `(("emacs-slack", emacs-slack)))
(home-page "https://github.com/yuya373/helm-slack")
(synopsis "Helm extension for emacs-slack")
(description "This package provides an helm extension for emacs-slack
Slack client.")
(license license:gpl3+))))
(define-public emacs-bash-completion (define-public emacs-bash-completion
(package (package
(name "emacs-bash-completion") (name "emacs-bash-completion")
@ -13949,7 +14198,7 @@ Features:
(define-public emacs-evil-matchit (define-public emacs-evil-matchit
(package (package
(name "emacs-evil-matchit") (name "emacs-evil-matchit")
(version "2.3.9") (version "2.3.10")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -13958,7 +14207,7 @@ Features:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1jk5qkqz3c4fnh6d2y889k5ycz8ipbkmzk4i8bl86xv9rhis1pv9")))) (base32 "14nrc46290q54y7wv25251f2kqc0z8i9byl09xkgjijqldl9vdxa"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil))) `(("emacs-evil" ,emacs-evil)))
@ -15872,8 +16121,8 @@ navigate and display hierarchy structures.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-pulseaudio-control (define-public emacs-pulseaudio-control
(let ((commit "7e1a87068379075a5e9ce36c64c686c03d20d379") (let ((commit "a931533140547510decdc368f39b2d2b97ca725f")
(revision "3")) (revision "4"))
(package (package
(name "emacs-pulseaudio-control") (name "emacs-pulseaudio-control")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -15886,7 +16135,7 @@ navigate and display hierarchy structures.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0wcaqyh15x56255rrj350089z15pnwixa2vf0ly6dv0hjmzmh3mr")))) "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
@ -16073,6 +16322,32 @@ dumb text search, @code{elisp-refs} actually parses the code, so it's never
confused by comments or @code{foo-bar} matching @code{foo}.") confused by comments or @code{foo-bar} matching @code{foo}.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-crdt
(let ((commit "44068ae505adf2c3a7bdbf6723a25fc45d6d1666")
(revision "0"))
(package
(name "emacs-crdt")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://code.librehq.com/qhong/crdt.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "130fkhvi757pfnbz70g6nw2n71k89cwwx7yzvsd5v177228c8w7w"))))
(build-system emacs-build-system)
(home-page "https://code.librehq.com/qhong/crdt.el")
(synopsis "Real-time collaborative editing environment")
(description
"@code{crdt.el} is a real-time collaborative editing environment for
Emacs using Conflict-free Replicated Data Types. With it, you can share
multiple buffer in one session, and see other users’ cursor and region. It
also synchronizes Org mode folding status. It should work with all of Org
mode.")
(license license:gpl3+))))
(define-public emacs-crux (define-public emacs-crux
(let ((commit "308f17d914e2cd79cbc809de66d02b03ceb82859") (let ((commit "308f17d914e2cd79cbc809de66d02b03ceb82859")
(revision "2")) (revision "2"))
@ -18134,16 +18409,16 @@ appropriate directory if no @code{eshell} session is active.")
(define-public emacs-eshell-syntax-highlighting (define-public emacs-eshell-syntax-highlighting
(package (package
(name "emacs-eshell-syntax-highlighting") (name "emacs-eshell-syntax-highlighting")
(version "0.2") (version "0.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/akreisher/eshell-syntax-highlighting") (url "https://github.com/akreisher/eshell-syntax-highlighting")
(commit version))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0id27874wsb5y169030x8g1ldpa1mnskv1s2j3ygqiyh5fvpfash")))) (base32 "1fb9aa85a3hx1rcmv71j6sc3y278452p1y4dabpwy07avb6apd0p"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/akreisher/eshell-syntax-highlighting") (home-page "https://github.com/akreisher/eshell-syntax-highlighting")
(synopsis "Add syntax highlighting to Eshell") (synopsis "Add syntax highlighting to Eshell")
@ -20083,7 +20358,7 @@ correctly.")
(define-public emacs-helm-sly (define-public emacs-helm-sly
(package (package
(name "emacs-helm-sly") (name "emacs-helm-sly")
(version "0.5.1") (version "0.7.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -20092,7 +20367,7 @@ correctly.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx")))) "12w1j1irgv6gy48zb4xi28ryan3fxd9kaay42798am5i1xa0yjjm"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm) `(("emacs-helm" ,emacs-helm)
@ -20957,6 +21232,25 @@ with emacs. It displays the output of the @code{repo status} command in a
buffer and launches Magit from the status buffer for the project at point.") buffer and launches Magit from the status buffer for the project at point.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-repology
(package
(name "emacs-repology")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"repology-" version ".tar"))
(sha256
(base32 "031245rrhazj53bk1csa6x3ygzvg74w2hwjf08ficwvmdn97li90"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/repology.html")
(synopsis "Repology API access via Elisp")
(description
"This package provides tools to query Repology API (see
@url{https://repology.org/api}), process results, and display them.")
(license license:gpl3+)))
(define-public emacs-alect-themes (define-public emacs-alect-themes
(package (package
(name "emacs-alect-themes") (name "emacs-alect-themes")
@ -22583,6 +22877,21 @@ through Dash docsets.")
(sha256 (sha256
(base32 "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv")))) (base32 "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((calibre (assoc-ref inputs "calibre")))
(make-file-writable "calibredb-core.el")
(emacs-substitute-variables "calibredb-core.el"
("calibredb-program"
(string-append calibre "/bin/calibredb"))
("calibredb-fetch-metadata-program"
(string-append calibre "/bin/fetch-ebook-metadata"))))
#t)))))
(inputs
`(("calibre" ,calibre)))
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
("emacs-s" ,emacs-s) ("emacs-s" ,emacs-s)
@ -22693,14 +23002,14 @@ well as an option for visually flashing evaluated s-expressions.")
(define-public emacs-tramp (define-public emacs-tramp
(package (package
(name "emacs-tramp") (name "emacs-tramp")
(version "2.5.0") (version "2.5.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"tramp-" version ".tar")) "tramp-" version ".tar"))
(sha256 (sha256
(base32 "1jpnqyk108nksaym2b9v243y5zkpr4px9d070wsb9cwm3xrcd8rh")))) (base32 "0kqlc03bbsdywp0m3mf0m62hqyam8vg81phh7nqmpdjzskrdc1yy"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:emacs ,emacs ;need D-Bus `(#:emacs ,emacs ;need D-Bus
@ -23754,7 +24063,7 @@ Emacs that integrate with major modes like Org-mode.")
(define-public emacs-modus-themes (define-public emacs-modus-themes
(package (package
(name "emacs-modus-themes") (name "emacs-modus-themes")
(version "1.0.2") (version "1.1.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -23763,7 +24072,7 @@ Emacs that integrate with major modes like Org-mode.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1v82payjgx8z0qdklsrkim7xkb6hqrbs34d5qpq0sii43jwhiy5j")))) (base32 "1n716nasa1pccz7983kicagc9sqnxlyfmflvifqk4kza2ks0rh9m"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://protesilaos.com/modus-themes/") (home-page "https://protesilaos.com/modus-themes/")
(synopsis "Accessible themes (WCAG AAA)") (synopsis "Accessible themes (WCAG AAA)")
@ -24902,7 +25211,7 @@ pattern guessed from thing under current cursor position.
(define-public emacs-helm-selector (define-public emacs-helm-selector
(package (package
(name "emacs-helm-selector") (name "emacs-helm-selector")
(version "0.5") (version "0.6.1")
(home-page "https://github.com/emacs-helm/helm-selector") (home-page "https://github.com/emacs-helm/helm-selector")
(source (source
(origin (origin
@ -24913,7 +25222,7 @@ pattern guessed from thing under current cursor position.
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1cv659sqmrvk316fp7mjc58vvbcg1j6s2q4rwgqrpbyszrxl3i63")))) "01lh1df0bnas1p7xlqc4i1jd67f8lxgq0q2zsvx10z8828i76j3v"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm))) `(("emacs-helm" ,emacs-helm)))
@ -25761,7 +26070,7 @@ comments or emails.")
(define-public emacs-trashed (define-public emacs-trashed
(package (package
(name "emacs-trashed") (name "emacs-trashed")
(version "1.9.0") (version "2.1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -25770,7 +26079,7 @@ comments or emails.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "13grdi12iwlw4fiphdfmvclfpbr6ajlgfbfyi7v41z8k3rxz4ypz")))) (base32 "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/shingo256/trashed/") (home-page "https://github.com/shingo256/trashed/")
(synopsis "View and edit system trash can in Emacs") (synopsis "View and edit system trash can in Emacs")

20
gnu/packages/emacs.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
@ -195,16 +195,10 @@
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Directly copy emacs-X.Y to emacs, so that it is not wrapped ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped
;; twice. This also fixes a minor issue, where WMs would not be ;; twice. This also fixes a minor issue, where WMs would not be
;; able to track emacs back to emacs.desktop. The version is ;; able to track emacs back to emacs.desktop.
;; accessed using using THIS-PACKAGE so it "just works" for
;; inherited Emacs packages of different versions.
(with-directory-excursion (assoc-ref outputs "out") (with-directory-excursion (assoc-ref outputs "out")
(copy-file (string-append (copy-file
"bin/emacs-" (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
,(let ((this-version (package-version this-package)))
(or (false-if-exception
(version-major+minor+point this-version))
(version-major+minor this-version))))
"bin/emacs") "bin/emacs")
#t))) #t)))
(add-before 'reset-gzip-timestamps 'make-compressed-files-writable (add-before 'reset-gzip-timestamps 'make-compressed-files-writable
@ -314,8 +308,8 @@ languages.")
(files '("share/info")))))))) (files '("share/info"))))))))
(define-public emacs-next-pgtk (define-public emacs-next-pgtk
(let ((commit "d46a223d8595e8edb67c6361033625797503cacf") (let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2")
(revision "0")) (revision "1"))
(package/inherit emacs-next (package/inherit emacs-next
(name "emacs-next-pgtk") (name "emacs-next-pgtk")
(version (git-version "28.0.50" revision commit)) (version (git-version "28.0.50" revision commit))
@ -328,7 +322,7 @@ languages.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1fhkgqsdpy3qkf8wyjvavnfyh8byxh0h80n0448rkg9k0lrkl4wf")))) "07hgfqh965zmra0rbmnf63p3lsinpv5hn5payqcrjx25pl75xnaf"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments emacs-next) (substitute-keyword-arguments (package-arguments emacs-next)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())

6
gnu/packages/emulators.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2015, 2018 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2015, 2018 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
@ -1552,7 +1552,7 @@ This is a part of the TiLP project.")
(define-public mame (define-public mame
(package (package
(name "mame") (name "mame")
(version "0.227") (version "0.228")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1561,7 +1561,7 @@ This is a part of the TiLP project.")
(commit (apply string-append "mame" (string-split version #\.))))) (commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0p7xhsahmkr5hh3j6hc1mpgi5z4navy77v4k35i0sgpdv1ax4y2l")) (base32 "1xqd0b8xz9bc6ks9qbnrm7kkjcr81l0ksisvflr6gr6lxg2268xz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.

39
gnu/packages/engineering.scm
View file

@ -15,12 +15,12 @@
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com> ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu> ;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -50,6 +50,7 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system ant) #:use-module (guix build-system ant)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
@ -1214,14 +1215,14 @@ use on a given system.")
(define-public libredwg (define-public libredwg
(package (package
(name "libredwg") (name "libredwg")
(version "0.11.1") (version "0.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/libredwg/libredwg-" (uri (string-append "mirror://gnu/libredwg/libredwg-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "1xx6y6ckm4mzqln8y8lqf5frcn2b32ypc0d0h9dzpz6363zh7pdn")))) (base32 "0z5algzi3alq166885y0qyj2gnc7gc6vhnz7nw0kwc0d236p6md8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-bindings"))) `(#:configure-flags '("--disable-bindings")))
@ -1524,7 +1525,7 @@ bindings for Python, Java, OCaml and more.")
(define-public radare2 (define-public radare2
(package (package
(name "radare2") (name "radare2")
(version "4.4.0") (version "5.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1532,7 +1533,7 @@ bindings for Python, Java, OCaml and more.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s")) "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -2367,7 +2368,7 @@ simulation.")
(define-public cutter (define-public cutter
(package (package
(name "cutter") (name "cutter")
(version "1.10.3") (version "1.12.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2376,7 +2377,7 @@ simulation.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk")))) (base32 "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2513,6 +2514,26 @@ full programmatic control over your models.")
(home-page "https://www.openscad.org/") (home-page "https://www.openscad.org/")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-scad-mode
(package
(inherit openscad)
(name "emacs-scad-mode")
(native-inputs '())
(inputs '())
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir-elisp
;; Elisp directory is not in root of the source.
(lambda _
(chdir "contrib")
#t)))))
(synopsis "Emacs major mode for editing editing OpenSCAD code")
(description "@code{scad-mode} provides an Emacs major mode for editing
OpenSCAD code. It supports syntax highlighting, indenting and refilling of
comments.")))
(define-public freecad (define-public freecad
(let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858") (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858")
(revision "1")) (revision "1"))

13
gnu/packages/enlightenment.scm
View file

@ -198,7 +198,7 @@ removable devices or support for multimedia.")
(define-public terminology (define-public terminology
(package (package
(name "terminology") (name "terminology")
(version "1.8.1") (version "1.9.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -206,7 +206,7 @@ removable devices or support for multimedia.")
"terminology/terminology-" version ".tar.xz")) "terminology/terminology-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4")) "0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove the bundled fonts. ;; Remove the bundled fonts.
(snippet (snippet
@ -217,10 +217,11 @@ removable devices or support for multimedia.")
#t)))) #t))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags (list "-Dtests=true" `(#:configure-flags
(string-append "-Dedje-cc=" (let ((efl (assoc-ref %build-inputs "efl")))
(assoc-ref %build-inputs "efl") (list "-Dtests=true"
"/bin/edje_cc")) (string-append "-Dedje-cc=" efl "/bin/edje_cc")
(string-append "-Deet=" efl "/bin/eet")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'set-home-directory (add-after 'unpack 'set-home-directory

15
gnu/packages/erlang.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nikita <nikita@n0.is> ;;; Copyright © 2018 Nikita <nikita@n0.is>
;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -40,7 +41,7 @@
(define-public erlang (define-public erlang
(package (package
(name "erlang") (name "erlang")
(version "21.3.8.13") (version "23.2.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
;; The tarball from http://erlang.org/download contains many ;; The tarball from http://erlang.org/download contains many
@ -52,7 +53,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj")) "1p3lw4bcm2dph3pf1h4i0d9pzrcfr83r0iadqanxkwbmm1bl11pm"))
(patches (search-patches "erlang-man-path.patch")))) (patches (search-patches "erlang-man-path.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -68,7 +69,7 @@
(version-major+minor version) ".tar.gz")) (version-major+minor version) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm")))))) "0rq0rw68f02vckgdiwmvx8bvyv00l81s27cq59i3h79j9prfal2n"))))))
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)
("openssl" ,openssl) ("openssl" ,openssl)
@ -180,6 +181,14 @@
(lambda _ (lambda _
(invoke "./otp_build" "autoconf") (invoke "./otp_build" "autoconf")
#t)) #t))
(add-after 'autoconf 'patch-configure-script-shell
(lambda _
(substitute* "configure"
(("cmd_str=\"./configure")
(string-append "cmd_str=\""
(which "sh")
" ./configure")))
#t))
(add-after 'install 'patch-erl (add-after 'install 'patch-erl
;; This only works after install. ;; This only works after install.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)

61
gnu/packages/fcitx.scm
View file

@ -19,11 +19,13 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages fcitx) (define-module (gnu packages fcitx)
#:use-module ((guix licenses) #:select (gpl2+)) #:use-module ((guix licenses) #:select (gpl2+ bsd-3))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system qt)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages enchant) #:use-module (gnu packages enchant)
@ -33,14 +35,69 @@
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages iso-codes) #:use-module (gnu packages iso-codes)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg))
(define-public fcitx-qt5
(package
(name "fcitx-qt5")
(version "1.2.5")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/fcitx/fcitx-qt5.git")
(commit version)))
(file-name
(git-file-name name version))
(sha256
(base32 "1d56bp11jp85b2r4syw1clfg4vqxqfh7gygpwz8wk5sxmfmmdq83"))))
(build-system qt-build-system)
(arguments
`(#:tests? #f ; No target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-install-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "quickphrase-editor/CMakeLists.txt"
(("\\$\\{FCITX4_ADDON_INSTALL_DIR\\}")
(string-append
(assoc-ref outputs "out")
"/lib/fcitx")))
(substitute* "platforminputcontext/CMakeLists.txt"
(("\\$\\{CMAKE_INSTALL_QTPLUGINDIR\\}")
(string-append
(assoc-ref outputs "out")
"/lib/qt5/plugins")))
#t)))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("fcitx" ,fcitx)
("libintl" ,intltool)
("libxkbcommon" ,libxkbcommon)))
(propagated-inputs
`(("qtbase" ,qtbase)))
(synopsis "Fcitx Qt5 Input Context")
(description "This package provides a Qt5 frontend for fcitx.")
(home-page "https://github.com/fcitx/fcitx-qt5/")
(license
(list
;; Plugin
bsd-3
;; Others
gpl2+))))
(define-public presage (define-public presage
(package (package

36
gnu/packages/fcitx5.scm
View file

@ -51,7 +51,7 @@
(define-public xcb-imdkit (define-public xcb-imdkit
(package (package
(name "xcb-imdkit") (name "xcb-imdkit")
(version "1.0.1") (version "1.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -59,7 +59,7 @@
"https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-" "https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "1qgbbp8y8ci7haz99vgbrgpjsbrwwyjianyhdvxcirnbm5bybvmz")) (base32 "16f7jdnrr8lrll7qvnj0gh3gwzgn5idfsc9rwi1gp1n2mnjrs7w0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -86,7 +86,7 @@ client.")
(define-public fcitx5 (define-public fcitx5
(package (package
(name "fcitx5") (name "fcitx5")
(version "5.0.3") (version "5.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -94,7 +94,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-" "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
version "_dict.tar.xz")) version "_dict.tar.xz"))
(sha256 (sha256
(base32 "06zkb33m2rnhg385iy79n3r4svz5jbav74di61xqa3lhbv7534s3")))) (base32 "14pqbjbdc3b5xlycm92gs1rgkmpykfnyls3gfr608902lk2lw5as"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -146,7 +146,7 @@ client.")
(define-public fcitx5-lua (define-public fcitx5-lua
(package (package
(name "fcitx5-lua") (name "fcitx5-lua")
(version "5.0.1") (version "5.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -154,7 +154,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-" "https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "177mj56j8yrl79hvk7bbrifvm137np23pwalv83ibgk4l51z92hf")))) (base32 "0y5yc9102bz681f4wj6xqjxmfdmrshz3fhf39pa61718hkyy9lih"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("fcitx5" ,fcitx5) `(("fcitx5" ,fcitx5)
@ -171,14 +171,14 @@ client.")
(define-public libime (define-public libime
(package (package
(name "libime") (name "libime")
(version "1.0.2") (version "1.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-" (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
version "_dict.tar.xz")) version "_dict.tar.xz"))
(sha256 (sha256
(base32 "006pncby7p6h3rnicckzjwi6jzsrqiqbj6p9bpic80lanlllgw31")))) (base32 "1gi9ylqha9x3dhjsa2i7x9wh2g9vgqkkfr6s1facs2ky65vgvdrv"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("fcitx5" ,fcitx5) `(("fcitx5" ,fcitx5)
@ -196,7 +196,7 @@ editors.")
(define-public fcitx5-gtk (define-public fcitx5-gtk
(package (package
(name "fcitx5-gtk") (name "fcitx5-gtk")
(version "5.0.1") (version "5.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -204,7 +204,7 @@ editors.")
"/fcitx5-gtk/fcitx5-gtk-" "/fcitx5-gtk/fcitx5-gtk-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "0h53liraqc5nz4nyi3ixdfdw3zzkdcsiff7j25acc3gmaa5gyij7")))) (base32 "18bwwj9a5v82c6ssc8560hd8vwykakvg6sfijwdb5jswk9mafvgj"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;No test `(#:tests? #f ;No test
@ -212,7 +212,9 @@ editors.")
(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR="
%output "/share/gir-1.0") %output "/share/gir-1.0")
(string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR="
%output "/lib/girepository-1.0")) %output "/lib/girepository-1.0")
;; TODO: Enable it when Guix has GTK4.
"-DENABLE_GTK4_IM_MODULE=Off")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-install-prefix (add-before 'configure 'patch-install-prefix
@ -247,7 +249,7 @@ for GTK+2/GTK+3 application.")
(define-public fcitx5-qt (define-public fcitx5-qt
(package (package
(name "fcitx5-qt") (name "fcitx5-qt")
(version "5.0.1") (version "5.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -255,7 +257,7 @@ for GTK+2/GTK+3 application.")
"/fcitx5-qt/fcitx5-qt-" "/fcitx5-qt/fcitx5-qt-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "0ilhb4yw9k3m1c4fidnv3nd5dgm9xxds11dgdys6gswjjnmcgqqm")))) (base32 "15rn111mrp6lcgm0ka3vb6a6qwkv6kqkqn563wsm49n16iy1dhqj"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -282,7 +284,7 @@ for Qt based application.")
(define-public fcitx5-chinese-addons (define-public fcitx5-chinese-addons
(package (package
(name "fcitx5-chinese-addons") (name "fcitx5-chinese-addons")
(version "5.0.2") (version "5.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -290,7 +292,7 @@ for Qt based application.")
"/fcitx5-chinese-addons/fcitx5-chinese-addons-" "/fcitx5-chinese-addons/fcitx5-chinese-addons-"
version "_dict.tar.xz")) version "_dict.tar.xz"))
(sha256 (sha256
(base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp")))) (base32 "1kmzbllk0g86m2z3piwn9j84ihxixyxzv7rzj832xfvwqgk7gixk"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -343,7 +345,7 @@ including input methods previous bundled inside Fcitx 4:
(define-public fcitx5-configtool (define-public fcitx5-configtool
(package (package
(name "fcitx5-configtool") (name "fcitx5-configtool")
(version "5.0.1") (version "5.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -351,7 +353,7 @@ including input methods previous bundled inside Fcitx 4:
"https://download.fcitx-im.org/fcitx5" "https://download.fcitx-im.org/fcitx5"
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz")) "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
(sha256 (sha256
(base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b")))) (base32 "0rpk3yn572pcr29jak63x84g0qgj8hj011aw8gmxjah9311nxhpb"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

37
gnu/packages/file-systems.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021 raid5atemyhoemwork <raid5atemyhomework@protonmail.com> ;;; Copyright © 2021 raid5atemyhoemwork <raid5atemyhomework@protonmail.com>
@ -847,7 +847,7 @@ APFS.")
(define-public zfs (define-public zfs
(package (package
(name "zfs") (name "zfs")
(version "0.8.5") (version "2.0.1")
(outputs '("out" "module" "src")) (outputs '("out" "module" "src"))
(source (source
(origin (origin
@ -856,7 +856,7 @@ APFS.")
"/download/zfs-" version "/download/zfs-" version
"/zfs-" version ".tar.gz")) "/zfs-" version ".tar.gz"))
(sha256 (sha256
(base32 "0gfdnynmsxbhi97q73smrgmcw1k8zmlr1hgljfn38sk0kimivd6v")))) (base32 "0y3992l4nzr67q18lz1kizw0za1shvqbpmsjz9shv4frh5ihllbi"))))
(build-system linux-module-build-system) (build-system linux-module-build-system)
(arguments (arguments
`(;; The ZFS kernel module should not be downloaded since the license `(;; The ZFS kernel module should not be downloaded since the license
@ -885,19 +885,33 @@ APFS.")
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(src (assoc-ref outputs "src")) (src (assoc-ref outputs "src"))
(util-linux (assoc-ref inputs "util-linux")) (util-linux (assoc-ref inputs "util-linux"))
(nfs-utils (assoc-ref inputs "nfs-utils"))) (nfs-utils (assoc-ref inputs "nfs-utils"))
(kmod (assoc-ref inputs "kmod-runtime")))
(substitute* "etc/Makefile.in"
;; This just contains an example configuration file for
;; configuring ZFS on traditional init systems, skip it
;; since we cannot use it anyway; the install target becomes
;; misdirected.
(("= default ") "= "))
(substitute* "lib/libzfs/os/linux/libzfs_util_os.c"
;; Use path to /gnu/store/*-kmod in actual path that is exec'ed.
(("\"/sbin/modprobe\"")
(string-append "\"" kmod "/bin/modprobe" "\""))
;; Just use 'modprobe' in message to user, since Guix
;; does not have a traditional /sbin/
(("'/sbin/modprobe ") "'modprobe "))
(substitute* "contrib/Makefile.in" (substitute* "contrib/Makefile.in"
;; This is not configurable nor is its hard-coded /usr prefix. ;; This is not configurable nor is its hard-coded /usr prefix.
((" initramfs") "")) ((" initramfs") ""))
(substitute* "module/zfs/zfs_ctldir.c" (substitute* "module/os/linux/zfs/zfs_ctldir.c"
(("/usr/bin/env\", \"umount") (("/usr/bin/env\", \"umount")
(string-append util-linux "/bin/umount\", \"-n")) (string-append util-linux "/bin/umount\", \"-n"))
(("/usr/bin/env\", \"mount") (("/usr/bin/env\", \"mount")
(string-append util-linux "/bin/mount\", \"-n"))) (string-append util-linux "/bin/mount\", \"-n")))
(substitute* "lib/libzfs/libzfs_mount.c" (substitute* "lib/libzfs/os/linux/libzfs_mount_os.c"
(("/bin/mount") (string-append util-linux "/bin/mount")) (("/bin/mount") (string-append util-linux "/bin/mount"))
(("/bin/umount") (string-append util-linux "/bin/umount"))) (("/bin/umount") (string-append util-linux "/bin/umount")))
(substitute* "lib/libshare/nfs.c" (substitute* "lib/libshare/os/linux/nfs.c"
(("/usr/sbin/exportfs") (("/usr/sbin/exportfs")
(string-append nfs-utils "/sbin/exportfs"))) (string-append nfs-utils "/sbin/exportfs")))
(substitute* "config/zfs-build.m4" (substitute* "config/zfs-build.m4"
@ -915,7 +929,9 @@ APFS.")
(substitute* "contrib/pyzfs/Makefile.in" (substitute* "contrib/pyzfs/Makefile.in"
((".*install-lib.*") "")) ((".*install-lib.*") ""))
(substitute* '("Makefile.am" "Makefile.in") (substitute* '("Makefile.am" "Makefile.in")
(("\\$\\(prefix)/src") (string-append src "/src")))) (("\\$\\(prefix)/src") (string-append src "/src")))
(substitute* (find-files "udev/rules.d/" ".rules.in$")
(("/sbin/modprobe") (string-append kmod "/bin/modprobe"))))
#t)) #t))
(replace 'build (replace 'build
(lambda _ (invoke "make"))) (lambda _ (invoke "make")))
@ -939,6 +955,7 @@ APFS.")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("eudev" ,eudev) `(("eudev" ,eudev)
("kmod-runtime" ,kmod)
("libaio" ,libaio) ("libaio" ,libaio)
("libtirpc" ,libtirpc) ("libtirpc" ,libtirpc)
("nfs-utils" ,nfs-utils) ("nfs-utils" ,nfs-utils)
@ -1086,14 +1103,14 @@ Dropbox API v2.")
(define-public dbxfs (define-public dbxfs
(package (package
(name "dbxfs") (name "dbxfs")
(version "1.0.48") (version "1.0.50")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "dbxfs" version)) (uri (pypi-uri "dbxfs" version))
(sha256 (sha256
(base32 (base32
"07q7dgqaqqyapjl9r4lqydflrgx4dh84c1qsb0jvfmqj3i8887ak")) "01zvk862ybz12270q0r2l1i7kdj30ib2gxrlxmwvi19b2fkf39na"))
(patches (search-patches "dbxfs-remove-sentry-sdk.patch")))) (patches (search-patches "dbxfs-remove-sentry-sdk.patch"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments

63
gnu/packages/fonts.scm
View file

@ -38,6 +38,7 @@
;;; Copyright © 2020 Simen Endsjø <simendsjo@gmail.com> ;;; Copyright © 2020 Simen Endsjø <simendsjo@gmail.com>
;;; Copyright © 2020 Tim Van den Langenbergh <tmt_vdl@gmx.com> ;;; Copyright © 2020 Tim Van den Langenbergh <tmt_vdl@gmx.com>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1031,6 +1032,27 @@ Sans Pro family.")
(description "This is the typeface used by Mozilla in Firefox OS.") (description "This is the typeface used by Mozilla in Firefox OS.")
(license license:silofl1.1))) (license license:silofl1.1)))
(define-public font-fira-go
(package
(name "font-fira-go")
(version "1.000")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bBoxType/FiraGO")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"10rcfg1fijv00yxv5n9l3lm0axhafa1irkg42zpmasd70flgg655"))))
(build-system font-build-system)
(home-page "https://github.com/bBoxType/FiraGO")
(synopsis "Multilingual extension of the Fira Sans font family")
(description "FiraGO is a multilingual extension of the Fira Sans font
family. Based on the Fira Sans 4.3 glyph set, FiraGO adds support for the
Arabic, Devanagari, Georgian, Hebrew and Thai scripts.")
(license license:silofl1.1)))
(define-public font-fira-code (define-public font-fira-code
(package (package
(name "font-fira-code") (name "font-fira-code")
@ -1371,6 +1393,43 @@ programming. Iosevka is completely generated from its source code.")
"Sarasa Gothic is a programming font based on Iosevka and Source Han Sans, "Sarasa Gothic is a programming font based on Iosevka and Source Han Sans,
most CJK characters are same height, and double width as ASCII characters."))) most CJK characters are same height, and double width as ASCII characters.")))
(define-public font-space-grotesk
(package
(name "font-space-grotesk")
(version "2.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/floriankarsten/space-grotesk")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1aiivn0rl7ydiyqvsr0fa2hx82h3br3x48w3100fcly23n0fdcby"))))
(build-system font-build-system)
;; TODO: Package fontmake and gftools and build from source.
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'install-license-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(install-file "OFL.txt" doc)
#t))))))
(home-page "https://floriankarsten.github.io/space-grotesk/")
(synopsis "Proportional variant of the fixed-width Space Mono family")
(description
"Space Grotesk is a proportional sans-serif typeface variant based on Colophon
Foundry's fixed-width Space Mono family. It retains the monospace's idiosyncratic
details while optimizing for improved readability at non-display sizes.
Space Grotesk includes Latin Vietnamese, Pinyin, and all Western, Central, and
South-Eastern European language support, as well as several OpenType features:
old-style and tabular figures, superscript and subscript numerals, fractions,
and stylistic alternates.")
(license license:silofl1.1)))
(define-public font-go (define-public font-go
(let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc") (let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc")
(revision "1")) (revision "1"))
@ -1822,7 +1881,7 @@ in small sizes, the text looks crisper.")
(define-public font-juliamono (define-public font-juliamono
(package (package
(name "font-juliamono") (name "font-juliamono")
(version "0.025") (version "0.031")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1831,7 +1890,7 @@ in small sizes, the text looks crisper.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1w8mpl9zc1y4j1f26ikbz5g9dqsszhikp4r9p1d3ch3b5ayb5c3m")))) (base32 "0pcz2qaw0g0gak4plvhgg3m76h4gamffa373r52dzx0qwn1i1cf1"))))
(build-system font-build-system) (build-system font-build-system)
(arguments (arguments
`(#:phases `(#:phases

87
gnu/packages/fpga.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Andrew Miloradovsky <andrew@interpretmath.pw>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -467,3 +468,89 @@ a hardware description and verification language. ")
(description "This package provides a VHDL compiler and simulator.") (description "This package provides a VHDL compiler and simulator.")
(home-page "https://github.com/nickg/nvc") (home-page "https://github.com/nickg/nvc")
(license license:gpl3+))) (license license:gpl3+)))
(define-public systemc
(package
(name "systemc")
(version "2.3.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://accellera.org/images/downloads/standards/"
"systemc/systemc-" version ".tar.gz"))
(sha256
(base32 "0gvv3xmhiwx1izmzy06yslzqzh6ygrgmw53xqfmyvbz5a6ivk0ap"))))
(native-inputs `(("perl" ,perl)))
(build-system gnu-build-system)
(arguments '(#:configure-flags '("--enable-debug")))
(home-page "https://accellera.org/community/systemc")
(synopsis "Library for event-driven simulation")
(description
"SystemC is a C++ library for modeling concurrent systems, and the
reference implementation of IEEE 1666-2011. It provides a notion of timing as
well as an event-driven simulations environment. Due to its concurrent and
sequential nature, SystemC allows the description and integration of complex
hardware and software components. To some extent, SystemC can be seen as
a Hardware Description Language. However, unlike VHDL or Verilog, SystemC
provides sophisticated mechanisms that offer high abstraction levels on
components interfaces. This, in turn, facilitates the integration of systems
using different abstraction levels.")
;; homepages.cae.wisc.edu/~ece734/SystemC/Esperan_SystemC_tutorial.pdf
(license license:asl2.0)))
(define-public verilator
(package
(name "verilator")
(version "4.108")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/verilator/verilator")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0kcs0p8i2hiw348xqqh49pmllqspbzh2ljwmia03b42md5h4x5vf"))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("bison" ,bison)
("flex" ,flex)
("gettext" ,gettext-minimal)
("python" ,python)))
(inputs
`(("perl" ,perl)
("systemc" ,systemc)))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
(list (string-append "LDFLAGS=-L"
(assoc-ref %build-inputs "systemc")
"/lib-linux64"))
#:make-flags
(list (string-append "LDFLAGS=-L"
(assoc-ref %build-inputs "systemc")
"/lib-linux64"))
#:phases
(modify-phases %standard-phases
(replace 'bootstrap
(lambda _ (invoke "autoconf"))))
#:test-target "test"))
;; #error "Something failed during ./configure as config_build.h is incomplete.
;; Perhaps you used autoreconf, don't." -- so we won't. ^^
(home-page "https://www.veripool.org/projects/verilator/")
(synopsis "Fast Verilog/SystemVerilog simulator")
(description
"Verilator is invoked with parameters similar to GCC or Synopsys’s VCS.
It ``Verilates'' the specified Verilog or SystemVerilog code by reading it,
performing lint checks, and optionally inserting assertion checks and
coverage-analysis points. It outputs single- or multi-threaded @file{.cpp}
and @file{.h} files, the ``Verilated'' code.
The user writes a little C++/SystemC wrapper file, which instantiates the
Verilated model of the user’s top level module. These C++/SystemC files are
then compiled by a C++ compiler (GCC/Clang/etc.). The resulting executable
performs the design simulation. Verilator also supports linking its generated
libraries, optionally encrypted, into other simulators.")
(license license:lgpl3)))

9
gnu/packages/freedesktop.scm
View file

@ -1480,7 +1480,7 @@ wish to perform colour calibration.")
(define-public libfprint (define-public libfprint
(package (package
(name "libfprint") (name "libfprint")
(version "1.90.6") (version "1.90.7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1489,7 +1489,7 @@ wish to perform colour calibration.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0hagm1i78mrd772y3cinr7bda4myx0v4bixwqnqbxknds8m9h8sg")))) (base32 "00pmdpxxjj4sh8qjq9ch3pylgg9w019rg1bbaw53a4wr637rrz43"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -2021,14 +2021,15 @@ useful with system integration.")
("xvfb" ,xorg-server-for-tests))) ("xvfb" ,xorg-server-for-tests)))
(inputs (inputs
`(("dbus-glib" ,dbus-glib) `(("dbus-glib" ,dbus-glib)
("gtk+" ,gtk+)
("libdbusmenu" ,libdbusmenu)
("libindicator" ,libindicator) ("libindicator" ,libindicator)
("python@2" ,python-2) ("python@2" ,python-2)
("python2-pygtk" ,python2-pygtk) ("python2-pygtk" ,python2-pygtk)
("python2-pygobject-2" ,python2-pygobject-2) ("python2-pygobject-2" ,python2-pygobject-2)
;; ("mono" ,mono) ; requires non-packaged gapi ;; ("mono" ,mono) ; requires non-packaged gapi
("vala" ,vala))) ("vala" ,vala)))
(propagated-inputs
`(("gtk+" ,gtk+)
("libdbusmenu" ,libdbusmenu)))
(arguments (arguments
;; FIXME: do not hardcode gtk version ;; FIXME: do not hardcode gtk version
`(#:configure-flags '("--with-gtk=3") `(#:configure-flags '("--with-gtk=3")

36
gnu/packages/game-development.scm
View file

@ -490,7 +490,7 @@ clone.")
(define-public tsukundere (define-public tsukundere
(package (package
(name "tsukundere") (name "tsukundere")
(version "0.2.0") (version "0.2.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -499,21 +499,47 @@ clone.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qmqch8hh7vsa8qaz853vwbkz0krb106955dnz8dsl7skbm5jpn6")))) "05ckds2df810441wfavllx9lsw5jsc9h3nb7m31df01nsj56azdw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
,@%gnu-build-system-modules)
#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-command
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(version (target-guile-effective-version))
(scm (string-append out "/share/guile/site/"
version))
(go (string-append out "/lib/guile/"
version "/site-ccache")))
(substitute* "bin/tsukundere"
(("exec guile .*" all)
(string-append
(format #f "export GUILE_LOAD_PATH=~@?~%"
"\"~a:~a\"" scm (getenv "GUILE_LOAD_PATH"))
(format #f "export GUILE_LOAD_COMPILED_PATH=~@?~%"
"\"~a:~a\"" go (getenv "GUILE_LOAD_COMPILED_PATH"))
all)))
#t))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf-wrapper) `(("autoconf" ,autoconf-wrapper)
("automake" ,automake) ("automake" ,automake)
("guile" ,guile-3.0) ("guile" ,guile-3.0)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(propagated-inputs (propagated-inputs
`(("guile-sdl2" ,guile3.0-sdl2))) `(("guile-sdl2" ,guile3.0-sdl2)))
(home-page "https://gitlab.com/leoprikler/tsukundere") (home-page "https://gitlab.com/leoprikler/tsukundere")
(synopsis "Visual novel engine") (synopsis "Visual novel engine")
(description "Tsukundere is a game engine geared heavily towards the (description "Tsukundere is a game engine geared heavily towards the
development of visual novels, written on top of Guile-SDL2. It is still development of visual novels, written on top of Guile-SDL2. It is still
experimental and at the time of writing contains little more than the Guile experimental.")
modules, that make up its runtime.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public sfml (define-public sfml

280
gnu/packages/games.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013 John Darrington <jmd@gnu.org> ;;; Copyright © 2013 John Darrington <jmd@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2014, 2016 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com> ;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net> ;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
@ -30,7 +30,7 @@
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 okapi <okapi@firemail.cc> ;;; Copyright © 2018 okapi <okapi@firemail.cc>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
@ -1360,7 +1360,7 @@ does not include game data.")
(package (package
(inherit julius) (inherit julius)
(name "augustus") (name "augustus")
(version "1.4.1a") (version "2.0.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1369,7 +1369,7 @@ does not include game data.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y")) (base32 "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj"))
;; Remove unused bundled libraries. ;; Remove unused bundled libraries.
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -2237,6 +2237,100 @@ and defeat them with your bubbles!")
;; GPL2+ is for code, CC0 is for art. ;; GPL2+ is for code, CC0 is for art.
(license (list license:gpl2+ license:cc0)))) (license (list license:gpl2+ license:cc0))))
(define-public solarus
(package
(name "solarus")
;; XXX: When updating this package, please also update hash in
;; `solarus-quest-editor' below.
(version "1.6.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/solarus-games/solarus")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1n6l91yyqjx0pz4w1lp3yybpq0fs2yjswfcm8c1wjfkxwiznbdxi"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
;; The following tests fail reporting a missing "/dev/dri"
;; file.
(lambda _
(substitute* "tests/cmake/AddTestMaps.cmake"
((".*1200_create_shader_from_source.*" all)
(string-append "#" all))
((".*1210_shader_scaling_factor.*" all)
(string-append "#" all)))
#t))
(add-before 'check 'set-home
;; Tests fail without setting the following environment
;; variables.
(lambda _
(setenv "HOME" (getcwd))
(setenv "XDG_RUNTIME_DIR" (getcwd))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
`(("glm" ,glm)
("libmodplug" ,libmodplug)
("libogg" ,libogg)
("libvorbis" ,libvorbis)
("luajit" ,luajit)
("openal" ,openal)
("physfs" ,physfs)
("qtbase" ,qtbase)
("sdl2" ,(sdl-union (list sdl2 sdl2-image sdl2-ttf)))))
(home-page "https://www.solarus-games.org/")
(synopsis "Lightweight game engine for Action-RPGs")
(description
"Solarus is a 2D game engine written in C++, that can run games
scripted in Lua. It has been designed with 16-bit classic Action-RPGs
in mind.")
;; The source code is licensed under the terms of GPL-3.0.
;; Resources are licensed under the terms of CC-BY-SA-3.0 and
;; CC-BY-SA 4.0.
(license (list license:gpl3 license:cc-by-sa3.0 license:cc-by-sa4.0))))
(define-public solarus-quest-editor
(package
(inherit solarus)
(name "solarus-quest-editor")
(version (package-version solarus))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/solarus-games/solarus-quest-editor")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"))))
(arguments
`(#:tests? #false ;no test
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-qt-build
;; XXX: Fix build with Qt 5.15. It has been applied upstream as
;; 81d5c7f1 and can be removed at next upgrade.
(lambda _
(substitute* "src/entities/jumper.cpp"
(("#include <QPainter>" all)
(string-append all "\n" "#include <QPainterPath>\n")))
#t)))))
(inputs
`(("solarus" ,solarus)
,@(package-inputs solarus)))
(synopsis "Create and modify quests for the Solarus engine")
(description
"Solarus Quest Editor is a graphical user interface to create and
modify quests for the Solarus engine.")))
(define-public superstarfighter (define-public superstarfighter
(package (package
(name "superstarfighter") (name "superstarfighter")
@ -2365,6 +2459,93 @@ available, as well as a single-player mode with AI-controlled ships.")
"$(call ZIP) -X")) "$(call ZIP) -X"))
#t)))) #t))))
(define-public trigger-rally
(package
(name "trigger-rally")
(version "0.6.6.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/trigger-rally/"
"trigger-" version "/"
"trigger-rally-" version ".tar.gz"))
(sha256
(base32
"016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z"))))
(build-system gnu-build-system)
(inputs
`(("freealut" ,freealut)
("glew" ,glew)
("glu" ,glu)
("mesa" ,mesa)
("openal" ,openal)
("physfs" ,physfs)
("sdl" ,(sdl-union (list sdl2 sdl2-image)))
("tinyxml2" ,tinyxml2)))
(arguments
`(#:make-flags (list (string-append "prefix=" %output)
"bindir=$(prefix)/bin"
"datadir=$(datarootdir)"
"OPTIMS=-Ofast")
#:tests? #f ; No tests present
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'cd-src
(lambda _ (chdir "src")))
(add-before 'build 'remove-timestamps
(lambda _
(substitute* (list "Trigger/menu.cpp"
"PEngine/app.cpp")
((".*__DATE__.*") ""))))
(add-before 'build 'make-verbose
(lambda _
(substitute* "GNUmakefile"
(("@\\$\\(CXX\\)") "$(CXX)"))))
(add-after 'build 'set-data-path
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "../bin/trigger-rally.config.defs"
(("<data path=\"C:[^\"]*\"")
(string-append "<data path=\"" out "/share/trigger-rally\""))))))
(add-after 'install 'create-desktop-entry
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(apps (string-append out "/share/applications")))
(mkdir-p apps)
(with-output-to-file
(string-append apps "/trigger-rally.desktop")
(lambda ()
(format #t ; Borrowed from Debian package
"[Desktop Entry]~@
Name=Trigger Rally~@
Icon=trigger-rally~@
Comment=3D rally racing car game~@
Comment[de]=3D Rally-Autorennen~@
Comment[fr_FR]=un jeu de rally en 3D~@
Comment[ro_RO]=Un joc în 3D cu curse de raliu~@
Exec=~a/bin/trigger-rally~@
Terminal=false~@
StartupNotify=false~@
Type=Application~@
TryExec=~:*~a/bin/trigger-rally~@
Categories=Game;ArcadeGame;~@
Keywords=racing;tracks;~@
Keywords[de]=Rennstrecke;~%"
out)))))))))
(home-page "http://trigger-rally.sourceforge.net")
(synopsis "Fast-paced single-player racing game")
(description "Trigger-rally is a 3D rally simulation with great physics
for drifting on over 200 maps. Different terrain materials like dirt,
asphalt, sand, ice, etc. and various weather, light, and fog conditions give
this rally simulation the edge over many other games. You need to make it
through the maps in often tight time limits and can further improve by beating
the recorded high scores. All attached single races must be finished in time
in order to win an event, unlocking additional events and cars. Most maps are
equipped with spoken co-driver notes and co-driver icons.")
(license (list license:cc0 ;textures and audio in data.zip
license:gpl2+))))
(define-public ufo2map (define-public ufo2map
(package (package
(name "ufo2map") (name "ufo2map")
@ -5911,11 +6092,13 @@ small robot living in the nano world, repair its maker.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/teeworlds/teeworlds") (url "https://github.com/teeworlds/teeworlds")
(commit version))) (commit version)
;; There are two submodules in datasrc/{languages,maps}
(recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"169dl83q08zl4h813az8hjs4rs3dms9yjn6bnsld4fjcj0imvvc6")) "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 ftw) (ice-9 ftw)
(ice-9 regex) (ice-9 regex)
@ -5928,15 +6111,12 @@ small robot living in the nano world, repair its maker.")
(remove (cut string-match "(^.)|(^md5$)" <>) (remove (cut string-match "(^.)|(^md5$)" <>)
(scandir base-dir))) (scandir base-dir)))
#t)))) #t))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests included `(#:tests? #f ; no tests included
#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (add-after 'unpack 'patch-paths
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Embed path to assets. ;; Embed path to assets.
(substitute* "src/engine/shared/storage.cpp" (substitute* "src/engine/shared/storage.cpp"
@ -5945,51 +6125,7 @@ small robot living in the nano world, repair its maker.")
(assoc-ref outputs "out") (assoc-ref outputs "out")
"/share/teeworlds/data" "/share/teeworlds/data"
"\""))) "\"")))
#t)))))
;; Bam expects all files to have a recent time stamp.
(for-each (cut utime <> 1 1)
(find-files "."))
;; Do not use bundled libraries.
(substitute* "bam.lua"
(("local json = Compile.+$")
"local json = nil
settings.link.libs:Add(\"jsonparser\")")
(("local png = Compile.+$")
"local png = nil
settings.link.libs:Add(\"pnglite\")")
(("local wavpack = Compile.+$")
"local wavpack = nil
settings.link.libs:Add(\"wavpack\")")
(("if config\\.zlib\\.value == 1")
"if config.zlib.value"))
(substitute* "src/engine/client/graphics_threaded.cpp"
(("engine/external/pnglite/pnglite\\.h")
"pnglite.h"))
(substitute* "src/engine/client/sound.cpp"
(("engine/external/wavpack/wavpack\\.h")
"wavpack/wavpack.h"))
#t))
(replace 'build
(lambda _
(invoke "bam" "-a" "-v" "conf=release")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((arch ,(system->linux-architecture
(or (%current-target-system)
(%current-system))))
(build (string-append "build/" (if (string=? arch "i386")
"x86" arch)
"/release/"))
(data-built (string-append build "data/"))
(out (assoc-ref outputs "out"))
(bin (string-append out "/bin/"))
(data (string-append out "/share/teeworlds/data/")))
(for-each (cut install-file <> bin)
(map (cut string-append build <>)
'("teeworlds" "teeworlds_srv")))
(copy-recursively data-built data)
#t))))))
(inputs (inputs
`(("freetype" ,freetype) `(("freetype" ,freetype)
("glu" ,glu) ("glu" ,glu)
@ -6000,17 +6136,17 @@ settings.link.libs:Add(\"wavpack\")")
("sdl2-image" ,sdl2-image) ("sdl2-image" ,sdl2-image)
("sdl2-mixer" ,sdl2-mixer) ("sdl2-mixer" ,sdl2-mixer)
("wavpack" ,wavpack) ("wavpack" ,wavpack)
("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("bam" ,bam) `(("python" ,python-wrapper)
("python" ,python-wrapper)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://www.teeworlds.com") (home-page "https://www.teeworlds.com")
(synopsis "2D retro multiplayer shooter game") (synopsis "2D retro multiplayer shooter game")
(description "Teeworlds is an online multiplayer game. Battle with up to (description "Teeworlds is an online multiplayer game. Battle with up to
16 players in a variety of game modes, including Team Deathmatch and Capture 16 players in a variety of game modes, including Team Deathmatch and Capture
The Flag. You can even design your own maps!") The Flag. You can even design your own maps!")
(license license:bsd-3))) (license (list license:bsd-3 license:cc-by-sa3.0)))) ; game+maps&languages
(define-public enigma (define-public enigma
(package (package
@ -6184,31 +6320,15 @@ fish. The whole game is accompanied by quiet, comforting music.")
(define-public crawl (define-public crawl
(package (package
(name "crawl") (name "crawl")
(version "0.25.0") (version "0.26.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (string-append "https://github.com/crawl/crawl/releases/download/"
;; Older releases get moved into a versioned directory version "/stone_soup-" version "-nodeps.tar.xz"))
(string-append "http://crawl.develz.org/release/"
(version-major+minor version) "/stone_soup-"
version "-nodeps.tar.xz")
;; Only the latest release is in this directory
(string-append "http://crawl.develz.org/release/stone_soup-"
version "-nodeps.tar.xz")))
(sha256 (sha256
(base32 "0rn1wjxdqw33caiwisfypm1j8cid3c9pz01ahicl17144zs29z3d")) (base32 "1m81x1sp6p2ka5w2nib3pcw5w5iv58z41c8aqn0dayi1lb3yslfb"))
(patches (search-patches "crawl-upgrade-saves.patch")) (patches (search-patches "crawl-upgrade-saves.patch"))))
;; The 0.25.0 -nodeps.tar.xz was built from an OSX machine; normally
;; apparently it's built from a Debian machine before the Debian
;; packages are made. These ._* files are binary and have the string
;; "Mac OS X" in them... removing these seems to result in compilation
;; again.
(modules '((guix build utils)))
(snippet
'(begin
(for-each delete-file (find-files "." "^\\._"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("lua51" ,lua-5.1) `(("lua51" ,lua-5.1)

3
gnu/packages/genimage.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -47,7 +48,7 @@
(uri (git-reference (uri (git-reference
(url "https://github.com/pengutronix/genimage") (url "https://github.com/pengutronix/genimage")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54")) "15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54"))

27
gnu/packages/geo.scm
View file

@ -14,6 +14,7 @@
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2020 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2020 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1693,6 +1694,32 @@ input file (in @code{.osm} or @code{.osm.pbf} format).")
license:lgpl2.1+ license:lgpl2.1+
license:mpl1.1)))) license:mpl1.1))))
(define-public shapelib
(package
(name "shapelib")
(version "1.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OSGeo/shapelib")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1lzch0jf6yqhw391phhafzw4ghmiz98zkf698h4fmq109fa2vhqd"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(home-page "http://shapelib.maptools.org/")
(synopsis "Provides C library to write and update ESRI Shapefiles")
(description
"The Shapefile C Library provides the ability to write simple C programs
for reading, writing and updating (to a limited extent) ESRI Shapefiles, and the
associated attribute file (@file{.dbf}).")
(license license:gpl2+)))
(define-public spatialite-tools (define-public spatialite-tools
(package (package
(name "spatialite-tools") (name "spatialite-tools")

42
gnu/packages/gettext.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Miguel <rosen644835@gmail.com> ;;; Copyright © 2019 Miguel <rosen644835@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 EuAndreh <eu@euandre.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,12 +28,14 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages gettext) (define-module (gnu packages gettext)
#:use-module ((guix licenses) #:select (gpl2+ gpl3+)) #:use-module ((guix licenses) #:select (gpl2+ gpl3+ bsd-3))
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (gnu packages check)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
@ -42,6 +45,8 @@
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages tex) #:use-module (gnu packages tex)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx)
#:use-module (guix utils)) #:use-module (guix utils))
(define-public gettext-minimal (define-public gettext-minimal
@ -183,6 +188,41 @@ allows applications to emit text annotated with styling information, such as
color, font attributes (weight, posture), or underlining.") color, font attributes (weight, posture), or underlining.")
(license gpl3+))) (license gpl3+)))
(define-public mdpo
(package
(name "mdpo")
(version "0.3.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mdpo" version))
(sha256
(base32 "0kgbm0af7jwpfspa2xxiy9nc2l1r2s1rhbhz4r229zcqv49ak6sq"))))
(build-system python-build-system)
(native-inputs
`(("python-bump2version" ,python-bump2version)
("python-flake8" ,python-flake8)
("python-flake8-implicit-str-concat" ,python-flake8-implicit-str-concat)
("python-flake8-print" ,python-flake8-print)
("python-isort" ,python-isort)
("python-pre-commit" ,python-pre-commit)
("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
("python-sphinx" ,python-sphinx)
("python-sphinx-argparse" ,python-sphinx-argparse)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
("python-twine" ,python-twine)
("python-yamllint" ,python-yamllint)))
(propagated-inputs
`(("python-polib" ,python-polib)
("python-pymd4c" ,python-pymd4c)))
(home-page "https://github.com/mondeja/mdpo")
(synopsis "Markdown file translation utilities using pofiles")
(description
"The mdpo utility creates pofiles, the format stabilished by GNU Gettext,
from Markdown files.")
(license bsd-3)))
(define-public po4a (define-public po4a
(package (package
(name "po4a") (name "po4a")

7
gnu/packages/gl.scm
View file

@ -250,7 +250,7 @@ also known as DXTn or DXTC) for Mesa.")
(base32 (base32
"14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5")) "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5"))
(patches (patches
(search-patches "mesa-skip-disk-cache-test.patch")))) (search-patches "mesa-skip-tests.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(propagated-inputs (propagated-inputs
`(;; The following are in the Requires.private field of gl.pc. `(;; The following are in the Requires.private field of gl.pc.
@ -777,7 +777,7 @@ OpenGL.")
(define-public glfw (define-public glfw
(package (package
(name "glfw") (name "glfw")
(version "3.2.1") (version "3.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/glfw/glfw" (uri (string-append "https://github.com/glfw/glfw"
@ -785,7 +785,7 @@ OpenGL.")
"/glfw-" version ".zip")) "/glfw-" version ".zip"))
(sha256 (sha256
(base32 (base32
"09kk5yc1zhss9add8ryqrngrr16hdmc94rszgng135bhw09mxmdp")))) "1izgc4r0ypxwwklfzj98ab4xqsjpb1wbsfdbivvxpmr95x8km8q8"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no test target '(#:tests? #f ; no test target
@ -799,6 +799,7 @@ OpenGL.")
;; These are in 'Requires.private' of 'glfw3.pc'. ;; These are in 'Requires.private' of 'glfw3.pc'.
("libx11" ,libx11) ("libx11" ,libx11)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxi" ,libxi)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
("libxxf86vm" ,libxxf86vm))) ("libxxf86vm" ,libxxf86vm)))

51
gnu/packages/gnome-xyz.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2019, 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2019, 2021 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
@ -779,6 +779,55 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.")
(define-public numix-theme (define-public numix-theme
(deprecated-package "numix-theme" numix-gtk-theme)) (deprecated-package "numix-theme" numix-gtk-theme))
(define-public markets
(package
(name "markets")
(version "0.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bitstower/markets")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1jzv74l2jkdiqy1hp0ww5yla50dmrvjw7fgkmb26ynblr1nb3rrb"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "build-aux/meson/postinstall.py"
(("gtk-update-icon-cache") "true"))
#t))
(add-after 'unpack 'skip-update-desktop-database
;; Don't update desktop file database.
(lambda _
(substitute* "build-aux/meson/postinstall.py"
(("update-desktop-database") "true"))
#t)))))
(inputs
`(("gtk3" ,gtk+)
("gettext" ,gettext-minimal)
("libgee" ,libgee)
("libhandy0" ,libhandy-0.0)
("libsoup" ,libsoup)
("json-glib" ,json-glib)
("vala" ,vala)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin"))) ; for 'glib-compile-resources'
(home-page "https://github.com/bitstower/markets")
(synopsis "Stock, currency and cryptocurrency tracker")
(description
"Markets is a GTK application that displays financial data, helping users
track stocks, currencies and cryptocurrencies.")
(license license:gpl3)))
(define-public vala-language-server (define-public vala-language-server
(package (package
(name "vala-language-server") (name "vala-language-server")

38
gnu/packages/gnome.scm
View file

@ -51,7 +51,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net> ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
@ -2252,6 +2252,16 @@ and keep up to date translations of documentation.")
(lambda _ (lambda _
(substitute* "meson-postinstall.sh" (substitute* "meson-postinstall.sh"
(("update-desktop-database") (which "true"))) (("update-desktop-database") (which "true")))
#t))
(add-after 'install 'patch-thumbnailer
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute*
(string-append
out
"/share/thumbnailers/gnome-font-viewer.thumbnailer")
(("gnome-thumbnail-font")
(string-append out "/bin/gnome-thumbnail-font"))))
#t))))) #t)))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -2841,7 +2851,7 @@ database is translated at Transifex.")
(define-public system-config-printer (define-public system-config-printer
(package (package
(name "system-config-printer") (name "system-config-printer")
(version "1.5.14") (version "1.5.15")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2850,7 +2860,7 @@ database is translated at Transifex.")
"download/v" version "download/v" version
"/system-config-printer-" version ".tar.xz")) "/system-config-printer-" version ".tar.xz"))
(sha256 (sha256
(base32 "1l79lj44kl079sk308m42x3py1yvcxk5x5bs2vqfmqv26zm8qyqf")))) (base32 "12d6xx51vizc476zfnsga9q09nflp51ipn6y7lhi9w2v4772dlpv"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:imported-modules ((guix build python-build-system) `(#:imported-modules ((guix build python-build-system)
@ -6440,7 +6450,7 @@ DAV, and others.")
(define-public gusb (define-public gusb
(package (package
(name "gusb") (name "gusb")
(version "0.3.0") (version "0.3.5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -6449,7 +6459,7 @@ DAV, and others.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"002pg0p4qzzk5dkyiynm483ir26zxrn4k71c7f6j85mfsdzbgli7")))) "0ifhdqhpyxwsg0z9s1anj7cf5pya5qsqyp5ksh9n7mqwa4lrjkl8"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("gobject-introspection" ,gobject-introspection) `(("gobject-introspection" ,gobject-introspection)
@ -6514,14 +6524,14 @@ almost all of them.")
(define-public eolie (define-public eolie
(package (package
(name "eolie") (name "eolie")
(version "0.9.100") (version "0.9.101")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://adishatz.org/eolie/eolie-" (uri (string-append "https://adishatz.org/eolie/eolie-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1vzhfp8j1z3jvd5ndqfyn7nqrx3zdvx9mv1byjl36nnd9g63ji62")))) "1v8n21y75abdzsnx5idyd0q6yfb6cd0sqbknlbkwh5fdgvjzyvwn"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -10799,13 +10809,13 @@ advanced image management tool")
(synopsis "Store and run multiple GNOME terminals in one window") (synopsis "Store and run multiple GNOME terminals in one window")
(description (description
"Terminator allows you to run multiple GNOME terminals in a grid and "Terminator allows you to run multiple GNOME terminals in a grid and
+tabs, and it supports drag and drop re-ordering of terminals.") tabs, and it supports drag and drop re-ordering of terminals.")
(license license:gpl2))) (license license:gpl2)))
(define-public libhandy (define-public libhandy
(package (package
(name "libhandy") (name "libhandy")
(version "1.0.2") (version "1.0.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -10814,7 +10824,7 @@ advanced image management tool")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1bmmkahshvlvpsnb7zp8bddv7i1h5k4p967n6kxh71g1vnj8x20m")))) (base32 "0flgwlm921801i3ns0dwqpnxl89f3rzn4y9h723i13bmflch3in7"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -11398,7 +11408,7 @@ and toolbars.")
(define-public setzer (define-public setzer
(package (package
(name "setzer") (name "setzer")
(version "0.3.8") (version "0.3.9")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11407,7 +11417,7 @@ and toolbars.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1f5qmkz4hzn54sh56z3hw8zrvg93xlz62ggzlzyg7vgsr83kpns9")))) (base32 "1qmy2bxl8x6pijjaaj91v6rqdipha6iyy0b6b9y1lk3r2p3azd42"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -11832,7 +11842,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(define-public komikku (define-public komikku
(package (package
(name "komikku") (name "komikku")
(version "0.24.0") (version "0.25.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -11842,7 +11852,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"010p32zrim245y0l784yp0rasqcqlyr3lrxwl3r1876x83qhs6q3")))) "03skci66y9qqiv4bqbbc0w6d6agilwmx95cw7sribj06zcykm7m3"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t

97
gnu/packages/gnupg.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org>
@ -13,10 +13,11 @@
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -67,6 +68,7 @@
#:use-module (gnu packages tor) #:use-module (gnu packages tor)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -355,13 +357,13 @@ libskba (working with X.509 certificates and CMS data).")
(define-public gpgme (define-public gpgme
(package (package
(name "gpgme") (name "gpgme")
(version "1.15.0") (version "1.15.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2")) (uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0nqfipv5s4npfidsm1rs3kpq0r0av9bfqfd5r035jibx5k0jniqb")))) (base32 "1bg13l5s8x9p1v0jyv29n84bay27pflindpzjsc9gj7i4wdkrg7f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("gnupg" ,gnupg))) `(("gnupg" ,gnupg)))
@ -432,19 +434,20 @@ gpgpme starting with version 1.7.")
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; When cross-compiling, the bash script libgcrypt-config provided by ;; Work around <https://bugs.gnu.org/20272> to achieve reproducible
;; libgcrypt must be accessible during configure phase. ;; builds.
`(,@(if (%current-target-system) '(#:parallel-build? #f
'(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'add-libgrypt-config (add-before 'configure 'add-libgrypt-config
(lambda _ (lambda* (#:key inputs target #:allow-other-keys)
(setenv "PATH" (string-append (when target
(assoc-ref %build-inputs "libgcrypt") ;; When cross-compiling, the bash script 'libgcrypt-config'
"/bin:" ;; must be accessible during the configure phase.
(getenv "PATH"))) (setenv "PATH"
#t)))) (string-append (assoc-ref inputs "libgcrypt")
'()))) "/bin:" (getenv "PATH")))))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf) ("autoconf" ,autoconf)
@ -782,14 +785,14 @@ including tools for signing keys, keyring analysis, and party preparation.
(define-public pinentry-tty (define-public pinentry-tty
(package (package
(name "pinentry-tty") (name "pinentry-tty")
(version "1.1.0") (version "1.1.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/pinentry/pinentry-" (uri (string-append "mirror://gnupg/pinentry/pinentry-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8")))) "0zx5vg6wws2sp2yxwi01b8i1pnsqkydncpj7x0p8xl9y05ja04nd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--enable-pinentry-tty"))) `(#:configure-flags '("--enable-pinentry-tty")))
@ -867,10 +870,6 @@ passphrase when @code{gpg} is run and needs it.")))
(package (package
(inherit pinentry-tty) (inherit pinentry-tty)
(name "pinentry-efl") (name "pinentry-efl")
(source
(origin
(inherit (package-source pinentry-tty))
(patches (search-patches "pinentry-efl.patch"))))
(arguments (arguments
'(#:configure-flags '("--enable-pinentry-efl" '(#:configure-flags '("--enable-pinentry-efl"
"--enable-fallback-curses") "--enable-fallback-curses")
@ -888,10 +887,62 @@ passphrase when @code{gpg} is run and needs it.")))
`(("efl" ,efl) `(("efl" ,efl)
,@(package-inputs pinentry-tty))) ,@(package-inputs pinentry-tty)))
(description (description
"Pinentry provides a console and a graphical interface for the "Pinentry provides a console and a graphical interface for @acronym{EFL,
@dfn{Enlightenment Foundation Libraries} (EFL) that allows users to enter a the Enlightenment Foundation Libraries} that allows users to enter a
passphrase when @code{gpg} is run and needs it."))) passphrase when @code{gpg} is run and needs it.")))
(define-public pinentry-rofi
(package
(name "pinentry-rofi")
(version "2.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/plattfot/pinentry-rofi/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0kjzvgni9srl8h5c52pqrvgdxs6avv0nhgk19apd97sx10qdwdhk"))))
(build-system gnu-build-system)
(arguments
`(#:modules
((ice-9 match)
(ice-9 ftw)
,@%gnu-build-system-modules)
#:phases
(modify-phases
%standard-phases
(add-after 'install 'hall-wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/"))
(site (string-append out "/share/guile/site"))
(rofi-bin (string-append (assoc-ref inputs "rofi") "/bin")))
(match (scandir site)
(("." ".." version)
(wrap-program
(string-append bin "pinentry-rofi")
(list "PATH" ":" 'prefix `(,rofi-bin)))
#t)))))
(add-after 'compress-documentation 'installcheck
(lambda* rest
(invoke "make" "installcheck"))))))
(native-inputs
`(("autoconf" ,autoconf)
("autoconf-archive" ,autoconf-archive)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-3.0)
("rofi" ,rofi)))
(synopsis "Rofi GUI for GnuPG's passphrase input")
(description "Pinentry-rofi is a simple graphical user interface for
passphrase or PIN when required by @code{gpg} or other software. It is using
the Rofi application launcher as the user interface. Which makes it combined
with @code{rofi-pass} a good front end for @code{password-store}.")
(home-page "https://github.com/plattfot/pinentry-rofi/")
(license license:gpl3+)))
(define-public pinentry (define-public pinentry
(package (inherit pinentry-gtk2) (package (inherit pinentry-gtk2)
(name "pinentry"))) (name "pinentry")))

20
gnu/packages/gnuzilla.scm
View file

@ -694,8 +694,8 @@ from forcing GEXP-PROMISE."
#:system system #:system system
#:guile-for-build guile))) #:guile-for-build guile)))
(define %icecat-version "78.6.1-guix0-preview1") (define %icecat-version "78.7.0-guix0-preview1")
(define %icecat-build-id "20210107000000") ;must be of the form YYYYMMDDhhmmss (define %icecat-build-id "20210126000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -717,11 +717,11 @@ from forcing GEXP-PROMISE."
"firefox-" upstream-firefox-version ".source.tar.xz")) "firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256 (sha256
(base32 (base32
"1kp75838a38x4h0w98qn01g9asn7jlgm64bz7n70353bnr6bf1qd")))) "0hqnc98k4irq0lsp154binrl0c6kxy6xmab3ss9jwx6d53dl380s"))))
(upstream-icecat-base-version "78.6.1") ; maybe older than base-version (upstream-icecat-base-version "78.7.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "10ca84bd9d255caeed506ef36bd3dbe2ad6375ab") (gnuzilla-commit "abfe5eebaca3c2787f1a9505669393674493c177")
(gnuzilla-source (gnuzilla-source
(origin (origin
(method git-fetch) (method git-fetch)
@ -733,7 +733,7 @@ from forcing GEXP-PROMISE."
(string-take gnuzilla-commit 8))) (string-take gnuzilla-commit 8)))
(sha256 (sha256
(base32 (base32
"07i3pfbzprnmzrilsh13jjrrk0jixpb9nrrqxzzdvzr2gz06vw29")))) "00ws3540x5whpicc5fx4k949ff73cqvajz6jp13ahn49wqdads47"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it ;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings. ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@ -1305,11 +1305,11 @@ standards of the IceCat project.")
(cpe-version . ,(first (string-split version #\-))))))) (cpe-version . ,(first (string-split version #\-)))))))
;; Update this together with icecat! ;; Update this together with icecat!
(define %icedove-build-id "20201215000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-build-id "20210126000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove (define-public icedove
(package (package
(name "icedove") (name "icedove")
(version "78.6.0") (version "78.7.0")
(source icecat-source) (source icecat-source)
(properties (properties
`((cpe-name . "thunderbird_esr"))) `((cpe-name . "thunderbird_esr")))
@ -1589,7 +1589,7 @@ standards of the IceCat project.")
;; in the Thunderbird release tarball. We don't use the release ;; in the Thunderbird release tarball. We don't use the release
;; tarball because it duplicates the Icecat sources and only adds the ;; tarball because it duplicates the Icecat sources and only adds the
;; "comm" directory, which is provided by this repository. ;; "comm" directory, which is provided by this repository.
,(let ((changeset "18be92a3f0388fe1b69941a50cdbadbf2c95b885")) ,(let ((changeset "d4c4077a3ef9b3221984f2d0b42f1d96c35776e8"))
(origin (origin
(method hg-fetch) (method hg-fetch)
(uri (hg-reference (uri (hg-reference
@ -1598,7 +1598,7 @@ standards of the IceCat project.")
(file-name (string-append "thunderbird-" version "-checkout")) (file-name (string-append "thunderbird-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1w21g19l93bcna20260cgxjsh17pznd3kdfvyrn23wjkslgpbyi3"))))) "0yabs4zlwb5jvlyk45lbw1nzfmra1f8bbwvwcwxjs1a8wcmrmb39")))))
("autoconf" ,autoconf-2.13) ("autoconf" ,autoconf-2.13)
("cargo" ,rust-1.41 "cargo") ("cargo" ,rust-1.41 "cargo")
("clang" ,clang) ("clang" ,clang)

6
gnu/packages/gps.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
@ -149,7 +149,7 @@ between two other data points.")
(define-public gama (define-public gama
(package (package
(name "gama") (name "gama")
(version "2.12") (version "2.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -157,7 +157,7 @@ between two other data points.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj")) "041cprbj4lfs42i7sd1c2zlx3r16g6c5shz3qls79gxb7kqflkgb"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

55
gnu/packages/graphics.scm
View file

@ -19,10 +19,11 @@
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com> ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -83,6 +84,7 @@
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages plotutils) #:use-module (gnu packages plotutils)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages pth) #:use-module (gnu packages pth)
#:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -428,17 +430,47 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.")
(license (list license:gpl2+ ;for the utility itself (license (list license:gpl2+ ;for the utility itself
license:lgpl2.1+))))) ;for use as a library license:lgpl2.1+))))) ;for use as a library
(define-public embree
(package
(name "embree")
(version "3.12.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/embree/embree")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0aznd16n7h8g3f6jcahzfp1dq4r7wayqvn03wsaskiq2dvsi4srd"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests (apparently)
#:configure-flags
(list
"-DEMBREE_ISPC_SUPPORT=OFF")))
(inputs
`(("tbb" ,tbb)
("glfw" ,glfw)))
(home-page "https://www.embree.org/")
(synopsis "High performance ray tracing kernels")
(description
"Embree is a collection of high-performance ray tracing kernels.
Embree is meant to increase performance of photo-realistic rendering
applications.")
(license license:asl2.0)))
(define-public blender (define-public blender
(package (package
(name "blender") (name "blender")
(version "2.83.9") (version "2.91.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.blender.org/source/" (uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.xz")) "blender-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"106w9vi6z0gi2nbr73g8pm40w3wn7dkjcibzvvzbc786yrnzvkhb")))) "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(let ((python-version (version-major+minor (package-version python)))) (let ((python-version (version-major+minor (package-version python))))
@ -507,10 +539,12 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.")
("freetype" ,freetype) ("freetype" ,freetype)
("glew" ,glew) ("glew" ,glew)
("openal" ,openal) ("openal" ,openal)
("pugixml" ,pugixml)
("python" ,python) ("python" ,python)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
("tbb" ,tbb) ("tbb" ,tbb)
("zlib" ,zlib))) ("zlib" ,zlib)
("embree" ,embree)))
(home-page "https://blender.org/") (home-page "https://blender.org/")
(synopsis "3D graphics creation suite") (synopsis "3D graphics creation suite")
(description (description
@ -588,6 +622,7 @@ application can be customized via its API for Python scripting.")
`(("boost" ,boost) `(("boost" ,boost)
("jemalloc" ,jemalloc) ("jemalloc" ,jemalloc)
("libx11" ,libx11) ("libx11" ,libx11)
("opencolorio" ,opencolorio)
("openimageio" ,openimageio) ("openimageio" ,openimageio)
("openexr" ,openexr) ("openexr" ,openexr)
("ilmbase" ,ilmbase) ("ilmbase" ,ilmbase)
@ -602,6 +637,7 @@ application can be customized via its API for Python scripting.")
("freetype" ,freetype) ("freetype" ,freetype)
("glew" ,glew) ("glew" ,glew)
("openal" ,openal) ("openal" ,openal)
("pugixml" ,pugixml)
("python" ,python) ("python" ,python)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://blender.org/") (home-page "https://blender.org/")
@ -1055,7 +1091,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.")
(define-public openimageio (define-public openimageio
(package (package
(name "openimageio") (name "openimageio")
(version "2.0.13") (version "2.2.10.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1064,23 +1100,26 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0czcls82v71wkw1syib16ncg7463hx0py0xclycsiv4w6i3wlkzz")))) "0wzh5n527l7ia1754cf9xmbvv4ya6hj34dy6cbq9xk9372h8gd9q"))))
(build-system cmake-build-system) (build-system cmake-build-system)
;; FIXME: To run all tests successfully, test image sets from multiple ;; FIXME: To run all tests successfully, test image sets from multiple
;; third party sources have to be present. For details see ;; third party sources have to be present. For details see
;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL ;; <https://github.com/OpenImageIO/oiio/blob/master/INSTALL.md>
(arguments (arguments
`(#:tests? #f)) `(#:tests? #f
#:configure-flags (list "-DUSE_EXTERNAL_PUGIXML=1")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("fmt" ,fmt)
("libpng" ,libpng) ("libpng" ,libpng)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("giflib" ,giflib) ("giflib" ,giflib)
("openexr" ,openexr) ("openexr" ,openexr)
("ilmbase" ,ilmbase) ("ilmbase" ,ilmbase)
("pugixml" ,pugixml)
("python" ,python-wrapper) ("python" ,python-wrapper)
("pybind11" ,pybind11) ("pybind11" ,pybind11)
("robin-map" ,robin-map) ("robin-map" ,robin-map)

1
gnu/packages/gstreamer.scm
View file

@ -591,6 +591,7 @@ for the GStreamer multimedia library.")
(string-append (string-append
"https://gstreamer.freedesktop.org/src/" name "/" "https://gstreamer.freedesktop.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(patches (search-patches "gst-plugins-good-fix-test.patch"))
(sha256 (sha256
(base32 "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp")))) (base32 "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp"))))
(build-system meson-build-system) (build-system meson-build-system)

100
gnu/packages/guile-xyz.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co> ;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com> ;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2016, 2019, 2020 Eraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019, 2020, 2021 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2016 Amirouche <amirouche@hypermove.net> ;;; Copyright © 2016 Amirouche <amirouche@hypermove.net>
@ -33,6 +33,7 @@
;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com> ;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net> ;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -82,6 +83,7 @@
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mes)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
@ -101,6 +103,7 @@
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit) #:use-module (gnu packages webkit)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
@ -2428,7 +2431,7 @@ interface for reading articles in any format.")
(define-public guile-redis (define-public guile-redis
(package (package
(name "guile-redis") (name "guile-redis")
(version "1.3.0") (version "2.0.0")
(home-page "https://github.com/aconchillo/guile-redis") (home-page "https://github.com/aconchillo/guile-redis")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -2438,8 +2441,10 @@ interface for reading articles in any format.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"14izs8daxh7pb7vwpxi5g427qa31137jkaxrb1cy5rpjkwchy723")))) "1zk2x37lw6ygf7rwy71svnsian8lj51axpxmm66ah7dazn69swlm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -2462,6 +2467,18 @@ key-value cache and store.")
(package (package
(inherit guile-redis) (inherit guile-redis)
(name "guile2.0-redis") (name "guile2.0-redis")
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
;; put-string is in (rnrs io ports) in guile2.0,
;; not in (ice-9 textual-ports)
(substitute* "redis/utils.scm"
(("\\(ice-9 textual-ports\\)")
"(rnrs io ports)"))
#t)))
,@(package-arguments guile-redis)))
(native-inputs `(("guile" ,guile-2.0) (native-inputs `(("guile" ,guile-2.0)
,@(alist-delete "guile" ,@(alist-delete "guile"
(package-native-inputs guile-redis)))))) (package-native-inputs guile-redis))))))
@ -2570,8 +2587,8 @@ format is also supported.")
(deprecated-package "guile3.0-mcron" mcron)) (deprecated-package "guile3.0-mcron" mcron))
(define-public guile-picture-language (define-public guile-picture-language
(let ((commit "7e5982a2788bd79a45ad6f02db46f061f97b6e14") (let ((commit "291a746a1d3b4784d38b05239bdd7b8e796ce761")
(revision "3")) (revision "4"))
(package (package
(name "guile-picture-language") (name "guile-picture-language")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -2583,12 +2600,13 @@ format is also supported.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1y5f14cll4jx33hr43dpgrpd0yy6g0g7lim365kmgb0h0cvja80p")))) "0rnhf13ds92sbdicshy4sy4kl2kc431fy9vzm1divw974p7v57sd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("guile" ,guile-3.0))) `(("guile" ,guile-3.0)))
(propagated-inputs (propagated-inputs
`(("guile-rsvg" ,guile-rsvg))) `(("guile-cairo" ,guile-cairo)
("guile-rsvg" ,guile-rsvg)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -4429,6 +4447,74 @@ including parsing and code generation.")
"Guile Shapefile is a Guile library for reading shapefiles.") "Guile Shapefile is a Guile library for reading shapefiles.")
(license license:expat))) (license license:expat)))
(define-public guile-libyaml
(let ((commit "f5d33a6880e96571d3cb079ed7755ffc156cac46")
(revision "1"))
(package
(name "guile-libyaml")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mwette/guile-libyaml")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"12x91983fh1j39zy7kbk19acc1rqdh8515ddx1mh7l26j04k9wgq"))))
(build-system gnu-build-system)
(arguments
`(#:modules (((guix build guile-build-system)
#:prefix guile:)
,@%gnu-build-system-modules)
#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules)
#:tests? #false ; there are none
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'remove-unused-files
(lambda* (#:key inputs #:allow-other-keys)
(for-each delete-file
'("guix.scm" "demo1.yml" "demo1.scm"
"yaml/libyaml.scm"
;; This file is mismatched with the generated FFI code.
"yaml/ffi-help-rt.scm"))
(copy-file (string-append (assoc-ref inputs "nyacc")
"/share/guile/site/3.0/system/ffi-help-rt.scm")
"yaml/ffi-help-rt.scm")
(substitute* "yaml/ffi-help-rt.scm"
(("system ffi-help-rt") "yaml ffi-help-rt"))
#true))
(add-before 'build 'build-ffi
(lambda* (#:key inputs #:allow-other-keys)
(invoke "guild" "compile-ffi"
"--no-exec" ; allow us to patch the generated file
"yaml/libyaml.ffi")
(substitute* "yaml/libyaml.scm"
(("system ffi-help-rt") "yaml ffi-help-rt")
(("dynamic-link \"libyaml\"")
(format #false "dynamic-link \"~a/lib/libyaml\""
(assoc-ref inputs "libyaml"))))
#true))
(replace 'build
(assoc-ref guile:%standard-phases 'build))
(delete 'install))))
(inputs
`(("guile" ,guile-3.0)
("libyaml" ,libyaml)))
(propagated-inputs
`(("guile-bytestructures" ,guile-bytestructures)))
(native-inputs
`(("nyacc" ,nyacc)))
(home-page "https://github.com/mwette/guile-libyaml")
(synopsis "Guile wrapper for libyaml")
(description
"This package provides a simple yaml module for Guile using the
ffi-helper from nyacc.")
(license license:lgpl3+))))
(define-public schmutz (define-public schmutz
(let ((commit "add24588c59552537b8f1316df99a0cdd62c221e") (let ((commit "add24588c59552537b8f1316df99a0cdd62c221e")
(revision "1")) (revision "1"))

4
gnu/packages/guile.scm
View file

@ -575,14 +575,14 @@ specification. These are the main features:
(package (package
(inherit guile-json-3) (inherit guile-json-3)
(name "guile-json") (name "guile-json")
(version "4.4.1") (version "4.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/guile-json/guile-json-" (uri (string-append "mirror://savannah/guile-json/guile-json-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1xq4f59rdk28xy4sdn6amy07aa19ikrk48iily3kfhwpkbg6v9jj")))))) "0iigada80cg7dl10z6ligiykci0cv9b88zmncz47nsz5g9gacdpc"))))))
(define-public guile2.2-json (define-public guile2.2-json
(package-for-guile-2.2 guile-json-4)) (package-for-guile-2.2 guile-json-4))

74
gnu/packages/hardware.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Evgeny Pisemsky <evgeny@pisemsky.com> ;;; Copyright © 2021 Evgeny Pisemsky <evgeny@pisemsky.com>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,17 +28,23 @@
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit) #:use-module (gnu packages polkit)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
@ -130,6 +137,45 @@ calibrated, and restored when the calibration is applied.")
human-readable format and checks if it conforms to the standards.") human-readable format and checks if it conforms to the standards.")
(license license:expat)))) (license license:expat))))
(define-public libsmbios
(package
(name "libsmbios")
(version "2.4.3")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url (string-append "https://github.com/dell/" name))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("pkg-config" ,pkg-config)
("perl" ,perl)
("python" ,python)))
(inputs
`(("libxml2" ,libxml2)))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'bootstrap
(lambda _ (invoke "autoreconf" "-vfi"))))))
(synopsis "Library for interacting with Dell SMBIOS tables")
(description
"libsmbios provides a library to interface with the SMBIOS tables. It
also provides extensions for proprietary methods of interfacing with Dell
specific SMBIOS tables.")
(home-page "https://github.com/dell/libsmbios")
(license
(list license:osl2.1 license:gpl2+ license:bsd-3 license:boost1.0))))
;; Distinct from memtest86, which is obsolete. ;; Distinct from memtest86, which is obsolete.
(define-public memtest86+ (define-public memtest86+
(package (package
@ -498,3 +544,31 @@ screens. It displays various patterns and allows you to estimate the quality
of your CRT/LCD monitor.") of your CRT/LCD monitor.")
(home-page "https://github.com/TobiX/screentest") (home-page "https://github.com/TobiX/screentest")
(license license:gpl2))) (license license:gpl2)))
(define-public tpm2-tss
(package
(name "tpm2-tss")
(version "3.0.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/tpm2-software/tpm2-tss"
"/releases/download/" version "/tpm2-tss-" version
".tar.gz"))
(sha256
(base32 "05xynpwq851fp8f5fy7ac0blvz8mr5m5cbqj3gslgbwv63kjnfbq"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)
("json-c" ,json-c)
("openssl" ,openssl)))
(home-page "https://tpm2-software.github.io/")
(synopsis "OSS Implementation of the TCG TPM2 Software Stack (TSS2)")
(description
"This package provides the @acronym{TCG, Trusted Computing Group}
@acronym{TSS2, TPM2 Software Stack}. The stack contains libtss2-fapi,
libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-swtpm
and libtss2-tcti-mssim.")
(license license:bsd-2)))

4
gnu/packages/haskell-apps.scm
View file

@ -339,14 +339,14 @@ to @code{cabal repl}).")
(define-public git-annex (define-public git-annex
(package (package
(name "git-annex") (name "git-annex")
(version "8.20201127") (version "8.20210127")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"git-annex/git-annex-" version ".tar.gz")) "git-annex/git-annex-" version ".tar.gz"))
(sha256 (sha256
(base32 "0n9m5ffgbzms0nh9dskrc7vjgwwwi9f9gxyh498wnspf96729zz7")))) (base32 "1hsmaw70lfza1g5j6b9zbwqkkr374m18p7qb4nl952pj42a46vv3"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

12
gnu/packages/idris.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com> ;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019, 2021 Eric Bavier <bavier@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -38,7 +38,7 @@
(define-public idris (define-public idris
(package (package
(name "idris") (name "idris")
(version "1.3.2") (version "1.3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -46,10 +46,12 @@
"idris-" version "/idris-" version ".tar.gz")) "idris-" version "/idris-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wychzkg0yghd2pp8fqz78vp1ayzks191knfpl7mhh8igsmb6bc7")))) "1pachwc6msw3n1mz2z1r1w6h518w9gbhdvbaa5vi1qp3cn3wm6q4"))
(patches (search-patches "idris-disable-test.patch"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(native-inputs ;For tests (native-inputs ;For tests
`(("perl" ,perl) `(("perl" ,perl)
("ghc-cheapskate" ,ghc-cheapskate)
("ghc-tasty" ,ghc-tasty) ("ghc-tasty" ,ghc-tasty)
("ghc-tasty-golden" ,ghc-tasty-golden) ("ghc-tasty-golden" ,ghc-tasty-golden)
("ghc-tasty-rerun" ,ghc-tasty-rerun))) ("ghc-tasty-rerun" ,ghc-tasty-rerun)))
@ -98,7 +100,8 @@
(add-after 'unpack 'update-constraints (add-after 'unpack 'update-constraints
(lambda _ (lambda _
(substitute* "idris.cabal" (substitute* "idris.cabal"
(("ansi-terminal < 0\\.9") "ansi-terminal < 0.10")) (("ansi-terminal < 0\\.9") "ansi-terminal < 0.10")
(("cheapskate >= 0\\.1\\.1\\.2 && < 0\\.2") "cheapskate >= 0.1.1.1 && < 0.2"))
#t)) #t))
(add-before 'configure 'set-cc-command (add-before 'configure 'set-cc-command
(lambda _ (lambda _
@ -118,6 +121,7 @@
(add-after 'install 'check (add-after 'install 'check
(lambda* (#:key outputs #:allow-other-keys #:rest args) (lambda* (#:key outputs #:allow-other-keys #:rest args)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(chmod "test/scripts/timeout" #o755) ;must be executable
(setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count))) (setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count)))
(setenv "IDRIS_CC" "gcc") ;Needed for creating executables (setenv "IDRIS_CC" "gcc") ;Needed for creating executables
(setenv "PATH" (string-append out "/bin:" (getenv "PATH"))) (setenv "PATH" (string-append out "/bin:" (getenv "PATH")))

4
gnu/packages/image-viewers.scm
View file

@ -296,7 +296,7 @@ your images. Among its features are:
(define-public catimg (define-public catimg
(package (package
(name "catimg") (name "catimg")
(version "2.6.0") (version "2.7.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -305,7 +305,7 @@ your images. Among its features are:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz")))) (base32 "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests

4
gnu/packages/image.scm
View file

@ -1236,7 +1236,9 @@ processing and analysis library that puts its main emphasis on customizable
algorithms and data structures. It is particularly strong for algorithms and data structures. It is particularly strong for
multi-dimensional image processing.") multi-dimensional image processing.")
(license license:expat) (license license:expat)
(home-page "https://ukoethe.github.io/vigra/"))) (home-page "https://ukoethe.github.io/vigra/")
(properties '((max-silent-time . 7200))))) ;2 hours, to avoid timing out
(define-public vigra-c (define-public vigra-c
(let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7") (let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7")

4
gnu/packages/inkscape.scm
View file

@ -120,7 +120,7 @@ as the native format.")
(define-public inkscape-1.0 (define-public inkscape-1.0
(package (package
(name "inkscape") (name "inkscape")
(version "1.0.1") (version "1.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -129,7 +129,7 @@ as the native format.")
"inkscape-" version ".tar.xz")) "inkscape-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng")) "12krl97a00gdcxxibsb7g2lgx5458mhx2437x0hvz350242j6gns"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 format))) (ice-9 format)))
(snippet (snippet

5
gnu/packages/java.scm
View file

@ -14,6 +14,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -13120,7 +13121,7 @@ network protocols, and core version control algorithms.")
(define-public abcl (define-public abcl
(package (package
(name "abcl") (name "abcl")
(version "1.6.0") (version "1.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -13128,7 +13129,7 @@ network protocols, and core version control algorithms.")
version "/abcl-src-" version ".tar.gz")) version "/abcl-src-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9")) "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx"))
(patches (patches
(search-patches (search-patches
"abcl-fix-build-xml.patch")))) "abcl-fix-build-xml.patch"))))

181
gnu/packages/julia-xyz.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020, 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -22,19 +22,41 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system julia)) #:use-module (guix build-system julia))
(define-public julia-adapt
(package
(name "julia-adapt")
(version "3.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaGPU/Adapt.jl")
(commit (string-append "v" version))))
(file-name "Adapt")
(sha256
(base32 "1lks6k3a1gvwlplld47nh6xfy3nnlpc0vhkzg6zg0qn33qdmavrg"))))
(build-system julia-build-system)
(home-page "https://github.com/JuliaGPU/Adapt.jl")
(synopsis "Package providing the @code{adapt} function, similar to @code{convert}")
(description "This Julia package provides the @code{adapt(T, x)} function
acts like @code{convert(T, x)}, but without the restriction of returning a
@code{T}. This allows you to \"convert\" wrapper types like @code{Adjoint} to
be GPU compatible without throwing away the wrapper.")
(license license:expat)))
(define-public julia-compat (define-public julia-compat
(package (package
(name "julia-compat") (name "julia-compat")
(version "3.9.1") (version "3.25.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/JuliaLang/Compat.jl") (url "https://github.com/JuliaLang/Compat.jl")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name "Compat") (file-name (git-file-name name version))
(sha256 (sha256
(base32 "01vwjr2134bzgnaxwd67knbibbhnfgnqjw7gxrp29s6y2a6j3882")))) (base32 "1m4r5i8mq29xjp3mllh6047n5a78sdyld57m15anrnsjgaapcgby"))))
(build-system julia-build-system) (build-system julia-build-system)
(home-page "https://github.com/JuliaLang/Compat.jl") (home-page "https://github.com/JuliaLang/Compat.jl")
(synopsis "Compatibility across Julia versions") (synopsis "Compatibility across Julia versions")
@ -43,3 +65,154 @@ between older and newer versions of the Julia language. The Compat package
provides a macro that lets you use the latest syntax in a backwards-compatible provides a macro that lets you use the latest syntax in a backwards-compatible
way.") way.")
(license license:expat))) (license license:expat)))
(define-public julia-datastructures
(package
(name "julia-datastructures")
(version "0.18.9")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaCollections/DataStructures.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0hdqp8ipsqdw5bqqkdvz4j6n67x80sj5azr9vzyxwjfsgkfbnk2l"))))
(propagated-inputs
`(("julia-compat" ,julia-compat)
("julia-orderedcollections" ,julia-orderedcollections)))
(build-system julia-build-system)
(home-page "https://github.com/JuliaCollections/DataStructures.jl")
(synopsis "Julia module providing different data structures")
(description "This package implements a variety of data structures,
including, @code{CircularBuffer}, @code{Queue}, @code{Stack},
@code{Accumulators}, @code{LinkedLists}, @code{SortedDicts} and many others.")
(license license:expat)))
(define-public julia-fixedpointnumbers
(package
(name "julia-fixedpointnumbers")
(version "0.8.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaMath/FixedPointNumbers.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0j0n40n04q9sk68wh9jq90m6c67k4ws02k41djjzkrqmpzv4rcdi"))))
(build-system julia-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-test
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "test/fixed.jl"
;; A deprecation warning is not thrown
(("@test_logs.*:warn" all) (string-append "# " all)))
#t)))))
(propagated-inputs `(("julia-compat" ,julia-compat)))
(home-page "https://github.com/JuliaMath/FixedPointNumbers.jl")
(synopsis "Fixed point types for Julia")
(description "@code{FixedPointNumbers.jl} implements fixed-point number
types for Julia. A fixed-point number represents a fractional, or
non-integral, number. In contrast with the more widely known floating-point
numbers, with fixed-point numbers the decimal point doesn't \"float\":
fixed-point numbers are effectively integers that are interpreted as being
scaled by a constant factor. Consequently, they have a fixed number of
digits (bits) after the decimal (radix) point.")
(license license:expat)))
(define-public julia-json
(package
(name "julia-json")
(version "0.21.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaIO/JSON.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1f9k613kbknmp4fgjxvjaw4d5sfbx8a5hmcszmp1w9rqfqngjx9m"))))
(build-system julia-build-system)
(propagated-inputs
`(("julia-datastructures" ,julia-datastructures)
("julia-fixedpointnumbers" ,julia-fixedpointnumbers)
("julia-parsers" ,julia-parsers)
("julia-offsetarrays" ,julia-offsetarrays)))
(home-page "https://github.com/JuliaIO/JSON.jl")
(synopsis "JSON parsing and printing library for Julia")
(description "@code{JSON.jl} is a pure Julia module which supports parsing
and printing JSON documents.")
(license license:expat)))
(define-public julia-orderedcollections
(package
(name "julia-orderedcollections")
(version "1.3.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaCollections/OrderedCollections.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0sfip1ixghsz91q2s7d62rgzw3gppg42fg6bccxlplqa3hfmbycf"))))
(build-system julia-build-system)
(home-page "https://github.com/JuliaCollections/OrderedCollections.jl")
(synopsis "Associative containers that preserve insertion order")
(description "This package implements @code{OrderedDicts} and
@code{OrderedSets}, which are similar to containers in base Julia. However,
during iteration the @code{Ordered*} containers return items in the order in
which they were added to the collection.")
(license license:expat)))
(define-public julia-offsetarrays
(package
(name "julia-offsetarrays")
(version "1.5.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaArrays/OffsetArrays.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1y3fnssw2hzyghrk6jfcxslab0f8sjkjszh482snfq4k6mkrhy77"))))
(build-system julia-build-system)
(propagated-inputs
`(("julia-adapt" ,julia-adapt)))
;; CatIndices depends on OffsetArrays, introducing a recursive dependency
(arguments '(#:tests? #f))
(home-page "https://juliaarrays.github.io/OffsetArrays.jl/stable/")
(synopsis "Fortran-like arrays with arbitrary, zero or negative indices")
(description "@code{OffsetArrays.jl} provides Julia users with arrays that
have arbitrary indices, similar to those found in some other programming
languages like Fortran.")
(license license:expat)))
(define-public julia-parsers
(package
(name "julia-parsers")
(version "1.0.15")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaData/Parsers.jl")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "16iffl6l28kspgqch48mhi1s8qhspr3cpqcwsph3rqi72lbfqygx"))))
(build-system julia-build-system)
(home-page "https://github.com/JuliaData/Parsers.jl")
(synopsis "Fast parsing machinery for basic types in Julia")
(description "@code{Parsers.jl} is a collection of type parsers and
utilities for Julia.")
(license license:expat)))

70
gnu/packages/kde.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org> ;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org>
@ -9,7 +9,7 @@
;;; Copyright © 2018, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2018, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com> ;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
;;; ;;;
@ -457,7 +457,7 @@ illustrate project schedules.")
(define-public krita (define-public krita
(package (package
(name "krita") (name "krita")
(version "4.4.1") (version "4.4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -465,7 +465,7 @@ illustrate project schedules.")
"/krita-" version ".tar.gz")) "/krita-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"05rq5hkh2lmk8hall2h9ccaav0nw8fj7vd4aff5fyp2fiq3aybbg")))) "14lprcv7xw6r19bmylcz4c1p1jfazmza2b4m48f3x7vmdv2sx5ln"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
@ -714,6 +714,7 @@ different notification systems.")
("qtmultimedia" ,qtmultimedia) ("qtmultimedia" ,qtmultimedia)
("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols" ,qtquickcontrols)
("qtquickcontrols2" ,qtquickcontrols2) ("qtquickcontrols2" ,qtquickcontrols2)
("qtwayland" ,qtwayland)
("qtx11extras" ,qtx11extras))) ("qtx11extras" ,qtx11extras)))
(home-page "https://community.kde.org/KDEConnect") (home-page "https://community.kde.org/KDEConnect")
(synopsis "Enable your devices to communicate with each other") (synopsis "Enable your devices to communicate with each other")
@ -758,6 +759,40 @@ communicate with each other. Here's a few things KDE Connect can do:
charts.") charts.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public kdf
(package
(name "kdf")
(version "20.12.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kdf-" version ".tar.xz"))
(sha256
(base32
"0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("kdoctools" ,kdoctools)))
(inputs
`(("kcmutils" ,kcmutils)
("kconfigwidgets" ,kconfigwidgets)
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes)
("kio" ,kio)
("knotifications" ,knotifications)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase)))
(home-page "https://kde.org/applications/system/kdk")
(synopsis "View Disk Usage")
(description "KDiskFree displays the available file devices (hard drive
partitions, floppy and CD drives, etc.) along with information on their
capacity, free space, type and mount point. It also allows you to mount and
unmount drives and view them in a file manager.")
(license license:gpl2+)))
(define-public kcachegrind (define-public kcachegrind
(package (package
(name "kcachegrind") (name "kcachegrind")
@ -913,6 +948,33 @@ Python, PHP, and Perl.")
a variety of formats, including PDF, PostScript, DejaVu, and EPub.") a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public poxml
(package
(name "poxml")
(version "20.12.1")
(source (origin
(method url-fetch)
(uri
(string-append "mirror://kde/stable/release-service/" version
"/src/poxml-" version ".tar.xz"))
(sha256
(base32
"1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("kdoctools" ,kdoctools)))
(inputs
`(("gettext" ,gettext-minimal)
("qtbase" ,qtbase)))
(home-page "https://kde.org/applications/development")
(synopsis "Tools for translating DocBook XML files with Gettext")
(description "This is a collection of tools that facilitate translating
DocBook XML files using Gettext message files (PO files). Also included are
several command-line utilities for manipulating DocBook XML files, PO files and
PO template files.")
(license license:gpl2+)))
(define-public kdegraphics-mobipocket (define-public kdegraphics-mobipocket
(package (package
(name "kdegraphics-mobipocket") (name "kdegraphics-mobipocket")

279
gnu/packages/language.scm
View file

@ -23,36 +23,313 @@
(define-module (gnu packages language) (define-module (gnu packages language)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages anthy)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages base)
#:use-module (gnu packages docbook)
#:use-module (gnu packages emacs)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages ibus)
#:use-module (gnu packages java) #:use-module (gnu packages java)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages ocr) #:use-module (gnu packages ocr)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages qt)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module ((guix licenses) #:use-module ((guix licenses)
#:select #:select
(bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1)) (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1 fdl1.2+))
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils)) #:use-module (guix utils))
(define-public nimf
(package
(name "nimf")
(version "1.2")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/hamonikr/nimf.git")
(commit
(string-append "nimf-" version))))
(file-name
(git-file-name name version))
(sha256
(base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc"))))
(build-system glib-or-gtk-build-system)
(outputs '("out" "doc"))
(arguments
`(#:imported-modules
(,@%glib-or-gtk-build-system-modules
(guix build cmake-build-system)
(guix build qt-build-system))
#:modules
((guix build glib-or-gtk-build-system)
((guix build qt-build-system)
#:prefix qt:)
(guix build utils))
#:configure-flags
(list
"--with-im-config-data"
"--with-imsettings-data"
(string-append "--with-html-dir="
(assoc-ref %outputs "doc")
"/share/gtk-doc/html"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-flags
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "configure.ac"
(("-Werror")
"-Wno-error"))
#t))
(add-after 'patch-flags 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "docs"
(substitute* "nimf-docs.xml"
(("http://www.oasis-open.org/docbook/xml/4.3/")
(string-append (assoc-ref inputs "docbook-xml-4.3")
"/xml/dtd/docbook/"))))
#t))
(add-after 'patch-docbook-xml 'patch-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "configure.ac"
(("/usr/share/anthy/anthy.dic")
(string-append (assoc-ref inputs "anthy")
"/share/anthy/anthy.dic")))
(substitute* "configure.ac"
(("/usr/bin:\\$GTK3_LIBDIR/libgtk-3-0")
(string-append (assoc-ref inputs "gtk+:bin")
"/bin:$GTK3_LIBDIR/libgtk-3-0"))
(("/usr/bin:\\$GTK2_LIBDIR/libgtk2.0-0")
(string-append (assoc-ref inputs "gtk+-2:bin")
"/bin:$GTK2_LIBDIR/libgtk2.0-0")))
(substitute* "modules/clients/gtk/Makefile.am"
(("\\$\\(GTK3_LIBDIR\\)")
(string-append (assoc-ref outputs "out")
"/lib"))
(("\\$\\(GTK2_LIBDIR\\)")
(string-append (assoc-ref outputs "out")
"/lib")))
(substitute* "modules/clients/qt4/Makefile.am"
(("\\$\\(QT4_LIB_DIR\\)")
(string-append (assoc-ref outputs "out")
"/lib")))
(substitute* "modules/clients/qt5/Makefile.am"
(("\\$\\(QT5_IM_MODULE_DIR\\)")
(string-append (assoc-ref outputs "out")
"/lib/qt5/plugins/inputmethods")))
(substitute* '("bin/nimf-settings/Makefile.am"
"data/apparmor-abstractions/Makefile.am"
"data/Makefile.am" "data/im-config/Makefile.am"
"data/imsettings/Makefile.am")
(("/etc")
(string-append (assoc-ref outputs "out")
"/etc"))
(("/usr/share")
(string-append (assoc-ref outputs "out")
"/share")))
#t))
(add-after 'install 'qt-wrap
(assoc-ref qt:%standard-phases 'qt-wrap)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("docbook-xml-4.3" ,docbook-xml-4.3)
("gettext" ,gettext-minimal)
("gobject-introspection" ,gobject-introspection)
("gtk+-2:bin" ,gtk+-2 "bin")
("gtk+:bin" ,gtk+ "bin")
("gtk-doc" ,gtk-doc)
("intltool" ,intltool)
("libtool" ,libtool)
("perl" ,perl)
("pkg-config" ,pkg-config)
("which" ,which)))
(inputs
`(("anthy" ,anthy)
("appindicator" ,libappindicator)
("gtk+-2" ,gtk+-2)
("gtk+" ,gtk+)
("hangul" ,libhangul)
("m17n-db" ,m17n-db)
("m17n-lib" ,m17n-lib)
("qt-4" ,qt-4)
("qtbase" ,qtbase)
("rime" ,librime)
("rsvg" ,librsvg)
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)
("x11" ,libx11)
("xkbcommon" ,libxkbcommon)
("xklavier" ,libxklavier)))
(propagated-inputs
`(("glib" ,glib)))
(synopsis "Lightweight input method framework")
(description "Nimf is a lightweight, fast and extensible input method
framework. This package provides a fork of the original nimf project, that
focusses especially on Korean input (Hangul, Hanja, ...).")
(home-page "https://github.com/hamonikr/nimf/")
(license lgpl3+)))
(define-public hime
(package
(name "hime")
(version "0.9.11")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/hime-ime/hime.git")
(commit
(string-append "v" version))))
(file-name
(git-file-name name version))
(sha256
(base32 "1wn0ici78x5qh6hvv50bf76ld7ds42hzzl4l5qz34hp8wyvrwakw"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:tests? #f ; No target
#:imported-modules
(,@%glib-or-gtk-build-system-modules
(guix build cmake-build-system)
(guix build qt-build-system))
#:modules
((guix build glib-or-gtk-build-system)
((guix build qt-build-system)
#:prefix qt:)
(guix build utils))
#:configure-flags
(list
;; FIXME
;; error: unknown type name ‘GtkStatusIcon’
"--disable-system-tray")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-std
(lambda _
(substitute* "configure"
(("gnu17")
"gnu11")
(("gnu++17")
"gnu++11"))
#t))
(add-after 'install 'qt-wrap
(assoc-ref qt:%standard-phases 'qt-wrap)))))
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("whereis" ,util-linux)))
(inputs
`(("anthy" ,anthy)
("appindicator" ,libappindicator)
("chewing" ,libchewing)
("gtk+" ,gtk+)
("qtbase" ,qtbase)
("xtst" ,libxtst)))
(synopsis "HIME Input Method Editor")
(description "Hime is an extremely easy-to-use input method framework. It
is lightweight, stable, powerful and supports many commonly used input methods,
including Cangjie, Zhuyin, Dayi, Ranked, Shrimp, Greek, Anthy, Korean, Latin,
Random Cage Fighting Birds, Cool Music etc.")
(home-page "http://hime-ime.github.io/")
(license
(list
gpl2+
lgpl2.1+
;; Documentation
fdl1.2+))))
(define-public libchewing
(package
(name "libchewing")
(version "0.5.1")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/chewing/libchewing.git")
(commit
(string-append "v" version))))
(file-name
(git-file-name name version))
(sha256
(base32 "04d09w6xdd08v6laj9y4qmqsijw5i2jvshcilhh4vg6cfnfgl2my"))))
(build-system gnu-build-system)
(arguments
`(;; test-easy-symbol and test-fullshape fail with multiple cores.
#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "test/Makefile.am"
((" test-bopomofo ")
"")
((" test-config ")
"")
((" test-reset ")
"")
((" test-symbol ")
"")
((" test-keyboardless ")
"")
((" test-special-symbol ")
"")
((" test-keyboard ")
"")
((" test-regression ")
"")
((" test-userphrase ")
""))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("texinfo" ,texinfo)))
(inputs
`(("ncurses" ,ncurses)
("sqlite" ,sqlite)))
(synopsis "Chinese phonetic input method")
(description "Chewing is an intelligent phonetic (Zhuyin/Bopomofo) input
method, one of the most popular choices for Traditional Chinese users.")
(home-page "http://chewing.im/")
(license lgpl2.1+)))
(define-public liblouis (define-public liblouis
(package (package
(name "liblouis") (name "liblouis")

6
gnu/packages/libreoffice.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -1085,7 +1085,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(define-public libreoffice (define-public libreoffice
(package (package
(name "libreoffice") (name "libreoffice")
(version "6.4.6.2") (version "6.4.7.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1094,7 +1094,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
"https://download.documentfoundation.org/libreoffice/src/" "https://download.documentfoundation.org/libreoffice/src/"
(version-prefix version 3) "/libreoffice-" version ".tar.xz")) (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256 (sha256
(base32 "0k5aq1pfw2rpq28nkx6syrgwqbbdn6my9bnlqi3fn8qf572q30mb")))) (base32 "0i3654rmzs8aazj8j3dmxamilslfrki0y4sksg3n1zygc2ddfk83"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)

4
gnu/packages/libunwind.scm
View file

@ -28,14 +28,14 @@
(define-public libunwind (define-public libunwind
(package (package
(name "libunwind") (name "libunwind")
(version "1.3.1") (version "1.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/libunwind/libunwind-" (uri (string-append "mirror://savannah/libunwind/libunwind-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3")))) "05qhzcg1xag3l5m3c805np6k342gc0f3g087b7g16jidv59pccwh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are ;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are

4
gnu/packages/libusb.scm
View file

@ -53,7 +53,7 @@
(define-public libusb (define-public libusb
(package (package
(name "libusb") (name "libusb")
(version "1.0.23") (version "1.0.24")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -61,7 +61,7 @@
"releases/download/v" version "releases/download/v" version
"/libusb-" version ".tar.bz2")) "/libusb-" version ".tar.bz2"))
(sha256 (sha256
(base32 "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv")))) (base32 "0amilbi5qncdnrds3ji21vbiz1wvdm1fwp5qrxnk49xkyy2jdzby"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; XXX: Enabling udev is now recommended, but eudev indirectly depends on ;; XXX: Enabling udev is now recommended, but eudev indirectly depends on

39
gnu/packages/license.scm
View file

@ -1,7 +1,8 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Tanguy Le Carrour <tanguy@bioneland.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -169,13 +170,13 @@ belonging to various licenses.")
(define-public reuse (define-public reuse
(package (package
(name "reuse") (name "reuse")
(version "0.11.1") (version "0.12.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "reuse" version)) (uri (pypi-uri "reuse" version))
(sha256 (sha256
(base32 "09qjb4f49vr0a7zrszab8g719ilg2p6b942mr0bgyvplrjikkid5")))) (base32 "11i1xjbwbqjipzpbrbnp110zx1m49khn6dl5z3mjkjaz9kr6bl2f"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest) `(("python-pytest" ,python-pytest)
@ -205,3 +206,35 @@ tools that have a lot more features and functionality surrounding the analysis
and inspection of copyright and licenses in software projects. This one is and inspection of copyright and licenses in software projects. This one is
designed to be simple.") designed to be simple.")
(license (list asl2.0 gpl3+)))) (license (list asl2.0 gpl3+))))
(define-public licenseheaders
(package
(name "licenseheaders")
(version "0.8.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "licenseheaders" version))
(sha256
(base32 "073xcm10gyg5kcxqmbsyaz9sr0slbdwgr0r9qanch0zl8i0z9259"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; Reported upstream:
;; <https://github.com/johann-petrak/licenseheaders/issues/47>.
(add-after 'unpack 'patch-code
(lambda _
(substitute* "licenseheaders.py"
(("\\\"filenames\\\": \\[\\\"CMakeLists.txt\\\"\\],")
"\"filenames\": [\"CMakeLists.txt\"], \n \"extensions\": [],"))
#t)))))
(propagated-inputs
`(("python-regex" ,python-regex)))
(home-page "http://github.com/johann-petrak/licenseheaders")
(synopsis "Add or change license headers for all files in a directory")
(description
"Licenseheaders is a Python 3 tool to update, change or add license
headers to all files of any of the supported types in or below some
directory.")
(license expat)))

107
gnu/packages/linux.scm
View file

@ -49,7 +49,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com> ;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Greg Hogan <code@greghogan.com> ;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2020 David Dashyan <mail@davie.li> ;;; Copyright © 2020 David Dashyan <mail@davie.li>
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net> ;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major ;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream. ;; versions that are still supported upstream.
(define-public linux-libre-5.10-version "5.10.6") (define-public linux-libre-5.10-version "5.10.12")
(define deblob-scripts-5.10 (define deblob-scripts-5.10
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-5.10-version linux-libre-5.10-version
@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7")))
(define-public linux-libre-5.10-pristine-source (define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version) (let ((version linux-libre-5.10-version)
(hash (base32 "02v91afra3pcwfws74wxdsm8pfc57vws659b7j6jmsxm3hnd0rvp"))) (hash (base32 "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.10))) deblob-scripts-5.10)))
@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support. ;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines: ;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html> ;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.4-version "5.4.88") (define-public linux-libre-5.4-version "5.4.94")
(define deblob-scripts-5.4 (define deblob-scripts-5.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-5.4-version linux-libre-5.4-version
@ -377,12 +377,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
(define-public linux-libre-5.4-pristine-source (define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version) (let ((version linux-libre-5.4-version)
(hash (base32 "1ci432xanm7glgg05012kh43pfi4k771kzih0816y5674v0hg02b"))) (hash (base32 "0f9bml584g6jb822j7xyxx9j2g3s49p08xz4bkx9lbiinxyzagf2")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.4))) deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.166") (define-public linux-libre-4.19-version "4.19.172")
(define deblob-scripts-4.19 (define deblob-scripts-4.19
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.19-version linux-libre-4.19-version
@ -390,12 +390,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source (define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version) (let ((version linux-libre-4.19-version)
(hash (base32 "03l86ykdjs5wa0n4wknpgy9dv2r6l92qfsyak373jkhs684z53mr"))) (hash (base32 "08hl7vw5r61gnzagnm8nbhlbm0h226crp4m19zh0qr2q0pmwqd2g")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.19))) deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.214") (define-public linux-libre-4.14-version "4.14.218")
(define deblob-scripts-4.14 (define deblob-scripts-4.14
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.14-version linux-libre-4.14-version
@ -403,12 +403,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(define-public linux-libre-4.14-pristine-source (define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version) (let ((version linux-libre-4.14-version)
(hash (base32 "07ir4yw7s5c6yb3gjbgjvcqqdgpbsjxrvapgh6zs22ffd8hrchpm"))) (hash (base32 "0l2rcpccf71amngii7vs18x4x6gb0bwxdb2gszabip03bshqdzp3")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.14))) deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.250") (define-public linux-libre-4.9-version "4.9.254")
(define deblob-scripts-4.9 (define deblob-scripts-4.9
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.9-version linux-libre-4.9-version
@ -416,12 +416,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(define-public linux-libre-4.9-pristine-source (define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version) (let ((version linux-libre-4.9-version)
(hash (base32 "15vizxd2i2311skjank406ny3bc30c5rz2p9jvh5xz1yv12vzgcy"))) (hash (base32 "1djw5mlff73j7m1176qspdzhf6zyv4m0gkdvlxq4g4mdrbqfx6xn")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.9))) deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.250") (define-public linux-libre-4.4-version "4.4.254")
(define deblob-scripts-4.4 (define deblob-scripts-4.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-4.4-version linux-libre-4.4-version
@ -429,7 +429,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source (define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version) (let ((version linux-libre-4.4-version)
(hash (base32 "12m14j8654rawj2znkyhvcnwnf53x10zlghxd0mpl8dfzwvn2f5b"))) (hash (base32 "11wca1mprlcyk7r5h1c8rx3hr7l6mj4i85jaaf106s7wqcm8wamd")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.4))) deblob-scripts-4.4)))
@ -641,6 +641,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
("CONFIG_MEMCG_KMEM" . #t) ("CONFIG_MEMCG_KMEM" . #t)
("CONFIG_CPUSETS" . #t) ("CONFIG_CPUSETS" . #t)
("CONFIG_PROC_PID_CPUSET" . #t) ("CONFIG_PROC_PID_CPUSET" . #t)
;; Allow disk encryption by default
("CONFIG_DM_CRYPT" . m)
;; Modules required for initrd: ;; Modules required for initrd:
("CONFIG_NET_9P" . m) ("CONFIG_NET_9P" . m)
("CONFIG_NET_9P_VIRTIO" . m) ("CONFIG_NET_9P_VIRTIO" . m)
@ -850,7 +852,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(description (description
"GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel.
It has been modified to remove all non-free binary blobs.") It has been modified to remove all non-free binary blobs.")
(license license:gpl2))) (license license:gpl2)
(properties '((max-silent-time . 3600))))) ;don't timeout on blob scan.
;;; ;;;
@ -2218,7 +2221,7 @@ external rate conversion.")
(define-public iptables (define-public iptables
(package (package
(name "iptables") (name "iptables")
(version "1.8.6") (version "1.8.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2227,7 +2230,7 @@ external rate conversion.")
(string-append "https://www.netfilter.org/projects/iptables/" (string-append "https://www.netfilter.org/projects/iptables/"
"files/iptables-" version ".tar.bz2"))) "files/iptables-" version ".tar.bz2")))
(sha256 (sha256
(base32 "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50")))) (base32 "1w6qx3sxzkv80shk21f63rq41c84irpx68k62m2cv629n1mwj2f1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -5513,7 +5516,7 @@ The package provides additional NTFS tools.")
(define-public rdma-core (define-public rdma-core
(package (package
(name "rdma-core") (name "rdma-core")
(version "26.0") (version "33.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core" (uri (string-append "https://github.com/linux-rdma/rdma-core"
@ -5521,27 +5524,18 @@ The package provides additional NTFS tools.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"14raqwx4pkzghiwkx1v0dq338f7xqqx8rnsxlpdnngvjy1p5l79j")))) "1rah0v9gq9rksqd2c17nmydsxcjz178n7m2y4ricwlf5pq1b2yfi"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
;; Upstream uses the "ninja" build system and encourage distros ;; Upstream uses the "ninja" build system and encourage distros
;; to do the same for consistency. They also recommend using the ;; to do the same for consistency.
;; "Release" build type.
#:build-type "Release"
#:configure-flags (list "-GNinja" #:configure-flags (list "-GNinja"
(string-append "-DRST2MAN_EXECUTABLE=" (string-append "-DRST2MAN_EXECUTABLE="
(assoc-ref %build-inputs (assoc-ref %build-inputs
"python-docutils") "python-docutils")
"/bin/rst2man.py") "/bin/rst2man.py"))
;; On some configurations, the
;; IB_USER_MAD_REGISTER_AGENT ioctl, which is
;; used by default, would return ENODEV. To
;; avoid that, use 'write' instead of ioctls,
;; as suggested in 'CMakeList.txt'.
"-DIOCTL_MODE=write")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'build (replace 'build
@ -5634,7 +5628,7 @@ The collection contains a set of bandwidth and latency benchmark such as:
(package (package
(name "rng-tools") (name "rng-tools")
(home-page "https://github.com/nhorman/rng-tools") (home-page "https://github.com/nhorman/rng-tools")
(version "6.10") (version "6.11")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url home-page) (uri (git-reference (url home-page)
@ -5642,7 +5636,7 @@ The collection contains a set of bandwidth and latency benchmark such as:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hbml37yxs0fs69g7f2x4ixq61z0029swy99rn7ykma9mi6b7ni9")))) "0wwvi8a8k2ahhmwln4w970b8gd3in3g13jkbsapkpnspwmlqj5xa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; Disable support for various hardware entropy sources as they need `(;; Disable support for various hardware entropy sources as they need
@ -5919,20 +5913,20 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.")
(define-public mcelog (define-public mcelog
(package (package
(name "mcelog") (name "mcelog")
(version "173") (version "175")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" (method git-fetch)
"mcelog.git/snapshot/v" version ".tar.gz")) (uri (git-reference
(url "https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "0vvrnjkh1jp7f6295syydg7lplqmcm8msdls3xyk8xfiz69xqdjz"))
"1a1j4lsvql3aiqbkdn10hhpvmhavhlr9qkh2scxcv1kn7rvvclih"))
(file-name (string-append name "-" version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
;; The snapshots lack a .git directory, ;; The checkout lack a .git directory, breaking ‘git describe’.
;; breaking ‘git describe’.
(substitute* "Makefile" (substitute* "Makefile"
(("\"unknown\"") (string-append "\"v" ,version "\""))) (("\"unknown\"") (string-append "\"v" ,version "\"")))
#t)))) #t))))
@ -5941,7 +5935,7 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.")
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(delete 'configure)) ; no configure script (delete 'configure)) ; no configure script
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:make-flags (let ((out (assoc-ref %outputs "out")))
(list "CC=gcc" (list (string-append "CC=" ,(cc-for-target))
(string-append "prefix=" out) (string-append "prefix=" out)
(string-append "DOCDIR=" out "/share/doc/" (string-append "DOCDIR=" out "/share/doc/"
,name "-" ,version) ,name "-" ,version)
@ -6442,14 +6436,14 @@ re-use code and to avoid re-inventing the wheel.")
(define-public libnftnl (define-public libnftnl
(package (package
(name "libnftnl") (name "libnftnl")
(version "1.1.8") (version "1.1.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://netfilter.org/libnftnl/" (uri (string-append "mirror://netfilter.org/libnftnl/"
"libnftnl-" version ".tar.bz2")) "libnftnl-" version ".tar.bz2"))
(sha256 (sha256
(base32 "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4")))) (base32 "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -6466,7 +6460,7 @@ used by nftables.")
(define-public nftables (define-public nftables
(package (package
(name "nftables") (name "nftables")
(version "0.9.7") (version "0.9.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6475,7 +6469,7 @@ used by nftables.")
(string-append "https://www.nftables.org/projects/nftables" (string-append "https://www.nftables.org/projects/nftables"
"/files/nftables-" version ".tar.bz2"))) "/files/nftables-" version ".tar.bz2")))
(sha256 (sha256
(base32 "1c1c2475nifncv0ng8z77h2dpanlsx0bhqm15k00jb3a6a68lszy")))) (base32 "1r4g22grhd4s1918wws9vggb8821sv4kkj8197ygxr6sar301z30"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments `(#:configure-flags (arguments `(#:configure-flags
'("--disable-man-doc"))) ; FIXME: Needs docbook2x. '("--disable-man-doc"))) ; FIXME: Needs docbook2x.
@ -6732,7 +6726,7 @@ comparing system environments.")
(define-public libfabric (define-public libfabric
(package (package
(name "libfabric") (name "libfabric")
(version "1.4.1") (version "1.11.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6740,7 +6734,7 @@ comparing system environments.")
(string-append "https://github.com/ofiwg/libfabric/releases/download/v" (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2")) version "/libfabric-" version ".tar.bz2"))
(sha256 (sha256
(base32 "19l2m1frna1l765z4j7wl8hp4rb9wrh0hy5496685hd183hmy5pv")))) (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("rdma-core" ,rdma-core) (inputs `(("rdma-core" ,rdma-core)
,@(match (%current-system) ,@(match (%current-system)
@ -7593,7 +7587,7 @@ persistent over reboots.")
(define-public libbpf (define-public libbpf
(package (package
(name "libbpf") (name "libbpf")
(version "0.0.9") (version "0.1.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -7603,7 +7597,7 @@ persistent over reboots.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7")))) "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -7623,10 +7617,7 @@ persistent over reboots.")
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'build 'pre-build (add-before 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(substitute* "scripts/check-reallocarray.sh"
(("/bin/rm" rm)
(string-append (assoc-ref inputs "coreutils") rm)))
(chdir "src") (chdir "src")
#t))))) #t)))))
(home-page "https://github.com/libbpf/libbpf") (home-page "https://github.com/libbpf/libbpf")
@ -7640,7 +7631,7 @@ headers.")
(define-public bcc (define-public bcc
(package (package
(name "bcc") (name "bcc")
(version "0.15.0") (version "0.16.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -7650,7 +7641,7 @@ headers.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1d5j9zanffa1c7lpi5fcrdlx1n7hy86xl82fam2xqr0s41q4ipxw")))) "1367c0bzrpclvjvmk0sxgi49rh7j2f9izqk5a7g3yvawh1fmvvjh"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -7865,7 +7856,7 @@ kernel side implementation.")
(define-public erofs-utils (define-public erofs-utils
(package (package
(name "erofs-utils") (name "erofs-utils")
(version "1.2") (version "1.2.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -7874,7 +7865,7 @@ kernel side implementation.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc")))) (base32 "1vb4mxsb59g29x7l22cffsqa8x743sra4j5zbmx89hjwpwm9vvcg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("lz4" ,lz4) `(("lz4" ,lz4)

1223
gnu/packages/lisp-xyz.scm
View file

File diff suppressed because it is too large Load diff

55
gnu/packages/lisp.scm
View file

@ -17,6 +17,7 @@
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -235,7 +236,13 @@ interface to the Tk widget system.")
`(("cl-asdf" ,cl-asdf) `(("cl-asdf" ,cl-asdf)
("which" ,which) ("which" ,which)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(inputs ;; When ECL is embedded in a program that wants to use Common Lisp as an
;; extension language, libgmp, libatomic-ops, libgc and libffi must be
;; present when compiling the program because they are required by ECL's
;; header file.
;; Therefore we put these libraries in 'propagated-inputs' instead
;; of 'inputs'.
(propagated-inputs
`(("gmp" ,gmp) `(("gmp" ,gmp)
("libatomic-ops" ,libatomic-ops) ("libatomic-ops" ,libatomic-ops)
("libgc" ,libgc) ("libgc" ,libgc)
@ -1079,7 +1086,7 @@ assembler, PEG) is less than 1MB.")
(define-public lisp-repl-core-dumper (define-public lisp-repl-core-dumper
(package (package
(name "lisp-repl-core-dumper") (name "lisp-repl-core-dumper")
(version "0.3.0") (version "0.5.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1088,7 +1095,7 @@ assembler, PEG) is less than 1MB.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1w7x7d7bnrdj0bd04vnjy7d7sngvcx1yjr4iw429hdd9lzlg8rbg")))) (base32 "1hrilm9lxy7zdidn4wac4yfqryg3hfw0371nanhd7g9bcfjx7n1q"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
'(#:install-plan '(#:install-plan
@ -1098,12 +1105,14 @@ assembler, PEG) is less than 1MB.")
(add-before 'install 'fix-utils-path (add-before 'install 'fix-utils-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((coreutils (string-append (assoc-ref inputs "coreutils") "/bin/")) (let* ((coreutils (string-append (assoc-ref inputs "coreutils") "/bin/"))
(cat (string-append coreutils "cat"))
(paste (string-append coreutils "paste")) (paste (string-append coreutils "paste"))
(sort (string-append coreutils "sort")) (sort (string-append coreutils "sort"))
(basename (string-append coreutils "basename")) (basename (string-append coreutils "basename"))
(sed (string-append (assoc-ref inputs "sed") "/bin/sed"))) (sed (string-append (assoc-ref inputs "sed") "/bin/sed")))
(substitute* "lisp-repl-core-dumper" (substitute* "lisp-repl-core-dumper"
(("\\$\\(basename") (string-append "$(" basename)) (("\\$\\(basename") (string-append "$(" basename))
(("\\<cat\\>") cat)
(("\\<paste\\>") paste) (("\\<paste\\>") paste)
(("\\<sed\\>") sed) (("\\<sed\\>") sed)
(("\\<sort\\>") sort)))))))) (("\\<sort\\>") sort))))))))
@ -1122,3 +1131,43 @@ and make for REPLs that start blazing fast.
@item It allows you to include arbitrary libraries. @item It allows you to include arbitrary libraries.
@end itemize\n") @end itemize\n")
(license license:gpl3+))) (license license:gpl3+)))
(define-public buildapp
(package
(name "buildapp")
(version "1.5.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xach/buildapp")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "020ipjfqa3l8skd97cj5kq837wgpj28ygfxnkv64cnjrlbnzh161"))))
(build-system gnu-build-system)
(native-inputs
`(("sbcl" ,sbcl)))
(arguments
`(#:tests? #f
#:make-flags
(list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
#:strip-binaries? #f
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'set-home
(lambda _
(setenv "HOME" "/tmp")
#t))
(add-before 'install 'create-target-directory
(lambda* (#:key outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out") "/bin")))
(mkdir-p bin)
#t))))))
(home-page "https://www.xach.com/lisp/buildapp/")
(synopsis "Makes easy to build application executables with SBCL")
(description
"Buildapp is an application for SBCL or CCL that configures and saves an
executable Common Lisp image. It is similar to cl-launch and hu.dwim.build. ")
(license license:bsd-2)))

30
gnu/packages/lua.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com> ;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com> ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org>
@ -1066,7 +1066,7 @@ shell command executions.")
(define-public fennel (define-public fennel
(package (package
(name "fennel") (name "fennel")
(version "0.7.0") (version "0.8.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1075,7 +1075,7 @@ shell command executions.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"17pdcwhfw754fblppw46qphnsvxrn3b7066cz54lv8c0c12iryim")) "1jng33vmnk6mi37l3x2z0plng940jpj7kz1s493ki80z3mkaxjfg"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1083,18 +1083,36 @@ shell command executions.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #t ; even on cross-build
#:test-target "test" #:test-target "test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'build 'patch-lua-calls
(lambda* (#:key inputs #:allow-other-keys)
(let ((lua (string-append (assoc-ref inputs "lua") "/bin/lua")))
(setenv "LUA" lua)
(substitute* "old/launcher.lua"
(("/usr/bin/env lua") lua))
#t)))
(add-after 'build 'patch-fennel (add-after 'build 'patch-fennel
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "fennel" (substitute* "fennel"
(("/usr/bin/env lua") (which "lua"))) (("/usr/bin/env .*lua")
(string-append (assoc-ref inputs "lua") "/bin/lua")))
#t))
(delete 'check)
(add-after 'install 'check
(assoc-ref %standard-phases 'check))
(add-after 'install 'install-manpage
(lambda* (#:key outputs #:allow-other-keys)
(install-file "fennel.1"
(string-append (assoc-ref outputs "out")
"/share/man/man1"))
#t))))) #t)))))
(inputs `(("lua" ,lua))) (inputs `(("lua" ,lua)))
(home-page "https://fennel-lang.org/") (home-page "https://fennel-lang.org/")
(synopsis "A Lisp that compiles to Lua") (synopsis "Lisp that compiles to Lua")
(description (description
"Fennel is a programming language that brings together the speed, "Fennel is a programming language that brings together the speed,
simplicity, and reach of Lua with the flexibility of a Lisp syntax and macro simplicity, and reach of Lua with the flexibility of a Lisp syntax and macro

32
gnu/packages/machine-learning.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -856,6 +856,36 @@ data analysis.")
(base32 (base32
"08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj"))))))) "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj")))))))
(define-public python-threadpoolctl
(package
(name "python-threadpoolctl")
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "threadpoolctl" version))
(sha256
(base32
"0szsxcm2fbxrn83iynn42bnvrdh7mfsmkhfn8pdn7swblfb7rifx"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "pytest"))
#t)))))
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "https://github.com/joblib/threadpoolctl")
(synopsis "Python helpers for common threading libraries")
(description "Thread-pool Controls provides Python helpers to limit the
number of threads used in the threadpool-backed of common native libraries used
for scientific computing and data science (e.g. BLAS and OpenMP).")
(license license:bsd-3)))
(define-public python-pynndescent (define-public python-pynndescent
(package (package
(name "python-pynndescent") (name "python-pynndescent")

8
gnu/packages/mail.scm
View file

@ -446,7 +446,7 @@ aliasing facilities to work just as they would on normal mail.")
(define-public mutt (define-public mutt
(package (package
(name "mutt") (name "mutt")
(version "2.0.4") (version "2.0.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list
@ -456,7 +456,7 @@ aliasing facilities to work just as they would on normal mail.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225")) "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2"))
(patches (search-patches "mutt-store-references.patch")))) (patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -2632,7 +2632,7 @@ converts them to maildir format directories.")
(define-public mblaze (define-public mblaze
(package (package
(name "mblaze") (name "mblaze")
(version "1.0") (version "1.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2641,7 +2641,7 @@ converts them to maildir format directories.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai")))) (base32 "1bir977vnqs76g8jgv1yivqw0wk2kn56l3l5r4w2ipix3fir138y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))

23
gnu/packages/markup.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 EuAndreh <eu@euandre.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -277,3 +278,25 @@ Smu was started as a rewrite of Markdown but became something more
lightweight and consistent. The biggest difference between Markdown lightweight and consistent. The biggest difference between Markdown
and smu is that smu doesn't support reference style links.") and smu is that smu doesn't support reference style links.")
(license x11))) (license x11)))
(define-public md4c
(package
(name "md4c")
(version "0.4.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mity/md4c/")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0m3202zzjvw4k7jw66z1qi3cbisxzvplq5alkygpifvhzm81gwwx"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f))
(home-page "https://github.com/mity/md4c/")
(synopsis "C Markdown parser compliant to CommonMark")
(description "MD4C is a C Markdown parser with a
SAX-like interface. It is compliant to the CommonMark specification,
with a few extensions.")
(license expat)))

75
gnu/packages/mastodon.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -20,14 +20,22 @@
(define-module (gnu packages mastodon) (define-module (gnu packages mastodon)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages time) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python-check) #:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages time))
(define-public toot (define-public toot
(package (package
@ -67,6 +75,67 @@ Features include:
@end itemize") @end itemize")
(license license:gpl3))) (license license:gpl3)))
(define-public tootle
(package
(name "tootle")
(version "1.0-alpha2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bleakgrey/tootle")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"16xz58xasprza89j3ljrfpgvn05yc00p1ch96nyia99r1dyms9rx"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "meson/post_install.py"
(("gtk-update-icon-cache") "true"))
#t))
(add-after 'unpack 'patch-source
(lambda _
(substitute* "src/Dialogs/NewAccount.vala"
(("xdg-mime") (which "xdg-mime")))
;; Patch for building on glib < 2.64
(substitute* "src/Build.vala"
(("(os_name = ).*" _ first) (string-append first "\"GNU\";\n"))
(("(os_ver = ).*" _ first) (string-append first "\"Guix\";\n"))
(("GLib.Environment.get_os_info.*") "\"unknown\";\n"))
#t))
(add-after 'install 'symlink-package
(lambda* (#:key outputs #:allow-other-keys)
(symlink "com.github.bleakgrey.tootle"
(string-append (assoc-ref outputs "out") "/bin/tootle"))
#t)))))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-compile-resources
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("pkg-config" ,pkg-config)))
(inputs
`(("glib-networking" ,glib-networking)
("gtk+" ,gtk+)
("json-glib" ,json-glib)
("libgee" ,libgee)
("libhandy" ,libhandy)
("libsoup" ,libsoup)
("vala" ,vala-0.50)
("xdg-utils" ,xdg-utils)))
(home-page "https://github.com/bleakgrey/tootle")
(synopsis "GTK3 client for Mastodon")
(description "Tootle is a GTK client for Mastodon. It provides a clean,
native interface that allows you to integrate Mastodon's social experience
seamlessly with your desktop environment.")
(license license:gpl3+)))
(define-public python-mastodon-py (define-public python-mastodon-py
(package (package
(name "python-mastodon-py") (name "python-mastodon-py")

30
gnu/packages/maths.scm
View file

@ -104,6 +104,7 @@
#:use-module (gnu packages less) #:use-module (gnu packages less)
#:use-module (gnu packages lisp) #:use-module (gnu packages lisp)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -922,14 +923,14 @@ singular value problems.")
(define-public gnuplot (define-public gnuplot
(package (package
(name "gnuplot") (name "gnuplot")
(version "5.2.7") (version "5.4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
version "/gnuplot-" version "/gnuplot-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "1vglp4la40f5dpj0zdj63zprrkyjgzy068p35bz5dqxjyczm1zlp")))) (base32 "03jrqs5lvxmbbz2c4g17dn2hrxqwd3hfadk9q8wbkbkyas2h8sbb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("readline" ,readline) (inputs `(("readline" ,readline)
("cairo" ,cairo) ("cairo" ,cairo)
@ -941,7 +942,9 @@ singular value problems.")
("texlive" ,texlive-tiny))) ("texlive" ,texlive-tiny)))
(arguments `(#:configure-flags (list (string-append (arguments `(#:configure-flags (list (string-append
"--with-texdir=" %output "--with-texdir=" %output
"/texmf-local/tex/latex/gnuplot")))) "/texmf-local/tex/latex/gnuplot"))
;; Plot on a dumb terminal during tests.
#:make-flags '("GNUTERM=dumb")))
(home-page "http://www.gnuplot.info") (home-page "http://www.gnuplot.info")
(synopsis "Command-line driven graphing utility") (synopsis "Command-line driven graphing utility")
(description "Gnuplot is a portable command-line driven graphing (description "Gnuplot is a portable command-line driven graphing
@ -3505,7 +3508,7 @@ point numbers.")
(define-public wxmaxima (define-public wxmaxima
(package (package
(name "wxmaxima") (name "wxmaxima")
(version "20.06.6") (version "20.12.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3514,22 +3517,20 @@ point numbers.")
(commit (string-append "Version-" version)))) (commit (string-append "Version-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w")))) (base32 "1rxnxk7yanb9ac5pxbii6k7gg3b09pbp9rmwvsvgpbrk17mg79r9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)))
("xorg-server" ,xorg-server-for-tests)))
;; TODO: Add libomp for multithreading support.
;; As of right now, enabling libomp causes the imageCells.wxm test to fail.
(inputs (inputs
`(("wxwidgets" ,wxwidgets) `(("libomp" ,libomp)
("wxwidgets" ,wxwidgets)
("maxima" ,maxima) ("maxima" ,maxima)
;; Runtime support. ;; Runtime support.
("adwaita-icon-theme" ,adwaita-icon-theme) ("adwaita-icon-theme" ,adwaita-icon-theme)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("shared-mime-info" ,shared-mime-info))) ("shared-mime-info" ,shared-mime-info)))
(arguments (arguments
`(#:test-target "test" `(#:tests? #f ; tests fail non-deterministically
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-doc-path (add-after 'unpack 'patch-doc-path
@ -3540,13 +3541,6 @@ point numbers.")
(substitute* "src/Dirstructure.cpp" (substitute* "src/Dirstructure.cpp"
(("/doc/wxmaxima-\\%s") "/doc/wxmaxima")) (("/doc/wxmaxima-\\%s") "/doc/wxmaxima"))
#t)) #t))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
(setenv "HOME" (getcwd))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out") (wrap-program (string-append (assoc-ref outputs "out")

6
gnu/packages/matrix.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com> ;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -61,13 +61,13 @@ an LDAP server.")
(define-public synapse (define-public synapse
(package (package
(name "synapse") (name "synapse")
(version "1.24.0") (version "1.25.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "matrix-synapse" version)) (uri (pypi-uri "matrix-synapse" version))
(sha256 (sha256
(base32 (base32
"0pmn8aqc7jj2xdrwljjz2vwg58hlyxp9axac471pcmg2vqais5yb")))) "0382qcsmgvg24p0xvb37kn3y1kd3bn363kblgwg58iy92df0pga4"))))
(build-system python-build-system) (build-system python-build-system)
;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’.
(propagated-inputs (propagated-inputs

23
gnu/packages/messaging.scm
View file

@ -24,9 +24,9 @@
;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org> ;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mason Hock <chaosmonk@riseup.net> ;;; Copyright © 2020 Mason Hock <chaosmonk@riseup.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Robert Karszniewicz <avoidr@posteo.de> ;;; Copyright © 2020, 2021 Robert Karszniewicz <avoidr@posteo.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1430,7 +1430,7 @@ messenger protocol.")
(define-public utox (define-public utox
(package (package
(name "utox") (name "utox")
(version "0.18.0") (version "0.18.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1441,7 +1441,7 @@ messenger protocol.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0d0mwgxffg4nhai62irf8lyhd1whp9s4k892rsmqz1sra3pbjcg9")))) "01rvlf94d4rkrygnnjak3cg16hrrqyi1rn9nx65y17qk2nbyh68g"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DENABLE_TESTS=on") `(#:configure-flags '("-DENABLE_TESTS=on")
@ -1466,7 +1466,6 @@ messenger protocol.")
("filteraudio" ,filteraudio) ("filteraudio" ,filteraudio)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("libsodium" ,libsodium)
("c-toxcore" ,c-toxcore) ("c-toxcore" ,c-toxcore)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("libvpx" ,libvpx) ("libvpx" ,libvpx)
@ -1998,7 +1997,7 @@ is also scriptable and extensible via Guile.")
(define-public libmesode (define-public libmesode
(package (package
(name "libmesode") (name "libmesode")
(version "0.9.3") (version "0.10.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2007,7 +2006,7 @@ is also scriptable and extensible via Guile.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0")))) "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("expat" ,expat) `(("expat" ,expat)
@ -2058,7 +2057,7 @@ are both supported).")
(define-public profanity (define-public profanity
(package (package
(name "profanity") (name "profanity")
(version "0.9.5") (version "0.10.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2067,7 +2066,7 @@ are both supported).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"00j9l9v62rz9hprgiy1vrz8v3v59ph18h8kskqxr31fgqvjv5xr3")))) "137z77514fgj2dk13d12g4jrn6gs5k85nwrk1r1kiv7rj0jy61aa"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2354,7 +2353,7 @@ There is support for:
(define-public quaternion (define-public quaternion
(package (package
(name "quaternion") (name "quaternion")
(version "0.0.9.4e") (version "0.0.9.4f")
(outputs '("out" "debug")) (outputs '("out" "debug"))
(source (source
(origin (origin
@ -2364,7 +2363,7 @@ There is support for:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv")))) (base32 "1q9ddz4rs02a0w3lwrsjnh59khv38cq9f0kv09vnwvazvayn87ck"))))
(build-system qt-build-system) (build-system qt-build-system)
(inputs (inputs
`(("libqmatrixclient" ,libqmatrixclient) `(("libqmatrixclient" ,libqmatrixclient)
@ -2375,7 +2374,7 @@ There is support for:
("qtquickcontrols2" ,qtquickcontrols2) ("qtquickcontrols2" ,qtquickcontrols2)
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qttools" ,qttools) ("qttools" ,qttools)
("xdg-utils", xdg-utils))) ("xdg-utils" ,xdg-utils)))
(arguments (arguments
`(#:tests? #f)) ; no tests `(#:tests? #f)) ; no tests
(home-page "https://matrix.org/docs/projects/client/quaternion.html") (home-page "https://matrix.org/docs/projects/client/quaternion.html")

4
gnu/packages/mono.scm
View file

@ -134,7 +134,7 @@ Java.")
(define-public libgdiplus (define-public libgdiplus
(package (package
(name "libgdiplus") (name "libgdiplus")
(version "6.0.4") (version "6.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -144,7 +144,7 @@ Java.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0adz5813f881z65lpyf0g0w9hcn7d7qkai6sncpkwnsxfv4khp5p")))) "1vr5l09i5i91n9qzky7ab9wwvgdidvrbw26y8llip0z4qdf4w7mq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

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