ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-23 21:17:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Marius Bakke 2020-04-13 20:26:21 +02:00
commit fc58cb5bd2
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
63 changed files with 762 additions and 461 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

176
doc/build.scm
View file

@ -220,8 +220,11 @@ (define build
(syntax-highlight scheme)
(syntax-highlight lexers)
(guix build utils)
(srfi srfi-1)
(srfi srfi-26)
(ice-9 match)
(ice-9 threads))
(ice-9 threads)
(ice-9 vlist))
(define (pair-open/close lst)
;; Pair 'open' and 'close' tags produced by 'highlights' and
@ -255,10 +258,11 @@ (define (pair-open/close lst)
level (reverse result)))
(values (reverse result) "" '())))))
(define (highlights->sxml* highlights)
(define (highlights->sxml* highlights anchors)
;; Like 'highlights->sxml', but handle nested 'paren tags. This
;; allows for paren matching highlights via appropriate CSS
;; "hover" properties.
;; "hover" properties. When a symbol is encountered, look it up
;; in ANCHORS, a vhash, and emit the corresponding href, if any.
(define (tag->class tag)
(string-append "syntax-" (symbol->string tag)))
@ -269,8 +273,16 @@ (define (tag->class tag)
(number->string level))))
,open
(span (@ (class "syntax-symbol"))
,@(highlights->sxml* body))
,@(highlights->sxml* body anchors))
,close))
(('symbol text)
;; Check whether we can emit a hyperlink for TEXT.
(match (vhash-assoc text anchors)
(#f
`(span (@ (class ,(tag->class 'symbol))) ,text))
((_ . target)
`(a (@ (class ,(tag->class 'symbol)) (href ,target))
,text))))
((tag text)
`(span (@ (class ,(tag->class tag))) ,text)))
highlights))
@ -301,35 +313,109 @@ (define (concatenate-snippets pieces)
(pk 'unsupported-code-snippet something)
(primitive-exit 1)))))
(define (syntax-highlight sxml)
(define (syntax-highlight sxml anchors)
;; Recurse over SXML and syntax-highlight code snippets.
(match sxml
(('*TOP* decl body ...)
`(*TOP* ,decl ,@(map syntax-highlight body)))
(('head things ...)
`(head ,@things
(link (@ (rel "stylesheet")
(type "text/css")
(href #$syntax-css-url)))))
(('pre ('@ ('class "lisp")) code-snippet ...)
`(pre (@ (class "lisp"))
,@(highlights->sxml*
(pair-open/close
(highlight lex-scheme
(concatenate-snippets code-snippet))))))
((tag ('@ attributes ...) body ...)
`(,tag (@ ,@attributes) ,@(map syntax-highlight body)))
((tag body ...)
`(,tag ,@(map syntax-highlight body)))
((? string? str)
str)))
(let loop ((sxml sxml))
(match sxml
(('*TOP* decl body ...)
`(*TOP* ,decl ,@(map loop body)))
(('head things ...)
`(head ,@things
(link (@ (rel "stylesheet")
(type "text/css")
(href #$syntax-css-url)))))
(('pre ('@ ('class "lisp")) code-snippet ...)
`(pre (@ (class "lisp"))
,@(highlights->sxml*
(pair-open/close
(highlight lex-scheme
(concatenate-snippets code-snippet)))
anchors)))
((tag ('@ attributes ...) body ...)
`(,tag (@ ,@attributes) ,@(map loop body)))
((tag body ...)
`(,tag ,@(map loop body)))
((? string? str)
str))))
(define (process-html file)
(define (underscore-decode str)
;; Decode STR, an "underscore-encoded" string as produced by
;; makeinfo for indexes, such as "_0025base_002dservices" for
;; "%base-services".
(let loop ((str str)
(result '()))
(match (string-index str #\_)
(#f
(string-concatenate-reverse (cons str result)))
(index
(let ((char (string->number
(substring str (+ index 1) (+ index 5))
16)))
(loop (string-drop str (+ index 5))
(append (list (string (integer->char char))
(string-take str index))
result)))))))
(define (anchor-id->key id)
;; Convert ID, an anchor ID such as
;; "index-pam_002dlimits_002dservice" to the corresponding key,
;; "pam-limits-service" in this example. Drop the suffix of
;; duplicate anchor IDs like "operating_002dsystem-1".
(let ((id (if (any (cut string-suffix? <> id)
'("-1" "-2" "-3" "-4" "-5"))
(string-drop-right id 2)
id)))
(underscore-decode
(string-drop id (string-length "index-")))))
(define* (collect-anchors file #:optional (vhash vlist-null))
;; Collect the anchors that appear in FILE, a makeinfo-generated
;; file. Grab those from <dt> tags, which corresponds to
;; Texinfo @deftp, @defvr, etc. Return VHASH augmented with
;; more name/reference pairs.
(define string-or-entity?
(match-lambda
((? string?) #t)
(('*ENTITY* _ ...) #t)
(_ #f)))
(define (worthy-entry? lst)
;; Attempt to match:
;; Scheme Variable: <strong>x</strong>
;; but not:
;; <code>cups-configuration</code> parameter: …
(let loop ((lst lst))
(match lst
(((? string-or-entity?) rest ...)
(loop rest))
((('strong _ ...) _ ...)
#t)
(_ #f))))
(let ((shtml (call-with-input-file file html->shtml)))
(let loop ((shtml shtml)
(vhash vhash))
(match shtml
(('dt ('@ ('id id)) rest ...)
(if (and (string-prefix? "index-" id)
(worthy-entry? rest))
(vhash-cons (anchor-id->key id)
(string-append (basename file)
"#" id)
vhash)
vhash))
((tag ('@ _ ...) body ...)
(fold loop vhash body))
((tag body ...)
(fold loop vhash body))
(_ vhash)))))
(define (process-html file anchors)
;; Parse FILE and perform syntax highlighting for its Scheme
;; snippets. Install the result to #$output.
(format (current-error-port) "processing ~a...~%" file)
(let* ((shtml (call-with-input-file file html->shtml))
(highlighted (syntax-highlight shtml))
(highlighted (syntax-highlight shtml anchors))
(base (string-drop file (string-length #$input)))
(target (string-append #$output base)))
(mkdir-p (dirname target))
@ -352,17 +438,43 @@ (define (copy-as-is file)
(pk 'error-link file target (strerror errno))
(primitive-exit 3))))))
(define (html? file stat)
(string-suffix? ".html" file))
;; Install a UTF-8 locale so we can process UTF-8 files.
(setenv "GUIX_LOCPATH"
#+(file-append glibc-utf8-locales "/lib/locale"))
(setlocale LC_ALL "en_US.utf8")
;; First process the mono-node 'guix.html' files.
(n-par-for-each (parallel-job-count)
(lambda (file)
(if (string-suffix? ".html" file)
(process-html file)
(copy-as-is file)))
(find-files #$input))))))
(lambda (mono)
(let ((anchors (collect-anchors mono)))
(process-html mono anchors)))
(find-files #$input "^guix(\\.[a-zA-Z_-]+)?\\.html$"))
;; Next process the multi-node HTML files in two phases: (1)
;; collect the list of anchors, and (2) perform
;; syntax-highlighting.
(let* ((multi (find-files #$input "^html_node$"
#:directories? #t))
(anchors (n-par-map (parallel-job-count)
(lambda (multi)
(cons multi
(fold collect-anchors vlist-null
(find-files multi html?))))
multi)))
(n-par-for-each (parallel-job-count)
(lambda (file)
(let ((anchors (assoc-ref anchors (dirname file))))
(process-html file anchors)))
(append-map (lambda (multi)
(find-files multi html?))
multi)))
;; Last, copy non-HTML files as is.
(for-each copy-as-is
(find-files #$input (negate html?)))))))
(computed-file name build))

6
gnu/packages/batik.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -198,7 +199,7 @@ (define-public java-w3c-sac
(define-public java-xmlgraphics-commons
(package
(name "java-xmlgraphics-commons")
(version "2.3")
(version "2.4")
(source
(origin
(method url-fetch)
@ -206,8 +207,7 @@ (define-public java-xmlgraphics-commons
"mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-"
version "-src.tar.gz"))
(sha256
(base32
"0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23"))
(base32 "0zdkngb896cr35jq1v859j2kpqyn6a87k6a893h394hgvnz7yi3v"))
(modules '((guix build utils)))
(snippet
`(begin

8
gnu/packages/bioconductor.scm
View file

@ -3501,8 +3501,8 @@ (define-public r-fgsea
(synopsis "Fast gene set enrichment analysis")
(description
"The package implements an algorithm for fast gene set enrichment
analysis. Using the fast algorithm allows to make more permutations and get
more fine grained p-values, which allows to use accurate stantard approaches
analysis. Using the fast algorithm makes more permutations and gets
more fine grained p-values, which allows using accurate standard approaches
to multiple hypothesis correction.")
(license license:expat)))
@ -4271,7 +4271,7 @@ (define-public r-aucell
(home-page "https://bioconductor.org/packages/AUCell/")
(synopsis "Analysis of gene set activity in single-cell RNA-seq data")
(description
"AUCell allows to identify cells with active gene sets (e.g. signatures,
"AUCell identifies cells with active gene sets (e.g. signatures,
gene modules, etc) in single-cell RNA-seq data. AUCell uses the @dfn{Area
Under the Curve} (AUC) to calculate whether a critical subset of the input
gene set is enriched within the expressed genes for each cell. The
@ -6426,7 +6426,7 @@ (define-public r-wavcluster
resolved at high resolution and cluster statistics are estimated using a
rigorous Bayesian framework. Post-processing of the results, data export for
UCSC genome browser visualization and motif search analysis are provided. In
addition, the package allows to integrate RNA-Seq data to estimate the False
addition, the package integrates RNA-Seq data to estimate the False
Discovery Rate of cluster detection. Key functions support parallel multicore
computing. While wavClusteR was designed for PAR-CLIP data analysis, it can
be applied to the analysis of other NGS data obtained from experimental

4
gnu/packages/bioinformatics.scm
View file

@ -8401,7 +8401,7 @@ (define-public r-qtl
genes contributing to variation in quantitative traits (so-called
quantitative trait loci, QTLs).
Using a hidden Markov model, R/qtl allows to estimate genetic maps, to
Using a hidden Markov model, R/qtl estimates genetic maps, to
identify genotyping errors, and to perform single-QTL and two-QTL,
two-dimensional genome scans.")
(license license:gpl3)))
@ -8532,7 +8532,7 @@ (define-public r-bamsignals
(home-page "https://bioconductor.org/packages/bamsignals")
(synopsis "Extract read count signals from bam files")
(description
"This package allows to efficiently obtain count vectors from indexed bam
"This package efficiently obtains count vectors from indexed bam
files. It counts the number of nucleotide sequence reads in given genomic
ranges and it computes reads profiles and coverage profiles. It also handles
paired-end data.")

14
gnu/packages/build-tools.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@ -103,8 +103,8 @@ (define-public bear
(license license:gpl3+)))
(define-public gn
(let ((commit "6e5ba2e7210823cf7ccce3eb2a23336a4e7f1349")
(revision "1666")) ;as returned by `git describe`, used below
(let ((commit "ec938ddaa276646eb8f1ab33e160c156011d8217")
(revision "1736")) ;as returned by `git describe`, used below
(package
(name "gn")
(version (git-version "0.0" revision commit))
@ -114,7 +114,7 @@ (define-public gn
(uri (git-reference (url home-page) (commit commit)))
(sha256
(base32
"157ax65sixjm0i1j89wvny48v1mbsl4pbvv5vqinjc6r0fryaf2r"))
"0j1qjwp2biw12s6npzpx4z8nvih7pyn68q6cz2k4700bk9y0d574"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@ -135,8 +135,10 @@ (define-public gn
(call-with-output-file "out/last_commit_position.h"
(lambda (port)
(format port
"#define LAST_COMMIT_POSITION \"~a (~a)\"\n"
,revision ,(string-take commit 8))
(string-append
"#define LAST_COMMIT_POSITION_NUM ~a\n"
"#define LAST_COMMIT_POSITION \"~a (~a)\"\n")
,revision ,revision ,(string-take commit 8))
#t))))
(replace 'build
(lambda _

8
gnu/packages/check.scm
View file

@ -582,14 +582,14 @@ (define-public cpputest
(define-public python-parameterized
(package
(name "python-parameterized")
(version "0.7.1")
(version "0.7.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "parameterized" version))
(sha256
(base32
"1vapry9lyfb2mlpgk2wh9079hzxzq5120bsczncxxay663mdp53a"))))
"0g1q6n7fkanjv7i1djzw62f46xf573jvza7afabh3baqjqxy7rpd"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -1952,8 +1952,8 @@ (define-public python-paramunittest
(synopsis
"Simple extension to have parametrized unit tests")
(description
"This package allows to create parametrized unit-tests that work with the standard
unittest package. A parametrized test case is automatically converted to multiple test
"This package creates parameterized unit-tests that work with the standard
unittest package. A parameterized test case is automatically converted to multiple test
cases. Since they are TestCase subclasses, they work with other test suites that
recognize TestCases.")
(license license:bsd-2)))

42
gnu/packages/chromium.scm
View file

@ -135,8 +135,11 @@ (define %preserved-third-party-files
"third_party/dawn" ;ASL2.0
"third_party/depot_tools/owners.py" ;BSD-3
"third_party/devtools-frontend" ;BSD-3
"third_party/devtools-frontend/src/front_end/third_party/fabricjs" ;Expat
"third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
"third_party/devtools-frontend/src/third_party/axe-core" ;MPL2.0
"third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0
"third_party/devtools-frontend/src/third_party/typescript" ;ASL2.0
"third_party/dom_distiller_js" ;BSD-3
"third_party/emoji-segmenter" ;ASL2.0
"third_party/flatbuffers" ;ASL2.0
@ -196,7 +199,6 @@ (define %preserved-third-party-files
"third_party/qcms" ;Expat
"third_party/rnnoise" ;BSD-3
"third_party/s2cellid" ;ASL2.0
"third_party/sfntly" ;ASL2.0
"third_party/skia" ;BSD-3
"third_party/skia/include/third_party/skcms" ;BSD-3
"third_party/skia/third_party/skcms" ;BSD-3
@ -206,7 +208,6 @@ (define %preserved-third-party-files
"third_party/spirv-headers" ;ASL2.0
"third_party/SPIRV-Tools" ;ASL2.0
"third_party/sqlite" ;Public domain
"third_party/ungoogled" ;BSD-3
"third_party/usb_ids" ;BSD-3
"third_party/usrsctp" ;BSD-2
"third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3
@ -247,9 +248,9 @@ (define* (computed-origin-method gexp-promise hash-algo hash
#:system system
#:guile-for-build guile)))
(define %chromium-version "80.0.3987.163")
(define %ungoogled-revision "516e2d990a50a4bbeb8c583e56333c2935e2af95")
(define %debian-revision "debian/80.0.3987.116-1")
(define %chromium-version "81.0.4044.92")
(define %ungoogled-revision "b484ad4c0bdb696c86d941798ae6b0e2bd0db35d")
(define %debian-revision "debian/81.0.4044.92-1")
(define package-revision "0")
(define %package-version (string-append %chromium-version "-"
package-revision "."
@ -263,7 +264,7 @@ (define %chromium-origin
%chromium-version ".tar.xz"))
(sha256
(base32
"0ikk4cgz3jgjhyncsvlqvlc03y7jywjpa6v34fwsjxs88flyzpdn"))))
"0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"))))
(define %ungoogled-origin
(origin
@ -274,7 +275,7 @@ (define %ungoogled-origin
(string-take %ungoogled-revision 7)))
(sha256
(base32
"0nm55qq4ahw9haf5g7hmzic4mr2xjgpay7lxps7xjp7s1pda4g0q"))))
"071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l"))))
(define %debian-origin
(origin
@ -288,7 +289,7 @@ (define %debian-origin
(_ (string-take %debian-revision 7)))))
(sha256
(base32
"1cc5sp566dd8f2grgr770xwbxgxf58dk1w7q3s8pmv4js5h3pwq8"))))
"0srgbcqga3l75bfkv3bnmjk416189nazsximvzdx2k5n8v5k4p3m"))))
;; This is a "computed" origin that does the following:
;; *) Runs the Ungoogled scripts on a pristine Chromium tarball.
@ -319,8 +320,7 @@ (define ungoogled-chromium-source
(list #+(canonical-package patch)
#+(canonical-package xz)
#+(canonical-package tar)
#+python-2
#+python))
#+python-wrapper))
(copy-recursively #+ungoogled-source "/tmp/ungoogled")
@ -338,11 +338,11 @@ (define ungoogled-chromium-source
(format #t "Ungooglifying...~%")
(force-output)
(invoke "python3" "utils/prune_binaries.py" chromium-dir
(invoke "python" "utils/prune_binaries.py" chromium-dir
"pruning.list")
(invoke "python3" "utils/patches.py" "apply"
(invoke "python" "utils/patches.py" "apply"
chromium-dir "patches")
(invoke "python3" "utils/domain_substitution.py" "apply" "-r"
(invoke "python" "utils/domain_substitution.py" "apply" "-r"
"domain_regex.list" "-f" "domain_substitution.list"
"-c" "/tmp/domainscache.tar.gz" chromium-dir)
@ -390,13 +390,13 @@ (define ungoogled-chromium-source
(format #t "Pruning third party files...~%")
(force-output)
(apply invoke "python"
(apply invoke (string-append #+python-2 "/bin/python")
"build/linux/unbundle/remove_bundled_libraries.py"
"--do-remove" preserved-files)
(format #t "Replacing GN files...~%")
(force-output)
(invoke "python3" "build/linux/unbundle/replace_gn_files.py"
(invoke "python" "build/linux/unbundle/replace_gn_files.py"
"--system-libraries" "ffmpeg" "flac" "fontconfig"
"freetype" "harfbuzz-ng" "icu" "libdrm" "libevent"
"libjpeg" "libpng" "libvpx" "libwebp" "libxml"
@ -450,7 +450,6 @@ (define-public ungoogled-chromium
;; directory for an exhaustive list of supported flags.
;; (Note: The 'configure' phase will do that for you.)
(list "is_debug=false"
"is_cfi=false"
"use_gold=false"
"use_lld=false"
"clang_use_chrome_plugins=false"
@ -636,8 +635,13 @@ (define-public ungoogled-chromium
(setenv "AR" "ar") (setenv "NM" "nm")
(setenv "CC" "clang") (setenv "CXX" "clang++")
;; Do not optimize away null pointer safety checks.
(setenv "CXXFLAGS" "-fno-delete-null-pointer-checks")
(setenv "CXXFLAGS"
(string-join
'(;; Do not optimize away null pointer safety checks.
"-fno-delete-null-pointer-checks"
;; Disable warnings about unknown warnings that require
;; Clang plugins or newer versions.
"-Wno-unknown-warning-option")))
;; TODO: pre-compile instead. Avoids a race condition.
(setenv "PYTHONDONTWRITEBYTECODE" "1")
@ -782,7 +786,7 @@ (define-public ungoogled-chromium
("glib" ,glib)
("gtk+" ,gtk+)
("harfbuzz" ,harfbuzz)
("icu4c" ,icu4c)
("icu4c" ,icu4c-66.1)
("jsoncpp" ,jsoncpp)
("lcms" ,lcms)
("libevent" ,libevent)

6
gnu/packages/cran.scm
View file

@ -11532,7 +11532,7 @@ (define-public r-etm
(home-page "https://cran.r-project.org/web/packages/etm")
(synopsis "Empirical transition matrix")
(description
"The @dfn{empirical transition matrix} (etm) package permits to estimate
"The @dfn{empirical transition matrix} (etm) package estimates
the matrix of transition probabilities for any time-inhomogeneous multistate
model with finite state space using the Aalen-Johansen estimator.")
(license license:expat)))
@ -13880,7 +13880,7 @@ (define-public r-r2html
as the student can keep a copy of the produced output to keep all that they
did during the course. The package comes with a vignette describing how to
write HTML reports for statistical analysis. Finally, a driver for Sweave
allows to parse HTML flat files containing R code and to automatically write
parses HTML flat files containing R code and to automatically write
the corresponding outputs (tables and graphs).")
(license license:gpl2+)))
@ -15863,7 +15863,7 @@ (define-public r-graphlayouts
"This package provides several layout algorithms to visualize networks
which are not part of the igraph library. Most are based on the concept of
stress majorization by Gansner et al. (2004)
<doi:10.1007/978-3-540-31843-9_25>. Some more specific algorithms allow to
<doi:10.1007/978-3-540-31843-9_25>. Some more specific algorithms
emphasize hidden group structures in networks or focus on specific nodes.")
(license license:expat)))

13
gnu/packages/databases.scm
View file

@ -225,7 +225,7 @@ (define-public go-gopkg.in-mgo.v2
(define-public ephemeralpg
(package
(name "ephemeralpg")
(version "2.9")
(version "3.0")
(source
(origin
(method url-fetch)
@ -233,17 +233,14 @@ (define-public ephemeralpg
"https://eradman.com/ephemeralpg/code/ephemeralpg-"
version ".tar.gz"))
(sha256
(base32 "1ghp3kya4lxvfwz3c022cx9vqf55jbf9sjw60bxjcb5sszklyc89"))))
(base32 "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags (list "CC=gcc"
(string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'check
(lambda* (#:key inputs #:allow-other-keys)
(invoke "ruby" "test.rb")))
(delete 'configure) ; no configure script
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@ -255,11 +252,13 @@ (define-public ephemeralpg
"/bin")
;; For getsocket.
,(string-append out "/bin")))))
#t)))))
#t)))
#:test-target "test"))
(inputs
`(("postgresql" ,postgresql)
("util-linux" ,util-linux)))
(native-inputs
;; For tests.
`(("ruby" ,ruby)
("which" ,which)))
(home-page "https://eradman.com/ephemeralpg/")

36
gnu/packages/datastructures.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;;
@ -105,17 +105,20 @@ (define-public sparsehash
(define-public ssdeep
(package
(name "ssdeep")
(version "2.13")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/ssdeep/"
name "-" version "/"
name "-" version ".tar.gz"))
(sha256
(base32
"1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f"))))
(version "2.14.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/ssdeep-project/ssdeep/"
"releases/download/release-" version "/"
"ssdeep-" version ".tar.gz"))
(sha256
(base32 "04qkjc6kksxkv7xbnk32rwmf3a8czdv2vvrdzfs0kw06h73snbpz"))))
(build-system gnu-build-system)
(home-page "http://ssdeep.sourceforge.net")
(arguments
`(#:configure-flags
(list "--disable-static")))
(home-page "https://ssdeep-project.github.io")
(synopsis "Context-triggered piecewise hashing algorithm")
(description "ssdeep computes and matches context triggered piecewise
hashes (CTPH), also called fuzzy checksums. It can identify similar files
@ -126,14 +129,14 @@ (define-public ssdeep
(define-public liburcu
(package
(name "liburcu")
(version "0.11.1")
(version "0.12.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.lttng.org/files/urcu/"
"userspace-rcu-" version ".tar.bz2"))
(sha256
(base32
"0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj"))))
"15wzk3nyy6gh6i7xhksxzs8fjar1g4ddz51iahk1v7lq0vjip6s0"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl))) ; for tests
@ -149,7 +152,7 @@ (define-public liburcu
(define-public uthash
(package
(name "uthash")
(version "2.0.2")
(version "2.1.0")
(source
(origin
(method git-fetch)
@ -158,8 +161,7 @@ (define-public uthash
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0kslz8k6lssh7fl7ayzwlj62p0asxs3dq03357ls5ywjad238gqg"))))
(base32 "0k80bjbb6ss5wpmfmfji6xbyjm990hg9kcshwwnhdnh73vxkcd1m"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)))
@ -178,7 +180,7 @@ (define-public uthash
;; There is no top-level Makefile to do this for us.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name))
(doc (string-append out "/share/doc/" ,name "-" ,version))
(include (string-append out "/include")))
;; Don't install HTML files: they're just the below .txt files
;; dolled up, can be stale, and regeneration requires asciidoc.

7
gnu/packages/debian.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -117,7 +117,7 @@ (define-public ubuntu-keyring
(define-public debootstrap
(package
(name "debootstrap")
(version "1.0.119")
(version "1.0.123")
(source
(origin
(method git-fetch)
@ -126,8 +126,7 @@ (define-public debootstrap
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0p0p8qmlsbvpfa0r7ifghr67zrrc96d83r9qwahzaxyxkvnhr4x4"))))
(base32 "0fr5ir8arzisx71jybbk4xz85waz50lf2y052nfimzh6vv9dx54c"))))
(build-system gnu-build-system)
(arguments
`(#:phases

4
gnu/packages/diffoscope.scm
View file

@ -68,7 +68,7 @@ (define-module (gnu packages diffoscope)
#:use-module (ice-9 match))
(define-public diffoscope
(let ((version "138"))
(let ((version "139"))
(package
(name "diffoscope")
(version version)
@ -80,7 +80,7 @@ (define-public diffoscope
(file-name (git-file-name name version))
(sha256
(base32
"1lsxwyqaaxmin8h06l0352f0kh0l9brbqfn0zv8hmb64bp5r20nr"))))
"1k4yjyvmn5nfdapkwgkr9gzpn18kr4c58n0f32pfkx4yakfqkk4i"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases

4
gnu/packages/disk.scm
View file

@ -624,7 +624,7 @@ (define-public volume-key
(define-public ndctl
(package
(name "ndctl")
(version "67")
(version "68")
(source (origin
(method git-fetch)
(uri (git-reference
@ -633,7 +633,7 @@ (define-public ndctl
(file-name (git-file-name name version))
(sha256
(base32
"076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n"))))
"0xmim7z4qp6x2ggndnbwd940c73pa1qlf3hxyn3qh5pyr69nh9y8"))))
(build-system gnu-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)

6
gnu/packages/display-managers.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -199,7 +199,7 @@ (define-public lightdm
(define-public lightdm-gtk-greeter
(package
(name "lightdm-gtk-greeter")
(version "2.0.2")
(version "2.0.7")
(source (origin
(method url-fetch)
(uri (string-append
@ -208,7 +208,7 @@ (define-public lightdm-gtk-greeter
"/+download/lightdm-gtk-greeter-" version ".tar.gz"))
(sha256
(base32
"1436sdm83xqhxyr1rzqxhsl8if2xmidlvb341xcv6dv83lyxkrlf"))))
"1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"))))
(build-system gnu-build-system)
(native-inputs
`(("exo" ,exo)

17
gnu/packages/dns.scm
View file

@ -13,6 +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>
;;;
;;; This file is part of GNU Guix.
;;;
@ -75,7 +76,7 @@ (define-module (gnu packages dns)
(define-public dnsmasq
(package
(name "dnsmasq")
(version "2.80")
(version "2.81")
(source (origin
(method url-fetch)
(uri (string-append
@ -83,17 +84,7 @@ (define-public dnsmasq
version ".tar.xz"))
(sha256
(base32
"1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"))
(modules '((guix build utils)))
(snippet
'(begin
;; The SIOCGSTAMP ioctl is defined in <linux/sockios.h> instead
;; of <asm/sockios.h> starting with linux-libre-headers 5.2.
;; Remove this for dnsmasq versions > 2.80.
(substitute* "src/dnsmasq.h"
(("#if defined\\(HAVE_LINUX_NETWORK\\)" all)
(string-append all "\n#include <linux/sockios.h>")))
#t))))
"1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -315,7 +306,7 @@ (define-public libasr
(synopsis "Asynchronous resolver library by the OpenBSD project")
(description
"libasr is a free, simple and portable asynchronous resolver library.
It allows to run DNS queries and perform hostname resolutions in a fully
It runs DNS queries and performs hostname resolution in a fully
asynchronous fashion.")
(license (list license:isc
license:bsd-2 ; last part of getrrsetbyname_async.c

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

@ -1565,7 +1565,7 @@ (define-public emacs-dhall-mode
@itemize
@item Syntax highlighting
@item Multiline support for String
@item Basic indendation, commenting
@item Basic indentation, commenting
@item Automatic formatting on save using dhall-format.
@item Error highlighting.
@end itemize")
@ -2019,7 +2019,7 @@ (define-public emacs-google-maps
(build-system emacs-build-system)
(home-page "https://github.com/jd/google-maps.el")
(synopsis "Access Google Maps from Emacs")
(description "The @code{google-maps} package allows to display Google
(description "The @code{google-maps} package displays Google
Maps directly inside Emacs.")
(license license:gpl3+)))
@ -6912,7 +6912,7 @@ (define-public emacs-find-file-in-project
`(("ert-runner" ,emacs-ert-runner)))
(home-page "https://github.com/technomancy/find-file-in-project")
(synopsis "File/directory finder for Emacs")
(description "@code{find-file-in-project} allows to find files or
(description "@code{find-file-in-project} finds files or
directories quickly in the current project. The project root is detected
automatically when Git, Subversion or Mercurial are used. It also provides
functions to assist in reviewing changes on files.")
@ -7896,17 +7896,29 @@ (define-public emacs-lua-mode
(define-public emacs-ebuild-mode
(package
(name "emacs-ebuild-mode")
(version "1.37")
(source (origin
(method url-fetch)
(uri (string-append
"https://dev.gentoo.org/~ulm/emacs/ebuild-mode"
"-" version ".tar.xz"))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
"07dzrdjjczkxdfdgi60h4jjkvzi4p0k9rij2wpfp8s03ay3qldpp"))))
(version "1.50")
(source
(origin
(method url-fetch)
(uri (string-append
"https://dev.gentoo.org/~ulm/emacs/"
"ebuild-mode-" version ".tar.xz"))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32 "0bgi98vx6ahxijw69kfdiy3rkjdg7yi6k3bkjyasak5920m6fj1d"))))
(build-system emacs-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "ebuild-mode.info")
(install-file "ebuild-mode.info"
(string-append (assoc-ref outputs "out")
"/share/info"))
#t)))))
(native-inputs
`(("texinfo" ,texinfo)))
(home-page "https://devmanual.gentoo.org")
(synopsis "Major modes for Gentoo package files")
(description
@ -8476,6 +8488,17 @@ (define-public emacs-org
(sha256
(base32 "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
(let* ((share (string-append (assoc-ref outputs "out") "/share"))
(info-dir (string-append share "/info"))
(doc-dir (string-append share "/doc/" ,name "-" ,version)))
(install-file "org" info-dir)
(install-file "orgcard.pdf" doc-dir))
#t)))))
(home-page "https://orgmode.org/")
(synopsis "Outline-based notes management and organizer")
(description "Org is an Emacs mode for keeping notes, maintaining TODO
@ -12331,6 +12354,49 @@ (define-public emacs-pass
and can be consulted and modified.")
(license license:gpl3+)))
(define-public emacs-psc-ide
;; There is no proper release. The base version is extracted from the
;; "Version" keyword in the main file.
(let ((commit "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe")
(revision "1"))
(package
(name "emacs-psc-ide")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/purescript-emacs/psc-ide-emacs")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0r0fymyai30jimm34z1cmav4wgij8ci6s1d9y7qigygfbbfrdsmj"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-company" ,emacs-company)
("emacs-dash" ,emacs-dash)
("emacs-flycheck" ,emacs-flycheck)
("emacs-let-alist" ,emacs-let-alist)
("emacs-s" ,emacs-s)
("emacs-seq" ,emacs-seq)))
(home-page "https://github.com/purescript-emacs/psc-ide-emacs")
(synopsis "Emacs integration for PureScript's psc-ide tool")
(description
"This package provices Emacs integration for @code{psc-ide}, an IDE
protocol for PureScript programming language. It features:
@itemize
@item Completions
@item Type at point
@item Go to definition
@item Automatic imports
@item Case split
@item Build system integration, and
@item Flycheck support
@end itemize")
(license license:gpl3+))))
(define-public emacs-evil-anzu
(package
(name "emacs-evil-anzu")
@ -12418,8 +12484,8 @@ (define-public emacs-finalize
(home-page "https://github.com/skeeto/elisp-finalize")
(synopsis "Finalizers for Emacs Lisp")
(description
"This package will allows to immediately run a callback (a finalizer)
after its registered lisp object has been garbage collected. This allows for
"This package runs a callback (a finalizer)
after its registered lisp object has been garbage collected. This allows
extra resources, such as buffers and processes, to be cleaned up after the
object has been freed.")
(license license:unlicense)))
@ -12525,7 +12591,7 @@ (define-public emacs-closql
(home-page "https://github.com/emacscollective/closql")
(synopsis "Store EIEIO objects using EmacSQL")
(description
"This package allows to store uniform EIEIO objects in an EmacSQL
"This package stores uniform EIEIO objects in an EmacSQL
database. SQLite is used as backend. This library imposes some restrictions
on what kind of objects can be stored; it isn't intended to store arbitrary
objects. All objects have to share a common superclass and subclasses cannot
@ -13334,7 +13400,7 @@ (define-public emacs-md4rd
(home-page "https://github.com/ahungry/md4rd")
(synopsis "Emacs Mode for Reddit")
(description
"This package allows to read Reddit from within Emacs interactively.")
"This package allows reading Reddit from within Emacs interactively.")
(license license:gpl3+)))
(define-public emacs-pulseaudio-control
@ -13368,7 +13434,7 @@ (define-public emacs-pulseaudio-control
(home-page "https://github.com/flexibeast/pulseaudio-control")
(synopsis "Control @code{pulseaudio} from Emacs")
(description
"This package allows to control @code{pulseaudio} from Emacs.")
"This package allows controlling @code{pulseaudio} from Emacs.")
(license license:gpl3+))))
(define-public emacs-datetime
@ -13891,7 +13957,7 @@ (define-public emacs-mbsync
(build-system emacs-build-system)
(home-page "https://github.com/dimitri/mbsync-el")
(synopsis "Interface to mbsync for Emacs")
(description "This package allows to call the @code{mbsync} from
(description "This package calls @code{mbsync} from
within Emacs.")
(license license:gpl3+))))
@ -14087,7 +14153,7 @@ (define-public emacs-discover-my-major
`(("emacs-makey" ,emacs-makey)))
(home-page "https://framagit.org/steckerhalter/discover-my-major/")
(synopsis "Discover key bindings for the current Emacs major mode")
(description "This package provides allows to discover key bindings and
(description "This package discovers key bindings and
their meaning for the current Emacs major-mode.")
(license license:gpl3+)))
@ -17494,7 +17560,7 @@ (define-public emacs-buttercup
(home-page "https://github.com/jorgenschaefer/emacs-buttercup")
(synopsis "Behavior driven emacs lisp testing framework")
(description "Buttercup is a behavior-driven development framework for
testing Emacs Lisp code. It allows to group related tests so they can share
testing Emacs Lisp code. It groups related tests so they can share
common set-up and tear-down code, and allows the programmer to \"spy\" on
functions to ensure they are called with the right arguments during testing.")
(license license:gpl3+)))
@ -22299,7 +22365,7 @@ (define-public emacs-objed
(home-page "https://github.com/clemera/objed")
(synopsis "Navigate and edit text objects")
(description
"@code{emacs-objed} allows to navigate and edit text objects. It
"@code{emacs-objed} allows navigating and editing text objects. It
enables modal editing and composition of commands, too. It combines ideas of
other Editors like Vim or Kakoune and tries to align them with regular Emacs
conventions.")

4
gnu/packages/finance.scm
View file

@ -390,11 +390,11 @@ (define-public geierlein
(synopsis "Free Elster client, for sending Germany VAT declarations")
(description
"Geierlein is a free Elster client, i.e. an application that
allows to send VAT declarations to Germany's fiscal authorities.
sends VAT declarations to Germany's fiscal authorities.
Currently it is *not* possible to send returns that are due annually
(especially the income tax return) since the fiscal authority doesn't
allow to do that off the ERiC library (which is proprietary however).
allow doing that off the ERiC library (which is proprietary however).
It's not clear at the moment whether one day it will be possible to
do so.")
(license license:agpl3+)))

4
gnu/packages/freedesktop.scm
View file

@ -1671,8 +1671,8 @@ (define-public udiskie
(home-page "https://github.com/coldfix/udiskie")
(synopsis "Automounter for removable media")
(description
"The @command{udiskie} program is a udisks2 front-end that allows to
manage removable media such as CDs or flash drives from userspace.
"The @command{udiskie} program is a udisks2 front-end that
manages removable media such as CDs or flash drives from userspace.
Its features include:

19
gnu/packages/games.scm
View file

@ -2961,20 +2961,14 @@ (define-public manaplus
(define openttd-engine
(package
(name "openttd-engine")
(version "1.9.3")
(version "1.10.0")
(source
(origin (method url-fetch)
(uri (string-append "https://proxy.binaries.openttd.org/openttd-releases/"
(uri (string-append "https://cdn.openttd.org/openttd-releases/"
version "/openttd-" version "-source.tar.xz"))
(sha256
(base32
"0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"))
(modules '((guix build utils)))
(snippet
;; The DOS port contains proprietary software.
'(begin
(delete-file-recursively "os/dos")
#t))))
"0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no "check" target
@ -3024,15 +3018,15 @@ (define openttd-engine
(define openttd-opengfx
(package
(name "openttd-opengfx")
(version "0.5.5")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://binaries.openttd.org/extra/opengfx/"
(uri (string-append "https://cdn.openttd.org/opengfx-releases/"
version "/opengfx-" version "-source.tar.xz"))
(sha256
(base32
"009fa1bdin1bk0ynzhzc30hzkmmwzmwkk6j591ax3f6w75l28n49"))))
"0qxc6gl2gxcrn1np88dnjgbaaakkkx96b13rcmy1spryc8c09hyr"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags (list "CC=gcc"
@ -3062,6 +3056,7 @@ (define openttd-opengfx
("gimp" ,gimp)
("grfcodec" ,grfcodec)
("nml" ,nml)
("which" ,which)
("python" ,python-2)))
(home-page "http://dev.openttdcoop.org/projects/opengfx")
(synopsis "Base graphics set for OpenTTD")

6
gnu/packages/geo.scm
View file

@ -1153,8 +1153,8 @@ (define-public java-jmapviewer
(copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar"))))))))
(home-page "https://wiki.openstreetmap.org/wiki/JMapViewer")
(synopsis "OSM map integration in Java")
(description "JMapViewer is a Java component which allows to easily
integrate an OSM map view into your Java application. It is maintained as
(description "JMapViewer is a Java component which easily
integrates an OSM map view into your Java application. It is maintained as
an independent project by the JOSM team.")
(license license:gpl2)))
@ -1292,7 +1292,7 @@ (define-public josm
(synopsis "OSM editor")
(description "JOSM is an extensible editor for OpenStreetMap (OSM). It
supports loading GPX tracks, background imagery and OSM data from local
sources as well as from online sources and allows to edit the OSM data (nodes,
sources as well as from online sources and allows editing the OSM data (nodes,
ways, and relations) and their metadata tags.")
(license license:gpl2+)))

83
gnu/packages/gimp.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
@ -191,7 +191,7 @@ (define-public gimp
("gexiv2" ,gexiv2)
("gtk+" ,gtk+-2)
("libmypaint" ,libmypaint)
("mypaint-brushes" ,mypaint-brushes)
("mypaint-brushes" ,mypaint-brushes-1.3)
("exif" ,libexif) ; optional, EXIF + XMP support
("lcms" ,lcms) ; optional, color management
("librsvg" ,librsvg) ; optional, SVG support
@ -278,7 +278,7 @@ (define-public gimp-fourier
(define-public libmypaint
(package
(name "libmypaint")
(version "1.3.0")
(version "1.5.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mypaint/libmypaint/"
@ -286,7 +286,7 @@ (define-public libmypaint
version ".tar.xz"))
(sha256
(base32
"0wd6jk69vmhsq1mdw96v0fh7b28n3glkr5ca466zcq7agzaxj1va"))))
"0aqcv4fyscpfhknxgfpq0v84aj2nzigqvpi4zgv2zkl41h51by5f"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@ -306,34 +306,42 @@ (define-public libmypaint
(define-public mypaint-brushes
(package
(name "mypaint-brushes")
(version "1.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Jehan/mypaint-brushes.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"))))
(version "2.0.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mypaint/mypaint-brushes.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'relax-dependency-version
(lambda _
(substitute* "autogen.sh"
(("automake-1.13") "automake")
(("aclocal-1.13") "aclocal"))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
(synopsis "Default brushes for MyPaint")
(description "This package provides the default set of brushes for
MyPaint.")
(home-page "https://github.com/Jehan/mypaint-brushes")
(license license:cc0)))
(home-page "https://github.com/mypaint/mypaint-brushes/")
;; Scripts are distributed under GPL2+ terms, brushes are provided as
;; public domain or under CC0 terms.
(license (list license:gpl2+ license:cc0 license:public-domain))))
(define-public mypaint-brushes-1.3
(package
(inherit mypaint-brushes)
(name "mypaint-brushes")
(version "1.3.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mypaint/mypaint-brushes.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j"))))))
(define-public gimp-resynthesizer
;; GIMP does not respect any plugin search path environment variable, so after
@ -345,13 +353,14 @@ (define-public gimp-resynthesizer
(version "2.0.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/bootchk/resynthesizer/archive/v"
version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/bootchk/resynthesizer")
(commit (string-append "v" version))))
(sha256
(base32
"0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr"))
(file-name (string-append name "-" version ".tar.gz"))))
"1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
`( ;; Turn off tests to avoid:
@ -359,11 +368,11 @@ (define-public gimp-resynthesizer
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-env
(lambda _
(setenv "CONFIG_SHELL" (which "sh"))
#t))
(add-after 'configure 'set-prefix
(add-after 'unpack 'set-env
(lambda _
(setenv "CONFIG_SHELL" (which "sh"))
#t))
(add-after 'configure 'set-prefix
;; Install plugin under $prefix, not under GIMP's libdir.
(lambda* (#:key outputs #:allow-other-keys)
(let ((target (string-append (assoc-ref outputs "out")
@ -372,8 +381,8 @@ (define-public gimp-resynthesizer
(package-version gimp))
".0")))
(substitute* (list "src/resynthesizer/Makefile"
"src/resynthesizer-gui/Makefile")
(("GIMP_LIBDIR = .*")
"src/resynthesizer-gui/Makefile")
(("GIMP_LIBDIR = .*")
(string-append "GIMP_LIBDIR = " target "\n")))
(mkdir-p target)
#t))))))

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

@ -359,7 +359,7 @@ (define-public gnome-shell-extension-hide-app-icon
(propagated-inputs
`(("glib" ,glib)))
(synopsis "Hide app icon from GNOME's panel")
(description "This extension allows to hide the icon and/or title of the
(description "This extension hides the icon and/or title of the
currently focused application in the top panel of the GNOME shell.")
(home-page
"https://github.com/michael-rapp/gnome-shell-extension-hide-app-icon/")

6
gnu/packages/gnome.scm
View file

@ -9162,7 +9162,7 @@ (define-public soundconverter
(define-public workrave
(package
(name "workrave")
(version "1.10.37")
(version "1.10.42")
(source
(origin
(method git-fetch)
@ -9173,7 +9173,7 @@ (define-public workrave
version)))))
(file-name (git-file-name name version))
(sha256
(base32 "01cxy7606hx9wgxl550l4p2xa9hsy0rk7swsp58hyi842z2z0y13"))))
(base32 "03i9kk8r1wgrfkkbwikx8wxaw4r4kn62vismr2zdq5g34fkkjh95"))))
(build-system glib-or-gtk-build-system)
(arguments
;; The only tests are maintainer tests (in po/), which fail.
@ -9640,7 +9640,7 @@ (define-public gamin
(description
"Gamin is a file and directory monitoring system defined to be a subset
of the FAM (File Alteration Monitor) system. This is a service provided by a
library which allows to detect when a file or a directory has been modified.")
library which detects when a file or a directory has been modified.")
(license license:gpl2+)))
(define-public gnome-mahjongg

2
gnu/packages/golang.scm
View file

@ -3281,7 +3281,7 @@ (define-public go-golang.org-x-sync-errgroup
(synopsis "Synchronization, error propagation, and Context cancellation
for groups of goroutines working on subtasks of a common task.")
(description "This package provides synchronization, error propagation,
and Context cancelation for groups of goroutines working on subtasks of a
and Context cancellation for groups of goroutines working on subtasks of a
common task.")
(home-page "https://godoc.org/golang.org/x/sync/errgroup")
(license license:bsd-3))))

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

@ -5,14 +5,14 @@
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2016, 2019 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019, 2020 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2016 Amirouche <amirouche@hypermove.net>
;;; Copyright © 2016, 2019 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -1140,7 +1140,7 @@ (define-public guile-mastodon
(define-public guile-parted
(package
(name "guile-parted")
(version "0.0.2")
(version "0.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1149,20 +1149,8 @@ (define-public guile-parted
(file-name (git-file-name name version))
(sha256
(base32
"01qmv6xnbbq3wih0dl9bscvca2d7zx7bjiqf35y6dkaqsp8nvdxf"))
(modules '((guix build utils)))
(snippet
'(begin
;; Allow builds with Guile 3.0.
(substitute* "configure.ac"
(("^GUILE_PKG.*")
"GUILE_PKG([3.0 2.2 2.0])\n"))
;; Remove "guile.m4" since it contains an obsolete version
;; of 'GUILE_PKG' that doesn't work with development
;; versions such as 2.9.
(delete-file "m4/guile.m4")
#t))))
"0kwi777fhfb4rq6fik9bwqzr63k82qjl94dm5lyyyal4rh724xrc"))
(modules '((guix build utils)))))
(build-system gnu-build-system)
(arguments
'(#:make-flags
@ -2186,14 +2174,14 @@ (define-public guile3.0-commonmark
(define-public mcron
(package
(name "mcron")
(version "1.1.3")
(version "1.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mcron/mcron-"
version ".tar.gz"))
(sha256
(base32
"00kv7fgllzjpis0g1m9csycp4f6l11774m09dqy255cvmim2g743"))))
"1521w3h33bhdlg6qc66sq4dwv3qsx8r8x6srq4ca6kaahy6dszw8"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases

2
gnu/packages/haskell-xyz.scm
View file

@ -10780,7 +10780,7 @@ (define-public ghc-smallcheck
(home-page
"https://github.com/feuerbach/smallcheck")
(synopsis "Property-based testing library")
(description "SmallCheck is a testing library that allows to verify
(description "SmallCheck is a testing library that verifies
properties for all test cases up to some depth. The test cases are generated
automatically by SmallCheck.")
(license license:bsd-3)))

20
gnu/packages/icu4c.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
@ -114,6 +114,24 @@ (define-public icu4c-build-root
#t)))))))
(native-inputs '())))
(define-public icu4c-66.1
(package
(inherit icu4c)
(version "66.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/unicode-org/icu/releases/download/release-"
(string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
"/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
(patch-flags '("-p2"))
(patches (search-patches "icu4c-CVE-2020-10531.patch"))
(sha256
(base32
"0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"))))))
(define-public java-icu4j
(package
(name "java-icu4j")

6
gnu/packages/irc.scm
View file

@ -170,14 +170,14 @@ (define-public irssi
(define-public weechat
(package
(name "weechat")
(version "2.7.1")
(version "2.8")
(source (origin
(method url-fetch)
(uri (string-append "https://weechat.org/files/src/weechat-"
version ".tar.xz"))
(sha256
(base32
"0haw0c35mf4r47j24issc9caq0da3fy7gjfq3454fm3ap3n2yxcx"))))
"1301lrb3xnm9dcw3av82rkqjzqxxwwhrq0p6i37h6fxdxnas4gjm"))))
(build-system cmake-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@ -193,7 +193,7 @@ (define-public weechat
("zlib" ,zlib)
;; Scripting language plug-ins.
("guile" ,guile-2.2)
("guile" ,guile-3.0)
("lua" ,lua-5.1)
("perl" ,perl)
("python" ,python)

8
gnu/packages/java.scm
View file

@ -4422,7 +4422,7 @@ (define-public java-asm
(description "ASM is an all purpose Java bytecode manipulation and
analysis framework. It can be used to modify existing classes or dynamically
generate classes, directly in binary form. The provided common
transformations and analysis algorithms allow to easily assemble custom
transformations and analysis algorithms allow easily assembling custom
complex transformations and code analysis tools.")
(license license:bsd-3)))
@ -7426,7 +7426,7 @@ (define-public java-microemulator-cldc
(home-page "https://github.com/barteo/microemu")
(synopsis "J2ME CLDC emulator")
(description "Microemulator is a Java 2 Micro Edition (J2ME) CLDC/MIDP
Emulator. It allows to demonstrate MIDlet based applications in web browser
Emulator. It demonstrates MIDlet based applications in web browser
applet and can be run as a standalone java application.")
(license (list license:asl2.0
;; or altenatively:
@ -8821,7 +8821,7 @@ (define-public java-hdrhistogram
("hamcrest" ,java-hamcrest-core)))
(home-page "https://hdrhistogram.github.io/HdrHistogram")
(synopsis "High dynamic range histogram")
(description "Hdrhistogram allows to create histograms that support
(description "Hdrhistogram creates histograms that support
recording and analyzing sampled data value counts across a configurable integer
value range with configurable value precision within the range. Value precision
is expressed as the number of significant digits in the value recording, and
@ -11651,7 +11651,7 @@ (define-public java-jsonp-api
(description "JSON Processing (JSON-P) is a Java API to process (e.g.
parse, generate, transform and query) JSON messages. It produces and
consumes JSON text in a streaming fashion (similar to StAX API for XML)
and allows to build a Java object model for JSON text using API classes
and allows building a Java object model for JSON text using API classes
(similar to DOM API for XML).")
;; either gpl2 only with classpath exception, or epl2.0.
(license (list license:gpl2

2
gnu/packages/julia.scm
View file

@ -409,7 +409,7 @@ (define-public julia
("openlibm" ,openlibm)
("mbedtls" ,mbedtls-apache)
("curl" ,curl)
("libgit2" ,libgit2)
("libgit2" ,libgit2-0.28)
("libssh2" ,libssh2)
("fortran" ,gfortran)
("libuv" ,libuv-julia)

2
gnu/packages/kde-internet.scm
View file

@ -452,7 +452,7 @@ (define-public libgravatar
`(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
(home-page "https://cgit.kde.org/libgravatar.git")
(synopsis "Online avatar lookup library")
(description "This library allows to retrieve avatar images based on a
(description "This library retrieves avatar images based on a
hash from a person's email address, as well as local caching to avoid
unnecessary network operations.")
(license ;; GPL for programs, LGPL for libraries

2
gnu/packages/kde-multimedia.scm
View file

@ -191,7 +191,7 @@ (define-public elisa
(home-page "https://kde.org/applications/multimedia/org.kde.elisa")
(synopsis "Powerful music player for Plasma 5")
(description "Elisa is a simple music player aiming to provide a nice
experience for its users. Elisa allows to browse music by album, artist or
experience for its users. Elisa browses music by album, artist or
all tracks. The music is indexed using either a private indexer or an indexer
using Baloo. The private one can be configured to scan music on chosen paths.
The Baloo one is much faster because Baloo is providing all needed data from

8
gnu/packages/kde-pim.scm
View file

@ -623,7 +623,7 @@ (define-public kdav
("qtxmlpatterns" ,qtxmlpatterns)))
(home-page "https://cgit.kde.org/kdav.git")
(synopsis "DAV protocol implementation with KJobs")
(description "This is a DAV protocol implemention with KJobs. Calendars
(description "This is a DAV protocol implementation with KJobs. Calendars
and todos are supported, using either GroupDAV or CalDAV, and contacts are
supported using GroupDAV or CardDAV.")
(license ;; GPL for programs, LGPL for libraries
@ -670,7 +670,7 @@ (define-public kdepim-apps-libs
("qtbase" ,qtbase)))
(home-page "https://cgit.kde.org/kdepim-apps-libs.git")
(synopsis "KDE PIM mail related libraries and data files")
(description "This packages provides mail related libraries and data files
(description "This package provides mail related libraries and data files
for KDE PIM.")
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
@ -1095,7 +1095,7 @@ (define-public kmail
(description "KMail supports multiple accounts, mail filtering and email
encryption. The program let you configure your workflow and it has good
integration into KDE (Plasma Desktop) but is also useable with other Desktop
Envionments.
Environments.
KMail is the email component of Kontact, the integrated personal information
manager from KDE.")
@ -1346,7 +1346,7 @@ (define-public kmessagelib
`(#:tests? #f)) ;; TODO many test fail for quite different reasons
(home-page "https://cgit.kde.org/messagelib.git")
(synopsis "KDE PIM messaging libraries")
(description "This packages provides several libraries for messages,
(description "This package provides several libraries for messages,
e.g. a message list, a mime tree parse, a template parser and the
kwebengineviewer.")
(license ;; GPL for programs, LGPL for libraries

2
gnu/packages/kde-systemtools.scm
View file

@ -83,7 +83,7 @@ (define-public dolphin
(description "Dolphin is a file manager for KDE focusing on usability.
The main features of Dolphin are:
@itemize
@item Navigation bar for URLs, which allows to navigate quickly
@item Navigation bar for URLs, which navigates quickly
through the file hierarchy.
@item View properties are remembered for each folder.
@item Split of views is supported.

2
gnu/packages/linphone.scm
View file

@ -101,7 +101,7 @@ (define-public bctoolbox
("mbedtls" ,mbedtls-apache)))
(synopsis "Belledonne Communications Tool Box")
(description "BcToolBox is an utilities library used by Belledonne
Communications softwares like belle-sip, mediastreamer2 and linphone.")
Communications software like belle-sip, mediastreamer2 and linphone.")
(home-page "https://gitlab.linphone.org/BC/public/bctoolbox")
(license license:gpl2+)))

8
gnu/packages/linux.scm
View file

@ -1534,16 +1534,16 @@ (define-public usbutils
(define-public e2fsprogs
(package
(name "e2fsprogs")
(version "1.45.5")
(version "1.45.6")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kernel.org/linux/kernel/people/tytso/"
name "/v" version "/"
name "-" version ".tar.xz"))
"e2fsprogs/v" version "/"
"e2fsprogs-" version ".tar.xz"))
(sha256
(base32
"1pmf8inp736l587rqq7qsd8bv0mmg5cwrivxg5p5awqgv70crypr"))))
"0mj2yizwygs7xww8jfy5mxjn8ww4pvc0b1hg1p2vsnirailsx9zz"))))
(build-system gnu-build-system)
(inputs `(("util-linux" ,util-linux "lib")))
(native-inputs `(("pkg-config" ,pkg-config)

2
gnu/packages/lirc.scm
View file

@ -98,7 +98,7 @@ (define-public lirc
"LIRC allows computers to send and receive IR signals of many commonly
used remote controls. The most important part of LIRC is the @code{lircd}
daemon that decodes IR signals received by the device drivers. The second
daemon program @code{lircmd} allows to translate IR signals to mouse movements.
daemon program @code{lircmd} translates IR signals to mouse movements.
The user space applications allow you to control your computer with a remote
control: you can send X events to applications, start programs and much more
on just one button press.")

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

@ -10,7 +10,7 @@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
@ -53,6 +53,7 @@ (define-module (gnu packages lisp-xyz)
#:use-module (gnu packages c)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages enchant)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages imagemagick)
@ -2785,8 +2786,8 @@ (define-public sbcl-unix-opts
options once and then use this definition for parsing and extraction of
command line arguments, as well as printing description of command line
options (you get --help for free). This way you don't need to repeat
yourself. Also, @command{unix-opts} doesn't depend on anything and allows to
precisely control behavior of the parser via Common Lisp restarts.")
yourself. Also, @command{unix-opts} doesn't depend on anything and
precisely controls the behavior of the parser via Common Lisp restarts.")
(license license:expat)))
(define-public cl-unix-opts
@ -3046,10 +3047,10 @@ (define-public cl-cffi-gtk
(sbcl-package->cl-source-package sbcl-cl-cffi-gtk))
(define-public sbcl-cl-webkit
(let ((commit "4832c99c31e0eb1fcce3779d119343ae8a423952"))
(let ((commit "d97115ca601838dfa60ea7afbb88641d7a526dba"))
(package
(name "sbcl-cl-webkit")
(version (git-version "2.4" "1" commit))
(version (git-version "2.4" "2" commit))
(source
(origin
(method git-fetch)
@ -3059,7 +3060,7 @@ (define-public sbcl-cl-webkit
(file-name (git-file-name "cl-webkit" version))
(sha256
(base32
"0sn7m181wfg1q49q45dlsry8c38x7pziqcs0frnymk6yvgndybxd"))))
"0sdb2l2h5xv5c1m2mfq31i9yl6zjf512fvwwzlvk9nvisyhc4xi3"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cffi" ,sbcl-cffi)
@ -5508,7 +5509,7 @@ (define-public sbcl-ieee-floats
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(synopsis "IEEE 754 binary representation for floats in Common Lisp")
(description "This is a Common Lisp library that allows to convert
(description "This is a Common Lisp library that converts
floating point values to IEEE 754 binary representation.")
(license license:bsd-3))))
@ -6422,7 +6423,7 @@ (define-public cl-dbus
("cl-xmlspam" ,sbcl-cl-xmlspam)
("ironclad" ,sbcl-ironclad)))
(synopsis "D-Bus client library for Common Lisp")
(description "This is a Common Lisp library that allows to publish D-Bus
(description "This is a Common Lisp library that publishes D-Bus
objects as well as send and notify other objects connected to a bus.")
(license license:bsd-2))))
@ -11318,3 +11319,42 @@ (define-public sbcl-trivial-package-local-nicknames
(define-public cl-trivial-package-local-nicknames
(sbcl-package->cl-source-package sbcl-trivial-package-local-nicknames))
(define-public sbcl-enchant
(let ((commit "6af162a7bf10541cbcfcfa6513894900329713fa"))
(package
(name "sbcl-enchant")
(version (git-version "0.0.0" "1" commit))
(home-page "https://github.com/tlikonen/cl-enchant")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "19yh5ihirzi1d8xqy1cjqipzd6ly3245cfxa5s9xx496rryz0s01"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("enchant" ,enchant)
("cffi" ,sbcl-cffi)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "load-enchant.lisp"
(("libenchant")
(string-append
(assoc-ref inputs "enchant") "/lib/libenchant-2"))))))))
(synopsis "Common Lisp interface for the Enchant spell-checker library")
(description
"Enchant is a Common Lisp interface for the Enchant spell-checker
library. The Enchant library is a generic spell-checker library which uses
other spell-checkers transparently as back-end. The library supports the
multiple checkers, including Aspell and Hunspell.")
(license license:public-domain))))
(define-public cl-enchant
(sbcl-package->cl-source-package sbcl-enchant))

2
gnu/packages/llvm.scm
View file

@ -883,7 +883,7 @@ (define-public emacs-clang-format
(string-append clang "/bin/clang-format"))))
#t)))))
(synopsis "Format code using clang-format")
(description "This package allows to filter code through @code{clang-format}
(description "This package filters code through @code{clang-format}
to fix its formatting. @code{clang-format} is a tool that formats
C/C++/Obj-C code according to a set of style options, see
@url{https://clang.llvm.org/docs/ClangFormatStyleOptions.html}.")))

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

@ -570,8 +570,8 @@ (define (delete-ifdefs file)
(synopsis "Machine learning toolbox")
(description
"The Shogun Machine learning toolbox provides a wide range of unified and
efficient Machine Learning (ML) methods. The toolbox seamlessly allows to
combine multiple data representations, algorithm classes, and general purpose
efficient Machine Learning (ML) methods. The toolbox seamlessly
combines multiple data representations, algorithm classes, and general purpose
tools. This enables both rapid prototyping of data pipelines and extensibility
in terms of new algorithms.")
(license license:gpl3+)))

4
gnu/packages/maths.scm
View file

@ -5018,7 +5018,7 @@ (define-public dune-subgrid
("pkg-config" ,pkg-config)))
(home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php")
(synopsis "Distributed and Unified Numerics Environment")
(description "The dune-subgrid module allows to mark elements of
(description "The dune-subgrid module marks elements of
another hierarchical dune grid. The set of marked elements can then be
accessed as a hierarchical dune grid in its own right. Dune-Subgrid
provides the full grid interface including adaptive mesh refinement.")
@ -5485,7 +5485,7 @@ (define-public libqalculate
It provides basic and advanced functionality. Features include customizable
functions, unit calculations, and conversions, physical constants, symbolic
calculations (including integrals and equations), arbitrary precision,
uncertainity propagation, interval arithmetic, plotting and a user-friendly
uncertainty propagation, interval arithmetic, plotting and a user-friendly
cli.")
(license license:gpl2+)))

1
gnu/packages/matrix.scm
View file

@ -20,6 +20,7 @@ (define-module (gnu packages matrix)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
#:use-module (gnu packages monitoring)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)

108
gnu/packages/messaging.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
@ -728,68 +728,52 @@ (define-public gajim-omemo
(license license:gpl3+)))
(define-public dino
;; The only release tarball is for version 0.0, but it is very old and fails
;; to build.
(let ((commit "8e14ac6d714b7f88e16de31a6c795e811dc27417")
(revision "4"))
(package
(name "dino")
(version (git-version "0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dino/dino.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0xfmwnc2f8lsvmp7m8ggikzqjaw5z6wmxrv6j5ljha5ckffrdd9m"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests
#:parallel-build? #f ; not supported
; Use our libsignal-protocol-c instead of the git submodule.
#:configure-flags '("-DSHARED_SIGNAL_PROTOCOL=yes")
#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build cmake-build-system)
(guix build glib-or-gtk-build-system))
#:phases
(modify-phases %standard-phases
;; The signal-protocol plugin accesses internal headers of
;; libsignal-protocol-c, so we need to put the sources there.
(add-after 'unpack 'unpack-sources
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "plugins/signal-protocol/libsignal-protocol-c"
(invoke "tar" "xvf"
(assoc-ref inputs "libsignal-protocol-c-source")
"--strip-components=1"))))
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs
`(("libgee" ,libgee)
("libsignal-protocol-c" ,libsignal-protocol-c)
("libgcrypt" ,libgcrypt)
("libsoup" ,libsoup)
("qrencode" ,qrencode)
("sqlite" ,sqlite)
("gpgme" ,gpgme)
("gtk+" ,gtk+)
("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(native-inputs
`(("pkg-config" ,pkg-config)
("libsignal-protocol-c-source" ,(package-source libsignal-protocol-c))
("glib" ,glib "bin")
("vala" ,vala)
("gettext" ,gettext-minimal)))
(home-page "https://dino.im")
(synopsis "Graphical Jabber (XMPP) client")
(description "Dino is a Jabber (XMPP) client which aims to fit well into
(package
(name "dino")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/dino/dino/releases/download/v"
version "/dino-" version ".tar.gz"))
(sha256
(base32
"0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f
#:parallel-build? #f ; not supported
#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build cmake-build-system)
(guix build glib-or-gtk-build-system))
#:phases
(modify-phases %standard-phases
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs
`(("libgee" ,libgee)
("libsignal-protocol-c" ,libsignal-protocol-c)
("libgcrypt" ,libgcrypt)
("libsoup" ,libsoup)
("qrencode" ,qrencode)
("sqlite" ,sqlite)
("gpgme" ,gpgme)
("gtk+" ,gtk+)
("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin")
("vala" ,vala)
("gettext" ,gettext-minimal)))
(home-page "https://dino.im")
(synopsis "Graphical Jabber (XMPP) client")
(description "Dino is a Jabber (XMPP) client which aims to fit well into
a graphical desktop environment like GNOME.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public prosody
(package

6
gnu/packages/monitoring.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -371,14 +372,13 @@ (define-public python2-graphite-web
(define-public python-prometheus-client
(package
(name "python-prometheus-client")
(version "0.5.0")
(version "0.7.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "prometheus_client" version))
(sha256
(base32
"0g7rpv1pq2lab1nfqdx98z9d3bqwc400alg1j4ynrpjkrbsizhg8"))))
(base32 "1ni2yv4ixwz32nz39ckia76lvggi7m19y5f702w5qczbnfi29kbi"))))
(build-system python-build-system)
(arguments
'(;; No included tests.

6
gnu/packages/ocaml.scm
View file

@ -1179,7 +1179,7 @@ (define-public ocaml-qcheck
(home-page "https://github.com/c-cube/qcheck")
(synopsis "QuickCheck inspired property-based testing for OCaml")
(description "QuickCheck inspired property-based testing for OCaml. This
module allows to check invariants (properties of some types) over randomly
module checks invariants (properties of some types) over randomly
generated instances of the type. It provides combinators for generating
instances and printing them.")
(license license:lgpl3+)))
@ -1534,7 +1534,7 @@ (define-public ocaml-mtime
(delete 'configure))))
(home-page "http://erratique.ch/software/mtime")
(synopsis "Monotonic wall-clock time for OCaml")
(description "Access monotonic wall-clock time. It allows to measure time
(description "Access monotonic wall-clock time. It measures time
spans without being subject to operating system calendar time adjustments.")
(license license:isc)))
@ -2266,7 +2266,7 @@ (define-public ocamlify
`(("ocamlbuild" ,ocamlbuild)))
(home-page "https://forge.ocamlcore.org/projects/ocamlify")
(synopsis "Include files in OCaml code")
(description "OCamlify allows to create OCaml source code by including
(description "OCamlify creates OCaml source code by including
whole files into OCaml string or string list. The code generated can be
compiled as a standard OCaml file. It allows embedding external resources as
OCaml code.")

10
gnu/packages/password-utils.scm
View file

@ -12,7 +12,7 @@
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
@ -119,7 +119,7 @@ (define-public pwgen
(define-public keepassxc
(package
(name "keepassxc")
(version "2.5.3")
(version "2.5.4")
(source
(origin
(method url-fetch)
@ -127,7 +127,7 @@ (define-public keepassxc
"/releases/download/" version "/keepassxc-"
version "-src.tar.xz"))
(sha256
(base32 "1sx647mp1xikig50p9bb6vxv18ymdfj3wkxj6qfdr1zfcv7gn005"))))
(base32 "0jndssyvpl8bc5i2q3d6kq1ppynchxx9nvp1qhd2pc0qqc0hhpm5"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DWITH_XC_ALL=YES"
@ -846,8 +846,8 @@ (define-public pass-git-helper
("python-pytest-mock" ,python-pytest-mock)))
(home-page "https://github.com/languitar/pass-git-helper")
(synopsis "Git credential helper interfacing with pass")
(description "pass-git-helper is a git credential helper which allows to
use pass, the standard unix password manager, as the credential backend for
(description "pass-git-helper is a git credential helper which
uses pass, the standard unix password manager, as the credential backend for
your git repositories. This is achieved by explicitly defining mappings
between hosts and entries in the password store.")
(license license:lgpl3+)))

6
gnu/packages/pdf.scm
View file

@ -135,7 +135,7 @@ (define-public flyer-composer
times. If you have a second page, Flyer Composer can arrange it the same way
- even if the second page is in a separate PDF file.
This package contains both the commnd line tool and the gui too.")
This package contains both the command line tool and the gui too.")
(license license:agpl3+)))
(define-public flyer-composer-cli
@ -162,7 +162,7 @@ (define-public flyer-composer-cli
times. If you have a second page, Flyer Composer can arrange it the same way
- even if the second page is in a separate PDF file.
This package contains only the commnd line tool. If you like to use the gui,
This package contains only the command line tool. If you like to use the gui,
please install the @code{flyer-composer-gui} package.")))
(define-public poppler
@ -885,7 +885,7 @@ (define-public xournalpp
@item Fill shape functionality
@item PDF Export (with and without paper style)
@item PNG Export (with and without transparent background)
@item Allow to map different tools / colors etc. to stylus buttons /
@item Map different tools / colors etc. to stylus buttons /
mouse buttons
@item Sidebar with Page Previews with advanced page sorting, PDF
Bookmarks and Layers (can be individually hidden, editing layer can be

2
gnu/packages/perl.scm
View file

@ -343,7 +343,7 @@ (define-public perl-attribute-util
(build-system perl-build-system)
(home-page "https://metacpan.org/pod/Attribute::Util")
(synopsis "Assorted general utility attributes")
(description "This packages provides various utility functions. When used
(description "This package provides various utility functions. When used
without argument, this module provides four universally accessible attributes
of general interest as follows:
@itemize

31
gnu/packages/python-xyz.scm
View file

@ -2832,8 +2832,7 @@ (define-public python-pyyaml
"PyYAML is a YAML parser and emitter for Python. PyYAML features a
complete YAML 1.1 parser, Unicode support, pickle support, capable extension
API, and sensible error messages. PyYAML supports standard YAML tags and
provides Python-specific tags that allow to represent an arbitrary Python
object.")
provides Python-specific tags that represent an arbitrary Python object.")
(license license:expat)))
(define-public python2-pyyaml
@ -3562,7 +3561,7 @@ (define-public python-rst.linker
;; Note: As of version 1.7 the documentation is not worth building.
(home-page "https://github.com/jaraco/rst.linker")
(synopsis "Sphinx plugin to add links and timestamps")
(description "rst.linker allows to automatically replace text by a
(description "rst.linker automatically replaces text by a
reStructuredText external reference or timestamps. It's primary purpose is to
augment the changelog, but it can be used for other documents, too.")
(license license:expat)))
@ -12738,7 +12737,7 @@ (define-public python-setproctitle
Changing the title is mostly useful in multi-process systems, for
example when a master process is forked: changing the children's title
allows to identify the task each process is busy with. The technique
allows identifying the task each process is busy with. The technique
is used by PostgreSQL and the OpenSSH Server for example.")
(license license:bsd-3)
(properties `((python2-variant . ,(delay python2-setproctitle))))))
@ -19141,7 +19140,7 @@ (define-public python-pifpaf
(home-page "https://github.com/jd/pifpaf")
(synopsis "Tools and fixtures to manage daemons for testing in Python")
(description "Pifpaf is a suite of fixtures and a command-line tool that
allows to start and stop daemons for a quick throw-away usage. This is typically
starts and stops daemons for a quick throw-away usage. This is typically
useful when needing these daemons to run integration testing. It originally
evolved from its precursor @code{overtest}.")
(license license:asl2.0)))
@ -19349,28 +19348,6 @@ (define-public python-pymacaroons
enforcement of that policy.")
(license license:expat)))
(define-public python-prometheus-client
(package
(name "python-prometheus-client")
(version "0.7.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "prometheus_client" version))
(sha256
(base32 "1ni2yv4ixwz32nz39ckia76lvggi7m19y5f702w5qczbnfi29kbi"))))
(build-system python-build-system)
(arguments
;; TODO: No tests in the PyPI distribution.
`(#:tests? #f))
(propagated-inputs
`(("python-twisted" ,python-twisted)))
(home-page "https://github.com/prometheus/client_python")
(synopsis "Prometheus instrumentation library")
(description
"This is the official Python client for the Prometheus monitoring server.")
(license license:asl2.0)))
(define-public python-ldap3
(package
(name "python-ldap3")

4
gnu/packages/ruby.scm
View file

@ -1810,8 +1810,8 @@ (define-public ruby-notiffany
("ruby-nenv" ,ruby-nenv)))
(native-inputs
`(("bundler" ,bundler)))
(synopsis "Wrapper libray for notification libraries")
(description "Notiffany is a Ruby wrapper libray for notification
(synopsis "Wrapper library for notification libraries")
(description "Notiffany is a Ruby wrapper library for notification
libraries such as Libnotify.")
(home-page "https://github.com/guard/notiffany")
(license license:expat)))

4
gnu/packages/sagemath.scm
View file

@ -331,7 +331,7 @@ (define-public zn-poly
(define-public brial
(package
(name "brial")
(version "1.2.7")
(version "1.2.8")
(source
(origin
(method git-fetch)
@ -340,7 +340,7 @@ (define-public brial
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm"))))
(base32 "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)

6
gnu/packages/statistics.scm
View file

@ -1505,7 +1505,7 @@ (define-public r-memoise
(home-page "https://github.com/hadley/memoise")
(synopsis "Memoise functions for R")
(description
"This R package allows to cache the results of a function so that when
"This R package caches the results of a function so that when
you call it again with the same arguments it returns the pre-computed value.")
(license license:expat)))
@ -4781,7 +4781,7 @@ (define-public r-robustbase
(home-page "http://robustbase.r-forge.r-project.org/")
(synopsis "Basic robust statistics")
(description
"This package allows to analyze data with robust methods such as
"This package analyzes data with robust methods such as
regression methodology including model selections and multivariate statistics.")
(license license:gpl2+)))
@ -5257,7 +5257,7 @@ (define-public r-rcppprogress
(home-page "https://github.com/kforner/rcpp_progress")
(synopsis "Interruptible progress bar for C++ in R packages")
(description
"This package allows to display a progress bar in the R console for long running
"This package displays a progress bar in the R console for long running
computations taking place in C++ code, and support for interrupting those computations
even in multithreaded code, typically using OpenMP.")
(license license:gpl3+)))

43
gnu/packages/syncthing.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2016 Petter <petter@mykolab.ch>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1022,29 +1023,27 @@ (define-public go-github-com-flynn-archive-go-shlex
(license asl2.0))))
(define-public go-github-com-audriusbutkevicius-pfilter
(let ((commit "c55ef6137fc6f075801eac099cc2687ede0f101d")
(revision "3"))
(package
(name "go-github-com-audriusbutkevicius-pfilter")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AudriusButkevicius/pfilter.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/AudriusButkevicius/pfilter"))
(synopsis "Filter packets into multiple virtual connections")
(description "Pfilter is a Go package for filtering packets into multiple
(package
(name "go-github-com-audriusbutkevicius-pfilter")
(version "0.0.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AudriusButkevicius/pfilter.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/AudriusButkevicius/pfilter"))
(synopsis "Filter packets into multiple virtual connections")
(description "Pfilter is a Go package for filtering packets into multiple
virtual connections from a single physical connection.")
(home-page "https://github.com/AudriusButkevicius/pfilter")
(license expat))))
(home-page "https://github.com/AudriusButkevicius/pfilter")
(license expat)))
(define-public go-github-com-ccding-go-stun
(let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6")

98
gnu/packages/text-editors.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -30,12 +31,14 @@ (define-module (gnu packages text-editors)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages aspell)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
@ -49,6 +52,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
#:use-module (gnu packages llvm)
#:use-module (gnu packages lua)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre)
@ -61,6 +65,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages ruby)
#:use-module (gnu packages terminals)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
@ -187,6 +192,97 @@ (define-public joe
bindings and many of the powerful features of GNU Emacs.")
(license license:gpl3+)))
(define-public jucipp
(package
(name "jucipp")
(version "1.5.1")
(home-page "https://gitlab.com/cppit/jucipp")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page)
(commit (string-append "v" version))
;; Two submodules are required which are
;; developed alongside JuCi++ and difficult
;; to package separately.
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32 "0v7fmsya2zn1xx59bkv4cbyinmcnv52hm4j40nbfwalcks631xrr"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_TESTING=ON"
;; These arguments are here to facilitate an "in-source"
;; build using "./build" instead of the default "../build".
;; The test suite expects that to be the case.
"..")
#:out-of-source? #f
#:phases (modify-phases %standard-phases
(add-before 'configure 'enter-build-directory
(lambda _
(mkdir "build")
(chdir "build")
#t))
;; This phase is necessary to fix a test failure, see
;; <https://gitlab.com/cppit/jucipp/-/issues/423>.
(add-after 'unpack 'add-reference-to-clang-internal-header
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/compile_commands.cc"
((".*-I/usr/lib/clang.*" all)
(string-append "arguments.emplace_back(\"-I"
(assoc-ref inputs "libclang")
"/lib/clang/"
,@(list (package-version clang))
"/include\");\n"
all)))
#t))
(add-after 'unpack 'patch-tiny-process-library
(lambda _
(with-directory-excursion "lib/tiny-process-library"
(substitute* '("process_unix.cpp"
"tests/io_test.cpp")
(("/bin/sh") (which "sh"))))
#t))
(add-after 'unpack 'disable-git-test
(lambda _
(substitute* "tests/CMakeLists.txt"
;; Disable the git test, as it requires the full checkout.
(("add_test\\(git_test.*\\)") ""))
#t))
(add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys)
;; Tests do not expect HOME to be empty.
(setenv "HOME" "/etc")
;; Most tests require an X server.
(let ((xorg-server (assoc-ref inputs "xorg-server"))
(display ":1"))
(setenv "DISPLAY" display)
(system (string-append xorg-server "/bin/Xvfb "
display " &")))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server-for-tests)))
(inputs
`(("aspell" ,aspell)
("boost" ,boost)
("gtkmm" ,gtkmm)
("gtksourceviewmm" ,gtksourceviewmm)
("libclang" ,clang)
("libgit2" ,libgit2)))
(synopsis "Lightweight C++ IDE")
(description
"juCi++ is a small @dfn{IDE} (Integrated Development Environment)
designed especially towards libclang with speed, stability, and ease of use
in mind.
It supports autocompletion, on-the-fly warnings and errors, syntax
highlighting, and integrates with Git as well as the CMake and Meson build
systems.")
(license license:expat)))
(define-public leafpad
(package
(name "leafpad")
@ -812,7 +908,7 @@ (define-public fe
`(("ncurses" ,ncurses)))
(home-page "http://www.moria.de/~michael/fe/")
(synopsis "Small folding editor")
(description "Fe is a small folding editor. It allows to fold
(description "Fe is a small folding editor. It folds
arbitrary text regions; it is not bound to syntactic units.
Fe has no configuration or extension language and requires no setup.

18
gnu/packages/version-control.scm
View file

@ -684,6 +684,24 @@ (define-public libgit2
;; GPLv2 with linking exception
(license license:gpl2)))
(define-public libgit2-0.28
(package
(inherit libgit2)
(version "0.28.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/libgit2/libgit2/releases/"
"download/v" version
"/libgit2-" version ".tar.gz"))
(sha256
(base32
"0hjgpqjjmkciw1i8jqkx9q2vhdc4fc99qajhrj2bq8ziwsp6hyrb"))
(patches (search-patches "libgit2-mtime-0.patch"))
(modules '((guix build utils)))
(snippet '(begin
(delete-file-recursively "deps") #t))))))
(define-public git-crypt
(package
(name "git-crypt")

2
gnu/packages/web.scm
View file

@ -1273,7 +1273,7 @@ (define-public libpsl
highlighting parts of the domain in a user interface, and sorting domain lists
by site.
Libpsl has built-in PSL data for fast access, allows to load PSL data from
Libpsl has built-in PSL data for fast access, allowing to load PSL data from
files, checks if a given domain is a public suffix, provides immediate cookie
domain verification, finds the longest public part of a given domain, finds
the shortest private part of a given domain, works with international

8
gnu/packages/wine.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
@ -328,7 +328,7 @@ (define-public wine-minimal
(define-public wine-staging-patchset-data
(package
(name "wine-staging-patchset-data")
(version "5.3")
(version "5.6")
(source
(origin
(method git-fetch)
@ -337,7 +337,7 @@ (define-public wine-staging-patchset-data
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1mvhrvshyrj7lgjgka735z6j8idwd6j58bpg5nz1slgmlh1llrs6"))))
(base32 "1i9yiwbyxl0vshc4gbgnhp53m1ray8pkiii876gbiaf93k1irk0d"))))
(build-system trivial-build-system)
(native-inputs
`(("bash" ,bash)
@ -387,7 +387,7 @@ (define-public wine-staging
"/wine-" version ".tar.xz")))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv"))))
(base32 "1rh0pk8mbi3bb0di13swzxn7nwnrbfsfizdv472vv3ymf5z8l6ah"))))
(inputs `(("autoconf" ,autoconf) ; for autoreconf
("ffmpeg" ,ffmpeg)
("gtk+" ,gtk+)

8
gnu/packages/xdisorg.scm
View file

@ -604,7 +604,7 @@ (define-public wmctrl
(home-page "http://tomas.styblo.name/wmctrl/")
(synopsis "Command-line tool to control X window managers")
(description
"Wmctrl allows to interact with an X window manager that is compatible
"Wmctrl interacts with an X window manager that is compatible
with the EWMH/NetWM specification. It can query the window manager for
information, and request for certain window management actions (resize and
move windows, switch between desktops, etc.).")
@ -637,7 +637,7 @@ (define-public scrot
(home-page "https://github.com/resurrecting-open-source-projects/scrot")
(synopsis "Command-line screen capture utility for X Window System")
(description
"Scrot allows to save a screenshot of a full screen, a window or a part
"Scrot saves a screenshot of a full screen, a window or a part
of the screen selected by mouse.")
;; This license removes a clause about X Consortium from the original
;; X11 license.
@ -1057,7 +1057,7 @@ (define-public xcape
(home-page "https://github.com/alols/xcape")
(synopsis "Use a modifier key in X.org as another key")
(description
"This utility for X.org allows to use modifier key as another key when
"This utility for X.org uses a modifier key as another key when
pressed and released on its own. The default behaviour is to generate the
Escape key when Left Control is pressed and released on its own.")
(license license:gpl3+)))
@ -1733,7 +1733,7 @@ (define-public xss-lock
`(#:tests? #f))
(synopsis "Use external screen locker on events")
(description "@code{xss-lock} listens to X signals to fire up a
user-defined screensaver. In effect this allows to automatically lock the
user-defined screensaver. In effect this automatically locks the
screen when closing a laptop lid or after a period of user inactivity (as set
with @code{xset s TIMEOUT}). The notifier command, if specified, is executed
first. Additionally, xss-lock uses the inhibition logic to lock the screen

57
gnu/packages/xfce.scm
View file

@ -204,7 +204,7 @@ (define-public libxfce4ui
(define-public exo
(package
(name "exo")
(version "0.12.10")
(version "0.12.11")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/xfce/"
@ -212,7 +212,7 @@ (define-public exo
"exo-" version ".tar.bz2"))
(sha256
(base32
"1b3w4pf9gkcp13h63nf93k95hkw0ij7v5y7wjklqd1qifm8xd3w4"))))
"1dp5s64g6572h9zvx9js7qc72s728qsd9y7hl7hg6rwaq0cjb2gc"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -222,7 +222,7 @@ (define-public exo
`(("gtk+-3" ,gtk+)
("libxfce4util" ,libxfce4util)))
(inputs
`(;; FIXME Refered to in exo-1.pc but conflict with gtk+-3
`(;; FIXME Referred to in exo-1.pc but conflict with gtk+-3.
("gtk+-2" ,gtk+-2)
("libxfce4ui" ,libxfce4ui)
("perl-uri" ,perl-uri)))
@ -238,7 +238,7 @@ (define-public exo
(define-public garcon
(package
(name "garcon")
(version "0.6.4")
(version "0.7.0")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/xfce/"
@ -246,17 +246,17 @@ (define-public garcon
"garcon-" version ".tar.bz2"))
(sha256
(base32
"0bbngb4bn1m325j7y40gky36kn2nlsvqs6xp0wy76x3s0d9lfpnp"))))
"08r4dfvdvl178cjajm7ww16lwb7jsfqh3yz614mn84c0a0dvdhw2"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("glib:bin" ,glib "bin")))
(inputs
`(("gtk+-2" ,gtk+-2))); required by garcon-gtk2-1.pc
`(("gtk+-2" ,gtk+-2))) ; required by garcon-gtk2-1.pc
(propagated-inputs
`(("gtk+-3" ,gtk+) ; required by garcon-gtk3-1.pc
("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc
("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc
(home-page "https://www.xfce.org/")
(synopsis "Implementation of the freedesktop.org menu specification")
(description
@ -387,7 +387,7 @@ (define-public xfce4-battery-plugin
(define-public xfce4-clipman-plugin
(package
(name "xfce4-clipman-plugin")
(version "1.4.4")
(version "1.6.1")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@ -395,7 +395,7 @@ (define-public xfce4-clipman-plugin
"xfce4-clipman-plugin-" version ".tar.bz2"))
(sha256
(base32
"1819kjn7gs30zhhj2ppfw4zjpcgj9amw1vvppjsavsff1xflrq88"))))
"1d6fxdzy9b511hqcyj7825fx67q6zqk6cln4g3x9d498jrvk3s5k"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@ -418,19 +418,20 @@ (define-public xfce4-clipman-plugin
(define-public xfce4-pulseaudio-plugin
(package
(name "xfce4-pulseaudio-plugin")
(version "0.4.2")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"0851b0vs5xmy3cq899khcghmkqwvh9rnzwavi17msrsq4jyaxs2a"))))
(version "0.4.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-pulseaudio-plugin/"
(version-major+minor version) "/"
"xfce4-pulseaudio-plugin-" version ".tar.bz2"))
(sha256
(base32 "0nv1lbkshfzar87f6xq1ib120pjja24r7135rbc42wqkw8vq4las"))))
(build-system gnu-build-system)
(arguments
`(#:phases
;; For dbus/dbus-glib.h in pulseaudio-config.h
;; For dbus/dbus-glib.h in pulseaudio-config.h.
(modify-phases %standard-phases
(add-after 'set-paths 'augment-cflags
(lambda* (#:key inputs #:allow-other-keys)
@ -464,7 +465,7 @@ (define-public xfce4-pulseaudio-plugin
(define-public xfce4-whiskermenu-plugin
(package
(name "xfce4-whiskermenu-plugin")
(version "2.3.4")
(version "2.4.3")
(source
(origin
(method url-fetch)
@ -472,7 +473,7 @@ (define-public xfce4-whiskermenu-plugin
"xfce4-whiskermenu-plugin/" (version-major+minor version) "/"
"xfce4-whiskermenu-plugin-" version ".tar.bz2"))
(sha256
(base32 "03jpcbdpkgg825g7mr630wxynachymsrnyhz32mkl0jsd4sxxlw4"))))
(base32 "1w2zvqr0g6miliv3nb0shljfawwc1brdn2fyz4kvfg7b3klyxyir"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -563,15 +564,15 @@ (define-public xfce4-appfinder
(define-public xfce4-session
(package
(name "xfce4-session")
(version "4.14.0")
(version "4.14.2")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/xfce/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
"xfce4-session/" (version-major+minor version) "/"
"xfce4-session-" version ".tar.bz2"))
(sha256
(base32
"0gq4a8yiw58hb4d5dhvprxvzamqfg8qblmiqcw0b97mn9svnvyql"))
"1bwpylcn7x9i301yz45wvkzah9bncv9b44nf4hh9ln4i1jka9qzv"))
(modules '((guix build utils)))
(snippet
'(begin
@ -602,7 +603,7 @@ (define-public xfce4-session
(synopsis "Xfce session manager")
(description
"Session manager for Xfce, it will restore your session on startup and
allows you to shutdown the computer from Xfce.")
allows you to shut down the computer from Xfce.")
(license gpl2+)))
(define-public xfce4-settings
@ -1160,7 +1161,7 @@ (define-public xfce4-screenshooter
(define-public xfce4-screensaver
(package
(name "xfce4-screensaver")
(version "0.1.9")
(version "0.1.10")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/apps/"
@ -1170,7 +1171,7 @@ (define-public xfce4-screensaver
version ".tar.bz2"))
(sha256
(base32
"11p48yyjgy6crwfbyvm16yg0rkzn90ssd2wygzmwvwrx3wkzyhsp"))))
"0mqxbyq9np6jzky8y35dlxxmk78q2w0jvwg9kh7a4ib7vmw1qvsq"))))
(build-system gnu-build-system)
(arguments
`(#:phases

2
gnu/packages/xiph.scm
View file

@ -74,7 +74,7 @@ (define libogg
'(#:configure-flags '("--disable-static")))
(synopsis "Library for manipulating the ogg multimedia format")
(description
"The libogg library allows to manipulate the ogg multimedia container
"The libogg library manipulates the ogg multimedia container
format, which encapsulates raw compressed data and allows the interleaving of
audio and video data. In addition to encapsulation and interleaving of
multiple data streams, ogg provides packet framing, error detection, and

2
gnu/services/virtualization.scm
View file

@ -285,7 +285,7 @@ (define-configuration libvirt-configuration
(string "3:remote 4:event")
"Logging filters.
A filter allows to select a different logging level for a given category
A filter allows selecting a different logging level for a given category
of logs
The format for a filter is one of:
@itemize

51
guix/build/julia-build-system.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2019, 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -37,53 +37,46 @@ (define (invoke-julia code)
;; subpath where we store the package content
(define %package-path "/share/julia/packages/")
(define (generate-load-path inputs outputs)
(string-append
(string-join (map (match-lambda
((_ . path)
(string-append path %package-path)))
;; Restrict to inputs beginning with "julia-".
(filter (match-lambda
((name . _)
(string-prefix? "julia-" name)))
inputs))
":")
(string-append ":" (assoc-ref outputs "out") %package-path)
;; stdlib is always required to find Julia's standard libraries.
;; usually there are other two paths in this variable:
;; "@" and "@v#.#"
":@stdlib"))
(define* (install #:key source inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(package-dir (string-append out %package-path
(string-append
(strip-store-file-name source)))))
(setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs))
(strip-store-file-name source))))
(mkdir-p package-dir)
(copy-recursively source package-dir))
(copy-recursively (getcwd) package-dir))
#t)
;; TODO: Precompilation is working, but I don't know how to tell
;; julia to use use it. If (on rantime) we set HOME to
;; store path, julia tries to write files there (failing)
(define* (precompile #:key source inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(builddir (string-append out "/share/julia/"))
(package (strip-store-file-name source)))
(mkdir-p builddir)
;; With a patch, SOURCE_DATE_EPOCH is honored
(setenv "SOURCE_DATE_EPOCH" "1")
(setenv "JULIA_DEPOT_PATH" builddir)
(setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs))
;; Actual precompilation
(invoke-julia (string-append "using " package)))
;; Add new package dir to the load path.
(setenv "JULIA_LOAD_PATH"
(string-append builddir "packages/" ":"
(or (getenv "JULIA_LOAD_PATH")
"")))
;; Actual precompilation:
(invoke-julia
;; When using Julia as a user, Julia writes precompile cache to the first
;; entry of the DEPOT_PATH list (by default, the home dir). We want to
;; write it to the store, so let's push the store path as the first
;; element of DEPOT_PATH. Once the cache file exists, this hack is not
;; needed anymore (like in the check phase). If the user install new
;; packages, those will be installed and precompiled in the home dir.
(string-append "pushfirst!(DEPOT_PATH, pop!(DEPOT_PATH)); using " package)))
#t)
(define* (check #:key source inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(package (strip-store-file-name source))
(builddir (string-append out "/share/julia/")))
;; With a patch, SOURCE_DATE_EPOCH is honored
(setenv "SOURCE_DATE_EPOCH" "1")
(setenv "JULIA_DEPOT_PATH" builddir)
(setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs))
(setenv "JULIA_LOAD_PATH" (string-append builddir "packages/"))
(invoke-julia (string-append "using Pkg;Pkg.test(\"" package "\")")))
#t)

7
guix/self.scm
View file

@ -489,6 +489,13 @@ (define build
(computed-file "guix-manual" build))
(define-syntax-rule (prevent-inlining! identifier ...)
(begin (set! identifier identifier) ...))
;; XXX: These procedures are actually used by 'doc/build.scm'. Protect them
;; from inlining on Guile 3.
(prevent-inlining! file-append* translate-texi-manuals info-manual)
(define* (guile-module-union things #:key (name "guix-module-union"))
"Return the union of the subset of THINGS (packages, computed files, etc.)
that provide Guile modules."