me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into staging-next

master
Leo Famulari 2021-02-09 15:09:43 -05:00
parent f1c7c2f697 d00380b007
commit 388bd35dd0
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
380 changed files with 50698 additions and 75189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Makefile.am
View File

@ -1,5 +1,5 @@
# 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 Andreas Enge <andreas@enge.fr>
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
@ -103,6 +103,7 @@ MODULES = \
guix/profiles.scm \
guix/serialization.scm \
guix/nar.scm \
guix/narinfo.scm \
guix/derivations.scm \
guix/grafts.scm \
guix/repl.scm \
@ -149,6 +150,7 @@ MODULES = \
guix/build-system/node.scm \
guix/build-system/perl.scm \
guix/build-system/python.scm \
guix/build-system/renpy.scm \
guix/build-system/ocaml.scm \
guix/build-system/qt.scm \
guix/build-system/waf.scm \
@ -204,6 +206,7 @@ MODULES = \
guix/build/ocaml-build-system.scm \
guix/build/qt-build-system.scm \
guix/build/r-build-system.scm \
guix/build/renpy-build-system.scm \
guix/build/rakudo-build-system.scm \
guix/build/ruby-build-system.scm \
guix/build/scons-build-system.scm \
@ -361,10 +364,6 @@ AUX_FILES = \
gnu/packages/aux-files/linux-libre/5.10-arm64.conf \
gnu/packages/aux-files/linux-libre/5.10-i686.conf \
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.9-arm.conf \
gnu/packages/aux-files/linux-libre/5.9-arm64.conf \
gnu/packages/aux-files/linux-libre/5.9-i686.conf \
gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.4-arm.conf \
gnu/packages/aux-files/linux-libre/5.4-arm64.conf \
gnu/packages/aux-files/linux-libre/5.4-i686.conf \
@ -397,6 +396,8 @@ EXAMPLES = \
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
nobase_dist_guilemodule_DATA = \
guix/d3.v3.js \
guix/graph.js \
guix/store/schema.sql \
$(MODULES) $(MODULES_NOT_COMPILED) $(AUX_FILES) $(EXAMPLES) \
$(MISC_DISTRO_FILES)
@ -460,7 +461,6 @@ SCM_TESTS = \
tests/monads.scm \
tests/nar.scm \
tests/networking.scm \
tests/offload.scm \
tests/opam.scm \
tests/openpgp.scm \
tests/packages.scm \
@ -497,6 +497,12 @@ SCM_TESTS = \
tests/uuid.scm \
tests/workers.scm
if BUILD_DAEMON_OFFLOAD
SCM_TESTS += tests/offload.scm
else
EXTRA_DIST += tests/offload.scm
endif
SH_TESTS = \
tests/guix-build.sh \
tests/guix-build-branch.sh \
@ -611,8 +617,6 @@ EXTRA_DIST += \
build-aux/test-driver.scm \
build-aux/update-guix-package.scm \
build-aux/update-NEWS.scm \
d3.v3.js \
graph.js \
tests/test.drv \
tests/signing-key.pub \
tests/signing-key.sec \
@ -982,9 +986,12 @@ download-po.$(1):
fi ; \
for lang in $$$$LINGUAS; do \
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 \
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 \
rm "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" ; \
fi ; \
@ -994,13 +1001,49 @@ download-po.$(1):
endef
$(eval $(call make-download-po-rule,guix,po/guix))
$(eval $(call make-download-po-rule,guix-packages,po/packages))
$(eval $(call make-download-po-rule,guix-manual,po/doc,guix-manual.))
# Checking po files for issues. This is useful to run after downloading new
# po files.
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
check-po: $(foreach domain,guix packages documentation-manual documentation-cookbook,check-po.$(domain))
.PHONY: check-po
## -------------- ##
## Silent rules. ##
## -------------- ##

14
build-aux/build-self.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -241,12 +241,15 @@ interface (FFI) of Guile.")
(define* (build-program source version
#:optional (guile-version (effective-version))
#:key (pull-version 0))
#:key (pull-version 0) (channel-metadata #f))
"Return a program that computes the derivation to build Guix from SOURCE."
(define select?
;; 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
(('guix 'config) #f)
(('guix 'channels) #f)
(('guix _ ...) #t)
(('gnu _ ...) #t)
(_ #f)))
@ -356,6 +359,8 @@ interface (FFI) of Guile.")
(run-with-store store
(guix-derivation source version
#$guile-version
#:channel-metadata
'#$channel-metadata
#:pull-version
#$pull-version)
#:system system)
@ -377,7 +382,9 @@ interface (FFI) of Guile.")
;; The procedure below is our return value.
(define* (build source
#:key verbose? (version (date-version-string)) system
#:key verbose?
(version (date-version-string)) channel-metadata
system
(pull-version 0)
;; For the standalone Guix, default to Guile 3.0. For old
@ -394,6 +401,7 @@ files."
;; Build the build program and then use it as a trampoline to build from
;; SOURCE.
(mlet %store-monad ((build (build-program source version guile-version
#:channel-metadata channel-metadata
#:pull-version pull-version))
(system (if system (return system) (current-system)))
(home -> (getenv "HOME"))

184
build-aux/test-driver.scm 100644 → 100755
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
(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 © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; 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
@ -24,8 +28,12 @@
;;;
;;;; Code:
(use-modules (ice-9 getopt-long)
(use-modules (ice-9 format)
(ice-9 getopt-long)
(ice-9 pretty-print)
(ice-9 regex)
(srfi srfi-1)
(srfi srfi-19)
(srfi srfi-26)
(srfi srfi-64))
@ -33,18 +41,30 @@
(display "Usage:
test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
[--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]
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
'((test-name (value #t))
(log-file (value #t))
(trs-file (value #t))
(select (value #t))
(exclude (value #t))
(errors-only (value #t))
(color-tests (value #t))
(expect-failure (value #t)) ;XXX: not implemented yet
(enable-hard-errors (value #t)) ;not implemented in SRFI-64
(brief (value #t))
(show-duration (value #t))
(help (single-char #\h) (value #f))
(version (single-char #\V) (value #f))))
@ -75,46 +95,81 @@ The '--test-name', '--log-file' and '--trs-file' options are mandatory.\n"))
"") ;no color
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
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
current output port is supposed to be redirected to a '.log' file."
file name of the current the test. COLOR? specifies whether to use colors.
When BRIEF? is true, the individual test cases results are masked and only the
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)
;; Procedure called at the start of an individual test case, before the
;; test expression (and expected value) are evaluated.
(let ((result (cute assq-ref (test-result-alist 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)))
(let ((test-case-name (test-runner-test-name runner))
(start-time (current-time time-monotonic)))
(hash-set! test-cases-start-time test-case-name start-time)))
(define (test-skipped? runner)
(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)
;; Procedure called at the end of an individual test case, when the result
;; of the test is available.
(let* ((results (test-result-alist runner))
(result? (cut assq <> results))
(result (cut assq-ref results <>)))
(unless brief?
(result (cut assq-ref results <>))
(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.
(format out-port "~A: ~A - ~A~%"
(format out-port "~a: ~a - ~a ~@[[~,3fs]~]~%"
(result->string (test-result-kind runner) #:colorize? color?)
test-name (test-runner-test-name runner)))
(when (result? 'expected-value)
(test-display "expected-value" (result 'expected-value)))
(when (result? 'expected-error)
(test-display "expected-error" (result 'expected-error) #:pretty? #t))
(when (result? 'actual-value)
(test-display "actual-value" (result 'actual-value)))
(when (result? 'actual-error)
(test-display "actual-error" (result 'actual-error) #:pretty? #t))
(format #t "result: ~a~%" (result->string (result 'result-kind)))
(newline)
(format trs-port ":test-result: ~A ~A~%"
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)
(test-display "expected-value" (result 'expected-value)))
(when (result? 'expected-error)
(test-display "expected-error" (result 'expected-error) #:pretty? #t))
(when (result? 'actual-value)
(test-display "actual-value" (result 'actual-value)))
(when (result? 'actual-error)
(test-display "actual-error" (result 'actual-error) #:pretty? #t))
(format #t "result: ~a~%" (result->string (result 'result-kind)))
(newline))
(format trs-port ":test-result: ~A ~A [~,3fs]~%"
(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)
;; 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)
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.
@ -154,22 +237,39 @@ current output port is supposed to be redirected to a '.log' file."
(option (cut option-ref opts <> <>)))
(cond
((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
(let ((log (open-file (option 'log-file "") "w0"))
(trs (open-file (option 'trs-file "") "wl"))
(out (duplicate-port (current-output-port) "wl")))
(redirect-port log (current-output-port))
(redirect-port log (current-warning-port))
(redirect-port log (current-error-port))
(let* ((log (and=> (option 'log-file #f) (cut open-file <> "w0")))
(trs (and=> (option 'trs-file #f) (cut open-file <> "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-warning-port))
(redirect-port log (current-error-port)))
(test-with-runner
(test-runner-gnu (option 'test-name #f)
#:color? (option->boolean opts 'color-tests)
(test-runner-gnu test-name
#:color? color-tests
#: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)
(load-from-path (option 'test-name #f)))
(close-port log)
(close-port trs)
(test-apply test-specifier
(lambda _
(load-from-path test-name))))
(and=> log close-port)
(and=> trs close-port)
(close-port out))))
(exit 0)))

1
configure.ac
View File

@ -25,6 +25,7 @@ AM_GNU_GETTEXT_VERSION([0.18.1])
GUIX_SYSTEM_TYPE
GUIX_ASSERT_SUPPORTED_SYSTEM
GUIX_CHANNEL_METADATA
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])

29
doc/contributing.texi
View File

@ -166,14 +166,15 @@ actually installing them. So that you can distinguish between your
``end-user'' hat and your ``motley'' costume.
To that end, all the command-line tools can be used even if you have not
run @code{make install}. To do that, you first need to have an environment
with all the dependencies available (@pxref{Building from Git}), and then
simply prefix each command with
@command{./pre-inst-env} (the @file{pre-inst-env} script lives in the
top build tree of Guix; it is generated by @command{./configure}).
As an example, here is how you would build the @code{hello} package as
defined in your working tree (this assumes @command{guix-daemon} is
already running on your system; it's OK if it's a different version):
run @code{make install}. To do that, you first need to have an
environment with all the dependencies available (@pxref{Building from
Git}), and then simply prefix each command with @command{./pre-inst-env}
(the @file{pre-inst-env} script lives in the top build tree of Guix; it
is generated by running @command{./bootstrap} followed by
@command{./configure}). As an example, here is how you would build the
@code{hello} package as defined in your working tree (this assumes
@command{guix-daemon} is already running on your system; it's OK if it's
a different version):
@example
$ ./pre-inst-env guix build hello
@ -592,8 +593,8 @@ such as @command{guix package --show} take care of rendering it
appropriately.
Synopses and descriptions are translated by volunteers
@uref{https://translationproject.org/domain/guix-packages.html, at the
Translation Project} so that as many users as possible can read them in
@uref{https://translate.fedoraproject.org/projects/guix/packages, at
Weblate} so that as many users as possible can read them in
their native language. User interfaces search them and display them in
the language specified by the current locale.
@ -801,10 +802,10 @@ To prevent namespace collisions we prefix all other Rust packages with the
dashes should remain in place.
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
suffix. If a package has passed version 1.0.0 then just the major version
number is sufficient (e.g.@: @code{rust-clap-2}), otherwise the version suffix
should contain both the major and minor version (e.g.@: @code{rust-rand-0.6}).
package to be used at any given time, so all package definitions should have a
versioned suffix. The versioned suffix is the left-most non-zero digit (and
any leading zeros, of course). This follows the ``caret'' version scheme
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
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 translation.
If you would like to translate this document in your native language, consider
joining the @uref{https://translationproject.org/domain/guix-cookbook.html,
Translation Project}.
joining
@uref{https://translate.fedoraproject.org/projects/guix/documentation-cookbook,
Weblate}.
@menu
* Scheme tutorials:: Meet your new favorite language!
@ -1353,6 +1354,7 @@ reference.
@menu
* 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.
* 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
@ -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
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
@section Connecting to Wireguard VPN

764
doc/guix.texi
View File

File diff suppressed because it is too large Load Diff

15
etc/guix-install.sh
View File

@ -7,6 +7,7 @@
# Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
# Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
#
# This file is part of GNU Guix.
#
@ -454,14 +455,12 @@ sys_create_init_profile()
cat <<"EOF" > /etc/profile.d/guix.sh
# _GUIX_PROFILE: `guix pull` profile
_GUIX_PROFILE="$HOME/.config/guix/current"
if [ -L $_GUIX_PROFILE ]; then
export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
# Export INFOPATH so that the updated info pages can be found
# and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
# When INFOPATH is unset, add a trailing colon so that Emacs
# searches 'Info-default-directory-list'.
export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
fi
export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
# Export INFOPATH so that the updated info pages can be found
# and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
# When INFOPATH is unset, add a trailing colon so that Emacs
# searches 'Info-default-directory-list'.
export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
# GUIX_PROFILE: User's default profile
GUIX_PROFILE="$HOME/.guix-profile"

198
etc/news.scm
View File

@ -1,11 +1,11 @@
;; 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 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;; 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 Mathieu Othacehe <m.othacehe@gmail.com>
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -18,6 +18,200 @@
(channel-news
(version 0)
(entry (commit "aa8de806252e3835d57fab351b02d13db762deac")
(title
(en "Risk of local privilege escalation @i{via} setuid programs")
(de "Risiko lokaler Rechteausweitung bei setuid-Programmen"))
(body
(en "On Guix System, setuid programs were, until now, installed as
setuid-root @emph{and} setgid-root (in the @file{/run/setuid-programs}
directory). However, most of these programs are meant to run as setuid-root,
but not setgid-root. Thus, this setting posed a risk of local privilege
escalation.
This bug has been fixed and users are advised to upgrade their system, with a
command along the lines of:
@example
guix system reconfigure /run/current-system/configuration.scm
@end example
Users of Guix on a ``foreign distro'' are unaffected. See
@url{https://issues.guix.gnu.org/46395} for more information.")
(de "Auf Guix System wurden setuid-Programme bisher mit setuid-root
@emph{und} setgid-root ausgestattet (im Verzeichnis
@file{/run/setuid-programs}). Die meisten solchen Programme sind jedoch nur
dafür gedacht, mit setuid-root zu laufen, ohne setgid-root. Durch diese
Einstellung war daher vielleicht eine lokale Rechteausweitung („local
privilege escalation“) möglich.
Dieser Fehler wurde behoben und Benutzern wird geraten, ihr System zu
aktualisieren, etwa mit diesem Befehl:
@example
guix system reconfigure /run/current-system/configuration.scm
@end example
Benutzer von Guix auf einer „Fremddistribution“ sind @emph{nicht} betroffen.
Siehe @url{https://issues.guix.gnu.org/46395} für weitere Informationen.")))
(entry (commit "aedbc5ff32a62f45aeed74c6833399a6cf2c22dc")
(title
(en "Create a manifest with @command{guix package --export-manifest}")
(de "Manifest erzeugen mit @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.")
(de "Mit dem Befehl @command{guix package --export-manifest} wird ein
@dfn{Manifest} aus Ihrem Profil erzeugt. Bei einem Manifest handelt es sich um
ein Stück Code, das Sie an @command{guix package --manifest} zum Einspielen
der Pakete aus dem Manifest übergeben können (oder an jeden anderen Befehl,
der die Befehlszeilenoption @option{--manifest} versteht).
Die Absicht hinter dieser neuen Befehlszeilenoption @option{--export-manifest}
ist, dass man leichter von einem „imperativen“ Stil, bei dem man wiederholt
@command{guix install} und ähnliche Befehle aufruft, zum deklarativen Stil
wechseln kann. Im deklarativen Stil tragen Sie die Liste der Pakete, die Sie
haben möchten, in eine Manifest-Datei ein.
Analog können Sie mit der neuen Befehlszeilenoption @option{--export-channels}
zu Ihrem Profil eine @dfn{Kanalspezifikation} erzeugen, die für @command{guix
pull --channels} geeignet ist. Damit können Sie für Guix immer die Version
benutzen, mit der das Profil erstellt wurde.
Führen Sie für mehr Informationen @command{info \"(guix.de) Aufruf von guix
package\"} aus.")
(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")
(title (en "New @option{--with-patch} package transformation option")
(de "Neue Paketumwandlungsoption @option{--with-patch}")

26
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
fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory prefix to
prepend to any store file name."
(define (setup-gfxterm config font-file)
(define (setup-gfxterm config)
(if (memq 'gfxterm (bootloader-configuration-terminal-outputs config))
#~(format #f "
if loadfont ~a; then
if loadfont unicode; then
set gfxmode=~a
insmod all_video
insmod gfxterm
fi~%"
#+font-file
#$(string-join
(grub-theme-gfxmode (bootloader-theme config))
";"))
@ -188,13 +187,6 @@ fi~%"
(string-append (symbol->string (assoc-ref colors 'fg)) "/"
(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
(normalize-file (grub-background-image config)
store-mount-point
@ -216,8 +208,8 @@ else
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
fi~%"
#$(grub-root-search store-device font-file)
#$(setup-gfxterm config font-file)
#$(grub-root-search store-device image)
#$(setup-gfxterm config)
#$(grub-setup-io config)
#$image
@ -545,9 +537,13 @@ fi~%"))))
(invoke/quiet grub "--no-floppy" "--target=i386-pc"
"--boot-directory" install-dir
device))
;; When creating a disk-image, only install GRUB modules.
(copy-recursively (string-append bootloader "/lib/")
install-dir)))))
;; 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/")
install-dir))))))
(define install-grub-disk-image
#~(lambda (bootloader root-index image)

9
gnu/bootloader/u-boot.scm
View File

@ -73,12 +73,9 @@
(define install-allwinner64-u-boot
#~(lambda (bootloader root-index image)
(let ((spl (string-append bootloader "/libexec/spl/sunxi-spl.bin"))
(u-boot (string-append bootloader "/libexec/u-boot.itb")))
(let ((spl (string-append bootloader "/libexec/u-boot-sunxi-with-spl.fit.itb")))
(write-file-on-device spl (stat:size (stat spl))
image (* 8 1024))
(write-file-on-device u-boot (stat:size (stat u-boot))
image (* 40 1024)))))
image (* 8 1024)))))
(define install-imx-u-boot
#~(lambda (bootloader root-index image)
@ -91,7 +88,7 @@
(define install-puma-rk3399-u-boot
#~(lambda (bootloader root-index image)
(let ((spl (string-append bootloader "/libexec/u-boot-spl.rksd"))
(let ((spl (string-append bootloader "/libexec/idbloader.img"))
(u-boot (string-append bootloader "/libexec/u-boot.itb")))
(write-file-on-device spl (stat:size (stat spl))
image (* 64 512))

4
gnu/build/activation.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
@ -234,7 +234,7 @@ they already exist."
"/" (basename prog))))
(copy-file prog target)
(chown target 0 0)
(chmod target #o6555)))
(chmod target #o4555)))
(format #t "setting up setuid programs in '~a'...~%"
%setuid-directory)

7
gnu/ci.scm
View File

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

2
gnu/installer.scm
View File

@ -187,7 +187,7 @@ selected keymap."
(lambda (models layouts)
((installer-keymap-page current-installer)
layouts '#$context)))))
(#$apply-keymap result)
(and result (#$apply-keymap result))
result)))
(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")))
#:button-callback-procedure
(case context
((param) (const #t))
((param) (const #f))
(else
(lambda _
(raise
@ -183,7 +183,9 @@ options."
(compute
(lambda (result _)
(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.
(and (not (null? variants))
(run-variant-page
@ -196,16 +198,19 @@ options."
(gettext (x11-keymap-layout-description layout)
"xkeyboard-config")))))))))))
(define (format-result result)
(let ((layout (x11-keymap-layout-name
(result-step result 'layout)))
(variant (and=> (result-step result 'variant)
(define (format-result layout variant)
(let ((layout (x11-keymap-layout-name layout))
(variant (and=> variant
(lambda (variant)
(gettext (x11-keymap-variant-name variant)
"xkeyboard-config")))))
(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)
"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 © 2019, 2020 Ludovic Courtès <ludo@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.
;;;
@ -34,9 +35,9 @@
environments."
(let ((items (filter desktop-system-service? %system-services)))
(run-checkbox-tree-page
#:info-text (G_ "Please select the desktop(s) environment(s) you wish to \
install. If you select multiple desktops environments, you will be able to \
choose the one to use on the log-in screen.")
#:info-text (G_ "Please select the desktop environment(s) you wish to \
install. If you select multiple desktop environments here, you will be able \
to choose from them later when you log in.")
#:title (G_ "Desktop environment")
#:items items
#:selection (map system-service-recommended? items)

50
gnu/local.mk
View File

@ -7,17 +7,17 @@
# Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
# 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, 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, 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 © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
# 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, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
# Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
@ -39,6 +39,7 @@
# Copyright © 2020 Martin Becze <mjbecze@riseup.net>
# Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
# Copyright © 2020 Vinicius Monego <monego@posteo.net>
# Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
#
# This file is part of GNU Guix.
#
@ -459,6 +460,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/purescript.scm \
%D%/packages/pv.scm \
%D%/packages/python.scm \
%D%/packages/python-build.scm \
%D%/packages/python-check.scm \
%D%/packages/python-compression.scm \
%D%/packages/python-crypto.scm \
@ -533,6 +535,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/task-management.scm \
%D%/packages/tbb.scm \
%D%/packages/tcl.scm \
%D%/packages/telegram.scm \
%D%/packages/telephony.scm \
%D%/packages/terminals.scm \
%D%/packages/terraform.scm \
@ -629,6 +632,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/sddm.scm \
%D%/services/spice.scm \
%D%/services/ssh.scm \
%D%/services/syncthing.scm \
%D%/services/sysctl.scm \
%D%/services/telephony.scm \
%D%/services/version-control.scm \
@ -680,6 +684,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests.scm \
%D%/tests/audio.scm \
%D%/tests/base.scm \
%D%/tests/cuirass.scm \
%D%/tests/cups.scm \
%D%/tests/databases.scm \
%D%/tests/desktop.scm \
@ -819,9 +824,6 @@ dist_patch_DATA = \
%D%/packages/patches/audiofile-function-signature.patch \
%D%/packages/patches/automake-skip-amhello-tests.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/awesome-reproducible-png.patch \
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
@ -892,9 +894,6 @@ dist_patch_DATA = \
%D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \
%D%/packages/patches/classpath-aarch64-support.patch \
%D%/packages/patches/clementine-fix-sqlite.patch \
%D%/packages/patches/clementine-remove-crypto++-dependency.patch \
%D%/packages/patches/clementine-use-openssl.patch \
%D%/packages/patches/clucene-pkgconfig.patch \
%D%/packages/patches/cmake-curl-certificates.patch \
%D%/packages/patches/coda-use-system-libs.patch \
@ -912,6 +911,7 @@ dist_patch_DATA = \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.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/datefudge-gettimeofday.patch \
%D%/packages/patches/dbacl-include-locale.h.patch \
@ -957,11 +957,9 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
%D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \
%D%/packages/patches/emacs-libgit-use-system-libgit2.patch \
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/emacs-telega-patch-server-functions.patch \
%D%/packages/patches/emacs-telega-test-env.patch \
%D%/packages/patches/emacs-undohist-ignored.patch \
%D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \
%D%/packages/patches/enjarify-setup-py.patch \
%D%/packages/patches/enlightenment-fix-setuid-path.patch \
@ -997,6 +995,7 @@ dist_patch_DATA = \
%D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/fplll-std-fenv.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/fuse-overlapping-headers.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
@ -1115,8 +1114,7 @@ dist_patch_DATA = \
%D%/packages/patches/go-skip-gc-test.patch \
%D%/packages/patches/gpm-glibc-2.26.patch \
%D%/packages/patches/gpodder-disable-updater.patch \
%D%/packages/patches/gpsbabel-minizip.patch \
%D%/packages/patches/gpsbabel-qstring.patch \
%D%/packages/patches/gpsbabel-fix-i686-test.patch \
%D%/packages/patches/grantlee-merge-theme-dirs.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/grocsvs-dont-use-admiral.patch \
@ -1127,8 +1125,10 @@ dist_patch_DATA = \
%D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.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-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-2.2-skip-so-test.patch \
%D%/packages/patches/guile-default-utf8.patch \
%D%/packages/patches/guile-2.2-default-utf8.patch \
%D%/packages/patches/guile-relocatable.patch \
@ -1155,7 +1155,6 @@ dist_patch_DATA = \
%D%/packages/patches/hdf4-shared-fortran.patch \
%D%/packages/patches/hdf4-tirpc.patch \
%D%/packages/patches/hdf5-config-date.patch \
%D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \
%D%/packages/patches/hdf-eos2-build-shared.patch \
%D%/packages/patches/hdf-eos2-remove-gctp.patch \
%D%/packages/patches/hdf-eos2-fortrantests.patch \
@ -1179,12 +1178,14 @@ dist_patch_DATA = \
%D%/packages/patches/icu4c-CVE-2020-10531.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.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/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \
%D%/packages/patches/ipxe-reproducible-geniso.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/json-c-CVE-2020-12762.patch \
@ -1349,7 +1350,7 @@ dist_patch_DATA = \
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.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/meson-for-build-rpath.patch \
%D%/packages/patches/metabat-fix-compilation.patch \
@ -1405,6 +1406,7 @@ dist_patch_DATA = \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \
%D%/packages/patches/nvi-db4.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-cairo2-caml_ba_array-fix.patch \
%D%/packages/patches/ocaml-CVE-2015-8869.patch \
@ -1454,6 +1456,7 @@ dist_patch_DATA = \
%D%/packages/patches/sdl-pango-header-guard.patch \
%D%/packages/patches/sdl-pango-matrix_declarations.patch \
%D%/packages/patches/sdl-pango-sans-serif.patch \
%D%/packages/patches/smalltalk-multiplication-overflow.patch \
%D%/packages/patches/sqlite-hurd.patch \
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \
%D%/packages/patches/patchutils-test-perms.patch \
@ -1474,13 +1477,12 @@ dist_patch_DATA = \
%D%/packages/patches/picard-fix-id3-rename-test.patch \
%D%/packages/patches/picprog-non-intel-support.patch \
%D%/packages/patches/pidgin-add-search-path.patch \
%D%/packages/patches/pidgin-libnm.patch \
%D%/packages/patches/pidgin-vv-gst.patch \
%D%/packages/patches/pinball-const-fix.patch \
%D%/packages/patches/pinball-cstddef.patch \
%D%/packages/patches/pinball-missing-separators.patch \
%D%/packages/patches/pinball-src-deps.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-sdl-libs-config.patch \
%D%/packages/patches/pixman-CVE-2016-5296.patch \
@ -1491,7 +1493,6 @@ dist_patch_DATA = \
%D%/packages/patches/plib-CVE-2011-4620.patch \
%D%/packages/patches/plib-CVE-2012-4552.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/portmidi-modular-build.patch \
%D%/packages/patches/postgresql-disable-resolve_symlinks.patch \
@ -1505,6 +1506,7 @@ dist_patch_DATA = \
%D%/packages/patches/psm-repro.patch \
%D%/packages/patches/pulseaudio-fix-mult-test.patch \
%D%/packages/patches/pulseaudio-longer-test-timeout.patch \
%D%/packages/patches/pulseview-qt515-compat.patch \
%D%/packages/patches/purescript-relax-dependencies.patch \
%D%/packages/patches/pybugz-encode-error.patch \
%D%/packages/patches/pybugz-stty.patch \
@ -1536,6 +1538,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
%D%/packages/patches/python-flint-includes.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-mox3-python3.6-compat.patch \
%D%/packages/patches/python-testtools.patch \
@ -1557,6 +1560,7 @@ dist_patch_DATA = \
%D%/packages/patches/pypy3-7.3.1-fix-tests.patch \
%D%/packages/patches/qemu-build-info-manual.patch \
%D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qpdfview-qt515-compat.patch \
%D%/packages/patches/qrcodegen-cpp-make-install.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtbase-absolute-runpath.patch \
@ -1579,7 +1583,7 @@ dist_patch_DATA = \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/renpy-use-system-fribidi.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/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
@ -1598,6 +1602,7 @@ dist_patch_DATA = \
%D%/packages/patches/rust-1.19-mrustc.patch \
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
%D%/packages/patches/rust-1.45-linker-locale.patch \
%D%/packages/patches/rust-1.48-linker-locale.patch \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
@ -1665,8 +1670,10 @@ dist_patch_DATA = \
%D%/packages/patches/thefuck-test-environ.patch \
%D%/packages/patches/tidy-CVE-2015-5522+5523.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-remove-license-code.patch \
%D%/packages/patches/tipp10-qt5.patch \
%D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/transcode-ffmpeg.patch \
%D%/packages/patches/transmission-honor-localedir.patch \
@ -1701,15 +1708,10 @@ dist_patch_DATA = \
%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-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/vinagre-newer-freerdp.patch \
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \
%D%/packages/patches/virglrenderer-CVE-2017-6386.patch \
%D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \
%D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \
%D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \
%D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \

17
gnu/machine/ssh.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -346,6 +346,14 @@ by MACHINE."
;;; System deployment.
;;;
(define not-config?
;; Select (guix …) and (gnu …) modules, except (guix config).
(match-lambda
(('guix 'config) #f)
(('guix _ ...) #t)
(('gnu _ ...) #t)
(_ #f)))
(define (machine-boot-parameters machine)
"Monadic procedure returning a list of 'boot-parameters' for the generations
of MACHINE's system profile, ordered from most recent to oldest."
@ -354,9 +362,10 @@ of MACHINE's system profile, ordered from most recent to oldest."
(define remote-exp
(with-extensions (list guile-gcrypt)
(with-imported-modules (source-module-closure
`(((guix config) => ,(make-config.scm))
(guix profiles)))
(with-imported-modules `(((guix config) => ,(make-config.scm))
,@(source-module-closure
'((guix profiles))
#:select? not-config?))
#~(begin
(use-modules (guix config)
(guix profiles)

12
gnu/packages/accessibility.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;;
@ -95,15 +95,14 @@ terminals.")
(define-public brltty
(package
(name "brltty")
(version "6.1")
(version "6.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://brltty.app/archive/"
name "-" version ".tar.gz"))
(string-append "https://brltty.app/archive/brltty-" version ".tar.gz"))
(sha256
(base32 "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"))))
(base32 "0m0cq3p1cwp52n81si621gij82w3mdqwgr39m6bs652pmk5na72l"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:tests? #f ; No target
@ -138,7 +137,8 @@ terminals.")
"PYTHON_ROOT=/"
(string-append "TCL_DIR="
(assoc-ref %outputs "out")
"/lib"))
"/lib")
"INSTALL_WRITABLE_DIRECTORY=no-thanks")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-errors

151
gnu/packages/admin.scm
View File

@ -9,11 +9,11 @@
;;; Copyright © 2016, 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 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 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
@ -28,7 +28,7 @@
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.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 © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -267,7 +267,8 @@ and provides a \"top-like\" mode (monitoring).")
"0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--localstatedir=/var")))
'(#:configure-flags '("--localstatedir=/var")
#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs
`(("pkg-config" ,pkg-config)
@ -297,7 +298,8 @@ interface and is based on GNU Guile.")
`(("pkg-config" ,pkg-config)
("guile" ,guile-2.2)))
(inputs
`(("guile" ,guile-2.2)))))
`(("guile" ,guile-2.2)
("guile2.2-readline" ,guile2.2-readline)))))
(define-public guile3.0-shepherd
(deprecated-package "guile3.0-shepherd" shepherd))
@ -307,10 +309,21 @@ interface and is based on GNU Guile.")
(inherit shepherd)
(name "guile2.0-shepherd")
(native-inputs
`(("pkg-config" ,pkg-config)
`(("help2man" ,help2man)
("pkg-config" ,pkg-config)
("guile" ,guile-2.0)))
(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
(package
@ -445,7 +458,7 @@ graphs and can export its output to different formats.")
(define-public facter
(package
(name "facter")
(version "4.0.47")
(version "4.0.49")
(source (origin
(method git-fetch)
(uri (git-reference
@ -454,7 +467,7 @@ graphs and can export its output to different formats.")
(file-name (git-file-name name version))
(sha256
(base32
"1zz5kk3ad1jj8y939369dfvjh7zqwpkcqzzad7yb6wp01rc5sf88"))))
"0l7gic5ql5xiy5s6rb0j9ydyaal5bcxl10bx45khcgdr9zg16pb1"))))
(build-system ruby-build-system)
(arguments
`(#:phases
@ -516,7 +529,7 @@ or via the @code{facter} Ruby library.")
(define-public htop
(package
(name "htop")
(version "3.0.4")
(version "3.0.5")
(source
(origin
(method git-fetch)
@ -524,7 +537,7 @@ or via the @code{facter} Ruby library.")
(url "https://github.com/htop-dev/htop")
(commit version)))
(sha256
(base32 "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9"))
(base32 "10lp6cbfvigzp6pq5nwj3s3l4vs7cv92krz2r08nwrz8vl6rqdzp"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
@ -663,7 +676,10 @@ hostname.")
`(;; Assume System V `setpgrp (void)', which is the default on GNU
;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
#:configure-flags
'("--with-libpam" "ac_cv_func_setpgrp_void=yes")
'(,@(if (hurd-target?)
'()
'("--with-libpam"))
"ac_cv_func_setpgrp_void=yes")
#:phases
(modify-phases %standard-phases
@ -688,7 +704,10 @@ hostname.")
(for-each delete-file (find-files man "^groups\\."))
#t))))))
(inputs `(("linux-pam" ,linux-pam)))
(inputs
`(,@(if (hurd-target?)
'()
`(("linux-pam" ,linux-pam)))))
(home-page "https://github.com/shadow-maint/shadow")
(synopsis "Authentication-related tools such as passwd, su, and login")
(description
@ -929,14 +948,14 @@ recursive runs on the generated subnets. (also IPv6)
(define-public alive
(package
(name "alive")
(version "2.0.2")
(version "2.0.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/alive/alive-"
version ".tar.xz"))
(sha256
(base32
"1vrzg51ai68x9yld7vbgl58sxaw5qpx8rbakwcxn4cqq6vpxj38j"))))
"053hfp7s66lnilm1ii4jrjmy44wpa2cwwh6f0sl8cyz0mm813x4b"))))
(build-system gnu-build-system)
(arguments '(#:configure-flags '("alive_cv_nice_ping=yes")))
(inputs `(("guile" ,guile-2.0)
@ -1402,7 +1421,7 @@ system administrator.")
(define-public sudo
(package
(name "sudo")
(version "1.9.4p2")
(version "1.9.5p2")
(source (origin
(method url-fetch)
(uri
@ -1412,7 +1431,7 @@ system administrator.")
version ".tar.gz")))
(sha256
(base32
"0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3"))
"0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1483,7 +1502,9 @@ system administrator.")
`(("groff" ,groff))))
(inputs
`(("coreutils" ,coreutils)
("linux-pam" ,linux-pam)
,@(if (hurd-target?)
'()
`(("linux-pam" ,linux-pam)))
("zlib" ,zlib)))
(home-page "https://www.sudo.ws/")
(synopsis "Run commands as root")
@ -1499,7 +1520,7 @@ commands and their arguments.")
(define-public opendoas
(package
(name "opendoas")
(version "6.8")
(version "6.8.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1508,7 +1529,7 @@ commands and their arguments.")
(file-name (git-file-name name version))
(sha256
(base32
"1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb"))))
"0gfcssm21vdfg6kcrcc7hz1h4jmhy2zv29rfqyrrj3a6r9b5ah8p"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -1862,7 +1883,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica
(package
(name "acpica")
(version "20201217")
(version "20210105")
(source (origin
(method url-fetch)
(uri (string-append
@ -1870,7 +1891,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz"))
(sha256
(base32
"06rdpfjmij5nni1x2wi1gnalhsza5yxq1viskjm9r11wmsjnxm2a"))))
"1gi7qzfywg118g5nlqn5lawxk25pg2sz01gmbz40vvmikks4ri9r"))))
(build-system gnu-build-system)
(native-inputs `(("flex" ,flex)
("bison" ,bison)))
@ -1945,7 +1966,7 @@ system is under heavy load.")
(define-public detox
(package
(name "detox")
(version "1.3.0")
(version "1.3.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1954,7 +1975,7 @@ system is under heavy load.")
(file-name (git-file-name name version))
(sha256
(base32
"1dd608c7g65s5lj02cddvani3q9kzirddgkjqa22ap9d4f8b9xgr"))))
"13mhs62m7bpff45liy65pajq5jg3i12jj90vwdkra94z9mlr2rlz"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@ -2082,7 +2103,7 @@ track changes in important system configuration files.")
(define-public libcap-ng
(package
(name "libcap-ng")
(version "0.8")
(version "0.8.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -2090,7 +2111,7 @@ track changes in important system configuration files.")
version ".tar.gz"))
(sha256
(base32
"08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi"))))
"1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -2110,7 +2131,7 @@ various ways that may be running with too much privilege.")
(define-public smartmontools
(package
(name "smartmontools")
(version "7.1")
(version "7.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -2118,7 +2139,7 @@ various ways that may be running with too much privilege.")
version "/smartmontools-" version ".tar.gz"))
(sha256
(base32
"0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz"))))
"1mlc25sd5rgj5xmzcllci47inmfdw7cp185fday6hc9rwqkqmnaw"))))
(build-system gnu-build-system)
(inputs `(("libcap-ng" ,libcap-ng)))
(home-page "https://www.smartmontools.org/")
@ -2611,14 +2632,14 @@ done with the @code{auditctl} utility.")
(define-public nmap
(package
(name "nmap")
(version "7.91")
(version "7.80")
(source (origin
(method url-fetch)
(uri (string-append "https://nmap.org/dist/nmap-" version
".tar.bz2"))
(sha256
(base32
"001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"))
"1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"))
(modules '((guix build utils)))
(snippet
'(begin
@ -2696,7 +2717,7 @@ advanced netcat implementation (ncat), a utility for comparing scan
results (ndiff), and a packet generation and response analysis tool (nping).")
;; This package uses nmap's bundled versions of libdnet and liblinear, which
;; both use a 3-clause BSD license.
(license (list license:npsl license:bsd-3))))
(license (list license:nmap license:bsd-3))))
(define-public dstat
(package
@ -2797,13 +2818,13 @@ a new command using the matched rule, and runs it.")
(define-public di
(package
(name "di")
(version "4.48")
(version "4.48.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://gentoo.com/di/di-" version ".tar.gz"))
(sha256
(base32 "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r"))))
(base32 "0rxli3bcm6vlcfx2jminviv8aawwczrpp9kja5zniawy6528al30"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; obscure test failures
@ -3419,7 +3440,7 @@ make it a perfect utility on modern distros.")
(define-public thermald
(package
(name "thermald")
(version "2.4.1")
(version "2.4.2")
(source
(origin
(method git-fetch)
@ -3428,7 +3449,7 @@ make it a perfect utility on modern distros.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6"))))
(base32 "0nzjfiis4d3ml765s65bywk5dhx5x2fb3hpiixpxzzrs50ajwasj"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -3617,7 +3638,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi"))
(package
(name "inxi-minimal")
(version "3.2.01-1")
(version "3.2.02-2")
(source
(origin
(method git-fetch)
@ -3626,7 +3647,7 @@ Python loading in HPC environments.")
(commit version)))
(file-name (git-file-name real-name version))
(sha256
(base32 "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65"))))
(base32 "0fwx798v9kwiwkgbj97w6rjdanwf7ap65vvq1fqy7gd9x78xcxsq"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash-minimal)
@ -4306,3 +4327,59 @@ This program allows you to view and manipulate this EEPROM list.")
(home-page "https://github.com/xobs/novena-eeprom/")
(supported-systems '("armhf-linux"))
(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)))

25
gnu/packages/algebra.scm
View File

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

33
gnu/packages/animation.scm
View File

@ -26,10 +26,12 @@
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages dejagnu)
@ -53,6 +55,37 @@
#:use-module (gnu packages video)
#: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.
(define synfig-version "1.2.2")

6
gnu/packages/antivirus.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -44,14 +44,14 @@
(define-public clamav
(package
(name "clamav")
(version "0.103.0")
(version "0.103.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.clamav.net/downloads/production/"
"clamav-" version ".tar.gz"))
(sha256
(base32
"0ih5x1rscg2m64y0z20njj7435q8k7ss575cfw7aipdzfx979a9j"))
"0mz2aq8dh4i7mh59r71scczgyjbsj8l0a51nkwxsys5ji5xw823k"))
(modules '((guix build utils)))
(snippet
'(begin

7
gnu/packages/aspell.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Andersson <christopher@8bits.nu>
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
@ -476,15 +476,14 @@ under permissive licensing terms. See the 'Copyright' file."))))
(define-public ispell
(package
(name "ispell")
(version "3.4.00")
(version "3.4.02")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-"
version ".tar.gz"))
(sha256
(base32
"1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"))))
(base32 "0b6rqzqjdhwf323sf1dv8qzx5pxa5asz618922r59zjp65660yb6"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-build? #f

35
gnu/packages/assembly.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; 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 © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2019 Andy Tai <atai@atai.org>
@ -26,6 +26,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages assembly)
#:use-module (guix build-system meson)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix download)
@ -148,6 +149,38 @@ to the clients.")
(home-page "https://www.gnu.org/software/lightning/")
(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
(package
(name "fasm")

347
gnu/packages/astronomy.scm
View File

@ -1,10 +1,11 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -30,6 +31,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages fontutils)
@ -39,18 +41,22 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libusb)
#:use-module (gnu packages lua)
#:use-module (gnu packages maths)
#:use-module (gnu packages netpbm)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xorg)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
(define-public cfitsio
@ -86,6 +92,29 @@ in FITS files.")
(license (license:non-copyleft "file://License.txt"
"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
(package
(name "wcslib")
@ -125,10 +154,30 @@ coordinate systems in a @dfn{FITS} (Flexible Image Transport System) image
header.")
(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
(package
(name "gnuastro")
(version "0.13")
(version "0.14")
(source
(origin
(method url-fetch)
@ -136,13 +185,15 @@ header.")
version ".tar.lz"))
(sha256
(base32
"07di6zx2irc5q0zyymx2951ydzxdfjmzd3az5qnk67ncf3hknvj5"))))
"1xp6n42qxv0x6yigi2w2l5k8006smv27lhrcssysgsvzbydghzg5"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")))
(inputs
`(("cfitsio" ,cfitsio)
("curl" ,curl-minimal)
("gsl" ,gsl)
("libgit2" ,libgit2)
("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("wcslib" ,wcslib)
@ -156,10 +207,86 @@ header.")
programs for the manipulation and analysis of astronomical data.")
(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
(package
(name "stellarium")
(version "0.20.3")
(version "0.20.4")
(source
(origin
(method url-fetch)
@ -167,7 +294,7 @@ programs for the manipulation and analysis of astronomical data.")
"/releases/download/v" version
"/stellarium-" version ".tar.gz"))
(sha256
(base32 "0z5r7b1ac43l330xphxnw54xg7jm87ajix8yl4hkq82cs5ja7097"))))
(base32 "1253zlr0mi4kdbj119spxk7spg4rkahb4rlpd0hz1d81mnv3n0v3"))))
(build-system cmake-build-system)
(inputs
`(("qtbase" ,qtbase)
@ -203,6 +330,46 @@ can be used to control telescopes over a serial port for tracking celestial
objects.")
(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
(let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce"))
(package
@ -299,6 +466,82 @@ Mechanics, Astrometry and Astrodynamics library.")
(license (list license:lgpl2.0+
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
(package
(name "xplanet")
@ -391,3 +634,95 @@ Gpredict can also predict the time of future passes for a satellite, and
provide you with detailed information about each pass.")
(home-page "http://gpredict.oz9aec.net/index.php")
(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+))))
(define-public python-jplephem
(package
(name "python-jplephem")
(version "2.15")
(source
(origin
(method url-fetch)
(uri (pypi-uri "jplephem" version))
(sha256
(base32 "1ca3dswsslij79qg6dcijjz4l0fj6nzmxld8z93v45ahlkhps0g0"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "PYTHONPATH"
(string-append "./build/lib:"
(getenv "PYTHONPATH")))
(setenv "PATH" (string-append out "/bin:"
(getenv "PATH")))
(invoke "python" "-m" "unittest" "discover" "-s" "test")))))))
(inputs
`(("python-numpy" ,python-numpy)))
(home-page "https://github.com/brandon-rhodes/python-jplephem")
(synopsis "Python version of NASA DE4xx ephemerides")
(description
"The package is a Python implementation of the mathematics that standard
JPL ephemerides use to predict raw (x,y,z) planetary positions.")
(license license:expat)))

98
gnu/packages/audio.scm
View File

@ -1,14 +1,14 @@
;;; 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 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.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, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 okapi <okapi@firemail.cc>
;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -2343,14 +2343,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.")
(define-public lilv
(package
(name "lilv")
(version "0.24.8")
(version "0.24.10")
(source (origin
(method url-fetch)
(uri (string-append "https://download.drobilla.net/lilv-"
version ".tar.bz2"))
(sha256
(base32
"0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a"))))
"1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi"))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ; no check target
@ -2703,7 +2703,7 @@ background file post-processing.")
(define-public supercollider
(package
(name "supercollider")
(version "3.11.0")
(version "3.11.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2714,7 +2714,7 @@ background file post-processing.")
(file-name (git-file-name name version))
(sha256
(base32
"02v911w2kdbg3kfl593lb2ig4sjbfxzv20a0vbcymhfzpvp1x6xp"))
"1gi7nrmjmbnjndqkmhfrkk0jchrzvnhl3f6gp6n5wgdd4mxbgxgw"))
(modules '((guix build utils)
(ice-9 ftw)))
(snippet
@ -2744,7 +2744,8 @@ link REQUIRED)"))
(arguments
`(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on"
"-DSC_QT=ON" "-DCMAKE_BUILD_TYPE=Release"
"-DFORTIFY=ON" "-DLIBSCSYNTH=ON"
"-DFORTIFY=ON"
;"-DLIBSCSYNTH=ON" ; TODO: Re-enable?
"-DSC_EL=off") ;scel is packaged individually as
;emacs-scel
#:phases
@ -4133,6 +4134,63 @@ the following features:
")
(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
(package
(name "cli-visualizer")
@ -4771,11 +4829,13 @@ with the provided metadata and adhere to well-known best practices.")
(base32
"07xl3cmdaf7k9mm58m93cn8i1jvgimmiifdw1w7v2jl88nx60pm1"))))
(build-system meson-build-system)
(inputs
`(("cairo" ,cairo)
("libx11" ,libx11)))
(native-inputs
`(("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")
(description "ZToolkit (Ztk) is a cross-platform GUI toolkit heavily
inspired by GTK. It handles events and low level drawing on behalf of
@ -4824,24 +4884,23 @@ edited, converted, compressed and saved.")
(name "ztoolkit-rsvg")
(arguments
`(#:configure-flags `("-Denable_rsvg=true")))
(inputs
(propagated-inputs
`(("librsvg" ,librsvg)
,@(package-inputs ztoolkit)))
,@(package-propagated-inputs ztoolkit)))
(synopsis "ZToolkit with SVG support")))
(define-public lsp-dsp-lib
(package
(name "lsp-dsp-lib")
(version "0.5.8")
(version "0.5.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/sadko4u/lsp-dsp-lib/"
"releases/download/lsp-dsp-lib-" version
"releases/download/" version
"/lsp-dsp-lib-" version "-src.tar.gz"))
(sha256
(base32
"07w3d2i0z0xmvi1ngcgs7lc5a0da8jvf7rv4dnjk01md43b7fkh1"))))
(base32 "0lkar6r9jfrrqswi8nnndlm5a9kfwqjn92d81gp2yhc3p46xsswz"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
@ -4849,6 +4908,11 @@ edited, converted, compressed and saved.")
(list (string-append "CC=" ,(cc-for-target)))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'omit-static-library
(lambda _
(substitute* "src/Makefile"
((".*@.*ARTIFACT_SLIB.*") "") ; don't install it
((" \\$\\(ARTIFACT_SLIB\\)") "")))) ; don't build it
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "config"

6
gnu/packages/authentication.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@ -33,14 +33,14 @@
(define-public oath-toolkit
(package
(name "oath-toolkit")
(version "2.6.4")
(version "2.6.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz"))
(sha256
(base32 "116na9nncpwshl3ww8w3llzwk49igilplxcjy1k6jzl3mmg2bimz"))))
(base32 "06f21smb412xads4lygvyb47fcpvhdns0k6h880m9pbzgq6141yj"))))
(build-system gnu-build-system)
(arguments
;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures.

58
gnu/packages/autotools.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; 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 © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -11,6 +11,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -38,6 +39,7 @@
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (ice-9 match)
@ -103,10 +105,11 @@ scripts are self-contained and portable, freeing the user from needing to
know anything about Autoconf or M4.")
(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
(inherit autoconf-2.69)
(version "2.70")
(version "2.71")
(source
(origin
(method url-fetch)
@ -114,7 +117,7 @@ know anything about Autoconf or M4.")
version ".tar.xz"))
(sha256
(base32
"1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"))))
"197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i"))))
(arguments
(substitute-keyword-arguments (package-arguments autoconf-2.69)
((#:tests? _ #f)
@ -491,6 +494,53 @@ complexity of working with shared libraries across platforms.")
(license gpl3+)
(home-page "https://www.gnu.org/software/libtool/")))
(define-public config
(let ((revision "1")
(commit "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f"))
(package
(name "config")
(version (git-version "0.0.0" revision commit)) ;no release tag
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/config.git/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0x6ycvkmmhhhag97wsf0pw8n5fvh12rjvrck90rz17my4ys16qwv"))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-/bin/sh
(lambda _
(substitute* "testsuite/config-guess.sh"
(("#!/bin/sh")
(string-append "#!" (which "sh"))))
#t))
(replace 'build
(lambda _
(invoke "make" "manpages")))
(delete 'configure)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man1 (string-append out "/share/man/man1")))
(install-file "config.guess" bin)
(install-file "config.sub" bin)
(install-file "doc/config.guess.1" man1)
(install-file "doc/config.sub.1" man1)
#t))))))
(native-inputs
`(("help2man" ,help2man)))
(home-page "https://savannah.gnu.org/projects/config")
(synopsis "Ubiquitious config.guess and config.sub scripts")
(description "The `config.guess' script tries to guess a canonical system triple,
and `config.sub' validates and canonicalizes. These are used as part of
configuration in nearly all GNU packages (and many others).")
(license gpl2+))))
(define-public libltdl
;; This is a libltdl package separate from the libtool package. This is
;; useful because, unlike libtool, it has zero extra dependencies (making it

8
gnu/packages/aux-files/guile-launcher.c
View File

@ -1,5 +1,5 @@
/* GNU Guix --- Functional package management for GNU
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020,2021
Free Software Foundation, Inc.
Copyright (C) 2020 Ludovic Courtès <ludo@gnu.org>
@ -82,7 +82,11 @@ main (int argc, char **argv)
unsetenv ("GUILE_LOAD_PATH");
unsetenv ("GUILE_LOAD_COMPILED_PATH");
scm_install_gmp_memory_functions = 1;
/* XXX: Do not let GMP allocate via libgc as this can lead to memory
corruption in GnuTLS/Nettle since Nettle also uses GMP:
<https://issues.guix.gnu.org/46330>. */
scm_install_gmp_memory_functions = 0;
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */
}

6
gnu/packages/aux-files/linux-libre/5.10-arm.conf
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.10.0 Kernel Configuration
# Linux/arm 5.10.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -4786,7 +4786,6 @@ CONFIG_MFD_RK808=y
# CONFIG_MFD_RN5T618 is not set
CONFIG_MFD_SEC_CORE=y
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SL28CPLD is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SKY81452 is not set
# CONFIG_ABX500_CORE is not set
@ -7053,7 +7052,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@ -7766,7 +7764,6 @@ CONFIG_BCM_VIDEOCORE=y
# CONFIG_BCM2835_VCHIQ is not set
# CONFIG_SND_BCM2835 is not set
# CONFIG_VIDEO_BCM2835 is not set
# CONFIG_BCM2835_VCHIQ_MMAL is not set
CONFIG_PI433=m
#
@ -9784,6 +9781,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
CONFIG_DYNAMIC_EVENTS=y

14
gnu/packages/aux-files/linux-libre/5.10-arm64.conf
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.0 Kernel Configuration
# Linux/arm64 5.10.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -4242,7 +4242,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=y
CONFIG_GPIO_REGMAP=m
#
# Memory mapped GPIO drivers
@ -4298,7 +4297,6 @@ CONFIG_GPIO_BD70528=m
CONFIG_GPIO_BD71828=m
CONFIG_GPIO_MADERA=m
CONFIG_GPIO_MAX77620=y
CONFIG_GPIO_SL28CPLD=m
# end of MFD GPIO expanders
#
@ -4540,7 +4538,6 @@ CONFIG_SENSORS_NCT6775=m
# CONFIG_PMBUS is not set
# CONFIG_SENSORS_PWM_FAN is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_SL28CPLD=m
# CONFIG_SENSORS_SHT15 is not set
CONFIG_SENSORS_SHT21=m
# CONFIG_SENSORS_SHT3x is not set
@ -4670,7 +4667,6 @@ CONFIG_GPIO_WATCHDOG=m
# CONFIG_WDAT_WDT is not set
# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_ZIIRAVE_WATCHDOG is not set
CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_ARM_SBSA_WATCHDOG=m
# CONFIG_ARMADA_37XX_WATCHDOG is not set
@ -4807,8 +4803,6 @@ CONFIG_MFD_RK808=m
# CONFIG_MFD_RN5T618 is not set
# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
CONFIG_MFD_SIMPLE_MFD_I2C=m
CONFIG_MFD_SL28CPLD=m
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SKY81452 is not set
# CONFIG_ABX500_CORE is not set
@ -5850,7 +5844,6 @@ CONFIG_DRM_AMDGPU_USERPTR=y
# Display Engine Configuration
#
CONFIG_DRM_AMD_DC=y
CONFIG_DRM_AMD_DC_DCN=y
# CONFIG_DRM_AMD_DC_HDCP is not set
CONFIG_DRM_AMD_DC_SI=y
# end of Display Engine Configuration
@ -7013,7 +7006,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@ -7730,7 +7722,6 @@ CONFIG_BCM_VIDEOCORE=y
# CONFIG_BCM2835_VCHIQ is not set
# CONFIG_SND_BCM2835 is not set
# CONFIG_VIDEO_BCM2835 is not set
# CONFIG_BCM2835_VCHIQ_MMAL is not set
# CONFIG_PI433 is not set
#
@ -8641,7 +8632,6 @@ CONFIG_PWM_BCM2835=m
CONFIG_PWM_MESON=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_SUN4I=m
CONFIG_PWM_TEGRA=m
@ -9670,7 +9660,6 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
CONFIG_DMA_VIRT_OPS=y
CONFIG_SWIOTLB=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
@ -9948,6 +9937,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
CONFIG_DYNAMIC_EVENTS=y

13
gnu/packages/aux-files/linux-libre/5.10-i686.conf
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 5.10.0 Kernel Configuration
# Linux/i386 5.10.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -826,6 +826,7 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
CONFIG_ARCH_HAS_MEM_ENCRYPT=y
CONFIG_HAVE_STATIC_CALL=y
CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
CONFIG_ARCH_SPLIT_ARG64=y
#
# GCOV-based kernel profiling
@ -4624,7 +4625,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=m
CONFIG_GPIO_REGMAP=m
CONFIG_GPIO_MAX730X=m
#
@ -4686,7 +4686,6 @@ CONFIG_GPIO_MADERA=m
CONFIG_GPIO_MSIC=y
CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_RC5T583=y
CONFIG_GPIO_SL28CPLD=m
CONFIG_GPIO_TIMBERDALE=y
CONFIG_GPIO_TPS65086=m
CONFIG_GPIO_TPS6586X=y
@ -4989,7 +4988,6 @@ CONFIG_SENSORS_UCD9000=m
CONFIG_SENSORS_UCD9200=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_ZL6100=m
CONFIG_SENSORS_SL28CPLD=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SHT3x=m
@ -5113,7 +5111,6 @@ CONFIG_WM8350_WATCHDOG=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_ZIIRAVE_WATCHDOG=m
CONFIG_RAVE_SP_WATCHDOG=m
CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_CADENCE_WATCHDOG=m
CONFIG_DW_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
@ -5283,8 +5280,6 @@ CONFIG_MFD_RT5033=m
CONFIG_MFD_RC5T583=y
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_SI476X_CORE=m
CONFIG_MFD_SIMPLE_MFD_I2C=m
CONFIG_MFD_SL28CPLD=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SKY81452=m
@ -7013,6 +7008,7 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_HDA=m
# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_XTENSA=m
@ -7604,7 +7600,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
# CONFIG_USB_SISUSBVGA_CON is not set
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@ -7659,7 +7654,6 @@ CONFIG_USB_BDC_UDC=m
#
# Platform Support
#
CONFIG_USB_BDC_PCI=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
CONFIG_USB_NET2272_DMA=y
@ -9386,7 +9380,6 @@ CONFIG_PWM_LPSS=m
CONFIG_PWM_LPSS_PCI=m
CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM_PCA9685=m
CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_TWL=m
CONFIG_PWM_TWL_LED=m

35
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 5.10.0 Kernel Configuration
# Linux/x86 5.10.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -2214,6 +2214,7 @@ CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP_W1=m
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_REGMAP_SOUNDWIRE=m
CONFIG_REGMAP_SCCB=m
CONFIG_REGMAP_I3C=m
CONFIG_REGMAP_SPI_AVMM=m
@ -4600,7 +4601,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=m
CONFIG_GPIO_REGMAP=m
CONFIG_GPIO_MAX730X=m
#
@ -4660,7 +4660,6 @@ CONFIG_GPIO_MADERA=m
CONFIG_GPIO_MSIC=y
CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_RC5T583=y
CONFIG_GPIO_SL28CPLD=m
CONFIG_GPIO_TPS65086=m
CONFIG_GPIO_TPS6586X=y
CONFIG_GPIO_TPS65910=y
@ -4961,7 +4960,6 @@ CONFIG_SENSORS_UCD9000=m
CONFIG_SENSORS_UCD9200=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_ZL6100=m
CONFIG_SENSORS_SL28CPLD=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SHT3x=m
@ -5085,7 +5083,6 @@ CONFIG_WM8350_WATCHDOG=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_ZIIRAVE_WATCHDOG=m
CONFIG_RAVE_SP_WATCHDOG=m
CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_CADENCE_WATCHDOG=m
CONFIG_DW_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
@ -5243,8 +5240,6 @@ CONFIG_MFD_RT5033=m
CONFIG_MFD_RC5T583=y
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_SI476X_CORE=m
CONFIG_MFD_SIMPLE_MFD_I2C=m
CONFIG_MFD_SL28CPLD=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SKY81452=m
@ -6902,7 +6897,9 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_HDA=m
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK=y
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_XTENSA=m
#
@ -6989,6 +6986,7 @@ CONFIG_SND_SOC_MAX9867=m
CONFIG_SND_SOC_MAX98927=m
CONFIG_SND_SOC_MAX98373=m
CONFIG_SND_SOC_MAX98373_I2C=m
CONFIG_SND_SOC_MAX98373_SDW=m
CONFIG_SND_SOC_MAX98390=m
CONFIG_SND_SOC_MAX9860=m
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
@ -7018,6 +7016,7 @@ CONFIG_SND_SOC_RT286=m
CONFIG_SND_SOC_RT298=m
CONFIG_SND_SOC_RT1011=m
CONFIG_SND_SOC_RT1015=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT5514=m
CONFIG_SND_SOC_RT5514_SPI=m
CONFIG_SND_SOC_RT5616=m
@ -7032,6 +7031,13 @@ CONFIG_SND_SOC_RT5677=m
CONFIG_SND_SOC_RT5677_SPI=m
CONFIG_SND_SOC_RT5682=m
CONFIG_SND_SOC_RT5682_I2C=m
CONFIG_SND_SOC_RT5682_SDW=m
CONFIG_SND_SOC_RT700=m
CONFIG_SND_SOC_RT700_SDW=m
CONFIG_SND_SOC_RT711=m
CONFIG_SND_SOC_RT711_SDW=m
CONFIG_SND_SOC_RT715=m
CONFIG_SND_SOC_RT715_SDW=m
CONFIG_SND_SOC_SGTL5000=m
CONFIG_SND_SOC_SI476X=m
CONFIG_SND_SOC_SIGMADSP=m
@ -7095,6 +7101,7 @@ CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8974=m
CONFIG_SND_SOC_WM8978=m
CONFIG_SND_SOC_WM8985=m
CONFIG_SND_SOC_WSA881X=m
CONFIG_SND_SOC_ZL38060=m
CONFIG_SND_SOC_ZX_AUD96P22=m
CONFIG_SND_SOC_MAX9759=m
@ -7499,7 +7506,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
# CONFIG_USB_SISUSBVGA_CON is not set
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@ -7554,7 +7560,6 @@ CONFIG_USB_BDC_UDC=m
#
# Platform Support
#
CONFIG_USB_BDC_PCI=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
CONFIG_USB_NET2272_DMA=y
@ -8657,7 +8662,15 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=m
CONFIG_RPMSG_VIRTIO=m
# end of Rpmsg drivers
# CONFIG_SOUNDWIRE is not set
CONFIG_SOUNDWIRE=m
#
# SoundWire Devices
#
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE_INTEL=m
CONFIG_SOUNDWIRE_QCOM=m
CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
#
# SOC (System On Chip) specific Drivers
@ -9321,7 +9334,6 @@ CONFIG_PWM_LPSS=m
CONFIG_PWM_LPSS_PCI=m
CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM_PCA9685=m
CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_TWL=m
CONFIG_PWM_TWL_LED=m
@ -10317,7 +10329,6 @@ CONFIG_DMA_OPS=y
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_DMA_VIRT_OPS=y
CONFIG_SWIOTLB=y
CONFIG_DMA_CMA=y
CONFIG_DMA_PERNUMA_CMA=y

9791
gnu/packages/aux-files/linux-libre/5.9-arm.conf
View File

File diff suppressed because it is too large Load Diff

9895
gnu/packages/aux-files/linux-libre/5.9-arm64.conf
View File

File diff suppressed because it is too large Load Diff

10645
gnu/packages/aux-files/linux-libre/5.9-i686.conf
View File

File diff suppressed because it is too large Load Diff

10638
gnu/packages/aux-files/linux-libre/5.9-x86_64.conf
View File

File diff suppressed because it is too large Load Diff

20
gnu/packages/backup.scm
View File

@ -17,6 +17,7 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -672,6 +673,19 @@ detection, and lossless compression.")
"docs/misc/internals-picture.txt"
"docs/misc/prune-example.txt"))
(copy-recursively "docs/man" man)
#t)))
(add-after 'install-docs 'install-shell-completions
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(etc (string-append out "/etc"))
(share (string-append out "/share")))
(with-directory-excursion "scripts/shell_completions"
(install-file "bash/borg"
(string-append etc "/bash_completion.d"))
(install-file "zsh/_borg"
(string-append share "/zsh/site-functions"))
(install-file "fish/borg.fish"
(string-append share "/fish/vendor_completions.d")))
#t))))))
(native-inputs
`(("python-cython" ,python-cython)
@ -994,7 +1008,7 @@ is format-agnostic, so you can feed virtually any files to it.")
(define-public dump
(package
(name "dump")
(version "0.4b46")
(version "0.4b47")
(source
(origin
(method url-fetch)
@ -1002,7 +1016,7 @@ is format-agnostic, so you can feed virtually any files to it.")
version "/dump-" version ".tar.gz"))
(sha256
(base32
"15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0"))))
"1l2gzzxyqhinx1yqvj4yn9k8vx3iyqi1965dxf9kvvdv9zgaq8fh"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -1012,7 +1026,7 @@ is format-agnostic, so you can feed virtually any files to it.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("openssl" ,openssl-1.0)
`(("openssl" ,openssl)
("zlib" ,zlib)
("util-linux" ,util-linux "lib")
("e2fsprogs" ,e2fsprogs)))

37
gnu/packages/base.scm
View File

@ -52,13 +52,16 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages gettext)
#:use-module (guix i18n)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
#:use-module (ice-9 optargs)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:export (glibc
@ -1106,9 +1109,16 @@ to the @code{share/locale} sub-directory of this package.")
,(version-major+minor
(package-version glibc)))))))))))
(define-public (make-glibc-utf8-locales glibc)
(define %default-utf8-locales
;; These are the locales commonly used for tests---e.g., in Guile's i18n
;; tests.
'("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
(define*-public (make-glibc-utf8-locales glibc #:key
(locales %default-utf8-locales)
(name "glibc-utf8-locales"))
(define default-locales? (equal? locales %default-utf8-locales))
(package
(name "glibc-utf8-locales")
(name name)
(version (package-version glibc))
(source #f)
(build-system trivial-build-system)
@ -1142,17 +1152,22 @@ to the @code{share/locale} sub-directory of this package.")
(symlink (string-append locale ".utf8")
(string-append localedir "/"
locale ".UTF-8")))
;; These are the locales commonly used for
;; tests---e.g., in Guile's i18n tests.
'("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
',locales)
#t))))
(native-inputs `(("glibc" ,glibc)
("gzip" ,gzip)))
(synopsis "Small sample of UTF-8 locales")
(synopsis (if default-locales?
(P_ "Small sample of UTF-8 locales")
(P_ "Customized sample of UTF-8 locales")))
(description
"This package provides a small sample of UTF-8 locales mostly useful in
(if default-locales?
(P_ "This package provides a small sample of UTF-8 locales mostly useful in
test environments.")
(format #f (P_ "This package provides the following UTF-8 locales:
@itemize
~{@item ~a~%~}
@end itemize~%")
locales)))
(home-page (package-home-page glibc))
(license (package-license glibc))))
@ -1229,7 +1244,7 @@ command.")
(define-public tzdata
(package
(name "tzdata")
(version "2020d")
(version "2020f")
(source (origin
(method url-fetch)
(uri (string-append
@ -1237,7 +1252,7 @@ command.")
version ".tar.gz"))
(sha256
(base32
"1wxskk9mh1x2073n99qna2mq58mgi648mbq5dxlqfcrnvrbkk0cd"))))
"10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@ -1297,7 +1312,7 @@ command.")
version ".tar.gz"))
(sha256
(base32
"1mgsckixmmk9qxzsflfxnp3999qi3ls72bgksclk01g852x51w3c"))))))
"1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng"))))))
(home-page "https://www.iana.org/time-zones")
(synopsis "Database of current and historical time zones")
(description "The Time Zone Database (often called tz or zoneinfo)

686
gnu/packages/bioinformatics.scm
View File

@ -1,17 +1,17 @@
;;; 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, 2018, 2019, 2020 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; 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, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.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 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
@ -57,6 +57,7 @@
#:use-module (guix build-system trivial)
#:use-module (guix deprecation)
#:use-module (gnu packages)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
#:use-module (gnu packages algebra)
#:use-module (gnu packages base)
@ -142,6 +143,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match))
(define-public aragorn
@ -2820,6 +2822,86 @@ sequencing data. It uses paired-ends and split-reads to sensitively and
accurately delineate genomic rearrangements throughout the genome.")
(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
(package
(name "diamond")
@ -3563,61 +3645,60 @@ comment or quality sections.")
(define-public gemma
(package
(name "gemma")
(version "0.98")
(version "0.98.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xiangzhou/GEMMA")
(commit (string-append "v" version))))
(url "https://github.com/genetics-statistics/GEMMA")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1s3ncnbn45r2hh1cvrqky1kbqq6546biypr4f5mkw1kqlrgyh0yg"))))
"1p8a7kkfn1mmrg017aziy544aha8i9h6wd1x2dk3w2794wl33qb7"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "contrib")
#t))))
(build-system gnu-build-system)
(inputs
`(("eigen" ,eigen)
("gfortran" ,gfortran "lib")
("gsl" ,gsl)
("lapack" ,lapack)
`(("gsl" ,gsl)
("openblas" ,openblas)
("zlib" ,zlib)))
(build-system gnu-build-system)
(native-inputs
`(("catch" ,catch-framework2-1)
("perl" ,perl)
("shunit2" ,shunit2)
("which" ,which)))
(arguments
`(#:make-flags
'(,@(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
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'find-eigen
(add-after 'unpack 'prepare-build
(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"))
(mkdir-p "bin")
(substitute* "Makefile"
(("/usr/local/opt/openblas")
(assoc-ref inputs "openblas")))
#t))
(add-before 'build 'bin-mkdir
(lambda _
(mkdir-p "bin")
#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
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "bin/gemma"
(string-append
out "/bin")))
#t)))
#:tests? #f)) ; no tests included yet
(home-page "https://github.com/xiangzhou/GEMMA")
(install-file "bin/gemma"
(string-append (assoc-ref outputs "out") "/bin"))
#t)))))
(home-page "https://github.com/genetics-statistics/GEMMA")
(synopsis "Tool for genome-wide efficient mixed model association")
(description
"Genome-wide Efficient Mixed Model Association (GEMMA) provides a
standard linear mixed model resolver with application in genome-wide
association studies (GWAS).")
"@acronym{GEMMA, Genome-wide Efficient Mixed Model Association} provides a
standard linear mixed model resolver with application in @acronym{GWAS,
genome-wide association studies}.")
(license license:gpl3)))
(define-public grit
@ -4687,7 +4768,7 @@ sequencing tag position and orientation.")
(define-public mafft
(package
(name "mafft")
(version "7.471")
(version "7.475")
(source (origin
(method url-fetch)
(uri (string-append
@ -4696,7 +4777,7 @@ sequencing tag position and orientation.")
(file-name (string-append name "-" version ".tgz"))
(sha256
(base32
"0r1973fx2scq4712zdqfy67wkzqj0c0bhrdy4jxhvq40mdxyry30"))))
"0i2i2m3blh2xkbkdk48hxfssks30ny0v381gdl7zwhcvp0axs26r"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no automated tests, though there are tests in the read me
@ -5631,7 +5712,7 @@ phylogenies.")
"/include/htslib/sam.h")
(string-append "SAMLIBS="
(assoc-ref %build-inputs "htslib")
"/lib/libhts.a"))
"/lib/libhts.so"))
#:phases
(modify-phases %standard-phases
;; No "configure" script.
@ -7073,6 +7154,55 @@ sequence.")
(supported-systems '("i686-linux" "x86_64-linux"))
(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
(package
(name "r-scde")
@ -7139,6 +7269,45 @@ between two different types of motif instances using as much relevant
information as possible.")
(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
(package
(name "r-genefilter")
@ -7726,6 +7895,31 @@ BLAST, KEGG, GenBank, MEDLINE and GO.")
;; (LGPLv2.1+) and scripts in samples (which have GPL2 and 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
(package
(name "r-biocviews")
@ -9386,8 +9580,9 @@ group or two ChIP groups run under different conditions.")
(delete 'configure) ; There is no configure phase.
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "filevercmp" bin)
(let ((out (assoc-ref outputs "out")))
(install-file "filevercmp" (string-append out "/bin"))
(install-file "filevercmp.h" (string-append out "/include"))
#t))))))
(home-page "https://github.com/ekg/filevercmp")
(synopsis "This program compares version strings")
@ -10514,41 +10709,20 @@ explore and perform basic analysis of single cell sequencing data coming from
droplet sequencing. It has been particularly tailored for Drop-seq.")
(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
(package
(name "sambamba")
(version "0.7.1")
(version "0.8.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lomereiter/sambamba")
(url "https://github.com/biod/sambamba")
(commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout"))
(file-name (git-file-name name version))
(sha256
(base32
"111h05b60pj8dxbidiamy4imc92x2962b3lmb7wgysl6lx064qis"))))
"07dznzl6m8k7sw84jxw2kx6i3ymrapbmcmyh0fxz8wrybhw8fmwc"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there is no test target
@ -10558,52 +10732,30 @@ droplet sequencing. It has been particularly tailored for Drop-seq.")
(delete 'configure)
(add-after 'unpack 'fix-ldc-version
(lambda _
(substitute* "gen_ldc_version_info.py"
(("/usr/bin/env.*") (which "python3")))
(substitute* "Makefile"
;; We use ldc2 instead of ldmd2 to compile sambamba.
(("\\$\\(shell which ldmd2\\)") (which "ldc2")))
#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
(lambda _
(substitute* "Makefile"
(("htslib/libhts.a lz4/lib/liblz4.a")
"-L-lhts -L-llz4")
((" lz4-static htslib-static") ""))
(("= lz4/lib/liblz4.a") "= -L-llz4")
(("ldc_version_info lz4-static") "ldc_version_info"))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(mkdir-p bin)
(copy-file (string-append "bin/sambamba-" ,version)
(string-append bin "/sambamba"))
#t))))))
(native-inputs
`(("ldc" ,ldc)
("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")))))))
`(("python" ,python)))
(inputs
`(("lz4" ,lz4)
("htslib" ,htslib-for-sambamba)))
(home-page "https://lomereiter.github.io/sambamba/")
`(("ldc" ,ldc)
("lz4" ,lz4)
("zlib" ,zlib)))
(home-page "https://github.com/biod/sambamba")
(synopsis "Tools for working with SAM/BAM data")
(description "Sambamba is a high performance modern robust and
fast tool (and library), written in the D programming language, for
@ -14855,10 +15007,14 @@ some of the details of opening and jumping in tabix-indexed files.")
(delete 'configure) ; There is no configure phase.
(replace 'install
(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.
(install-file "multichoose" bin)
(install-file "multipermute" bin))
(install-file "multipermute" bin)
(install-file "multichoose.h" include)
(install-file "multipermute.h" include))
#t)))))
(home-page "https://github.com/ekg/multichoose")
(synopsis "Efficient loopless multiset combination generation algorithm")
@ -14967,32 +15123,44 @@ library automatically handles index file generation and use.")
(define-public vcflib
(package
(name "vcflib")
(version "1.0.1")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/vcflib/vcflib/releases/"
"download/v" version
"/vcflib-" version "-src.tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/vcflib/vcflib")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "14zzrg8hg8cq9cvq2wdvp21j7nmxxkjrbagw2apd2yqv2kyx42lm"))
(patches (search-patches "vcflib-use-shared-libraries.patch"))
(base32 "1k1z3876kbzifj1sqfzsf3lgb4rw779hvkg6ryxbyq5bc2paj9kh"))
(modules '((guix build utils)))
(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)?$")
(("\"SmithWatermanGotoh.h\"") "<smithwaterman/SmithWatermanGotoh.h>")
(("\"convert.h\"") "<smithwaterman/convert.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
'("fastahack" "filevercmp" "fsom" "googletest" "intervaltree"
"libVCFH" "multichoose" "smithwaterman" "tabixpp"))
"libVCFH" "multichoose" "smithwaterman"))
#t))))
(build-system gnu-build-system)
(build-system cmake-build-system)
(inputs
`(("htslib" ,htslib)
`(("bzip2" ,bzip2)
("htslib" ,htslib)
("fastahack" ,fastahack)
("perl" ,perl)
("python" ,python)
@ -15005,22 +15173,20 @@ library automatically handles index file generation and use.")
;; Submodules.
;; This package builds against the .o files so we need to extract the source.
("filevercmp-src" ,(package-source filevercmp))
("fsom-src" ,(package-source fsom))
("intervaltree-src" ,(package-source intervaltree))
("multichoose-src" ,(package-source multichoose))))
(arguments
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-flags
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile"
(("LDFLAGS =")
(string-append "LDFLAGS = -Wl,-rpath="
(assoc-ref outputs "out") "/lib ")))
(substitute* "filevercmp/Makefile"
(("-c") "-c -fPIC"))
(add-after 'unpack 'build-shared-library
(lambda _
(substitute* "CMakeLists.txt"
(("vcflib STATIC") "vcflib SHARED"))
(substitute* "test/Makefile"
(("libvcflib.a") "libvcflib.so"))
#t))
(delete 'configure)
(add-after 'unpack 'unpack-submodule-sources
(lambda* (#:key inputs #:allow-other-keys)
(let ((unpack (lambda (source target)
@ -15033,39 +15199,31 @@ library automatically handles index file generation and use.")
"--strip-components=1"))))))
(and
(unpack "filevercmp-src" "filevercmp")
(unpack "fsom-src" "fsom")
(unpack "intervaltree-src" "intervaltree")
(unpack "multichoose-src" "multichoose")))))
(replace 'install
(unpack "multichoose-src" "multichoose"))
#t)))
;; This pkg-config file is provided by other distributions.
(add-after 'install 'install-pkg-config-file
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(lib (string-append out "/lib")))
(for-each (lambda (file)
(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")
(pkgconfig (string-append out "/lib/pkgconfig")))
(mkdir-p pkgconfig)
(with-output-to-file (string-append pkgconfig "/vcflib.pc")
(lambda _
(format #t "prefix=~a~@
exec_prefix=${prefix}~@
libdir=${exec_prefix}/lib~@
includedir=${prefix}/include~@
~@
~@
Name: libvcflib~@
Name: vcflib~@
Version: ~a~@
Requires: smithwaterman, fastahack~@
Requires: smithwaterman, fastahack, tabixpp~@
Description: C++ library for parsing and manipulating VCF files~@
Libs: -L${libdir} -lvcflib~@
Cflags: -I${includedir}~%"
out ,version))))
#t)))))
out ,version)))
#t))))))
(home-page "https://github.com/vcflib/vcflib/")
(synopsis "Library for parsing and manipulating VCF files")
(description "Vcflib provides methods to manipulate and interpret
@ -15076,125 +15234,94 @@ manipulations on VCF files.")
(license license:expat)))
(define-public freebayes
(let ((commit "3ce827d8ebf89bb3bdc097ee0fe7f46f9f30d5fb")
(revision "1")
(version "1.0.2"))
(package
(name "freebayes")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ekg/freebayes")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1sbzwmcbn78ybymjnhwk7qc5r912azy5vqz2y7y81616yc3ba2a2"))))
(build-system gnu-build-system)
(inputs
`(("bamtools" ,bamtools)
("htslib" ,htslib)
("zlib" ,zlib)))
(native-inputs
`(("bc" ,bc) ; Needed for running tests.
("samtools" ,samtools) ; Needed for running tests.
("parallel" ,parallel) ; Needed for running tests.
("perl" ,perl) ; Needed for running tests.
("procps" ,procps) ; Needed for running tests.
("python" ,python-2) ; Needed for running tests.
("vcflib-src" ,(package-source vcflib))
;; These are submodules for the vcflib version used in freebayes.
;; This package builds against the .o files so we need to extract the source.
("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"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ingydotnet/test-simple-bash/")
(commit "124673ff204b01c8e96b7fc9f9b32ee35d898acc")))
(file-name "test-simple-bash-src-checkout")
(sha256
(base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga"))))))
(arguments
`(#:make-flags
(list "CC=gcc"
(string-append "BAMTOOLS_ROOT="
(assoc-ref %build-inputs "bamtools")))
#:test-target "test"
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'fix-tests
(lambda _
(substitute* "test/t/01_call_variants.t"
(("grep -P \"\\(\\\\t500\\$\\|\\\\t11000\\$\\|\\\\t1000\\$\\)\"")
"grep -E ' (500|11000|1000)$'"))
#t))
(add-after 'unpack 'unpack-submodule-sources
(lambda* (#:key inputs #:allow-other-keys)
(let ((unpack (lambda (source target)
(with-directory-excursion target
(if (file-is-directory? (assoc-ref inputs source))
(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))
(add-before 'build 'build-tabixpp-and-vcflib
(lambda* (#:key inputs make-flags #:allow-other-keys)
(with-directory-excursion "vcflib"
(with-directory-excursion "tabixpp"
(apply invoke "make"
(string-append "HTS_LIB="
(assoc-ref inputs "htslib")
"/lib/libhts.a")
make-flags))
(apply invoke "make"
(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")
(description "FreeBayes is a Bayesian genetic variant detector designed to
(package
(name "freebayes")
(version "1.3.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/freebayes/freebayes")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0myz3giad7jqp6ricdfnig9ymlcps2h67mlivadvx97ngagm85z8"))
(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
`(("fastahack" ,fastahack)
("htslib" ,htslib)
("smithwaterman" ,smithwaterman)
("tabixpp" ,tabixpp)
("vcflib" ,vcflib)
("zlib" ,zlib)))
(native-inputs
`(("bash-tap" ,bash-tap)
("bc" ,bc)
("grep" ,grep) ; Built with perl support.
("parallel" ,parallel)
("perl" ,perl)
("pkg-config" ,pkg-config)
("samtools" ,samtools)
("simde" ,simde)
;; This submodule is needed to run the tests.
("test-simple-bash-src"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ingydotnet/test-simple-bash/")
(commit "124673ff204b01c8e96b7fc9f9b32ee35d898acc")))
(file-name "test-simple-bash-src-checkout")
(sha256
(base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga"))))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash-tap (assoc-ref inputs "bash-tap")))
(substitute* (find-files "test/t")
(("BASH_TAP_ROOT=bash-tap")
(string-append "BASH_TAP_ROOT=" bash-tap "/bin"))
(("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
(lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "test/test-simple-bash")
(copy-recursively (assoc-ref inputs "test-simple-bash-src")
"test/test-simple-bash")
#t))
;; The slow tests take longer than the specified timeout.
,@(if (any (cute string=? <> (%current-system))
'("armhf-linux" "aarch64-linux"))
'((replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "meson" "test" "--timeout-multiplier" "5"))
#t)))
'()))))
(home-page "https://github.com/freebayes/freebayes")
(synopsis "Haplotype-based variant detector")
(description "FreeBayes is a Bayesian genetic variant detector designed to
find small polymorphisms, specifically SNPs (single-nucleotide polymorphisms),
indels (insertions and deletions), MNPs (multi-nucleotide polymorphisms), and
complex events (composite insertion and substitution events) smaller than the
length of a short-read sequencing alignment.")
(license license:expat))))
(license license:expat)))
(define-public samblaster
(package
@ -15480,44 +15607,3 @@ biological processes. SBML is useful for models of metabolism, cell
signaling, and more. It continues to be evolved and expanded by an
international community.")
(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))))

1
gnu/packages/bittorrent.scm
View File

@ -56,6 +56,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)

171
gnu/packages/bootloaders.scm
View File

@ -7,12 +7,14 @@
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; 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 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org>
;;; 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.
;;;
@ -476,7 +478,7 @@ tree binary files. These are board description files used by Linux and BSD.")
(define u-boot
(package
(name "u-boot")
(version "2020.10")
(version "2021.01")
(source (origin
(method url-fetch)
(uri (string-append
@ -484,7 +486,7 @@ tree binary files. These are board description files used by Linux and BSD.")
"u-boot-" version ".tar.bz2"))
(sha256
(base32
"08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d"))))
"0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl"))))
(native-inputs
`(("bc" ,bc)
("bison" ,bison)
@ -811,30 +813,19 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(package
(inherit base)
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
;; Need to copy the firmware into u-boot build
;; directory.
(copy-file (string-append (assoc-ref inputs "firmware")
"/bl31.bin") "bl31-rk3399.bin")
(copy-file (string-append (assoc-ref inputs "firmware-m0")
"/rk3399m0.bin") "rk3399m0.bin")
#t))
(add-after 'build 'build-itb
(lambda* (#:key make-flags #:allow-other-keys)
;; The u-boot.itb is not built by default.
(apply invoke "make" `(,@make-flags ,"u-boot.itb"))))
(add-after 'build-itb 'build-rksd
(lambda* (#:key inputs #:allow-other-keys)
;; Build Rockchip SD card images.
(invoke "./tools/mkimage" "-T" "rksd" "-n" "rk3399" "-d"
"spl/u-boot-spl.bin" "u-boot-spl.rksd")))))))
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "BL31" (string-append (assoc-ref inputs "firmware")
"/bl31.elf"))
#t))
;; Phases do not succeed on the bl31 ELF.
(delete 'strip)
(delete 'validate-runpath)))))
(native-inputs
`(("firmware" ,arm-trusted-firmware-puma-rk3399)
("firmware-m0" ,rk3399-cortex-m0)
`(("firmware" ,arm-trusted-firmware-rk3399)
,@(package-native-inputs base))))))
(define-public u-boot-qemu-riscv64
@ -925,6 +916,13 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-pinebook-pro-config
;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled.
;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4
(lambda _
(substitute* "configs/pinebook-pro-rk3399_defconfig"
(("CONFIG_USE_PREBOOT=y") "CONFIG_USE_PREBOOT=n"))
#t))
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "BL31" (string-append (assoc-ref inputs "firmware")
@ -1095,3 +1093,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
order to add a suitable bootloader menu entry.")
(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
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -49,7 +49,7 @@ supported content to the Kodi media center.")
(make-chromium-extension play-to-kodi))
(define uassets
(let ((commit "8e79f25fceb7c27960753de6f4d21491257741ab"))
(let ((commit "61b43044fbe7be0cf4e9c636fe96236dc52e44cf"))
(origin
(method git-fetch)
(uri (git-reference
@ -58,12 +58,12 @@ supported content to the Kodi media center.")
(file-name (git-file-name "uAssets" (string-take commit 9)))
(sha256
(base32
"19ymyv6qpmmyw4lnpx6adm6mzf8ygfj0c9ljw24wl239v9vzn46w")))))
"03ikia0prmzsc34qa3418dc49ss8ari9hj6g3s6nvxrgyd127idi")))))
(define ublock-origin
(package
(name "ublock-origin")
(version "1.32.4")
(version "1.33.2")
(home-page "https://github.com/gorhill/uBlock")
(source (origin
(method git-fetch)
@ -71,7 +71,7 @@ supported content to the Kodi media center.")
(file-name (git-file-name name version))
(sha256
(base32
"0v5phzsrav1z0gd7rirmsy7k500xhibw73ffk61754hkqd0l635v"))))
"1pdf3fzc7ld65gr87s1cdy2sb84jbqnyq9lvwg1mgzi9dg8x7639"))))
(build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium"))
(arguments

6
gnu/packages/busybox.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; 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.
;;;
@ -33,7 +33,7 @@
(define-public busybox
(package
(name "busybox")
(version "1.32.0")
(version "1.32.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -41,7 +41,7 @@
version ".tar.bz2"))
(sha256
(base32
"12g63zsvzfz04wbyga8riyl8ils05riw4xf26cyiaasbs3qqfpf3"))))
"1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx"))))
(build-system gnu-build-system)
(arguments
'(#:phases

9
gnu/packages/c.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@ -189,15 +189,18 @@ language with thin bindings for other languages.")
(name "udunits")
;; Four-part version numbers are development snapshots, not releases. See
;; <https://github.com/Unidata/UDUNITS-2/issues/99#issuecomment-732323472>.
(version "2.2.26")
(version "2.2.28")
(source (origin
(method url-fetch)
(uri (string-append "ftp://ftp.unidata.ucar.edu/pub/udunits/"
"udunits-" version ".tar.gz"))
(sha256
(base32
"0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn"))))
"17jpbp6f0rr132jn2gqy8ry8mv1w27v6dyhfq1igv8v1674aw2sr"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--disable-static")))
(inputs
`(("expat" ,expat)))
(home-page "https://www.unidata.ucar.edu/software/udunits/")

6
gnu/packages/cdrom.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 John Darrington <jmd@gnu.org>
@ -159,7 +159,7 @@ libcdio.")
(define-public xorriso
(package
(name "xorriso")
(version "1.5.2")
(version "1.5.4.pl02")
(outputs '("out" "gui"))
(source (origin
(method url-fetch)
@ -167,7 +167,7 @@ libcdio.")
version ".tar.gz"))
(sha256
(base32
"1rqpzj95f70jfwpn4lamasfgqpizjsipz12aprdhri777b4zas9v"))))
"0wi92lxpm3dcjglmmfbh4z37w8jmbx0qmhh98gvzbjwx98ykkiry"))))
(build-system gnu-build-system)
(arguments
`(#:phases

134
gnu/packages/check.scm
View File

@ -7,7 +7,7 @@
;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; 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 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
@ -67,6 +67,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages time)
@ -288,6 +289,55 @@ unit testing. Test output is in XML for automatic testing and GUI based for
supervised tests.")
(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
;; be removed.
(define-public catch-framework
@ -1355,9 +1405,6 @@ subprocess and see the output as well as any file modifications.")
"This package is only for bootstrapping. Do not use this.")
(license license:psfl)))
(define-public python2-testtools-bootstrap
(package-with-python2 python-testtools-bootstrap))
(define-public python-testtools
(package
(inherit python-testtools-bootstrap)
@ -1383,9 +1430,6 @@ subprocess and see the output as well as any file modifications.")
provide matchers, more debugging information, and cross-Python
compatibility.")))
(define-public python2-testtools
(package-with-python2 python-testtools))
(define-public python-testscenarios-bootstrap
(package
(name "python-testscenarios-bootstrap")
@ -1413,9 +1457,6 @@ compatibility.")))
"This package is only for bootstrapping. Don't use this.")
(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
(package
(inherit python-testscenarios-bootstrap)
@ -1427,9 +1468,6 @@ compatibility.")))
"Testscenarios provides clean dependency injection for Python unittest
style tests.")))
(define-public python2-testscenarios
(package-with-python2 python-testscenarios))
;; Testresources requires python-pbr at runtime, but pbr needs it for its
;; own tests. Hence this bootstrap variant.
(define-public python-testresources-bootstrap
@ -1454,9 +1492,6 @@ style tests.")))
testresources package instead.")
(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
(package
(inherit python-testresources-bootstrap)
@ -1471,9 +1506,6 @@ testresources package instead.")
"Testresources is an extension to Python's unittest to allow declarative
use of resources by test cases.")))
(define-public python2-testresources
(package-with-python2 python-testresources))
(define-public python-subunit-bootstrap
(package
(name "python-subunit-bootstrap")
@ -1500,9 +1532,6 @@ use of resources by test cases.")))
python-subunit package instead.")
(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
(package
(inherit python-subunit-bootstrap)
@ -1518,9 +1547,6 @@ python-subunit package instead.")
"Python-subunit is a Python implementation of the subunit test streaming
protocol.")))
(define-public python2-subunit
(package-with-python2 python-subunit))
;; Fixtures requires python-pbr at runtime, but pbr uses fixtures for its
;; own tests. Hence this bootstrap variant.
(define-public python-fixtures-bootstrap
@ -1545,9 +1571,6 @@ protocol.")))
python-fixtures package instead.")
(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
(package
(inherit python-fixtures-bootstrap)
@ -1570,9 +1593,6 @@ python-fixtures package instead.")
"Fixtures provides a way to create reusable state, useful when writing
Python tests.")))
(define-public python2-fixtures
(package-with-python2 python-fixtures))
(define-public python-testrepository-bootstrap
(package
(name "python-testrepository-bootstrap")
@ -1598,9 +1618,6 @@ Python tests.")))
"Bootstrap package for python-testrepository. Don't use this.")
(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
(package
(inherit python-testrepository-bootstrap)
@ -1618,9 +1635,6 @@ Python 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.")))
(define-public python2-testrepository
(package-with-python2 python-testrepository))
(define-public python-coverage
(package
(name "python-coverage")
@ -2149,51 +2163,8 @@ Pylint has many rules enabled by default, way too much to silence them
all on a minimally sized program. It's highly configurable and handle
pragmas to control it from within your code. Additionally, it is
possible to write plugins to add your own checks.")
(properties `((python2-variant . ,(delay python2-pylint))))
(license license:gpl2+)))
;; Python2 is not supported anymore by Pylint. See:
;; https://github.com/PyCQA/pylint/issues/1763.
(define-public python2-pylint
(let ((pylint (package-with-python2
(strip-python2-variant python-pylint))))
(package (inherit pylint)
(version "1.9.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/PyCQA/pylint")
(commit (string-append "pylint-" version))))
(file-name (git-file-name (package-name pylint) version))
(sha256
(base32
"02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2"))))
(arguments
`(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint))
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
;; Somehow, tests fail if run from the build directory.
(let ((work "/tmp/work"))
(mkdir-p work)
(setenv "PYTHONPATH"
(string-append (getenv "PYTHONPATH") ":" work))
(copy-recursively "." work)
(with-directory-excursion "/tmp"
(invoke "python" "-m" "unittest" "discover"
"-s" (string-append work "/pylint/test")
"-p" "*test_*.py"))))))))
(native-inputs
`(("python2-futures" ,python2-futures)
,@(package-native-inputs pylint)))
(propagated-inputs
`(("python2-backports-functools-lru-cache"
,python2-backports-functools-lru-cache)
("python2-configparser" ,python2-configparser)
,@(package-propagated-inputs pylint))))))
(define-public python-paramunittest
(package
(name "python-paramunittest")
@ -2422,9 +2393,6 @@ tests written in a natural language style, backed up by Python code.")
JSON APIs with Behave.")
(license license:expat)))
(define-public python2-behave-web-api
(package-with-python2 python-behave-web-api))
(define-public python-rednose
(package
(name "python-rednose")

303
gnu/packages/chemistry.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; 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 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
@ -29,6 +29,8 @@
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@ -43,96 +45,89 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages xml)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python))
(define-public avogadro
(define-public avogadrolibs
(package
(name "avogadro")
(version "1.2.0")
(name "avogadrolibs")
(version "1.93.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cryos/avogadro")
(url "https://github.com/OpenChemistry/avogadrolibs")
(commit version)))
(sha256
(base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2"))
(file-name (git-file-name name version))
(patches
(search-patches "avogadro-eigen3-update.patch"
"avogadro-python-eigen-lib.patch"
"avogadro-boost148.patch"))))
(base32 "1xivga626n5acnmwmym8svl0pdri8hkp59czf04ri2zflnviyh39"))
(file-name (git-file-name name version))))
(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\")")))
#t))
(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 "PYTHONPATH"
(string-append
(assoc-ref outputs "out")
"/lib/python"
,(version-major+minor
(package-version python))
"/site-packages:"
(getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/avogadro")
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))
#t)))))
(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)))
(inputs
`(("boost" ,boost)
("eigen" ,eigen)
("glew" ,glew)
("openbabel" ,openbabel)
("python" ,python-2)
("python-numpy" ,python2-numpy)
("python-pyqt" ,python2-pyqt-4)
("python-sip" ,python2-sip)
("qt" ,qt-4)
("zlib" ,zlib)))
(home-page "https://avogadro.cc")
`(("avogadrolibs" ,avogadrolibs)
("hdf5" ,hdf5)
("molequeue" ,molequeue)
("qtbase" ,qtbase)))
;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
(arguments
'(#:tests? #f))
(home-page "https://www.openchemistry.org/projects/avogadro2/")
(synopsis "Advanced molecule editor")
(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
science, and related areas. It offers flexible high quality rendering and a
powerful plugin architecture.")
(license license:gpl2+)))
(license license:bsd-3)))
(define-public domainfinder
(package
@ -166,15 +161,16 @@ only with Python 2 and NumPy < 1.9.")
(define-public inchi
(package
(name "inchi")
(version "1.05")
;; Update the inchi-doc native input when updating inchi.
(version "1.06")
(source (origin
(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 #\.) "")
"/INCHI-1-SRC.zip"))
(sha256
(base32
"081pcjx1z5jm23fs1pl2r3bccia0ww8wfkzcjpb7byhn7b513hsa"))
"1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28"))
(file-name (string-append name "-" version ".zip"))))
(build-system gnu-build-system)
(arguments
@ -227,7 +223,7 @@ only with Python 2 and NumPy < 1.9.")
"/INCHI-1-DOC.zip"))
(sha256
(base32
"1id1qb2y4lwsiw91qr2yqpn6kxbwjwhjk0hb2rwk4fxhdqib6da6"))
"1kyda09i9p89xfq90ninwi7w13k1w3ljpl4gqdhpfhi5g8fgxx7f"))
(file-name (string-append name "-" version ".zip"))))))
(home-page "https://www.inchi-trust.org")
(synopsis "Utility for manipulating machine-readable chemical structures")
@ -241,6 +237,103 @@ analogy is that InChI is the bar-code for chemistry and chemical structures.")
"file://LICENCE"
"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
(package-input-rewriting `((,python2-numpy . ,python2-numpy-1.8))))
@ -429,19 +522,23 @@ usual algorithms you expect from a modern molecular dynamics implementation.")
(define-public openbabel
(package
(name "openbabel")
(version "2.4.1")
(version "3.1.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/"
version "/" name "-" version ".tar.gz"))
(uri (string-append "https://github.com/openbabel/openbabel/"
"releases/download/openbabel-"
(string-replace-substring version "." "-")
"/openbabel-" version "-source.tar.bz2"))
(sha256
(base32
"1z3d6xm70dpfikhwdnbzc66j2l49vq105ch041wivrfz5ic3ch90"))
(patches
(search-patches "openbabel-fix-crash-on-nwchem-output.patch"))))
"0s0f4zib8vshfaywsr5bjjz55jwsg6yiz2qw4i5jm8wysn0q7v56"))))
(build-system cmake-build-system)
(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"
(string-append "-DINCHI_LIBRARY="
(assoc-ref %build-inputs "inchi")
@ -464,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
materials, biochemistry, or related areas.")
(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)))

45
gnu/packages/chromium.scm
View File

@ -1,5 +1,5 @@
;;; 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>
;;;
;;; This file is part of GNU Guix.
@ -160,6 +160,7 @@
"third_party/dom_distiller_js" ;BSD-3
"third_party/emoji-segmenter" ;ASL2.0
"third_party/flatbuffers" ;ASL2.0
"third_party/fusejs" ;ASL2.0
"third_party/glslang" ;BSD-3, Expat, ASL2.0
"third_party/google_input_tools" ;ASL2.0
"third_party/google_input_tools/third_party/closure_library" ;ASL2.0
@ -277,6 +278,13 @@
"third_party/woff2" ;ASL2.0
"third_party/xcbproto" ;X11
"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/zxcvbn-cpp" ;Expat
"url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+
@ -302,8 +310,8 @@
(string-append "ungoogled-chromium-" category "-" name))))
(sha256 (base32 hash))))
(define %chromium-version "87.0.4280.88")
(define %ungoogled-revision "b78cb927fa8beaee0ddfb4385277edb96444c40f")
(define %chromium-version "88.0.4324.150")
(define %ungoogled-revision "f7c33ded1674556b6e9e72d597c706666f490da8")
(define %debian-revision "debian/84.0.4147.105-1")
(define %debian-patches
@ -321,7 +329,7 @@
(string-take %ungoogled-revision 7)))
(sha256
(base32
"0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg"))))
"0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y"))))
(define %guix-patches
(list (local-file
@ -405,6 +413,22 @@
`(cons "--enable-custom-modes"
,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
;; this trick to make it wrap 'lld'.
(define (make-lld-wrapper lld)
@ -443,7 +467,7 @@
%chromium-version ".tar.xz"))
(sha256
(base32
"1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy"))
"1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system)
@ -580,6 +604,12 @@
(("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.
(substitute* "third_party/pdfium/core/fxcodec/icc/iccmodule.h"
(("include \"third_party/lcms/include/lcms2\\.h\"")
@ -795,7 +825,6 @@
("cups" ,cups)
("curl" ,curl)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("expat" ,expat)
("flac" ,flac)
("ffmpeg" ,ffmpeg)
@ -805,14 +834,14 @@
("glib" ,glib)
("gtk+" ,gtk+)
("harfbuzz" ,harfbuzz)
("icu4c" ,icu4c-67)
("icu4c" ,icu4c-68)
("lcms" ,lcms)
("libevent" ,libevent)
("libffi" ,libffi)
("libjpeg-turbo" ,libjpeg-turbo)
("libpng" ,libpng)
("libva" ,libva)
("libvpx" ,libvpx)
("libvpx" ,libvpx/chromium)
("libwebp" ,libwebp)
("libx11" ,libx11)
("libxcb" ,libxcb)

67
gnu/packages/ci.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@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 © 2018 Clément Lassieur <clement@lassieur.org>
;;;
@ -26,6 +26,7 @@
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix download)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages docbook)
@ -39,7 +40,6 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages version-control)
@ -47,29 +47,9 @@
#:use-module (gnu packages xml)
#: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
(let ((commit "697fa14584551d9595cd042f1ffeba240e45a127")
(revision "56"))
(let ((commit "23688a0e451e0265ad29e150d6eba497d4291fb6")
(revision "67"))
(package
(name "cuirass")
(version (git-version "0.0.1" revision commit))
@ -81,43 +61,33 @@
(file-name (git-file-name name version))
(sha256
(base32
"0gw9cja8fiyra9vnn3y384gwanvsqdq6gwjcvmz91sy5lvfwv34m"))))
"1r90wnj9w3vh3rr48mddp0xi874ffawc9nsb8cdnpw034px62k1k"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
(guix build gnu-build-system)
(ice-9 rdelim)
(ice-9 popen))
#:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
#:tests? #f ;requires a PostgreSQL database.
#: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
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules.
(let* ((out (assoc-ref outputs "out"))
(avahi (assoc-ref inputs "guile-avahi"))
(gcrypt (assoc-ref inputs "guile-gcrypt"))
(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"))
(bytes (assoc-ref inputs "guile-bytestructures"))
(fibers (assoc-ref inputs "guile-fibers"))
(zlib (assoc-ref inputs "guile-zlib"))
(guix (assoc-ref inputs "guix"))
(deps (list gcrypt json sqlite git bytes fibers
zlib guix))
(deps (list avahi gcrypt json zmq squee git bytes
fibers zlib guix))
(guile (assoc-ref %build-inputs "guile"))
(effective (read-line
(open-pipe* OPEN_READ
@ -137,17 +107,22 @@
1)))
;; Make sure 'cuirass' can find the 'evaluate' command, as
;; well as the relevant Guile modules.
(wrap-program (string-append out "/bin/cuirass")
`("PATH" ":" prefix (,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix (,mods))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
(for-each
(lambda (name)
(wrap-program (string-append out "/bin/" name)
`("PATH" ":" prefix (,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix (,mods))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))))
'("cuirass" "remote-server" "remote-worker"))
#t))))))
(inputs
`(("guile" ,guile-3.0/libgc-7)
("guile-avahi" ,guile-avahi)
("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt)
("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-zlib" ,guile-zlib)
;; 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 packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix deprecation)
#:use-module (guix build-system gnu)
@ -43,6 +44,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages file)
#:use-module (gnu packages hurd)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages serialization)
@ -52,6 +54,33 @@
#:use-module (ice-9 match)
#: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
;;; that use cmake-build-system.
(define %common-build-phases

63
gnu/packages/compression.scm
View File

@ -10,7 +10,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2019, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@ -29,6 +29,8 @@
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -55,6 +57,7 @@
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
@ -70,7 +73,9 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@ -78,6 +83,7 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml)
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (last)))
@ -621,14 +627,14 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.")
(define-public lziprecover
(package
(name "lziprecover")
(version "1.21")
(version "1.22")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/lziprecover/"
"lziprecover-" version ".tar.gz"))
(sha256
(base32
"094w2z8fz41yaq0gkyr61cl7pb1d7kchpl5dka7rvm3qvbb7ncd2"))))
"0qh8dnhr5rly2k9dnx43qqynqwqzi5kfb15pyd29qwppfl4qm5gx"))))
(build-system gnu-build-system)
(home-page "https://www.nongnu.org/lzip/lziprecover.html")
(synopsis "Recover and decompress data from damaged lzip files")
@ -1025,6 +1031,41 @@ smaller than those produced by @code{Xdelta}.")
;; Some source files specify gpl2+, lgpl2+, however COPYING is 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
(package
(name "xdelta")
@ -1816,14 +1857,14 @@ Clzip is intended to be fully compatible with the regular lzip package.")
(define-public lzlib
(package
(name "lzlib")
(version "1.11")
(version "1.12")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/lzlib/"
"lzlib-" version ".tar.gz"))
(sha256
(base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c"))))
(base32 "1c9pwd6by8is4z8bs6j306jyy6pgm2dvsn4fr7fg2b5m5qj88pcf"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -1843,14 +1884,14 @@ corrupted input.")
(define-public plzip
(package
(name "plzip")
(version "1.8")
(version "1.9")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/plzip/"
"plzip-" version ".tar.gz"))
(sha256
(base32 "04indil809qgfmz776imb3dnhkysh7zk28jcv3mw0ahl2lyaxbzd"))))
(base32 "19zinpx7hssl6r3vilpvq2s7wha3545xan8b0vcvsxnyipdx3n0l"))))
(build-system gnu-build-system)
(inputs
`(("lzlib" ,lzlib)))
@ -2075,13 +2116,13 @@ reading from and writing to ZIP archives. ")
(define-public zutils
(package
(name "zutils")
(version "1.9")
(version "1.10")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz"))
(sha256
(base32 "0y2wm8wqr1wi1b1fv45dn50njv4q81p6ifx0279ji1bq56qkrn2r"))))
(base32 "15dimqp8zlqaaa2l46r22srp1py38mlmn69ph1j5fmrd54w43m0d"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -2327,14 +2368,14 @@ to their original, binary CD format.")
(define-public tarlz
(package
(name "tarlz")
(version "0.17")
(version "0.19")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/tarlz/"
"tarlz-" version ".tar.lz"))
(sha256
(base32 "0gpdm6z9pdr5bn31kxg73wm686hhpb5pdf5782pbl5a4xqqhqj90"))))
(base32 "09xal55973ivzpaja93jcc1pfla8gb3vrk8dx7pj9qvvz5aynf9n"))))
(build-system gnu-build-system)
(native-inputs
`(("lzip" ,lzip)))

12
gnu/packages/connman.scm
View File

@ -1,5 +1,5 @@
;;; 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 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
@ -44,14 +44,14 @@
(define-public connman
(package
(name "connman")
(version "1.38")
(version "1.39")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/network/connman/"
"connman-" version ".tar.xz"))
(sha256
(base32 "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"))))
(base32 "1wqs307vjphhh73qbqk25zxhhqwn1mdk6bpzl5qcd4blkcbafqlz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -138,15 +138,15 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
(define-public cmst
(package
(name "cmst")
(version "2019.01.13")
(version "2020.11.01")
(source
(origin
(method url-fetch)
(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"))
(sha256
(base32 "1cn6xz2rpkf5kx5d6p2x2lh85zppjacp59l6gj3n6x12p90al1vl"))))
(base32 "0jn12wxwjznady6aniwmvahg1dj25p902sdwj0070biv6vx5c7dq"))))
(inputs
`(("qtbase" ,qtbase)))
(native-inputs

100
gnu/packages/cpp.scm
View File

@ -14,7 +14,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; 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>
;;;
;;; This file is part of GNU Guix.
@ -49,6 +49,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gcc)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind)
@ -63,6 +64,74 @@
#:use-module (gnu packages tls)
#: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
(package
(name "libzen")
@ -334,7 +403,8 @@ as ordering relation.")
(build-system cmake-build-system)
(arguments
'(#:configure-flags
(list (string-append "-DJSON_TestDataDirectory="
(list "-DJSON_MultipleHeaders=ON" ; For json_fwd.hpp.
(string-append "-DJSON_TestDataDirectory="
(assoc-ref %build-inputs "json_test_data")))
#:phases (modify-phases %standard-phases
;; XXX: When tests are enabled, the install phase will cause
@ -688,7 +758,7 @@ standard GNU style syntax for options.")
(define-public folly
(package
(name "folly")
(version "2020.10.05.00")
(version "2021.01.25.00")
(source (origin
(method git-fetch)
(uri (git-reference
@ -697,7 +767,7 @@ standard GNU style syntax for options.")
(file-name (git-file-name name version))
(sha256
(base32
"0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn"))))
"14dl1g6vf7mc90mcync5h2lp14fwcx8n9h91pmiq6rfgv1fjjrwz"))))
(build-system cmake-build-system)
(arguments
'(;; Tests must be explicitly enabled
@ -807,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.")
(home-page "https://tl.tartanllama.xyz/")
(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)))

1552
gnu/packages/cran.scm
View File

File diff suppressed because it is too large Load Diff

790
gnu/packages/crates-graphics.scm
View File

File diff suppressed because it is too large Load Diff

4
gnu/packages/crates-gtk.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
@ -773,7 +773,7 @@
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1.0)
(("rust-anyhow" ,rust-anyhow-1)
("rust-heck" ,rust-heck-0.3)
("rust-itertools" ,rust-itertools-0.9)
("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1)

9147
gnu/packages/crates-io.scm
View File

File diff suppressed because it is too large Load Diff

10
gnu/packages/crypto.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
@ -444,14 +444,14 @@ total number of shares generated.")
(define-public tomb
(package
(name "tomb")
(version "2.8")
(version "2.9")
(source (origin
(method url-fetch)
(uri (string-append "https://files.dyne.org/tomb/releases/"
"Tomb-" version ".tar.gz"))
(sha256
(base32
"0bggzzqmpfiknr76lyl8iszybrcpyqlbgiqk47fxq08h2b5ln1ic"))))
"136nfnpaz29hngwwnzrmc858gpnvnb977gf4ldbpapw1h1k3r8mk"))))
(build-system gnu-build-system)
(native-inputs `(("sudo" ,sudo))) ;presence needed for 'check' phase
(inputs
@ -717,7 +717,7 @@ data on your platform, so the seed itself will be as random as possible.
(define-public crypto++
(package
(name "crypto++")
(version "8.2.0")
(version "8.4.0")
(source (origin
(method url-fetch/zipbomb)
(uri (string-append "https://cryptopp.com/cryptopp"
@ -725,7 +725,7 @@ data on your platform, so the seed itself will be as random as possible.
".zip"))
(sha256
(base32
"0n40hlz5jkvlcp9vxrj0fsrcfp7dm0zmmv6h52dx3f8i5qjf5w03"))))
"16kvfm11xv7j9a3yykzysjgw38a9b7lnc5n5x5h82g395k6ybxf0"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags

72
gnu/packages/cups.scm
View File

@ -1,11 +1,11 @@
;;; 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, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; 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>
;;;
;;; This file is part of GNU Guix.
@ -47,6 +47,7 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages scanner)
#:use-module (gnu packages tls)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix download)
@ -57,6 +58,73 @@
#:use-module (srfi srfi-1)
#: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
(package
(name "cups-filters")

69
gnu/packages/curl.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Dale Mellor <guix-devel-0brg6b@rdmp.org>
;;;
@ -198,43 +198,68 @@ not offer a replacement for libcurl.")
(define-public guile-curl
(package
(name "guile-curl")
(version "0.6")
(version "0.7")
(source (origin
(method url-fetch)
(uri (string-append "http://www.lonelycactus.com/tarball/"
"guile_curl-" version ".tar.gz"))
(sha256
(base32
"1pxdhnk288ky6gkpad8i60m0p6404rdvls43lr1b5d3csrklyc70"))))
"1zk0ijx6bj212k0j0ma84cpvpvn0x6raaxnby3wdx3w4wnhnscn7"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append
`(#: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)
#:configure-flags (list (string-append
"--with-guilesitedir="
(assoc-ref %outputs "out")
"/share/guile/site/2.2")
"/share/guile/site/"
(target-guile-effective-version
(assoc-ref %build-inputs "guile")))
(string-append
"-with-guileextensiondir="
(assoc-ref %outputs "out")
"/lib/guile/2.2/extensions"))
"/lib/guile/"
(target-guile-effective-version
(assoc-ref %build-inputs "guile"))
"/extensions"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-undefined-references
(lambda* _
(substitute* "src/curl.scm"
;; The following #defines are missing from our curl package
;; and therefore result in the evaluation of undefined symbols.
((",CURLOPT_HAPROXYPROTOCOL") "#f")
((",CURLOPT_DISALLOW_USERNAME_IN_URL") "#f")
((",CURLOPT_TIMEVALUE_LARGE") "#f")
((",CURLOPT_DNS_SHUFFLE_ADDRESSES") "#f")
((",CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS") "#f"))))
(add-after 'install 'patch-extension-path
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(curl.scm (string-append
out "/share/guile/site/2.2/curl.scm"))
(curl.go (string-append
out "/lib/guile/2.2/site-ccache/curl.go"))
(ext (string-append out "/lib/guile/2.2/"
"extensions/libguile-curl")))
(substitute* curl.scm (("libguile-curl") ext))
;; The build system does not actually compile the Scheme module.
;; So we can compile it and put it in the right place in one go.
(invoke "guild" "compile" curl.scm "-o" curl.go)))))))
(let* ((out (assoc-ref outputs "out"))
(curl.scm (string-append
out "/share/guile/site/"
(target-guile-effective-version)
"/curl.scm"))
(curl.go (string-append
out "/lib/guile/"
(target-guile-effective-version)
"/site-ccache/curl.go"))
(ext (string-append out "/lib/guile/"
(target-guile-effective-version)
"/extensions/libguile-curl")))
(substitute* curl.scm (("libguile-curl") ext))
;; The build system does not actually compile the Scheme module.
;; So we can compile it and put it in the right place in one go.
(invoke "guild" "compile" curl.scm "-o" curl.go)))))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)
("guile" ,guile-2.2)))
("guile" ,guile-3.0)))
(home-page "http://www.lonelycactus.com/guile-curl.html")
(synopsis "Curl bindings for Guile")
(description "@code{guile-curl} is a project that has procedures that allow
@ -242,6 +267,14 @@ Guile to do client-side URL transfers, like requesting documents from HTTP or
FTP servers. It is based on the curl library.")
(license license:gpl3+)))
(define-public guile2.2-curl
(package
(inherit guile-curl)
(name "guile2.2-curl")
(inputs
`(("curl" ,curl)
("guile" ,guile-2.2)))))
(define-public curlpp
(package
(name "curlpp")

131
gnu/packages/databases.scm
View File

@ -23,7 +23,7 @@
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; 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 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
@ -37,7 +37,7 @@
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
@ -46,6 +46,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -85,15 +86,16 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages guile)
#:use-module (gnu packages time)
#:use-module (gnu packages golang)
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages language)
#:use-module (gnu packages libedit)
#:use-module (gnu packages libevent)
#: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 man)
#:use-module (gnu packages maths)
@ -110,8 +112,8 @@
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages rdf)
#:use-module (gnu packages readline)
@ -124,6 +126,7 @@
#:use-module (gnu packages tcl)
#:use-module (gnu packages terminals)
#:use-module (gnu packages textutils)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages web)
@ -1278,6 +1281,89 @@ pictures, sounds, or video.")
(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
(package
(name "python-pymysql")
@ -2163,14 +2249,14 @@ similar to BerkeleyDB, LevelDB, etc.")
(define-public redis
(package
(name "redis")
(version "6.0.9")
(version "6.0.10")
(source (origin
(method url-fetch)
(uri (string-append "http://download.redis.io/releases/redis-"
version".tar.gz"))
(sha256
(base32
"1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw"))
"1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr"))
(modules '((guix build utils)))
(snippet
;; Delete bundled jemalloc, as the package will use the libc one
@ -2215,14 +2301,14 @@ sets, bitmaps and hyperloglogs.")
(define-public kyotocabinet
(package
(name "kyotocabinet")
(version "1.2.78")
(version "1.2.79")
(source (origin
(method url-fetch)
(uri (string-append "https://fallabs.com/kyotocabinet/pkg/"
"kyotocabinet-" version ".tar.gz"))
(sha256
(base32
"1bxkf9kmcavq9rqridb8mvmrk3hj4447ffi24m2admsbm61n6k29"))))
"079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -3839,9 +3925,6 @@ implementation, along with tools for interoperability with pandas, NumPy, and
other traditional Python scientific computing packages.")
(license license:asl2.0)))
(define-public python2-pyarrow
(package-with-python2 python-pyarrow))
(define-public python-crate
(package
(name "python-crate")
@ -3927,6 +4010,7 @@ simultaneous database connections by using this framework.")
"--with-sqlite3"
(string-append "--with-sqlite-incdir=" sqlite "/include")
(string-append "--with-sqlite-libdir=" sqlite "/lib")))
#:tests? #f ; FIXME: Find why the tests get stuck forever.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
@ -3989,3 +4073,26 @@ The drivers officially supported by @code{libdbi} are:
PostreSQL, SQLite, ODBC and MySQL.")
(home-page "http://soci.sourceforge.net/")
(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/debian.scm
View File

@ -284,7 +284,7 @@ other apt sources typically provided by open source developers.")
(define-public dpkg
(package
(name "dpkg")
(version "1.20.5")
(version "1.20.7.1")
(source
(origin
(method git-fetch)
@ -294,7 +294,7 @@ other apt sources typically provided by open source developers.")
(file-name (git-file-name name version))
(sha256
(base32
"190q968g1vdz07byvfvc2gladhpq3yl765mfiacglyix3nkisy0j"))))
"0d1cppigwhpv0z1ac94gjalkzs3n0gjyi383pkhz1h9d4fvmadk9"))))
(build-system gnu-build-system)
(arguments
`(#:phases

57
gnu/packages/dictionaries.scm
View File

@ -7,6 +7,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Lu hux <luhux@outlook.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -32,6 +33,7 @@
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (guix build-system copy)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
@ -39,7 +41,10 @@
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@ -392,3 +397,55 @@ second on ordinary desktop computers) and, in spite of the errors, reasonably
intelligible and easily correctable.")
(license (list license:gpl2 ; main license
license:expat)))) ; utf8/*
(define-public sdcv
(package
(name "sdcv")
(version "0.5.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Dushistov/sdcv/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_TESTS=YES")
#:phases
(modify-phases %standard-phases
(add-after 'build 'build-lang
(lambda _
(invoke "make" "lang")))
(add-before 'check 'pre-check
(lambda _
(setenv "HOME" (getcwd))
#t))
(add-after 'unpack 'remove-jq-requirement
(lambda _
;; We don't want to bring in jq for one test.
(substitute* "tests/t_json"
(("jq") "echo"))
#t)))))
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)
("ncurses" ,ncurses)
("readline" ,readline)
("zlib" ,zlib)))
;; If you use Guix to package and install dictionary data,
;; you need this variable to load them.
(native-search-paths
(list (search-path-specification
(variable "STARDICT_DATA_DIR")
(files '("share/stardict/dic")))))
(home-page "https://dushistov.github.io/sdcv/")
(synopsis "Console version of StarDict")
(description "sdcv is simple text-based utility for work with dictionaries
in StarDict's format.")
(license license:gpl2+)))

8
gnu/packages/diffoscope.scm
View File

@ -72,7 +72,7 @@
(define-public diffoscope
(package
(name "diffoscope")
(version "162")
(version "165")
(source (origin
(method git-fetch)
(uri (git-reference
@ -81,7 +81,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"02wjjbmdbyqpyizw384j50bc2ar4g5m40amz9q102gqbw6sflwbf"))))
"0chi8drkxdwk7mlfgljij0nihnxp9pi5ybhqaq8rc4l1zl6srirb"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -225,7 +225,7 @@ install.")
(define-public reprotest
(package
(name "reprotest")
(version "0.7.15")
(version "0.7.16")
(source
(origin
(method git-fetch)
@ -235,7 +235,7 @@ install.")
(file-name (git-file-name name version))
(sha256
(base32
"12lc1pb9d5h3blrzzx9nbqqj5bi9x23yj31fxafmk37803rl8a0m"))))
"0s7gyixk868dw6yqxsb1sq24mgg9ilz5s2yidd5j0zhl683n7dw9"))))
(inputs
`(("python-debian" ,python-debian)
("python-distro" ,python-distro)

36
gnu/packages/digest.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Ryan Prior <rprior@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,9 +22,44 @@
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix utils)
#:use-module (ice-9 match))
(define-public wyhash
(package
(name "wyhash")
(version "5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wangyi-fudan/wyhash")
(commit (string-append "wyhash_v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "03ljs5iw9zrm3bydwggjvpwrcwmsd75h3dv1j4am4hw3h22cjdjc"))))
(build-system trivial-build-system) ;; source-only package
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((out (string-append (assoc-ref %outputs "out")))
(include (string-append out "/include"))
(doc (string-append out "/share/doc/" ,name "-" ,version))
(source (assoc-ref %build-inputs "source")))
(with-directory-excursion source
(install-file "wyhash.h" include)
(install-file "LICENSE" doc)
(install-file "README.md" doc))
#t))))
(home-page "https://github.com/wangyi-fudan/wyhash")
(synopsis "Embeddable hash function and random number generator")
(description "This package provides a portable hash function and random
number generator suitable for use in data structures. Provided by default in
Zig, V, and Nim programming language standard libraries.")
(license license:unlicense)))
(define-public xxhash
(package
(name "xxhash")

86
gnu/packages/disk.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@ -18,6 +18,7 @@
;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2021 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -89,6 +90,73 @@
#:use-module (guix packages)
#:use-module (guix utils))
(define-public bcache-tools
;; The 1.1 release is a year old and missing new features & documentation.
(let ((commit "096d205a9f1be8540cbc5a468c0da8203023de70")
(revision "0"))
(package
(name "bcache-tools")
(version (git-version "1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://git.kernel.org/pub/scm/"
"linux/kernel/git/colyli/bcache-tools.git"))
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0r0vwg4vacz5zgsafk360xn7gi2scy01c79mkmjrdyxjfij5z3iy"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no test suite
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "UDEVLIBDIR=" (assoc-ref %outputs "out")
"/lib/udev")
(string-append "DRACUTLIBDIR=" (assoc-ref %outputs "out")
"/lib/dracut")
(string-append "CC=" ,(cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'install 'fix-hard-coded-file-names
(lambda _
;; Some rules still hard-code /usr.
(substitute* "Makefile"
(("/usr") "${PREFIX}"))
#t))
(add-before 'install 'create-target-directories
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(for-each (lambda (dir)
(mkdir-p (string-append out dir)))
(list "/lib/udev/rules.d"
"/sbin"
"/share/man/man8"))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("util-linux:lib" ,util-linux "lib"))) ; libblkid
(home-page "https://bcache.evilpiepirate.org")
(synopsis "Tools for the Linux kernel block layer cache")
(description
"This package contains user-space utilities to create and inspect bcache
partitions. It's rather minimal as bcache is designed to work well without
configuration on any system.
Linux's @acronym{bcache, block layer cache} lets one or more fast block devices,
such as flash-based @acronym{SSDs, solid state drives}, to act as a cache for
one or more slower (and inexpensive) devices, such as hard disk drives or
redundant storage arrays. In fact, bcache intends to be a superior alternative
to battery-backed RAID controllers.
Bcache is designed around the performance characteristics of SSDs and tries to
minimize write inflation. It's file-system agnostic and does both write-through
and write-back caching.")
(license license:gpl2))))
(define-public udevil
(package
(name "udevil")
@ -237,14 +305,14 @@ tables, and it understands a variety of different formats.")
(define-public gptfdisk
(package
(name "gptfdisk")
(version "1.0.5")
(version "1.0.6")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
version "/gptfdisk-" version ".tar.gz"))
(sha256
(base32 "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f"))))
(base32 "1a4c2ss6n2s6x8v11h79jykh96y46apd6i838ka0ngx58gb53ifx"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)
@ -426,14 +494,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
(define-public gparted
(package
(name "gparted")
(version "1.1.0")
(version "1.2.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gparted/gparted/gparted-"
version "/gparted-" version ".tar.gz"))
(sha256
(base32 "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2"))))
(base32 "06f72hqx5jf2irzsmi7lgpxxj38ncixh0acb4307wyjd4mfp343c"))))
(build-system glib-or-gtk-build-system)
(arguments
;; Tests require access to paths outside the build container, such
@ -692,7 +760,7 @@ passphrases.")
(define-public ndctl
(package
(name "ndctl")
(version "71")
(version "71.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -701,7 +769,7 @@ passphrases.")
(file-name (git-file-name name version))
(sha256
(base32
"14vhldncflxgsam49ssn1x3h4m9xxw9dwyl748xajf1js33ph5av"))))
"1vi61bm9wyawklswh9mj9zdp28ar7r97qckwnhgiyila73fb3jx2"))))
(build-system gnu-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)
@ -793,7 +861,7 @@ to create devices with respective mappings for the ATARAID sets discovered.")
(define-public libblockdev
(package
(name "libblockdev")
(version "2.24")
(version "2.25")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/storaged-project/"
@ -801,7 +869,7 @@ to create devices with respective mappings for the ATARAID sets discovered.")
version "-1/libblockdev-" version ".tar.gz"))
(sha256
(base32
"0wq7624pnprvfzrf39bq1cybd9lqwawbdg5bm0cchlpgvdq7q86w"))))
"0s0nazkpzpn4an00qghjkk9n7gdm5a8dqfr5hfnlk5mk5lma8njm"))))
(build-system gnu-build-system)
(arguments
`(#:phases

5
gnu/packages/display-managers.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 L p R n d n <guix@lprndn.info>
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -57,7 +58,7 @@
(define-public sddm
(package
(name "sddm")
(version "0.18.1")
(version "0.19.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -66,7 +67,7 @@
"sddm-" version ".tar.xz"))
(sha256
(base32
"0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh"))))
"0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)

25
gnu/packages/dlang.scm
View File

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

33
gnu/packages/dns.scm
View File

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

163
gnu/packages/docbook.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -214,6 +215,168 @@ by no means limited to these applications.) This package provides XML DTDs.")
"This package provides XSL style sheets for DocBook.")
(license (x11-style "" "See 'COPYING' file."))))
(define-public docbook-dsssl
(package
(name "docbook-dsssl")
(version "1.79")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/docbook/"
name "/" version "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig"))))
(build-system trivial-build-system)
(outputs '("out" "doc"))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source"))
(dtd (string-append (assoc-ref %outputs "out")
"/sgml/dtd/docbook"))
(docbook-dsssl-doc (assoc-ref %build-inputs "docbook-dsssl-doc"))
(doc (assoc-ref %outputs "doc"))
(tar (assoc-ref %build-inputs "tar"))
(bzip2 (assoc-ref %build-inputs "bzip2")))
(setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin"))
(mkdir-p dtd)
(invoke "tar" "-xf" source "-C" dtd)
;; The doc output contains 1.4 MiB of HTML documentation.
(symlink docbook-dsssl-doc doc)))))
(inputs
`(("docbook-dsssl-doc" ,docbook-dsssl-doc)))
(native-inputs
`(("bzip2", bzip2)
("tar" ,tar)))
(home-page "https://docbook.org/")
(synopsis "DSSSL style sheets for DocBook")
(description "This package provides DSSSL style sheets for DocBook.")
(license (non-copyleft "file://README"))))
;;; Private variable, used as the 'doc' output of the docbook-dsssl package.
(define docbook-dsssl-doc
(package
(name "docbook-dsssl-doc")
(version "1.79")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/docbook/"
name "/" version "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1plp5ngc96pbna4rwglp9glcadnirbm3hlcjb4gjvq1f8biic9lz"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source"))
(docdir (string-append (assoc-ref %outputs "out")
"/share/doc/" "docbook-dsssl-" ,version))
(tar (assoc-ref %build-inputs "tar"))
(bzip2 (assoc-ref %build-inputs "bzip2")))
(setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin"))
(mkdir-p docdir)
;; Extract the "doc" subdirectory.
(invoke "tar" "-xf" source "--strip-components=2"
"--no-same-owner" "-C" docdir
(string-append "docbook-dsssl-" ,version "/doc"))))))
(native-inputs
`(("bzip2", bzip2)
("tar" ,tar)))
(home-page "https://docbook.org/")
(synopsis "DocBook DSSSL style sheets documentation")
(description "Documentation for the DocBook DSSSL style sheets.")
(license (non-copyleft "file://doc/LEGALNOTICE.htm"))))
(define-public docbook-sgml
(package
(name "docbook-sgml")
(version "4.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.oasis-open.org/docbook/sgml/"
version "/docbk41.zip"))
(sha256
(base32
"04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany"))))
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source"))
(iso-entities-dir (string-append
(assoc-ref %build-inputs "iso-8879-entities")))
(unzip (string-append (assoc-ref %build-inputs "unzip")
"/bin/unzip"))
(dtd (string-append (assoc-ref %outputs "out")
"/sgml/dtd/docbook")))
;; Extract the sources.
(mkdir-p dtd)
(chdir dtd)
(invoke unzip source)
;; Reference the ISO 8879 character entities.
;; e.g. "iso-lat1.gml" --> "<iso-entities-dir>/ISOlat1"
(substitute* "docbook.cat"
(("(.*ISO 8879.*)\"iso-(.*)\\.gml\"" _ head name)
(string-append head "\"" iso-entities-dir "/ISO" name "\"")))))))
(native-inputs
`(("unzip" ,unzip)))
(inputs
`(("iso-8879-entities" ,iso-8879-entities)))
(home-page "https://docbook.org")
(synopsis "DocBook SGML style sheets for document authoring")
(description "This package provides SGML style sheets for DocBook.")
(license (x11-style "" "See file headers."))))
(define-public docbook-sgml-3.1
(package
(inherit docbook-sgml)
(version "3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.oasis-open.org/docbook/sgml/"
version "/docbk31.zip"))
(sha256
(base32
"0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0"))))))
;;; Private package referenced by docbook-sgml.
(define iso-8879-entities
(package
(name "iso-8879-entities")
(version "0.0") ;no proper version
(source (origin
(method url-fetch)
(uri "http://www.oasis-open.org/cover/ISOEnts.zip")
(sha256
(base32
"1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"))))
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source"))
(unzip (string-append (assoc-ref %build-inputs "unzip")
"/bin/unzip"))
(out (string-append (assoc-ref %outputs "out"))))
(invoke unzip source "-d" out)))))
(native-inputs `(("unzip" ,unzip)))
(home-page "https://www.oasis-open.org/")
(synopsis "ISO 8879 character entities")
(description "ISO 8879 character entities that are typically used in
the in DocBook SGML DTDs.")
(license (x11-style "" "See file headers."))))
(define-public dblatex
(package
(name "dblatex")

7
gnu/packages/docker.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -51,7 +52,7 @@
;; Note - when changing Docker versions it is important to update the versions
;; of several associated packages (docker-libnetwork and go-sctp).
(define %docker-version "19.03.12")
(define %docker-version "19.03.13")
(define-public python-docker
(package
@ -319,7 +320,7 @@ built-in registry server of Docker.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1dj6llfcgcbpq9q9j6b4wb0anbn1g5wzm8ikq2lyhg54i3154m93"))
(base32 "1mg3jjisdbqrqrrhyslj3715lslial2kcgjrpprb6q63i52963gj"))
(patches
(search-patches "docker-fix-tests.patch"))))
(build-system gnu-build-system)
@ -610,7 +611,7 @@ provisioning etc.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1bynmnaykhh1m42v6bxparlpm9kajpqsvlrlwgz1b9ivcklf5ik6"))))
(base32 "0wm5x8b8jll78h2zzncfdpxj0y3gv571z0nd39f036wsy7r23dsi"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"

76
gnu/packages/documentation.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -313,32 +313,50 @@ local system.")
(license lgpl2.1+)))
(define-public zeal
(package
(name "zeal")
(version "0.6.1")
(home-page "https://github.com/zealdocs/zeal")
(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 "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v"))))
(build-system qt-build-system)
(arguments `(#:tests? #f)) ; no tests
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("libarchive" ,libarchive)
("sqlite" ,sqlite)
("qtbase" ,qtbase)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
("xcb-util-keyms" ,xcb-util-keysyms)))
(synopsis "Offline documentation browser inspired by Dash")
(description "Zeal is a simple offline documentation browser
(let ((commit "d3c5521c501d24050f578348ff1b9d68244b992c")
(revision "1"))
(package
(name "zeal")
(version (git-version "0.6.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zealdocs/zeal")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1ky2qi2cmjckc51lm3i28815ixgqdm36j7smixxr16jxpmbqs6sl"))))
(build-system qt-build-system)
(arguments
`(#:tests? #f ;no tests
#:phases
(modify-phases %standard-phases
(add-after 'wrap 'wrap-qt-process-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/zeal"))
(qt-process-path (string-append
(assoc-ref inputs "qtwebengine")
"/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin
`("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
#t))))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("libarchive" ,libarchive)
("sqlite" ,sqlite)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)
("qtquickcontrols" ,qtquickcontrols)
("qtx11extras" ,qtx11extras)
("xcb-util-keyms" ,xcb-util-keysyms)))
(home-page "https://zealdocs.org/")
(synopsis "Offline documentation browser inspired by Dash")
(description "Zeal is a simple offline documentation browser
inspired by Dash.")
(license gpl3+)))
(license gpl3+))))

6
gnu/packages/ebook.scm
View File

@ -6,7 +6,7 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
@ -443,7 +443,7 @@ following formats:
(define-public cozy
(package
(name "cozy")
(version "0.7.6")
(version "0.7.8")
(source
(origin
(method git-fetch)
@ -452,7 +452,7 @@ following formats:
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1pg0djhg4p32vxfwf6bfals31zf93m56fx1x4q5jhhdwmll7xl6w"))))
(base32 "0z2wj9g32aa5g9pw81q49iv1smb6yvlv9zs0vrzbx6mw8cj3c5d2"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t

18
gnu/packages/education.scm
View File

@ -2,8 +2,8 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
@ -230,8 +230,11 @@ Currently available boards include:
(sha256
(base32
"0d387b404j88gsv6kv0rb7wxr23v5g5vl6s5l7602x8pxf7slbbx"))
;; Apply patches in the order determined by Debian
(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)
(arguments
`(#:tests? #f ; packages has no tests
@ -256,8 +259,8 @@ Currently available boards include:
;; Recreate Makefile
(invoke "qmake")))))))
(inputs
`(("qt4" ,qt-4)
("sqlite" ,sqlite)))
`(("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia)))
(home-page "https://www.tipp10.com/")
(synopsis "Touch typing tutor")
(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
(package
(name "ktouch")
(version "20.12.0")
(version "20.12.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/ktouch-" version ".tar.xz"))
(sha256
(base32
"1s8pcwakx94aygfyjmyps5b43j4kv6dmfw7n12japcka2yfp9bi2"))))
(base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"))))
(build-system qt-build-system)
(arguments
`(#:phases

41
gnu/packages/efi.scm
View File

@ -1,7 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
;;; 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.
;;;
@ -61,6 +62,44 @@ environment presented by Intel's EFI.")
;; Distribution is allowed only when accepting all those licenses.
(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
(package
(name "sbsigntools")

11
gnu/packages/electronics.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -239,15 +240,16 @@ format support.")
(define-public pulseview
(package
(name "pulseview")
(version "0.4.1")
(version "0.4.2")
(source (origin
(method url-fetch)
(uri (string-append
"http://sigrok.org/download/source/pulseview/pulseview-"
"https://sigrok.org/download/source/pulseview/pulseview-"
version ".tar.gz"))
(sha256
(base32
"0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"))))
"1jxbpz1h3m1mgrxw74rnihj8vawgqdpf6c33cqqbyd8v7rxgfhph"))
(patches (search-patches "pulseview-qt515-compat.patch"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DENABLE_TESTS=y")
@ -262,7 +264,8 @@ format support.")
(rmdir "doc"))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
`(("boost" ,boost)
("glib" ,glib)

4
gnu/packages/elf.scm
View File

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

5
gnu/packages/elixir.scm
View File

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

1557
gnu/packages/emacs-xyz.scm
View File

File diff suppressed because it is too large Load Diff

22
gnu/packages/emacs.scm
View File

@ -1,5 +1,5 @@
;;; 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 © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
@ -195,17 +195,11 @@
(lambda* (#:key outputs #:allow-other-keys)
;; 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
;; able to track emacs back to emacs.desktop. The version is
;; accessed using using THIS-PACKAGE so it "just works" for
;; inherited Emacs packages of different versions.
;; able to track emacs back to emacs.desktop.
(with-directory-excursion (assoc-ref outputs "out")
(copy-file (string-append
"bin/emacs-"
,(let ((this-version (package-version this-package)))
(or (false-if-exception
(version-major+minor+point this-version))
(version-major+minor this-version))))
"bin/emacs")
(copy-file
(car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
"bin/emacs")
#t)))
(add-before 'reset-gzip-timestamps 'make-compressed-files-writable
;; The 'reset-gzip-timestamps phase will throw a permission error
@ -314,8 +308,8 @@ languages.")
(files '("share/info"))))))))
(define-public emacs-next-pgtk
(let ((commit "d46a223d8595e8edb67c6361033625797503cacf")
(revision "0"))
(let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2")
(revision "1"))
(package/inherit emacs-next
(name "emacs-next-pgtk")
(version (git-version "28.0.50" revision commit))
@ -328,7 +322,7 @@ languages.")
(file-name (git-file-name name version))
(sha256
(base32
"1fhkgqsdpy3qkf8wyjvavnfyh8byxh0h80n0448rkg9k0lrkl4wf"))))
"07hgfqh965zmra0rbmnf63p3lsinpv5hn5payqcrjx25pl75xnaf"))))
(arguments
(substitute-keyword-arguments (package-arguments emacs-next)
((#:configure-flags flags ''())

27
gnu/packages/embedded.scm
View File

@ -7,6 +7,7 @@
;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@ -54,6 +55,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages swig)
#:use-module (gnu packages texinfo)
@ -1520,3 +1522,28 @@ families, plus many of their variants.")
license:lgpl3+
license:public-domain
license:zlib))))
(define-public python-psptool
(package
(name "python-psptool")
(version "2.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "psptool" version))
(sha256
(base32
"1kx0xpfx67m4zclk4gs97wiwjms8i7z4f6b6m68y8sfgpshy4rf3"))
(modules '((guix build utils)))
(snippet
'(begin
;; IPython is not used by the package at all
(substitute* '("psptool/directory.py" "psptool/entry.py")
(("from IPython.*") ""))))))
(build-system python-build-system)
(propagated-inputs
`(("python-cryptography" ,python-cryptography)
("python-prettytable" ,python-prettytable)))
(home-page "https://github.com/PSPReverse/psptool")
(synopsis "Tool for dealing with AMD binary blobs")
(description "PSPTool is a tool for dealing with AMD binary blobs")
(license license:gpl3+)))

14
gnu/packages/emulators.scm
View File

@ -6,8 +6,8 @@
;;; Copyright © 2015, 2018 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
@ -133,8 +133,8 @@
;; Building from recent Git because the official 5.0 release no longer builds.
(define-public dolphin-emu
(let ((commit "a9745400ec5cea7e55d94955afbdc44d1a4982d1")
(revision "7"))
(let ((commit "3e4bf57c696ed1e4f465075ae311653de2cd33b0")
(revision "8"))
(package
(name "dolphin-emu")
(version (git-version "5.0" revision commit))
@ -160,7 +160,7 @@
#t))
(sha256
(base32
"0ic08ii4vlqlmk2wkfc99jiy6nji2wfq56r7slj23wgvhznnaabk"))))
"0mscspwd4k635b0857253ic55idlv2jvjdljssbryf8kd1ikwlhs"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f
@ -1552,7 +1552,7 @@ This is a part of the TiLP project.")
(define-public mame
(package
(name "mame")
(version "0.226")
(version "0.228")
(source
(origin
(method git-fetch)
@ -1561,7 +1561,7 @@ This is a part of the TiLP project.")
(commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version))
(sha256
(base32 "1yfns42rk1l0qprj5ksj9fqsgqpa23xnzxf29r4434p4n18bb77v"))
(base32 "1xqd0b8xz9bc6ks9qbnrm7kkjcr81l0ksisvflr6gr6lxg2268xz"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries.

240
gnu/packages/engineering.scm
View File

@ -15,12 +15,12 @@
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; 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 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -50,6 +50,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system ant)
#:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
@ -1214,14 +1215,14 @@ use on a given system.")
(define-public libredwg
(package
(name "libredwg")
(version "0.11.1")
(version "0.12")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/libredwg/libredwg-"
version ".tar.xz"))
(sha256
(base32 "1xx6y6ckm4mzqln8y8lqf5frcn2b32ypc0d0h9dzpz6363zh7pdn"))))
(base32 "0z5algzi3alq166885y0qyj2gnc7gc6vhnz7nw0kwc0d236p6md8"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-bindings")))
@ -1524,7 +1525,7 @@ bindings for Python, Java, OCaml and more.")
(define-public radare2
(package
(name "radare2")
(version "4.4.0")
(version "5.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1532,7 +1533,7 @@ bindings for Python, Java, OCaml and more.")
(commit version)))
(sha256
(base32
"0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"))
"0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@ -2367,7 +2368,7 @@ simulation.")
(define-public cutter
(package
(name "cutter")
(version "1.10.3")
(version "1.12.0")
(source
(origin
(method git-fetch)
@ -2376,7 +2377,7 @@ simulation.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk"))))
(base32 "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -2513,122 +2514,131 @@ full programmatic control over your models.")
(home-page "https://www.openscad.org/")
(license license:gpl2+)))
(define-public freecad
(define-public emacs-scad-mode
(package
(name "freecad")
(version "0.18.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/FreeCAD/FreeCAD")
(commit version)))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix build with Python 3.8, see
;; <https://tracker.freecadweb.org/view.php?id=4143>.
(substitute* "src/Base/swigpyrun.inl"
(("PyObject \\*modules = interp->modules;")
"PyObject *modules = PyEval_GetBuiltins();"))
#t))
(file-name (git-file-name name version))
(sha256
(base32
"0r31jzzkamf76l19fb175hhv48irk06fpi8ldxdlr31w8c1ix4aa"))))
(build-system qt-build-system)
(native-inputs
`(("doxygen" ,doxygen)
("graphviz" ,graphviz)
("qttools" ,qttools)
("pkg-config" ,pkg-config)
("swig" ,swig)))
(inputs
`(("boost" ,boost)
("coin3D" ,coin3D)
("eigen" ,eigen)
("freetype" ,freetype)
("glew" ,glew)
("hdf5" ,hdf5-1.10)
("libarea" ,libarea)
("libmedfile" ,libmedfile)
("libspnav" ,libspnav)
("libxi" ,libxi)
("libxmu" ,libxmu)
("openmpi" ,openmpi)
("opencascade-occt" ,opencascade-occt)
("python-matplotlib" ,python-matplotlib)
("python-pyside-2" ,python-pyside-2)
("python-pyside-2-tools" ,python-pyside-2-tools)
("python-shiboken-2" ,python-shiboken-2)
("python-wrapper" ,python-wrapper)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns)
;; qtwebkit is optional. We remove it currently, because it takes
;; much time to compile and substitutes are often unavailable
;;("qtwebkit" ,qtwebkit)
("tbb" ,tbb)
("vtk" ,vtk)
("xerces-c" ,xerces-c)
("zlib" ,zlib)))
(inherit openscad)
(name "emacs-scad-mode")
(native-inputs '())
(inputs '())
(build-system emacs-build-system)
(arguments
`(#:tests? #f
#:configure-flags
(list
"-DBUILD_QT5=ON"
(string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")
(string-append "-DPYSIDE2UICBINARY="
(assoc-ref %build-inputs "python-pyside-2-tools")
"/bin/uic")
(string-append "-DPYSIDE2RCCBINARY="
(assoc-ref %build-inputs "python-pyside-2-tools")
"/bin/rcc")
"-DPYSIDE_LIBRARY=PySide2::pyside2"
(string-append
"-DPYSIDE_INCLUDE_DIR="
(assoc-ref %build-inputs "python-pyside-2") "/include;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
(string-append "-DSHIBOKEN_INCLUDE_DIR="
(assoc-ref %build-inputs "python-shiboken-2")
"/include/shiboken2"))
#:phases
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'restore-pythonpath
(add-after 'unpack 'chdir-elisp
;; Elisp directory is not in root of the source.
(lambda _
(substitute* "src/Main/MainGui.cpp"
(("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
#t))
(add-after 'install 'wrap-pythonpath
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/FreeCAD")
(list "PYTHONPATH"
'prefix (list (getenv "PYTHONPATH")))))
(chdir "contrib")
#t)))))
(home-page "https://www.freecadweb.org/")
(synopsis "Your Own 3D Parametric Modeler")
(description
"FreeCAD is a general purpose feature-based, parametric 3D modeler for
(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
(let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858")
(revision "1"))
(package
(name "freecad")
(version (git-version "0.18.5" revision commit-ref))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/FreeCAD/FreeCAD")
(commit commit-ref)))
(file-name (git-file-name name version))
(sha256
(base32
"16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2"))))
(build-system qt-build-system)
(native-inputs
`(("doxygen" ,doxygen)
("graphviz" ,graphviz)
("qttools" ,qttools)
("pkg-config" ,pkg-config)
("python-pyside-2-tools" ,python-pyside-2-tools)
("swig" ,swig)))
(inputs
`(("boost" ,boost)
("coin3D" ,coin3D)
("eigen" ,eigen)
("freetype" ,freetype)
("glew" ,glew)
("hdf5" ,hdf5-1.10)
("libarea" ,libarea)
("libmedfile" ,libmedfile)
("libspnav" ,libspnav)
("libxi" ,libxi)
("libxmu" ,libxmu)
("openmpi" ,openmpi)
("opencascade-occt" ,opencascade-occt)
("python-matplotlib" ,python-matplotlib)
("python-pyside-2" ,python-pyside-2)
("python-shiboken-2" ,python-shiboken-2)
("python-pivy" ,python-pivy)
("python-wrapper" ,python-wrapper)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns)
("qtwebkit" ,qtwebkit)
("tbb" ,tbb)
("vtk" ,vtk)
("xerces-c" ,xerces-c)
("zlib" ,zlib)))
(arguments
`(#:tests? #f
#:configure-flags
(list
"-DBUILD_QT5=ON"
(string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")
(string-append "-DPYSIDE2UICBINARY="
(assoc-ref %build-inputs "python-pyside-2-tools")
"/bin/uic")
(string-append "-DPYSIDE2RCCBINARY="
(assoc-ref %build-inputs "python-pyside-2-tools")
"/bin/rcc")
"-DPYSIDE_LIBRARY=PySide2::pyside2"
(string-append
"-DPYSIDE_INCLUDE_DIR="
(assoc-ref %build-inputs "python-pyside-2") "/include;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
(string-append "-DSHIBOKEN_INCLUDE_DIR="
(assoc-ref %build-inputs "python-shiboken-2")
"/include/shiboken2"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'restore-pythonpath
(lambda _
(substitute* "src/Main/MainGui.cpp"
(("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
#t))
(add-after 'install 'wrap-pythonpath
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/FreeCAD")
(list "PYTHONPATH"
'prefix (list (getenv "PYTHONPATH")))))
#t)))))
(home-page "https://www.freecadweb.org/")
(synopsis "Your Own 3D Parametric Modeler")
(description
"FreeCAD is a general purpose feature-based, parametric 3D modeler for
CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and
product design but also fits a wider range of uses in engineering, such as
architecture or other engineering specialties. It is 100% Open Source (LGPL2+
license) and extremely modular, allowing for very advanced extension and
customization.")
(license
(list
license:lgpl2.1+
license:lgpl2.0+
license:gpl3+
license:bsd-3))))
(license
(list
license:lgpl2.1+
license:lgpl2.0+
license:gpl3+
license:bsd-3)))))
(define-public libmedfile
(package

19
gnu/packages/enlightenment.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
@ -198,7 +198,7 @@ removable devices or support for multimedia.")
(define-public terminology
(package
(name "terminology")
(version "1.8.1")
(version "1.9.0")
(source (origin
(method url-fetch)
(uri
@ -206,7 +206,7 @@ removable devices or support for multimedia.")
"terminology/terminology-" version ".tar.xz"))
(sha256
(base32
"1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4"))
"0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz"))
(modules '((guix build utils)))
;; Remove the bundled fonts.
(snippet
@ -217,10 +217,11 @@ removable devices or support for multimedia.")
#t))))
(build-system meson-build-system)
(arguments
`(#:configure-flags (list "-Dtests=true"
(string-append "-Dedje-cc="
(assoc-ref %build-inputs "efl")
"/bin/edje_cc"))
`(#:configure-flags
(let ((efl (assoc-ref %build-inputs "efl")))
(list "-Dtests=true"
(string-append "-Dedje-cc=" efl "/bin/edje_cc")
(string-append "-Deet=" efl "/bin/eet")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-home-directory
@ -566,14 +567,14 @@ directories.
(define-public evisum
(package
(name "evisum")
(version "0.5.7")
(version "0.5.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.enlightenment.org/rel/apps/"
"evisum/evisum-" version ".tar.xz"))
(sha256
(base32 "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd"))))
(base32 "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx"))))
(build-system meson-build-system)
(arguments
'(#:tests? #f)) ; no tests

15
gnu/packages/erlang.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Nikita <nikita@n0.is>
;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee>
;;;
;;; This file is part of GNU Guix.
;;;
@ -40,7 +41,7 @@
(define-public erlang
(package
(name "erlang")
(version "21.3.8.13")
(version "23.2.1")
(source (origin
(method git-fetch)
;; The tarball from http://erlang.org/download contains many
@ -52,7 +53,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj"))
"1p3lw4bcm2dph3pf1h4i0d9pzrcfr83r0iadqanxkwbmm1bl11pm"))
(patches (search-patches "erlang-man-path.patch"))))
(build-system gnu-build-system)
(native-inputs
@ -68,7 +69,7 @@
(version-major+minor version) ".tar.gz"))
(sha256
(base32
"0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm"))))))
"0rq0rw68f02vckgdiwmvx8bvyv00l81s27cq59i3h79j9prfal2n"))))))
(inputs
`(("ncurses" ,ncurses)
("openssl" ,openssl)
@ -180,6 +181,14 @@
(lambda _
(invoke "./otp_build" "autoconf")
#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
;; This only works after install.
(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/>.
(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 download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system qt)
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#:use-module (gnu packages enchant)
@ -33,14 +35,69 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages web)
#: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
(package

102
gnu/packages/fcitx5.scm
View File

@ -51,7 +51,7 @@
(define-public xcb-imdkit
(package
(name "xcb-imdkit")
(version "1.0.1")
(version "1.0.2")
(source
(origin
(method url-fetch)
@ -59,7 +59,7 @@
"https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-"
version ".tar.xz"))
(sha256
(base32 "1qgbbp8y8ci7haz99vgbrgpjsbrwwyjianyhdvxcirnbm5bybvmz"))
(base32 "16f7jdnrr8lrll7qvnj0gh3gwzgn5idfsc9rwi1gp1n2mnjrs7w0"))
(modules '((guix build utils)))
(snippet
'(begin
@ -86,7 +86,7 @@ client.")
(define-public fcitx5
(package
(name "fcitx5")
(version "5.0.3")
(version "5.0.4")
(source
(origin
(method url-fetch)
@ -94,7 +94,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
version "_dict.tar.xz"))
(sha256
(base32 "06zkb33m2rnhg385iy79n3r4svz5jbav74di61xqa3lhbv7534s3"))))
(base32 "14pqbjbdc3b5xlycm92gs1rgkmpykfnyls3gfr608902lk2lw5as"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -146,7 +146,7 @@ client.")
(define-public fcitx5-lua
(package
(name "fcitx5-lua")
(version "5.0.1")
(version "5.0.2")
(source
(origin
(method url-fetch)
@ -154,7 +154,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
version ".tar.xz"))
(sha256
(base32 "177mj56j8yrl79hvk7bbrifvm137np23pwalv83ibgk4l51z92hf"))))
(base32 "0y5yc9102bz681f4wj6xqjxmfdmrshz3fhf39pa61718hkyy9lih"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
@ -171,14 +171,14 @@ client.")
(define-public libime
(package
(name "libime")
(version "1.0.2")
(version "1.0.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
version "_dict.tar.xz"))
(sha256
(base32 "006pncby7p6h3rnicckzjwi6jzsrqiqbj6p9bpic80lanlllgw31"))))
(base32 "1gi9ylqha9x3dhjsa2i7x9wh2g9vgqkkfr6s1facs2ky65vgvdrv"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
@ -196,7 +196,7 @@ editors.")
(define-public fcitx5-gtk
(package
(name "fcitx5-gtk")
(version "5.0.1")
(version "5.0.3")
(source
(origin
(method url-fetch)
@ -204,7 +204,7 @@ editors.")
"/fcitx5-gtk/fcitx5-gtk-"
version ".tar.xz"))
(sha256
(base32 "0h53liraqc5nz4nyi3ixdfdw3zzkdcsiff7j25acc3gmaa5gyij7"))))
(base32 "18bwwj9a5v82c6ssc8560hd8vwykakvg6sfijwdb5jswk9mafvgj"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;No test
@ -212,7 +212,9 @@ editors.")
(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR="
%output "/share/gir-1.0")
(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
(modify-phases %standard-phases
(add-before 'configure 'patch-install-prefix
@ -247,7 +249,7 @@ for GTK+2/GTK+3 application.")
(define-public fcitx5-qt
(package
(name "fcitx5-qt")
(version "5.0.1")
(version "5.0.2")
(source
(origin
(method url-fetch)
@ -255,7 +257,7 @@ for GTK+2/GTK+3 application.")
"/fcitx5-qt/fcitx5-qt-"
version ".tar.xz"))
(sha256
(base32 "0ilhb4yw9k3m1c4fidnv3nd5dgm9xxds11dgdys6gswjjnmcgqqm"))))
(base32 "15rn111mrp6lcgm0ka3vb6a6qwkv6kqkqn563wsm49n16iy1dhqj"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -282,7 +284,7 @@ for Qt based application.")
(define-public fcitx5-chinese-addons
(package
(name "fcitx5-chinese-addons")
(version "5.0.2")
(version "5.0.3")
(source
(origin
(method url-fetch)
@ -290,7 +292,7 @@ for Qt based application.")
"/fcitx5-chinese-addons/fcitx5-chinese-addons-"
version "_dict.tar.xz"))
(sha256
(base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp"))))
(base32 "1kmzbllk0g86m2z3piwn9j84ihxixyxzv7rzj832xfvwqgk7gixk"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -342,42 +344,42 @@ including input methods previous bundled inside Fcitx 4:
(define-public fcitx5-configtool
(package
(name "fcitx5-configtool")
(version "5.0.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://download.fcitx-im.org/fcitx5"
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
(sha256
(base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
;; KDE is currently not working on Guix, KCM supports doesn't make sense.
'("-DENABLE_KCM=Off")))
(inputs
`(("fcitx5" ,fcitx5)
("fcitx5-qt" ,fcitx5-qt)
("qtbase" ,qtbase)
("qtx11extras" ,qtx11extras)
("kitemviews" ,kitemviews)
("kwidgetsaddons" ,kwidgetsaddons)
("libx11" ,libx11)
("xkeyboard-config" ,xkeyboard-config)
("libxkbfile" ,libxkbfile)
("gettext" ,gettext-minimal)
("iso-codes" ,iso-codes)))
(native-inputs
`(("gcc" ,gcc-9)
("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/fcitx/fcitx5-configtool")
(synopsis "Graphical configuration tool for Fcitx 5")
(description "Fcitx5-configtool is a graphical configuration tool
(name "fcitx5-configtool")
(version "5.0.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://download.fcitx-im.org/fcitx5"
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
(sha256
(base32 "0rpk3yn572pcr29jak63x84g0qgj8hj011aw8gmxjah9311nxhpb"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
;; KDE is currently not working on Guix, KCM supports doesn't make sense.
'("-DENABLE_KCM=Off")))
(inputs
`(("fcitx5" ,fcitx5)
("fcitx5-qt" ,fcitx5-qt)
("qtbase" ,qtbase)
("qtx11extras" ,qtx11extras)
("kitemviews" ,kitemviews)
("kwidgetsaddons" ,kwidgetsaddons)
("libx11" ,libx11)
("xkeyboard-config" ,xkeyboard-config)
("libxkbfile" ,libxkbfile)
("gettext" ,gettext-minimal)
("iso-codes" ,iso-codes)))
(native-inputs
`(("gcc" ,gcc-9)
("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/fcitx/fcitx5-configtool")
(synopsis "Graphical configuration tool for Fcitx 5")
(description "Fcitx5-configtool is a graphical configuration tool
to manage different input methods in Fcitx 5.")
(license license:gpl2+)))
(license license:gpl2+)))
(define-public fcitx5-material-color-theme
(package

53
gnu/packages/file-systems.scm
View File

@ -1,11 +1,12 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; 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 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021 raid5atemyhoemwork <raid5atemyhomework@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -330,8 +331,8 @@ from a mounted file system.")
(license license:gpl2+)))
(define-public bcachefs-tools
(let ((commit "db931a4571817d7d61be6bce306f1d42f7cd3398")
(revision "2"))
(let ((commit "612f6b9ab73c7f46e0254355b707d494a8ad9270")
(revision "3"))
(package
(name "bcachefs-tools")
(version (git-version "0.1" revision commit))
@ -343,7 +344,7 @@ from a mounted file system.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1zl8lda6ni6rhsmsng6smrcjihy2irjf03h1m7nvkqmkhq44j80s"))))
(base32 "1a62wkv1i6pg5k1cjw7fzn933cbz8cp8y40cdpfd8rxjx0wg2szb"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@ -626,7 +627,7 @@ from the jfsutils package. It is meant to be used in initrds.")
(define-public disorderfs
(package
(name "disorderfs")
(version "0.5.10")
(version "0.5.11")
(source
(origin
(method git-fetch)
@ -636,7 +637,7 @@ from the jfsutils package. It is meant to be used in initrds.")
(file-name (git-file-name name version))
(sha256
(base32
"0lsisx5118k0qk0b5klbxl03rvhycnznyfx05yxmjawh85bfhmlh"))))
"1pnrj0h8sgqwgsc18vz3fkqsp6vhigdbi75vdj0si1r6wgslnr7z"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -846,7 +847,7 @@ APFS.")
(define-public zfs
(package
(name "zfs")
(version "0.8.5")
(version "2.0.2")
(outputs '("out" "module" "src"))
(source
(origin
@ -855,7 +856,7 @@ APFS.")
"/download/zfs-" version
"/zfs-" version ".tar.gz"))
(sha256
(base32 "0gfdnynmsxbhi97q73smrgmcw1k8zmlr1hgljfn38sk0kimivd6v"))))
(base32 "090b2pp0cgzkjcnbjf8ms28dah5dff8s04q31z62czapwiy0drdx"))))
(build-system linux-module-build-system)
(arguments
`(;; The ZFS kernel module should not be downloaded since the license
@ -884,19 +885,33 @@ APFS.")
(let ((out (assoc-ref outputs "out"))
(src (assoc-ref outputs "src"))
(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"
;; This is not configurable nor is its hard-coded /usr prefix.
((" initramfs") ""))
(substitute* "module/zfs/zfs_ctldir.c"
(substitute* "module/os/linux/zfs/zfs_ctldir.c"
(("/usr/bin/env\", \"umount")
(string-append util-linux "/bin/umount\", \"-n"))
(("/usr/bin/env\", \"mount")
(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/umount") (string-append util-linux "/bin/umount")))
(substitute* "lib/libshare/nfs.c"
(substitute* "lib/libshare/os/linux/nfs.c"
(("/usr/sbin/exportfs")
(string-append nfs-utils "/sbin/exportfs")))
(substitute* "config/zfs-build.m4"
@ -914,7 +929,9 @@ APFS.")
(substitute* "contrib/pyzfs/Makefile.in"
((".*install-lib.*") ""))
(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))
(replace 'build
(lambda _ (invoke "make")))
@ -938,13 +955,15 @@ APFS.")
("pkg-config" ,pkg-config)))
(inputs
`(("eudev" ,eudev)
("kmod-runtime" ,kmod)
("libaio" ,libaio)
("libtirpc" ,libtirpc)
("nfs-utils" ,nfs-utils)
("openssl" ,openssl)
("python" ,python)
("python-cffi" ,python-cffi)
("util-linux" ,util-linux "lib")
("util-linux" ,util-linux)
("util-linux:lib" ,util-linux "lib")
("zlib" ,zlib)))
(home-page "https://zfsonlinux.org/")
(synopsis "Native ZFS on Linux")
@ -1084,14 +1103,14 @@ Dropbox API v2.")
(define-public dbxfs
(package
(name "dbxfs")
(version "1.0.48")
(version "1.0.50")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dbxfs" version))
(sha256
(base32
"07q7dgqaqqyapjl9r4lqydflrgx4dh84c1qsb0jvfmqj3i8887ak"))
"01zvk862ybz12270q0r2l1i7kdj30ib2gxrlxmwvi19b2fkf39na"))
(patches (search-patches "dbxfs-remove-sentry-sdk.patch"))))
(build-system python-build-system)
(arguments

77
gnu/packages/finance.scm
View File

@ -11,7 +11,7 @@
;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019 Sebastian Schott <sschott@mailbox.org>
@ -92,6 +92,7 @@
#:use-module (gnu packages popt)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
@ -632,7 +633,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
;; the system's dynamically linked library.
(package
(name "monero")
(version "0.17.1.7")
(version "0.17.1.9")
(source
(origin
(method git-fetch)
@ -652,7 +653,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
"external/unbound"))
#t))
(sha256
(base32 "1fdw4i4rw87yz3hz4yc1gdw0gr2mmf9038xaw2l4rrk5y50phjp4"))))
(base32 "0jqss4csvkcrhrmaa3vrnyv6yiwqpbfw7037clx9xcfm4qrrfiwy"))))
(build-system cmake-build-system)
(native-inputs
`(("doxygen" ,doxygen)
@ -742,16 +743,24 @@ the Monero command line client and daemon.")
(define-public monero-gui
(package
(name "monero-gui")
(version "0.17.1.7")
(version "0.17.1.9")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/monero-project/monero-gui")
(commit (string-append "v" version))))
(commit (string-append "v" version))
(recursive? #t)))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete bundled monero sources, we already have them.
;; See the 'extract-monero-sources' phase.
(delete-file-recursively "monero")
#t))
(sha256
(base32 "1dd2ddkxh9ynxnscysl46hj4dm063h1v13fnyah69am26qzzbby4"))))
(base32 "0vpvpvsbbj547yir15g84qy9l9lwbip795zlliz79i7d66l23b1w"))))
(build-system qt-build-system)
(native-inputs
`(,@(package-native-inputs monero)
@ -780,6 +789,7 @@ the Monero command line client and daemon.")
;; Some of the monero package source code is required
;; to build the GUI.
(lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "monero")
(invoke "tar" "-xv" "--strip-components=1"
"-C" "monero"
"-f" (assoc-ref inputs "monero-source"))))
@ -1373,56 +1383,6 @@ following three utilities are included with the library:
@end enumerate")
(license license:gpl2+)))
(define-public opensp
(package
(name "opensp")
(version "1.5.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/openjade/opensp/"
version "/OpenSP-" version ".tar.gz"))
(sha256
(base32
"1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)))
(inputs
`(("docbook-xml" ,docbook-xml-4.1.2)
("docbook-xsl" ,docbook-xsl)
("xmlto" ,xmlto)))
(arguments
`(;; TODO: Fix and enable tests.
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook"))
(xsldoc (string-append (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl))))
(substitute* (find-files "docsrc" "\\.xml$")
(("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc)
(("http://.*/docbookx\\.dtd")
(string-append xmldoc "/docbookx.dtd")))
;; Directly pass the path to the stylesheet to xmlto.
(substitute* "docsrc/Makefile.in"
(("\\$\\(XMLTO\\)")
(string-append "$(XMLTO) -x " xsldoc
"/manpages/docbook.xsl")))
#t))))))
(home-page "http://openjade.sourceforge.net/")
(synopsis "Suite of SGML/XML processing tools")
(description "OpenSP is an object-oriented toolkit for SGML parsing and
entity management.")
(license
;; expat license with added clause regarding advertising
(license:non-copyleft
"file://COPYING"
"See COPYING in the distribution."))))
(define-public bitcoin-unlimited
(package
(name "bitcoin-unlimited")
@ -1476,6 +1436,11 @@ entity management.")
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda _
;; Fix data specific test failure
;; https://reviews.bitcoinabc.org/rABC67bbd3d0aaee2952ff1cb5da51d1fd0b50c2b63a
(substitute* "src/test/rpc_tests.cpp"
(("1607731200") "9907731200"))
;; Disable utilprocess_tests because it never ends.
;; It looks like it tries to start /bin/sleep and waits until it
;; is in the list of running processes, but /bin/sleep doesn't

78
gnu/packages/firmware.scm
View File

@ -464,7 +464,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(define* (make-arm-trusted-firmware platform #:optional (arch "aarch64"))
(package
(name (string-append "arm-trusted-firmware-" platform))
(version "2.3")
(version "2.4")
(source
(origin
(method git-fetch)
@ -475,7 +475,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(file-name (git-file-name "arm-trusted-firmware" version))
(sha256
(base32
"113mcf1hwwl0i90cqh08lywxs1bfbg0nwqibay9wlkmx1a5v0bnj"))))
"12k0n79j156bdzqws18kpbli04kn00nh6dy42pjv6gakqrkx9px3"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -512,17 +512,18 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(native-inputs
`(,@(if (and (not (string-prefix? "aarch64" (%current-system)))
(string-prefix? "aarch64" arch))
;; gcc-7 since it is used for u-boot, which needs gcc-7.
`(("cross-gcc" ,(cross-gcc "aarch64-linux-gnu" #:xgcc gcc-7))
;; Needs newer gcc version for some targets
`(("cross-gcc" ,(cross-gcc "aarch64-linux-gnu" #:xgcc gcc-9))
("cross-binutils" ,(cross-binutils "aarch64-linux-gnu")))
'())
,@(if (and (not (string-prefix? "armhf" (%current-system)))
(string-prefix? "armhf" arch))
;; gcc-7 since it is used for u-boot, which needs gcc-7.
`(("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf" #:xgcc gcc-7))
;; Needs newer gcc version for some targets
`(("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf" #:xgcc gcc-9))
("cross-binutils" ,(cross-binutils "arm-linux-gnueabihf")))
'())
))
;; Needs newer gcc version for some targets
("gcc" ,gcc-9)))
(home-page "https://www.trustedfirmware.org/")
(synopsis "Implementation of \"secure world software\"")
(description
@ -549,26 +550,6 @@ such as:
(define-public arm-trusted-firmware-rk3328
(make-arm-trusted-firmware "rk3328"))
(define-public arm-trusted-firmware-puma-rk3399
(let ((base (make-arm-trusted-firmware "rk3399"))
;; Vendor's arm trusted firmware branch hasn't been upstreamed yet.
(commit "d71e6d83612df896774ec4c03d49500312d2c324")
(revision "1"))
(package
(inherit base)
(name "arm-trusted-firmware-puma-rk3399")
(version (git-version "1.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.theobroma-systems.com/arm-trusted-firmware.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0vqhwqqh8h9qlkpybg2v94911091c1418bc4pnzq5fd7zf0fjkf8")))))))
(define-public arm-trusted-firmware-rk3399
(let ((base (make-arm-trusted-firmware "rk3399")))
(package
@ -578,46 +559,3 @@ such as:
`(("cross32-gcc" ,(cross-gcc "arm-none-eabi"))
("cross32-binutils", (cross-binutils "arm-none-eabi"))
,@(package-native-inputs base))))))
(define-public rk3399-cortex-m0
(package
(name "rk3399-cortex-m0")
(version "1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.theobroma-systems.com/rk3399-cortex-m0.git")
(commit (string-append "v" version))))
(file-name (git-file-name "rk3399-cortex-m0" version))
(sha256
(base32
"02wz1vkf4j3zc8rx289z76xhrf71jhb2p05lvmygky393a9gjh9w"))))
(home-page "https://git.theobroma-systems.com/rk3399-cortex-m0.git/about/")
(synopsis "PMU Cortex M0 firmware for RK3399 Q7 (Puma)")
(description
"Cortex-M0 firmware used with the RK3399 to implement
power-management functionality and helpers (e.g. DRAM frequency
switching support).\n")
(license license:bsd-3)
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(mzerofiles (find-files "." "rk3399m0.(elf|bin)$")))
(for-each
(lambda (file)
(install-file file out))
mzerofiles))
#t))
(add-before 'build 'setenv
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CROSS_COMPILE" "arm-none-eabi-")
#t)))))
(native-inputs `(("cross-gcc" ,(cross-gcc "arm-none-eabi" #:xgcc gcc-7))
("cross-binutils" ,(cross-binutils "arm-none-eabi"))))))

79
gnu/packages/fonts.scm
View File

@ -14,7 +14,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016 Toni Reina <areina@riseup.net>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
@ -38,6 +38,7 @@
;;; Copyright © 2020 Simen Endsjø <simendsjo@gmail.com>
;;; Copyright © 2020 Tim Van den Langenbergh <tmt_vdl@gmx.com>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -314,14 +315,14 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over
(define-public font-liberation
(package
(name "font-liberation")
(version "2.1.1")
(version "2.1.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/liberationfonts/liberation-fonts/"
"files/4743886/liberation-fonts-ttf-" version ".tar.gz"))
"files/5722233/liberation-fonts-ttf-" version ".tar.gz"))
(sha256
(base32 "1jkg8j8jx7ffj13z5ilw7dids99dyypljm1pv06ycmghw1pw3qlf"))))
(base32 "1q7qx9bpn1gqjh1zbb8n9fkzwz8skn41hyy61186g4c3y8q4js8l"))))
(build-system font-build-system)
(home-page "https://github.com/liberationfonts")
(synopsis "Fonts compatible with Arial, Times New Roman, and Courier New")
@ -711,7 +712,7 @@ for use at smaller text sizes")))
(define-public font-gnu-unifont
(package
(name "font-gnu-unifont")
(version "13.0.04")
(version "13.0.05")
(source
(origin
(method url-fetch)
@ -721,7 +722,7 @@ for use at smaller text sizes")))
(string-append "mirror://gnu/unifont/unifont-"
version "/unifont-" version ".tar.gz")))
(sha256
(base32 "064ilpbnz62cwmpajszs2b08x2zg7yh9whlaiqhjzi7bir3im94j"))))
(base32 "0kkgagnyhl92pwgnvf1vjrc1ql8lk5khb125sz18ck8vnxk4i3pr"))))
(build-system gnu-build-system)
(outputs '("out" ; TrueType version
"pcf" ; PCF (bitmap) version
@ -1031,6 +1032,27 @@ Sans Pro family.")
(description "This is the typeface used by Mozilla in Firefox OS.")
(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
(package
(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,
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
(let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc")
(revision "1"))
@ -1787,7 +1846,7 @@ This package provides the TrueType fonts.")
(define-public font-jetbrains-mono
(package
(name "font-jetbrains-mono")
(version "2.210")
(version "2.221")
(source
(origin
(method url-fetch)
@ -1795,7 +1854,7 @@ This package provides the TrueType fonts.")
(string-append "https://github.com/JetBrains/JetBrainsMono/releases/"
"download/v" version "/JetBrainsMono-" version ".zip"))
(sha256
(base32 "19wbggnmqs3k1wdqy7l7imnx23g7hh159pl32nz3mzz8s8sqfdix"))))
(base32 "1acrgv2q9vxviirpi01xy67pkkswyssw4dn5pgyvrnjxr85cgjrg"))))
(build-system font-build-system)
(arguments
`(#:phases
@ -1822,7 +1881,7 @@ in small sizes, the text looks crisper.")
(define-public font-juliamono
(package
(name "font-juliamono")
(version "0.025")
(version "0.031")
(source
(origin
(method git-fetch)
@ -1831,7 +1890,7 @@ in small sizes, the text looks crisper.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1w8mpl9zc1y4j1f26ikbz5g9dqsszhikp4r9p1d3ch3b5ayb5c3m"))))
(base32 "0pcz2qaw0g0gak4plvhgg3m76h4gamffa373r52dzx0qwn1i1cf1"))))
(build-system font-build-system)
(arguments
`(#:phases

122
gnu/packages/fpga.scm
View File

@ -1,8 +1,10 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Andrew Miloradovsky <andrew@interpretmath.pw>
;;;
;;; This file is part of GNU Guix.
;;;
@ -35,6 +37,7 @@
#:use-module (gnu packages tcl)
#:use-module (gnu packages readline)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages flex)
@ -346,7 +349,7 @@ FOSS FPGA place and route tool.")
(define-public gtkwave
(package
(name "gtkwave")
(version "3.3.107")
(version "3.3.108")
(source
(origin
(method url-fetch)
@ -356,7 +359,7 @@ FOSS FPGA place and route tool.")
(string-append "http://gtkwave.sourceforge.net/"
"gtkwave-" version ".tar.gz")))
(sha256
(base32 "1ibnhn7w1awalsbndbb5nilbmih3i3dwfry95mq5sn221l5n7zj8"))))
(base32 "0fzbap72zm4ka6n85j0873fpaarrx199ay0kjw1avrs20hs4gr7c"))))
(build-system gnu-build-system)
(native-inputs
`(("gperf" ,gperf)
@ -381,6 +384,33 @@ simulator trace files (@dfn{FST}).")
;; Exception against free government use in tcl_np.c and tcl_np.h.
(license (list license:gpl2+ license:expat license:tcl/tk))))
(define-public python-migen
(package
(name "python-migen")
(version "0.9.2")
(source
(origin
;; Tests fail in the PyPI tarball due to missing files.
(method git-fetch)
(uri (git-reference
(url "https://github.com/m-labs/migen")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1kq11if64zj84gv4w1q7l16fp17xjxl2wv5hc9dibr1z3m1gy67l"))))
(build-system python-build-system)
(propagated-inputs
`(("python-colorama" ,python-colorama)))
(home-page "https://m-labs.hk/gateware/migen/")
(synopsis "Python toolbox for building complex digital hardware")
(description
"Migen FHDL is a Python library that replaces the event-driven
paradigm of Verilog and VHDL with the notions of combinatorial and
synchronous statements, has arithmetic rules that make integers always
behave like mathematical integers, and allows the design's logic to be
constructed by a Python program.")
(license license:bsd-2)))
(define-public python-myhdl
(package
(name "python-myhdl")
@ -438,3 +468,89 @@ a hardware description and verification language. ")
(description "This package provides a VHDL compiler and simulator.")
(home-page "https://github.com/nickg/nvc")
(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
(package
(name "libfprint")
(version "1.90.6")
(version "1.90.7")
(source
(origin
(method git-fetch)
@ -1489,7 +1489,7 @@ wish to perform colour calibration.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0hagm1i78mrd772y3cinr7bda4myx0v4bixwqnqbxknds8m9h8sg"))))
(base32 "00pmdpxxjj4sh8qjq9ch3pylgg9w019rg1bbaw53a4wr637rrz43"))))
(build-system meson-build-system)
(arguments
'(#:configure-flags
@ -2021,14 +2021,15 @@ useful with system integration.")
("xvfb" ,xorg-server-for-tests)))
(inputs
`(("dbus-glib" ,dbus-glib)
("gtk+" ,gtk+)
("libdbusmenu" ,libdbusmenu)
("libindicator" ,libindicator)
("python@2" ,python-2)
("python2-pygtk" ,python2-pygtk)
("python2-pygobject-2" ,python2-pygobject-2)
;; ("mono" ,mono) ; requires non-packaged gapi
("vala" ,vala)))
(propagated-inputs
`(("gtk+" ,gtk+)
("libdbusmenu" ,libdbusmenu)))
(arguments
;; FIXME: do not hardcode gtk version
`(#:configure-flags '("--with-gtk=3")

92
gnu/packages/game-development.scm
View File

@ -8,14 +8,14 @@
;;; Copyright © 2016, 2017, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019, 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
@ -63,6 +63,7 @@
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
@ -163,21 +164,22 @@ is used in some video games and movies.")
(define-public deutex
(package
(name "deutex")
(version "5.2.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/Doom-Utils/deutex"
"/releases/download/v" version "/"
"deutex-" version ".tar.xz"))
(sha256
(base32
"07w3asqxx89wl2wfv1z3cak8v83h3ys3b39mq9qq4gyf3xdhs76n"))))
(version "5.2.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/Doom-Utils/deutex"
"/releases/download/v" version "/"
"deutex-" version ".tar.zst"))
(sha256
(base32 "0psb2za6ldrlak7s8pjvli98ij5yiwjx8j1ms2v7rj9yadx0xv8h"))))
(build-system gnu-build-system)
(inputs
`(("libpng" ,libpng)))
(native-inputs
`(("asciidoc" ,asciidoc)
("pkg-config" ,pkg-config)))
("pkg-config" ,pkg-config)
("zstd" ,zstd)))
(home-page "https://github.com/Doom-Utils/deutex")
(synopsis "WAD file composer for Doom and related games")
(description
@ -277,14 +279,14 @@ PCM data.")
(define-public gzochi
(package
(name "gzochi")
(version "0.12")
(version "0.13")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/gzochi/gzochi-"
version ".tar.gz"))
(sha256
(base32
"0h8yvk7154kd8zdfa9nqy73blrjq2x19kv305jcnwlmm09vvss59"))))
"1vcvf04qqzs3q8kaild2x7qvkwc6bwzfsisb78147b8z747j7hj0"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -298,7 +300,7 @@ PCM data.")
(native-inputs `(("pkgconfig" ,pkg-config)))
(inputs `(("bdb" ,bdb)
("glib" ,glib)
("guile" ,guile-2.2)
("guile" ,guile-3.0)
("libmicrohttpd" ,libmicrohttpd)
("ncurses" ,ncurses)
("sdl" ,sdl)
@ -489,7 +491,7 @@ clone.")
(define-public tsukundere
(package
(name "tsukundere")
(version "0.2.0")
(version "0.2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -498,21 +500,47 @@ clone.")
(file-name (git-file-name name version))
(sha256
(base32
"0qmqch8hh7vsa8qaz853vwbkz0krb106955dnz8dsl7skbm5jpn6"))))
"05ckds2df810441wfavllx9lsw5jsc9h3nb7m31df01nsj56azdw"))))
(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
`(("autoconf" ,autoconf-wrapper)
("automake" ,automake)
("guile" ,guile-3.0)
("pkg-config" ,pkg-config)))
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(propagated-inputs
`(("guile-sdl2" ,guile3.0-sdl2)))
(home-page "https://gitlab.com/leoprikler/tsukundere")
(synopsis "Visual novel engine")
(description "Tsukundere is a game engine geared heavily towards the
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
modules, that make up its runtime.")
experimental.")
(license license:lgpl3+)))
(define-public sfml
@ -721,7 +749,7 @@ programming language.")
(url "https://github.com/keharriso/love-nuklear/")
(commit commit)
(recursive? #t)))
;; NOTE: the HEAD of the Nuklear git-submodule is at commit
;; NOTE: the HEAD of the Nuklear git-submodule is at commit
;; "adc52d710fe3c87194b99f540c53e82eb75c2521" of Oct 1 2019
(file-name (git-file-name name version))
(sha256
@ -1061,7 +1089,7 @@ to create fully featured games and multimedia programs in the python language.")
(define-public python2-pygame-sdl2
(let ((real-version "2.1.0")
(renpy-version "7.3.5"))
(renpy-version "7.4.2"))
(package
(inherit python2-pygame)
(name "python2-pygame-sdl2")
@ -1071,13 +1099,13 @@ to create fully featured games and multimedia programs in the python language.")
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" renpy-version
"/pygame_sdl2-" version ".tar.gz"))
(sha256 (base32 "1bmr7j9mlsc4czpgw70ld15ymyp4wxrk9hdsqad40wjwdxvvg2dr"))
(sha256 (base32 "1lpk69nh379x5pdlr838x5b49spzksn9hyqiq2g0q28k0xk4lm67"))
(modules '((guix build utils)))
(snippet
'(begin
;; drop generated sources
(delete-file-recursively "gen")
(delete-file-recursively "gen3")
(delete-file-recursively "gen-static")
#t))))
(build-system python-build-system)
(arguments
@ -1114,13 +1142,13 @@ developed mainly for Ren'py.")
(define-public python2-renpy
(package
(name "python2-renpy")
(version "7.3.5")
(version "7.4.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" version
"/renpy-" version "-source.tar.bz2"))
(sha256 (base32 "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4"))
(sha256 (base32 "1mlrq9q3r36izyskq674qhp8s32iirvvfb4r8z6hi26189aaydsw"))
(modules '((guix build utils)))
(patches
(search-patches
@ -1177,8 +1205,8 @@ developed mainly for Ren'py.")
;; (both source and compiled) in the same directory.
(let* ((out (assoc-ref outputs "out"))
(site (string-append "/lib/python"
,(version-major+minor
(package-version python-2))
(python-version
(assoc-ref inputs "python"))
"/site-packages")))
(with-directory-excursion "module"
(apply (assoc-ref %standard-phases 'install) args))
@ -1191,11 +1219,14 @@ developed mainly for Ren'py.")
("fribidi" ,fribidi)
("glew" ,glew)
("libpng" ,libpng)
("python2-pygame" ,python2-pygame-sdl2)
("sdl-union"
,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))))
(propagated-inputs
`(("python2-future" ,python2-future)
("python2-pygame" ,python2-pygame-sdl2)))
(native-inputs
`(("python2-cython" ,python2-cython)
`(("gcc" ,gcc-8) ; for const variables as initializer elements
("python2-cython" ,python2-cython)
("xdg-utils" ,xdg-utils)))
(home-page "https://www.renpy.org/")
(synopsis "Ren'py python module")
@ -1207,7 +1238,6 @@ modules of Ren'py.")
(package
(inherit python2-renpy)
(name "renpy")
(version "7.3.5")
(build-system python-build-system)
(arguments
`(#:tests? #f ; see python2-renpy

359
gnu/packages/games.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013 John Darrington <jmd@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; 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 Sylvain Beucler <beuc@beuc.net>
;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
@ -24,13 +24,13 @@
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
;;; Copyright © 2017, 2018, 2020 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, 2019 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; 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 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
@ -53,9 +53,10 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Trevor Hass <thass@okstate.edu>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020 Lu hux <luhux@outlook.com>
;;; Copyright © 2020 Tomás Ortín Fernández <tomasortin@mailbox.org>
;;; Copyright © 2021 Olivier Rojon <o.rojon@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -98,6 +99,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages curl)
#:use-module (gnu packages crypto)
#:use-module (gnu packages cyrus-sasl)
@ -133,6 +135,7 @@
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages javascript)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages less)
@ -855,6 +858,52 @@ things far stranger and deadlier, and against the others like yourself, that
want what you have.")
(license license:cc-by-sa3.0)))
(define-public cockatrice
(let ((release-date "2021-01-26"))
(package
(name "cockatrice")
(version "2.8.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Cockatrice/Cockatrice")
(commit (string-append release-date "-Release-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0q8ffcklb2b7hcqhy3d2f9kz9aw22pp04pc9y4sslyqmf17pwnz9"))
(modules '((guix build utils)))
(snippet
;; Strip image URLs as they point towards non-free web services
'(substitute* "cockatrice/src/settings/downloadsettings.cpp"
(("downloadURLs.append\\(\".*\"\\);") "")))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DWITH_SERVER=1"
"-DWITH_CLIENT=1"
"-DWITH_ORACLE=1"
"-DTEST=1")))
(native-inputs
`(("googletest" ,googletest)
("pkg-config" ,pkg-config)))
(inputs
`(("protobuf" ,protobuf)
("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)
("qttools" ,qttools)
("qtwebsockets" ,qtwebsockets)
("xz" ,xz)
("zlib" ,zlib)))
(home-page "https://cockatrice.github.io")
(synopsis "Tabletop card game simulator")
(description "Cockatrice is a program for playing tabletop card games
over a network. Its server design prevents users from manipulating the game
for unfair advantage. The client also provides a single-player mode, which
allows users to brew while offline.")
(license license:gpl2))))
(define-public corsix-th
(package
(name "corsix-th")
@ -1322,7 +1371,7 @@ automata. The following features are available:
(define-public julius
(package
(name "julius")
(version "1.5.1")
(version "1.6.0")
(source
(origin
(method git-fetch)
@ -1331,7 +1380,7 @@ automata. The following features are available:
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "10d6py1cmkq8lnb5h3w8rdpp4fmpd1wgqkgiabdghqxi7b2s0g4b"))
(base32 "0nfdn8n6ywhm69ckz9a1chl5xxiqyaj3l337wadsbppnpscjihrc"))
;; Remove unused bundled libraries.
(modules '((guix build utils)))
(snippet
@ -1358,7 +1407,7 @@ does not include game data.")
(package
(inherit julius)
(name "augustus")
(version "1.4.1a")
(version "2.0.1")
(source
(origin
(method git-fetch)
@ -1367,7 +1416,7 @@ does not include game data.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y"))
(base32 "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj"))
;; Remove unused bundled libraries.
(modules '((guix build utils)))
(snippet
@ -2235,6 +2284,100 @@ and defeat them with your bubbles!")
;; GPL2+ is for code, CC0 is for art.
(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
(package
(name "superstarfighter")
@ -2363,6 +2506,93 @@ available, as well as a single-player mode with AI-controlled ships.")
"$(call ZIP) -X"))
#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
(package
(name "ufo2map")
@ -4218,7 +4448,7 @@ Transport Tycoon Deluxe.")
(define openrct2-objects
(package
(name "openrct2-objects")
(version "1.0.9")
(version "1.0.20")
(source
(origin
(method url-fetch)
@ -4226,7 +4456,7 @@ Transport Tycoon Deluxe.")
version "/objects.zip"))
(file-name (string-append name "-" version ".zip"))
(sha256
(base32 "02apb8h553m7d6jvysgb1zahvxc1yzyygfca2iclb21b3fhpsas4"))))
(base32 "1q7a38kcwrfijav6app1gf253yfv8b0rljbkah8040y6i7snw9mw"))))
(build-system trivial-build-system)
(native-inputs
`(("bash" ,bash)
@ -4258,7 +4488,7 @@ Transport Tycoon Deluxe.")
(define-public openrct2
(package
(name "openrct2")
(version "0.2.6")
(version "0.3.2")
(source
(origin
(method git-fetch)
@ -4267,7 +4497,7 @@ Transport Tycoon Deluxe.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1vikbkg3wh5ngzdfilb6irbh6nqinf138qpdz8wz9izlvl8s36k4"))))
(base32 "1fd32wniiy6qz2046ppqfj2sb3rf2qf086rf9v1bdhyj254d0b1z"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF"
@ -4296,6 +4526,7 @@ Transport Tycoon Deluxe.")
(("-Werror") ""))
#t)))))
(inputs `(("curl" ,curl)
("duktape" ,duktape)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("icu4c" ,icu4c)
@ -4303,6 +4534,7 @@ Transport Tycoon Deluxe.")
("libpng" ,libpng)
("libzip" ,libzip)
("mesa" ,mesa)
("nlohmann-json-cpp" ,nlohmann-json-cpp)
("openrct2-objects" ,openrct2-objects)
("openrct2-title-sequences" ,openrct2-title-sequences)
("openssl" ,openssl)
@ -4938,7 +5170,7 @@ of war. Widelands also offers an Artificial Intelligence to challenge you.")
(define-public starfighter
(package
(name "starfighter")
(version "2.3.3")
(version "2.4")
(source (origin
(method url-fetch)
(uri (string-append
@ -4947,7 +5179,7 @@ of war. Widelands also offers an Artificial Intelligence to challenge you.")
version "-src.tar.gz"))
(sha256
(base32
"0jz2lgvmp299nks6ajg2yxbx4xcaxlc4cpfr61861p7m7z2nv84y"))))
"0ips79j3sdy8wa64jqka0skbbqkzqiln9bbiiilh4z717q7vz9r5"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -5571,7 +5803,7 @@ for Un*x systems with X11.")
(define-public freeciv
(package
(name "freeciv")
(version "2.6.2.1")
(version "2.6.3")
(source
(origin
(method url-fetch)
@ -5583,7 +5815,7 @@ for Un*x systems with X11.")
(version-major+minor version) "/" version
"/freeciv-" version ".tar.bz2")))
(sha256
(base32 "0pjqnwpxsirhyf5c4f1b9gxkqah0213wqaynklq84mahq41sq15x"))))
(base32 "1lgq7wcbhwpy2yqdw4biwfmp5q8fh7lhlwxcgm0fpaapfl12whvp"))))
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)
@ -5919,11 +6151,13 @@ small robot living in the nano world, repair its maker.")
(method git-fetch)
(uri (git-reference
(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))
(sha256
(base32
"169dl83q08zl4h813az8hjs4rs3dms9yjn6bnsld4fjcj0imvvc6"))
"1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz"))
(modules '((guix build utils)
(ice-9 ftw)
(ice-9 regex)
@ -5936,15 +6170,12 @@ small robot living in the nano world, repair its maker.")
(remove (cut string-match "(^.)|(^md5$)" <>)
(scandir base-dir)))
#t))))
(build-system gnu-build-system)
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests included
#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
#:phases
(modify-phases %standard-phases
(replace 'configure
(add-after 'unpack 'patch-paths
(lambda* (#:key outputs #:allow-other-keys)
;; Embed path to assets.
(substitute* "src/engine/shared/storage.cpp"
@ -5953,51 +6184,7 @@ small robot living in the nano world, repair its maker.")
(assoc-ref outputs "out")
"/share/teeworlds/data"
"\"")))
;; 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))))))
#t)))))
(inputs
`(("freetype" ,freetype)
("glu" ,glu)
@ -6008,17 +6195,17 @@ settings.link.libs:Add(\"wavpack\")")
("sdl2-image" ,sdl2-image)
("sdl2-mixer" ,sdl2-mixer)
("wavpack" ,wavpack)
("openssl" ,openssl)
("zlib" ,zlib)))
(native-inputs
`(("bam" ,bam)
("python" ,python-wrapper)
`(("python" ,python-wrapper)
("pkg-config" ,pkg-config)))
(home-page "https://www.teeworlds.com")
(synopsis "2D retro multiplayer shooter game")
(description "Teeworlds is an online multiplayer game. Battle with up to
16 players in a variety of game modes, including Team Deathmatch and Capture
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
(package
@ -6192,31 +6379,15 @@ fish. The whole game is accompanied by quiet, comforting music.")
(define-public crawl
(package
(name "crawl")
(version "0.25.0")
(version "0.26.1")
(source
(origin
(method url-fetch)
(uri (list
;; Older releases get moved into a versioned directory
(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")))
(uri (string-append "https://github.com/crawl/crawl/releases/download/"
version "/stone_soup-" version "-nodeps.tar.xz"))
(sha256
(base32 "0rn1wjxdqw33caiwisfypm1j8cid3c9pz01ahicl17144zs29z3d"))
(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))))
(base32 "1d8p2np2q5951wqphq2f4dyvv976m2lh82b0qp7w9pp1h8zzi1ff"))
(patches (search-patches "crawl-upgrade-saves.patch"))))
(build-system gnu-build-system)
(inputs
`(("lua51" ,lua-5.1)
@ -6959,7 +7130,7 @@ elements to achieve a simple goal in the most complex way possible.")
(define-public pioneer
(package
(name "pioneer")
(version "20200203")
(version "20210203")
(source (origin
(method git-fetch)
(uri (git-reference
@ -6968,7 +7139,7 @@ elements to achieve a simple goal in the most complex way possible.")
(file-name (git-file-name name version))
(sha256
(base32
"1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8"))))
"1zyi1xyghj99hz8fa6dywpscj6flp04fspnlgxbivf3rgmnxflg7"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

3
gnu/packages/genimage.scm
View File

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

185
gnu/packages/geo.scm
View File

@ -2,18 +2,19 @@
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018, 2019, 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2020 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -847,14 +848,14 @@ utilities for data translation and processing.")
(define-public postgis
(package
(name "postgis")
(version "3.0.3")
(version "3.1.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.osgeo.org/postgis/source/postgis-"
version ".tar.gz"))
(sha256
(base32
"05s8cx1rlysiq7dd44kf7cid0la61a4p895j9g95bvfb8v8dpzh7"))))
"0z9a39243fv37mansbbjq5mmxpnhr7xzn8pv92fr7dkdb3psz5hf"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@ -879,6 +880,7 @@ utilities for data translation and processing.")
("libxml2" ,libxml2)
("pcre" ,pcre)
("postgresql" ,postgresql)
("protobuf-c" ,protobuf-c)
("proj" ,proj)))
(native-inputs
`(("perl" ,perl)
@ -1559,15 +1561,14 @@ The API also works with MaxMind’s free GeoLite2 databases.")
(define-public routino
(package
(name "routino")
(version "3.3.2")
(version "3.3.3")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.routino.org/download/routino-"
version ".tgz"))
(sha256
(base32
"1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab"))))
(base32 "1xa7l2bjn832nk6bc7b481nv8hd2gj41jwhg0d2qy10lqdvjpn5b"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)))
@ -1602,7 +1603,7 @@ using the dataset of topographical information collected by
(define-public qmapshack
(package
(name "qmapshack")
(version "1.14.0")
(version "1.15.2")
(source
(origin
(method git-fetch)
@ -1611,8 +1612,7 @@ using the dataset of topographical information collected by
(commit (string-append "V_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"07c2hrq9sn456w7l3gdr599rmjfv2k6mh159zza7p1py8r7ywksa"))))
(base32 "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7"))))
(build-system qt-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -1694,6 +1694,32 @@ input file (in @code{.osm} or @code{.osm.pbf} format).")
license:lgpl2.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
(package
(name "spatialite-tools")
@ -1989,14 +2015,14 @@ growing set of geoscientific methods.")
(define-public qgis
(package
(name "qgis")
(version "3.12.1")
(version "3.16.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://qgis.org/downloads/qgis-"
version ".tar.bz2"))
(sha256
(base32 "1a41525y8ac44gzcfaffjx0lyrm49hgnr83jrq40r5mqd3vpmp57"))))
(base32 "012dv8dcg7w4lf6k37i41wialwhi0kpkxw2dnq19yqqk35632mzx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((guix build cmake-build-system)
@ -2011,23 +2037,26 @@ growing set of geoscientific methods.")
;; Configure correct path to PyQt5 SIP directory
(add-after 'unpack 'configure-pyqt5-sip-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmake/FindPyQt5.cmake"
(("\"\\\\\\\\1\" PYQT5_SIP_DIR")
(string-append "\"" (assoc-ref inputs "python-pyqt+qscintilla")
"/share/sip\" PYQT5_SIP_DIR")))
(substitute* (list "scripts/prepare-commit.sh"
"scripts/runtests-local-travis-config.sh"
(substitute* "cmake/FindPyQt5.py"
(("sip_dir = cfg.default_sip_dir")
(string-append "sip_dir = \""
(assoc-ref inputs "python-pyqt+qscintilla")
"/share/sip\"")))
(substitute* (list "scripts/prepare_commit.sh"
"scripts/qstringfixup.sh"
"scripts/release.pl"
"scripts/runtests_local_travis_config.sh"
"scripts/sip_include.sh"
"scripts/sipdiff"
"scripts/sipify_all.sh"
"scripts/spell_check/check_spelling.sh"
"scripts/spell_check/spell_test.sh"
"scripts/verify-indentation.sh"
"scripts/verify_indentation.sh"
"tests/code_layout/test_banned_keywords.sh"
"tests/code_layout/test_licenses.sh"
"tests/code_layout/test_shellcheck.sh"
"tests/code_layout/test_sip_include.sh"
"tests/code_layout/test_sipfiles_uptodate.sh"
"tests/code_layout/test_sipfiles.sh"
"tests/code_layout/test_sipify.sh")
(("\\$\\(git rev-parse --show-toplevel\\)")
(getcwd)))
@ -2047,77 +2076,95 @@ growing set of geoscientific methods.")
'(;; Disable tests that require network access
"qgis_filedownloader"
;; TODO: Find why the following tests fail
"ProcessingQgisAlgorithmsTestPt1"
"ProcessingQgisAlgorithmsTestPt2"
"ProcessingQgisAlgorithmsTestPt3"
"ProcessingQgisAlgorithmsTestPt4"
"ProcessingGdalAlgorithmsRasterTest"
"ProcessingGdalAlgorithmsVectorTest"
"ProcessingGrass7AlgorithmsImageryTest"
"ProcessingGrass7AlgorithmsRasterTest"
"ProcessingGrass7AlgorithmsVectorTest"
"ProcessingOtbAlgorithmsTest"
"qgis_authmanagertest"
"qgis_compositionconvertertest"
"qgis_coordinatereferencesystemtest"
"qgis_geometrytest"
"qgis_layouthtmltest"
"qgis_layoutmaptest"
"qgis_layoutmapgridtest"
"qgis_painteffecttest"
"qgis_pallabelingtest"
"qgis_svgmarkertest"
"qgis_taskmanagertest"
"qgis_ziplayertest"
"qgis_processingtest"
"qgis_wcsprovidertest"
"qgis_arcgisrestutilstest"
"qgis_grassprovidertest7"
"qgis_gpsinformationwidget"
"ProcessingQgisAlgorithmsTestPt1"
"ProcessingQgisAlgorithmsTestPt2"
"ProcessingQgisAlgorithmsTestPt3"
"ProcessingQgisAlgorithmsTestPt4"
"PyCoreAdittions"
"PyQgsPythonProvider"
"PyQgsAnnotation"
"PyQgsAppStartup"
"PyQgsAuthenticationSystem"
"PyQgsProject"
"PyQgsAuxiliaryStorage"
"PyQgsDBManagerGpkg"
"PyQgsDBManagerSpatialite"
"PyQgsDataItem"
"PyQgsFieldValidator"
"PyQgsFileUtils"
"PyQgsGeometryTest"
"PyQgsImageCache"
"PyQgsImportIntoPostGIS"
"PyQgsLayerDependencies"
"PyQgsLayerMetadata"
"PyQgsLayout"
"PyQgsLayoutHtml"
"PyQgsLayoutMapGrid"
"PyQgsMetadataBase"
"PyQgsLayoutExporter"
"PyQgsLayoutHtml"
"PyQgsLayoutLegend"
"PyQgsLayoutMapGrid"
"PyQgsMapLayer"
"PyQgsOGRProviderGpkg"
"PyQgsPalLabelingLayout"
"PyQgsImportIntoPostGIS"
"PyQgsProviderConnectionPostgres"
"PyQgsProviderConnectionGpkg"
"PyQgsShapefileProvider"
"PyQgsSvgCache"
"PyQgsTextRenderer"
"PyQgsMetadataBase"
"PyQgsOGRProvider"
"PyQgsOGRProviderGpkg"
"PyQgsOapifProvider"
"PyQgsPalLabelingLayout"
"PyQgsProject"
"PyQgsProviderConnectionGpkg"
"PyQgsProviderConnectionPostgres"
"PyQgsProviderConnectionSpatialite"
"PyQgsPythonProvider"
"PyQgsRasterLayer"
"PyQgsRulebasedRenderer"
"PyQgsSelectiveMasking"
"PyQgsSettings"
"PyQgsShapefileProvider"
"PyQgsSpatialiteProvider"
"PyQgsSvgCache"
"PyQgsSymbolExpressionVariables"
"PyQgsTextRenderer"
"PyQgsVectorFileWriter"
"PyQgsVectorLayer"
"PyQgsVectorLayerUtils"
"PyQgsVirtualLayerProvider"
"PyQgsWFSProvider"
"PyQgsOapifProvider"
"PyQgsLayerDependencies"
"PyQgsDBManagerGpkg"
"PyQgsDBManagerSpatialite"
"PyQgsSettings"
"PyQgsAuxiliaryStorage"
"PyQgsSelectiveMasking"
"PyQgsAppStartup"
"qgis_arcgisrestutilstest"
"qgis_authmanagertest"
"qgis_compositionconvertertest"
"qgis_coordinatereferencesystemtest"
"qgis_expressiontest"
"qgis_fontmarkertest"
"qgis_geometrycheckstest"
"qgis_geometrytest"
"qgis_gpsinformationwidget"
"qgis_grassprovidertest7"
"qgis_imagecachetest"
"qgis_labelingenginetest"
"qgis_layouthtmltest"
"qgis_layoutmanualtabletest"
"qgis_layoutmapgridtest"
"qgis_layoutmaptest"
"qgis_layoutpicturetest"
"qgis_layouttabletest"
"qgis_mapdevicepixelratiotest"
"qgis_maprendererjobtest"
"qgis_ogrproviderguitest"
"qgis_painteffecttest"
"qgis_pallabelingtest"
"qgis_processingtest"
"qgis_rasterlayertest"
"qgis_shellcheck"
"qgis_sipify"
"qgis_sip_include"
"qgis_sip_uptodate")
"qgis_sip_uptodate"
"qgis_sipify"
"qgis_styletest"
"qgis_svgmarkertest"
"qgis_taskmanagertest"
"qgis_wcsprovidertest"
"qgis_ziplayertest")
"|"))))
(add-after 'install 'wrap-python
(assoc-ref python:%standard-phases 'wrap))
@ -2128,8 +2175,11 @@ growing set of geoscientific methods.")
#t))
(add-after 'wrap-qt 'wrap-gis
(lambda* (#:key inputs outputs #:allow-other-keys)
;; TODO: Find if there is a way to get SAGA to work.
;; Currently QGIS says "version of SAGA not supported".
;; Disable it for now.
(let* ((out (assoc-ref outputs "out"))
(saga (string-append (assoc-ref inputs "saga") "/bin"))
;;(saga (string-append (assoc-ref inputs "saga") "/bin"))
(grass-version ,(package-version grass))
(grass-majorminor (string-join
(list-head
@ -2138,7 +2188,7 @@ growing set of geoscientific methods.")
(grass (string-append (assoc-ref inputs "grass")
"/grass" grass-majorminor)))
(wrap-program (string-append out "/bin/qgis")
`("PATH" ":" prefix (,saga))
;;`("PATH" ":" prefix (,saga))
`("QGIS_PREFIX_PATH" = (,out))
`("GISBASE" = (,grass))))
#t)))))
@ -2158,6 +2208,7 @@ growing set of geoscientific methods.")
("netcdf" ,netcdf)
("postgresql" ,postgresql)
("proj" ,proj)
("protobuf" ,protobuf)
("python" ,python)
("python-chardet" ,python-chardet)
("python-dateutil" ,python-dateutil)
@ -2185,7 +2236,7 @@ growing set of geoscientific methods.")
("qtsvg" ,qtsvg)
("qtwebkit" ,qtwebkit)
("qwt" ,qwt)
("saga" ,saga)
;;("saga" ,saga)
("sqlite" ,sqlite)))
(native-inputs
`(("bison" ,bison)

42
gnu/packages/gettext.scm
View File

@ -10,6 +10,7 @@
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Miguel <rosen644835@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 EuAndreh <eu@euandre.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -27,12 +28,14 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(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 (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#: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 emacs)
#:use-module (gnu packages hurd)
@ -42,6 +45,8 @@
#:use-module (gnu packages perl-check)
#:use-module (gnu packages tex)
#:use-module (gnu packages xml)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx)
#:use-module (guix utils))
(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.")
(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
(package
(name "po4a")

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