diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
commit | 6901878894e9c6405fa811c512a32f448e8b9fa2 (patch) | |
tree | 5b04c4234f4022533692c36a83047ec9801aada9 /gnu/packages | |
parent | baf766a7ff9db45c707b4539176f2143fbd90efd (diff) | |
parent | 58c6a93d9d60660d8425d8c52d4b73a42d4a5b55 (diff) | |
download | guix-6901878894e9c6405fa811c512a32f448e8b9fa2.tar guix-6901878894e9c6405fa811c512a32f448e8b9fa2.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages')
72 files changed, 2648 insertions, 742 deletions
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 64d26548c4..afcb33ad6d 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darringon <jmd@gnu.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +24,8 @@ #: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 pkg-config) #:use-module (gnu packages image) #:use-module (guix build-system gnu)) @@ -75,21 +77,28 @@ characters, and is highly robust.") (define-public libdmtx (package (name "libdmtx") - (version "0.7.4") + (version "0.7.5") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/libdmtx/" name "/" version "/" - name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dmtx/libdmtx.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n")))) + (base32 "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj")))) (build-system gnu-build-system) + (arguments + ;; XXX Test suite is broken: https://github.com/dmtx/libdmtx/issues/22 + `(#:tests? #f)) (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://libdmtx.sourceforge.net/") + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/dmtx") (synopsis "Library for reading and writing Data Matrix 2D barcodes") (description "libdmtx is software for reading and writing Data Matrix 2D -barcodes on Linux and Unix. At its core libdmtx is a shared library, allowing +barcodes of the modern ECC200 variety. libdmtx is a shared library, allowing C/C++ programs to use its capabilities without restrictions or overhead.") (license license:bsd-3))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 64f826b3f0..8a0bb70871 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1892,19 +1892,17 @@ significantly faster and have minimal dependencies.") (define-public lv2 (package (name "lv2") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "http://lv2plug.in/spec/lv2-" version ".tar.bz2")) (sha256 (base32 - "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq")))) + "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target - ;; XXX: The bundled waf does not work with Python 3.7. - #:python ,python-2 #:configure-flags '("--no-plugins"))) (inputs ;; Leaving off cairo and gtk+-2.0 which are needed for example plugins @@ -1920,22 +1918,6 @@ add functionality to support the needs of increasingly powerful audio software.") (license license:isc))) -(define-public lv2-devel - (let ((commit "39c7c726cd52b2863fcea356cafe1bcab2ba7f37") - (revision "1")) - (package (inherit lv2) - (name "lv2-devel") - (version (string-append "1.15.3-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "http://lv2plug.in/git/lv2.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r"))))))) - (define-public lv2-mda-piano (package (name "lv2-mda-piano") @@ -3225,7 +3207,7 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) @@ -3233,7 +3215,7 @@ with support for HD extensions.") version "/bs1770gain-" version ".tar.gz")) (sha256 (base32 - "0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06")))) + "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk")))) (build-system gnu-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("sox" ,sox))) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index c312f23c1a..970d0adb06 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages dbm) #:use-module (gnu packages dejagnu) #:use-module (gnu packages ftp) @@ -1001,3 +1002,30 @@ de-duplicated before it is actually written to the storage back end to save precious backup space. @end itemize") (license license:bsd-2))) + +(define-public burp + (package + (name "burp") + (version "2.3.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/burp/burp-" version + "/burp-" version ".tar.bz2")) + (sha256 + (base32 + "0in49c0ir7lb7jli0fcphdq1nh5rclhans4ngm7z7hzyxa4jrgri")))) + (build-system gnu-build-system) + (inputs + `(("librsync" ,librsync) + ("openssl" ,openssl) + ("uthash" ,uthash) + ("zlib" ,zlib))) + (native-inputs + `(("check" ,check) + ("pkg-config" ,pkg-config))) + (home-page "https://burp.grke.org") + (synopsis "Differential backup and restore") + (description "Burp is a network backup and restore program. It attempts +to reduce network traffic and the amount of space that is used by each +backup.") + (license license:agpl3))) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 67fab7c114..db9cca6faf 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -892,7 +892,10 @@ with the Linux kernel.") "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch")))))) + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-CVE-2018-11236.patch" + "glibc-CVE-2018-11237.patch")))) + (properties `((lint-hidden-cve . ("CVE-2017-18269")))))) ; glibc-2.27-git-fixes (define-public glibc-2.26 (package diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 20aabb0be4..9057158cde 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages bioinformatics) #:use-module (gnu packages cran) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages graph) #:use-module (gnu packages maths) #:use-module (gnu packages statistics) @@ -1176,3 +1177,25 @@ Viewer (SAV) files, access data, and generate QC plots.") "This package provides a quality control pipeline for ChIP-exo/nexus sequencing data.") (license license:gpl2+))) + +(define-public r-dnacopy + (package + (name "r-dnacopy") + (version "1.56.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "DNAcopy" version)) + (sha256 + (base32 + "04cqdqxhva66xwh1s2vffi56b9fcrqd4slcrvqasj5lp2rkjli82")))) + (properties `((upstream-name . "DNAcopy"))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://bioconductor.org/packages/DNAcopy") + (synopsis "DNA copy number data analysis") + (description + "This package implements the @dfn{circular binary segmentation} (CBS) +algorithm to segment DNA copy number data and identify genomic regions with +abnormal copy number.") + (license license:gpl2+))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 02cafb2358..d6db02188f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> +;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -612,16 +613,22 @@ intended to behave exactly the same as the original BWK awk.") (define-public python-pybedtools (package (name "python-pybedtools") - (version "0.7.10") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pybedtools" version)) (sha256 (base32 - "0l2b2wrnj85azfqgr0zwr60f7j58vlla1hcgxvr9rwikpl8j72ji")))) + "1xl454ijvd4dzfvqgfahad49b49j7qy710fq9xh1rvk42z6x5ssf")))) (build-system python-build-system) (arguments - `(#:phases + `(#:modules ((ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + ;; See https://github.com/daler/pybedtools/issues/192 + #:phases (modify-phases %standard-phases ;; See https://github.com/daler/pybedtools/issues/261 (add-after 'unpack 'disable-broken-tests @@ -631,21 +638,59 @@ intended to behave exactly the same as the original BWK awk.") (substitute* "pybedtools/test/test_scripts.py" (("def test_venn_mpl") "def _do_not_test_venn_mpl")) - ;; Requires internet access. (substitute* "pybedtools/test/test_helpers.py" + ;; Requires internet access. (("def test_chromsizes") - "def _do_not_test_chromsizes")) - ;; FIXME: these two fail for no good reason. - (substitute* "pybedtools/test/test1.py" - (("def test_issue_157") - "def _do_not_test_issue_157") - (("def test_to_dataframe") - "def _do_not_test_to_dataframe")) - #t))))) - (propagated-inputs - ;; Tests don't pass with Bedtools 2.27.1. - ;; See https://github.com/daler/pybedtools/issues/260 - `(("bedtools" ,bedtools-2.26) + "def _do_not_test_chromsizes") + ;; Broken as a result of the workaround used in the check phase + ;; (see: https://github.com/daler/pybedtools/issues/192). + (("def test_getting_example_beds") + "def _do_not_test_getting_example_beds")) + #t)) + ;; TODO: Remove phase after it's part of PYTHON-BUILD-SYSTEM. + ;; build system. + ;; Force the Cythonization of C++ files to guard against compilation + ;; problems. + (add-after 'unpack 'remove-cython-generated-files + (lambda _ + (let ((cython-sources (map (cut string-drop-right <> 4) + (find-files "." "\\.pyx$"))) + (c/c++-files (find-files "." "\\.(c|cpp|cxx)$"))) + (define (strip-extension filename) + (string-take filename (string-index-right filename #\.))) + (define (cythonized? c/c++-file) + (member (strip-extension c/c++-file) cython-sources)) + (for-each delete-file (filter cythonized? c/c++-files)) + #t))) + (add-after 'remove-cython-generated-files 'generate-cython-extensions + (lambda _ + (invoke "python" "setup.py" "cythonize"))) + (replace 'check + (lambda _ + (let* ((cwd (getcwd)) + (build-root-directory (string-append cwd "/build/")) + (build (string-append + build-root-directory + (find (cut string-prefix? "lib" <>) + (scandir (string-append + build-root-directory))))) + (scripts (string-append + build-root-directory + (find (cut string-prefix? "scripts" <>) + (scandir build-root-directory))))) + (setenv "PYTHONPATH" + (string-append build ":" (getenv "PYTHONPATH"))) + ;; Executable scripts such as 'intron_exon_reads.py' must be + ;; available in the PATH. + (setenv "PATH" + (string-append scripts ":" (getenv "PATH")))) + ;; The tests need to be run from elsewhere... + (mkdir-p "/tmp/test") + (copy-recursively "pybedtools/test" "/tmp/test") + (with-directory-excursion "/tmp/test" + (invoke "pytest"))))))) + (propagated-inputs + `(("bedtools" ,bedtools) ("samtools" ,samtools) ("python-matplotlib" ,python-matplotlib) ("python-pysam" ,python-pysam) @@ -654,9 +699,11 @@ intended to behave exactly the same as the original BWK awk.") `(("python-numpy" ,python-numpy) ("python-pandas" ,python-pandas) ("python-cython" ,python-cython) - ("python-nose" ,python-nose) - ("kentutils" ,kentutils) ; for bedGraphToBigWig - ("python-six" ,python-six))) + ("kentutils" ,kentutils) ; for bedGraphToBigWig + ("python-six" ,python-six) + ;; For the test suite. + ("python-pytest" ,python-pytest) + ("python-psutil" ,python-psutil))) (home-page "https://pythonhosted.org/pybedtools/") (synopsis "Python wrapper for BEDtools programs") (description @@ -667,34 +714,7 @@ Python.") (license license:gpl2+))) (define-public python2-pybedtools - (let ((pkg (package-with-python2 python-pybedtools))) - (package (inherit pkg) - (arguments - `(#:modules ((ice-9 ftw) - (srfi srfi-1) - (srfi srfi-26) - (guix build utils) - (guix build python-build-system)) - ;; See https://github.com/daler/pybedtools/issues/192 - ,@(substitute-keyword-arguments (package-arguments pkg) - ((#:phases phases) - `(modify-phases ,phases - (replace 'check - (lambda _ - (let ((cwd (getcwd))) - (setenv "PYTHONPATH" - (string-append cwd "/build/" - (find (cut string-prefix? "lib" <>) - (scandir (string-append cwd "/build"))) - ":" (getenv "PYTHONPATH")))) - ;; The tests need to be run from elsewhere... - (mkdir-p "/tmp/test") - (copy-recursively "pybedtools/test" "/tmp/test") - (with-directory-excursion "/tmp/test" - (invoke "nosetests" - ;; This test fails for unknown reasons - "--exclude=.*test_getting_example_beds")) - #t)))))))))) + (package-with-python2 python-pybedtools)) (define-public python-biom-format (package @@ -14441,3 +14461,39 @@ Nanopolish can calculate an improved consensus sequence for a draft genome assembly, detect base modifications, call SNPs (Single nucleotide polymorphisms) and indels with respect to a reference genome and more.") (license license:expat)))) + +(define-public cnvkit + (package + (name "cnvkit") + (version "0.9.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/etal/cnvkit.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g2f78k68yglmj4fsfmgs8idqv3di9aj53fg0ld0hqljg8chhh82")))) + (build-system python-build-system) + (propagated-inputs + `(("python-biopython" ,python-biopython) + ("python-future" ,python-future) + ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-reportlab" ,python-reportlab) + ("python-pandas" ,python-pandas) + ("python-pysam" ,python-pysam) + ("python-pyfaidx" ,python-pyfaidx) + ("python-scipy" ,python-scipy) + ;; R packages + ("r-dnacopy" ,r-dnacopy))) + (home-page "https://cnvkit.readthedocs.org/") + (synopsis "Copy number variant detection from targeted DNA sequencing") + (description + "CNVkit is a Python library and command-line software toolkit to infer +and visualize copy number from high-throughput DNA sequencing data. It is +designed for use with hybrid capture, including both whole-exome and custom +target panels, and short-read sequencing platforms such as Illumina and Ion +Torrent.") + (license license:asl2.0))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 5bd784f73c..b0617f452a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 nee <nee@cock.li> ;;; ;;; This file is part of GNU Guix. @@ -624,7 +624,25 @@ board-independent tools."))) (make-u-boot-package "mx6cuboxi" "arm-linux-gnueabihf")) (define-public u-boot-novena - (make-u-boot-package "novena" "arm-linux-gnueabihf")) + (let ((base (make-u-boot-package "novena" "arm-linux-gnueabihf"))) + (package + (inherit base) + (description "U-Boot is a bootloader used mostly for ARM boards. It +also initializes the boards (RAM etc). + +This U-Boot is built for Novena. Be advised that this version, contrary +to Novena upstream, does not load u-boot.img from the first patition.") + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-novena-defconfig + ;; Patch configuration to disable loading u-boot.img from FAT partition, + ;; allowing it to be installed at a device offset. + (lambda _ + (substitute* "configs/novena_defconfig" + (("CONFIG_SPL_FAT_SUPPORT=y") "# CONFIG_SPL_FAT_SUPPORT is not set")) + #t))))))))) (define-public u-boot-cubieboard (make-u-boot-package "Cubieboard" "arm-linux-gnueabihf")) @@ -755,7 +773,7 @@ tools, and more.") (define-public os-prober (package (name "os-prober") - (version "1.76") + (version "1.77") (source (origin (method url-fetch) @@ -763,15 +781,15 @@ tools, and more.") version ".tar.xz")) (sha256 (base32 - "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk")))) + "0pvhrw4h05n21zw7ig3a3bi8aqdh6zxs0x1znz4g7vhspsps93ld")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) - (ice-9 regex) ; for string-match - (srfi srfi-26)) ; for cut + (ice-9 regex) ; for string-match + (srfi srfi-26)) ; for cut #:make-flags (list "CC=gcc") - #:tests? #f ; no tests + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (replace 'configure diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index b6f07dfa9a..0c57f1c27b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016, 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com> @@ -540,14 +540,14 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.") (define-public lziprecover (package (name "lziprecover") - (version "1.20") + (version "1.21") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lziprecover/" + "lziprecover-" version ".tar.gz")) (sha256 (base32 - "0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz")))) + "094w2z8fz41yaq0gkyr61cl7pb1d7kchpl5dka7rvm3qvbb7ncd2")))) (build-system gnu-build-system) (home-page "https://www.nongnu.org/lzip/lziprecover.html") (synopsis "Recover and decompress data from damaged lzip files") @@ -1606,14 +1606,14 @@ of archives.") (define-public lunzip (package (name "lunzip") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lunzip/" + "lunzip-" version ".tar.gz")) (sha256 - (base32 "1iw59br6nsxs7l1p875h8w3vxwr04xfhg5zyal64crvamhxkj5kl")))) + (base32 "19zq3gmlbia2krq4k4zs1j0xjdv7nsdzqvfb0pyca5n53h2mzb91")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1633,14 +1633,14 @@ Lunzip is intended to be fully compatible with the regular lzip package.") (define-public clzip (package (name "clzip") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/clzip/" + "clzip-" version ".tar.gz")) (sha256 - (base32 "03xcmhl3dya4jrwmsqh09ikimpb36fr3vkh2bwfzz1sbcns0cdg3")))) + (base32 "1h14dmc9fi10gcdpdpbgq1bwvcxvivppilj64pf720x8mw915mfr")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1659,17 +1659,15 @@ Clzip is intended to be fully compatible with the regular lzip package.") (define-public lzlib (package (name "lzlib") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lzlib/" + "lzlib-" version ".tar.gz")) (sha256 - (base32 "0hqhnj2lzqacdbmmnpy91lsm1rd9zlngs1q6s9pyahsv1a0bfshx")))) + (base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c")))) (build-system gnu-build-system) - ;; The included minilzip binary is only ~16 smaller than the ‘real’ lzip. - ;; It's used during the test suite, but don't be tempted to install it. (arguments `(#:configure-flags (list "CC=gcc" @@ -1687,14 +1685,14 @@ corrupted input.") (define-public plzip (package (name "plzip") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/plzip/" + "plzip-" version ".tar.gz")) (sha256 - (base32 "1dzjp9r7krwpsn224bhcqbzd5aj5b4556sdi9yzl2bzbk3fjrqlm")))) + (base32 "04indil809qgfmz776imb3dnhkysh7zk28jcv3mw0ahl2lyaxbzd")))) (build-system gnu-build-system) (inputs `(("lzlib" ,lzlib))) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index e42f8af1ab..3cd8c4cb69 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl> ;;; ;;; This file is part of GNU Guix. @@ -42,14 +43,15 @@ (package (name "coq") (version "8.8.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/coq/coq/archive/V" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0i2hs0i6rp27cy8zd0mx7jscqw5cx2y0diw0pxgij66s3yr47y7r")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coq/coq.git") + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03v8b57mz3ivsijwxy51avzwiyhla5ijaf98a5a2q29yabdq8dkp")))) (native-search-paths (list (search-path-specification (variable "COQPATH") @@ -63,6 +65,10 @@ (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -279,20 +285,22 @@ assistant.") (package (name "coq-mathcomp") (version "1.7.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/math-comp/math-comp/archive/mathcomp-" - version ".tar.gz")) - (sha256 - (base32 - "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/math-comp/math-comp.git") + (commit (string-append "mathcomp-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cdzi67jj440xkdpxm10aly80zpn56vjzj2ygb67iq3xpljlv95h")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) ("which" ,which) ("coq" ,coq))) (arguments - `(#:tests? #f; No need to test formally-verified programs :) + `(#:tests? #f ; no need to test formally-verified programs :) #:phases (modify-phases %standard-phases (delete 'configure) @@ -492,3 +500,44 @@ work on a decision procedure for the equational theory of an extension of the sigma-calculus by Abadi et al. The library is completely written in Coq and uses Ltac to synthesize the substitution operation.") (license license:bsd-3)))) + +(define-public coq-equations + (package + (name "coq-equations") + (version "1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattam82/Coq-Equations.git") + (commit (string-append "v" version "-8.8")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "129rxsdsf88vjcw0xhm74yax1hmnk6f8n9ksg0hcyyjq1ijddiwa")))) + (build-system gnu-build-system) + (native-inputs + `(("ocaml" ,ocaml) + ("coq" ,coq) + ("camlp5" ,camlp5))) + (arguments + `(#:test-target "test-suite" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "coq_makefile" "-f" "_CoqProject" "-o" "Makefile"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/")) + (invoke "make" + (string-append "COQLIB=" (assoc-ref outputs "out") + "/lib/coq/") + "install")))))) + (home-page "https://mattam82.github.io/Coq-Equations/") + (synopsis "Function definition plugin for Coq") + (description "Equations provides a notation for writing programs +by dependent pattern-matching and (well-founded) recursion in Coq. It +compiles everything down to eliminators for inductive types, equality +and accessibility, providing a definitional extension to the Coq +kernel.") + (license license:lgpl2.1))) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 6724f04ce5..c63b5ddf39 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -45,6 +46,7 @@ #:use-module (gnu packages scanner) #:use-module (gnu packages tls) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -380,6 +382,32 @@ device-specific programs to convert and print many types of files.") ("cups-filters" ,cups-filters) ("zlib" ,zlib))))) +(define-public cups-pk-helper + (package + (name "cups-pk-helper") + (version "0.2.6") + (source (origin + (method url-fetch) + (uri (string-append "https://freedesktop.org/software/" + name "/releases/" name "-" version ".tar.xz")) + (sha256 + (base32 + "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("glib" ,glib) + ("polkit" ,polkit) + ("cups" ,cups))) + (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/") + (synopsis "PolicyKit helper to configure CUPS with fine-grained privileges") + (description + "This package provides the org.opensuse.CupsPkHelper.Mechanism DBus +system service which uses @file{cups-pk-helper-mechanism}. This package +should only be used as part of the Guix cups-pk-helper service.") + (license license:gpl2+))) + (define-public hplip (package (name "hplip") @@ -681,3 +709,27 @@ printers. It can only be used with printers that support the Epson ESC/P-R language.") (home-page "http://download.ebz.epson.net/dsc/search/01/search") (license license:gpl2+))) + +(define-public python-pycups + (package + (name "python-pycups") + (version "1.9.74") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pycups" version ".tar.bz2")) + (sha256 + (base32 + "1ffp7sswhdsfpy88zg0cc8kl04wygkjs01rlm9f0spbwk8jhy2c6")))) + (build-system python-build-system) + (arguments + '(;; Tests require CUPS to be running + #:tests? #f)) + (inputs + `(("cups" ,cups))) + (home-page "https://github.com/zdohnal/pycups") + (synopsis "Python bindings for libcups") + (description + "This package provides Python bindings for libcups, wrapping the CUPS +API.") + (license license:gpl2+))) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 24180e0073..12a82d1bb7 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,6 +50,7 @@ (define-public curl (package (name "curl") + (replacement curl-7.64.0) (version "7.63.0") (source (origin (method url-fetch) @@ -141,6 +142,19 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) +(define-public curl-7.64.0 + (package + (inherit curl) + (version "7.64.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://curl.haxx.se/download/curl-" + version ".tar.xz")) + (sha256 + (base32 + "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))))) + (define-public kurly (package (name "kurly") diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dd93747ed6..2a34f51285 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> @@ -1070,7 +1070,7 @@ extremely small.") (define-public perl-dbi (package (name "perl-dbi") - (version "1.641") + (version "1.642") (source (origin (method url-fetch) (uri (string-append @@ -1078,7 +1078,7 @@ extremely small.") version ".tar.gz")) (sha256 (base32 - "1hf2x29bnqf2x1v4bdhji802z7n2mbg7h1amv8gdkqyhrlrfa2am")))) + "0pbzqazrx7pnw4nbyaf27in4b6yddkirbd2ws7mnqa2n7812a81z")))) (build-system perl-build-system) (synopsis "Database independent interface for Perl") (description "This package provides an database interface for Perl.") @@ -1491,14 +1491,14 @@ sets, bitmaps and hyperloglogs.") (define-public kyotocabinet (package (name "kyotocabinet") - (version "1.2.76") + (version "1.2.77") (source (origin (method url-fetch) (uri (string-append "http://fallabs.com/kyotocabinet/pkg/" name "-" version ".tar.gz")) (sha256 (base32 - "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1")))) + "1rlx4307adbzd842b4npq6cwlw8h010ingxaz3qz1ijc70lr72an")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index ceacd98a43..dd424461d5 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2016, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> @@ -340,14 +340,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") (define-public gparted (package (name "gparted") - (version "0.32.0") + (version "0.33.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df")))) + (base32 "1ml1ky3s75lbxr91p608q3prsdh9x899mw7nbgk252pqhg4vh8sh")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require a network connection @@ -478,16 +478,16 @@ a card with a smaller capacity than stated.") (define-public duperemove (package (name "duperemove") - (version "0.11") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/markfasheh/duperemove/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "0rjmmh42yqw9a5j6sp31cqwxk3s97dsi4xz0wpxpllj7bsp3aiw5")) - (file-name (string-append name "-" version ".tar.gz")))) + (version "0.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/markfasheh/duperemove.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index a2fa1db036..bce84449e1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -38,13 +38,13 @@ (define-public python-django (package (name "python-django") - (version "1.11.18") + (version "1.11.20") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "19b6f020als9hr4q1im5282yn2b1hzf586n9kjrlkrslq7da3k3k")))) + "0h90kdq8r4y8wa73hdxmyy5psnwlg61dcq3qsa098cpfiyh9vaa3")))) (build-system python-build-system) (arguments '(#:modules ((srfi srfi-1) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 09f0194bf7..dbd00271b1 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> @@ -294,15 +294,14 @@ asynchronous fashion.") (define-public nsd (package (name "nsd") - (version "4.1.25") + (version "4.1.26") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 - "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg")))) + (base32 "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -524,16 +523,16 @@ served by AS112. Stub and forward zones are supported.") (define-public yadifa (package (name "yadifa") - (version "2.3.8") + (version "2.3.9") (source - (let ((build "7713")) + (let ((build "8497")) (origin (method url-fetch) (uri (string-append "http://cdn.yadifa.eu/sites/default/files/releases/" - name "-" version "-" build ".tar.gz")) + "yadifa-" version "-" build ".tar.gz")) (sha256 - (base32 "15xhzg4crjcxascwpz6y8qpqcgypzv2p9bspdskp4nx1x1y4316c"))))) + (base32 "0xvyr91sfgzkpw6g3h893ldbwnki3w2472n56rr18w67qghs1sa5"))))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) @@ -571,14 +570,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.7.3") + (version "2.7.6") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" - name "-" version ".tar.xz")) + "knot-" version ".tar.xz")) (sha256 (base32 - "1pwjcv7hzhqawisibybma160k77a6f1v94xw6ay9c7j49vrw05w7")) + "18lpyq3vgr2ainmfiy14x7hcf1zxza66bhkpr54jaz2gy1viijx1")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 992eb0dcc1..b340f8d4a0 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -43,7 +43,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "18.09.0") +(define %docker-version "18.09.2") (define-public python-docker-py (package @@ -241,7 +241,7 @@ network attachments.") (file-name (git-file-name name version)) (sha256 (base32 - "1liqbx58grqih6m8hz9y20y5waflv19pv15l3wl64skap2bsn21c")) + "1zfpk2n8j6gnwbrxrh6d6pj24y60dhbanpf55shrm2yxz54ka36c")) (patches (search-patches "docker-engine-test-noinstall.patch" "docker-fix-tests.patch")))) @@ -337,6 +337,7 @@ network attachments.") (substitute-LookPath "blkid" "util-linux" "/sbin/blkid") (substitute-LookPath "unpigz" "pigz" "/bin/unpigz") (substitute-LookPath "iptables" "iptables" "/sbin/iptables") + (substitute-LookPath "iptables-legacy" "iptables" "/sbin/iptables") (substitute-LookPath "ip" "iproute2" "/sbin/ip") (substitute-Command "modprobe" "kmod" "/bin/modprobe") (substitute-Command "pvcreate" "lvm2" "/sbin/pvcreate") @@ -483,7 +484,7 @@ provisioning etc.") (file-name (git-file-name name version)) (sha256 (base32 - "1ivisys20kphvbqlazc3bsg7pk0ykj9gjx5d4yg439x4n13jxwvb")))) + "0jzcqh1kqbfyj6ax7z67gihaqgjiz6ddz6rq6k458l68v7zn77r8")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 9425df707c..9d4d5916fb 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -124,10 +124,14 @@ markup) can be customized and extended by the user.") (package (name "doxygen") (version "1.8.14") + (home-page "http://www.doxygen.nl/") (source (origin (method url-fetch) - (uri (string-append "http://ftp.stack.nl/pub/users/dimitri/" - name "-" version ".src.tar.gz")) + (uri (list (string-append home-page "files/doxygen-" + version ".src.tar.gz") + (string-append "mirror://sourceforge/doxygen/rel-" + version "/doxygen-" version + ".src.tar.gz"))) (sha256 (base32 "0kcxymbam9jwiyjwyvwdjj0h74lbb6c467szsipzbxjyfl17wxfi")) @@ -150,7 +154,6 @@ markup) can be customized and extended by the user.") (string-append (assoc-ref inputs "bash") "/bin/sh"))) #t))))) - (home-page "http://www.stack.nl/~dimitri/doxygen/") (synopsis "Generate documentation from annotated sources") (description "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 43e660743a..49ca740088 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org> +;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,8 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (ice-9 match)) (define-public gnu-efi (package @@ -195,6 +197,12 @@ and EFI variable management.") (arguments `(#:make-flags (list "CC=gcc" + ,@(match (%current-system) + ("aarch64-linux" + '("ARCH=aarch64")) + ("armhf-linux" + '("ARCH=arm")) + (_ '())) (string-append "INCDIR=" (assoc-ref %build-inputs "gnu-efi") "/include") (string-append "LIBDIR=" (assoc-ref %build-inputs "gnu-efi") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 339927a4f0..957c9ea613 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8918,7 +8918,7 @@ outline-mode), so there is no such thing like an outshine mode, only (define-public emacs-biblio (package (name "emacs-biblio") - (version "0.1") + (version "0.2") (source (origin (method url-fetch) @@ -8927,7 +8927,7 @@ outline-mode), so there is no such thing like an outshine mode, only (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "109fvivsb4r0rbqljngqrmxqvbnbkqlivczx6brrvlr7ci625lhf")))) + "0vwrljmab8m1z83048gxx5mryml9f5pb3h0jpwkvqcl0ra152lzx")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-seq" ,emacs-seq) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 066d6d843b..c778ebd21e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -109,7 +109,7 @@ single file can be mounted.") (define-public disorderfs (package (name "disorderfs") - (version "0.5.5") + (version "0.5.6") (source (origin (method git-fetch) @@ -119,7 +119,7 @@ single file can be mounted.") (file-name (git-file-name name version)) (sha256 (base32 - "18c32qcdzbxrzg7srnqnw1ls9yqqxyk9b996yxr6w2znw6x6n8v4")))) + "1zn2ydap8k9fwjl3ivgrg6l32s5p4ik6ca6j1idp7c77znlv6cpp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e44be713f2..112a6eba97 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages dns) #:use-module (gnu packages emacs) #:use-module (gnu packages dbm) + #:use-module (gnu packages gnupg) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages libedit) @@ -138,7 +139,7 @@ line client and a client based on Qt.") (define-public ledger (package (name "ledger") - (version "3.1.1") + (version "3.1.2") (source (origin (method git-fetch) @@ -147,39 +148,17 @@ line client and a client based on Qt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp")) - (patches (search-patches "ledger-revert-boost-python-fix.patch" - "ledger-fix-uninitialized.patch")))) + (base32 "0hwnipj2m9p95hhyv6kyq54m27g14r58gnsy2my883kxhpcyb2vc")) + (patches (search-patches "ledger-fix-uninitialized.patch")))) (build-system cmake-build-system) (arguments - `(#:modules ((guix build cmake-build-system) - ((guix build gnu-build-system) #:prefix gnu:) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build emacs-utils)) - #:configure-flags + `(#:configure-flags `("-DBUILD_DOCS:BOOL=ON" "-DBUILD_WEB_DOCS:BOOL=ON" - "-DBUILD_EMACSLISP:BOOL=ON" "-DUSE_PYTHON:BOOL=ON" - "-DCMAKE_INSTALL_LIBDIR:PATH=lib" - ,(string-append "-DUTFCPP_INCLUDE_DIR:PATH=" - (assoc-ref %build-inputs "utfcpp") - "/include")) - ;; Skip failing test BaselineTest_cmd-org during the check phase. - ;; This is a known upstream issue. See - ;; https://github.com/ledger/ledger/issues/550 - #:make-flags (list "ARGS=-E BaselineTest_cmd-org") + "-DCMAKE_INSTALL_LIBDIR:PATH=lib") #:phases (modify-phases %standard-phases - (add-after 'unpack 'boost-compat - (lambda _ - (substitute* "src/utils.h" - ;; This library moved in Boost 1.66. Remove for Ledger - ;; versions > 3.1.1. - (("boost/uuid/sha1.hpp") "boost/uuid/detail/sha1.hpp")) - #t)) (add-before 'configure 'install-examples (lambda* (#:key outputs #:allow-other-keys) (let ((examples (string-append (assoc-ref outputs "out") @@ -195,18 +174,11 @@ line client and a client based on Qt.") (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - #t)) - (replace 'check (assoc-ref gnu:%standard-phases 'check)) - (add-after 'install 'relocate-elisp - (lambda* (#:key outputs #:allow-other-keys) - (let* ((site-dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) - (guix-dir (string-append site-dir "/guix.d")) - (orig-dir (string-append site-dir "/ledger-mode")) - (dest-dir (string-append guix-dir "/ledger-mode"))) - (mkdir-p guix-dir) - (rename-file orig-dir dest-dir) - (emacs-generate-autoloads ,name dest-dir))))))) + ;; Skip failing test BaselineTest_cmd-org. + ;; This is a known upstream issue. See + ;; https://github.com/ledger/ledger/issues/550 + (setenv "ARGS" "-E BaselineTest_cmd-org") + #t))))) (inputs `(("boost" ,boost) ("gmp" ,gmp) @@ -216,8 +188,7 @@ line client and a client based on Qt.") ("tzdata" ,tzdata) ("utfcpp" ,utfcpp))) (native-inputs - `(("emacs" ,emacs-minimal) - ("groff" ,groff) + `(("groff" ,groff) ("texinfo" ,texinfo))) (home-page "https://ledger-cli.org/") (synopsis "Command-line double-entry accounting program") @@ -243,8 +214,74 @@ in ability, and easy to use.") license:asl2.0 ; src/strptime.cc (license:non-copyleft "file://src/wcwidth.cc" - "See src/wcwidth.cc in the distribution.") - license:gpl2+)))) ; lisp/* + "See src/wcwidth.cc in the distribution."))))) + +(define-public emacs-ledger-mode + ;; There have been no new releases since 2016. + (let ((commit "253a20dc62e137ed0ed8e1dd8614ecba116610ea") + (revision "1")) + (package + (name "emacs-ledger-mode") + (version (git-version "3.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ledger/ledger-mode.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06wrgkqpgvk17vibrk2qikdlqn8y63jg86marp1wgmram92mb3jk")))) + (build-system cmake-build-system) + (arguments + `(#:modules ((guix build cmake-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules (,@%cmake-build-system-modules + (guix build emacs-utils)) + #:tests? #f ; there are none + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((target (string-append (assoc-ref outputs "out") + "/share/info"))) + (mkdir-p target) + (invoke "makeinfo" "-o" target + "../source/doc/ledger-mode.texi")) + #t)) + (add-after 'install 'relocate-elisp + (lambda* (#:key outputs #:allow-other-keys) + (let* ((site-dir (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp")) + (guix-dir (string-append site-dir "/guix.d")) + (orig-dir (string-append site-dir "/ledger-mode")) + (dest-dir (string-append guix-dir "/ledger-mode"))) + (mkdir-p guix-dir) + (rename-file orig-dir dest-dir) + (emacs-generate-autoloads ,name dest-dir) + #t)))))) + (native-inputs + `(("emacs-minimal" ,emacs-minimal) + ("texinfo" ,texinfo))) + (home-page "https://ledger-cli.org/") + (synopsis "Command-line double-entry accounting program") + (description + "Ledger is a powerful, double-entry accounting system that is +accessed from the UNIX command-line. This may put off some users, since +there is no flashy UI, but for those who want unparalleled reporting +access to their data there are few alternatives. + +Ledger uses text files for input. It reads the files and generates +reports; there is no other database or stored state. To use Ledger, +you create a file of your account names and transactions, run from the +command line with some options to specify input and requested reports, and +get output. The output is generally plain text, though you could generate +a graph or html instead. Ledger is simple in concept, surprisingly rich +in ability, and easy to use. + +This package provides the Emacs mode.") + (license license:gpl2+)))) (define-public geierlein (package @@ -591,7 +628,7 @@ Monero GUI client.") (define-public python-trezor-agent (package (name "python-trezor-agent") - (version "0.9.4") + (version "0.13.0") (source (origin (method git-fetch) @@ -600,11 +637,18 @@ Monero GUI client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "15aaqk79d9y9nbsfznf2iscz12z5ispcj8kr8v5bc0sqqj2brs12")))) + (base32 "0i4igkxi8fwdlbhg6nx27lhnc9v9nmrw4j5fvpnc202n6yjlc7x7")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-requires-backports-shutil-which + ;; Remove requires on backport of shutil_which, as python 3.4+ has + ;; a built-in implementation supported in python-trezor-agent. + (lambda _ + (substitute* "setup.py" + (("'backports.shutil_which>=3.5.1',") "")) + #t)) (delete 'check) (add-after 'install 'check (lambda* (#:key outputs inputs #:allow-other-keys) @@ -612,15 +656,22 @@ Monero GUI client.") (add-installed-pythonpath inputs outputs) (invoke "py.test")))))) (propagated-inputs - `(("python-ecdsa" ,python-ecdsa) + `(("python-configargparse" ,python-configargparse) + ("python-daemon" ,python-daemon) + ("python-docutils" ,python-docutils) + ("python-ecdsa" ,python-ecdsa) ("python-ed25519" ,python-ed25519) + ("python-mnemonic" ,python-mnemonic) + ("python-pymsgbox" ,python-pymsgbox) ("python-semver" ,python-semver) - ("python-unidecode" ,python-unidecode))) + ("python-unidecode" ,python-unidecode) + ("python-wheel" ,python-wheel))) (native-inputs - `(("python-mock" ,python-mock) + `(("gnupg" ,gnupg) + ("python-mock" ,python-mock) ("python-pytest" ,python-pytest))) (home-page "https://github.com/romanz/trezor-agent") - (synopsis "TREZOR SSH and GPG host support") + (synopsis "Use hardware wallets as SSH and GPG agent") (description "@code{libagent} is a library that allows using TREZOR, Keepkey and Ledger Nano as a hardware SSH/GPG agent.") @@ -789,19 +840,32 @@ Then set the environment variable GNUPGHOME to (define-public trezor-agent (package (name "trezor-agent") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "trezor_agent" version)) (sha256 (base32 - "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz")))) + "144657c7bn0a667dq5fv5r6j7iilxf3h9agj29v1m2qpq40g0az8")))) + (arguments + ;; Tests fail with "AttributeError: module 'attr' has no attribute 's'". + `(#:phases + (modify-phases %standard-phases + (add-after 'wrap 'fixup-agent-py + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + ;; overwrite the wrapper with the real thing. + (install-file "./trezor_agent.py" + (string-append out "/bin")) + #t)))))) (build-system python-build-system) (inputs `(("python-trezor" ,python-trezor) ("python-trezor-agent" ,python-trezor-agent))) - (home-page "http://github.com/romanz/trezor-agent") + (native-inputs + `(("python-hidapi" ,python-hidapi))) + (home-page "https://github.com/romanz/trezor-agent") (synopsis "Using Trezor as hardware SSH/GPG agent") (description "This package allows using Trezor as a hardware SSH/GPG agent.") diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f77f9da163..9d49c02cf6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2017 Mohammed Sadiq <sadiq@sadiqpk.org> ;;; Copyright © 2018 Charlie Ritter <chewzerita@posteo.net> ;;; Copyright © 2018 Gabriel Hondet <gabrielhondet@gmail.com> +;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; ;;; This file is part of GNU Guix. ;;; @@ -857,6 +858,56 @@ Powerline support.") designed to work well in user interface environments.") (license license:silofl1.1))) +(define-public font-adobe-source-sans-pro + (package + (name "font-adobe-source-sans-pro") + (version "2.040R-ro-1.090R-it") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/adobe-fonts/source-sans-pro/archive/" + (regexp-substitute/global + ;; The upstream tag uses "/" between the roman and italic + ;; versions, so substitute our "-" separator here. + #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wpbhd2idps53ph8rg1mhr3vz4lsgbpjprcq10nliwcxdz9d8lv0")))) + (build-system font-build-system) + (home-page "https://github.com/adobe-fonts/source-sans-pro") + (synopsis + "Sans serif font family for user interface environments") + (description + "Source Sans Pro is a set of OpenType fonts that have been designed to +work well in user interface (UI) environments.") + (license license:silofl1.1))) + +(define-public font-adobe-source-serif-pro + (package + (name "font-adobe-source-serif-pro") + (version "2.007R-ro-1.007R-it") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/adobe-fonts/source-serif-pro/archive/" + (regexp-substitute/global + ;; The upstream tag uses "/" between the roman and italic + ;; versions, so substitute our "-" separator here. + #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sws9k26ldqk375qsigk1zv8cq1xlvadjwvv3dqrcc3qzm1c7hwc")))) + (build-system font-build-system) + (home-page "https://github.com/adobe-fonts/source-serif-pro") + (synopsis + "Serif typeface to complement Source Sans Pro for setting text") + (description + "Source Serif Pro is a set of OpenType fonts to complement the Source +Sans Pro family.") + (license license:silofl1.1))) + (define-public font-fira-mono (package (name "font-fira-mono") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5d7c89a880..de53ac798d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2843,7 +2843,9 @@ http://lavachat.symlynx.com/unix/") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0")))) + "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0")) + (patches + (search-patches "red-eclipse-remove-gamma-name-hack.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b05b2d7879..a3412885a6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch> @@ -126,6 +126,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdesktop) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages samba) #:use-module (gnu packages scanner) #:use-module (gnu packages selinux) @@ -149,6 +150,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xorg) + #:use-module (gnu artwork) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -159,6 +161,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -972,6 +975,88 @@ for translations, though this is only a dependency for the maintainers. This database is translated at Transifex.") (license license:gpl2+))) +(define-public system-config-printer + (package + (name "system-config-printer") + (version "1.5.11") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/zdohnal/system-config-printer/releases/" + "download/" version + "/system-config-printer-" version ".tar.xz")) + (sha256 + (base32 + "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + ,@%glib-or-gtk-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-Makefile.am + (lambda _ + ;; The Makefile generates some scripts, so set a valid shebang + (substitute* "Makefile.am" + (("/bin/bash") (which "bash"))) + (delete-file "configure") + #t)) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + ;; Modify the man XML otherwise xmlto tries to access the network + (substitute* "man/system-config-printer.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + #t)) + (add-after 'install 'wrap-for-python + (@@ (guix build python-build-system) wrap)) + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (for-each + (lambda (program) + (wrap-program program + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + (map (lambda (name) + (string-append out "/bin/" name)) + '("system-config-printer" + "system-config-printer-applet" + "install-printerdriver" + "scp-dbus-service")))) + #t))))) + (inputs + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gobject-introspection" ,gobject-introspection) + ("python" ,python) + ("cups" ,cups) + ("python-dbus" ,python-dbus) + ("python-pygobject" ,python-pygobject) + ("python-pycups" ,python-pycups) + ("python-requests" ,python-requests) + ("python-pycairo" ,python-pycairo) + ("libnotify" ,libnotify) + ("packagekit" ,packagekit))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("desktop-file-utils" ,desktop-file-utils) + ("glib" ,glib) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) + ("xmlto" ,xmlto) + ("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("libxml2" ,libxml2))) + (home-page "https://github.com/zdohnal/system-config-printer") + (synopsis "CUPS administration tool") + (description + "system-config-printer is a CUPS administration tool. It's written in +Python using GTK+, and uses the @acronym{IPP, Internet Printing Protocol} when +configuring CUPS.") + (license license:gpl2+))) + (define-public hicolor-icon-theme (package (name "hicolor-icon-theme") @@ -4572,16 +4657,6 @@ such as gzip tarballs.") (out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/gnome-session") `("PATH" ":" prefix (,(string-append glib "/bin")))) - #t))) - (add-after 'install 'disable-hardware-acceleration-check - (lambda* (#:key outputs #:allow-other-keys) - ;; Do not abort if hardware acceleration is missing. This allows - ;; GNOME to run in QEMU and on low-end devices. - (let ((out (assoc-ref outputs "out"))) - (substitute* (string-append out - "/share/xsessions/gnome.desktop") - (("gnome-session") - "gnome-session --disable-acceleration-check")) #t)))) #:configure-flags @@ -5580,11 +5655,37 @@ properties, screen resolution, and other GNOME parameters.") name "-" version ".tar.xz")) (sha256 (base32 - "1f20x36ymkp1j667hb7s7byly2gqc4m0anldy3qwp38vm8437caq")))) + "1f20x36ymkp1j667hb7s7byly2gqc4m0anldy3qwp38vm8437caq")) + (patches (search-patches "gnome-shell-theme.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; CSS files have to be regenerated from the .scss source + ;; that 'gnome-shell-theme.patch' modifies. + (for-each delete-file + (find-files "data/theme" + "^gnome-shell.*\\.css$")) + + ;; Copy images for use on the GDM log-in screen. + (copy-file #$(file-append %artwork-repository + "/slim/0.x/background.png") + "data/theme/guix-background.png") + (invoke #+(file-append inkscape "/bin/inkscape") + "--export-png=data/theme/guix-logo.png" + #$(file-append %artwork-repository + "/logo/Guix-horizontal-white.svg")) + #t)))) (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases + (add-before 'build 'rebuild-css + (lambda _ + ;; Rebuild the CSS files from the .scss files that our patch + ;; modifies. + (invoke "make" "-C" "data" + "theme/gnome-shell.css" + "theme/gnome-shell-high-contrast.css"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -5614,7 +5715,8 @@ properties, screen resolution, and other GNOME parameters.") ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("python" ,python) - ("xsltproc" ,libxslt))) + ("xsltproc" ,libxslt) + ("ruby-sass" ,ruby-sass))) (inputs `(("accountsservice" ,accountsservice) ("caribou" ,caribou) @@ -6048,6 +6150,7 @@ associations for GNOME.") ("pinentry-gnome3" ,pinentry-gnome3) ("pulseaudio" ,pulseaudio) ("shared-mime-info" ,shared-mime-info) + ("system-config-printer" ,system-config-printer) ("totem" ,totem) ("xdg-user-dirs" ,xdg-user-dirs) ("yelp" ,yelp) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2b3ee89d35..7a7ff966bb 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -138,7 +138,7 @@ generation.") (define-public libassuan (package (name "libassuan") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) @@ -146,7 +146,7 @@ generation.") version ".tar.bz2")) (sha256 (base32 - "1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq")))) + "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error" ,libgpg-error) @@ -224,14 +224,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.12") + (version "2.2.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1jw282iy27j1qygym52aa44zxy7ly4bdadhd628hwr4q9j5hy0yv")))) + "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 92f6a4f977..3f3fe8fcb5 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -147,7 +147,7 @@ between two other data points.") (define-public gama (package (name "gama") - (version "2.02") + (version "2.03") (source (origin (method url-fetch) @@ -155,7 +155,7 @@ between two other data points.") version ".tar.gz")) (sha256 (base32 - "1r5rrmiqdg6dpxqla0f2mjwcjzlckdjpg4ar0cirmz78w78hf6vn")))) + "0d33yyasnx54c6i40rkr9by4qv92rqb8wkmp5r46nz7bbp9kpymv")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f)) ; race condition (native-inputs diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index ae05197e16..a48954e7f2 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1963,8 +1963,8 @@ format is also supported.") (deprecated-package "mcron2" mcron)) (define-public guile-picture-language - (let ((commit "1531116036d1b5e0d2482ff2c8d77ad21f1d2bef") - (revision "1")) + (let ((commit "1ea8b78a8bceb4f7e5eaeb3e76987072267f99bb") + (revision "2")) (package (name "guile-picture-language") (version (git-version "0" revision commit)) @@ -1975,7 +1975,7 @@ format is also supported.") (commit commit))) (sha256 (base32 - "04salmqf5x84vb3qkkxx47b64jyl290zsf3ik81l9hg6fwvvlmq3")))) + "1rvq6q2zq21x7dx0qq1hn568wglsl4bkd8gacbarcx1fs0rrxcqw")))) (build-system guile-build-system) (inputs `(("guile" ,guile-2.2))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 255e902e66..21a5177927 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11493,4 +11493,112 @@ imported with the correct Haskell types.") Music Player Daemon.") (license license:expat))) +(define-public ghc-alsa-core + (package + (name "ghc-alsa-core") + (version "0.5.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/alsa-core/alsa-core-" + version + ".tar.gz")) + (sha256 + (base32 + "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) + ("alsa-lib" ,alsa-lib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.haskell.org/haskellwiki/ALSA") + (synopsis "Binding to the ALSA Library API (Exceptions)") + (description "This package provides access to ALSA infrastructure, that is +needed by both alsa-seq and alsa-pcm.") + (license license:bsd-3))) + +(define-public ghc-base-unicode-symbols + (package + (name "ghc-base-unicode-symbols") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/base-unicode-symbols/base-unicode-symbols-" + version + ".tar.gz")) + (sha256 + (base32 + "1ia6li7qjg1zkak4gf6mnbshw45mq9bfjr0jch58ds0lscmvwyzf")))) + (build-system haskell-build-system) + (home-page "http://www.haskell.org/haskellwiki/Unicode-symbols") + (synopsis "Unicode alternatives for common functions and operators") + (description "This package defines new symbols for a number of functions, +operators and types in the base package. All symbols are documented with +their actual definition and information regarding their Unicode code point. +They should be completely interchangeable with their definitions. For +further Unicode goodness you can enable the @code{UnicodeSyntax} +@url{https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/glasgow_exs.html#unicode-syntax, +language extension}. This extension enables Unicode characters to be used to +stand for certain ASCII character sequences, i.e. → instead of @code{->}, +∀ instead of @code{forall} and many others.") + (license license:bsd-3))) + +(define-public ghc-stylish-haskell + (package + (name "ghc-stylish-haskell") + (version "0.9.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/stylish-haskell/stylish-haskell-" + version + ".tar.gz")) + (sha256 + (base32 + "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-file-embed" ,ghc-file-embed) + ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-syb" ,ghc-syb) + ("ghc-yaml" ,ghc-yaml) + ("ghc-strict" ,ghc-strict) + ("ghc-optparse-applicative" + ,ghc-optparse-applicative))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://github.com/jaspervdj/stylish-haskell") + (synopsis "Haskell code prettifier") + (description "Stylish-haskell is a Haskell code prettifier. The goal is +not to format all of the code in a file, to avoid \"getting in the way\". +However, this tool can e.g. clean up import statements and help doing various +tasks that get tedious very quickly. It can +@itemize +@item +Align and sort @code{import} statements +@item +Group and wrap @code{{-# LANGUAGE #-}} pragmas, remove (some) redundant +pragmas +@item +Remove trailing whitespaces +@item +Align branches in @code{case} and fields in records +@item +Convert line endings (customisable) +@item +Replace tabs by four spaces (turned off by default) +@item +Replace some ASCII sequences by their Unicode equivalent (turned off by +default) +@end itemize") + (license license:bsd-3))) ;;; haskell.scm ends here diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 895802cc94..417989050c 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 nee <nee-git@hidamari.blue> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. @@ -62,7 +62,7 @@ (define-public feh (package (name "feh") - (version "3.1.1") + (version "3.1.2") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31")))) + "0qjhlrgr606gc9h96w9piyd13mx63jqfbxxnan41nrh76m8d0dka")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6457127520..f217c3611a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -321,7 +321,7 @@ Currently all documentation resides in @file{pnglite.h}.") (version "9c") (source (origin (method url-fetch) - (uri (string-append "http://www.ijg.org/files/jpegsrc.v" + (uri (string-append "https://www.ijg.org/files/jpegsrc.v" version ".tar.gz")) (sha256 (base32 "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5")))) @@ -342,14 +342,14 @@ lossless JPEG manipulations such as rotation, scaling or cropping: @item wrjpgcom @end enumerate") (license license:ijg) - (home-page "http://www.ijg.org/"))) + (home-page "https://www.ijg.org/"))) (define-public libjpeg-8 (package (inherit libjpeg) (version "8d") (source (origin (method url-fetch) - (uri (string-append "http://www.ijg.org/files/jpegsrc.v" + (uri (string-append "https://www.ijg.org/files/jpegsrc.v" version ".tar.gz")) (sha256 (base32 "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0")))))) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5068de22bb..c9b464c2c5 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -78,7 +78,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -87,7 +87,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0")))) + "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) @@ -253,7 +253,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -262,7 +262,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn")))) + "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln")))) (build-system cmake-build-system) (arguments `(#:phases @@ -293,7 +293,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -302,7 +302,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard")))) + "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -326,7 +326,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -335,23 +335,8 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32 - "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph")))) + "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy")))) (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'add-symlinks - ;; Fix "ScalableTest" - FIXME: Remove for > 5.49.0 - (lambda _ - (symlink "../22/plasma-browser-integration.svg" - "icons-dark/apps/48/plasma-browser-integration.svg") - (symlink "../22/plasma-browser-integration.svg" - "icons-dark/apps/64/plasma-browser-integration.svg") - (symlink "../22/plasma-browser-integration.svg" - "icons/apps/48/plasma-browser-integration.svg") - (symlink "../22/plasma-browser-integration.svg" - "icons/apps/64/plasma-browser-integration.svg") - #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("fdupes" ,fdupes) @@ -370,7 +355,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -379,7 +364,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559")))) + "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -412,7 +397,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -421,7 +406,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0")))) + "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -446,7 +431,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcodecs (package (name "kcodecs") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -455,7 +440,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz")))) + "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -482,7 +467,7 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -491,10 +476,11 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32 - "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf")))) + "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) + `(("dbus" ,dbus) + ("extra-cmake-modules" ,extra-cmake-modules) ("inetutils" ,inetutils) ("qttools" ,qttools) ("xorg-server" ,xorg-server))) @@ -508,13 +494,10 @@ Internet).") (setenv "HOME" (getcwd)) (setenv "TMPDIR" (getcwd)) #t)) - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) - (setenv "DISPLAY" ":1") - #t))))) + (replace 'check + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "dbus-launch" "ctest" ".")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Kconfiguration settings framework for Qt") (description "KConfig provides an advanced configuration system. @@ -549,7 +532,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -558,7 +541,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj")))) + "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -606,7 +589,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -615,7 +598,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh")) + "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -651,7 +634,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -660,7 +643,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr")))) + "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -679,7 +662,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -688,7 +671,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk")))) + "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935")))) (build-system cmake-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -717,7 +700,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public ki18n (package (name "ki18n") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -726,7 +709,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") name "-" version ".tar.xz")) (sha256 (base32 - "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz")))) + "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -760,7 +743,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -769,7 +752,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv")))) + "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -791,7 +774,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -800,7 +783,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32 - "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz")))) + "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -827,7 +810,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -836,7 +819,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg")))) + "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -886,7 +869,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -895,7 +878,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp")))) + "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -921,7 +904,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -930,7 +913,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0")))) + "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -956,7 +939,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -965,7 +948,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v")))) + "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1005,7 +988,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1014,7 +997,7 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32 - "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6")))) + "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1044,7 +1027,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1053,7 +1036,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92")))) + "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1091,7 +1074,7 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1100,7 +1083,7 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp")))) + "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1152,7 +1135,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1161,7 +1144,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2")))) + "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1190,7 +1173,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1199,7 +1182,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z")))) + "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1229,7 +1212,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1238,7 +1221,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32 - "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g")))) + "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1254,7 +1237,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -1262,7 +1245,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d")))) + (base32 "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1279,7 +1262,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1288,7 +1271,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32 - "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj")))) + "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1313,7 +1296,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1322,7 +1305,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp")))) + "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1352,7 +1335,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1361,7 +1344,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3")))) + "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1389,7 +1372,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1398,7 +1381,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7")))) + "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1419,7 +1402,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1428,7 +1411,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32 - "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim")))) + "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1464,7 +1447,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1473,7 +1456,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8")))) + "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1511,7 +1494,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1520,7 +1503,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi")))) + "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1547,7 +1530,7 @@ integrated it into your application's other widgets.") (define-public kcrash (package (name "kcrash") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1556,7 +1539,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32 - "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3")))) + "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1582,7 +1565,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1591,7 +1574,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl")))) + "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1639,7 +1622,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1648,7 +1631,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80")))) + "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1691,7 +1674,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1700,7 +1683,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4")))) + "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1745,7 +1728,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1754,7 +1737,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g")))) + "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1773,7 +1756,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1782,7 +1765,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9")))) + "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1819,7 +1802,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1828,7 +1811,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd")) + "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb")) ;; Default to: external paths/symlinks can be followed by a ;; package (patches (search-patches "kpackage-allow-external-paths.patch")))) @@ -1880,7 +1863,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1889,7 +1872,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg")))) + "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1917,7 +1900,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1926,7 +1909,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79")))) + "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1960,7 +1943,7 @@ gallons).") (define-public baloo (package (name "baloo") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1969,7 +1952,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph")))) + "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -2025,7 +2008,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2034,7 +2017,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32 - "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f")))) + "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2055,7 +2038,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2064,7 +2047,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53")))) + "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -2098,7 +2081,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2107,7 +2090,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q")))) + "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -2151,7 +2134,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2160,7 +2143,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz")))) + "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31")))) (build-system cmake-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -2201,7 +2184,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2210,7 +2193,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9")))) + "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2264,7 +2247,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2273,7 +2256,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc")))) + "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2297,7 +2280,7 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2306,7 +2289,7 @@ started on demand.") name "-" version ".tar.xz")) (sha256 (base32 - "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd")))) + "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2348,7 +2331,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2357,7 +2340,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k")))) + "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2379,7 +2362,7 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2388,7 +2371,7 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n")))) + "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2411,7 +2394,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2420,7 +2403,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32 - "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn")))) + "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2451,7 +2434,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2460,7 +2443,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl")))) + "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2495,7 +2478,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2504,7 +2487,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m")))) + "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2542,7 +2525,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2551,7 +2534,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95")) + "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch" @@ -2610,7 +2593,7 @@ makes starting KDE applications faster and reduces memory consumption.") (define-public kio (package (name "kio") - (version "5.49.0") + (version "5.54.1") (source (origin (method url-fetch) (uri (string-append @@ -2619,7 +2602,7 @@ makes starting KDE applications faster and reduces memory consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k")) + "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2642,6 +2625,7 @@ makes starting KDE applications faster and reduces memory consumption.") ("kauth" ,kauth) ("kcodecs" ,kcodecs) ("kconfigwidgets" ,kconfigwidgets) + ("kcrash" ,kcrash) ("kdbusaddons" ,kdbusaddons) ("kdoctools" ,kdoctools) ("kiconthemes" ,kiconthemes) @@ -2702,7 +2686,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2711,7 +2695,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk")))) + "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2758,7 +2742,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2767,7 +2751,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa")))) + "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2800,7 +2784,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2809,7 +2793,7 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k")))) + "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio) @@ -2817,8 +2801,7 @@ notifications which can be embedded in your application.") ("kxmlgui" ,kxmlgui))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("shared-mime-info" ,shared-mime-info) - )) + ("shared-mime-info" ,shared-mime-info))) (inputs `(("kauth" ,kauth) ("kbookmarks" ,kbookmarks) @@ -2853,7 +2836,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2862,7 +2845,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv")))) + "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2896,7 +2879,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2905,7 +2888,7 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19")))) + "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) @@ -2966,7 +2949,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2975,7 +2958,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z")))) + "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3025,7 +3008,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3034,7 +3017,7 @@ types or handled by application specific code.") name "-" version ".tar.xz")) (sha256 (base32 - "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj")))) + "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -3105,7 +3088,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3114,7 +3097,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1")))) + "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5")))) (build-system cmake-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -3152,7 +3135,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3161,7 +3144,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z")))) + "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3194,7 +3177,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3203,7 +3186,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa")))) + "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3246,7 +3229,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3255,7 +3238,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06")))) + "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -3289,7 +3272,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3298,7 +3281,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv")))) + "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) @@ -3386,7 +3369,7 @@ script engines.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3395,7 +3378,7 @@ script engines.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx")))) + "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3443,7 +3426,7 @@ workspace.") (define-public kdelibs4support (package (name "kdelibs4support") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3452,7 +3435,7 @@ workspace.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi")))) + (base32 "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -3559,7 +3542,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3568,7 +3551,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64")))) + (base32 "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3618,7 +3601,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3627,7 +3610,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0")))) + (base32 "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3651,7 +3634,7 @@ support.") (define-public kjsembed (package (name "kjsembed") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3660,7 +3643,7 @@ support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m")))) + (base32 "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3680,7 +3663,7 @@ QObjects, so you can script your applications.") (define-public kmediaplayer (package (name "kmediaplayer") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3689,7 +3672,7 @@ QObjects, so you can script your applications.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx")))) + (base32 "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3726,7 +3709,7 @@ KParts instead.") (define-public kross (package (name "kross") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3735,7 +3718,7 @@ KParts instead.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz")))) + (base32 "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm new file mode 100644 index 0000000000..8d9d0b7660 --- /dev/null +++ b/gnu/packages/kde-plasma.scm @@ -0,0 +1,228 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> +;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com> +;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.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 kde-plasma) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cmake) + #:use-module (gnu packages compression) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages glib) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages xorg)) + +(define-public kdecoration + (package + (name "kdecoration") + (version "5.14.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version + "/kdecoration-" version ".tar.xz")) + (sha256 + (base32 + "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("ki18n" ,ki18n) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) + (home-page "https://cgit.kde.org/kdecoration.git") + (synopsis "Plugin based library to create window decorations") + (description "KDecoration is a library to create window decorations. +These window decorations can be used by for example an X11 based window +manager which re-parents a Client window to a window decoration frame.") + (license license:lgpl3+))) + +(define-public kscreenlocker + (package + (name "kscreenlocker") + (version "5.14.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version + "/kscreenlocker-" version ".tar.xz")) + (sha256 + (base32 + "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key inputs outputs #:allow-other-keys) + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (setenv "DISPLAY" ":1") + #t)) + (delete 'check) + ;; Tests use the installed library and require a DBus session. + (add-after 'install 'check + (lambda _ + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (invoke "dbus-launch" "ctest" ".")))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config) + + ;; For tests. + ("dbus" ,dbus) + ("xorg-server" ,xorg-server))) + (inputs + `(("kcmutils" ,kcmutils) + ("kcrash" ,kcrash) + ("kdeclarative" ,kdeclarative) + ("kglobalaccel" ,kglobalaccel) + ("ki18n" ,ki18n) + ("kidletime" ,kidletime) + ("knotifications" ,knotifications) + ("ktextwidgets" ,ktextwidgets) + ("kwayland" ,kwayland) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libseccomp" ,libseccomp) ;for sandboxing the look'n'feel package + ("libxcursor" ,libxcursor) ;missing in CMakeList.txt + ("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices + ("linux-pam" ,linux-pam) + ("logind" ,elogind) ;optional loginctl support + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtx11extras" ,qtx11extras) + ("solid" ,solid) + ("wayland" ,wayland) + ("xcb-util-keysyms" ,xcb-util-keysyms))) + (home-page "https://cgit.kde.org/kscreenlocker.git") + (synopsis "Screen locking library") + (description + "@code{kscreenlocker} is a library for creating secure lock screens.") + (license license:gpl2+))) + +(define-public libkscreen + (package + (name "libkscreen") + (version "5.14.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1vyaml5ap9siw9idiny92li2bykd0nwjsmwmg0c7ad912j4g1s7y")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ;; For testing. + ("dbus" ,dbus))) + (inputs + `(("kwayland" ,kwayland) + ("libxrandr" ,libxrandr) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (arguments + '(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11 + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; For the missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + ;; Run the tests offscreen. + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") + (synopsis "KDE's screen management software") + (description "KScreen is the new screen management software for KDE Plasma +Workspaces which tries to be as magic and automatic as possible for users with +basic needs and easy to configure for those who want special setups.") + (license license:gpl2+))) + +(define-public libksysguard + (package + (name "libksysguard") + (version "5.14.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde//stable/plasma/" version + "/libksysguard-" version ".tar.xz")) + (sha256 + (base32 + "11nz0g7dqvpvgsv0a7sai445vgfsfi25plj7jb1i46n7zf8i8mya")))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("kconfigwidgets" ,kconfigwidgets) + ("kiconthemes" ,kiconthemes) + ("kwindowsystem" ,kwindowsystem) + ("ki18n" ,ki18n) + ("kauth" ,kauth) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kglobalaccel" ,kglobalaccel) + ("kio" ,kio) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kservice" ,kservice) + ("qtbase" ,qtbase) + ("qtscript" ,qtscript) + ("qtwebkit" ,qtwebkit) + ("qtx11extras" ,qtx11extras) + ("plasma" ,plasma-framework) + ("zlib" ,zlib))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + `(,(string-append "-DKDE_INSTALL_DATADIR=" + (assoc-ref %outputs "out") "/share")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-cmakelists + (lambda _ + ;; TODO: Verify: This should no longer be necessary, since + ;; KF5AuthConfig.cmake.in contains this already. + (substitute* "processcore/CMakeLists.txt" + (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR")))) + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (replace 'check + (lambda _ + ;; TODO: Fix this failing test-case + (invoke "ctest" "-E" "processtest")))))) + (home-page "https://www.kde.org/info/plasma-5.13.4.php") + (synopsis "Network enabled task and system monitoring") + (description "KSysGuard can obtain information on system load and +manage running processes. It obtains this information by interacting +with a ksysguardd daemon, which may also run on a remote system.") + (license license:gpl3+))) + diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 5946ba0b52..23078d00a0 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -36,11 +36,11 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) - #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-plasma) #:use-module (gnu packages llvm) #:use-module (gnu packages maths) #:use-module (gnu packages pdf) @@ -480,105 +480,6 @@ used in KDE development tools Kompare and KDevelop.") ;; source archive (license (list license:gpl2+ license:lgpl2.0+ license:bsd-3)))) -(define-public libkscreen - (package - (name "libkscreen") - (version "5.13.5") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma/" version "/" - name "-" version ".tar.xz")) - (sha256 - (base32 "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k")))) - (build-system cmake-build-system) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ;; For testing. - ("dbus" ,dbus))) - (inputs - `(("kwayland" ,kwayland) - ("libxrandr" ,libxrandr) - ("qtbase" ,qtbase) - ("qtx11extras" ,qtx11extras))) - (arguments - '(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11 - #:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; For the missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - ;; Run the tests offscreen. - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) - (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") - (synopsis "KDE's screen management software") - (description "KScreen is the new screen management software for KDE Plasma -Workspaces which tries to be as magic and automatic as possible for users with -basic needs and easy to configure for those who want special setups.") - (license license:gpl2+))) - -(define-public libksysguard - (package - (name "libksysguard") - (version "5.13.4") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde//stable/plasma/" version - "/libksysguard-" version ".tar.xz")) - (sha256 - (base32 - "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh")))) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) - (inputs - `(("kconfigwidgets" ,kconfigwidgets) - ("kiconthemes" ,kiconthemes) - ("kwindowsystem" ,kwindowsystem) - ("ki18n" ,ki18n) - ("kauth" ,kauth) - ("kcompletion" ,kcompletion) - ("kconfig" ,kconfig) - ("kcoreaddons" ,kcoreaddons) - ("kwidgetsaddons" ,kwidgetsaddons) - ("kservice" ,kservice) - ("qtbase" ,qtbase) - ("qtscript" ,qtscript) - ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) - ("plasma" ,plasma-framework) - ("zlib" ,zlib))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - `(,(string-append "-DKDE_INSTALL_DATADIR=" - (assoc-ref %outputs "out") "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-cmakelists - (lambda _ - ;; TODO: Verify: This should no longer be necessary, since - ;; KF5AuthConfig.cmake.in contains this already. - (substitute* "processcore/CMakeLists.txt" - (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR")))) - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen"))) - (replace 'check - (lambda _ - ;; TODO: Fix this failing test-case - (invoke "ctest" "-E" "processtest")))))) - (home-page "https://www.kde.org/info/plasma-5.13.4.php") - (synopsis "Network enabled task and system monitoring") - (description "KSysGuard can obtain information on system load and -manage running processes. It obtains this information by interacting -with a ksysguardd daemon, which may also run on a remote system.") - (license license:gpl3+))) - (define-public qca (package (name "qca") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7c242015e..47b07340b8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> @@ -413,8 +413,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "4.20.7") -(define %linux-libre-hash "05jbpg4ivcbr8xi5ki03f4n57hnhc52nfjk1ik8czag7f4ph9v0b") +(define %linux-libre-version "4.20.8") +(define %linux-libre-hash "0qhwavylmkqqd84dym87ajzwnxc6rjpdijw7kbriqjmgjfsmf8sw") (define %linux-libre-4.20-patches (list %boot-logo-patch @@ -427,8 +427,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.20-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.20") -(define %linux-libre-4.19-hash "1rs4jvp88n23n9a6f037sn498fzl1fn96zsjjmjngb8nmjr1y9vp") +(define %linux-libre-4.19-version "4.19.21") +(define %linux-libre-4.19-hash "064vwfkcmc8ad37m1ziqc14vhvx3mba12rc9220xng3a48gwpi2m") (define %linux-libre-4.19-patches (list %boot-logo-patch @@ -441,8 +441,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.98") -(define %linux-libre-4.14-hash "165wlqqpb16zhrwihsb75y153xyz8q5dbi14xim7jsnvwlbh5i79") +(define %linux-libre-4.14-version "4.14.99") +(define %linux-libre-4.14-hash "1d9h4l22j3jy1bkq8i4g6axwpq04jbsys4bg6bx8sbl590c9lrwx") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version @@ -451,8 +451,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.155" - "0fyj8dqhpqi3jh6i58avyvmg4mp9bplnpiffpp3fdka4v85lx152" + (make-linux-libre "4.9.156" + "1ipmn5axlhfsfzqvwwyv7scrvfja39w7v68cnvbqiaq8fkjgffxg" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) @@ -3031,7 +3031,7 @@ arrays when needed.") (define-public multipath-tools (package (name "multipath-tools") - (version "0.7.7") + (version "0.7.9") (source (origin (method url-fetch) (uri (string-append "https://git.opensvc.com/?p=multipath-tools/" @@ -3039,7 +3039,7 @@ arrays when needed.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lirhjjv37jnf42r1ylrhi8kbzx9j9xnyfzvxpp6bzcp0fawigig")) + "1jhi6bhl4ih75rfmyyjxd35ghgch5ls1gw40cjxwy9d6bd41z6q1")) (modules '((guix build utils))) (snippet '(begin @@ -3077,7 +3077,7 @@ arrays when needed.") (("/usr/include/libudev.h") (string-append udev "/include/libudev.h"))) #t))) - (delete 'configure)))) + (delete 'configure)))) ; no configure script (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -3102,7 +3102,7 @@ Linux Device Mapper multipathing driver: @code{dm} multipath devices. @item @command{kpartx} - Create device maps from partition tables. @end enumerate") - (license (list license:gpl2+ ; Main distribution. + (license (list license:gpl2+ ; main distribution license:lgpl2.0+)))) ; libmpathcmd/mpath_cmd.h (define-public libaio diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index b3d32c284f..a37d2a1dd5 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -43,8 +43,8 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image) - #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-plasma) #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages lxde) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8ae069ba52..2c06519e1f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> @@ -1066,7 +1066,7 @@ which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.2") + (version "1.8.3") (source (origin (method url-fetch) @@ -1074,7 +1074,7 @@ which can add many functionalities to the base client.") "/msmtp-" version ".tar.xz")) (sha256 (base32 - "14w7lmw1jxlganfk089b0ib23y5917mxbg3xqpid007dd4cmq66i")))) + "1d4jdgrx4czp66nnwdsy938lzr4llhwyy0715pwg0j6h6gyyxciw")))) (build-system gnu-build-system) (inputs `(("libsecret" ,libsecret) @@ -1200,15 +1200,16 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.3.4") + (version "2.3.4.1") (source (origin (method url-fetch) (uri (string-append "https://www.dovecot.org/releases/" (version-major+minor version) "/" name "-" version ".tar.gz")) - (sha256 (base32 - "01ggzf7b3jpl89mjiqr7xbpbs181g2gjf6wzg70qaqfzz3ppc6yr")))) + (sha256 + (base32 + "01xa8d08c0j51w5kmqb3vnzrvh17hkzx5a5p7fb5hgn3wln3x1xq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1729,27 +1730,23 @@ maintained.") (define-public khard (package (name "khard") - (version "0.12.2") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "01y52qmab4cw9wmx87aahnxbyaxrxw8j2wx06mpcqsfvgk8d54wi")))) + "1lyjiskc6ckjjylzr04dnm66p3cnn7vlysw9c27qls3y3ywx14zw")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/khard"))) - (copy-recursively "misc/khard" doc) - #t)))) - ;; Tests are currently only runnable without preexisting data on - ;; the development branch: - ;; https://github.com/scheibler/khard/issues/176 - #:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/khard"))) + (copy-recursively "misc/khard" doc) + #t)))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-configobj" ,python-configobj) @@ -2596,14 +2593,14 @@ servers. The 4rev1 and 4 versions of IMAP are supported.") (define-public urlscan (package (name "urlscan") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (pypi-uri "urlscan" version)) (sha256 (base32 - "0vpdyrx51sg9a8kswa7ibbcgcpvc7r03aq8x4n4c7v2xg0v3c7wb")))) + "1zldck7vnp7z04aacbx3cprf5kzha4gfhjmss4iv2lh5nccxjfzx")))) (build-system python-build-system) (propagated-inputs `(("python-urwid" ,python-urwid))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 34c72dadad..ace7765c5d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org> -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> @@ -584,7 +584,8 @@ problems in numerical linear algebra.") version ".tgz")) (sha256 (base32 - "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c")))) + "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c")) + (patches (search-patches "scalapack-blacs-mpi-deprecations.patch")))) (build-system cmake-build-system) (inputs `(("mpi" ,openmpi) @@ -1635,7 +1636,7 @@ September 2004}") (define-public petsc (package (name "petsc") - (version "3.10.2") + (version "3.10.3") (source (origin (method url-fetch) @@ -1643,7 +1644,7 @@ September 2004}") (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" "petsc-lite-" version ".tar.gz")) (sha256 - (base32 "0bl64pydak3rblnjffi482r8bin4xim9sb37ksl2jkcxf0i0irsi")))) + (base32 "10p9ap1rp6k8k2g8zdc505kdlsc3976fjymyp393sccjapm50dph")))) (outputs '("out" ;libraries and headers "examples")) ;~30MiB of examples (build-system gnu-build-system) @@ -3973,6 +3974,96 @@ as equations, scalars, vectors, and matrices.") theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.") (license license:expat))) +(define-public elpa + (package + (name "elpa") + (version "2018.11.001") + (source (origin + (method url-fetch) + (uri (string-append "http://elpa.mpcdf.mpg.de/html/Releases/" + version "/elpa-" version ".tar.gz")) + (sha256 + (base32 + "05hv3v5i6xmziaizw350ff72y1c3k662r85fm3xfdrkclj5zw9yc")))) + (build-system gnu-build-system) + (native-inputs + `(("fortran" ,gfortran) + ("perl" ,perl))) ;for configure and deps + (inputs + `(("blas" ,openblas))) + (arguments + `(#:configure-flags + `("--enable-openmp" + "--with-mpi=no" + ;; ELPA unfortunately does not support runtime dispatch, so we can + ;; only enable the "generic" kernels. See the "Cross compilation" + ;; section of INSTALL.md. + "--enable-generic" + "--disable-sse" "--disable-sse-assembly" ;Require SSE3 + "--disable-avx" "--disable-avx2" "--disable-avx512" + ,(string-append "CFLAGS=-O3 " + "-funsafe-loop-optimizations -funsafe-math-optimizations " + "-ftree-vect-loop-version -ftree-vectorize " + ,(let ((system (or (%current-target-system) + (%current-system)))) + (cond + ((or (string-prefix? "x86_64" system) + (string-prefix? "i686" system)) + "-msse2") + (else ""))))) + #:parallel-tests? #f ;tests are multi-threaded, via BLAS + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-header-generation + (lambda _ + (substitute* "configure" + (("^ *make.*top_srcdir=\"\\$srcdir\"" &) + (string-append & " CPP=\"$CPP\""))) + #t)) + (add-before 'check 'setup-tests + (lambda _ + ;; Decrease test time and RAM use by computing fewer eigenvalues. + ;; The flags are (MATRIX-SIZE, EIGENVALUES, BLOCK-SIZE), where + ;; the default is (500, 250, 16) for C tests and (5000, 150, 16) + ;; for Fortran. This also causes several tests to pass that + ;; otherwise would otherwise fail with matrix size 5000; possibly + ;; due to floating point tolerances that are too tight. + (setenv "TEST_FLAGS" "1500 50 16") ;from elpa.spec + (setenv "OMP_NUM_THREADS" (number->string (parallel-job-count))) + (substitute* "Makefile" + ;; Test scripts are generated, patch the shebang + (("#!/bin/bash") (string-append "#!" (which "sh")))) + #t))))) + (home-page "http://elpa.mpcdf.mpg.de") + (synopsis "Eigenvalue solvers for symmetric matrices") + (description + "The ELPA library provides efficient and scalable direct eigensolvers for +symmetric matrices.") + (license license:lgpl3))) + +(define-public elpa-openmpi + (package (inherit elpa) + (name "elpa-openmpi") + (inputs + `(("mpi" ,openmpi) + ("scalapack" ,scalapack) + ,@(package-inputs elpa))) + (arguments + (substitute-keyword-arguments (package-arguments elpa) + ((#:configure-flags cf '()) + `(cons "--with-mpi=yes" (delete "--with-mpi=no" ,cf))) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'mpi-setup + (lambda _ + ;; Tests use 2 mpi tasks by default, use our remaining build + ;; cores as OpenMP threads. + (setenv "OMP_NUM_THREADS" (number->string + (max (quotient (parallel-job-count) 2) + 1))) + (,%openmpi-setup))))))) + (synopsis "Eigenvalue solvers for symmetric matrices (with MPI support)"))) + (define-public elemental (package (name "elemental") diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5379eb9166..2d7d54dd9d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2019 Tobias Geerinckx-Rite <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system ant) #:use-module (gnu packages) @@ -79,12 +81,14 @@ provides the Maven plugin generating the component metadata."))) (name "maven-resolver-api") (version "1.3.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/apache/maven-resolver/" - "archive/maven-resolver-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/maven-resolver.git") + (commit (string-append "maven-resolver-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0gfkf8g5zbjh6ciq3dnby9m5irhrbyc7d2jzic9l8xx6hl61q6mm")))) + "1x1gll8nkfl6zgnab78fxxvvhg42b2grxgdh1wp2h4qxsjkxg93d")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-resolver-api.jar" diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d8ec64f6c3..1991528a53 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1238,7 +1238,7 @@ with several different talk daemons at the same time.") (define-public gloox (package (name "gloox") - (version "1.0.21") + (version "1.0.22") (source (origin (method url-fetch) @@ -1246,7 +1246,7 @@ with several different talk daemons at the same time.") version ".tar.bz2")) (sha256 (base32 - "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw")))) + "0r69gq8if9yy1amjzl7qrq9lzhhna7qgz905ln4wvkwchha1ppja")))) (build-system gnu-build-system) (inputs `(("libidn" ,libidn) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index bf12239a02..7885e21aa4 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> -;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> +;;; Copyright © 2016, 2018, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -91,7 +91,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.20.23") + (version "0.21.4") (source (origin (method url-fetch) (uri @@ -100,18 +100,19 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1smg6hab4kwrzsw1k7vlpya3ampdk8psnmkrzxlgb43j4fgmygjh")))) - (build-system gnu-build-system) + "1ix52vfa8k8my4xyr8b0phg8605b2xchyzyva908m08vpzm14w94")))) + (build-system meson-build-system) (arguments - `(#:phases + `(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'... + #:phases (modify-phases %standard-phases - (add-after 'install 'install-service-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (systemd (string-append out "/etc/systemd/system")) - (systemd-user (string-append out "/etc/systemd/user"))) - (install-file "systemd/system/mpd.service" systemd) - (install-file "systemd/user/mpd.service" systemd-user) + (add-before 'configure 'expand-C++-include-path + ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((path "CPLUS_INCLUDE_PATH") + (gcc (assoc-ref inputs "gcc")) + (c++ (string-append gcc "/include/c++"))) + (setenv path (string-append c++ ":" (getenv path))) #t)))))) (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) @@ -134,7 +135,11 @@ interfacing MPD in the C, C++ & Objective C languages.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("zlib" ,zlib))) - (native-inputs `(("pkg-config" ,pkg-config))) + ;; MPD > 0.21 requires > GCC 6 + (native-inputs `(("gcc" ,gcc-8) + ("gcc-lib" ,gcc-8 "lib") + ("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx))) ;; Missing optional inputs: ;; libyajl ;; libcdio_paranoia diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c4333364e1..f1733b7ae1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3374,7 +3374,7 @@ plugins, a switch trigger, a toggle switch, and a peakmeter.") ("python-rdflib" ,python-rdflib) ("python" ,python) ("jack" ,jack-1) - ("lv2" ,lv2-devel) + ("lv2" ,lv2) ("lilv" ,lilv) ("raul" ,raul-devel) ("ganv" ,ganv-devel) diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index e5246660a2..9c0e970257 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -135,7 +135,9 @@ ;; 'gsc', so look for that instead. (substitute* "converter/other/pstopnm.c" (("\"%s/gs\"") - "\"%s/gsc\""))) + "\"%s/gsc\"") + (("/usr/bin/gs") + (string-append (assoc-ref inputs "ghostscript") "/bin/gsc")))) #t)) (add-before 'check 'setup-check (lambda _ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c71ae4a24d..d73b6f1108 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> -;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> +;;; Copyright © 2017, 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2018 Adam Van Ymeren <adam@vany.ca> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> @@ -98,6 +98,7 @@ #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) + #:use-module (gnu packages web) #:use-module (gnu packages wm) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) @@ -1401,7 +1402,7 @@ procedure calls (RPCs).") (define-public openvswitch (package (name "openvswitch") - (version "2.8.1") + (version "2.10.1") (source (origin (method url-fetch) (uri (string-append @@ -1409,7 +1410,7 @@ procedure calls (RPCs).") version ".tar.gz")) (sha256 (base32 - "14rqqhfyv49irz8ag0qbv9jn8z0bn3qzxir3r074y16p4sg4674d")))) + "103wi6k8xal0z1pyy680gms56skagh6jawa2ja588ljr55jcg4sg")))) (build-system gnu-build-system) (arguments '(;; FIXME: many tests fail with: @@ -2367,3 +2368,31 @@ communication over HTTP.") be used to manage peer-to-peer network connections as needed for real time communication.") (license license:gpl3+))) + +(define-public frrouting + (package + (name "frrouting") + (version "6.0.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/FRRouting/frr/releases/" + "download/frr-" version "/frr-" version + ".tar.xz")) + (sha256 + (base32 + "0xfrvi62w8qlh46f504ka0skb7pm0g0p8vmdng4w90gsbirlzpdd")))) + (build-system gnu-build-system) + (inputs + `(("c-ares" ,c-ares) + ("json-c" ,json-c) + ("readline" ,readline))) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("python-pytest" ,python-pytest))) + (home-page "https://frrouting.org/") + (synopsis "IP routing protocol suite") + (description "FRRouting (FRR) is an IP routing protocol suite which includes +protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ") + (license license:gpl2+))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 07fcf92aea..5101cc6b0a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4683,6 +4683,110 @@ in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) +(define-public ocaml-bindlib + (package + (name "ocaml-bindlib") + (version "5.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rlepigre/ocaml-bindlib.git") + (commit (string-append "ocaml-bindlib_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1f8kr81w8vsi4gv61xn1qbc6zrzkjp8l9ix0942vjh4gjxc74v75")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f ;no tests + #:use-make? #t + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make"))) + (replace 'install + (lambda _ + (invoke "make" "install")))))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("ocaml-findlib" ,ocaml-findlib))) + (home-page "https://rlepigre.github.io/ocaml-bindlib/") + (synopsis "OCaml Bindlib library for bound variables") + (description "Bindlib is a library allowing the manipulation of data +structures with bound variables. It is particularly useful when writing ASTs +for programming languages, but also for manipulating terms of the λ-calculus +or quantified formulas.") + (license license:gpl3+))) + +(define-public ocaml-earley + (package + (name "ocaml-earley") + (version "2.0.0") + (home-page "https://github.com/rlepigre/ocaml-earley") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18k7bi7krc4bvqnhijz1q0pfr0nfahghfjifci8rh1q4i5zd0xz5")))) + (build-system dune-build-system) + (arguments + `(#:test-target ".")) + (synopsis "Parsing library based on Earley Algorithm") + (description "Earley is a parser combinator library base on Earley's +algorithm. It is intended to be used in conjunction with an OCaml syntax +extension which allows the definition of parsers inside the language. There +is also support for writing OCaml syntax extensions in a camlp4 style.") + (license license:cecill-b))) + +(define-public ocaml-timed + (package + (name "ocaml-timed") + (version "1.0") + (home-page "https://github.com/rlepigre/ocaml-timed") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit (string-append name "_" version)))) + (sha256 + (base32 + "0hfxz710faxy5yk97bkfnw87r732jcxxhmjppwrbfdb6pd0wks96")) + (file-name (git-file-name name version)))) + (build-system ocaml-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make"))) + (replace 'install + (lambda _ + (invoke "make" "install"))) + (replace 'check + (lambda _ + (invoke "make" "tests")))))) + (synopsis "Timed references for imperative state") + (description "Timed references for imperative state. This module provides +an alternative type for references (or mutable cells) supporting undo/redo +operations. In particular, an abstract notion of time is used to capture the +state of the references at any given point, so that it can be restored. Note +that usual reference operations only have a constant time / memory overhead +(compared to those of the standard library). + +Moreover, we provide an alternative implementation based on the references +of the standard library (Pervasives module). However, it is less efficient +than the first one.") + (license license:expat))) + (define-public ocaml-biniou (package (name "ocaml-biniou") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2e69cd151e..af9667cd91 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -107,8 +107,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "4bddd12ad540d45a33a5f9f129b896843dca603f") - (revision 9)) + (commit "2637cfd7a4894ef2a2a7da3bb46d8815c43d7e75") + (revision 10)) (package (name "guix") @@ -124,7 +124,7 @@ (commit commit))) (sha256 (base32 - "1abn4ghb25kn0cmr9dbb3q3fxdcc0g2fnnmbrykxv111s6ahdmlw")) + "1m734gm45x9czqspsagdfxfgw5wiiinyq1s6zc9gfv7d3b2w472k")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -541,13 +541,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "106") + (version "111") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0qrfp7nha2n2s9h5ibcf7rqji1amh4cqbcf80m6anim6p3ik26da")))) + "0sgqx3n0ny75bvcw10pfx61z67mdk5hx3mblw4gqnn2h9vc74qz1")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -952,7 +952,7 @@ the bootloader configuration.") (define-public flatpak (package (name "flatpak") - (version "1.2.0") + (version "1.2.3") (source (origin (method url-fetch) @@ -960,7 +960,7 @@ the bootloader configuration.") version "/flatpak-" version ".tar.xz")) (sha256 (base32 - "1bdk6qmsvy4d80245x1si9qvrga2f2yalj9qfmf1lqj5ljxxxifv")))) + "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;; Tests fail due to trying to create files where it can't. diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 25d3c0737c..c024c5ceae 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; ;;; This file is part of GNU Guix. @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20181222") + (version "20190122") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "0sd39nzgff3rpyzfwkffb5yxbdm5r6amrkslbgpjlrcrymy9z305")))) + "030rjhis8s47gkm05k4vc9p886cxvadpgzs8rqmgzvlc38h5ywxf")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/glibc-CVE-2018-11236.patch b/gnu/packages/patches/glibc-CVE-2018-11236.patch new file mode 100644 index 0000000000..4f8a72943c --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2018-11236.patch @@ -0,0 +1,149 @@ +https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=5460617d1567657621107d895ee2dd83bc1f88f2 +with ChangeLog removed + +From 5460617d1567657621107d895ee2dd83bc1f88f2 Mon Sep 17 00:00:00 2001 +From: Paul Pluzhnikov <ppluzhnikov@google.com> +Date: Tue, 8 May 2018 18:12:41 -0700 +Subject: [PATCH] Fix BZ 22786: integer addition overflow may cause stack + buffer overflow when realpath() input length is close to SSIZE_MAX. + +2018-05-09 Paul Pluzhnikov <ppluzhnikov@google.com> + + [BZ #22786] + * stdlib/canonicalize.c (__realpath): Fix overflow in path length + computation. + * stdlib/Makefile (test-bz22786): New test. + * stdlib/test-bz22786.c: New test. +--- + ChangeLog | 8 +++++ + stdlib/Makefile | 2 +- + stdlib/canonicalize.c | 2 +- + stdlib/test-bz22786.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 100 insertions(+), 2 deletions(-) + create mode 100644 stdlib/test-bz22786.c + +diff --git a/stdlib/Makefile b/stdlib/Makefile +index af1643c..1ddb1f9 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -84,7 +84,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ + tst-cxa_atexit tst-on_exit test-atexit-race \ + test-at_quick_exit-race test-cxa_atexit-race \ + test-on_exit-race test-dlclose-exit-race \ +- tst-makecontext-align ++ tst-makecontext-align test-bz22786 + + tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ + tst-tls-atexit tst-tls-atexit-nodelete +diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c +index 4135f3f..390fb43 100644 +--- a/stdlib/canonicalize.c ++++ b/stdlib/canonicalize.c +@@ -181,7 +181,7 @@ __realpath (const char *name, char *resolved) + extra_buf = __alloca (path_max); + + len = strlen (end); +- if ((long int) (n + len) >= path_max) ++ if (path_max - n <= len) + { + __set_errno (ENAMETOOLONG); + goto error; +diff --git a/stdlib/test-bz22786.c b/stdlib/test-bz22786.c +new file mode 100644 +index 0000000..e7837f9 +--- /dev/null ++++ b/stdlib/test-bz22786.c +@@ -0,0 +1,90 @@ ++/* Bug 22786: test for buffer overflow in realpath. ++ Copyright (C) 2018 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ ++/* This file must be run from within a directory called "stdlib". */ ++ ++#include <errno.h> ++#include <limits.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <unistd.h> ++#include <sys/stat.h> ++#include <sys/types.h> ++#include <support/test-driver.h> ++#include <libc-diag.h> ++ ++static int ++do_test (void) ++{ ++ const char dir[] = "bz22786"; ++ const char lnk[] = "bz22786/symlink"; ++ ++ rmdir (dir); ++ if (mkdir (dir, 0755) != 0 && errno != EEXIST) ++ { ++ printf ("mkdir %s: %m\n", dir); ++ return EXIT_FAILURE; ++ } ++ if (symlink (".", lnk) != 0 && errno != EEXIST) ++ { ++ printf ("symlink (%s, %s): %m\n", dir, lnk); ++ return EXIT_FAILURE; ++ } ++ ++ const size_t path_len = (size_t) INT_MAX + 1; ++ ++ DIAG_PUSH_NEEDS_COMMENT; ++#if __GNUC_PREREQ (7, 0) ++ /* GCC 7 warns about too-large allocations; here we need such ++ allocation to succeed for the test to work. */ ++ DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); ++#endif ++ char *path = malloc (path_len); ++ DIAG_POP_NEEDS_COMMENT; ++ ++ if (path == NULL) ++ { ++ printf ("malloc (%zu): %m\n", path_len); ++ return EXIT_UNSUPPORTED; ++ } ++ ++ /* Construct very long path = "bz22786/symlink/aaaa....." */ ++ char *p = mempcpy (path, lnk, sizeof (lnk) - 1); ++ *(p++) = '/'; ++ memset (p, 'a', path_len - (path - p) - 2); ++ p[path_len - (path - p) - 1] = '\0'; ++ ++ /* This call crashes before the fix for bz22786 on 32-bit platforms. */ ++ p = realpath (path, NULL); ++ ++ if (p != NULL || errno != ENAMETOOLONG) ++ { ++ printf ("realpath: %s (%m)", p); ++ return EXIT_FAILURE; ++ } ++ ++ /* Cleanup. */ ++ unlink (lnk); ++ rmdir (dir); ++ ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test ++#include <support/test-driver.c> +-- +2.9.3 + diff --git a/gnu/packages/patches/glibc-CVE-2018-11237.patch b/gnu/packages/patches/glibc-CVE-2018-11237.patch new file mode 100644 index 0000000000..8a7c604ecd --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2018-11237.patch @@ -0,0 +1,55 @@ +https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=9aaaab7c6e4176e61c59b0a63c6ba906d875dc0e +with the ChangeLog removed + +From 9aaaab7c6e4176e61c59b0a63c6ba906d875dc0e Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@suse.de> +Date: Tue, 22 May 2018 10:37:59 +0200 +Subject: [PATCH] Don't write beyond destination in + __mempcpy_avx512_no_vzeroupper (bug 23196) + +When compiled as mempcpy, the return value is the end of the destination +buffer, thus it cannot be used to refer to the start of it. +--- + ChangeLog | 9 +++++++++ + string/test-mempcpy.c | 1 + + sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S | 5 +++-- + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/string/test-mempcpy.c b/string/test-mempcpy.c +index c08fba8..d98ecdd 100644 +--- a/string/test-mempcpy.c ++++ b/string/test-mempcpy.c +@@ -18,6 +18,7 @@ + <http://www.gnu.org/licenses/>. */ + + #define MEMCPY_RESULT(dst, len) (dst) + (len) ++#define MIN_PAGE_SIZE 131072 + #define TEST_MAIN + #define TEST_NAME "mempcpy" + #include "test-string.h" +diff --git a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S +index 23c0f7a..effc3ac 100644 +--- a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S ++++ b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S +@@ -336,6 +336,7 @@ L(preloop_large): + vmovups (%rsi), %zmm4 + vmovups 0x40(%rsi), %zmm5 + ++ mov %rdi, %r11 + /* Align destination for access with non-temporal stores in the loop. */ + mov %rdi, %r8 + and $-0x80, %rdi +@@ -366,8 +367,8 @@ L(gobble_256bytes_nt_loop): + cmp $256, %rdx + ja L(gobble_256bytes_nt_loop) + sfence +- vmovups %zmm4, (%rax) +- vmovups %zmm5, 0x40(%rax) ++ vmovups %zmm4, (%r11) ++ vmovups %zmm5, 0x40(%r11) + jmp L(check) + + L(preloop_large_bkw): +-- +2.9.3 + diff --git a/gnu/packages/patches/gnome-shell-theme.patch b/gnu/packages/patches/gnome-shell-theme.patch new file mode 100644 index 0000000000..fc7f7caf0f --- /dev/null +++ b/gnu/packages/patches/gnome-shell-theme.patch @@ -0,0 +1,53 @@ +Adjust GNOME-Shell so that it uses a Guix theme by default. + +Patch by Ludovic Courtès <ludo@gnu.org>. + +diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml +index 76aeaa5..8eaf32e 100644 +--- a/data/gnome-shell-theme.gresource.xml ++++ b/data/gnome-shell-theme.gresource.xml +@@ -22,6 +22,8 @@ + <file>no-events.svg</file> + <file>no-notifications.svg</file> + <file>noise-texture.png</file> ++ <file>guix-background.png</file> ++ <file>guix-logo.png</file> + <file>pad-osd.css</file> + <file>page-indicator-active.svg</file> + <file>page-indicator-inactive.svg</file> +diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss +index 54d9f39..b9badd0 100644 +--- a/data/theme/gnome-shell-sass/_common.scss ++++ b/data/theme/gnome-shell-sass/_common.scss +@@ -1742,7 +1742,16 @@ $legacy_icon_size: 24px; + + } + +- .login-dialog-logo-bin { padding: 24px 0px; } ++ .login-dialog-logo-bin { ++ /* Make it a bit narrower than .login-dialog-user-list. */ ++ width: 12em; ++ height: 8em; ++ background: url(resource:///org/gnome/shell/theme/guix-logo.png); ++ background-color: transparent; ++ background-repeat: no-repeat; ++ background-size: contain; ++ background-position: center; } ++ + .login-dialog-banner { color: darken($osd_fg_color,10%); } + .login-dialog-button-box { spacing: 5px; } + .login-dialog-message-warning { color: $warning_color; } +@@ -1889,9 +1898,10 @@ $legacy_icon_size: 24px; + } + + #lockDialogGroup { +- background: #2e3436 url(resource:///org/gnome/shell/theme/noise-texture.png); +- background-repeat: repeat; +-} ++ background: #2e3436 url(resource:///org/gnome/shell/theme/guix-background.png); ++ background-repeat: no-repeat; ++ background-size: cover; ++ background-position: center; } + + #screenShieldNotifications { + StButton#vhandle, StButton#hhandle { diff --git a/gnu/packages/patches/kio-search-smbd-on-PATH.patch b/gnu/packages/patches/kio-search-smbd-on-PATH.patch index 47e20cfc0b..55535ffa11 100644 --- a/gnu/packages/patches/kio-search-smbd-on-PATH.patch +++ b/gnu/packages/patches/kio-search-smbd-on-PATH.patch @@ -16,7 +16,7 @@ pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch + QLatin1Char pathSep(':'); + QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); + for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { -+ it->append("/smbd"); ++ it->append(QStringLiteral("/smbd")); + if (QFile::exists(*it)) { + return true; + } diff --git a/gnu/packages/patches/ledger-revert-boost-python-fix.patch b/gnu/packages/patches/ledger-revert-boost-python-fix.patch deleted file mode 100644 index 99f48f6e46..0000000000 --- a/gnu/packages/patches/ledger-revert-boost-python-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 01220484f428a447e9b00e071a0d85185f30e1de Mon Sep 17 00:00:00 2001 -From: Alexis Hildebrandt <afh@surryhill.net> -Date: Wed, 22 Jun 2016 15:43:37 +0200 -Subject: [PATCH] Revert "[python] Add fix for Boost.Python compile errors" - -This reverts commit 11590e134eafa768ccc4a171cc7fb216e906095f. ---- - src/py_commodity.cc | 3 --- - src/py_journal.cc | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/src/py_commodity.cc b/src/py_commodity.cc -index 5aafa6c..c457e64 100644 ---- a/src/py_commodity.cc -+++ b/src/py_commodity.cc -@@ -243,9 +243,6 @@ namespace { - - void export_commodity() - { --#if BOOST_VERSION >= 106000 -- python::register_ptr_to_python< shared_ptr<commodity_pool_t> >(); --#endif - class_< commodity_pool_t, shared_ptr<commodity_pool_t>, - boost::noncopyable > ("CommodityPool", no_init) - .add_property("null_commodity", -diff --git a/src/py_journal.cc b/src/py_journal.cc -index c1c38a9..879f954 100644 ---- a/src/py_journal.cc -+++ b/src/py_journal.cc -@@ -232,9 +232,6 @@ void export_journal() - boost::noncopyable >("PostHandler") - ; - --#if BOOST_VERSION >= 106000 -- python::register_ptr_to_python< shared_ptr<collector_wrapper> >(); --#endif - class_< collector_wrapper, shared_ptr<collector_wrapper>, - boost::noncopyable >("PostCollectorWrapper", no_init) - .def("__len__", &collector_wrapper::length) diff --git a/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch new file mode 100644 index 0000000000..573920cb99 --- /dev/null +++ b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch @@ -0,0 +1,52 @@ +From b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4 Mon Sep 17 00:00:00 2001 +From: Lee Salzman <lsalzman@gmail.com> +Date: Tue, 12 Sep 2017 14:45:10 -0400 +Subject: [PATCH] remove gamma name hack + +--- + src/engine/main.cpp | 6 +++--- + src/shared/cube.h | 8 -------- + 2 files changed, 3 insertions(+), 11 deletions(-) + +diff --git a/src/engine/main.cpp b/src/engine/main.cpp +index 1032004d..77c9233a 100644 +--- a/src/engine/main.cpp ++++ b/src/engine/main.cpp +@@ -278,10 +278,10 @@ static void setgamma(int val) + } + + static int curgamma = 100; +-VARF(IDF_PERSIST, gamma, 30, 100, 300, ++VARFN(IDF_PERSIST, gamma, reqgamma, 30, 100, 300, + { +- if(initing || gamma == curgamma) return; +- curgamma = gamma; ++ if(initing || reqgamma == curgamma) return; ++ curgamma = reqgamma; + setgamma(curgamma); + }); + +diff --git a/src/shared/cube.h b/src/shared/cube.h +index 3864c492..7ff5e267 100644 +--- a/src/shared/cube.h ++++ b/src/shared/cube.h +@@ -3,19 +3,11 @@ + + #define _FILE_OFFSET_BITS 64 + +-#ifdef __GNUC__ +-#define gamma __gamma +-#endif +- + #ifdef WIN32 + #define _USE_MATH_DEFINES + #endif + #include <math.h> + +-#ifdef __GNUC__ +-#undef gamma +-#endif +- + #include <string.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/gnu/packages/patches/runc-CVE-2019-5736.patch b/gnu/packages/patches/runc-CVE-2019-5736.patch new file mode 100644 index 0000000000..f629fcbfb4 --- /dev/null +++ b/gnu/packages/patches/runc-CVE-2019-5736.patch @@ -0,0 +1,343 @@ +Fix CVE-2019-5736: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736 +https://seclists.org/oss-sec/2019/q1/119 + +Patch copied from upstream source repository: + +https://github.com/opencontainers/runc/commit/0a8e4117e7f715d5fbeef398405813ce8e88558b + +From 0a8e4117e7f715d5fbeef398405813ce8e88558b Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai <asarai@suse.de> +Date: Wed, 9 Jan 2019 13:40:01 +1100 +Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary + to container + +There are quite a few circumstances where /proc/self/exe pointing to a +pretty important container binary is a _bad_ thing, so to avoid this we +have to make a copy (preferably doing self-clean-up and not being +writeable). + +We require memfd_create(2) -- though there is an O_TMPFILE fallback -- +but we can always extend this to use a scratch MNT_DETACH overlayfs or +tmpfs. The main downside to this approach is no page-cache sharing for +the runc binary (which overlayfs would give us) but this is far less +complicated. + +This is only done during nsenter so that it happens transparently to the +Go code, and any libcontainer users benefit from it. This also makes +ExtraFiles and --preserve-fds handling trivial (because we don't need to +worry about it). + +Fixes: CVE-2019-5736 +Co-developed-by: Christian Brauner <christian.brauner@ubuntu.com> +Signed-off-by: Aleksa Sarai <asarai@suse.de> +--- + libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++ + libcontainer/nsenter/nsexec.c | 11 ++ + 2 files changed, 279 insertions(+) + create mode 100644 libcontainer/nsenter/cloned_binary.c + +diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c +new file mode 100644 +index 000000000..c8a42c23f +--- /dev/null ++++ b/libcontainer/nsenter/cloned_binary.c +@@ -0,0 +1,268 @@ ++/* ++ * Copyright (C) 2019 Aleksa Sarai <cyphar@cyphar.com> ++ * Copyright (C) 2019 SUSE LLC ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#define _GNU_SOURCE ++#include <unistd.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <stdbool.h> ++#include <string.h> ++#include <limits.h> ++#include <fcntl.h> ++#include <errno.h> ++ ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <sys/vfs.h> ++#include <sys/mman.h> ++#include <sys/sendfile.h> ++#include <sys/syscall.h> ++ ++/* Use our own wrapper for memfd_create. */ ++#if !defined(SYS_memfd_create) && defined(__NR_memfd_create) ++# define SYS_memfd_create __NR_memfd_create ++#endif ++#ifdef SYS_memfd_create ++# define HAVE_MEMFD_CREATE ++/* memfd_create(2) flags -- copied from <linux/memfd.h>. */ ++# ifndef MFD_CLOEXEC ++# define MFD_CLOEXEC 0x0001U ++# define MFD_ALLOW_SEALING 0x0002U ++# endif ++int memfd_create(const char *name, unsigned int flags) ++{ ++ return syscall(SYS_memfd_create, name, flags); ++} ++#endif ++ ++/* This comes directly from <linux/fcntl.h>. */ ++#ifndef F_LINUX_SPECIFIC_BASE ++# define F_LINUX_SPECIFIC_BASE 1024 ++#endif ++#ifndef F_ADD_SEALS ++# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) ++# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) ++#endif ++#ifndef F_SEAL_SEAL ++# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ ++# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ ++# define F_SEAL_GROW 0x0004 /* prevent file from growing */ ++# define F_SEAL_WRITE 0x0008 /* prevent writes */ ++#endif ++ ++#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */ ++#ifdef HAVE_MEMFD_CREATE ++# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe" ++# define RUNC_MEMFD_SEALS \ ++ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) ++#endif ++ ++static void *must_realloc(void *ptr, size_t size) ++{ ++ void *old = ptr; ++ do { ++ ptr = realloc(old, size); ++ } while(!ptr); ++ return ptr; ++} ++ ++/* ++ * Verify whether we are currently in a self-cloned program (namely, is ++ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather ++ * for shmem files), and we want to be sure it's actually sealed. ++ */ ++static int is_self_cloned(void) ++{ ++ int fd, ret, is_cloned = 0; ++ ++ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC); ++ if (fd < 0) ++ return -ENOTRECOVERABLE; ++ ++#ifdef HAVE_MEMFD_CREATE ++ ret = fcntl(fd, F_GET_SEALS); ++ is_cloned = (ret == RUNC_MEMFD_SEALS); ++#else ++ struct stat statbuf = {0}; ++ ret = fstat(fd, &statbuf); ++ if (ret >= 0) ++ is_cloned = (statbuf.st_nlink == 0); ++#endif ++ close(fd); ++ return is_cloned; ++} ++ ++/* ++ * Basic wrapper around mmap(2) that gives you the file length so you can ++ * safely treat it as an ordinary buffer. Only gives you read access. ++ */ ++static char *read_file(char *path, size_t *length) ++{ ++ int fd; ++ char buf[4096], *copy = NULL; ++ ++ if (!length) ++ return NULL; ++ ++ fd = open(path, O_RDONLY | O_CLOEXEC); ++ if (fd < 0) ++ return NULL; ++ ++ *length = 0; ++ for (;;) { ++ int n; ++ ++ n = read(fd, buf, sizeof(buf)); ++ if (n < 0) ++ goto error; ++ if (!n) ++ break; ++ ++ copy = must_realloc(copy, (*length + n) * sizeof(*copy)); ++ memcpy(copy + *length, buf, n); ++ *length += n; ++ } ++ close(fd); ++ return copy; ++ ++error: ++ close(fd); ++ free(copy); ++ return NULL; ++} ++ ++/* ++ * A poor-man's version of "xargs -0". Basically parses a given block of ++ * NUL-delimited data, within the given length and adds a pointer to each entry ++ * to the array of pointers. ++ */ ++static int parse_xargs(char *data, int data_length, char ***output) ++{ ++ int num = 0; ++ char *cur = data; ++ ++ if (!data || *output != NULL) ++ return -1; ++ ++ while (cur < data + data_length) { ++ num++; ++ *output = must_realloc(*output, (num + 1) * sizeof(**output)); ++ (*output)[num - 1] = cur; ++ cur += strlen(cur) + 1; ++ } ++ (*output)[num] = NULL; ++ return num; ++} ++ ++/* ++ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. ++ * This is necessary because we are running in a context where we don't have a ++ * main() that we can just get the arguments from. ++ */ ++static int fetchve(char ***argv, char ***envp) ++{ ++ char *cmdline = NULL, *environ = NULL; ++ size_t cmdline_size, environ_size; ++ ++ cmdline = read_file("/proc/self/cmdline", &cmdline_size); ++ if (!cmdline) ++ goto error; ++ environ = read_file("/proc/self/environ", &environ_size); ++ if (!environ) ++ goto error; ++ ++ if (parse_xargs(cmdline, cmdline_size, argv) <= 0) ++ goto error; ++ if (parse_xargs(environ, environ_size, envp) <= 0) ++ goto error; ++ ++ return 0; ++ ++error: ++ free(environ); ++ free(cmdline); ++ return -EINVAL; ++} ++ ++static int clone_binary(void) ++{ ++ int binfd, memfd; ++ ssize_t sent = 0; ++ ++#ifdef HAVE_MEMFD_CREATE ++ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING); ++#else ++ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711); ++#endif ++ if (memfd < 0) ++ return -ENOTRECOVERABLE; ++ ++ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC); ++ if (binfd < 0) ++ goto error; ++ ++ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX); ++ close(binfd); ++ if (sent < 0) ++ goto error; ++ ++#ifdef HAVE_MEMFD_CREATE ++ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS); ++ if (err < 0) ++ goto error; ++#else ++ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */ ++ int newfd; ++ char *fdpath = NULL; ++ ++ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0) ++ goto error; ++ newfd = open(fdpath, O_RDONLY | O_CLOEXEC); ++ free(fdpath); ++ if (newfd < 0) ++ goto error; ++ ++ close(memfd); ++ memfd = newfd; ++#endif ++ return memfd; ++ ++error: ++ close(memfd); ++ return -EIO; ++} ++ ++int ensure_cloned_binary(void) ++{ ++ int execfd; ++ char **argv = NULL, **envp = NULL; ++ ++ /* Check that we're not self-cloned, and if we are then bail. */ ++ int cloned = is_self_cloned(); ++ if (cloned > 0 || cloned == -ENOTRECOVERABLE) ++ return cloned; ++ ++ if (fetchve(&argv, &envp) < 0) ++ return -EINVAL; ++ ++ execfd = clone_binary(); ++ if (execfd < 0) ++ return -EIO; ++ ++ fexecve(execfd, argv, envp); ++ return -ENOEXEC; ++} +diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c +index 28269dfc0..7750af35e 100644 +--- a/libcontainer/nsenter/nsexec.c ++++ b/libcontainer/nsenter/nsexec.c +@@ -534,6 +534,9 @@ void join_namespaces(char *nslist) + free(namespaces); + } + ++/* Defined in cloned_binary.c. */ ++extern int ensure_cloned_binary(void); ++ + void nsexec(void) + { + int pipenum; +@@ -549,6 +552,14 @@ void nsexec(void) + if (pipenum == -1) + return; + ++ /* ++ * We need to re-exec if we are not in a cloned binary. This is necessary ++ * to ensure that containers won't be able to access the host binary ++ * through /proc/self/exe. See CVE-2019-5736. ++ */ ++ if (ensure_cloned_binary() < 0) ++ bail("could not ensure we are a cloned binary"); ++ + /* Parse all of the netlink configuration. */ + nl_parse(pipenum, &config); + diff --git a/gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch b/gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch new file mode 100644 index 0000000000..6ec1b8f21f --- /dev/null +++ b/gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch @@ -0,0 +1,170 @@ +From f11c3f094ed5ca727ec819983425b6641db8227c Mon Sep 17 00:00:00 2001 +From: Eric Bavier <bavier@member.fsf.org> +Date: Wed, 13 Feb 2019 09:32:11 -0600 +Subject: [PATCH] BLACS: Remove use of long-deprecated MPI1 functions. + +* BLACS/SRC/blacs_get_.c: 'MPI_Attr_get' -> 'MPI_Comm_get_attr'. +* BLACS/SRC/cgamn2d_.c, BLACS/SRC/cgamx2d_.c, BLACS/SRC/dgamn2d_.c, +BLACS/SRC/dgamx2d_.c, BLACS/SRC/igamn2d_.c, BLACS/SRC/igamx2d_.c, +BLACS/SRC/sgamn2d_.c, BLACS/SRC/sgamx2d_.c, BLACS/SRC/zgamn2d_.c, +BLACS/SRC/zgamx2d_.c: 'MPI_Type_struct' -> 'MPI_Type_create_struct'. +--- + BLACS/SRC/blacs_get_.c | 2 +- + BLACS/SRC/cgamn2d_.c | 2 +- + BLACS/SRC/cgamx2d_.c | 2 +- + BLACS/SRC/dgamn2d_.c | 2 +- + BLACS/SRC/dgamx2d_.c | 2 +- + BLACS/SRC/igamn2d_.c | 2 +- + BLACS/SRC/igamx2d_.c | 2 +- + BLACS/SRC/sgamn2d_.c | 2 +- + BLACS/SRC/sgamx2d_.c | 2 +- + BLACS/SRC/zgamn2d_.c | 2 +- + BLACS/SRC/zgamx2d_.c | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c +index e979767..d4b04cf 100644 +--- a/BLACS/SRC/blacs_get_.c ++++ b/BLACS/SRC/blacs_get_.c +@@ -23,7 +23,7 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *val) + case SGET_MSGIDS: + if (BI_COMM_WORLD == NULL) Cblacs_pinfo(val, &val[1]); + iptr = &val[1]; +- ierr=MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); ++ ierr=MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); + val[0] = 0; + val[1] = *iptr; + break; +diff --git a/BLACS/SRC/cgamn2d_.c b/BLACS/SRC/cgamn2d_.c +index 2db6ccb..6958f32 100644 +--- a/BLACS/SRC/cgamn2d_.c ++++ b/BLACS/SRC/cgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/cgamx2d_.c b/BLACS/SRC/cgamx2d_.c +index 707c0b6..f802d01 100644 +--- a/BLACS/SRC/cgamx2d_.c ++++ b/BLACS/SRC/cgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamn2d_.c b/BLACS/SRC/dgamn2d_.c +index dff23b4..a2627ac 100644 +--- a/BLACS/SRC/dgamn2d_.c ++++ b/BLACS/SRC/dgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamx2d_.c b/BLACS/SRC/dgamx2d_.c +index a51f731..2a644d0 100644 +--- a/BLACS/SRC/dgamx2d_.c ++++ b/BLACS/SRC/dgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamn2d_.c b/BLACS/SRC/igamn2d_.c +index 16bc003..f6a7859 100644 +--- a/BLACS/SRC/igamn2d_.c ++++ b/BLACS/SRC/igamn2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamx2d_.c b/BLACS/SRC/igamx2d_.c +index 8165cbe..a7cfcc6 100644 +--- a/BLACS/SRC/igamx2d_.c ++++ b/BLACS/SRC/igamx2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamn2d_.c b/BLACS/SRC/sgamn2d_.c +index d6c95e5..569c797 100644 +--- a/BLACS/SRC/sgamn2d_.c ++++ b/BLACS/SRC/sgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamx2d_.c b/BLACS/SRC/sgamx2d_.c +index 4b0af6f..8897ece 100644 +--- a/BLACS/SRC/sgamx2d_.c ++++ b/BLACS/SRC/sgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamn2d_.c b/BLACS/SRC/zgamn2d_.c +index 9de2b23..37897df 100644 +--- a/BLACS/SRC/zgamn2d_.c ++++ b/BLACS/SRC/zgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamx2d_.c b/BLACS/SRC/zgamx2d_.c +index 414c381..0e9d474 100644 +--- a/BLACS/SRC/zgamx2d_.c ++++ b/BLACS/SRC/zgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +-- +2.20.1 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 504e69c769..e6f0ae1a74 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -748,18 +748,20 @@ using a stylus.") (define-public python-reportlab (package (name "python-reportlab") - (version "3.4.0") + (version "3.5.13") (source (origin (method url-fetch) (uri (pypi-uri "reportlab" version)) (sha256 (base32 - "0hy304pzsz9lblmk7mrbk2682bi911lxgvzx2kcfpmfzb5gg7sjv")))) + "1wxgcj46rm83qz97i8ygvd59bks60kr6vvnz12ygw640z58ff5k1")))) (build-system python-build-system) (arguments '(;; FIXME: There is one test failure, but it does not cause the ;; build to fail. No time to investigate right now. #:test-target "tests")) + (inputs + `(("freetype" ,freetype))) (propagated-inputs `(("python-pillow" ,python-pillow))) (home-page "https://www.reportlab.com") diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 077330e54a..2e08243178 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -743,14 +743,14 @@ file, and more.") (define-public python-ecpy (package (name "python-ecpy") - (version "0.8.2") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "ECPy" version)) (sha256 (base32 - "090fqnj8z0xm44jrfpll7j45r68m6kp7mjr7yxzg93j42h3sj285")))) + "1gc3i5s93zq6x1nkaxkq1dvmsc12vmrw0hns9f5s1hcb78ni52c8")))) (build-system python-build-system) (propagated-inputs `(("python-future" ,python-future))) @@ -803,14 +803,14 @@ protocol (Javascript Object Signing and Encryption).") (define-public python-pycryptodome (package (name "python-pycryptodome") - (version "3.7.2") + (version "3.7.3") (source (origin (method url-fetch) (uri (pypi-uri "pycryptodome" version)) (sha256 (base32 - "1xxf5cyhlc5ak5skf4zgqz9yk5fj5g70hd06hc1jym995lxpxz7m")))) + "0dh6ky5ngxayyn5f6n7gdamjl49g3khz6pdx9sdnag1zwi8248hs")))) (build-system python-build-system) (home-page "https://www.pycryptodome.org") (synopsis "Cryptographic library for Python") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 36e8ce0120..55ac37ffb0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2013, 2014, 2015, 2016, 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch> @@ -1938,6 +1938,40 @@ easier to build concurrent applications.") (define-public python2-pykka (package-with-python2 python-pykka)) +(define-public python-pymsgbox + (package + (name "python-pymsgbox") + (version "1.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; LICENSE.txt is not present on pypi + (url "https://github.com/asweigart/PyMsgBox") + (commit "55926b55f46caa969c5ddb87990ebea2737bd66f"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zy7rjfpwlrd8b64j7jk2lb8m2npc21rnpwakpfvwgl4nxdy80rg")))) + (arguments + ;; Circular dependency to run tests: + ;; Tests need pyautogui, which depends on pymsgbox. + '(#:tests? #f)) + (build-system python-build-system) + (home-page "https://github.com/asweigart/PyMsgBox") + (synopsis "Python module for JavaScript-like message boxes") + (description + "PyMsgBox is a simple, cross-platform, pure Python module for +JavaScript-like message boxes. Types of dialog boxes include: +@enumerate +@item alert +@item confirm +@item prompt +@item password +@end enumerate +") + (license license:bsd-3))) + (define-public python-pympler (package (name "python-pympler") @@ -2189,6 +2223,57 @@ logging and tracing of the execution.") (define-public python2-joblib (package-with-python2 python-joblib)) +(define-public python-daemon + (package + (name "python-daemon") + (version "2.2.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-daemon" version)) + (sha256 + (base32 + "09fcjdjzk9ywmpnrj62iyxqgcygzdafsz41qlrk2dknzbagcmzmg")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-tests + (lambda _ + ;; FIXME: Determine why test fails + (substitute* "test/test_daemon.py" + (("test_detaches_process_context") + "skip_test_detaches_process_context")) + #t))))) + (propagated-inputs + `(("python-lockfile" ,python-lockfile))) + (native-inputs + `(("python-unittest2" ,python-unittest2) + ("python-testtools" ,python-testtools) + ("python-testscenarios" ,python-testscenarios) + ("python-mock" ,python-mock) + ("python-docutils" ,python-docutils))) + (home-page "https://pagure.io/python-daemon/") + (synopsis "Python library for making a Unix daemon process") + (description "Python-daemon is a library that assists a Python program to +turn itself into a well-behaved Unix daemon process, as specified in PEP 3143. + +This library provides a @code{DaemonContext} class that manages the following +important tasks for becoming a daemon process: +@enumerate +@item Detach the process into its own process group. +@item Set process environment appropriate for running inside a chroot. +@item Renounce suid and sgid privileges. +@item Close all open file descriptors. +@item Change the working directory, uid, gid, and umask. +@item Set appropriate signal handlers. +@item Open new file descriptors for stdin, stdout, and stderr. +@item Manage a specified PID lock file. +@item Register cleanup functions for at-exit processing. +@end enumerate") + ;; Only setup.py is gpl3+, everything else is apache 2.0 licensed. + (license (list license:asl2.0 license:gpl3+)))) + (define-public python-docutils (package (name "python-docutils") @@ -2493,6 +2578,84 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") Language (TOML) configuration files.") (license license:expat))) +(define-public python-jsonrpc-server + (package + (name "python-jsonrpc-server") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-jsonrpc-server" version)) + (sha256 + (base32 + "0m4ykpcdy52x37n1ikysp07j7p8ialcdvvvsrjp3545sn7iiid09")))) + (build-system python-build-system) + (propagated-inputs + `(("python-future" ,python-future) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page + "https://github.com/palantir/python-jsonrpc-server") + (synopsis "JSON RPC 2.0 server library") + (description + "This packages provides a JSON RPC 2.0 server library for Python.") + (license license:expat))) + +(define-public python-pydocstyle + (package + (name "python-pydocstyle") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pydocstyle" version)) + (sha256 + (base32 + "1m1xv9clkg9lgzyza6dnj359z04vh5g0h49nhzghv7lg81gchhap")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ("python-snowballstemmer" ,python-snowballstemmer))) + (home-page + "https://github.com/PyCQA/pydocstyle/") + (synopsis "Python docstring style checker") + (description + "This package provides a style checker for the Python Language +Server (PLS).") + (license license:expat))) + +(define-public python-language-server + (package + (name "python-language-server") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-language-server" version)) + (sha256 + (base32 + "04pbxl06hg0ddm2xx99jn9jh40yv0mmzdjw8pqd2rbcdg42hhia6")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pluggy" ,python-pluggy) + ("python-jsonrpc-server" ,python-jsonrpc-server) + ("python-jedi" ,python-jedi) + ("python-yapf" ,python-yapf) + ("python-pyflakes" ,python-pyflakes) + ("python-pydocstyle" ,python-pydocstyle) + ("python-pycodestyle" ,python-pycodestyle) + ("python-mccabe" ,python-mccabe) + ("python-rope" ,python-rope) + ("python-autopep8" ,python-autopep8))) + (home-page "https://github.com/palantir/python-language-server") + (synopsis "Python implementation of the Language Server Protocol") + (description + "The Python Language Server (pyls) is an implementation of the Python 3 +language specification for the Language Server Protocol (LSP). This tool is +used in text editing environments to provide a complete and integrated +feature-set for programming Python effectively.") + (license license:expat))) + (define-public python-black (package (name "python-black") @@ -2635,14 +2798,14 @@ and is very extensible.") (define-public python-cython (package (name "python-cython") - (version "0.28.4") + (version "0.29.5") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "0imw9s2rbrh32clbl10csnwmig9p3nzkrd2baxxxfmnrsc42pb3n")))) + "1wfb68g115gmf3mv23w0hh972b0ll85gpb92ci28x6h997br0llx")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so @@ -8761,8 +8924,7 @@ Python. It generates C++ code and a Makefile.")) (base32 "1cppm0pa9aqgsbkq130lskrzmrvjs5vpiavjjbhpz2fdw52w8251")))) (arguments - ;; Rope is currently python-2 only. - ;; https://github.com/python-rope/rope/issues/57 + ;; Rope has only partial python3 support, see `python-rope' `(#:python ,python-2)) (build-system python-build-system) (native-inputs @@ -8775,6 +8937,16 @@ and parameters in Python 2 source code. These refactorings can also be applied to occurrences in strings and comments.") (license license:gpl2))) +(define-public python-rope + (package + (inherit python2-rope) + (name "python-rope") + (arguments `(#:python ,python-wrapper + ;; XXX: Only partial python3 support, results in some failing + ;; tests: <https://github.com/python-rope/rope/issues/247>. + #:tests? #f)) + (properties `((python2-variant . ,(delay python2-rope)))))) + (define-public python-py3status (package (name "python-py3status") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2e8f2d1135..6775a991b9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2173,6 +2173,11 @@ different kinds of sliders, and much more.") (arguments `(#:tests? #f ; no apparent tests; it might be necessary to set ; ENABLE_API_TESTS, see CMakeLists.txt + + ;; Parallel builds fail due to a race condition: + ;; <https://bugs.gnu.org/34062>. + #:parallel-build? #f + #:configure-flags (list ;"-DENABLE_API_TESTS=TRUE" "-DPORT=Qt" "-DUSE_LIBHYPHEN=OFF" diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index ed616e739f..8ee6b4d32f 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -47,14 +47,14 @@ (define-public xapian (package (name "xapian") - (version "1.4.9") + (version "1.4.10") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd")))) + (base32 "1f4vf1w1yvsn9mn462q6snc8wkmfpifp8wrlzs4aqi45w0kr6rk8")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux))) @@ -92,7 +92,7 @@ rich set of boolean query operators.") "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "0ll3z3418r7bzxs4kyini2cbci5xl8i5scl3wyx88s2v4ak56bcz")))) + "0zqx5gcwm2mhx41fnfx30z9c31x96g5pskyrmx3c556mnklfpask")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3") diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 6546d40597..9ba37b0f19 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Claes Wallin <claes.wallin@greatsinodevelopment.com> ;;; Copyright © 2016 Eric Le Bihan <eric.le.bihan.dev@free.fr> ;;; Copyright © 2017 Z. Ren <zren@dlut.edu.cn> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,7 +105,7 @@ complexity."))) (define-public s6 (package (name "s6") - (version "2.7.2.1") + (version "2.7.2.2") (source (origin (method url-fetch) @@ -113,7 +113,7 @@ complexity."))) version ".tar.gz")) (sha256 (base32 - "0vyl4wr2l4mp9ams0dyg224qxhl8ksxsv2shs6606lhhp9g1rb6b")))) + "0psjmfidjdciswakw9agzzniqfmhrr21765m0q77kwxg7iisgpsq")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline))) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 682989ae29..1928ea7634 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -456,6 +456,9 @@ TCP, not the SSH protocol.") "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there is no "make check" or anything similar + ;; TODO: Investigate unbundling libtommath and libtomcrypt or at least + ;; cherry-picking important bug fixes from them. See <bugs.gnu.org/24674> + ;; for more information. (inputs `(("zlib" ,zlib))) (synopsis "Small SSH server and client") (description "Dropbear is a relatively small SSH server and diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 6edeea6cac..d15fdbaddd 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -78,13 +78,13 @@ a custom raw video format with a simple container.") (define-public dwm (package (name "dwm") - (version "6.1") + (version "6.2") (source (origin (method url-fetch) (uri (string-append "https://dl.suckless.org/dwm/dwm-" version ".tar.gz")) (sha256 - (base32 "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2")))) + (base32 "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p")))) (build-system gnu-build-system) (arguments `(#:tests? #f @@ -137,14 +137,14 @@ optimising the environment for the application in use and the task performed.") (define-public dmenu (package (name "dmenu") - (version "4.8") + (version "4.9") (source (origin (method url-fetch) (uri (string-append "https://dl.suckless.org/tools/dmenu-" version ".tar.gz")) (sha256 (base32 - "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy")))) + "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 92eda1c9b1..e4f8c09016 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0992nsdiw374pbh1dywg7c2jijzy4xmsv0b7q5p76xn2yyg5yhr7")) + "0gas07lxm5d2c21axgcs90r779rj9sk3jymnnffxz457rvpr2qn3")) ;; Since the update to Go 1.11, Go programs have been keeping ;; spurious references to all their dependencies: ;; <https://bugs.gnu.org/33620>. diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index fab0e72278..e9ee79e508 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -531,13 +531,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.30.2") + (version "0.31.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1wmqxrl4w9w79jd16bmxp8g3xbrx3az4137zbip8x44zrrzmnni9")))) + "1gxjv09c695lj8swspa390nch117i60qkrgy135383vfk00jsp3y")))) (build-system python-build-system) (arguments `(#:phases @@ -588,7 +588,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri name version)) (sha256 (base32 - "0vkpqwps1c8ja140kiiz2cws9hqjrbkx58wbji3qxv9cap5qfi2k")))) + "0wq4jgyzli684h154w26xplp0fzyks2vlrnmhafhyb0h1bw9cc8c")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index e7da5b30c0..9d534e5799 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -32,14 +32,14 @@ (define-public miniupnpc (package (name "miniupnpc") - (version "2.1") + (version "2.1.20190210") (source (origin (method url-fetch) (uri (string-append "https://miniupnp.tuxfamily.org/files/" name "-" version ".tar.gz")) (sha256 - (base32 "1ik440yspbp3clr4m01xsl9skwyrzcvzb5nbm3i0g9x53vhbb7z1")))) + (base32 "05w8p51yd71ksapajb9nag464ncakk72v9dxr01y168wix707d49")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a5a684c67e..ece66a3745 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -683,14 +683,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "4.1") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3")))) + "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -992,7 +992,7 @@ videoformats depend on the configuration flags of ffmpeg.") ("libva" ,libva) ("libvdpau" ,libvdpau) ("libvorbis" ,libvorbis) - ("libvpx" ,libvpx) + ("libvpx" ,libvpx-1.7) ("libtheora" ,libtheora) ("libx264" ,libx264) ("libxext" ,libxext) @@ -2877,7 +2877,17 @@ programmers to access a standard API to open and decompress media files.") (add-before 'configure 'fix-ldflags (lambda _ (setenv "LDFLAGS" "-pthread") - #t))))) + #t)) + (add-after 'unpack 'fix-boost-headers + (lambda _ + (substitute* + '("src/subtitles_provider_libass.cpp" + "src/colour_button.cpp" + "src/video_provider_dummy.cpp" + "./src/video_frame.cpp") + (("#include <boost/gil/gil_all.hpp>") + "#include <boost/gil.hpp>")) + #t))))) (inputs `(("boost" ,boost) ("desktop-file-utils" ,desktop-file-utils) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 53d028681d..8da08c41b0 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> -;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> @@ -519,7 +519,7 @@ commit or run any Git arbitrary command.") (define-public vim-airline (package (name "vim-airline") - (version "0.9") + (version "0.10") (source (origin (method git-fetch) @@ -529,7 +529,7 @@ commit or run any Git arbitrary command.") (file-name (git-file-name name version)) (sha256 (base32 - "0hq3304rhakx7x1v7wll7gxinmfz6561bq97qpj8jrk19rhcab75")))) + "0k3c6p3xy6514n1n347ci4q9xjm9wwqirpdysam6f7r39crgmfhd")))) (build-system gnu-build-system) (arguments `(#:tests? #f diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f5e4540329..8a5af2e8ea 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -847,15 +847,17 @@ monitor/GPU.") (define-public runc (package (name "runc") - (version "1.0.0-rc5") + (version "1.0.0-rc6") (source (origin (method url-fetch) (uri (string-append "https://github.com/opencontainers/runc/releases/" "download/v" version "/runc.tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (patches (search-patches "runc-CVE-2019-5736.patch")) (sha256 (base32 - "081avdzwnqpk368wbaihlzsypaxpj42d7699h7jgp0fks14x4103")))) + "1c7832dq70slkjh8qp2civ1wxhhdd2hrx84pq7db1mmqc9fdr3cc")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 158d542d7f..f7f8e157e5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -164,17 +164,17 @@ and its related documentation.") (name "mod-wsgi") (version "4.5.22") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/GrahamDumpleton/mod_wsgi/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/GrahamDumpleton/mod_wsgi.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0n1yhmrfp8mjbsngmyjl937c6rc0069p6wdi1lknrbn1q42hzw6q")))) + "1q90xw2cbhka5gcd6yc69iir73x4gm7fm75qpkins2ryfl6w1q3f")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;; TODO: Can't figure out if there are tests + '(#:tests? #f ; TODO: can't figure out if there are tests #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) @@ -413,16 +413,16 @@ APIs.") (version "1.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gnosek/fcgiwrap/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/gnosek/fcgiwrap.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac")))) + (base32 "1ryw66h9aazi83amk8l7ha8k5g0c7qvk5g6jv376a1ws9xk2qw6f")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests included + `(#:tests? #f ; no tests included #:make-flags (list "CC=gcc"))) (native-inputs `(("autoconf" ,autoconf) @@ -620,17 +620,17 @@ project) (name "qjson") (version "0.9.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/flavio/qjson/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/flavio/qjson.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1m0h4rajj99hv9w4i381a8x81lxiv167lxk10ncvphpkfxs624p8")))) + "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs")))) (build-system cmake-build-system) (arguments - ;; The tests require a X server + ;; The tests require a running X server. `(#:configure-flags '("-DQJSON_BUILD_TESTS=ON" "-DCMAKE_CXX_FLAGS=-std=gnu++11 -fPIC") #:phases @@ -747,14 +747,14 @@ current version of any major web browser.") (name "rapidjson") (version "1.1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/miloyip/rapidjson/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/miloyip/rapidjson.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13nrpvw8f1wx0ga7svbzld7pgrv8l172nangpipnj7jaf0lysz5z")) + "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab")) (modules '((guix build utils))) (snippet '(begin @@ -786,13 +786,14 @@ style API.") (name "libyajl") (version "2.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lloyd/yajl/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lloyd/yajl.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0nmcqpaiq4pv7dymyg3n3jsd57yhp5npxl26a1hzw3m3lmj37drz")))) + "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml")))) (build-system cmake-build-system) (arguments '(#:phases @@ -992,13 +993,14 @@ of people.") (name "websockify") (version "0.8.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/novnc/websockify/archive/v" - version "/archive.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/novnc/websockify.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1kjq6gibsvbb6zx5gi8hgh7110x62pbwcqkwapf3k7s27w5y907h")))) + "0pcic8qs0gdwrfjgfaf893jyddaw97wcjm2mmvwn0xyhmy8mbmw1")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; FIXME: 2 out of 6 tests fail with "ImportError: No module @@ -4779,13 +4781,13 @@ deployments.") (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.0.0") + (version "6.1.1") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7")))) + "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") @@ -4793,6 +4795,10 @@ deployments.") (string-append "PTHREAD_CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc") + ;; XXX: Disable PCRE-JIT to work around a segmentation + ;; fault when using jemalloc 5.x: + ;; <https://github.com/varnishcache/varnish-cache/issues/2817> + "--disable-pcre-jit" "--localstatedir=/var") #:phases (modify-phases %standard-phases @@ -4827,6 +4833,7 @@ deployments.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx) ("rst2man" ,python-docutils))) (inputs `(("jemalloc" ,jemalloc) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index fd89df0c16..f1f3c25391 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 xd1le <elisp.vim@gmail.com> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> @@ -675,20 +675,27 @@ drags, snap-to-border support, and virtual desktops.") `(#:make-flags '("CPPFLAGS=-U__TIME__") ;ugly, but for reproducibility #:phases (modify-phases %standard-phases - (add-after - 'install 'install-xsession - (lambda _ - (let ((xsessions (string-append %output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file - (string-append xsessions "/fluxbox.desktop") - (lambda (port) - (format port "~ - [Desktop Entry]~@ - Name=~a~@ - Comment=~a~@ - Exec=~a/bin/startfluxbox~@ - Type=Application~%" ,name ,synopsis %output))))))))) + (add-after 'install 'install-vim-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (syntax (string-append out "/share/vim/vimfiles/syntax"))) + (copy-recursively "3rd/vim/vim/syntax" syntax) + #t))) + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/fluxbox.desktop") + (lambda (port) + (format port "~ + [Desktop Entry]~@ + Name=~a~@ + Comment=~a~@ + Exec=~a/bin/startfluxbox~@ + Type=Application~%" ,name ,synopsis out))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7613accb4f..5359c4c9d9 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -302,7 +302,7 @@ following the mouse.") (source (origin (method url-fetch) (uri (string-append - "http://cairographics.org/releases/pixman-" + "https://www.cairographics.org/releases/pixman-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bf7a4050a3..de8d784e64 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6366,16 +6366,16 @@ output.") (define-public console-setup (package (name "console-setup") - (version "1.188") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/installer-team/console-setup.git") - (commit version))) - (sha256 - (base32 - "1741mg2wc5wa63clkijmv04zd6jxhc7c6aq7mkhqw1r4dhfhih19")) - (file-name (git-file-name name version)))) + (version "1.189") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/installer-team/console-setup.git") + (commit version))) + (sha256 + (base32 "09rfnnhwjm98im711v6jrgl49iy5n1b26x12zzk5rw6g1667mz86")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:make-flags |