diff options
109 files changed, 2737 insertions, 1256 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 891e2693f6..9ddd266b2b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20919,7 +20919,7 @@ The time in seconds after which a process with no requests is killed. @end deftp -@deffn {Scheme Procedure} nginx-php-fpm-location @ +@deffn {Scheme Procedure} nginx-php-location @ [#:nginx-package nginx] @ [socket (string-append "/var/run/php" @ (version-major (package-version php)) @ diff --git a/gnu/local.mk b/gnu/local.mk index 0117a43ae2..952fc55df4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -256,7 +256,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/haskell-crypto.scm \ %D%/packages/haskell-web.scm \ %D%/packages/haskell-xyz.scm \ - %D%/packages/ham-radio.scm \ %D%/packages/hexedit.scm \ %D%/packages/hugs.scm \ %D%/packages/hurd.scm \ @@ -435,6 +434,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/toys.scm \ %D%/packages/tryton.scm \ %D%/packages/qt.scm \ + %D%/packages/radio.scm \ %D%/packages/ragel.scm \ %D%/packages/rails.scm \ %D%/packages/ratpoison.scm \ @@ -463,7 +463,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/scsi.scm \ %D%/packages/sdcc.scm \ %D%/packages/sdl.scm \ - %D%/packages/sdr.scm \ %D%/packages/search.scm \ %D%/packages/security-token.scm \ %D%/packages/selinux.scm \ @@ -824,6 +823,7 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ + %D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ @@ -1162,7 +1162,6 @@ dist_patch_DATA = \ %D%/packages/patches/libvnc-CVE-2018-20750.patch \ %D%/packages/patches/libvnc-CVE-2019-15681.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ - %D%/packages/patches/libvpx-use-after-free-in-postproc.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ @@ -1365,7 +1364,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ - %D%/packages/patches/python-jedi-deleted-variables.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ @@ -1481,7 +1479,6 @@ dist_patch_DATA = \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ - %D%/packages/patches/txr-shell.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e602b002f2..bf16e09f61 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2019 Hartmt Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> +;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,7 @@ #:use-module (gnu packages telephony) #:use-module (gnu packages linphone) #:use-module (gnu packages tls) + #:use-module (gnu packages valgrind) #:use-module (gnu packages video) #:use-module (gnu packages vim) ;xxd #:use-module (gnu packages webkit) @@ -4206,3 +4208,37 @@ minimum.") `(("librsvg" ,librsvg) ,@(package-inputs ztoolkit))) (synopsis "ZToolkit with SVG support"))) + +(define-public codec2 + (package + (name "codec2") + (version "0.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/drowe67/codec2.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jpvr7bra8srz8jvnlbmhf8andbaavq5v01qjnp2f61za93rzwba")))) + (build-system cmake-build-system) + (native-inputs + `(("bc" ,bc) + ("octave" ,octave) + ("valgrind" ,valgrind))) + (arguments + `(#:tests? #f ; TODO: Fix tests (paths, graphic toolkit, octave modules). + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-test-environment + (lambda _ + (setenv "HOME" "/tmp") + #t))))) + (synopsis "Speech codec") + (description + "Codec 2 is a speech codec designed for communications quality speech +between 700 and 3200 bit/s. The main application is low bandwidth HF/VHF +digital radio.") + (home-page "https://www.rowetel.com/?page_id=452") + (license license:lgpl2.1))) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 4d24dff0a3..223c393b6d 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> @@ -979,15 +979,25 @@ precious backup space. (define-public burp (package (name "burp") - (version "2.3.20") + (version "2.3.24") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/burp/burp-" version "/burp-" version ".tar.bz2")) (sha256 (base32 - "0dm2y76z7pg17kfv6ahmh4mf2r3pg7mlwd69lvmjwssnd9vs1nn5")))) + "0dmahqx8ldqdrx9b47r7ag3m801n7h3kclcqja1cc1jzhfhfq27w")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'extend-test-time-outs + ;; The defaults are far too low for busy boxes & spinning storage. + (lambda _ + (substitute* (find-files "utest" "\\.c$") + (("(tcase_set_timeout\\(tc_core,)[ 0-9]*(\\);.*)$" _ prefix suffix) + (string-append prefix " 3600" suffix "\n"))) + #t))))) (inputs `(("librsync" ,librsync) ("openssl" ,openssl) diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index cd77c9a12b..c8f4a34c72 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -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 @@ SAC is an interface for CSS parsers.") (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 @@ SAC is an interface for CSS parsers.") "mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-" version "-src.tar.gz")) (sha256 - (base32 - "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23")) + (base32 "0zdkngb896cr35jq1v859j2kpqyn6a87k6a893h394hgvnz7yi3v")) (modules '((guix build utils))) (snippet `(begin diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2fbfdba2d8..a49c05dbce 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1958,14 +1958,14 @@ experiments.") (define-public r-genomicinteractions (package (name "r-genomicinteractions") - (version "1.20.2") + (version "1.20.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicInteractions" version)) (sha256 (base32 - "0mqb899wah5n7bp2lajhwy2zpqqhi18plza3i3m51rfl9n62smph")))) + "01ps97cs29qvzy5piq2l2k0yyr56rmg5cycfiqhbbvqpjrfvy60g")))) (properties `((upstream-name . "GenomicInteractions"))) (build-system r-build-system) @@ -3332,14 +3332,14 @@ peak definition in combination with known profile characteristics.") (define-public r-varianttools (package (name "r-varianttools") - (version "1.28.0") + (version "1.28.1") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantTools" version)) (sha256 (base32 - "0aafcprsqbn1xl8jqnxfl8r2d0lmzhssqpr26lam2cprh3yk0xiv")))) + "1x57shc3slcbnc807ra1nwnjr37sqjh04n2xfwd469m4hkjb0jzh")))) (properties `((upstream-name . "VariantTools"))) (build-system r-build-system) (propagated-inputs @@ -3501,8 +3501,8 @@ phenotype of interest.") (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))) @@ -3783,14 +3783,14 @@ provides reporting features.") (define-public r-a4base (package (name "r-a4base") - (version "1.34.0") + (version "1.34.1") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Base" version)) (sha256 (base32 - "0dgqyq4dnlcik5qqygnhxlhfr98sh6kmdcj2qllhrwyk0lmsfk01")))) + "1a0yk05ikk1hr1vpxynydrb5xb1hj4hdqlh9zd13n83ir89dss83")))) (properties `((upstream-name . "a4Base"))) (build-system r-build-system) (propagated-inputs @@ -4032,14 +4032,14 @@ position-specific scores within R and Bioconductor.") (define-public r-atacseqqc (package (name "r-atacseqqc") - (version "1.10.3") + (version "1.10.4") (source (origin (method url-fetch) (uri (bioconductor-uri "ATACseqQC" version)) (sha256 (base32 - "18zf90iksglbs13cwr4jjwsv332a19lf4bpdmy69jz8bpwrklv22")))) + "1g07ni134cyl3jd9y19afip39kxddfgpm1jjm0rhrm7jgssp24in")))) (properties `((upstream-name . "ATACseqQC"))) (build-system r-build-system) (propagated-inputs @@ -4271,7 +4271,7 @@ investigation using RNA-seq data.") (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 @@ parametric mixture model. The protein binding sites (clusters) are then 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 diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 943369b275..4741c8bc50 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7502,13 +7502,13 @@ checks on R packages that are to be submitted to the Bioconductor repository.") (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.24.3") + (version "0.24.4") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "01f7dms4kw9ajwqlvh5s47riv748xrrs41na03byhjvn4fbdc44y")))) + "1fzs8j2d3wwfzm2fq63ywf68a4dbggyl5l098f148yn4jw7jd3bc")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) @@ -7944,13 +7944,13 @@ tab-delimited (tabix) files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.12.2") + (version "0.12.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "09lackgix5jpm16k0mz2zkibflfb4wzidbz4q32mlxmklf40037q")))) + "02i88ll2d7r83nk0wdj28akvsz3jq19g6ixpaahfy3jy5av4byv6")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) @@ -7961,6 +7961,8 @@ tab-delimited (tabix) files.") ("r-iranges" ,r-iranges) ("r-matrix" ,r-matrix) ("r-matrixstats" ,r-matrixstats))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/DelayedArray") (synopsis "Delayed operations on array-like objects") (description @@ -8401,7 +8403,7 @@ system. It is used to analyze experimental crosses for identifying 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 +8534,7 @@ of other R packages who wish to make use of HTSlib.") (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.") @@ -12768,7 +12770,7 @@ expression report comparing samples in an easily configurable manner.") (define-public pigx-chipseq (package (name "pigx-chipseq") - (version "0.0.41") + (version "0.0.42") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/" @@ -12776,7 +12778,7 @@ expression report comparing samples in an easily configurable manner.") "/pigx_chipseq-" version ".tar.gz")) (sha256 (base32 - "0akbxdmsjsq5fzbwaap04hqjpsfgv1l6yrc2pwgbya1xgqvcq6vy")))) + "0xbvgqpk32a8iczhvac56cacr46rdkqb0allhhpvmj940idf72bi")))) (build-system gnu-build-system) ;; parts of the tests rely on access to the network (arguments '(#:tests? #f)) @@ -13172,7 +13174,7 @@ version does count multisplits.") ((or (string-prefix? "armhf" system) (string-prefix? "aarch64" system)) "arm_neon=1") - (_ "sse2only=1")))) + (else "sse2only=1")))) #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index cadcc937e1..28a088a43a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -399,7 +399,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2020.01") + (version "2020.04") (source (origin (method url-fetch) (uri (string-append @@ -407,7 +407,7 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida")))) + "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 8cfd26fec0..d27c951d43 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -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 @@ generate such a compilation database.") (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 @@ generate such a compilation database.") (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 @@ generate such a compilation database.") (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 _ diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index f893ec9961..a2f1121b1a 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 John Darrington <jmd@gnu.org> @@ -66,6 +66,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages image) #:use-module (gnu packages photo) + #:use-module (gnu packages tcl) #:use-module (gnu packages video) #:use-module (gnu packages wget) #:use-module (gnu packages xiph)) @@ -156,6 +157,7 @@ libcdio.") (package (name "xorriso") (version "1.5.2") + (outputs '("out" "gui")) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/xorriso/xorriso-" @@ -172,10 +174,26 @@ libcdio.") (let* ((out (assoc-ref outputs "out")) (out-bin (string-append out "/bin"))) (install-file "frontend/grub-mkrescue-sed.sh" out-bin) + #t))) + (add-after 'install 'move-gui-to-separate-output + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gui (assoc-ref outputs "gui"))) + (for-each + (lambda (file) + (mkdir-p (string-append gui (dirname file))) + (rename-file (string-append out file) + (string-append gui file))) + (list "/bin/xorriso-tcltk" + "/share/info/xorriso-tcltk.info" + "/share/man/man1/xorriso-tcltk.1")) + (wrap-program (string-append gui "/bin/xorriso-tcltk") + `("PATH" ":" prefix (,(string-append out "/bin")))) #t)))))) (inputs `(("acl" ,acl) ("readline" ,readline) + ("tk" ,tk) ("zlib" ,zlib))) (home-page "https://www.gnu.org/software/xorriso/") (synopsis "Create, manipulate, burn ISO-9660 file systems") diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 2cfaddbc5f..1cd40d9b13 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -581,14 +581,14 @@ but it works for any C/C++ project.") (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 @@ -1894,8 +1894,8 @@ possible to write plugins to add your own checks.") (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))) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 3d079559f3..f79254d825 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -135,8 +135,11 @@ "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 @@ "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 @@ "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 @@ from forcing GEXP-PROMISE." #: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 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "0ikk4cgz3jgjhyncsvlqvlc03y7jywjpa6v34fwsjxs88flyzpdn")))) + "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2")))) (define %ungoogled-origin (origin @@ -274,7 +275,7 @@ from forcing GEXP-PROMISE." (string-take %ungoogled-revision 7))) (sha256 (base32 - "0nm55qq4ahw9haf5g7hmzic4mr2xjgpay7lxps7xjp7s1pda4g0q")))) + "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l")))) (define %debian-origin (origin @@ -288,7 +289,7 @@ from forcing GEXP-PROMISE." (_ (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 @@ from forcing GEXP-PROMISE." (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 @@ from forcing GEXP-PROMISE." (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 @@ from forcing GEXP-PROMISE." (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" @@ -462,7 +462,6 @@ from forcing GEXP-PROMISE." ;; 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" @@ -648,8 +647,13 @@ from forcing GEXP-PROMISE." (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") @@ -795,7 +799,7 @@ from forcing GEXP-PROMISE." ("glib" ,glib) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) - ("icu4c" ,icu4c) + ("icu4c" ,icu4c-66.1) ("jsoncpp" ,jsoncpp) ("lcms" ,lcms) ("libevent" ,libevent) diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm index 16c288cc82..ba13709eda 100644 --- a/gnu/packages/cook.scm +++ b/gnu/packages/cook.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,13 @@ (substitute* "test/00/t0077a.sh" (("ar qc") "ar qcU")) + ;; Guix builds have LC_ALL set to "en_US.utf8", which causes + ;; `date` to use a 12-hour clock instead of 24h, which in turn + ;; makes t0217a.sh fail because of unexpected date output. + (substitute* "test/02/t0217a.sh" + (("export TZ") + "export TZ\nLC_ALL=POSIX\nexport LC_ALL")) + (setenv "SH" (which "sh")) #t))))) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 84a7e68b88..2248ebfc4b 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -47,18 +47,18 @@ (define-public libzen (package (name "libzen") - (version "0.4.37") + (version "0.4.38") (source (origin (method url-fetch) ;; Warning: This source has proved unreliable 1 time at least. ;; Consider an alternate source or report upstream if this ;; happens again. (uri (string-append "https://mediaarea.net/download/source/" - name "/" version "/" - name "_" version ".tar.bz2")) + "libzen/" version "/" + "libzen_" version ".tar.bz2")) (sha256 (base32 - "1dkqbgabzpa6bd7dkqrvd35sdxrhr6qxalb88f3dw0afk65xqb0k")))) + "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -66,7 +66,7 @@ (build-system gnu-build-system) (arguments '(#:phases - ;; build scripts not in root of archive + ;; The build scripts are not at the root of the archive. (modify-phases %standard-phases (add-after 'unpack 'pre-configure (lambda _ diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a758e51d47..f5863e1f6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1559,15 +1559,20 @@ colors are provided.") (define-public r-glue (package (name "r-glue") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "0alklqcf68kmccssp4j7a7fv553pyqyy6mkkfslav83inppm4d3g")))) + "1hb9j2519jv9zgkgjb25hnqi22i7zxnaksqd16m4nxa1f6gl0v7a")))) (build-system r-build-system) + ;; knitr depends on glue, so we can't add knitr here to build the + ;; vignettes. + #; + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/tidyverse/glue") (synopsis "Interpreted string literals") (description @@ -1727,13 +1732,13 @@ you to rapidly iterate while developing a package.") (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.4") + (version "1.0.4.6") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "1m80pdhzi2p82db5xkbwc2m3fzv6df59955yj03nlq40fj7zx4nr")))) + (base32 "00mk23zmrqn1c4mk9d6csjcbnl12wd7yicjk2ikmw5dyvdfngbs5")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") @@ -1905,14 +1910,13 @@ multi-dimensional data.") (define-public r-powerlaw (package (name "r-powerlaw") - (version "0.70.2") + (version "0.70.4") (source (origin (method url-fetch) (uri (cran-uri "poweRlaw" version)) (sha256 - (base32 - "1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4")))) + (base32 "19zah9mx93az5lh9vicn3c8q1xb12g0w46dh5p901fbyimc32vwk")))) (properties `((upstream-name . "poweRlaw"))) (build-system r-build-system) (propagated-inputs @@ -4043,14 +4047,18 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df")))) + (base32 "03iyqgx9mmdbd3qih70qzijjqcdg7k7ps5r1y6q8praanx9qvnm3")))) (build-system r-build-system) + ;; knitr itself depends on xfun + #; + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/yihui/xfun") (synopsis "Miscellaneous functions") (description @@ -5388,14 +5396,14 @@ evaluated by the @dfn{Akaike Information Criterion} (AIC).") (define-public r-arules (package (name "r-arules") - (version "1.6-4") + (version "1.6-5") (source (origin (method url-fetch) (uri (cran-uri "arules" version)) (sha256 (base32 - "003c5cd3xzq39h7c19px077ygm0n1v7k83icy5zzrnkagyds2p8n")))) + "0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) @@ -6501,14 +6509,14 @@ vice versa), or to deal with multiple declared missing values.") (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.8.3") + (version "2.8.4") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "0w8l9grmp4q775jrf4q6rxx36ld5daz9b0gdxyyh42xfihk6m62h")))) + "1ad7ca71w0v9ja4wb47aygczc987zz1lnjljhh2n497nzrpzzv64")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -6518,6 +6526,8 @@ vice versa), or to deal with multiple declared missing values.") ("r-rlang" ,r-rlang) ("r-sjlabelled" ,r-sjlabelled) ("r-tidyselect" ,r-tidyselect))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/strengejacke/sjmisc") (synopsis "Data and variable transformation functions") (description @@ -7906,14 +7916,14 @@ console, resulting in an interactive editing environment.") (define-public r-survey (package (name "r-survey") - (version "3.37") + (version "4.0") (source (origin (method url-fetch) (uri (cran-uri "survey" version)) (sha256 (base32 - "1f31dvh48gzzan13pdrwh84ls35x9116095i7mdrcbrhz809r8dy")))) + "1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) @@ -8286,14 +8296,14 @@ packages maintained by Torsten Hothorn.") (define-public r-multcomp (package (name "r-multcomp") - (version "1.4-12") + (version "1.4-13") (source (origin (method url-fetch) (uri (cran-uri "multcomp" version)) (sha256 (base32 - "14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b")))) + "1nszi22rcc551yc75h9cdfkdqsxw1rz30vadazmpyzihp1bh63yk")))) (build-system r-build-system) (propagated-inputs `(("r-codetools" ,r-codetools) @@ -8631,20 +8641,22 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "1liix8rf8xq3hzi7684bl0s20iflsq6g5mxr5k59wp2qwn1i6aww")))) + "0kijp4wamkidaxysc11dd4vhvnm4wnbi87871wcbwn27k5b6i5dg")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) ("r-insight" ,r-insight) ("r-parameters" ,r-parameters))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/easystats/effectsize") (synopsis "Indices of effect size and standardized parameters") (description @@ -8745,14 +8757,14 @@ back to file after modifications.") (define-public r-fs (package (name "r-fs") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "fs" version)) (sha256 (base32 - "1ishdxrxy88w1lrn657a573wdra5v7xf1yfa1c4kss07rlynwrj7")))) + "0kksig9pk8aid9l6r250na8z8j9919jvs20lj0s6m9bcybgh74df")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -8787,18 +8799,18 @@ terminals that do not support Unicode.") (define-public r-usethis (package (name "r-usethis") - (version "1.5.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (cran-uri "usethis" version)) (sha256 (base32 - "07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy")))) + "12iyimqyza752anj29wpfisl8nz5r25kfcqbssybg24nb4wyy146")))) (build-system r-build-system) (propagated-inputs - `(("r-clipr" ,r-clipr) - ("r-clisymbols" ,r-clisymbols) + `(("r-cli" ,r-cli) + ("r-clipr" ,r-clipr) ("r-crayon" ,r-crayon) ("r-curl" ,r-curl) ("r-desc" ,r-desc) @@ -8807,6 +8819,7 @@ terminals that do not support Unicode.") ("r-git2r" ,r-git2r) ("r-glue" ,r-glue) ("r-purrr" ,r-purrr) + ("r-rematch2" ,r-rematch2) ("r-rlang" ,r-rlang) ("r-rprojroot" ,r-rprojroot) ("r-rstudioapi" ,r-rstudioapi) @@ -9176,14 +9189,14 @@ experiments using ANOVA or mixed models.") (define-public r-lmertest (package (name "r-lmertest") - (version "3.1-1") + (version "3.1-2") (source (origin (method url-fetch) (uri (cran-uri "lmerTest" version)) (sha256 (base32 - "0r2vvs3nl6p8xla3gd943khb4ixp0alvspqpnz2y6n3wk8zgh3jj")))) + "1qkdxx5sri65zgpb9gw4nkfkdam51kgy4hxclk5c40yk7y3p0n1q")))) (properties `((upstream-name . "lmerTest"))) (build-system r-build-system) (propagated-inputs @@ -11533,7 +11546,7 @@ JASA, 94:496-509.") (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))) @@ -12068,14 +12081,14 @@ users of rARPACK are advised to switch to the RSpectra package.") (define-public r-compositions (package (name "r-compositions") - (version "1.40-4") + (version "1.40-5") (source (origin (method url-fetch) (uri (cran-uri "compositions" version)) (sha256 (base32 - "0z40llyij3cc80ac1vzzrpykk6ysp89bn6dyyh40fbnc4anwx69a")))) + "0l9ayz2nb2wqhl7v9hkfl7pd950ba0h6hma8zqncbcxh6xh2k7l7")))) (build-system r-build-system) (propagated-inputs `(("r-bayesm" ,r-bayesm) @@ -12818,14 +12831,14 @@ can be used with function approximation, eligibility traces (Singh & Sutton, (define-public r-lemon (package (name "r-lemon") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (cran-uri "lemon" version)) (sha256 (base32 - "0wsn5bfg10wq4dnrgpyraz2bzx9p19c7hf1pwj3h4zmpqfgsdbpw")))) + "0m9hqwi709j9iwsxn8jh63741jiyr7ppwgqaw2zkv285p3m5wvd5")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) @@ -12834,6 +12847,7 @@ can be used with function approximation, eligibility traces (Singh & Sutton, ("r-knitr" ,r-knitr) ("r-lattice" ,r-lattice) ("r-plyr" ,r-plyr) + ("r-rlang" ,r-rlang) ("r-scales" ,r-scales))) (home-page "https://github.com/stefanedwards/lemon") (synopsis "Freshen up your ggplot2 plots") @@ -13114,21 +13128,23 @@ classes.") (define-public r-classint (package (name "r-classint") - (version "0.4-2") + (version "0.4-3") (source (origin (method url-fetch) (uri (cran-uri "classInt" version)) (sha256 (base32 - "0w980hrw8sgfdfyd5dsimalq7gwhvqm7507abk7k363pvgks23dv")))) + "1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply")))) (properties `((upstream-name . "classInt"))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) ("r-e1071" ,r-e1071) ("r-kernsmooth" ,r-kernsmooth))) - (native-inputs `(("gfortran" ,gfortran))) + (native-inputs + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) (home-page "https://github.com/r-spatial/classInt/") (synopsis "Choose univariate class intervals") (description @@ -13139,14 +13155,14 @@ univariate class intervals for mapping or other graphics purposes.") (define-public r-spdata (package (name "r-spdata") - (version "0.3.3") + (version "0.3.5") (source (origin (method url-fetch) (uri (cran-uri "spData" version)) (sha256 (base32 - "1v66qkvsx77hvv5c78v760yp0hknf7xzcjir2ri3ha456mz79yl5")))) + "09l9j1vjbfyc8mikb8kliqmdjkg4xigq3zhdx98mv51flh5q87lh")))) (properties `((upstream-name . "spData"))) (build-system r-build-system) (propagated-inputs @@ -13216,14 +13232,14 @@ tessellation.") (define-public r-sf (package (name "r-sf") - (version "0.9-0") + (version "0.9-1") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "117r9l3v7nkdj9bfy6qr0yz0gd5bv0pwnkc9vk2gv3xqj0h1fpf6")))) + "1qghrskqwwlwxmmvkv7knhlr1a32ngyimycasy5gfazgviljsfn4")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) @@ -13881,7 +13897,7 @@ redirection on the fly, which appears to be very useful for teaching purposes, 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+))) @@ -15864,7 +15880,7 @@ be used further by e.g. graphic devices.") "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))) @@ -15961,14 +15977,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "0zin3ikc013hc713n5zs0dbhc3m4nfw1vhc3924z0mrww8r241xn")))) + "0mylxkf1y6mk4kf6c57x102sf4c800pfasjcfbf1hnsh6ya0m6dy")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs @@ -16192,14 +16208,14 @@ are noisy or are discontinuous at the solution.") (define-public r-txtplot (package (name "r-txtplot") - (version "1.0-3") + (version "1.0-4") (source (origin (method url-fetch) (uri (cran-uri "txtplot" version)) (sha256 (base32 - "1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h")))) + "00sriml48y70j18jz235dsfm5x3a81bnzskfp3hnv6cbjwwsmca4")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/txtplot/") (synopsis "Text-based plotting") @@ -17113,17 +17129,19 @@ See e.g. Gentle (2003) @url{doi:10.1007/b97336}.") (define-public r-lhs (package (name "r-lhs") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "lhs" version)) (sha256 (base32 - "0lzaqr7xi3ckln5nglv5xf5njm359slpz1jc6s02hpsqdw6armd4")))) + "0n0i1hr9gmc0hfcs2cvpjvdfgm6k26rhcq3q22r8ic0gfj953572")))) (properties `((upstream-name . "lhs"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/bertcarnell/lhs") (synopsis "Latin Hypercube Samples") (description @@ -18791,14 +18809,14 @@ Edition), John Wiley and Sons.") (define-public r-anthropometry (package (name "r-anthropometry") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (cran-uri "Anthropometry" version)) (sha256 (base32 - "1f568ri1s6psaby8y737vrkarbjg64v89d4jyw23hy17apdmszr8")))) + "0y52g15pcgs4b68sfczn6nnpdqsialsb4mq3wb9a2gba7qdcf76y")))) (properties `((upstream-name . "Anthropometry"))) (build-system r-build-system) (propagated-inputs @@ -18811,6 +18829,8 @@ Edition), John Wiley and Sons.") ("r-nnls" ,r-nnls) ("r-rgl" ,r-rgl) ("r-shapes" ,r-shapes))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/Anthropometry/") (synopsis "Statistical methods for anthropometric data") (description @@ -20805,19 +20825,21 @@ Encyclopedia of Integer Sequences} (OEIS) in the function help page.") (define-public r-isoband (package (name "r-isoband") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "isoband" version)) (sha256 (base32 - "1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq")))) + "1ndlnv4g9pbd02y50sx4ffg2ccwqbi7fm2v1lh22wdd8pq33d20q")))) (properties `((upstream-name . "isoband"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) ("r-testthat" ,r-testthat))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/wilkelab/isoband") (synopsis "Generate isolines and isobands from regularly spaced elevation grids") (description @@ -20925,13 +20947,13 @@ carrying out convergence diagnostics and statistical and graphical analysis of (define-public r-httpcode (package (name "r-httpcode") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "httpcode" version)) (sha256 (base32 - "06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv")))) + "0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr")))) (build-system r-build-system) (home-page "https://github.com/sckott/httpcode") (synopsis "HTTP status code helper") diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f760c692d7..a6f78154e8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -225,38 +225,22 @@ standard Go idioms.") (define-public ephemeralpg (package (name "ephemeralpg") - (version "2.8") + (version "3.0") (source (origin (method url-fetch) (uri (string-append - "http://eradman.com/ephemeralpg/code/ephemeralpg-" + "https://eradman.com/ephemeralpg/code/ephemeralpg-" version ".tar.gz")) (sha256 - (base32 "1dpfxsd8a52psx3zlfbqkw53m35w28qwyb87a8anz143x6gnkkr4")))) + (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) - ;; The intention for one test is to test without PostgreSQL on - ;; the $PATH, so replace the test $PATH with just the util-linux - ;; bin, which contains getopt. It will hopefully be possible to - ;; remove this for releases after 2.8. - (substitute* "test.rb" - (("/bin:/usr/bin") - (string-append (assoc-ref inputs "util-linux") - "/bin"))) - ;; Set the LC_ALL=C as some tests use sort, and the locale - ;; affects the order. It will hopefully be possible to remove - ;; this for releases after 2.8. - (setenv "LC_ALL" "C") - (invoke "ruby" "test.rb") - #t)) + (delete 'configure) ; no configure script (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -266,15 +250,18 @@ standard Go idioms.") "/bin") ,(string-append (assoc-ref inputs "postgresql") "/bin") - ;; For getsocket + ;; For getsocket. ,(string-append out "/bin"))))) - #t))))) + #t))) + #:test-target "test")) (inputs `(("postgresql" ,postgresql) ("util-linux" ,util-linux))) (native-inputs - `(("ruby" ,ruby))) - (home-page "http://eradman.com/ephemeralpg/") + ;; For tests. + `(("ruby" ,ruby) + ("which" ,which))) + (home-page "https://eradman.com/ephemeralpg/") (synopsis "Run temporary PostgreSQL databases") (description "@code{pg_tmp} creates temporary PostgreSQL databases, suitable for tasks diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index e7833b8e70..3c8814348f 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -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 @@ and time-efficient for good hash functions.") (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 @@ in between these sequences may be different in both content and length.") (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 @@ queues, stacks, and doubly-linked lists.") (define-public uthash (package (name "uthash") - (version "2.0.2") + (version "2.1.0") (source (origin (method git-fetch) @@ -158,8 +161,7 @@ queues, stacks, and doubly-linked lists.") (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 @@ queues, stacks, and doubly-linked lists.") ;; 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. diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index db8c9695f4..ff4cccb03d 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -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 @@ contains the archive keys used for that.") (define-public debootstrap (package (name "debootstrap") - (version "1.0.119") + (version "1.0.123") (source (origin (method git-fetch) @@ -126,8 +126,7 @@ contains the archive keys used for that.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0p0p8qmlsbvpfa0r7ifghr67zrrc96d83r9qwahzaxyxkvnhr4x4")))) + (base32 "0fr5ir8arzisx71jybbk4xz85waz50lf2y052nfimzh6vv9dx54c")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index b835fb4510..37f8f74b7b 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -68,7 +68,7 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "138")) + (let ((version "139")) (package (name "diffoscope") (version version) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1lsxwyqaaxmin8h06l0352f0kh0l9brbqfn0zv8hmb64bp5r20nr")))) + "1k4yjyvmn5nfdapkwgkr9gzpn18kr4c58n0f32pfkx4yakfqkk4i")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index e54d6911ce..0f23852971 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> +;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,10 +47,12 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages linux) @@ -70,6 +73,7 @@ #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) @@ -618,7 +622,7 @@ passphrases.") (define-public ndctl (package (name "ndctl") - (version "67") + (version "68") (source (origin (method git-fetch) (uri (git-reference @@ -627,7 +631,7 @@ passphrases.") (file-name (git-file-name name version)) (sha256 (base32 - "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n")))) + "0xmim7z4qp6x2ggndnbwd940c73pa1qlf3hxyn3qh5pyr69nh9y8")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) @@ -856,3 +860,49 @@ written in Go. It is heavily inspired by ranger with some missing and extra features. Some of the missing features are deliberately omitted since they are better handled by external tools.") (license license:expat))) + +(define-public xfe + (package + (name "xfe") + (version "1.43.2") + (source + (origin + (method url-fetch) + (uri + (string-append "https://sourceforge.net/projects/xfe/files/xfe/" + version + "/xfe-" version ".tar.gz")) + (sha256 + (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("fox" ,fox) + ("freetype" ,freetype) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xcb-util" ,xcb-util) + ("xft" ,libxft) + ("xrandr" ,libxrandr))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-xferc-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xferc (string-append out "/share/xfe/xferc"))) + (substitute* "src/XFileExplorer.cpp" + (("/usr/share/xfe/xferc") xferc)) + #t)))) + #:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "BASH_COMPLETION_DIR=" out + "/share/bash-completion/completions"))))) + (synopsis "File Manager for X-Based Graphical Systems") + (description"XFE (X File Explorer) is a file manager for X. It is based on +the popular but discontinued, X Win Commander. It aims to be the file manager +of choice for all light thinking Unix addicts!") + (home-page "http://roland65.free.fr/xfe/") + (license license:gpl2+))) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index bfe1a8f6dd..51605e09aa 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -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 @@ display manager which supports different greeters.") (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 @@ display manager which supports different greeters.") "/+download/lightdm-gtk-greeter-" version ".tar.gz")) (sha256 (base32 - "1436sdm83xqhxyr1rzqxhsl8if2xmidlvb341xcv6dv83lyxkrlf")))) + "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms")))) (build-system gnu-build-system) (native-inputs `(("exo" ,exo) diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm index e1e6636219..d861484d22 100644 --- a/gnu/packages/distributed.scm +++ b/gnu/packages/distributed.scm @@ -44,7 +44,7 @@ (define-public boinc-client (package (name "boinc-client") - (version "7.16.5") + (version "7.16.6") (source (origin (method git-fetch) (uri (git-reference @@ -55,7 +55,7 @@ (file-name (git-file-name "boinc" version)) (sha256 (base32 - "107rpw9qd5x4pyxm9jd1lqxva5nxwb01dm5h61d6msv2vgiy0r8n")))) + "00xpzxxnki9hsf2vg9p67dk9ilw9ychpgm09fp3c41zyylb33ml5")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-server"))) (inputs `(("openssl" ,openssl) diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 3b0c799dc3..5db012c680 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,9 +36,11 @@ #:use-module (gnu packages gdb) #:use-module (gnu packages libedit) #:use-module (gnu packages llvm) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages textutils)) + #:use-module (gnu packages textutils) + #:use-module (gnu packages xorg)) (define-public rdmd (package @@ -348,3 +351,49 @@ The design emphasis is on maximum simplicity for simple projects, while providing the opportunity to customize things when needed.") (license license:expat))) + +(define-public gtkd + (package + (name "gtkd") + (version "3.9.0") + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://gtkd.org/Downloads/sources/GtkD-" + version ".zip")) + (sha256 + (base32 "0qv8qlpwwb1d078pnrf0a59vpbkziyf53cf9p6m8ms542wbcxllp")))) + (build-system gnu-build-system) + (native-inputs + `(("unzip" ,unzip) + ("ldc" ,ldc) + ("pkg-config" ,pkg-config) + ("xorg-server-for-tests" ,xorg-server-for-tests))) + (arguments + `(#:test-target "test" + #:make-flags + `("DC=ldc2" + ,(string-append "prefix=" (assoc-ref %outputs "out")) + ,(string-append "libdir=" (assoc-ref %outputs "out") + "/lib")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "GNUmakefile" + ;; We do the tests ourselves. + (("default-goal: libs test") "default-goal: libs") + (("all: libs shared-libs test") "all: libs shared-libs") + ;; Work around upstream bug. + (("\\$\\(prefix\\)\\/\\$\\(libdir\\)") "$(libdir)")) + #t)) + (add-before 'check 'prepare-x + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + #t))))) + (home-page "https://gtkd.org/") + (synopsis "D binding and OO wrapper of GTK+") + (description "This package provides bindings to GTK+ for D.") + (license license:lgpl2.1))) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index cc9dc28391..77f27fddfb 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -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-public dnsmasq (package (name "dnsmasq") - (version "2.80") + (version "2.81") (source (origin (method url-fetch) (uri (string-append @@ -83,7 +84,7 @@ version ".tar.xz")) (sha256 (base32 - "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd")))) + "1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -305,7 +306,7 @@ the two.") (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 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f6b5406cd4..a9550ee112 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -67,6 +67,7 @@ ;;; Copyright © 2020 6033fe7de85d <6033fe7de85d@airmail.cc> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020 Jérémy Korwin-Zmijowski <jeremy@korwin-zmijowski.fr> +;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx> ;;; ;;; This file is part of GNU Guix. ;;; @@ -596,6 +597,45 @@ Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a handful of functions that are not resource-specific.") (license license:gpl3+)))) +(define-public emacs-typit + ;; Last release is from 2017. + (let ((commit "231cb7df43253b84323520b8ed70f128d37003af") + (revision "1")) + (package + (name "emacs-typit") + (version (git-version "0.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mrkkrp/typit.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-dictionaries + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (site-lisp + (string-append + out "/share/emacs/site-lisp/dict"))) + (mkdir-p site-lisp) + (copy-recursively "dict" site-lisp) + #t)))))) + (propagated-inputs + `(("emacs-f" ,emacs-f) + ("emacs-mmt" ,emacs-mmt))) + (home-page "https://github.com/mrkkrp/typit") + (synopsis "Typing game for Emacs with two difficulties") + (description "Emacs Typit is a typing game for Emacs. Words that are +picked randomly from the most frequent words in language you're practicing, +until time is up.") + (license license:gpl3+)))) + (define-public emacs-scribble-mode (let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2") (revision "2")) @@ -1565,7 +1605,7 @@ configuration language. It features: @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 +2059,7 @@ written in the Go programming language.") (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+))) @@ -2122,6 +2162,26 @@ window).") single buffer.") (license license:gpl3+))) +(define-public emacs-mmt + (package + (name "emacs-mmt") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mrkkrp/mmt.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav")))) + (build-system emacs-build-system) + (home-page "https://github.com/mrkkrp/mmt") + (synopsis "Classic tools to write Emacs Lisp macros") + (description "Emacs MMT is a package that contains classic tools for Emacs +Lisp developers who want to write macros with convenience.") + (license license:gpl3+))) + (define-public emacs-tablist (package (name "emacs-tablist") @@ -5976,33 +6036,30 @@ windows.") (license license:gpl3+))) (define-public emacs-ace-window - ;; last release version is from 2015 - (let ((commit "a5344925e399e1f015721cda6cf5db03c90ab87a") - (revision "1")) - (package - (name "emacs-ace-window") - (version (git-version "0.9.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/abo-abo/ace-window.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18jm8gfgnf6ja9aarws5650lw2zfi3wdwc5j8r5ijn5fcqhfy7rc")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-avy" ,emacs-avy))) - (home-page "https://github.com/abo-abo/ace-window") - (synopsis "Quickly switch windows in Emacs") - (description - "@code{ace-window} is meant to replace @code{other-window}. + (package + (name "emacs-ace-window") + (version "0.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abo-abo/ace-window.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-avy" ,emacs-avy))) + (home-page "https://github.com/abo-abo/ace-window") + (synopsis "Quickly switch windows in Emacs") + (description + "@code{ace-window} is meant to replace @code{other-window}. In fact, when there are only two windows present, @code{other-window} is called. If there are more, each window will have its first character highlighted. Pressing that character will switch to that window.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-iedit ;; Last release version was in 2016. @@ -6915,7 +6972,7 @@ maximizes flexibility (at the expense of conciseness).") `(("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.") @@ -7427,29 +7484,27 @@ for search-based navigation of buffers.") (license license:gpl2+))) (define-public emacs-helm-ag - (let ((commit "2fc02c4ead29bf0db06fd70740cc7c364cb650ac") - (revision "1")) - (package - (name "emacs-helm-ag") - (version (git-version "0.58" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/syohex/emacs-helm-ag.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1gnn0byywbld6afcq1vp92cjvy4wlag9d1wgymnqn86c3b1bcf21")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-helm" ,emacs-helm))) - (home-page "https://github.com/syohex/emacs-helm-ag") - (synopsis "Helm interface to the Silver Searcher") - (description - "This package provides a frontend for grepping tools like ag and ack, + (package + (name "emacs-helm-ag") + (version "0.59") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/syohex/emacs-helm-ag.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vsz2b5qw4qahlf74059z4p1grinhfz28f0psw4c3qf4jasv3b9j")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (home-page "https://github.com/syohex/emacs-helm-ag") + (synopsis "Helm interface to the Silver Searcher") + (description + "This package provides a frontend for grepping tools like ag and ack, as well as features for editing search results.") - (license license:gpl3+)))) + (license license:gpl3+))) ;; There hasn't been a tag or release since 2016, so we take the latest ;; commit. @@ -7899,17 +7954,29 @@ Lua programming language}.") (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 @@ -8406,24 +8473,23 @@ distribution, primarily targeting Clojure users") (define-public emacs-orgalist (package (name "emacs-orgalist") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "orgalist-" version ".el")) (sha256 - (base32 - "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl")))) + (base32 "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/orgalist.html") (synopsis "Manage Org-like lists in non-Org buffers") - (description "Write Org mode's plain lists in non-Org buffers. More -specifically, Orgalist supports the syntax of Org mode for numbered, -unnumbered, description items, checkboxes, and counter cookies. + (description "Orgalist writes and manages Org mode's plain lists in +non-Org buffers. More specifically, it supports the syntax of Org mode for +numbered, unnumbered, description items, checkboxes, and counter cookies. -The library also implements radio lists, i.e., lists written in Org -syntax later translated into the host format, e.g., LaTeX or HTML.") +The library also implements radio lists, i.e., lists written in Org syntax +later translated into the host format, e.g., LaTeX or HTML.") (license license:gpl3+))) (define-public emacs-writegood-mode @@ -8480,6 +8546,17 @@ passive voice.") (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 @@ -9178,6 +9255,31 @@ above over the network.") in Org buffers and displays matching entries.") (license license:gpl3+))) +(define-public emacs-dired-git-info + ;; Upstream has no proper release. The base version is extracted from the + ;; "Version" keyword in the main file. + (let ((commit "91d57e3a4c5104c66a3abc18e281ee55e8979176") + (revision "0")) + (package + (name "emacs-dired-git-info") + (version (git-version "0.3.1" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/clemera/dired-git-info") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dr4iv95s4barxxj56znqkl9z0lg5jw731jmjr01s6vn8ar69gik")))) + (build-system emacs-build-system) + (home-page "https://github.com/clemera/dired-git-info/") + (synopsis "Show git info in Emacs Dired") + (description "This Emacs package provides a minor mode which shows git +information inside the Dired buffer.") + (license license:gpl3+)))) + (define-public emacs-dired-toggle-sudo (package (name "emacs-dired-toggle-sudo") @@ -9202,6 +9304,28 @@ in Org buffers and displays matching entries.") @code{sudo} privileges.") (license license:wtfpl2))) +(define-public emacs-diredfl + (package + (name "emacs-diredfl") + (version "0.4") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/purcell/diredfl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z")))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/diredfl/") + (synopsis "Extra Emacs font lock rules for a more colourful Dired") + (description "This library enables additional font locking in Dired mode. +This is adapted from the extra font lock rules provided by Drew Adams' Dired+ +package.") + (license license:gpl3+))) + (define-public emacs-memoize (package (name "emacs-memoize") @@ -12291,6 +12415,49 @@ keychains. The keychain entries are displayed in a directory-like structure 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") @@ -12378,8 +12545,8 @@ match and total match information in the mode-line in various search modes.") (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))) @@ -12485,7 +12652,7 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.") (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 @@ -12758,7 +12925,7 @@ into sections while preserving the structure imposed by any timestamps.") (define-public emacs-org-make-toc (package (name "emacs-org-make-toc") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) (uri (git-reference @@ -12767,7 +12934,7 @@ into sections while preserving the structure imposed by any timestamps.") (file-name (git-file-name name version)) (sha256 (base32 - "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw")))) + "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-org" ,emacs-org) @@ -13294,7 +13461,7 @@ navigate and display hierarchy structures.") (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 @@ -13328,7 +13495,7 @@ navigate and display hierarchy structures.") (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 @@ -13851,7 +14018,7 @@ key again.") (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+)))) @@ -14047,17 +14214,17 @@ throw a shell history.") `(("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+))) (define-public emacs-org-ref - (let ((commit "8c9b5d7efb9f0c1ad5186b8203bdd017f4249129") - (revision "1")) + ;; No release since June 2017. + (let ((commit "5bb9be2232db72b04754d7e4c02a3976ad422f6f") + (revision "2")) (package (name "emacs-org-ref") - (version (string-append "1.1.1" "-" revision "." - (string-take commit 7))) + (version (git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -14066,29 +14233,40 @@ their meaning for the current Emacs major-mode.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "1rxz0bjdsayk0slv23i07d9xhj2m7s4hsc81wc2d1cs52dkr5zmz")))) + (base32 "15gcvbfj19kyv4nxa632b261dwhb26m99plq230qhv9ssfwfgxbx")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) ("emacs-helm" ,emacs-helm) ("emacs-helm-bibtex" ,emacs-helm-bibtex) - ("emacs-ivy" ,emacs-ivy) + ("emacs-htmlize" ,emacs-htmlize) ("emacs-hydra" ,emacs-hydra) + ("emacs-ivy" ,emacs-ivy) ("emacs-key-chord" ,emacs-key-chord) - ("emacs-s" ,emacs-s) - ("emacs-f" ,emacs-f) - ("emacs-pdf-tools" ,emacs-pdf-tools))) + ("emacs-pdf-tools" ,emacs-pdf-tools) + ("emacs-s" ,emacs-s))) (home-page "https://github.com/jkitchin/org-ref") - (synopsis "Citations, cross-references and bibliographies in org-mode") + (synopsis "Citations, cross-references and bibliographies in Org mode") (description - "Lisp code to setup bibliography, cite, ref and label org-mode links. -Also sets up reftex and helm for org-mode citations. The links are -clickable and do things that are useful. - -The default setup uses helm-bibtex. - -You should really read org-ref.org in this package for details.") + "Org Ref is an Emacs library that provides rich support for citations, +labels and cross-references in Org mode. + +The basic idea of Org Ref is that it defines a convenient interface to insert +citations from a reference database (e.g., from BibTeX files), and a set of +functional Org links for citations, cross-references and labels that export +properly to LaTeX, and that provide clickable functionality to the user. Org +Ref interfaces with Helm BibTeX to facilitate citation entry, and it can also +use RefTeX. + +It also provides a fairly large number of utilities for finding bad citations, +extracting BibTeX entries from citations in an Org file, and functions to +create and modify BibTeX entries from a variety of sources, most notably from +a DOI. + +Org Ref is especially suitable for Org documents destined for LaTeX export and +scientific publication. Org Ref is also useful for research documents and +notes.") (license license:gpl3+)))) ;; This project is unmaintained. Please use emacs-org-re-reveal instead. @@ -17454,7 +17632,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (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+))) @@ -22259,7 +22437,7 @@ conversion program}, a Japanese input method on Emacs.") (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.") @@ -22301,3 +22479,59 @@ conventions.") (description "Haskell-Snippets is a collection of YASnippet Haskell snippets for Emacs.") (license license:expat)))) + +(define-public emacs-org-roam + (package + (name "emacs-org-roam") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jethrokuan/org-roam.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-company" ,emacs-company) + ("emacs-dash" ,emacs-dash) + ("emacs-emacsql-sqlite" ,emacs-emacsql) + ("emacs-f" ,emacs-f) + ("emacs-org-ref" ,emacs-org-ref) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/jethrokuan/org-roam/") + (synopsis "Non-hierarchical note-taking with Org mode") + (description "Emacs Org Roam is a solution for taking non-hierarchical +notes with Org mode. Notes are captured without hierarchy and are connected +by tags. Notes can be found and created quickly. Org Roam should also work +as a plug-and-play solution for anyone already using Org mode for their +personal wiki.") + (license license:gpl3+))) + +(define-public emacs-uml-mode + ;; Package has no release. Version is extracted from "Version:" keyword in + ;; main file. + (let ((commit "4c37ac1c4424b2313cd8f16ba48a98a4cc214200") + (revision "1")) + (package + (name "emacs-uml-mode") + (version (git-version "0.0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ianxm/emacs-uml.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "145i4srnfvd1vyibri2a1l6p9mbjvkkwlrpi41134pbarqffcnka")))) + (build-system emacs-build-system) + (home-page "https://github.com/ianxm/emacs-uml") + (synopsis "Minor mode for editing ASCII UML sequence diagrams") + (description "Emacs UML mode is a minor mode that makes it easy to build +ASCII UML sequence diagrams in Emacs, which can be embedded in source code, +comments or emails.") + (license license:gpl3+)))) + diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5405db762c..ac50efb923 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1017,22 +1017,42 @@ the 'showing the effect of'-style of operation.") (define-public volk (package (name "volk") - (version "1.3") + (version "2.2.1") (source (origin (method url-fetch) - (uri (string-append "http://libvolk.org/releases/volk-" + (uri (string-append "https://www.libvolk.org/releases/volk-" version ".tar.gz")) (sha256 (base32 - "1bz3ywc6y5wmz3i8p4z2wbzhns8bc0ywdkl9qnxpcvfcscarbdlh")))) + "1wz5nhmw6np8ka30pgy1qnima3rk2ksln4klfhrj7wah3fian0k9")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-pythonpath + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python")) + (file (string-append out "/bin/volk_modtool")) + (path (string-append + out + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages:" + (getenv "PYTHONPATH")))) + (wrap-program file + `("PYTHONPATH" ":" prefix (,path)) + `("PATH" ":" prefix + (,(string-append python "/bin:"))))) + #t))))) (inputs `(("boost" ,boost))) (native-inputs - `(("python-2" ,python-2) - ("python2-cheetah" ,python2-cheetah))) - (home-page "http://libvolk.org/") + `(("python" ,python-wrapper) + ("python-mako" ,python-mako))) + (home-page "https://www.libvolk.org/") (synopsis "Vector-Optimized Library of Kernels") (description "@code{volk} contains procedures with machine-specific optimizations diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ea1fcbe9d4..aa71335040 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019 Sebastian Schott <sschott@mailbox.org> ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org> +;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch> ;;; ;;; This file is part of GNU Guix. ;;; @@ -389,11 +390,11 @@ This package provides the Emacs mode.") (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+))) @@ -1048,13 +1049,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.56.0") + (version "0.57.0") (source (origin (method url-fetch) (uri (pypi-uri "duniterpy" version)) (sha256 - (base32 "1h8d8cnr6k5sw4cqy8r82zy4ldzpvn4nlk2221lz2haqq7xm4s5z")))) + (base32 "0rw2c7r9gcqhymp82gbk1ky45zqbypsi2q5x4vdwjc6g00kh7h6l")))) (build-system python-build-system) (arguments ;; FIXME: Tests fail with: "ModuleNotFoundError: No module named @@ -1401,6 +1402,44 @@ electronic cash system. This package provides a command line client and a Qt GUI.") (license license:expat))) +(define-public fulcrum + (package + (name "fulcrum") + (version "1.0.5b") + (source + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/FloweeTheHub/fulcrum/-/archive/v" + version "/fulcrum-v" version ".tar.gz")) + (sha256 + (base32 "1c1hkik8avill8ha33g76rk4b03j5ac8wiml69q4jav7a63ywgfy")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Call qmake instead of configure to create a Makefile. + (replace 'configure + (lambda _ + (invoke + "qmake" + (string-append "PREFIX=" %output) + "features=")))))) + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("python" ,python) + ("qtbase" ,qtbase) + ("rocksdb" ,rocksdb) + ("zlib" ,zlib))) + (home-page "https://gitlab.com/FloweeTheHub/fulcrum/") + (synopsis "Fast and nimble SPV server for Bitcoin Cash") + (description + "Flowee Fulcrum is a server that is the back-end for @acronym{SPV, +Simplified Payment Verification} wallets, it provides the full API for those +walets in a fast and small server. The full data is stored in a full node, +like Flowee the Hub, which Fulcrum connects to over RPC.") + (license license:gpl3+))) + (define-public beancount (package (name "beancount") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b9811fb60e..9b62cf6aac 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1671,8 +1671,8 @@ encoding names are iconv-compatible.") (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: diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0e902200f2..b15d4eeb3a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -397,6 +397,56 @@ Playing bastet can be a painful experience, especially if you usually make canyons and wait for the long I-shaped block to clear four rows at a time.") (license license:gpl3+))) +(define-public blobwars + (package + (name "blobwars") + (version "2.00") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/blobwars/" + "blobwars-" version ".tar.gz")) + (sha256 + (base32 "16aagvkx6azf75gm5kaa94bh5npydvhqp3fvdqyfsanzdjgjf1n4")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test + #:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" out) + (string-append "BINDIR=" out "/bin/") + "USEPAK=1" + "RELEASE=1")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'werror-begone + (lambda _ + (substitute* "Makefile" (("-Werror") "")) + #t)) + (delete 'configure)))) ;no configure script + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("hicolor-icon-theme" ,hicolor-icon-theme) + ("sdl" ,(sdl-union (list sdl2 + sdl2-image + sdl2-mixer + sdl2-ttf + sdl2-net))))) + (home-page "https://sourceforge.net/projects/blobwars/") + (synopsis "Platform action game featuring a blob with a lot of weapons") + (description "Blobwars: Metal Blob Solid is a 2D platform game, the first +in the Blobwars series. You take on the role of a fearless Blob agent. Your +mission is to infiltrate various enemy bases and rescue as many MIAs as +possible, while battling many vicious aliens.") + (license (list license:gpl2 ; For code and graphics + license:cc0 ; Music and sounds have specific licenses + license:cc-by3.0 ; see /doc/readme + license:cc-by-sa3.0 + license:lgpl2.1+ + license:bsd-2)))) + (define-public cataclysm-dda (package (name "cataclysm-dda") @@ -2971,20 +3021,14 @@ world}, @uref{http://evolonline.org, Evol Online} and (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 @@ -3034,15 +3078,15 @@ engine. When you start it you will be prompted to download a graphics set.") (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" @@ -3072,6 +3116,7 @@ engine. When you start it you will be prompted to download a graphics set.") ("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") @@ -3716,6 +3761,69 @@ fullscreen, use F5 or Alt+Enter.") ;; Code mainly BSD-2, some parts under Boost 1.0. All assets are WTFPL2. (license (list license:bsd-2 license:boost1.0 license:wtfpl2)))) +(define-public tennix + (package + (name "tennix") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://repo.or.cz/tennix.git") + (commit (string-append "tennix-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02cj4lrdrisal5s9pnbf2smx7qz9czczjzndfkhfx0qy67b957sk")) + ;; Remove non-free images. + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file + '("data/loc_training_camp.png" + "data/loc_austrian_open.png" + "data/loc_olympic_green_tennis.png")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-include + (lambda _ + (substitute* '("src/graphics.h" "src/sound.h") + (("#include \"(SDL_(image|ttf|mixer)\\.h)\"" _ header) + (string-append "#include \"SDL/" header "\""))) + (substitute* '("src/tennix.h" "src/network.h" "src/SDL_rotozoom.h") + (("#include <SDL.h>") "#include <SDL/SDL.h>") + (("#include <SDL_net.h>") "#include <SDL/SDL_net.h>")) + #t)) + (add-after 'unpack 'locate-install + ;; Build process cannot expand "$(INSTALL)" in Makefile. + (lambda _ + (substitute* "makefile" + (("^CONFIGURE_OUTPUT :=.*" all) + (string-append "INSTALL := install -c\n" all))) + #t)) + (replace 'configure + ;; The "configure" script is picky about the arguments it + ;; gets. Call it ourselves. + (lambda _ + (invoke "./configure" "--prefix" (assoc-ref %outputs "out"))))))) + (native-inputs + `(("which" ,which))) + (inputs + `(("python" ,python-wrapper) + ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf sdl-net))))) + (home-page "http://icculus.org/tennix/") + (synopsis "Play tennis against the computer or a friend") + (description "Tennix is a 2D tennis game. You can play against the +computer or against another player using the keyboard. The game runs +in-window at 640x480 resolution or fullscreen.") + ;; Project is licensed under GPL2+ terms. It includes images + ;; released under Public Domain terms, and SDL_rotozoom, released + ;; under LGPL2.1 terms. + (license (list license:gpl2+ license:public-domain license:lgpl2.1)))) + (define-public warzone2100 (package (name "warzone2100") @@ -3772,7 +3880,7 @@ fullscreen, use F5 or Alt+Enter.") modes. An extensive tech tree with over 400 different technologies, combined with the unit design system, allows for a wide variety of possible units and tactics.") - ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL + ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL (license (list license:bsd-3 license:cc0 license:cc-by-sa3.0 @@ -4018,7 +4126,7 @@ with the \"Stamp\" tool within Tux Paint.") (define-public supertux (package (name "supertux") - (version "0.6.1") + (version "0.6.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/SuperTux/supertux/" @@ -4027,7 +4135,7 @@ with the \"Stamp\" tool within Tux Paint.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lqch5gcq6ccnspy93z9r13bp8w2j1vrd8jhvk5kp4qhrd1f069s")) + "0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f")) (patches (search-patches "supertux-unbundle-squirrel.patch")))) (arguments @@ -6081,7 +6189,7 @@ affect gameplay).") (package (inherit chocolate-doom) (name "crispy-doom") - (version "5.7.1") + (version "5.7.2") (source (origin (method git-fetch) (uri (git-reference @@ -6089,7 +6197,7 @@ affect gameplay).") (commit (string-append "crispy-doom-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gqivy4pxasy7phyznixsagylf9f70bk33b0knpfzzlks6cc6zzj")))) + (base32 "002aqbgsksrgzqridwdlkrjincaxh0dkvwlrbb8d2f3kwk7lj4fq")))) (native-inputs (append (package-native-inputs chocolate-doom) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 86385c14ae..384f274aee 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1153,8 +1153,8 @@ persisted. (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 @@ an independent project by the JOSM team.") (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+))) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 3537fa12f5..d13390c214 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -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> @@ -183,7 +183,7 @@ buffers.") ("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 @@ -270,7 +270,7 @@ inverse fourier transform.") (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/" @@ -278,7 +278,7 @@ inverse fourier transform.") version ".tar.xz")) (sha256 (base32 - "0wd6jk69vmhsq1mdw96v0fh7b28n3glkr5ca466zcq7agzaxj1va")))) + "0aqcv4fyscpfhknxgfpq0v84aj2nzigqvpi4zgv2zkl41h51by5f")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -298,34 +298,42 @@ brushstrokes which is used by MyPaint and GIMP.") (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 @@ -337,13 +345,14 @@ MyPaint.") (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: @@ -351,11 +360,11 @@ MyPaint.") #: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") @@ -364,8 +373,8 @@ MyPaint.") (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)))))) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index ad4593bcd5..625248a25a 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -359,7 +359,7 @@ control.") (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/") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 63dd8dc4c6..33aae4545e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9201,7 +9201,7 @@ configurable file renaming. ") (define-public workrave (package (name "workrave") - (version "1.10.37") + (version "1.10.42") (source (origin (method git-fetch) @@ -9212,7 +9212,7 @@ configurable file renaming. ") 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. @@ -9679,7 +9679,7 @@ repository and commit your work.") (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 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ed82d4153c..06d855ee3e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -750,7 +750,7 @@ from forcing GEXP-PROMISE." ("libxt" ,libxt) ("libffi" ,libffi) ("ffmpeg" ,ffmpeg) - ("libvpx" ,libvpx-1.7) + ("libvpx" ,libvpx) ("icu4c" ,icu4c) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6fc5181d6c..69f46df743 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3281,7 +3281,7 @@ are semantically equal in Go (for writing tests).") (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)))) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 8bf69c6551..02aef3ed47 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -167,14 +168,13 @@ downloading episode status changes.") (define-public python-podcastparser (package (name "python-podcastparser") - (version "0.6.4") + (version "0.6.5") (source (origin (method url-fetch) (uri (pypi-uri "podcastparser" version)) (sha256 - (base32 - "1ksj1gcmbnm5i43xhpqxbs2mqi6xzawwwkwbh9h6lwa1wxxvv247")))) + (base32 "0k62ppg20i41gcc5x8ddjn7zbpy47hqpxzrq9257g2c71m4qw07b")))) (native-inputs `(("python-nose" ,python-nose))) (build-system python-build-system) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index db4dd33464..dd5041784c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -87,6 +88,61 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public fox + (package + (name "fox") + (version "1.6.57") + (source + (origin + (method url-fetch) + (uri + (string-append "https://fox-toolkit.org/ftp/fox-" version ".tar.gz")) + (sha256 + (base32 "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "configure" + (("-I/usr/include/freetype2") + (string-append "-I" + (string-append + (assoc-ref %build-inputs "freetype") + "/include/freetype2")))) + #t))))) + (native-inputs + `(("doxygen" ,doxygen))) + (inputs + `(("bzip2" ,lbzip2) + ("freetype" ,freetype) + ("gl" ,mesa) + ("glu" ,glu) + ("jpeg" ,libjpeg) + ("png" ,libpng) + ("tiff" ,libtiff) + ("x11" ,libx11) + ("xcursor" ,libxcursor) + ("xext" ,libxext) + ("xfixes" ,libxfixes) + ("xft" ,libxft) + ("xinput" ,libxi) + ("xrandr" ,libxrandr) + ("xrender" ,libxrender) + ("xshm" ,libxshmfence) + ("zlib" ,zlib))) + (synopsis "Widget Toolkit for building GUI") + (description"FOX (Free Objects for X) is a C++ based Toolkit for developing +Graphical User Interfaces easily and effectively. It offers a wide, and +growing, collection of Controls, and provides state of the art facilities such +as drag and drop, selection, as well as OpenGL widgets for 3D graphical +manipulation. FOX also implements icons, images, and user-convenience features +such as status line help, and tooltips. Tooltips may even be used for 3D +objects!") + (home-page "http://www.fox-toolkit.org") + (license license:lgpl2.1+))) + (define-public blender (package (name "blender") diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a86a3f77ef..ebd7d89dec 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -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> @@ -1123,7 +1123,7 @@ microblogging service.") (define-public guile-parted (package (name "guile-parted") - (version "0.0.2") + (version "0.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -1132,20 +1132,8 @@ microblogging service.") (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)))) + "0b7h8psfm9gmmwb65pp5zwzglvwnfmw5j40g09hhf3f7kwxc0mv2")) + (modules '((guix build utils))))) (build-system gnu-build-system) (arguments '(#:make-flags @@ -1663,6 +1651,84 @@ capabilities.") (home-page "https://dthompson.us/projects/sly.html") (license license:gpl3+))) +(define-public g-golf + (let ((commit "4a4edf25e4877df9182c77843bdd98ab59e13ef7")) + (package + (name "g-golf") + (version (git-version "1" "683" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/g-golf.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09p0gf71wbmlm9kri693a8fvr9hl3hhlmlidyadwjdh7853xg0h8")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2) + ("guile-lib" ,guile-lib) + ("clutter" ,clutter) + ("gtk" ,gtk+) + ("glib" ,glib))) + (propagated-inputs + `(("gobject-introspection" ,gobject-introspection))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'tests-work-arounds + (lambda* (#:key inputs #:allow-other-keys) + ;; In build environment, There is no /dev/tty + (substitute* + "test-suite/tests/gobject.scm" + (("/dev/tty") "/dev/null")))) + (add-before 'configure 'substitute-libs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((get (lambda (key lib) + (string-append (assoc-ref inputs key) "/lib/" lib))) + (libgi (get "gobject-introspection" "libgirepository-1.0")) + (libglib (get "glib" "libglib-2.0")) + (libgobject (get "glib" "libgobject-2.0")) + (libgdk (get "gtk" "libgdk-3"))) + (substitute* "configure" + (("SITEDIR=\"\\$datadir/g-golf\"") + "SITEDIR=\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSION\"") + (("SITECCACHEDIR=\"\\$libdir/g-golf/") + "SITECCACHEDIR=\"$libdir/")) + (substitute* "g-golf/init.scm" + (("libgirepository-1.0") libgi) + (("libglib-2.0") libglib) + (("libgdk-3") libgdk) + (("libgobject-2.0") libgobject) + (("\\(dynamic-link \"libg-golf\"\\)") + (format #f "~s" + `(dynamic-link + (format #f "~alibg-golf" + (if (getenv "GUILE_GGOLF_UNINSTALLED") + "" + ,(format #f "~a/lib/" + (assoc-ref outputs "out")))))))) + (setenv "GUILE_AUTO_COMPILE" "0") + (setenv "GUILE_GGOLF_UNINSTALLED" "1") + #t)))))) + (home-page "https://www.gnu.org/software/g-golf/") + (synopsis "Guile bindings for GObject Introspection") + (description + "G-Golf (Gnome: (Guile Object Library for)) is a library for developing +modern applications in Guile Scheme. It comprises a direct binding to the +GObject Introspection API and higher-level functionality for importing Gnome +libraries and making GObject classes (and methods) available in Guile's +object-oriented programming system, GOOPS.") + (license license:lgpl3+)))) + (define-public g-wrap (package (name "g-wrap") @@ -2142,14 +2208,14 @@ is no support for parsing block and inline level HTML.") (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 @@ -2680,11 +2746,11 @@ in C using Gtk+-3 and WebKitGtk.") (license license:gpl3+))) (define-public emacsy-minimal - (let ((commit "f3bf0dbd803d7805b6ae8303253507ad13922293")) + (let ((commit "d459ca1d3d09e7624e662bc4cfc3596850796fc6")) (package (inherit emacsy) (name "emacsy-minimal") - (version (git-version "v0.4.1" "19" commit)) + (version (git-version "v0.4.1" "28" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2693,7 +2759,7 @@ in C using Gtk+-3 and WebKitGtk.") (file-name (git-file-name name version)) (sha256 (base32 - "0ivy28km1p7nlrf63xx3hvrpxf5ld5amk1wcan3k7sqv1kq9mqdb")))) + "1ps15w8cxj9kc18gmvys9jv9xa1qqa7m43ismv34l3cmhddrn0sr")))) (build-system gnu-build-system) (inputs `(("guile" ,guile-2.2) diff --git a/gnu/packages/ham-radio.scm b/gnu/packages/ham-radio.scm deleted file mode 100644 index 376191af54..0000000000 --- a/gnu/packages/ham-radio.scm +++ /dev/null @@ -1,178 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com> -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. - -(define-module (gnu packages ham-radio) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (gnu packages autotools) - #:use-module (gnu packages base) - #:use-module (gnu packages gtk) - #:use-module (gnu packages image) - #:use-module (gnu packages libusb) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages sdr) - #:use-module (gnu packages xml) - #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) - #:use-module (guix build-system python)) - -(define-public rtl-sdr - (package - (name "rtl-sdr") - (version "0.6.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.osmocom.org/rtl-sdr.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k")))) - (build-system cmake-build-system) - (inputs - `(("libusb" ,libusb))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (arguments - `(#:configure-flags '("-DDETACH_KERNEL_DRIVER=ON") - #:tests? #f)) ; No tests - (home-page "https://osmocom.org/projects/sdr/wiki/rtl-sdr") - (synopsis "Software defined radio driver for Realtek RTL2832U") - (description "DVB-T dongles based on the Realtek RTL2832U can be used as a -cheap software defined radio, since the chip allows transferring the raw I/Q -samples to the host. @code{rtl-sdr} provides drivers for this purpose.") - (license license:gpl2+))) - -(define-public chirp - (package - (name "chirp") - (version "20181205") - (source - (origin - (method url-fetch) - (uri (string-append "https://trac.chirp.danplanet.com/chirp_daily/daily-" - version "/chirp-daily-" version ".tar.gz")) - (sha256 - (base32 - "1cp280b95j39xaxs50zn55jigg7pyfpm9n098hmsyxrplqn8z43c")))) - (build-system python-build-system) - (inputs - `(("python2-libxml2" ,python2-libxml2) - ("python2-pygtk" ,python2-pygtk) - ("python2-pyserial" ,python2-pyserial))) - (arguments - `(#:python ,python-2)) - (home-page "https://chirp.danplanet.com") - (synopsis "Cross-radio programming tool") - (description "Chirp is a cross-radio programming tool. It supports a -growing list of radios across several manufacturers and allows transferring of -memory contents between them.") - (license (list license:gpl3+ - license:lgpl3+)))) ; chirp/elib_intl.py - -(define-public aptdec - (package - (name "aptdec") - (version "1.7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/csete/aptdec") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hf0zb51qc6fyhdjxyij1n3vgwnw3cwksc3r11szbhkml14qjnzk")))) - (build-system gnu-build-system) - (inputs - `(("libpng" ,libpng) - ("libsndfile" ,libsndfile))) - (arguments - `(#:make-flags (list "CC=gcc") - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "atpdec" (string-append out "/bin"))) - #t))))) - (home-page "https://github.com/csete/aptdec") - (synopsis "NOAA Automatic Picture Transmission (APT) decoder") - (description "Aptdec decodes Automatic Picture Transmission (APT) images. -These are medium resolution images of the Earth transmitted by, among other -satellites, the POES NOAA weather satellite series. These transmissions are -on a frequency of 137 MHz. They can be received using an inexpensive antenna -and a dedicated receiver.") - (license license:gpl2+))) - -(define-public redsea - (package - (name "redsea") - (version "0.18") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/windytan/redsea") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; The configure.ac file does not explicitly link against libiconv - ;; except on Mac OS, causing the build to fail. This phase comments - ;; out the original AC_SUBST macro (located inside a conditional) and - ;; adds an explicit use of it underneath, so that libiconv is always - ;; linked against. - (add-after 'unpack 'patch-libiconv - (lambda _ - (substitute* "configure.ac" - (("^ +AC_SUBST") - "# AC_SUBST") - (("esac") - "esac\nAC_SUBST([ICONV], [\"-liconv\"])")) - #t))))) - (inputs - `(("libiconv" ,libiconv) - ("libsndfile" ,libsndfile) - ("liquid-dsp" ,liquid-dsp))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake))) - (home-page "https://github.com/windytan/redsea") - (synopsis "Lightweight RDS to JSON decoder") - (description "redsea is a lightweight command-line @dfn{FM Radio Data -System} (FM-RDS) decoder. Redsea can be used with any RTL-SDR USB radio stick -with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via -csdr, for example. It can also decode raw ASCII bitstream, the hex format -used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") - (license license:expat))) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 4c9c45bc48..7ee657a75a 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,6 +18,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages hardware) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) @@ -276,3 +278,32 @@ supported by the Linux kernel.") ;; Source file headers still say GPL2+, but the authorial intent ;; (from COPYING and the F9 'about' screen) is clearly GPL3+. (license license:gpl3+))) + +(define-public rkdeveloptool + (let ((commit "6e92ebcf8b1812da02663494a68972f956e490d3") + (revision "0")) + (package + (name "rkdeveloptool") + (version (git-version "1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rockchip-linux/rkdeveloptool.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("libusb" ,libusb))) + (home-page "https://github.com/rockchip-linux/rkdeveloptool") + (synopsis "Read from and write to RockChicp devices over USB") + (description + "Rkdeveloptool can read from and write to RockChip devices over USB, such +as the Pinebook Pro.") + (license license:gpl2+)))) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index c6821daf00..d12d113945 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -746,7 +746,7 @@ too slow and you'll get wound up in the scroll and crushed.") ("ghc-diff" ,ghc-diff) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) - (home-page "https://github.com/koalaman/shellcheck") + (home-page "https://www.shellcheck.net/") (synopsis "Static analysis for shell scripts") (description "@code{shellcheck} provides static analysis for @command{bash} and @command{sh} shell scripts. diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 5dc9f705cc..c9119efd69 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9745,7 +9745,7 @@ Haskell library @code{regex-base}.") (build-system haskell-build-system) (inputs `(("ghc-regex-base" ,ghc-regex-base))) - (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") + (home-page "https://github.com/haskell-hvr/regex-tdfa") (synopsis "POSIX extended regular expressions in Haskell.") (description "Regex-tdfa is a pure Haskell regular expression library implementing POSIX @@ -10780,7 +10780,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (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))) diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index a317cd590c..0061701304 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +22,6 @@ #:use-module (gnu packages compression) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) - #:use-module (gnu packages web) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -30,7 +30,7 @@ (define-public i2pd (package (name "i2pd") - (version "2.29.0") + (version "2.31.0") (source (origin (method git-fetch) @@ -39,12 +39,11 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1issg3aidwikk4g12sa8q81zzp0hd0g8wdy2dx4899z8yrscl300")))) + (base32 "1q2gxz041ha9n5lfn91iy11sdf3z7d806vcq4z43m7lf92m7i4nn")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) - ("websocketpp" ,websocketpp) ("zlib" ,zlib))) (arguments '(#:configure-flags (let ((source (assoc-ref %build-inputs "source"))) @@ -52,7 +51,6 @@ "-DWITH_PCH=OFF" "-DWITH_STATIC=OFF" "-DWITH_UPNP=ON" - "-DWITH_WEBSOCKETS=ON" "-DWITH_LIBRARY=ON" "-DBUILD_SHARED_LIBS=ON" "-DWITH_BINARY=ON")) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 3869016df3..beeb2d7ff4 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -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> ;;; ;;; This file is part of GNU Guix. ;;; @@ -117,6 +117,24 @@ C/C++ part.") (search-patches "icu4c-CVE-2020-10531.patch"))))))) +(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") diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index e7bfb10474..12bf318b0a 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Peng Mei Yu <pengmeiyu@riseup.net> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> +;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system meson) @@ -420,44 +422,95 @@ imaging. It supports several HDR and LDR image formats, and it can: (license license:gpl2+))) ;; CBR and RAR are currently unsupported, due to non-free dependencies. -;; For optional PDF support, you can install the mupdf package. (define-public mcomix - (package - (name "mcomix") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/mcomix/MComix-" version - "/mcomix-" version ".tar.bz2")) - (sha256 - (base32 - "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy")))) - (build-system python-build-system) - (inputs - `(("p7zip" ,p7zip) - ("python2-pillow" ,python2-pillow) - ("python2-pygtk" ,python2-pygtk))) - (arguments - ;; Python 2.5 or newer (Python 3 and up is not supported) - `(#:python ,python-2 - #:tests? #f ; there are no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((p7zip (assoc-ref inputs "p7zip"))) - ;; insert absolute path to 7z executable - (substitute* "mcomix/archive/sevenzip_external.py" - (("_7z_executable = -1") - (string-append "_7z_executable = u'" p7zip "/bin/7z'")))) - #t))))) - (home-page "https://sourceforge.net/p/mcomix/wiki/Home/") - (synopsis "Image viewer for comics") - (description "MComix is a customizable image viewer that specializes as + ;; Official mcomix hasn't been updated since 2016, it's broken with + ;; python-pillow 6+ and only supports Python 2. We use fork instead. + (let ((commit "fea55a7a9369569eefed72209eed830409c4af98")) + (package + (name "mcomix") + (version (git-version "1.2.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/multiSnow/mcomix3") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05zl0dkjwbdcm2zlk4nz9w33amlqj8pbf32a8ymshc2356fqhhi5")))) + (build-system python-build-system) + (inputs + `(("p7zip" ,p7zip) + ("python-pillow" ,python-pillow) + ("python-pygobject" ,python-pygobject) + ("python-pycairo" ,python-pycairo))) + (arguments + `(#:tests? #f ; FIXME: How do we run tests? + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((p7zip (assoc-ref inputs "p7zip"))) + ;; insert absolute path to 7z executable + (substitute* "mcomix/mcomix/archive/sevenzip_external.py" + (("_7z_executable = -1") + (string-append "_7z_executable = u'" p7zip "/bin/7z'")))) + #t)) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pyver ,(version-major+minor (package-version python))) + (lib (string-append out "/lib/python" pyver))) + (invoke (which "python") "installer.py" "--srcdir=mcomix" + (string-append "--target=" lib)) + (rename-file (string-append lib "/mcomix") + (string-append lib "/site-packages")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (bin (string-append out "/bin")) + (pyver ,(version-major+minor (package-version python))) + (lib (string-append out "/lib/python" pyver "/site-packages"))) + (mkdir-p bin) + (rename-file (string-append lib "/mcomixstarter.py") + (string-append bin "/mcomix")) + (rename-file (string-append lib "/comicthumb.py") + (string-append bin "/comicthumb")) + (install-file "mime/mcomix.desktop" + (string-append share "/applications")) + (install-file "mime/mcomix.appdata.xml" + (string-append share "/metainfo")) + (install-file "mime/mcomix.xml" + (string-append share "/mime/packages")) + (install-file "mime/comicthumb.thumbnailer" + (string-append share "/thumbnailers")) + (install-file "man/mcomix.1" (string-append share "/man/man1")) + (install-file "man/comicthumb.1" (string-append share "/man/man1")) + (for-each + (lambda (size) + (install-file + (format #f "mcomix/mcomix/images/~sx~s/mcomix.png" size size) + (format #f "~a/icons/hicolor/~sx~s/apps/" share size size)) + (for-each + (lambda (ext) + (install-file + (format #f "mime/icons/~sx~s/application-x-~a.png" size size ext) + (format #f "~a/icons/hicolor/~sx~s/mimetypes/" + share size size))) + '("cb7" "cbr" "cbt" "cbz"))) + '(16 22 24 32 48)) + #t)))))) + (home-page "https://sourceforge.net/p/mcomix/wiki/Home/") + (synopsis "Image viewer for comics") + (description "MComix is a customizable image viewer that specializes as a comic and manga reader. It supports a variety of container formats -including CBZ, CB7, CBT, LHA.") - (license license:gpl2+))) +including CBZ, CB7, CBT, LHA. + +For PDF support, install the @emph{mupdf} package.") + (license license:gpl2+)))) (define-public qview (package diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index acaf25f745..95b8123b8e 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -170,14 +170,14 @@ SILC and ICB protocols via plugins.") (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 @@ SILC and ICB protocols via plugins.") ("zlib" ,zlib) ;; Scripting language plug-ins. - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("lua" ,lua-5.1) ("perl" ,perl) ("python" ,python) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4d305aac49..1d9f6ff92b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4416,7 +4416,7 @@ on the XPP3 API (XML Pull Parser)."))) (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))) @@ -7420,7 +7420,7 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) (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: @@ -8815,7 +8815,7 @@ make data-binding work.") ("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 @@ -11644,7 +11644,7 @@ the application using Java to Lisp integration APIs.") (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 diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 6dd53b9283..16a4705a07 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -409,7 +409,7 @@ ("openlibm" ,openlibm) ("mbedtls" ,mbedtls-apache) ("curl" ,curl) - ("libgit2" ,libgit2) + ("libgit2" ,libgit2-0.28) ("libssh2" ,libssh2) ("fortran" ,gfortran) ("libuv" ,libuv-julia) diff --git a/gnu/packages/kawa.scm b/gnu/packages/kawa.scm index 5771eeda8e..9550a01720 100644 --- a/gnu/packages/kawa.scm +++ b/gnu/packages/kawa.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,18 +28,25 @@ (define-public kawa (package (name "kawa") - (version "3.0") + (version "3.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/kawa/kawa-" version ".tar.gz")) (sha256 - (base32 - "1k9qpydc64ar4aqyg3q7jmmxy503ayj85227qfhc5n6ngchqavhy")))) + (base32 "06g015zjlfgsx0n4lb326czkbf1grlx0n6dx074m808hdg6m16lc")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f - #:parallel-tests? #f)) + #:parallel-tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-kawa + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/share/kawa/bin/kawa") + `("JAVA_HOME" ":" = (,(assoc-ref inputs "icedtea")))) + #t)))))) (inputs `(("icedtea" ,icedtea-8 "jdk"))) (home-page "https://www.gnu.org/software/kawa/") diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 666959ea15..5eb90cfb7c 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -452,7 +452,7 @@ a full-featured client for BitTorrent.") `(#: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 diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 4c1d5e7244..639d74d894 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -191,7 +191,7 @@ This package is part of the KDE multimedia module.") (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 diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index fea6dd3068..cb24f0efbf 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -623,7 +623,7 @@ functions for accessing calendar data using the kcalcore API.") ("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 @@ supported using GroupDAV or CardDAV.") ("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 @@ and retrieving certificates from LDAP servers.") (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 @@ using a Qt/KMime C++ API.") `(#: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 diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index cd1b442169..d51566341d 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -83,7 +83,7 @@ (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. diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 50d75a4a95..c9959d7d01 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -99,7 +99,7 @@ framework for writing, administering, and running unit tests in C.") ("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+))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 41bdced9e1..ad6e38f620 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,50 +369,50 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.3") +(define-public linux-libre-5.6-version "5.6.4") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "1ajh1iw3bplm6ckcycg45wfmmqkvfiqmh6i3m1895dfapfd6h4qx"))) + (hash (base32 "14cxbc9xi4s3xwx4yb1yd4z0kidsk3d443skf5sgmdhcalg79wax"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.31") +(define-public linux-libre-5.4-version "5.4.32") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1svf4wf4j1vqhdpgx63ry4c99fc54d9nfi4d1xm7z209z3w86451"))) + (hash (base32 "1czjjnln1cqrnjxw0md6mpw9haw9abdyvmxnjds56ym4nzx9jb8r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.114") +(define-public linux-libre-4.19-version "4.19.115") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "03hz6vg5bg728ilbm4z997pf52cgxzsxb03vz5cs55gwdbfa0h0y"))) + (hash (base32 "1hh170z3mv181l6cc6qqc12wif5jsmxbh2qxbq6b9km5irydkchi"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.175") +(define-public linux-libre-4.14-version "4.14.176") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0b12w0d21sk261jr4p1pm32v0r20a5c2j1p5hasdqw80sb2hli6b"))) + (hash (base32 "18jwxhf29ax54xnylmz9zfkslnxw7y3h215dbfmmvddfp9b0kbmw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.218") +(define-public linux-libre-4.9-version "4.9.219") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1ka98c8sbfipzll6ss9fcsn26lh4cy60372yfw27pif4brhnwfnz"))) + (hash (base32 "0i5wlyp11ss9p035bhq73xjx8iyk5dk4ynvd7msw5qfkrs6265vb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.218") +(define-public linux-libre-4.4-version "4.4.219") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0qzhcy8i111jbpnkpzq7hqf9nkwq4s7smi820hfvnmd2ky7cns7a"))) + (hash (base32 "1mpxqb2m24ay4n9px4n2cyklxy4lhnv9q6wlvilx13rs5qfbb62f"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) @@ -1505,16 +1505,16 @@ slabtop, and skill.") (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))) (native-inputs `(("pkg-config" ,pkg-config) @@ -4325,7 +4325,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.4.1") + (version "5.6") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -4333,7 +4333,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "0scxg9p6z0wss92gmv5a8yxdmr8x449kb5v3bfnvs26n92r7zq7k")))) + "0srg276yccfmqz0skmmga3vbqx4wiqsk1l6h86n6ryhxa9viqcm1")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index 5e77f1ddc2..510bc032f8 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -98,7 +98,7 @@ "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.") diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6085ec18d1..40852440b1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -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 @@ #: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) @@ -1710,7 +1711,7 @@ also be supported.") (define-public sbcl-ironclad (package (name "sbcl-ironclad") - (version "0.48") + (version "0.49") (source (origin (method git-fetch) @@ -1718,8 +1719,7 @@ also be supported.") (url "https://github.com/sharplispers/ironclad/") (commit (string-append "v" version)))) (sha256 - (base32 - "1wzczpgvgjc5h8ghz75kxi7iykmqxqchdhgdhkif9j99kyqvbyam")) + (base32 "0kbzqg2aasrhjwy3nrzy2ddy809n1j045w4qkyc3r2syqd203d4q")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (native-inputs @@ -1727,7 +1727,8 @@ also be supported.") `(("rt" ,sbcl-rt))) (inputs `(("bordeaux-threads" ,sbcl-bordeaux-threads) - ("flexi-streams" ,sbcl-flexi-streams))) + ("flexi-streams" ,sbcl-flexi-streams) + ("trivial-garbage" ,sbcl-trivial-garbage))) (synopsis "Cryptographic toolkit written in Common Lisp") (description "Ironclad is a cryptography library written entirely in Common Lisp. @@ -2785,8 +2786,8 @@ advantage of the library is the ability to concisely define command line 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 @@ is a library for creating graphical user interfaces.") (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 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "0sn7m181wfg1q49q45dlsry8c38x7pziqcs0frnymk6yvgndybxd")))) + "0sdb2l2h5xv5c1m2mfq31i9yl6zjf512fvwwzlvk9nvisyhc4xi3")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) @@ -5076,8 +5077,8 @@ high-level way. This library provides such operators.") (sbcl-package->ecl-package sbcl-cl-quickcheck)) (define-public sbcl-burgled-batteries3 - (let ((commit "9c0f6667e1a71ddf77e21793a0bea524710fef6e") - (revision "1")) + (let ((commit "f65f454d13bb6c40e17e9ec62e41eb5069e09760") + (revision "2")) (package (name "sbcl-burgled-batteries3") (version (git-version "0.0.0" revision commit)) @@ -5090,33 +5091,33 @@ high-level way. This library provides such operators.") (file-name (git-file-name name version)) (sha256 (base32 - "0b726kz2xxcg5l930gz035rsdvhxrzmp05iwfwympnb4z4ammicb")))) + "1nzn7jawrfajyzwfnzrg2cmn9xxadcqh4szbpg0jggkhdkdzz4wa")))) (build-system asdf-build-system/sbcl) (arguments - '(#:tests? #f + `(#:tests? #f + #:modules (((guix build python-build-system) #:select (python-version)) + ,@%asdf-build-system-modules) + #:imported-modules ((guix build python-build-system) + ,@%asdf-build-system-modules) #:phases - (modify-phases %standard-phases + (modify-phases (@ (guix build asdf-build-system) %standard-phases) (add-after 'unpack 'set-*cpython-include-dir*-var (lambda* (#:key inputs #:allow-other-keys) - (substitute* "grovel-include-dir.lisp" - (("\\(defparameter \\*cpython-include-dir\\* \\(detect-python\\)\\)") - (string-append - "(defparameter *cpython-include-dir* \"" - (assoc-ref inputs "python") - "/include/python3.7m" - "\")"))) - (substitute* "ffi-interface.lisp" - (("\\*cpython-lib\\*") - (format #f "'(\"~a/lib/libpython3.so\")" - (assoc-ref inputs "python")))) - #t))))) + (let ((python (assoc-ref inputs "python"))) + (setenv "BB_PYTHON3_INCLUDE_DIR" + (string-append python "/include/python" + (python-version python) + "m")) + (setenv "BB_PYTHON3_DYLIB" + (string-append python "/lib/libpython3.so")) + #t)))))) (native-inputs - `(("python" ,python) - ("sbcl-cl-fad" ,sbcl-cl-fad) + `(("sbcl-cl-fad" ,sbcl-cl-fad) ("sbcl-lift" ,sbcl-lift) ("sbcl-cl-quickcheck" ,sbcl-cl-quickcheck))) (inputs - `(("sbcl-cffi" ,sbcl-cffi) + `(("python" ,python) + ("sbcl-cffi" ,sbcl-cffi) ("sbcl-cffi-grovel" ,sbcl-cffi-grovel) ("sbcl-alexandria" , sbcl-alexandria) ("sbcl-parse-declarations-1.0" ,sbcl-parse-declarations) @@ -5126,7 +5127,6 @@ high-level way. This library provides such operators.") "This package provides a shim between Python3 (specifically, the CPython implementation of Python) and Common Lisp.") (home-page "https://github.com/snmsts/burgled-batteries3") - ;; MIT (license license:expat)))) (define-public cl-burgled-batteries3 @@ -5503,7 +5503,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") (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)))) @@ -6315,10 +6315,10 @@ various string metrics in Common Lisp: (sbcl-package->cl-source-package sbcl-mk-string-metrics)) (define-public sbcl-cl-str - (let ((commit "3d5ec86e3a0199e5973aacde951086dfd754b5e5")) + (let ((commit "eb480f283e28802d67b35bf916506701152f9a2a")) (package (name "sbcl-cl-str") - (version (git-version "0.8" "1" commit)) + (version (git-version "0.17" "1" commit)) (home-page "https://github.com/vindarel/cl-str") (source (origin (method git-fetch) @@ -6326,12 +6326,13 @@ various string metrics in Common Lisp: (url home-page) (commit commit))) (sha256 - (base32 "0szzzbygw9h985yxz909vvqrp69pmpcpahn7hn350lnyjislk9ga")) + (base32 "1hpq5m8zjjnzns370zy27z2vcm1p8n2ka5ij2x67gyc9amz9vla0")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (inputs `(("cl-ppcre" ,sbcl-cl-ppcre) - ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode))) + ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) + ("cl-change-case" ,sbcl-cl-change-case))) (native-inputs `(("prove" ,sbcl-prove) ("prove-asdf" ,sbcl-prove-asdf))) @@ -6417,7 +6418,7 @@ power of CXML is available when necessary.") ("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)))) @@ -11313,3 +11314,106 @@ in DEFPACKAGE.") (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)) + +(define-public sbcl-cl-change-case + (let ((commit "5ceff2a5f8bd845b6cb510c6364176b27a238fd3")) + (package + (name "sbcl-cl-change-case") + (version (git-version "0.1.0" "1" commit)) + (home-page "https://github.com/rudolfochrist/cl-change-case") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1afyglglk9z3yg8gylcl301bl2r8vq3sllyznzj9s5xi5gs6qyf2")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre) + ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + '(;; FIXME: Test pass but phase fails with 'Component + ;; "cl-change-case-test" not found, required by'. + #:tests? #f + #:test-asd-file "cl-change-case-test.asd")) + (synopsis "Convert Common Lisp strings between camelCase, PascalCase and more") + (description + "@code{cl-change-case} is library to convert strings between camelCase, +PascalCase, snake_case, param-case, CONSTANT_CASE and more.") + (license license:llgpl)))) + +(define-public cl-change-case + (sbcl-package->cl-source-package sbcl-cl-change-case)) + +(define-public sbcl-moptilities + (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41")) + (package + (name "sbcl-moptilities") + (version (git-version "0.3.13" "1" commit)) + (home-page "https://github.com/gwkkwg/moptilities/") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("closer-mop" ,sbcl-closer-mop))) + (native-inputs + `(("lift" ,sbcl-lift))) + (synopsis "Compatibility layer for Common Lisp MOP implementation differences") + (description + "MOP utilities provide a common interface between Lisps and make the +MOP easier to use.") + (license license:expat)))) + +(define-public cl-moptilities + (sbcl-package->cl-source-package sbcl-moptilities)) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 709ea88ae0..27d38cd471 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> @@ -845,7 +845,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "234") + (version "235") (source (origin (method git-fetch) @@ -853,24 +853,29 @@ enough to play the original mainframe Zork all the way through.") (url "http://www.kylheku.com/git/txr/") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) - (patches (search-patches "txr-shell.patch")) (sha256 - (base32 - "0c9qsj4xwc24c9g02mr5n97m4d87d4n0pcc2c2n58l2vg5dnzba0")))) + (base32 "0kpqk2x0sz7sqxsrhasq0xnljjlnxwhh4xjx2nii0zy2jkv4vsbn")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("cc=gcc") - #:phases (modify-phases %standard-phases - (add-after 'configure 'fix-tests - (lambda _ - (substitute* "tests/017/realpath.tl" - (("/usr/bin") "/")) - (substitute* "tests/017/realpath.expected" - (("/usr/bin") "/")) - #t)) - (replace 'check - (lambda _ - (invoke "make" "tests")))))) + '(#:configure-flags + (list "cc=gcc" + (string-append "--prefix=" (assoc-ref %outputs "out"))) + #:test-target "tests" + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; ./configure is a hand-written script that can't handle standard + ;; autotools arguments like CONFIG_SHELL. + (lambda* (#:key configure-flags #:allow-other-keys) + (setenv "txr_shell" (which "bash")) + (apply invoke "./configure" configure-flags) + #t)) + (add-after 'configure 'fix-tests + (lambda _ + (substitute* (list "tests/017/realpath.tl" + "tests/017/realpath.expected") + (("/usr/bin") "/")) + #t))))) (native-inputs `(("bison" ,bison) ("flex" ,flex))) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 41217d14f0..7236567a5e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -816,7 +816,7 @@ SOURCE-FILES found in SOURCE-PACKAGE." (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}."))) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3e32b3cfff..9a88b53415 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -570,8 +570,8 @@ optimizing, and searching weighted finite-state transducers (FSTs).") (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+))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a6ed776db1..0a88c20a6e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -384,7 +384,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.13.4") + (version "1.13.5") (source (origin (method url-fetch) (uri (list @@ -394,7 +394,7 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm")) + "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 7463b1dbd8..ae795ecba6 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -164,7 +164,7 @@ the traditional flat-text whatis databases.") (define-public man-pages (package (name "man-pages") - (version "5.05") + (version "5.06") (source (origin (method url-fetch) @@ -174,7 +174,7 @@ the traditional flat-text whatis databases.") (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm")))) + (base32 "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cd786ac0e8..9930f491a2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4985,7 +4985,7 @@ cubes.") ("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.") @@ -5452,7 +5452,7 @@ researchers and developers alike to get started on SAT.") 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+))) diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 0aba774a91..7bbdc09688 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -20,6 +20,7 @@ #: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) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 04287f251f..c6217a95de 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -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 @@ on Axolotl and PEP.") (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-with-column-metadata) - ("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-with-column-metadata) + ("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 diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index bcb8df24d0..8da31d6a84 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -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 @@ demand.") (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. diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index c96d67d8f2..303af32983 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -92,7 +92,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.21.21") + (version "0.21.22") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1kk8q5z99zdzwv3angn03jwnxhqdad0pnyi5j67c2qiv1rgv3gg1")))) + "18lvyv3crijki5nxjdhf1byayyavdvj07dk6rm856n4vi78qfmjn")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5257d9463a..cad6bf35ea 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019 David Wilson <david@daviwil.com> ;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> +;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2671,7 +2672,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.") (define-public pianobar (package (name "pianobar") - (version "2019.02.14") + (version "2020.04.05") (source (origin (method git-fetch) (uri (git-reference @@ -2680,7 +2681,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.") (file-name (git-file-name name version)) (sha256 (base32 - "1bfabkj3m9kmhxl64w4azmi0xf7w52fmqfbw2ag28hbb5yy01k1m")))) + "1gq8kpks6nychqz4gf0rpy7mrhz5vjw48a60x56j6y9flmazmypw")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index bdc73a91f7..099a953989 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,13 +30,13 @@ (define-public nano (package (name "nano") - (version "4.9") + (version "4.9.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "19ik88b3g0d9xwav4hkai2h1acmjy5fdnh21gdc1mjq5s4lrff8f")))) + (base32 "1xifbn1xaklrrf7knxvqif0hy0wgnas7w0wfggay5kifjkm5x8nq")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 79b07e23f0..f754683bb9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2030,14 +2030,14 @@ displays the results in real time.") (define-public strongswan (package (name "strongswan") - (version "5.8.2") + (version "5.8.4") (source (origin (method url-fetch) (uri (string-append "https://download.strongswan.org/strongswan-" version ".tar.bz2")) (sha256 - (base32 "03j3fx357bh89n44a5v9wdc92azdx2d37j7jmlyr4z1kwzdhv446")))) + (base32 "0g2m08gmgdi3qvvqz6zy7n16np53sp232xd0rdc2vdhk73img6id")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 84efe2c1de..525854676f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1179,7 +1179,7 @@ GNU CC attributes. It provides also a C pretty printer as an example of use.") (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 @@ manipulate such data.") (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 @@ radix-64 representation. It is specified in RFC 4648.") `(("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.") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 333fbfa026..2a570691a4 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -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 @@ human.") (define-public keepassxc (package (name "keepassxc") - (version "2.5.3") + (version "2.5.4") (source (origin (method url-fetch) @@ -127,7 +127,7 @@ human.") "/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 @@ winner of the 2015 Password Hashing Competition.") ("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+))) diff --git a/gnu/packages/patches/dbacl-include-locale.h.patch b/gnu/packages/patches/dbacl-include-locale.h.patch new file mode 100644 index 0000000000..40d5d0aa44 --- /dev/null +++ b/gnu/packages/patches/dbacl-include-locale.h.patch @@ -0,0 +1,36 @@ +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Sat, 11 Apr 2020 03:02:04 +0200 +Subject: [PATCH] gnu: dbacl: Include <locale.h> in dbacl.h. + +Copied verbatim[0] from Debian. + +[0]: https://sources.debian.org/data/main/d/dbacl/1.14.1-2/debian/patches/05-locale-h.patch + +Description: Add missing <locale.h> include in dbacl.h +Author: Fabian Wolff <fabi.wolff@arcor.de> +Bug-Debian: https://bugs.debian.org/916182 +Last-Update: 2019-08-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/dbacl.h ++++ b/src/dbacl.h +@@ -21,6 +21,8 @@ + #ifndef DBACL_H + #define DBACL_H + ++#include <locale.h> ++ + #ifdef HAVE_CONFIG_H + #undef HAVE_CONFIG_H + #include "config.h" +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,7 +28,7 @@ + # stuff_SOURCES = stuff.c stuff.h fram.c stuff-lexer.l stuff-parser.y stuff-parser.h probs.c util.c util.h $(PUBDOM) + # stuff_LDADD = @LEXLIB@ + +-AM_CFLAGS = -funsigned-char -std=c99 -Wall -pedantic $(CFLAGSIEEE) -O3 ++AM_CFLAGS = -funsigned-char -std=c99 -D_XOPEN_SOURCE=700 -Wall -pedantic $(CFLAGSIEEE) -O3 + AM_YFLAGS = -d + + CLEANFILES = mailcross mailtoe mailfoot diff --git a/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch b/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch deleted file mode 100644 index 04f2a953b7..0000000000 --- a/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 -From: Jerome Jiang <jianj@google.com> -Date: Wed, 23 May 2018 15:43:00 -0700 -Subject: [PATCH] VP8: Fix use-after-free in postproc. - -The pointer in vp8 postproc refers to show_frame_mi which is only -updated on show frame. However, when there is a no-show frame which also -changes the size (thus new frame buffers allocated), show_frame_mi is -not updated with new frame buffer memory. - -Change the pointer in postproc to mi which is always updated. - -Bug: 842265 -Change-Id: I33874f2112b39f74562cba528432b5f239e6a7bd ---- - vp8/common/postproc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c -index d67ee8a57..8c292d616 100644 ---- a/vp8/common/postproc.c -+++ b/vp8/common/postproc.c -@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source, - double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; - int ppl = (int)(level + .5); - -- const MODE_INFO *mode_info_context = cm->show_frame_mi; -+ const MODE_INFO *mode_info_context = cm->mi; - int mbr, mbc; - - /* The pixel thresholds are adjusted according to if or not the macroblock --- -2.19.0 - diff --git a/gnu/packages/patches/python-jedi-deleted-variables.patch b/gnu/packages/patches/python-jedi-deleted-variables.patch deleted file mode 100644 index 53bdc05cde..0000000000 --- a/gnu/packages/patches/python-jedi-deleted-variables.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix test failure in some environments, including Guix. - -Taken from upstream: -https://github.com/davidhalter/jedi/commit/bec87f7ff82b0731713c6520a14c213341b4cecf - -diff --git a/test/completion/basic.py b/test/completion/basic.py -index b40068179..3ff919ca6 100644 ---- a/test/completion/basic.py -+++ b/test/completion/basic.py -@@ -209,11 +209,11 @@ def global_as_import(): - - deleted_var = 3 - del deleted_var --#? int() -+#? - deleted_var --#? ['deleted_var'] -+#? [] - deleted_var --#! ['deleted_var = 3'] -+#! [] - deleted_var - - # ----------------- -diff --git a/test/test_api/test_full_name.py b/test/test_api/test_full_name.py -index 4fdb861b0..6858b6ca8 100644 ---- a/test/test_api/test_full_name.py -+++ b/test/test_api/test_full_name.py -@@ -112,7 +112,8 @@ def test_os_path(Script): - - def test_os_issues(Script): - """Issue #873""" -- assert [c.name for c in Script('import os\nos.nt''').complete()] == ['nt'] -+ # nt is not found, because it's deleted -+ assert [c.name for c in Script('import os\nos.nt''').complete()] == [] - - - def test_param_name(Script): diff --git a/gnu/packages/patches/txr-shell.patch b/gnu/packages/patches/txr-shell.patch deleted file mode 100644 index a4abb73eac..0000000000 --- a/gnu/packages/patches/txr-shell.patch +++ /dev/null @@ -1,59 +0,0 @@ -Use the current shell instead of trying to find another one and -failing to do so. - -diff --git a/configure b/configure -index f1adb919..7891b4dc 100755 ---- a/configure -+++ b/configure -@@ -26,28 +26,6 @@ - # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --# --# The #!/bin/sh might be some legacy piece of crap, --# not even up to 1990 POSIX.2 spec. So the first step --# is to look for a better shell in some known places --# and re-execute ourselves with that interpreter. --# -- --if test x$txr_shell = x ; then -- for shell in /bin/bash /usr/bin/bash /usr/xpg4/bin/sh ; do -- if test -x $shell ; then -- txr_shell=$shell -- break -- fi -- done -- if test x$txr_shell = x ; then -- echo "No known POSIX shell found: falling back on /bin/sh, which may not work" -- txr_shell=/bin/sh -- fi -- export txr_shell -- exec $txr_shell $0 ${@+"$@"} --fi -- - set -u - - # -@@ -190,13 +168,6 @@ while [ $# -gt 0 ] ; do - exit 1 - fi - -- eval "var_exists=\${$var+y}" -- -- if [ "$var_exists" != y ] ; then -- printf "$0: nonexistent option: '%s'\n" "$1" -- exit 1 -- fi -- - eval "$var='$val'" - - eval "var_given_exists=\${${var}_given+y}" -@@ -208,6 +179,8 @@ while [ $# -gt 0 ] ; do - shift - done - -+txr_shell=$CONFIG_SHELL -+ - # - # If --help was given (or --help=<nonempty> or help=<nonempty>) then - # print help and exit. The termination status is failed, to indicate diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e9a9b619e7..9d517bbf2f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -135,7 +135,7 @@ where Flyer Composer steps in, creating a PDF which holds your flyer four 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 @@ where Flyer Composer steps in, creating a PDF which holds your flyer four 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 @@ Xournal++ features: @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 diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index beb3567ff0..7c9a1d37ca 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -52,6 +52,7 @@ #:use-module (guix build-system perl) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gd) #:use-module (gnu packages less) @@ -352,7 +353,7 @@ sometimes even without using a single syscall.") (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 @@ -395,6 +396,49 @@ functions. The password hashing function is implemented in XS with a pure Perl backup version for systems that cannot handle XS.") (license gpl2+))) +(define-public perl-authen-passphrase + (package + (name "perl-authen-passphrase") + (version "0.008") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-Passphrase-" + version ".tar.gz")) + (sha256 + (base32 + "0qq4krap687rxf6xr31bg5nj5dqmm1frcm7fq249v1bxc4h4bnsm")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build) + ("perl-test-pod" ,perl-test-pod) + ("perl-test-pod-coverage" ,perl-test-pod-coverage))) + (propagated-inputs + `(("perl-authen-dechpwd" ,perl-authen-dechpwd) + ("perl-crypt-des" ,perl-crypt-des) + ("perl-crypt-eksblowfish" ,perl-crypt-eksblowfish) + ("perl-crypt-mysql" ,perl-crypt-mysql) + ("perl-crypt-passwdmd5" ,perl-crypt-passwdmd5) + ("perl-crypt-unixcrypt_xs" ,perl-crypt-unixcrypt_xs) + ("perl-data-entropy" ,perl-data-entropy) + ("perl-digest-md4" ,perl-digest-md4) + ("perl-module-runtime" ,perl-module-runtime) + ("perl-params-classify" ,perl-params-classify))) + (home-page "https://metacpan.org/release/Authen-Passphrase") + (synopsis "Hashed passwords/passphrases as objects") + (description "@code{Authen-Passphrase} is the base class for a +system of objects that encapsulate passphrases. An object of this +type is a passphrase recogniser; its job is to recognise whether an +offered passphrase is the right one. For security such passphrase +recognisers usually do not themselves know the passphrase they are +looking for; they can merely recognise it when they see it. There are +many schemes in use to achieve this effect and the intent of this +class is to provide a consistent interface to them all. In addition +to the base class, this module also contains implementations of +several specific passphrase schemes.") + (license perl-license))) + (define-public perl-autovivification (package (name "perl-autovivification") @@ -1858,6 +1902,55 @@ CPAN::Meta object are present.") versa.") (license (package-license perl)))) +(define-public perl-crypt-cbc + (package + (name "perl-crypt-cbc") + (version "2.33") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-" + version ".tar.gz")) + (sha256 + (base32 + "0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a")))) + (build-system perl-build-system) + (native-inputs + `(("perl-crypt-rijndael" ,perl-crypt-rijndael))) + (home-page "https://metacpan.org/release/Crypt-CBC") + (synopsis "Encrypt Data with Cipher Block Chaining Mode") + (description "@code{Crypt::CBC} is a Perl-only implementation of +the cryptographic Cipher Block Chaining (CBC) mode. In combination +with a block cipher such as @code{Crypt::Rijndael} you can encrypt and +decrypt messages of arbitrarily long length. The encrypted messages +are compatible with the encryption format used by SSLeay.") + (license perl-license))) + +(define-public perl-crypt-des + (package + (name "perl-crypt-des") + (version "2.07") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-" + version ".tar.gz")) + (sha256 + (base32 + "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d")))) + (build-system perl-build-system) + (native-inputs + `(("perl-crypt-cbc" ,perl-crypt-cbc))) + (home-page "https://metacpan.org/release/Crypt-DES") + (synopsis "DES encryption module") + (description "@code{Crypt::DES} is an XS-based implementation of +the DES cryptography algorithm. The module implements the +@code{Crypt::CBC} interface which has blocksize, keysize, encrypt and +decrypt functions.") + (license bsd-3))) + (define-public perl-crypt-eksblowfish (package (name "perl-crypt-eksblowfish") @@ -1892,6 +1985,57 @@ also includes an implementation of @code{bcrypt}, the Unix crypt() password hashing algorithm based on Eksblowfish.") (license perl-license))) +(define-public perl-crypt-mysql + (package + (name "perl-crypt-mysql") + (version "0.04") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/I/IK/IKEBE/Crypt-MySQL-" + version ".tar.gz")) + (sha256 + (base32 + "1qyx6ha13r0rh80ldv5wy2bq2pa74igwh8817xlapsfgxymdzswk")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build) + ("perl-dbd-mysql" ,perl-dbd-mysql))) + (propagated-inputs + `(("perl-digest-sha1" ,perl-digest-sha1))) + (home-page "https://metacpan.org/release/Crypt-MySQL") + (synopsis "Emulate the MySQL PASSWORD() function") + (description "@code{Crypt::MySQL} emulates the MySQL PASSWORD() +function. The module does not depend on an interface to the MySQL +database server. This enables the comparison of encrypted passwords +without the need for a real MySQL environment.") + (license perl-license))) + +(define-public perl-crypt-passwdmd5 + (package + (name "perl-crypt-passwdmd5") + (version "1.40") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-" + version ".tgz")) + (sha256 + (base32 + "0j0r74f18nk63phddzqbf7wqma2ci4p4bxvrwrxsy0aklbp6lzdp")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (home-page "https://metacpan.org/release/Crypt-PasswdMD5") + (synopsis "Interoperable MD5-based crypt() functions") + (description "@code{Crypt::PasswdMD5} provides various +crypt()-compatible interfaces to the MD5-based crypt() function found +in various *nixes. It is based on the implementation found on FreeBSD +2.2.[56]-RELEASE.") + (license perl-license))) + (define-public perl-crypt-randpasswd (package (name "perl-crypt-randpasswd") @@ -1966,6 +2110,29 @@ supported encryption modes are: (description "A pure Perl implementation of the RC4 algorithm.") (license (package-license perl)))) +(define-public perl-crypt-unixcrypt_xs + (package + (name "perl-crypt-unixcrypt_xs") + (version "0.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/B/BO/BORISZ/Crypt-UnixCrypt_XS-" + version ".tar.gz")) + (sha256 + (base32 + "1ajg3x6kwxy4x9p3nw1j36qjxpjvdpi9wkca5gfd86y9q8939sv2")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Crypt-UnixCrypt_XS") + (synopsis "XS interface for a portable traditional crypt function") + (description "@code{Crypt::UnixCrypt_XS} implements the DES-based +Unix @code{crypt} function. For those who need to construct +non-standard variants of @code{crypt}, the various building blocks +used in @code{crypt} are also supplied separately.") + ;; Files in the 'fcrypt' directory are covered by a BSD licence. + (license (list perl-license bsd-3)))) + (define-public perl-cwd-guard (package (name "perl-cwd-guard") @@ -3422,6 +3589,29 @@ for CRC-CCITT, CRC-16 and CRC-32.") interface for the RFC 2104 HMAC mechanism.") (license (package-license perl)))) +(define-public perl-digest-md4 + (package + (name "perl-digest-md4") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-" + version ".tar.gz")) + (sha256 + (base32 + "19ma1hmvgiznq95ngzvm6v4dfxc9zmi69k8iyfcg6w14lfxi0lb6")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Digest-MD4") + (synopsis "Interface to the MD4 Algorithm") + (description "The @code{Digest::MD4} module allows you to use the +RSA Data Security Inc.@: MD4 Message Digest algorithm from within Perl +programs. The algorithm takes as input a message of arbitrary length +and produces as output a 128-bit \"fingerprint\" or \"message digest\" +of the input. MD4 is described in RFC 1320.") + (license perl-license))) + (define-public perl-digest-md5 (package (name "perl-digest-md5") diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 4b3db6d5e0..530a2478f3 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -195,9 +195,6 @@ routines such as routines for numerical integration and optimization.") "Scikit-image is a collection of algorithms for image processing.") (license license:bsd-3))) -(define-public python2-scikit-image - (package-with-python2 python-scikit-image)) - (define-public python-pandas (package (name "python-pandas") diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3686432a1d..1d99239dbb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1774,13 +1774,13 @@ minimum of WSGI.") (define-public python-flask (package (name "python-flask") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (pypi-uri "Flask" version)) (sha256 (base32 - "0ljdjgyjn7vh8ic1n1dc2l1cl421i6pr3kx5sz2w5irhyfbg3y8k")))) + "0q3h295izcil7lswkzfnyg3k5gq4hpmqmpl6i7s5m1n9szi1myjf")))) (build-system python-build-system) (arguments '(#:phases @@ -2672,7 +2672,7 @@ for Flask programs that are using @code{python-alembic}.") (define-public python-genshi (package (name "python-genshi") - (version "0.7.2") + (version "0.7.3") (source (origin (method git-fetch) @@ -2681,7 +2681,7 @@ for Flask programs that are using @code{python-alembic}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "06rch30x10l105k5b6rahd839lkhmgrzn6691wbci0cb2fzps32w")))) + (base32 "04bw7nd4wyn8ixnhik57hny2xpjjpn80k5hp6691inix5gc6rxaf")))) (build-system python-build-system) (home-page "https://genshi.edgewall.org/") (synopsis "Toolkit for generation of output for the web") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1b97e21a62..20b8784c05 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Omar Radwan <toxemicsquire4@gmail.com> ;;; Copyright © 2015 Pierre-Antoine Rault <par@rigelk.eu> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2016 Christopher Allan Webber <cwebber@dustycloud.org> +;;; Copyright © 2015, 2016, 2020 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name> @@ -75,6 +75,7 @@ ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com> +;;; Copyright © 2020 Matthew Kraai <kraai@ftbfs.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -981,8 +982,17 @@ to rebuild the original object tree. Because only safe literals are encoded, it is safe to send serpent data to other machines, such as over the network.") + (properties `((python2-variant . ,(delay python2-serpent)))) (license license:expat))) +(define-public python2-serpent + (let ((base (package-with-python2 (strip-python2-variant python-serpent)))) + (package + (inherit base) + (propagated-inputs + `(("python-enum34" ,python2-enum34) + ,@(package-propagated-inputs base)))))) + (define-public python-setuptools (package (name "python-setuptools") @@ -2259,14 +2269,14 @@ from git information. (define-public python-pyrsistent (package (name "python-pyrsistent") - (version "0.15.7") + (version "0.16.0") (home-page "https://github.com/tobgu/pyrsistent") (source (origin (method url-fetch) (uri (pypi-uri "pyrsistent" version)) (sha256 (base32 - "103j63g6lb5dfspph96zxjdpnq9h991kazd4f09ddgkpxpivbiyd")))) + "1lrsjgblnapfimd0alsi1as5nz2lfqv97131l7d6anbjzq2rjri8")))) (build-system python-build-system) (native-inputs `(("python-hypothesis" ,python-hypothesis) @@ -2813,8 +2823,7 @@ environments and back.") "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 @@ -3543,7 +3552,7 @@ receive files via the SCP1 protocol, as implemented by the OpenSSH ;; 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))) @@ -6773,14 +6782,14 @@ of the structure, dynamics, and functions of complex networks.") (define-public python-datrie (package (name "python-datrie") - (version "0.8") + (version "0.8.2") (source (origin (method url-fetch) (uri (pypi-uri "datrie" version)) (sha256 (base32 - "0338r8xgmpy78556jhms0h6qkvyjr10p8bpgdvcpqzm9lrmxmmdx")))) + "0pbn32flkrpjiwfcknmj6398qa81ba783kbcvwan3kym73v0hnsj")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) @@ -11665,14 +11674,14 @@ until the object is actually required, and caches the result of said call.") (define-public python-dnspython (package (name "python-dnspython") - (version "1.15.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "http://www.dnspython.org/kits/" version "/dnspython-" version ".tar.gz")) (sha256 (base32 - "0jr4v2pd90i6l1xxbss2m05psbjaxvyvvvpq44wycijpfgjqln8i")))) + "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; XXX: requires internet access (home-page "http://www.dnspython.org") @@ -11903,15 +11912,14 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.16.0") + (version "0.17.0") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) - (patches (search-patches "python-jedi-deleted-variables.patch")) (sha256 (base32 - "1mb5kmrk9bkc3kwzx02j62cdan1jqd92q1z7h7wi9d30jg5p3j6m")))) + "0c1h9x3a9klvk2g288wl328x8xgzw7136k6vs9hkd56b85vcjh6z")))) (build-system python-build-system) (arguments `(#:phases @@ -12649,7 +12657,7 @@ by system tools such as ps and top). 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)))))) @@ -16241,14 +16249,14 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.6.2") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 (base32 - "0mr1j4ijqnrihz1yap34g6i8vjldg5lz814sz4v0d8pbqvh5jmhc")))) + "0b7irps2dqmzq41sxbpvxbivhh1x2hwmbqp45bbpd82446p9z3lh")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) @@ -17113,26 +17121,35 @@ pure-Python.") (define-public python-cloudpickle (package (name "python-cloudpickle") - (version "0.6.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "cloudpickle" version)) (sha256 (base32 - "1wdw89mlm7fqa3fm3ymskx05jrys66n8m1z1a8s0mss0799ahsgi")))) + "0lx7gy9clp427qwcm7b23zdsldpr03gy3vxxhyi8fpbhwz859brq")))) (build-system python-build-system) - ;; FIXME: there are 5 errors in 122 tests: - ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.CloudPickleTest) - ;; ERROR: test_function_pickle_compat_0_4_1 (tests.cloudpickle_test.CloudPickleTest) - ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.Protocol2CloudPickleTest) - ;; ERROR: test_function_pickle_compat_0_4_1 (tests.cloudpickle_test.Protocol2CloudPickleTest) - ;; ERROR: test_temp_file (tests.cloudpickle_file_test.CloudPickleFileTests) - ;; TypeError: cannot serialize '_io.BufferedRandom' object - (arguments '(#:tests? #f)) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'check 'do-not-override-PYTHONPATH + (lambda _ + ;; Append to PYTHONPATH instead of overriding it so + ;; that dependencies from Guix can be found. + (substitute* "tests/testutils.py" + (("env\\['PYTHONPATH'\\] = pythonpath") + "env['PYTHONPATH'] += os.pathsep + pythonpath")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "pytest" "-s" "-vv") + (format #t "test suite not run~%")) + #t))))) (native-inputs - `(("python-pytest" ,python-pytest) - ("python-mock" ,python-mock) + `(;; For tests. + ("python-psutil" ,python-psutil) + ("python-pytest" ,python-pytest) ("python-tornado" ,python-tornado))) (home-page "https://github.com/cloudpipe/cloudpickle") (synopsis "Extended pickling support for Python objects") @@ -17142,10 +17159,19 @@ supported by the default pickle module from the Python standard library. It is especially useful for cluster computing where Python expressions are shipped over the network to execute on remote hosts, possibly close to the data.") + (properties `((python2-variant . ,(delay python2-cloudpickle)))) (license license:bsd-3))) (define-public python2-cloudpickle - (package-with-python2 python-cloudpickle)) + (let ((base (package-with-python2 (strip-python2-variant python-cloudpickle)))) + (package + (inherit base) + (native-inputs + `(("python-mock" ,python2-mock) + ,@(package-native-inputs base))) + (propagated-inputs + `(("python-futures" ,python2-futures) + ,@(package-propagated-inputs base)))))) (define-public python-locket (package @@ -17256,13 +17282,13 @@ decisions with any given backend.") (define-public python-dask (package (name "python-dask") - (version "2.9.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (pypi-uri "dask" version)) (sha256 - (base32 "1w1hqr8vyx6ygwflj2737dcy0mmgvrc0s602gnny8pzlcbs9m76b")))) + (base32 "031j0j26s0675v0isyps2dphm03330n7dy8ifdy70jgvf78d119q")))) (build-system python-build-system) (arguments `(#:phases @@ -18557,14 +18583,14 @@ tests.") (define-public python-gssapi (package (name "python-gssapi") - (version "1.6.1") + (version "1.6.5") (source (origin (method url-fetch) (uri (pypi-uri "gssapi" version)) (sha256 (base32 - "1gymg4asvwrz7y13qpwp2s5g8qwq179d72gkj09q6bfcgs82l5wr")))) + "02i5s7998dg5kcr4m0xwamd8vjqk1816xbzldyp68l91f6bynwcr")))) (build-system python-build-system) (propagated-inputs `(("python-decorator" ,python-decorator) @@ -18727,6 +18753,29 @@ dedicated platform. The tool proposes a unified interface for any format and an upload option to send your work back to the platform.") (license license:gpl3+))) +(define-public python-titlecase + (package + (name "python-titlecase") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "titlecase" version)) + (sha256 + (base32 + "0486i99wf8ssa7sgn81fn6fv6i4rhhq6n751bc740b3hzfbpmpl4")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/ppannuto/python-titlecase") + (synopsis "Capitalize strings similar to book titles") + (description + "Python-Titlecase is a Python port of John Gruber's titlecase.pl. +It capitalizes (predominantly English) strings in a way that is similar to +book titles, using the New York Times Manual of Style to leave certain words +lowercase.") + (license license:expat))) + (define-public python-pypng (package (name "python-pypng") @@ -18978,7 +19027,7 @@ logging in Python. It also provides some custom formatters and handlers.") (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))) @@ -19186,28 +19235,6 @@ simple and fast to verify, and decouple authorization policy from the 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") @@ -19450,3 +19477,48 @@ an identity provider. The distribution contains examples of both. This package was originally written to work in a WSGI environment, but there are extensions that allow you to use it with other frameworks.") (license license:asl2.0))) + +(define-public python-click-plugins + (package + (name "python-click-plugins") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "click-plugins" version)) + (sha256 + (base32 "0jr6bxj67vg988vkm6nz8jj98v9lg46bn49lkhak3n598jbrkas6")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-click" ,python-click))) + (synopsis "Extension for Click to register external CLI commands") + (description "This package provides n extension module for Click to +register external CLI commands via setuptools entry-points.") + (home-page "https://github.com/click-contrib/click-plugins") + (license license:bsd-3))) + +(define-public python-diceware + (package + (name "python-diceware") + (version "0.9.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "diceware" version)) + (sha256 + (base32 + "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby")))) + (build-system python-build-system) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://github.com/ulif/diceware/") + (synopsis "Generates memorable passphrases") + (description "This package generates passphrases by concatenating words +randomly picked from wordlists. It supports several sources of +randomness (including real life dice) and different wordlists (including +cryptographically signed ones).") + (license license:gpl3+))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8696dc4bb6..9c517d0acf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2040,7 +2040,10 @@ contain over 620 classes.") ("qtwebengine" ,qtwebengine))) (arguments `(#:modules ((srfi srfi-1) + ((guix build python-build-system) #:select (python-version)) ,@%gnu-build-system-modules) + #:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -2050,13 +2053,8 @@ contain over 620 classes.") (pyqt-sipdir (string-append (assoc-ref inputs "python-pyqt") "/share/sip")) (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) ".")) (lib (string-append out "/lib/python" - python-major+minor + (python-version python) "/site-packages/PyQt5")) (stubs (string-append lib "/PyQt5"))) @@ -2075,7 +2073,9 @@ contain over 620 classes.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((__init__.py (string-append (assoc-ref outputs "out") - "/lib/python3.7/site-packages/PyQt5/__init__.py"))) + "/lib/python" + (python-version (assoc-ref inputs "python")) + "/site-packages/PyQt5/__init__.py"))) (with-output-to-file __init__.py (lambda _ (display " from pkgutil import extend_path diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm new file mode 100644 index 0000000000..a84a31fd9c --- /dev/null +++ b/gnu/packages/radio.scm @@ -0,0 +1,527 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2019 Christopher Howard <christopher@librehacker.com> +;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com> +;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> +;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages radio) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (gnu packages algebra) + #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) + #:use-module (gnu packages documentation) + #:use-module (gnu packages engineering) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages glib) + #:use-module (gnu packages gstreamer) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) + #:use-module (gnu packages logging) + #:use-module (gnu packages maths) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages networking) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages python) + #:use-module (gnu packages python-science) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) + #:use-module (gnu packages sphinx) + #:use-module (gnu packages swig) + #:use-module (gnu packages tex) + #:use-module (gnu packages version-control) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) + #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix build-system qt)) + +(define-public liquid-dsp + (package + (name "liquid-dsp") + (version "1.3.2") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/jgaeddert/liquid-dsp.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n6dbg13q8ga5qhg1yiszwly4jj0rxqr6f1xwm9waaly5z493xsd")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf))) + (inputs + `(("fftw" ,fftw) + ("fftwf" ,fftwf))) + (home-page "https://liquidsdr.org") + (synopsis "Signal processing library for software-defined radios") + (description + "Liquid DSP is a @dfn{digital signal processing} (DSP) library designed +specifically for software-defined radios on embedded platforms. The aim is to +provide a lightweight DSP library that does not rely on a myriad of external +dependencies or proprietary and otherwise cumbersome frameworks. All signal +processing elements are designed to be flexible, scalable, and dynamic, +including filters, filter design, oscillators, modems, synchronizers, complex +mathematical operations, and much more.") + (license license:expat))) + +(define-public rtl-sdr + (package + (name "rtl-sdr") + (version "0.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.osmocom.org/rtl-sdr.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k")))) + (build-system cmake-build-system) + (inputs + `(("libusb" ,libusb))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + `(#:configure-flags '("-DDETACH_KERNEL_DRIVER=ON") + #:tests? #f)) ; No tests + (home-page "https://osmocom.org/projects/sdr/wiki/rtl-sdr") + (synopsis "Software defined radio driver for Realtek RTL2832U") + (description "DVB-T dongles based on the Realtek RTL2832U can be used as a +cheap software defined radio, since the chip allows transferring the raw I/Q +samples to the host. @code{rtl-sdr} provides drivers for this purpose.") + (license license:gpl2+))) + +(define-public chirp + (package + (name "chirp") + (version "20181205") + (source + (origin + (method url-fetch) + (uri (string-append "https://trac.chirp.danplanet.com/chirp_daily/daily-" + version "/chirp-daily-" version ".tar.gz")) + (sha256 + (base32 + "1cp280b95j39xaxs50zn55jigg7pyfpm9n098hmsyxrplqn8z43c")))) + (build-system python-build-system) + (inputs + `(("python2-libxml2" ,python2-libxml2) + ("python2-pygtk" ,python2-pygtk) + ("python2-pyserial" ,python2-pyserial))) + (arguments + `(#:python ,python-2)) + (home-page "https://chirp.danplanet.com") + (synopsis "Cross-radio programming tool") + (description "Chirp is a cross-radio programming tool. It supports a +growing list of radios across several manufacturers and allows transferring of +memory contents between them.") + (license (list license:gpl3+ + license:lgpl3+)))) ; chirp/elib_intl.py + +(define-public aptdec + (package + (name "aptdec") + (version "1.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/csete/aptdec") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hf0zb51qc6fyhdjxyij1n3vgwnw3cwksc3r11szbhkml14qjnzk")))) + (build-system gnu-build-system) + (inputs + `(("libpng" ,libpng) + ("libsndfile" ,libsndfile))) + (arguments + `(#:make-flags (list "CC=gcc") + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "atpdec" (string-append out "/bin"))) + #t))))) + (home-page "https://github.com/csete/aptdec") + (synopsis "NOAA Automatic Picture Transmission (APT) decoder") + (description "Aptdec decodes Automatic Picture Transmission (APT) images. +These are medium resolution images of the Earth transmitted by, among other +satellites, the POES NOAA weather satellite series. These transmissions are +on a frequency of 137 MHz. They can be received using an inexpensive antenna +and a dedicated receiver.") + (license license:gpl2+))) + +(define-public redsea + (package + (name "redsea") + (version "0.18") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/windytan/redsea") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The configure.ac file does not explicitly link against libiconv + ;; except on Mac OS, causing the build to fail. This phase comments + ;; out the original AC_SUBST macro (located inside a conditional) and + ;; adds an explicit use of it underneath, so that libiconv is always + ;; linked against. + (add-after 'unpack 'patch-libiconv + (lambda _ + (substitute* "configure.ac" + (("^ +AC_SUBST") + "# AC_SUBST") + (("esac") + "esac\nAC_SUBST([ICONV], [\"-liconv\"])")) + #t))))) + (inputs + `(("libiconv" ,libiconv) + ("libsndfile" ,libsndfile) + ("liquid-dsp" ,liquid-dsp))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "https://github.com/windytan/redsea") + (synopsis "Lightweight RDS to JSON decoder") + (description "redsea is a lightweight command-line @dfn{FM Radio Data +System} (FM-RDS) decoder. Redsea can be used with any RTL-SDR USB radio stick +with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via +csdr, for example. It can also decode raw ASCII bitstream, the hex format +used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") + (license license:expat))) + +(define-public gnuradio + (package + (name "gnuradio") + (version "3.8.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.gnuradio.org/releases/gnuradio/" + "gnuradio-" version ".tar.xz")) + (sha256 + (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled volk to use the shared one. + (delete-file-recursively "volk") + #t)))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("git" ,git-minimal) + ("ghostscript" ,ghostscript) + ("orc" ,orc) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("python-cheetah" ,python-cheetah) + ("python-mako" ,python-mako) + ("python-pyzmq" ,python-pyzmq) + ("python-scipy" ,python-scipy) + ("python-sphinx" ,python-sphinx) + ("swig" ,swig) + ("texlive" ,(texlive-union (list texlive-amsfonts + texlive-latex-amsmath + ;; TODO: Add newunicodechar. + texlive-latex-graphics))) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("cairo" ,cairo) + ("codec2" ,codec2) + ("cppzmq" ,cppzmq) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gsl" ,gsl) + ("gsm" ,gsm) + ("gtk+" ,gtk+) + ("jack" ,jack-1) + ("log4cpp" ,log4cpp) + ("pango" ,pango) + ("portaudio" ,portaudio) + ("python-click" ,python-click) + ("python-click-plugins" ,python-click-plugins) + ("python-lxml" ,python-lxml) + ("python-numpy" ,python-numpy) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-pyqt" ,python-pyqt) + ("python-pyyaml" ,python-pyyaml) + ("qtbase" ,qtbase) + ("qwt" ,qwt) + ("volk" ,volk) + ("zeromq" ,zeromq))) + (arguments + `(#:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + ((guix build python-build-system) #:prefix python:) + (guix build utils) + (ice-9 match)) + #:imported-modules (,@%cmake-build-system-modules + (guix build glib-or-gtk-build-system) + (guix build python-build-system)) + #:configure-flags + '("-DENABLE_INTERNAL_VOLK=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((qwt (assoc-ref inputs "qwt"))) + (substitute* "cmake/Modules/FindQwt.cmake" + (("/usr/include") + (string-append qwt "/include")) + (("/usr/lib") + (string-append qwt "/lib")) + (("qwt6-\\$\\{QWT_QT_VERSION\\}") + "qwt"))) + (substitute* "cmake/Modules/GrPython.cmake" + (("dist-packages") + "site-packages")) + (substitute* '("gr-vocoder/swig/vocoder_swig.i" + "gr-vocoder/include/gnuradio/vocoder/codec2.h" + "gr-vocoder/include/gnuradio/vocoder/freedv_api.h") + (("<codec2/") + "<")) + #t)) + (add-before 'check 'set-test-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" "/tmp") + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") + #t)) + (add-after 'install 'wrap-python + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'wrap-python 'wrap-glib-or-gtk + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'wrap-glib-or-gtk 'wrap-with-GI_TYPELIB_PATH + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (paths (map (match-lambda + ((output . directory) + (let ((girepodir (string-append + directory + "/lib/girepository-1.0"))) + (if (file-exists? girepodir) + girepodir + #f)))) + inputs))) + (wrap-program (string-append out "/bin/gnuradio-companion") + `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths)))) + #t))))) + (synopsis "Toolkit for software-defined radios") + (description + "GNU Radio is a development toolkit that provides signal processing blocks +to implement software radios. It can be used with external RF hardware to +create software-defined radios, or without hardware in a simulation-like +environment.") + (home-page "https://www.gnuradio.org") + (license license:gpl3+))) + +(define-public gnuradio-osmosdr + (package + (name "gnuradio-osmosdr") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osmocom.org/gr-osmosdr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rdx7fa0xiq0qmgrrbby7z1bblmqhl9qh9jqpsznzxkx91f17ypd")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("git" ,git-minimal) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("python-mako" ,python-mako) + ("python-six" ,python-six) + ("swig" ,swig))) + (inputs + `(("boost" ,boost) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gnuradio" ,gnuradio) + ("log4cpp" ,log4cpp) + ;; TODO: Add more drivers. + ("rtl-sdr" ,rtl-sdr) + ("volk" ,volk))) + (synopsis "GNU Radio block for interfacing with various radio hardware") + (description "This is a block for GNU Radio allowing to use a common API +to access different radio hardware.") + (home-page "https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR") + (license license:gpl3+))) + +(define-public libosmo-dsp + (package + (name "libosmo-dsp") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osmocom.org/libosmo-dsp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00plihnpym1gkfpflah8il9463qxzm9kx2f07jyvbkszpj8viq5g")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("bash-minimal" ,bash-minimal) + ("doxygen" ,doxygen) + ("git" ,git-minimal) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("texlive" ,(texlive-union (list texlive-amsfonts + texlive-latex-amsmath + ;; TODO: Add newunicodechar. + texlive-latex-graphics))))) + (inputs + `(("fftwf" ,fftwf))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "git-version-gen" + (("/bin/sh") + (string-append (assoc-ref inputs "bash") + "/bin/bash"))) + #t))))) + (synopsis "DSP primitives for SDR") + (description + "This a C-language library for common DSP (Digital Signal Processing) +primitives for SDR (Software Defined Radio).") + (home-page "https://osmocom.org/projects/libosmo-dsp") + (license license:gpl2+))) + +(define-public gnuradio-iqbalance + (package + (name "gnuradio-iqbalance") + (version "0.38.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osmocom.org/gr-iqbal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ksagwz05p3b0702q7ljq7013xmp0ijp30my9z6s3p7ja8dj42s3")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("python-numpy" ,python-numpy) + ("python-six" ,python-six) + ("swig" ,swig))) + (inputs + `(("boost" ,boost) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gnuradio" ,gnuradio) + ("libosmo-dsp" ,libosmo-dsp) + ("log4cpp" ,log4cpp) + ("volk" ,volk))) + (synopsis "GNU Radio block to correct IQ imbalance") + (description + "This is a GNU Radio block to correct IQ imbalance in quadrature +receivers. It's composed of two main block: +@itemize +@item Fix: Given a phase and amplitude error, it will correct a complex signal. +@item Optimize: Attempts to auto-detect the phase and amplitude error to feed +to the fix block above. +@end itemize") + (home-page "https://git.osmocom.org/gr-iqbal/") + (license license:gpl3+))) + +(define-public gqrx + (package + (name "gqrx") + (version "2.12.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/csete/gqrx.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00alf3q6y313xpx6p7v43vqsphd2x4am4q362lw21bcy9wc4jidw")))) + (build-system qt-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gnuradio" ,gnuradio) + ("gnuradio-iqbalance" ,gnuradio-iqbalance) + ("gnuradio-osmosdr" ,gnuradio-osmosdr) + ("jack" ,jack-1) + ("log4cpp" ,log4cpp) + ("portaudio" ,portaudio) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("volk" ,volk))) + (arguments + `(#:tests? #f)) ; No tests + (synopsis "Software defined radio receiver") + (description "Gqrx is a software defined radio (SDR) receiver implemented +using GNU Radio and the Qt GUI toolkit.") + (home-page "https://gqrx.dk/") + (license license:gpl3+))) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a31f177349..4d6d323442 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1771,8 +1771,8 @@ the output produced by running shell commands.") ("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))) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 47bf9a9c88..b96cb6b96e 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -331,7 +331,7 @@ coefficients of which are modular integers.") (define-public brial (package (name "brial") - (version "1.2.7") + (version "1.2.8") (source (origin (method git-fetch) @@ -340,7 +340,7 @@ coefficients of which are modular integers.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm")))) + (base32 "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/sdr.scm b/gnu/packages/sdr.scm deleted file mode 100644 index 563a9b3887..0000000000 --- a/gnu/packages/sdr.scm +++ /dev/null @@ -1,57 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Christopher Howard <christopher@librehacker.com> -;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com> -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. - -(define-module (gnu packages sdr) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages algebra) - #:use-module (gnu packages autotools)) - -(define-public liquid-dsp - (package - (name "liquid-dsp") - (version "1.3.2") - (source - (origin (method git-fetch) - (uri (git-reference - (url "https://github.com/jgaeddert/liquid-dsp.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1n6dbg13q8ga5qhg1yiszwly4jj0rxqr6f1xwm9waaly5z493xsd")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf))) - (inputs - `(("fftw" ,fftw) - ("fftwf" ,fftwf))) - (home-page "https://liquidsdr.org") - (synopsis "Signal processing library for software-defined radios") - (description - "Liquid DSP is a @dfn{digital signal processing} (DSP) library designed -specifically for software-defined radios on embedded platforms. The aim is to -provide a lightweight DSP library that does not rely on a myriad of external -dependencies or proprietary and otherwise cumbersome frameworks. All signal -processing elements are designed to be flexible, scalable, and dynamic, -including filters, filter design, oscillators, modems, synchronizers, complex -mathematical operations, and much more.") - (license license:expat))) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8708b703ef..c71e6399ea 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -712,14 +712,14 @@ interactive POSIX shell targeted at resource-constrained systems.") (define-public mksh (package (name "mksh") - (version "57") + (version "58") (source (origin (method url-fetch) (uri (string-append "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R" version ".tgz")) (sha256 - (base32 "0xdykm1z710wriwd6nc8s8lwk2dwjl63dq96xxaawlid31a1241x")))) + (base32 "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require access to /dev/tty diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index e1e1865e2d..e9ac5bd095 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -72,7 +72,7 @@ (define-public libssh (package (name "libssh") - (version "0.9.3") + (version "0.9.4") (source (origin (method git-fetch) (uri (git-reference @@ -80,7 +80,7 @@ (commit (string-append "libssh-" version)))) (sha256 (base32 - "175i3xybg69d5lb078334v6dd3njm743kww8f67ix9w33969rmzf")) + "0qr4vi3k1wv69c95d9j26fiv78pzyksaq8ccd76b8nxar5z1fbj6")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (outputs '("out" "debug")) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c05f2419d0..b8e516f49c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -590,13 +590,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-145") + (version "3.1-147") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "1i9a3afdmn2ziks0imz0j09ay9n0zb9mhrymy9mg97vvlz5diwrh")))) + (base32 "1rqc3wy3lmy0wczsvsn8yszzsxhppfwg4iznb1j6ki2qawpdij7g")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -693,14 +693,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.1-11") + (version "3.1-12") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "1fbhbm3bnpg1nmj37h1d76x813ggvwk0cp51ixmmgb3pz47i5xj4")))) + "07zj3gpwncw89hbiwjb6ih9axv5zwdqnbgz9yw9xzws6nrpdcbmn")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) @@ -1066,13 +1066,13 @@ the input of another.") (define-public r-reshape2 (package (name "r-reshape2") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) (uri (cran-uri "reshape2" version)) (sha256 - (base32 "03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa")))) + (base32 "1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq")))) (build-system r-build-system) (propagated-inputs `(("r-plyr" ,r-plyr) @@ -1148,14 +1148,14 @@ agnes cluster diagrams.") (define-public r-gdtools (package (name "r-gdtools") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (cran-uri "gdtools" version)) (sha256 (base32 - "1aax50wyrs4336zpf247l8wmp4spab2n70msziy1ip4gbjn26wa1")))) + "08njzin0c6biw62j5w30r9j85vr1m2cg4hmv5d76nym860yrlqjf")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1505,7 +1505,7 @@ understand the language at a deeper level.") (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))) @@ -1989,14 +1989,14 @@ and environmental data in the framework of Euclidean exploratory methods.") (define-public r-xml2 (package (name "r-xml2") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "xml2" version)) (sha256 (base32 - "138v9374xwc7flw8fz8qp8q3w4fch2jviij0g10dg92xn9dsyani")))) + "0r7rxp922785dcryghbb3wxqgdav7mafwnmxjqfx8zaj3v1q2j3z")))) (build-system r-build-system) (inputs `(("libxml2" ,libxml2) @@ -2080,14 +2080,14 @@ limited to R.") (define-public r-backports (package (name "r-backports") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (cran-uri "backports" version)) (sha256 (base32 - "0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33")))) + "170rphqq28j0pcr28g6dxv3isp436ajhyzkpri31pn0lfm3szs6h")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/backports") (synopsis "Reimplementations of functions introduced since R 3.0.0") @@ -2401,13 +2401,13 @@ informative error messages when it's not available.") (define-public r-devtools (package (name "r-devtools") - (version "2.2.2") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "devtools" version)) (sha256 (base32 - "1bhb2j8ilpdzwd0c678mcgfpdw88vncsjma79afcikxmzcsz9279")))) + "1l6w765q180bg5mmdq5k2ymf6apz7ldhnknzf6ynfp1kf70pbhsg")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) @@ -2435,6 +2435,8 @@ informative error messages when it's not available.") ("r-testthat" ,r-testthat) ("r-usethis" ,r-usethis) ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/hadley/devtools") (synopsis "Tools to make developing R packages easier") (description "The devtools package is a collection of package development @@ -2573,21 +2575,15 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.850.1.0") + (version "0.9.860.2.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "0q9clhmbwwph47hrhx5827m7njrcl2klihyqbkf0ihwlbqrjijwz")))) + "1rg9ak0zbv8d9cyj10jq52nrcbk1pvfz28kbkhpx79mpjhrl7pb5")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) - ;; All needed for vignettes - (native-inputs - `(("r-knitr" ,r-knitr) - ("r-rmarkdown" ,r-rmarkdown) - ("ghc-pandoc" ,ghc-pandoc) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc))) (propagated-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/RcppCore/RcppArmadillo") @@ -3769,13 +3765,13 @@ features present in other programming languages.") (define-public r-plotly (package (name "r-plotly") - (version "4.9.2") + (version "4.9.2.1") (source (origin (method url-fetch) (uri (cran-uri "plotly" version)) (sha256 (base32 - "19zw3qnhfgqdxlvma8xyikir46aiqhfcwxf072z9xgq0hknpblm5")))) + "1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -4101,14 +4097,14 @@ existing packages provide.") (define-public r-sfsmisc (package (name "r-sfsmisc") - (version "1.1-5") + (version "1.1-6") (source (origin (method url-fetch) (uri (cran-uri "sfsmisc" version)) (sha256 (base32 - "173qgm2bn84x544fc3x9gc2rv995sbsvji9lnn2drx8drvzyy8lf")))) + "04fvjdab6vyyghyqy0abxvfbyr1myz6yib7ibwiyjw9yf7fjrcjp")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sfsmisc") (synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich") @@ -4695,17 +4691,18 @@ models, generalized linear models and model-based clustering.") (define-public r-mclust (package (name "r-mclust") - (version "5.4.5") + (version "5.4.6") (source (origin (method url-fetch) (uri (cran-uri "mclust" version)) (sha256 (base32 - "0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm")))) + "1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl")))) (build-system r-build-system) (native-inputs - `(("gfortran" ,gfortran))) + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) (home-page "https://www.stat.washington.edu/mclust/") (synopsis "Gaussian mixture modelling for model-based clustering etc.") (description @@ -4781,7 +4778,7 @@ can be efficiently implemented directly in the R language.") (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+))) @@ -5137,14 +5134,14 @@ algorithms.") (define-public r-lme4 (package (name "r-lme4") - (version "1.1-21") + (version "1.1-23") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "035j2hqkwv939xl07pm2vykvf3wlx8qj317846n9pkpqkyv58mbz")))) + "0qh29kqli0l3naylgb6jha6jllx4nwryr3hv9yk37blgyyql5mcr")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) @@ -5155,7 +5152,10 @@ algorithms.") ("r-nloptr" ,r-nloptr) ("r-nlme" ,r-nlme) ("r-rcpp" ,r-rcpp) - ("r-rcppeigen" ,r-rcppeigen))) + ("r-rcppeigen" ,r-rcppeigen) + ("r-statmod" ,r-statmod))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/lme4") (synopsis "Linear mixed-effects models using eigen and S4") (description @@ -5257,7 +5257,7 @@ to Applied regression, Second Edition, Sage, 2011.") (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+))) @@ -5403,14 +5403,14 @@ genome-wide association studies can be analyzed efficiently.") (define-public r-cairo (package (name "r-cairo") - (version "1.5-11") + (version "1.5-12") (source (origin (method url-fetch) (uri (cran-uri "Cairo" version)) (sha256 (base32 - "1k9kpxcg5n4g6x2gydv344f4w0snqbhww14fnbbj1bny0mmv28xg")))) + "02v29am4fac3fyq6y1w6r89zwbqqkxjsxrafcwb5s124ikxyl22f")))) (properties `((upstream-name . "Cairo"))) (build-system r-build-system) (inputs @@ -5439,20 +5439,21 @@ is supported.") (define-public r-lubridate (package (name "r-lubridate") - (version "1.7.4") + (version "1.7.8") (source (origin (method url-fetch) (uri (cran-uri "lubridate" version)) (sha256 (base32 - "14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i")))) + "0g2m9dyhgds4shdrk76w7rqdl9msam4rii2qrhz12gipzhi9k89x")))) (build-system r-build-system) (propagated-inputs - `(("r-rcpp" ,r-rcpp) - ("r-stringr" ,r-stringr))) - (home-page - "https://cran.r-project.org/web/packages/lubridate") + `(("r-generics" ,r-generics) + ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://cran.r-project.org/web/packages/lubridate/") (synopsis "Make dealing with dates a little easier") (description "This package provides functions to work with date-times and time-spans: diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 14aee33524..ad4c30d064 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; @@ -30,7 +32,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +40,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0p1855n29rin2y8bjvmr7gkm18xd2j7js15l8nqcmyd33d60568z")) + "16dqpbn4saxmmmqd5ya8zdkwvxzz4nim1p4w954zkkdz3cyg86h6")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -97,7 +99,7 @@ ("go-github-com-lucas-clemente-quic-go" ,go-github-com-lucas-clemente-quic-go) ("go-github-com-willf-bloom" ,go-github-com-willf-bloom) - ;; For tests + ;; For tests. ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) (arguments @@ -1021,29 +1023,27 @@ quoting, commenting, and escaping.") (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") diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index b7758f106d..36571e7846 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -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 @@ #: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 @@ #: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 @@ #: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 @@ interface similar to many user-friendly editors. JOE has some of the key 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 @@ The basic features of Geany are: `(("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. diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 8510c6d1d0..62988ec574 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017,2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2019 Yoshinori Arai <kumagusu08@gmail.com> @@ -612,15 +612,15 @@ in a portable way.") (define-public dbacl (package (name "dbacl") - (version "1.14") + (version "1.14.1") (source (origin (method url-fetch) - (uri (string-append "http://www.lbreyer.com/gpl/" + (uri (string-append "mirror://sourceforge/dbacl/dbacl/" version "/" "dbacl-" version ".tar.gz")) (sha256 - (base32 - "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7")))) + (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz")) + (patches (search-patches "dbacl-include-locale.h.patch")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -648,10 +648,6 @@ in a portable way.") (lambda _ (delete-file "src/tests/dbacl-jap.shin") #t)) - (add-after 'delete-sample6-and-japanese 'autoreconf - (lambda _ - (invoke "autoreconf" "-vif") - #t)) (add-after 'unpack 'fix-test-files (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -661,7 +657,11 @@ in a portable way.") "#PATH=/bin:/usr/bin") (("diff") (string-append (which "diff"))) (("tr") (string-append (which "tr")))) - #t)))))) + #t))) + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-vif") + #t))))) (inputs `(("ncurses" ,ncurses) ("perl" ,perl) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e8b3d88944..3eb32fc27a 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -245,7 +245,7 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define gnutls-3.6.13 +(define-public gnutls-3.6.13 (package (inherit gnutls) (version "3.6.A") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fdbfab2fa4..5b3955869f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -148,14 +148,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.26.0") + (version "2.26.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1mlmwibfgcv42c28fxmbd3iim8fc06r17dljd8vdgq550z5hvkly")))) + "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -168,7 +168,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "09ilv5gg7167mwc0qqw2fz3lmdm360crnxc0xzkqn53wnsh4cziq")))) + "0j2031x3qchwjmiy2h849j4x1vd8y4rgqv2ak9dc87xbbpsbfg59")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) @@ -653,6 +653,24 @@ write native speed custom Git applications in any language with bindings.") ;; 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") @@ -843,9 +861,9 @@ collaboration using typical untrusted file hosts or services.") (method url-fetch) ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, ;; which may not match the current (package-version git). - (uri "mirror://kernel.org/software/scm/git/git-2.25.1.tar.xz") + (uri "mirror://kernel.org/software/scm/git/git-2.25.3.tar.xz") (sha256 - (base32 "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2")))) + (base32 "0yvr97cl0dvj3fwblq1mb0cp97v8hrn9l98p8b1jx8815mbsnz9h")))) ("openssl" ,openssl) ("groff" ,groff) ("python" ,python) @@ -1934,7 +1952,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (define-public tig (package (name "tig") - (version "2.5.0") + (version "2.5.1") (source (origin (method url-fetch) (uri (string-append @@ -1942,7 +1960,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") version "/tig-" version ".tar.gz")) (sha256 (base32 - "1x5famvvs93ih7sr11x7m33dksb1k7zs1s3c4zkyf0cjmxkpqlzz")))) + "0r4y9hyvpkplaxrzslws3asz652d83qh3bjwvmp8assga8s5s3ah")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) @@ -1956,8 +1974,8 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (add-after 'install 'install-doc (lambda _ (invoke "make" "install-doc")))) - #:tests? #f)) ; tests require access to /dev/tty - ;; #:test-target "test")) + #:test-target "test" + #:tests? #f)) ; tests require access to /dev/tty (home-page "https://jonas.github.io/tig/") (synopsis "Ncurses-based text user interface for Git") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 83cce1753e..62cc423c09 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -214,14 +214,14 @@ old-fashioned output methods with powerful ascii-art renderer.") (define-public celluloid (package (name "celluloid") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (string-append "https://github.com/celluloid-player/celluloid/releases" "/download/v" version "/celluloid-" version ".tar.xz")) (sha256 - (base32 "0gmscx9zb8ppfjlnmgbcmhknhawa05sdhxi7dv5wjapjq0glq481")))) + (base32 "1s3qkism96gi44incvsb6rqg255qcvjvw61ya7nw30md0sapj4sl")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool) @@ -602,7 +602,7 @@ available.") (define-public x265 (package (name "x265") - (version "3.2.1") + (version "3.3") (outputs '("out" "static")) (source (origin @@ -612,7 +612,7 @@ available.") (string-append "https://download.videolan.org/videolan/x265/" "x265_" version ".tar.gz"))) (sha256 - (base32 "1k5vijsy6cgcghw69f5275xfmbjjx7js0nlbgxbd6krnjb7sv6zv")) + (base32 "170b61cgpcs5n35qps0p40dqs1q81vkgagzbs4zv7pzls6718vpj")) (patches (search-patches "x265-arm-flags.patch")) (modules '((guix build utils))) (snippet '(begin @@ -758,7 +758,7 @@ canvas operations.") (define-public libdca (package (name "libdca") - (version "0.0.6") + (version "0.0.7") (source (origin (method url-fetch) (uri (string-append @@ -766,8 +766,12 @@ canvas operations.") version "/libdca-" version ".tar.bz2")) (sha256 (base32 - "0h0zvcn97i9kyljdpifzi8in9xnw31fx3b3ggj96p8h0l2d8mycq")))) + "0sjz0s0nrv7jcpvh1i432x3jza0y5yycmzw84cfncb2qby0i62rs")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (home-page "https://www.videolan.org/developers/libdca.html") (synopsis "DTS Coherent Acoustics decoder") (description "libdca is a library for decoding DTS Coherent Acoustics @@ -1618,25 +1622,6 @@ To load this plugin, specify the following option when starting mpv: (license license:bsd-3) (home-page "https://www.webmproject.org/"))) -;; GNU IceCat fails to build against 1.8.0, so keep this version for now. -(define-public libvpx-1.7 - (package - (inherit libvpx) - (version "1.7.0") - (source (origin - (inherit (package-source libvpx)) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit (string-append "v" version)))) - (file-name (git-file-name "libvpx" version)) - (sha256 - (base32 - "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) - (patches - (append - (origin-patches (package-source libvpx)) - (search-patches "libvpx-use-after-free-in-postproc.patch"))))))) - (define-public youtube-dl (package (name "youtube-dl") diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index bfaf462e24..be17ec15f0 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1089,7 +1089,7 @@ virtual machines.") (define-public bubblewrap (package (name "bubblewrap") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/containers/bubblewrap/" @@ -1097,7 +1097,7 @@ virtual machines.") version ".tar.xz")) (sha256 (base32 - "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5")))) + "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr")))) (build-system gnu-build-system) (arguments `(#:phases @@ -1173,7 +1173,7 @@ DOS or Microsoft Windows.") (define-public xen (package (name "xen") - (version "4.11.1") + (version "4.13.0") (source (origin (method git-fetch) (uri (git-reference @@ -1182,7 +1182,7 @@ DOS or Microsoft Windows.") (file-name (git-file-name name version)) (sha256 (base32 - "1wv1hyfii14vi9lfjmnv07h2gpm3b7kvh2p55f4yy2b40simksgk")))) + "0py50n995gv909i0d1lfdcj9wcp5g1d5z6m2291jqqlfyany138g")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1296,14 +1296,13 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) new-search-path ":"))) (setenv env-name new-env-value))) environment-variable-names)) - (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) - (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) + (setenv "CROSS_CPATH" (getenv "CPATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (filter-environment! cross? - '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" + '("CROSS_CPATH" "CROSS_LIBRARY_PATH")) (filter-environment! (lambda (e) (not (cross? e))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + '("CPATH" "LIBRARY_PATH")) ;; Guix tries to be helpful and automatically adds ;; mini-os-git-checkout/include to the include path, @@ -1312,7 +1311,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) (not (string-contains e "mini-os-git-checkout"))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + '("CPATH" "LIBRARY_PATH")) (setenv "EFI_VENDOR" "guix") #t)) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 444fb6a32b..739522959c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -243,17 +243,17 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (define-public openconnect (package (name "openconnect") - (version "8.05") + (version "8.08") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" "openconnect-" version ".tar.gz")) (sha256 - (base32 "14i9q727c2zc9xhzp1a9hz3gzb5lwgsslbhircm84dnbs192jp1k")))) + (base32 "1s3rjdazx1n5izpcgz05p1sirm7kf4z3gh26dq2h2j5xmgmk0jxp")))) (build-system gnu-build-system) (propagated-inputs `(("libxml2" ,libxml2) - ("gnutls" ,gnutls) + ("gnutls" ,gnutls-3.6.13) ("zlib" ,zlib))) (inputs `(("vpnc-scripts" ,vpnc-scripts))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5e393db463..0092477679 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1269,7 +1269,7 @@ Browsers and other web clients can use it to avoid privacy-leaking 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 diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 2c8697223c..0bf3d5dd72 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> @@ -121,14 +121,14 @@ engine that uses Wayland for graphics output.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.28.0") + (version "2.28.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn")))) + "1n7k4yriqhr38f4fgy8pzdn1nm60m53z8p478sgg64swxnijdg5c")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 541ef3cd7a..2c48bebdbf 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -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 @@ integrate Windows applications into your desktop.") (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 @@ integrate Windows applications into your desktop.") (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 @@ integrate Windows applications into your desktop.") "/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+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8605f7c03a..1be52247d3 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -602,7 +602,7 @@ System style license, and has no special dependencies.") (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.).") @@ -635,7 +635,7 @@ move windows, switch between desktops, etc.).") (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. @@ -1055,7 +1055,7 @@ within a single process.") (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+))) @@ -1731,7 +1731,7 @@ commandline).") `(#: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 diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index ae2f0f2dab..b231761d43 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -204,7 +204,7 @@ to share commonly used Xfce widgets among the Xfce applications.") (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 @@ to share commonly used Xfce widgets among the Xfce applications.") "exo-" version ".tar.bz2")) (sha256 (base32 - "1b3w4pf9gkcp13h63nf93k95hkw0ij7v5y7wjklqd1qifm8xd3w4")))) + "1dp5s64g6572h9zvx9js7qc72s728qsd9y7hl7hg6rwaq0cjb2gc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -222,7 +222,7 @@ to share commonly used Xfce widgets among the Xfce applications.") `(("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 @@ development.") (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 @@ development.") "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 @@ applications menu, workspace switcher and more.") (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 @@ applications menu, workspace switcher and more.") "xfce4-clipman-plugin-" version ".tar.bz2")) (sha256 (base32 - "1819kjn7gs30zhhj2ppfw4zjpcgj9amw1vvppjsavsff1xflrq88")))) + "1d6fxdzy9b511hqcyj7825fx67q6zqk6cln4g3x9d498jrvk3s5k")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -418,19 +418,20 @@ matching them against regular expressions.") (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 @@ keys for controlling the audio volume.") (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 @@ keys for controlling the audio volume.") "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 @@ your system in categories, so you can quickly find and launch them.") (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 @@ your system in categories, so you can quickly find and launch them.") (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 @@ -647,7 +648,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "1.8.12") + (version "1.8.14") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -655,7 +656,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "1y1548jrx93c9v8ks60mkd9sx5xl69fmwh1pbr9gsnqz1gp5na99")))) + "17r1z8cyp709lz38w7b5vqi1zbgm2i3sqvdvicsbvma2b0gppica")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1160,7 +1161,7 @@ A plugin for the Xfce panel is also available.") (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 @@ A plugin for the Xfce panel is also available.") version ".tar.bz2")) (sha256 (base32 - "11p48yyjgy6crwfbyvm16yg0rkzn90ssd2wygzmwvwrx3wkzyhsp")))) + "0mqxbyq9np6jzky8y35dlxxmk78q2w0jvwg9kh7a4ib7vmw1qvsq")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 794dad517e..7c71bf0a28 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -74,7 +74,7 @@ '(#: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 diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index d473c5342e..989e439d5d 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -285,7 +285,7 @@ and max_workers parameter.") (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 diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 00c6f0fe38..04d84b5220 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -941,6 +941,7 @@ with '-virtfs' options for the host file systems listed in SHARED-FS." '()) "-no-reboot" + "-nic" "user,model=virtio-net-pci" "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guixsd-vm-rng" diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index e90b247883..ca18b2f452 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -205,7 +205,8 @@ port 7, and a dict service on port 2628." ;; Make sure the bridge is created. (test-assert "br0 exists" (marionette-eval - '(zero? (system* "ovs-vsctl" "br-exists" "br0")) + '(zero? (system* #$(file-append openvswitch "/bin/ovs-vsctl") + "br-exists" "br0")) marionette)) ;; Make sure eth0 is connected to the bridge. diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm index ff6fcf5fe3..e8ebcf8ba0 100644 --- a/guix/build/julia-build-system.scm +++ b/guix/build/julia-build-system.scm @@ -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 @@ ;; 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) diff --git a/guix/lint.scm b/guix/lint.scm index 72582cfffb..e192f292a4 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of GNU Guix. @@ -286,7 +286,8 @@ of a package, and INPUT-NAMES, a list of package specifications such as (define (check-inputs-should-be-native package) ;; Emit a warning if some inputs of PACKAGE are likely to belong to its ;; native inputs. - (let ((inputs (package-inputs package)) + (let ((inputs (append (package-inputs package) + (package-propagated-inputs package))) (input-names '("pkg-config" "autoconf" @@ -685,7 +686,7 @@ patch could not be found." ;; Check whether we're reaching tar's maximum file name length. (let ((prefix (string-length (%distro-directory))) - (margin (string-length "guix-0.13.0-10-123456789/")) + (margin (string-length "guix-2.0.0rc3-10000-1234567890/")) (max 99)) (filter-map (match-lambda ((? string? patch) diff --git a/guix/self.scm b/guix/self.scm index 6b633f9bc0..1040c27a6b 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -489,6 +489,13 @@ TRANSLATIONS, an alist of msgid and msgstr." (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." |