diff options
32 files changed, 3412 insertions, 1491 deletions
@@ -42,17 +42,18 @@ Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org> Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Mathieu Othacehe <m.othacehe@gmail.com> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> -ng0 <ng0@n0.is> -ng0 <ng0@n0.is> <ng0@infotropique.org> -ng0 <ng0@n0.is> <ng0@no-reply.infotropique.org> -ng0 <ng0@n0.is> <ng0@no-reply.pragmatique.xyz> -ng0 <ng0@n0.is> <ng0@pragmatique.xyz> -ng0 <ng0@n0.is> <contact.ng0@cryptolab.net> -ng0 <ng0@n0.is> <ng0@we.make.ritual.n0.is> -ng0 <ng0@n0.is> <ngillmann@runbox.com> -ng0 <ng0@n0.is> <niasterisk@grrlz.net> -ng0 <ng0@n0.is> <ng@niasterisk.space> -ng0 <ng0@n0.is> <ng0@libertad.pw> +ng0 <ng0@crash.cx> +ng0 <ng0@crash.cx> ng0 <ng0@n0.is> +ng0 <ng0@crash.cx> <ng0@infotropique.org> +ng0 <ng0@crash.cx> <ng0@no-reply.infotropique.org> +ng0 <ng0@crash.cx> <ng0@no-reply.pragmatique.xyz> +ng0 <ng0@crash.cx> <ng0@pragmatique.xyz> +ng0 <ng0@crash.cx> <contact.ng0@cryptolab.net> +ng0 <ng0@crash.cx> <ng0@we.make.ritual.n0.is> +ng0 <ng0@crash.cx> <ngillmann@runbox.com> +ng0 <ng0@crash.cx> <niasterisk@grrlz.net> +ng0 <ng0@crash.cx> <ng@niasterisk.space> +ng0 <ng0@crash.cx> <ng0@libertad.pw> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@thebird.nl> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@email> diff --git a/gnu/local.mk b/gnu/local.mk index 030ea8397a..19fc361f75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -903,9 +903,6 @@ dist_patch_DATA = \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ - %D%/packages/patches/mpv-CVE-2018-6360-1.patch \ - %D%/packages/patches/mpv-CVE-2018-6360-2.patch \ - %D%/packages/patches/mpv-CVE-2018-6360-3.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/mongodb-support-unknown-linux-distributions.patch \ %D%/packages/patches/mozjs17-aarch64-support.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b9b0dad9d7..0fd97b691e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2016 Raoul Bonnal <ilpuccio.febo@gmail.com> +;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; @@ -5849,14 +5849,14 @@ information as possible.") (define-public r-vegan (package (name "r-vegan") - (version "2.4-5") + (version "2.4-6") (source (origin (method url-fetch) (uri (cran-uri "vegan" version)) (sha256 (base32 - "0cyyvn3xsjn24w590jn6z4xajafv7yzvj6c51vqi9q6m8v5831ya")))) + "175mqr42mmxy98gpf3rky8alnkw3w1k90ggdw3cispl36841p76w")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) @@ -6673,19 +6673,21 @@ also known as views, in a controlled vocabulary.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "0zm63kr4f4kja4qpwkzl119zzyciqj7ihajfqgfjpgb4dzaiycxp")))) + "1pxxln42kvzl38fjprg6hcnyh1kij75fpj70vwp5hp5il813aszc")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) ("r-knitr" ,r-knitr) ("r-rmarkdown" ,r-rmarkdown) - ("r-yaml" ,r-yaml))) + ("r-yaml" ,r-yaml) + ("r-xfun" ,r-xfun) + ("ghc-pandoc" ,ghc-pandoc))) (home-page "https://github.com/rstudio/bookdown") (synopsis "Authoring books and technical documents with R markdown") (description "This package provides output formats and utilities for @@ -6965,13 +6967,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.20.2") + (version "3.20.8") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "0j5s3i33qmld9l7gs1rzpv601zxyqz711x8mq35hml088c8s99w9")))) + "0g7bj6w61blw3m22hw9rc01n554k9qkjizh7njr3j4shmhads58d")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs @@ -6993,13 +6995,13 @@ CAGE.") (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.24.2") + (version "1.24.5") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "19wgb2kcqy97pm3xgqc781id9fbmzp1hdwzkkhdzpvyf29w4n29j")))) + "07ywn3c4w83l3sr76d0z3b1nv9icgdh3phsjlc6cfx7i6nfmvxw2")))) (properties `((upstream-name . "VariantAnnotation"))) (inputs @@ -7031,13 +7033,13 @@ coding changes and predict coding outcomes.") (define-public r-limma (package (name "r-limma") - (version "3.34.4") + (version "3.34.8") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1vcxf9jg8xngxg5kb9bp8rw5sghpnkpj320iq309m2fp41ahsk3f")))) + "0bmxsgz2yll83sd3wbxsrsfd35468igb0d8lldym0d0lqfz906bw")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") @@ -7086,13 +7088,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.30.0") + (version "1.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "10ra2sjn17h6gilm9iz0cygp9ijpgbirljlc4drwrnivnw9cmi2a")))) + "1wnvvhj8yjsx242y6kfr5vs8kzisa96rxl1rgnnychrrvnvnh3i1")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) @@ -7164,13 +7166,13 @@ annotation data packages using SQLite data storage.") (define-public r-biomart (package (name "r-biomart") - (version "2.34.1") + (version "2.34.2") (source (origin (method url-fetch) (uri (bioconductor-uri "biomaRt" version)) (sha256 (base32 - "0jzv8b86vpvavwnzi5xf7y18xmn72zkabkn2kclg1mgl847cq13k")))) + "1zlgs2zg0lmnk572p55n7m34nkxka8w10x8f2ndssjkffl2csy79")))) (properties `((upstream-name . "biomaRt"))) (build-system r-build-system) @@ -7322,13 +7324,13 @@ array-like objects like @code{DataFrame} objects (typically with Rle columns), (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "SummarizedExperiment" version)) (sha256 (base32 - "1011r8l0k8420j31bmh4xdcp6ka5bzf4bqhip84v5b6alpkcbvmf")))) + "19vlwnby83fqjrilsxvnvgz0gvby7mrxvlmx18nb3p1w591ddfjh")))) (properties `((upstream-name . "SummarizedExperiment"))) (build-system r-build-system) @@ -7386,13 +7388,13 @@ alignments.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.38.2") + (version "1.38.3") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "1sjn3976f1sqvrq6jq2hgc60ffxgfr3jlklaxfrk3xad5cv2kr2d")))) + "1khzfczm35k5lq9h0jlqrq01192spzjyh8s6is89spj006flwn4k")))) (build-system r-build-system) (arguments `(#:phases @@ -7431,13 +7433,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.30.0") + (version "1.30.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "1khjvq1ffhqavkwf8n7bilknci60lxbg52icrcf2vnb9k8rlpghs")))) + "010vn8hlwbnw12pd1d8pv6m12yp3xwx557gba5rbjq9p4qypnn3z")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) @@ -7657,13 +7659,13 @@ reference point and sorted by a user defined feature.") (define-public r-genomation (package (name "r-genomation") - (version "1.10.0") + (version "1.11.3") (source (origin (method url-fetch) (uri (bioconductor-uri "genomation" version)) (sha256 (base32 - "1ddd8c9w1f1i1ga9rpbwiic8rsaws1chdxx4j38bpyaiy4zhz1ca")))) + "1d2g1v6xhrf3gm86pv8ln22df5g6v6k6i4i39v4j82zn4apany6v")))) (build-system r-build-system) (propagated-inputs `(("r-biostrings" ,r-biostrings) @@ -8362,14 +8364,14 @@ in SNV base substitution data.") (define-public r-wgcna (package (name "r-wgcna") - (version "1.61") + (version "1.62") (source (origin (method url-fetch) (uri (cran-uri "WGCNA" version)) (sha256 (base32 - "1vrc2k33a196hrrl7k0z534fp96vv0shmigcr65ny1q0v6lq0h6i")))) + "0c52rp09gqphz6g5x9jzkdcsyvfrknq0dkq9saslgy8q8ap974vx")))) (properties `((upstream-name . "WGCNA"))) (build-system r-build-system) (propagated-inputs @@ -8467,14 +8469,14 @@ factors bound at the specific regions.") (define-public r-gkmsvm (package (name "r-gkmsvm") - (version "0.71.0") + (version "0.79.0") (source (origin (method url-fetch) (uri (cran-uri "gkmSVM" version)) (sha256 (base32 - "1zpxgxmf2nd5j5wn00ps6kfxr8wxh7d1swr1rr4spq7sj5z5z0k0")))) + "04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3")))) (properties `((upstream-name . "gkmSVM"))) (build-system r-build-system) (propagated-inputs @@ -8941,13 +8943,13 @@ number detection tools.") (define-public r-methylkit (package (name "r-methylkit") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "methylKit" version)) (sha256 (base32 - "0h53w2mrjrg2n0ndi12k9j6cwclgwcgpy25nz7nyj971aisw02xn")))) + "1k0nfn9318sgwm4z963bhnbp4c3zv85v3f9886vc5hgaisr0yvai")))) (properties `((upstream-name . "methylKit"))) (build-system r-build-system) (propagated-inputs @@ -9311,14 +9313,14 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.4.0") + (version "2.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "0dqfimljhrx3gac8d1k72gppx27lz8yckyb12v4604nbviw7xd3r")))) + "1ig64bf881p118dwqfr0ry41m7yhnyv165smv8fdwfv7sb6sagif")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs @@ -9391,13 +9393,13 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") (define-public r-seurat (package (name "r-seurat") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1hqaq6bciikrsyw157w8fn4jw885air7xbkxrmism93rp4qx483x")) + "1yarzhbylkfk4vwp7f8710zpdglkfww2db3hmq69hjllgg80ykmw")) ;; Delete pre-built jar. (snippet '(begin (delete-file "inst/java/ModularityOptimizer.jar") @@ -9434,8 +9436,8 @@ Main-Class: ModularityOptimizer\n"))) ("r-fnn" ,r-fnn) ("r-fpc" ,r-fpc) ("r-gdata" ,r-gdata) - ("r-ggjoy" ,r-ggjoy) ("r-ggplot2" ,r-ggplot2) + ("r-ggridges" ,r-ggridges) ("r-gplots" ,r-gplots) ("r-gridextra" ,r-gridextra) ("r-hmisc" ,r-hmisc) @@ -9452,6 +9454,7 @@ Main-Class: ModularityOptimizer\n"))) ("r-ranger" ,r-ranger) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) + ("r-rcppeigen" ,r-rcppeigen) ("r-rcppprogress" ,r-rcppprogress) ("r-reshape2" ,r-reshape2) ("r-rocr" ,r-rocr) @@ -9661,14 +9664,14 @@ microarrays or GRanges for sequencing data.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "1i3i88lj57wvpgjf75a23msgfsjv8pr2b4j1faga276p4fsblkhj")))) + "02gwmm79djj55a90dzc80hlgwc6bafl7xd7fnx2q59pk945k3z9c")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs @@ -9685,14 +9688,14 @@ microarrays or GRanges for sequencing data.") (define-public r-gage (package (name "r-gage") - (version "2.28.0") + (version "2.28.2") (source (origin (method url-fetch) (uri (bioconductor-uri "gage" version)) (sha256 (base32 - "1r14p88q3y736pkqm4pdimf1izy1xy3xgivmj3cr4dv65kjny1zk")))) + "0h0mlhns9j7cpfksvdlvx9jb7szm3r1dwqb3s4s8p8hmkb9byyii")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -9806,14 +9809,14 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2): (define-public r-ensembldb (package (name "r-ensembldb") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ensembldb" version)) (sha256 (base32 - "1w0lca3ws5j770bmls91cn93lznvv2pc8s42nybdzz3vdxjvb4m1")))) + "1vk6j0r5cczxmwbfzzkgayna66rxkfa3q2jikz649qvdiybhls40")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -9975,14 +9978,14 @@ interval to data view, mismatch pileup, and several splicing summaries.") (define-public r-gprofiler (package (name "r-gprofiler") - (version "0.6.1") + (version "0.6.3") (source (origin (method url-fetch) (uri (cran-uri "gProfileR" version)) (sha256 (base32 - "1qix15d0wa9nspdclcawml94mng4qmr2jciv7d24py315wfsvv8p")))) + "08dsnja3g8qvqlgwhx9c9f8p8psn3qr5ddn84dhizkgglj30v2wj")))) (properties `((upstream-name . "gProfileR"))) (build-system r-build-system) (propagated-inputs @@ -10401,6 +10404,228 @@ problems in genomics, brain imaging, astrophysics, and data mining.") ;; Any version of the LGPL. (license license:lgpl3+))) +(define-public r-hdf5array + (package + (name "r-hdf5array") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "HDF5Array" version)) + (sha256 + (base32 + "0kcdza41saqv6vlpvqd841awbiwkg84lh0plx6c7fmfgbqv7a0jh")))) + (properties `((upstream-name . "HDF5Array"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-delayedarray" ,r-delayedarray) + ("r-iranges" ,r-iranges) + ("r-rhdf5" ,r-rhdf5) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://bioconductor.org/packages/HDF5Array") + (synopsis "HDF5 back end for DelayedArray objects") + (description "This package provides an array-like container for convenient +access and manipulation of HDF5 datasets. It supports delayed operations and +block processing.") + (license license:artistic2.0))) + +(define-public r-rhdf5lib + (package + (name "r-rhdf5lib") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "Rhdf5lib" version)) + (sha256 + (base32 + "0kkc4rprjbqn2wvbx4d49kk9l91vihccxbl4843qr1wqk6v33r1w")))) + (properties `((upstream-name . "Rhdf5lib"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-bundled-hdf5 + (lambda* (#:key inputs #:allow-other-keys) + (for-each delete-file '("configure" "configure.ac")) + ;; Do not make other packages link with the proprietary libsz. + (substitute* "R/zzz.R" + (("'%s/libhdf5_cpp.a %s/libhdf5.a %s/libsz.a'") + "'%s/libhdf5_cpp.a %s/libhdf5.a %s/libhdf5.a'") + (("'%s/libhdf5.a %s/libsz.a'") + "'%s/libhdf5.a %s/libhdf5.a'")) + (with-directory-excursion "src" + (invoke "tar" "xvf" (assoc-ref inputs "hdf5-source")) + (rename-file (string-append "hdf5-" ,(package-version hdf5)) + "hdf5") + (rename-file "Makevars.in" "Makevars") + (substitute* "Makevars" + (("HDF5_CXX_LIB=.*") + (string-append "HDF5_CXX_LIB=" + (assoc-ref inputs "hdf5") "/lib/libhdf5_cpp.a\n")) + (("HDF5_LIB=.*") + (string-append "HDF5_LIB=" + (assoc-ref inputs "hdf5") "/lib/libhdf5.a\n")) + (("HDF5_CXX_INCLUDE=.*") "HDF5_CXX_INCLUDE=./hdf5/c++/src\n") + (("HDF5_INCLUDE=.*") "HDF5_INCLUDE=./hdf5/src\n") + ;; szip is non-free software + (("cp \\$\\{SZIP_LIB\\}.*") "") + (("PKG_LIBS = \\$\\{HDF5_LIB\\} \\$\\{SZIP_LIB\\}") + "PKG_LIBS = ${HDF5_LIB}\n"))) + #t))))) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("hdf5" ,hdf5))) + (native-inputs + `(("hdf5-source" ,(package-source hdf5)))) + (home-page "https://bioconductor.org/packages/Rhdf5lib") + (synopsis "HDF5 library as an R package") + (description "This package provides C and C++ HDF5 libraries for use in R +packages.") + (license license:artistic2.0))) + +(define-public r-beachmat + (package + (name "r-beachmat") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "beachmat" version)) + (sha256 + (base32 + "0b6dzja5fbx4dawb7ixj67mlhw4fy62pfp20mfp918fy96zmdwqz")))) + (build-system r-build-system) + (inputs + `(("hdf5" ,hdf5))) + (propagated-inputs + `(("r-delayedarray" ,r-delayedarray) + ("r-hdf5array" ,r-hdf5array) + ("r-rcpp" ,r-rcpp) + ("r-rhdf5" ,r-rhdf5) + ("r-rhdf5lib" ,r-rhdf5lib))) + (home-page "https://bioconductor.org/packages/beachmat") + (synopsis "Compiling Bioconductor to handle each matrix type") + (description "This package provides a consistent C++ class interface for a +variety of commonly used matrix types, including sparse and HDF5-backed +matrices.") + (license license:gpl3))) + +(define-public r-singlecellexperiment + (package + (name "r-singlecellexperiment") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "SingleCellExperiment" version)) + (sha256 + (base32 + "1r276i97w64a5vdlg6952gkj7bls909p42zl8fn8yz87cdwyaars")))) + (properties + `((upstream-name . "SingleCellExperiment"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-s4vectors" ,r-s4vectors) + ("r-summarizedexperiment" ,r-summarizedexperiment))) + (home-page "https://bioconductor.org/packages/SingleCellExperiment") + (synopsis "S4 classes for single cell data") + (description "This package defines an S4 class for storing data from +single-cell experiments. This includes specialized methods to store and +retrieve spike-in information, dimensionality reduction coordinates and size +factors for each cell, along with the usual metadata for genes and +libraries.") + (license license:gpl3))) + +(define-public r-scater + (package + (name "r-scater") + (version "1.6.2") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "scater" version)) + (sha256 + (base32 + "0fp68n0xnbf90wrprqawsbilg9x7v2scp0dxb3936g20025csrdd")))) + (build-system r-build-system) + (propagated-inputs + `(("r-beachmat" ,r-beachmat) + ("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biomart" ,r-biomart) + ("r-data-table" ,r-data-table) + ("r-dplyr" ,r-dplyr) + ("r-edger" ,r-edger) + ("r-ggbeeswarm" ,r-ggbeeswarm) + ("r-ggplot2" ,r-ggplot2) + ("r-limma" ,r-limma) + ("r-matrix" ,r-matrix) + ("r-matrixstats" ,r-matrixstats) + ("r-plyr" ,r-plyr) + ("r-rcpp" ,r-rcpp) + ("r-reshape2" ,r-reshape2) + ("r-rhdf5" ,r-rhdf5) + ("r-rhdf5lib" ,r-rhdf5lib) + ("r-rjson" ,r-rjson) + ("r-s4vectors" ,r-s4vectors) + ("r-shiny" ,r-shiny) + ("r-shinydashboard" ,r-shinydashboard) + ("r-singlecellexperiment" ,r-singlecellexperiment) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-tximport" ,r-tximport) + ("r-viridis" ,r-viridis))) + (home-page "https://github.com/davismcc/scater") + (synopsis "Single-cell analysis toolkit for gene expression data in R") + (description "This package provides a collection of tools for doing +various analyses of single-cell RNA-seq gene expression data, with a focus on +quality control.") + (license license:gpl2+))) + +(define-public r-scran + (package + (name "r-scran") + (version "1.6.7") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "scran" version)) + (sha256 + (base32 + "0zfm5i8xrnzb3894xygqd6zkbwaa2x3z74wbxw39fcjhyhxv2hmb")))) + (build-system r-build-system) + (propagated-inputs + `(("r-beachmat" ,r-beachmat) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-dt" ,r-dt) + ("r-dynamictreecut" ,r-dynamictreecut) + ("r-edger" ,r-edger) + ("r-fnn" ,r-fnn) + ("r-ggplot2" ,r-ggplot2) + ("r-igraph" ,r-igraph) + ("r-limma" ,r-limma) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) + ("r-rhdf5lib" ,r-rhdf5lib) + ("r-s4vectors" ,r-s4vectors) + ("r-scater" ,r-scater) + ("r-shiny" ,r-shiny) + ("r-singlecellexperiment" ,r-singlecellexperiment) + ("r-statmod" ,r-statmod) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-viridis" ,r-viridis) + ("r-zoo" ,r-zoo))) + (home-page "https://bioconductor.org/packages/scran") + (synopsis "Methods for single-cell RNA-Seq data analysis") + (description "This package implements a variety of low-level analyses of +single-cell RNA-seq data. Methods are provided for normalization of +cell-specific biases, assignment of cell cycle phase, and detection of highly +variable and significantly correlated genes.") + (license license:gpl3))) + (define htslib-for-sambamba (let ((commit "2f3c3ea7b301f9b45737a793c0b2dcf0240e5ee5")) (package diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 82e1901aaf..5c1214506a 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; @@ -30,7 +30,7 @@ (define-public ccache (package (name "ccache") - (version "3.3.5") + (version "3.4") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r")))) + "0sfisvjs2iham29flxgmnfg7kzqz66bhk6q0qcwbdv1n569say5j")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;for test.sh ("which" ,(@ (gnu packages base) which)))) @@ -47,14 +47,14 @@ '(#:phases (modify-phases %standard-phases (add-before 'check 'setup-tests (lambda _ - (substitute* '("test/test_hashutil.c" "test.sh") + (substitute* '("unittest/test_hashutil.c" "test/suites/base.bash") (("#!/bin/sh") (string-append "#!" (which "sh")))) #t)) (add-before 'check 'munge-failing-test (lambda _ ;; XXX The new ‘Multiple -fdebug-prefix-map’ test added in ;; 3.3.5 fails (why?). Force it to report success instead. - (substitute* "test.sh" + (substitute* "test/suites/debug_prefix_map.bash" (("grep \"name\"") "true")) #t))))) (home-page "https://ccache.samba.org/") diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 58cea4ae1b..8e1eb127b2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -144,6 +144,23 @@ unit testing. Test output is in XML for automatic testing and GUI based for supervised tests.") (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball +;; Some packages require this newer version of cppunit. However, it needs +;; C++11 support, which is not enabled by default in our current GCC, and +;; updating in-place would require adding CXXFLAGS to many dependent packages. +;; Thus, keep as a separate variable for now. +;; TODO: Remove this when our default GCC is updated to 6 or higher. +(define-public cppunit-1.14 + (package + (inherit cppunit) + (version "1.14.0") + (source (origin + (method url-fetch) + (uri (string-append "https://dev-www.libreoffice.org/src/" + "cppunit-" version ".tar.gz")) + (sha256 + (base32 + "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix")))))) + (define-public catch-framework (package (name "catch") diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 86dc809adb..3bf2ec1617 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> +;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Jeff Mickey <j@codemac.net> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> @@ -1728,6 +1728,7 @@ Compression ratios of 2:1 to 3:1 are common for text files.") (define-public unzip (package (inherit zip) (name "unzip") + (replacement unzip/fixed) (version "6.0") (source (origin @@ -1778,6 +1779,20 @@ recreates the stored directory structure by default.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) +(define unzip/fixed + (package/inherit unzip + (arguments + (substitute-keyword-arguments (package-arguments unzip) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fortify + (lambda _ + ;; Mitigate CVE-2018-1000035, an exploitable buffer overflow. + ;; This environment variable is recommended in 'unix/Makefile' + ;; for passing flags to the C compiler. + (setenv "LOCAL_UNZIP" "-D_FORTIFY_SOURCE=1") + #t)))))))) + (define-public zziplib (package (name "zziplib") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 95e0faf2a0..603d231a04 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -95,13 +95,13 @@ error stream.") (define-public r-rcpp (package (name "r-rcpp") - (version "0.12.14") + (version "0.12.15") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "0qvyxggddyg87lza45hjl0a2prabdyshkqzkz418vi777zygqa6s")))) + (base32 "1pnv6sl4vdn69ygmgrb1b3gsigfdcfb56wnzikic93l8gkvdsvxv")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") @@ -206,14 +206,14 @@ on (non-orthogonal) variable vectors in scatterplots and biplots.") (define-public r-shape (package (name "r-shape") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) (uri (cran-uri "shape" version)) (sha256 (base32 - "1v9xp60p813rnx41vchkh32qmcb4z2zp9l7r1a8a6f8aqylnq3vj")))) + "0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/shape") (synopsis "Functions for plotting graphical shapes") @@ -321,14 +321,14 @@ rows, dropping names) to see if the modified versions are identical.") (define-public r-dendextend (package (name "r-dendextend") - (version "1.6.0") + (version "1.7.0") (source (origin (method url-fetch) (uri (cran-uri "dendextend" version)) (sha256 (base32 - "0pichh08zi12lpxzc061dmv4smj6lizygd1xymln8wfz18sf7923")))) + "1krvqadnnh53xx5ql7bwzxaif6a317jzbs1m00gnc6jnj03rfl5d")))) (build-system r-build-system) (propagated-inputs `(("r-fpc" ,r-fpc) @@ -542,14 +542,14 @@ plot networks.") (define-public r-proxy (package (name "r-proxy") - (version "0.4-20") + (version "0.4-21") (source (origin (method url-fetch) (uri (cran-uri "proxy" version)) (sha256 (base32 - "15g6dacdmlbkcnimblscghl23aj732cn6qwbs583r4im9v5nvbla")))) + "1vih8gsfzv97h5c8ixd1qjnn02i7fzla2p9fdj2wpisqhx0p0xv0")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/proxy") (synopsis "Distance and similarity measures") @@ -562,14 +562,14 @@ most popular ones.") (define-public r-sp (package (name "r-sp") - (version "1.2-5") + (version "1.2-7") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 (base32 - "09yydnacp33yx0kn537k96fjlbf75fjafqfknpa5gvci4l888bqd")))) + "0q04yfgyjannsrzl0ppwcv0simrxrrbx2iz5mzaafc5x38zf0q3d")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -989,20 +989,44 @@ testing framework of Wald are generic and can therefore also be used in other contexts.") (license license:gpl2+))) +(define-public r-squarem + (package + (name "r-squarem") + (version "2017.10-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "SQUAREM" version)) + (sha256 + (base32 + "10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv")))) + (properties `((upstream-name . "SQUAREM"))) + (build-system r-build-system) + (home-page "http://www.jhsph.edu/agingandhealth/People/Faculty_personal_pages/Varadhan.html") + (synopsis "Squared Extrapolation Methods for Accelerating EM-Like Monotone Algorithms") + (description + "This package provides algorithms for accelerating the convergence of +slow, monotone sequences from smooth, contraction mapping such as the EM +algorithm. It can be used to accelerate any smooth, linearly convergent +acceleration scheme. A tutorial style introduction to this package is +available in a vignette.") + (license license:gpl2+))) + (define-public r-lava (package (name "r-lava") - (version "1.5.1") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "lava" version)) (sha256 (base32 - "1vcm04h9i39gmf2prl5d4j4il4gs6skzr6y2fvl1vn4hklna87f4")))) + "02xf5d968raz9gnq5ywy04wz29xpdyca1hm79vbbg1mcxvzdl1dz")))) (build-system r-build-system) (propagated-inputs `(("r-numderiv" ,r-numderiv) + ("r-squarem" ,r-squarem) ("r-survival" ,r-survival))) (home-page "https://github.com/kkholst/lava") (synopsis "Latent variable models") @@ -1014,14 +1038,14 @@ variable models.") (define-public r-drr (package (name "r-drr") - (version "0.0.2") + (version "0.0.3") (source (origin (method url-fetch) (uri (cran-uri "DRR" version)) (sha256 (base32 - "1scfwp6ry6apxzqjclsmn2frxp9qfw6zxsxn5w0j0q3sz42hz1h2")))) + "1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl")))) (properties `((upstream-name . "DRR"))) (build-system r-build-system) (propagated-inputs @@ -1106,14 +1130,14 @@ calendar objects.") (define-public r-ddalpha (package (name "r-ddalpha") - (version "1.3.1") + (version "1.3.1.1") (source (origin (method url-fetch) (uri (cran-uri "ddalpha" version)) (sha256 (base32 - "0pczw9543y7f92m7gyk7rxcjn8vsjaldc5vl0r56ywip9i374zbh")))) + "13w8ir5rd80rka4mq343zd4wn93vfw870lzfqrd3cxgwb1bwcw7y")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) @@ -1279,14 +1303,14 @@ provides a one-row summary of model-level statistics.") (define-public r-recipes (package (name "r-recipes") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "0id46c7iaf49miw4kxpidsbg3hdywav43n1lh2zd1vg5946bzg04")))) + "1car3a3mqn87pz049cbgkaayz86970mvkapk6al2k7jjw76306l9")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) @@ -2072,3 +2096,86 @@ around the relevant area. This work is based on the @code{ggplot2} and dendrogram panes, and the placing of factor variables in the sides of the heatmap.") (license (list license:gpl2 license:gpl3)))) + +(define-public r-xfun + (package + (name "r-xfun") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "xfun" version)) + (sha256 + (base32 + "1sm51gmwgw876d6d1q8smxmfgfh6zsnykfx8qp8z6jmh0fvd89pj")))) + (build-system r-build-system) + (home-page "https://github.com/yihui/xfun") + (synopsis "Miscellaneous functions") + (description + "This package provides miscellaneous functions commonly used in other +packages maintained by Yihui Xie.") + (license license:expat))) + +(define-public r-utf8 + (package + (name "r-utf8") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "utf8" version)) + (sha256 + (base32 + "03s4j6059q0nly68vpk6wy3p3f5ypakw93fj35kzd82b4z1r9cs3")))) + (build-system r-build-system) + (home-page "https://github.com/patperry/r-utf8") + (synopsis "Unicode text processing") + (description + "This package provides tools to process and print UTF-8 encoded +international text (Unicode). Input, validate, normalize, encode, format, and +display.") + (license license:asl2.0))) + +(define-public r-pillar + (package + (name "r-pillar") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "pillar" version)) + (sha256 + (base32 + "1gh3j2pbbf5y4d5nyqnlr0x27jjyvjjspcccmw61airs1n6rx8jq")))) + (build-system r-build-system) + (propagated-inputs + `(("r-cli" ,r-cli) + ("r-crayon" ,r-crayon) + ("r-rlang" ,r-rlang) + ("r-utf8" ,r-utf8))) + (home-page "https://github.com/r-lib/pillar") + (synopsis "Coloured formatting for columns") + (description + "This package provides a @code{pillar} generic designed for formatting +columns of data using the full range of colours provided by modern +terminals.") + (license license:gpl3))) + +(define-public r-uuid + (package + (name "r-uuid") + (version "0.1-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "uuid" version)) + (sha256 + (base32 + "1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx")))) + (build-system r-build-system) + (home-page "http://www.rforge.net/uuid") + (synopsis "Tools for generating and handling of UUIDs") + (description + "This package provides tools for generating and handling of +@dfn{Universally Unique Identifiers} (UUIDs).") + (license license:expat))) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index e616c9223f..5e5bc4de05 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -87,16 +87,18 @@ communication, encryption, decryption, signatures, etc.") (define-public libmd (package (name "libmd") - (version "0.0.0") + (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append - "https://archive.hadrons.org/software/libmd/libmd-" - version - ".tar.xz")) + (uri + (list + (string-append "https://archive.hadrons.org/software/libmd/libmd-" + version ".tar.xz") + (string-append "https://libbsd.freedesktop.org/releases/libmd-" + version ".tar.xz"))) (sha256 (base32 - "121s73pgbqsnmy6xblbrkj9y44c5zzzpf2hcmh6zvcvg4dk26gzx")))) + "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj")))) (build-system gnu-build-system) (synopsis "Message Digest functions from BSD systems") (description diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d7effa4a87..7e36ceb6b4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2015, 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Adriano Peluso <catonano@gmail.com> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org> @@ -280,6 +280,7 @@ editor (without an X toolkit)" ) (uri (git-reference (url "git://git.hcoop.net/git/bpt/emacs.git") (commit "41120e0f595b16387eebfbf731fff70481de1b4b"))) + (file-name (string-append name "-" version "-checkout")) (patches (search-patches "guile-emacs-fix-configure.patch")) (sha256 (base32 @@ -957,7 +958,7 @@ light user interface.") (define-public emacs-emms-player-mpv (package (name "emacs-emms-player-mpv") - (version "0.0.10") + (version "0.0.13") (source (origin (method url-fetch) @@ -966,7 +967,7 @@ light user interface.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1q81fpmwr8hpdgq71vbdai2nml4yyqbmk4ffdyl4irlwph8gfjyq")))) + "01i0bz7wdqzcnv5r63m9xgl07yf1nmn86dwy00rcfsn5za46y3r3")))) (build-system emacs-build-system) (propagated-inputs `(("emms" ,emms))) @@ -1621,6 +1622,7 @@ management tasks from Emacs. To begin with, run @code{M-x guix-about} or (uri (string-append "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/" "archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0knpgi55jm09282aqf8pv55zillpnpzf9f4sgm6gwsmvxf17xaw0")))) @@ -2385,6 +2387,7 @@ the speedbar window.") (uri (git-reference (commit "880706469338ab59b5bb7dbe8460016f89755364") (url "https://github.com/gregsexton/ob-ipython.git"))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1scf25snbds9ymagpny30ijbsg479r3nm0ih01dy4m9d0g7qryb7")))) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 870574ae18..b2e33ea10b 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> @@ -525,6 +525,9 @@ with a layered architecture of JTAG interface and TAP support.") `(modify-phases ,phases (add-after 'unpack 'chdir (lambda _ (chdir "gcc") #t)))))) + (native-inputs + `(("gcc-4" ,gcc-4.9) + ,@(package-native-inputs propeller-gcc-6))) (home-page "https://github.com/parallaxinc/propgcc") (supported-systems (delete "aarch64-linux" %supported-systems))))) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3149d36bae..f11cc76d9c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -208,7 +208,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.4) (name "go") - (version "1.9.3") + (version "1.9.4") (source (origin (method url-fetch) @@ -216,7 +216,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "1bj73hrr7jjdg0w6snwkqb5y3yrlks5nrs2lgnkyy0hyx7b0lgaf")))) + "01nw8rfvf10naja0wq0kabsm012sbqq76hd4b8c7g28n6ggshwq5")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index d6d20218cf..8a3b8ad866 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 ng0 <ng0@infotropique.org> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org> @@ -180,7 +180,7 @@ timer functions of different operating systems via a unified API.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "0.11.0.1") + (version "0.11.0.4") (source (origin (method url-fetch) @@ -190,12 +190,13 @@ timer functions of different operating systems via a unified API.") ".tar.gz")) (sha256 (base32 - "1chapivmmwsb1ghwagvdm80bfj3hdk75m94z4p212ng2i4ghpjkx")))) + "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) ("ghc-mtl" ,ghc-mtl) ("ghc-tagged" ,ghc-tagged) + ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-regex-tdfa-rc" ,ghc-regex-tdfa-rc) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-unbounded-delays" ,ghc-unbounded-delays) @@ -310,10 +311,36 @@ only those tests that failed in the last run, or to only run the tests that have been added since previous test run.") (license license:bsd-3))) +(define-public ghc-tasty-expected-failure + (package + (name "ghc-tasty-expected-failure") + (version "0.11.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "tasty-expected-failure/tasty-expected-failure-" + version ".tar.gz")) + (sha256 + (base32 + "0r555f18d2gj96pjyc13chn1nxaxl81am4xgip3mvvjhw8s5mva1")))) + (build-system haskell-build-system) + (inputs + `(("ghc-tagged" ,ghc-tagged) + ("ghc-tasty" ,ghc-tasty))) + (home-page "http://github.com/nomeata/tasty-expected-failure") + (synopsis "Mark tasty tests as failure expected") + (description + "With the function @code{Test.Tasty.ExpectedFailure.expectFail} in the +provided module @code{Test.Tasty.ExpectedFailure}, you can mark that you +expect test cases to fail, and not to pass. This can be used for test-driven +development.") + (license license:expat))) + (define-public ghc-quickcheck-instances (package (name "ghc-quickcheck-instances") - (version "0.3.12") + (version "0.3.16.1") (source (origin (method url-fetch) @@ -323,18 +350,22 @@ been added since previous test run.") version ".tar.gz")) (sha256 (base32 - "1wwvkzpams7i0j7nk5qj8vvhj8x5zcbgbgrpczszgvshva4bkmfx")))) + "01v5bs7r9yvhkvb4yc9bqnacy8r6cy2gr9lnmwx40n5apgi0gcbz")))) (build-system haskell-build-system) (inputs - `(("ghc-old-time" ,ghc-old-time) - ("ghc-unordered-containers" ,ghc-unordered-containers) + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-hashable" ,ghc-hashable) - ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-old-time" ,ghc-old-time) ("ghc-scientific" ,ghc-scientific) - ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text))) - (home-page - "https://github.com/aslatter/qc-instances") + ("ghc-tagged" ,ghc-tagged) + ("ghc-text" ,ghc-text) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-uuid-types" ,ghc-uuid-types) + ("ghc-vector" ,ghc-vector))) + (home-page "https://github.com/aslatter/qc-instances") (synopsis "Common quickcheck instances") (description "This package provides QuickCheck instances for types provided by the Haskell Platform.") @@ -390,7 +421,7 @@ use HUnit assertions as QuickCheck properties.") (define-public ghc-quickcheck (package (name "ghc-quickcheck") - (version "2.8.2") + (version "2.10.1") (outputs '("out" "doc")) (source (origin @@ -401,21 +432,38 @@ use HUnit assertions as QuickCheck properties.") ".tar.gz")) (sha256 (base32 - "1ai6k5v0bibaxq8xffcblc6rwmmk6gf8vjyd9p2h3y6vwbhlvilq")))) + "1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx")))) (build-system haskell-build-system) (arguments `(#:tests? #f ; FIXME: currently missing libraries used for tests. #:configure-flags '("-f base4"))) (inputs - `(("ghc-tf-random" ,ghc-tf-random))) - (home-page - "https://github.com/nick8325/quickcheck") - (synopsis - "Automatic testing of Haskell programs") + `(("ghc-random" ,ghc-random) + ("ghc-tf-random" ,ghc-tf-random))) + (home-page "https://github.com/nick8325/quickcheck") + (synopsis "Automatic testing of Haskell programs") (description - "QuickCheck is a library for random testing of program properties.") + "QuickCheck is a library for random testing of program properties. The +programmer provides a specification of the program, in the form of properties +which functions should satisfy, and QuickCheck then tests that the properties +hold in a large number of randomly generated cases. Specifications are +expressed in Haskell, using combinators defined in the QuickCheck library.") (license license:bsd-3))) +(define-public ghc-quickcheck-latest + (package (inherit ghc-quickcheck) + (version "2.11.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/QuickCheck/QuickCheck-" + version + ".tar.gz")) + (sha256 + (base32 + "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328")))))) + (define-public ghc-test-framework (package (name "ghc-test-framework") @@ -429,6 +477,8 @@ use HUnit assertions as QuickCheck properties.") (base32 "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=time"))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck))) @@ -478,7 +528,7 @@ reporting and test statistics output.") (define-public ghc-test-framework-quickcheck2 (package (name "ghc-test-framework-quickcheck2") - (version "0.3.0.3") + (version "0.3.0.4") (source (origin (method url-fetch) @@ -487,14 +537,7 @@ reporting and test statistics output.") "test-framework-quickcheck2-" version ".tar.gz")) (sha256 (base32 - "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc")) - (modules '((guix build utils))) - (snippet - ;; The Hackage page and the cabal file linked there for this package - ;; both list 2.9 as the upper version limit, but the source tarball - ;; specifies 2.8. Assume the Hackage page is correct. - '(substitute* "test-framework-quickcheck2.cabal" - (("QuickCheck >= 2.4 && < 2.8") "QuickCheck >= 2.4 && < 2.9"))))) + "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) @@ -545,7 +588,7 @@ using Template Haskell") (define-public ghc-hunit (package (name "ghc-hunit") - (version "1.2.5.2") + (version "1.3.1.2") (outputs '("out" "doc")) (source (origin @@ -556,7 +599,7 @@ using Template Haskell") ".tar.gz")) (sha256 (base32 - "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a")))) + "10akdh4fl615rrshxi3m5gf414il1q42z4zqyb6q4jasmscvzpms")))) (build-system haskell-build-system) (home-page "http://hunit.sourceforge.net/") (synopsis "Unit testing framework for Haskell") @@ -568,7 +611,7 @@ JUnit tool for Java.") (define-public hspec-discover (package (name "hspec-discover") - (version "2.2.0") + (version "2.2.4") (source (origin (method url-fetch) @@ -578,7 +621,7 @@ JUnit tool for Java.") ".tar.gz")) (sha256 (base32 - "0w3awzbljf4hqhxrjrxqa1lfcclg92bhmq641gz2q80vycspapzx")))) + "1bz7wb8v0bx1amiz4bpj34xq97d1ia29n3f654wcrh6lacydp3dv")))) (build-system haskell-build-system) (arguments `(#:haddock? #f)) ; Haddock phase fails because there are no ; documentation files. @@ -592,7 +635,7 @@ runs Hspec tests.") (define-public ghc-hspec-core (package (name "ghc-hspec-core") - (version "2.2.0") + (version "2.2.4") (source (origin (method url-fetch) @@ -602,7 +645,7 @@ runs Hspec tests.") ".tar.gz")) (sha256 (base32 - "1wgd55k652jaf81nkvciyqi67ycj7zamr4nd9z1cqf8nr9fc3sa4")))) + "0x845ngfl6vf65fnpb5mm3wj0ql45pz11bnm0x4gxc4ybd9c52ij")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs @@ -623,7 +666,7 @@ be used to extend Hspec's functionality.") (define-public ghc-hspec-meta (package (name "ghc-hspec-meta") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) @@ -633,7 +676,7 @@ be used to extend Hspec's functionality.") ".tar.gz")) (sha256 (base32 - "1fmqmgrzp135cxhmxxbaswkk4bqbpgfml00cmcz0d39n11vzpa5z")))) + "1m1pkrxiglxzwv8gdj5jr1bdbhxvvg6sbl9m61w4565d7k1m8yxa")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) @@ -653,7 +696,7 @@ used to test the in-development version of Hspec.") (define-public ghc-hspec (package (name "ghc-hspec") - (version "2.2.0") + (version "2.2.4") (source (origin (method url-fetch) @@ -663,7 +706,7 @@ used to test the in-development version of Hspec.") ".tar.gz")) (sha256 (base32 - "0zqisxznlbszivsgy3irvf566zhcr6ipqqj3x9i7pj5hy913jwqf")))) + "1cf90gqvg1iknja6ymxqxyabpahcxni3blqllh81ywbir3whljvj")))) (build-system haskell-build-system) (inputs `(("ghc-hspec-core" ,ghc-hspec-core) @@ -726,3 +769,27 @@ Haskell, inspired by the Ruby library RSpec.") (description "This library provides catchy combinators for HUnit, see @uref{https://github.com/sol/hspec-expectations#readme, the README}.") (license license:expat))) + +(define-public ghc-nanospec + (package + (name "ghc-nanospec") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "nanospec/nanospec-" + version ".tar.gz")) + (sha256 + (base32 + "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-silently" ,ghc-silently))) + (home-page "https://github.com/hspec/nanospec#readme") + (synopsis "Lightweight implementation of a subset of Hspec's API") + (description + "Nanospec is a lightweight implementation of a subset of Hspec's API with +minimal dependencies.") + (license license:expat))) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index f1c9b9f26c..d930536e3f 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> -;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 ng0 <ng0@infotropique.org> ;;; Copyright © 2017 rsiddharth <s@ricketyspace.net> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> @@ -257,7 +257,7 @@ the C implementation.") (define-public ghc-cryptonite (package (name "ghc-cryptonite") - (version "0.19") + (version "0.20") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -265,7 +265,7 @@ the C implementation.") version ".tar.gz")) (sha256 (base32 - "1rw5k34vpn4134yrzdhf0rsshsrkixfbv9ap18di2n00z2cw1shw")))) + "0m63np0affci7ba9mrkvw2flzxn0s2mk930xldc4dwijw32gl6r6")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) @@ -419,14 +419,14 @@ libraries, like OpenSSL.") (define-public ghc-x509 (package (name "ghc-x509") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "x509/x509-" version ".tar.gz")) (sha256 (base32 - "1pmsby29abn485fvnymsgipvb3p1ch9c591xj5ncszkf0ivjiiin")))) + "0hixx76wpb4qxida017ka5zr6lrsycahrqyw8z90q9mxvndpy3my")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) @@ -449,7 +449,7 @@ libraries, like OpenSSL.") (define-public ghc-x509-store (package (name "ghc-x509-store") - (version "1.6.1") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -457,7 +457,7 @@ libraries, like OpenSSL.") version ".tar.gz")) (sha256 (base32 - "01abx528i9f7djq2772xyna8x2mykrnwqkcfrapcx7z3bhprvml3")))) + "0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9")))) (build-system haskell-build-system) (inputs `(("ghc-mtl" ,ghc-mtl) @@ -476,7 +476,7 @@ collections, certificates, revocation lists, and exception lists.") (define-public ghc-x509-validation (package (name "ghc-x509-validation") - (version "1.6.3") + (version "1.6.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -484,7 +484,7 @@ collections, certificates, revocation lists, and exception lists.") version ".tar.gz")) (sha256 (base32 - "1qr1v561hdlhjgqjv9pj9mbk0q1xf2mr1j67ghy93nlxxyzd7dw0")))) + "190w1sr3w6w49v3yvqz4grb0v09ym4gll3n8bxwijvbvcybk3xyi")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) @@ -508,7 +508,7 @@ list validation.") (define-public ghc-x509-system (package (name "ghc-x509-system") - (version "1.6.1") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -516,7 +516,7 @@ list validation.") version ".tar.gz")) (sha256 (base32 - "10qf60d2f9jqwnbrhsb2cwpi86xg66m6dxndlxw967v1cdb3h6gf")))) + "0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr")))) (build-system haskell-build-system) (inputs `(("ghc-mtl" ,ghc-mtl) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index e43f20b843..a24ee4b7c0 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> -;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 rsiddharth <s@ricketyspace.net> @@ -36,7 +36,7 @@ (define-public ghc-tagsoup (package (name "ghc-tagsoup") - (version "0.14") + (version "0.14.3") (source (origin (method url-fetch) @@ -46,11 +46,12 @@ ".tar.gz")) (sha256 (base32 - "07pax7i0bl79dmqqz58zy09yrgpnyyr2ya0z183hv96kp65jv0lh")))) + "00j2rm2sx0syn16kg2402fz4k8yqfl9knmi367jsiycds1q9zzf9")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) - (home-page - "http://community.haskell.org/~ndm/tagsoup/") + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "http://community.haskell.org/~ndm/tagsoup/") (synopsis "Parsing and extracting information from (possibly malformed) HTML/XML documents") @@ -126,7 +127,7 @@ both client and server code).") (define-public ghc-http (package (name "ghc-http") - (version "4000.2.20") + (version "4000.3.3") (outputs '("out" "doc")) (source (origin @@ -137,7 +138,7 @@ both client and server code).") ".tar.gz")) (sha256 (base32 - "0nyqdxr5ls2dxkf4a1f3x15xzwdm46ppn99nkcbhswlr6s3cq1s4")))) + "1wlvvqcxsnd2is3khsla0vd8i9cy12v1pg6d6i13ihcd131a7bdv")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit))) @@ -391,7 +392,7 @@ communication between web applications and web servers.") (define-public ghc-wai-logger (package (name "ghc-wai-logger") - (version "2.2.4.1") + (version "2.3.0") (source (origin (method url-fetch) @@ -401,7 +402,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "1s6svvy3ci4j1dj1jaw8hg628miwj8f5gpy9n8d8hpsaxav6nzgk")))) + "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported ; by propagated-inputs. @@ -424,7 +425,7 @@ communication between web applications and web servers.") (define-public ghc-wai-extra (package (name "ghc-wai-extra") - (version "3.0.13.1") + (version "3.0.18") (source (origin (method url-fetch) @@ -434,7 +435,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "0mh761a1bayr4ydwqmh3h8ndpi19zqw34mmy49lp2abr70r0nm1p")))) + "0r079mqqdv14fp97w0rigdpwk6b88grpjlqsjc5y8bbc0skf5za2")))) (build-system haskell-build-system) (inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal) @@ -578,17 +579,16 @@ a WAI handler, via the native Haskell TLS implementation.") (define-public ghc-xss-sanitize (package (name "ghc-xss-sanitize") - (version "0.3.5.6") + (version "0.3.5.7") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/xss-sanitize/xss-sanitize-" - version - ".tar.gz")) + version ".tar.gz")) (sha256 (base32 - "1j2qrn2dbfx01m7zyk9ilgnp9zjwq9mk62b0rdal4zkg4vh212h0")))) + "005cmhaw9xbzkcn42jmhvcvk63bzmg4lml368xwmqdvh7r0mcn4m")))) (build-system haskell-build-system) (inputs `(("ghc-tagsoup" ,ghc-tagsoup) @@ -610,7 +610,7 @@ attacks.") (define-public ghc-css-text (package (name "ghc-css-text") - (version "0.1.2.1") + (version "0.1.3.0") (source (origin (method url-fetch) @@ -620,7 +620,7 @@ attacks.") ".tar.gz")) (sha256 (base32 - "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw")))) + "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text) @@ -636,7 +636,7 @@ Haskell.") (define-public ghc-mime-types (package (name "ghc-mime-types") - (version "0.1.0.6") + (version "0.1.0.7") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -644,7 +644,7 @@ Haskell.") version ".tar.gz")) (sha256 (base32 - "090z3dp928243amnc6s8g10rk2h2bprk9y138q6wj3cpflzr72pw")))) + "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) @@ -702,23 +702,29 @@ Strict, Transitional and Frameset variants.") (define-public ghc-blaze-html (package (name "ghc-blaze-html") - (version "0.8.1.1") + (version "0.9.0.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/blaze-html/blaze-html-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/" + "blaze-html/blaze-html-" + version ".tar.gz")) (sha256 (base32 - "1dnw50kh0s405cg9i2y4a8awanhj3bqzk21jwgfza65kcjby7lpq")))) + "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-text" ,ghc-text) ("ghc-blaze-markup" ,ghc-blaze-markup))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (home-page "http://jaspervdj.be/blaze") (synopsis "Fast HTML combinator library") (description "This library provides HTML combinators for Haskell.") @@ -727,7 +733,7 @@ Strict, Transitional and Frameset variants.") (define-public ghc-aeson (package (name "ghc-aeson") - (version "0.10.0.0") + (version "1.2.4.0") (source (origin (method url-fetch) @@ -737,21 +743,33 @@ Strict, Transitional and Frameset variants.") ".tar.gz")) (sha256 (base32 - "19kp33rfivr4d3myyr8xn803wd7p8x5nc4wb3qvlgjwgyqjaxvrz")))) + "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-base-compat" ,ghc-base-compat) ("ghc-dlist" ,ghc-dlist) - ("ghc-mtl" ,ghc-mtl) + ("ghc-hashable" ,ghc-hashable) ("ghc-scientific" ,ghc-scientific) - ("ghc-syb" ,ghc-syb) + ("ghc-tagged" ,ghc-tagged) + ("ghc-text" ,ghc-text) + ("ghc-th-abstraction" ,ghc-th-abstraction) + ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-uuid-types" ,ghc-uuid-types) ("ghc-vector" ,ghc-vector) - ("ghc-hashable" ,ghc-hashable) - ("ghc-text" ,ghc-text) ("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck))) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-integer-logarithms" ,ghc-integer-logarithms) + ("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-generic-deriving" ,ghc-generic-deriving) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-hashable-time" ,ghc-hashable-time))) (home-page "https://github.com/bos/aeson") (synopsis "Fast JSON parsing and encoding") (description "This package provides a JSON parsing and encoding library @@ -762,7 +780,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") - (version "0.7.2") + (version "0.8.5") (source (origin (method url-fetch) (uri (string-append @@ -770,14 +788,15 @@ naming: in Greek mythology, Aeson was the father of Jason.)") version ".tar.gz")) (sha256 (base32 - "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234")))) + "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-scientific" ,ghc-scientific) ("ghc-vector" ,ghc-vector) ("ghc-text" ,ghc-text) - ("ghc-unordered-containers" - ,ghc-unordered-containers) + ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-cmdargs" ,ghc-cmdargs))) (home-page "https://github.com/informatikr/aeson-pretty") diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5db0c79073..b5950051a5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> @@ -136,7 +136,7 @@ top of CLISP.") ;; ;; - Test posix010 tries to check the existence of a user on the system: ;; getUserEntryForName: does not exist (no such user) -(define-public ghc +(define-public ghc-7 (package (name "ghc") (version "7.10.2") @@ -349,7 +349,7 @@ interactive environment for the functional language Haskell.") ("python" ,python-2) ; for tests ("ghostscript" ,ghostscript) ; for tests ;; GHC is built with GHC. - ("ghc-bootstrap" ,ghc))) + ("ghc-bootstrap" ,ghc-7))) (arguments `(#:test-target "test" ;; We get a smaller number of test failures by disabling parallel test @@ -426,6 +426,8 @@ interactive environment for the functional language Haskell.") interactive environment for the functional language Haskell.") (license license:bsd-3))) +(define-public ghc ghc-8) + (define-public ghc-hostname (package (name "ghc-hostname") @@ -475,7 +477,7 @@ determine the hostname.") (define-public ghc-prelude-extras (package (name "ghc-prelude-extras") - (version "0.4.0.2") + (version "0.4.0.3") (source (origin (method url-fetch) @@ -485,7 +487,7 @@ determine the hostname.") ".tar.gz")) (sha256 (base32 - "1q7mj9hysy747vimnlyrwsk1wb2axymxixa76fwcbcnmz3fi4llp")))) + "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9")))) (build-system haskell-build-system) (home-page "https://github.com/ekmett/prelude-extras") (synopsis "Higher order versions of Prelude classes") @@ -497,7 +499,7 @@ reduce @code{UndecidableInstances}.") (define-public ghc-data-default (package (name "ghc-data-default") - (version "0.5.3") + (version "0.7.1.1") (source (origin (method url-fetch) @@ -506,7 +508,7 @@ reduce @code{UndecidableInstances}.") version ".tar.gz")) (sha256 - (base32 "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c")))) + (base32 "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh")))) (build-system haskell-build-system) (inputs `(("ghc-data-default-class" @@ -530,7 +532,7 @@ packages.") (define-public ghc-data-default-class (package (name "ghc-data-default-class") - (version "0.0.1") + (version "0.1.2.0") (source (origin (method url-fetch) @@ -538,7 +540,7 @@ packages.") "https://hackage.haskell.org/package/data-default-class/" "data-default-class-" version ".tar.gz")) (sha256 - (base32 "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d")))) + (base32 "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/data-default-class") (synopsis "Types with default values") @@ -549,7 +551,7 @@ packages.") (define-public ghc-data-default-instances-base (package (name "ghc-data-default-instances-base") - (version "0.0.1") + (version "0.1.0.1") (source (origin (method url-fetch) @@ -558,7 +560,7 @@ packages.") "data-default-instances-base/" "data-default-instances-base-" version ".tar.gz")) (sha256 - (base32 "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb")))) + (base32 "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4")))) (build-system haskell-build-system) (inputs `(("ghc-data-default-class" ,ghc-data-default-class))) @@ -638,7 +640,7 @@ nothing.") (define-public ghc-haddock-library (package (name "ghc-haddock-library") - (version "1.2.1") + (version "1.4.3") (source (origin (method url-fetch) @@ -648,17 +650,16 @@ nothing.") ".tar.gz")) (sha256 (base32 - "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g")))) + "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p")))) (build-system haskell-build-system) (inputs - `(("ghc-base-compat" ,ghc-base-compat) + `(("ghc-base-compat" ,ghc-base-compat))) + (native-inputs + `(("hspec-discover" ,hspec-discover) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) - (native-inputs - `(("hspec-discover" ,hspec-discover))) (home-page "http://www.haskell.org/haddock/") - (synopsis - "Library exposing some functionality of Haddock") + (synopsis "Library exposing some functionality of Haddock") (description "Haddock is a documentation-generation tool for Haskell libraries. These modules expose some functionality of it without pulling in the GHC dependency. @@ -670,7 +671,8 @@ the ‘haddock’ package.") (define-public ghc-haddock-api (package (name "ghc-haddock-api") - (version "2.16.1") + ;; This is the last version to be supported by Cabal < 2.0 + (version "2.17.4") (source (origin (method url-fetch) @@ -680,21 +682,47 @@ the ‘haddock’ package.") ".tar.gz")) (sha256 (base32 - "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2")))) + "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss")))) (build-system haskell-build-system) (inputs `(("ghc-paths" ,ghc-paths) ("ghc-haddock-library" ,ghc-haddock-library))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) (home-page "http://www.haskell.org/haddock/") (synopsis "API for documentation-generation tool Haddock") (description "This package provides an API to Haddock, the documentation-generation tool for Haskell libraries.") (license license:bsd-3))) +(define-public ghc-haddock-test + (package + (name "ghc-haddock-test") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "haddock-test/haddock-test-" + version ".tar.gz")) + (sha256 + (base32 + "1ax8fnfrwx66csj952f3virxzapipan9da7z5l1zc12nqkifbs7w")))) + (build-system haskell-build-system) + (inputs + `(("ghc-xml" ,ghc-xml) + ("ghc-syb" ,ghc-syb))) + (home-page "http://www.haskell.org/haddock/") + (synopsis "Test utilities for Haddock") + (description "This package provides test utilities for Haddock.") + (license license:bsd-3))) + (define-public ghc-haddock (package (name "ghc-haddock") - (version "2.16.1") + (version "2.17.4") (source (origin (method url-fetch) @@ -704,12 +732,16 @@ documentation-generation tool for Haskell libraries.") ".tar.gz")) (sha256 (base32 - "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26")))) + "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Tests break with GHC 7.10.2, fixed - ; upstream. See - ; <https://github.com/haskell/haddock/issues/427> + ;; FIXME: Tests fail with this error: + ;; driver-test/Main.hs:4:1: error: + ;; Failed to load interface for ‘ResponseFileSpec’ + (arguments `(#:tests? #f)) (inputs `(("ghc-haddock-api" ,ghc-haddock-api))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-haddock-test" ,ghc-haddock-test))) (home-page "http://www.haskell.org/haddock/") (synopsis "Documentation-generation tool for Haskell libraries") @@ -802,7 +834,7 @@ tool lex or flex for C/C++.") (define-public ghc-cgi (package (name "ghc-cgi") - (version "3001.2.2.2") + (version "3001.3.0.2") (source (origin (method url-fetch) @@ -812,17 +844,20 @@ tool lex or flex for C/C++.") ".tar.gz")) (sha256 (base32 - "0q1pxpa8gi42c0hsidcdkhk5xr5anfrvhqsn3iksr9c0rllhz193")))) + "1hbpplss1m4rdpm4ibip6fpimlhssqa14fl338kl2jbc463i64cj")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-parsec" ,ghc-parsec) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-old-time" ,ghc-old-time) ("ghc-exceptions" ,ghc-exceptions) ("ghc-multipart" ,ghc-multipart) ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network) ("ghc-mtl" ,ghc-mtl))) + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/cheecheeo/haskell-cgi") (synopsis "Library for writing CGI programs") @@ -897,10 +932,71 @@ specification in BNF, Happy generates Haskell code to parse the grammar. Happy works in a similar way to the yacc tool for C.") (license license:bsd-3))) +(define-public ghc-haskell-lexer + (package + (name "ghc-haskell-lexer") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haskell-lexer/haskell-lexer-" + version ".tar.gz")) + (sha256 + (base32 + "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/haskell-lexer") + (synopsis "Fully compliant Haskell 98 lexer") + (description + "This package provides a fully compliant Haskell 98 lexer.") + (license license:bsd-3))) + +(define-public ghc-pretty-show + (package + (name "ghc-pretty-show") + (version "1.6.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/pretty-show/" + "pretty-show-" version ".tar.gz")) + (sha256 + (base32 + "1fblcxw4z4ry14brin1mvwccs6hqqlhi7xhwv1f23szjq25cjacn")))) + (build-system haskell-build-system) + (inputs + `(("ghc-haskell-lexer" ,ghc-haskell-lexer) + ("ghc-happy" ,ghc-happy))) + (home-page "http://wiki.github.com/yav/pretty-show") + (synopsis "Tools for working with derived `Show` instances") + (description + "This package provides a library and an executable for working with +derived @code{Show} instances. By using the library, derived @code{Show} +instances can be parsed into a generic data structure. The @code{ppsh} tool +uses the library to produce human-readable versions of @code{Show} instances, +which can be quite handy for debugging Haskell programs. We can also render +complex generic values into an interactive Html page, for easier +examination.") + (license license:expat))) + +(define-public ghc-pretty-show-for-haskell-src-exts + (package (inherit ghc-pretty-show) + (name "ghc-pretty-show") + (version "1.6.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/pretty-show/" + "pretty-show-" version ".tar.gz")) + (sha256 + (base32 + "133s4l1gk46saf6ycm785rswycy8g3j0qqrv93b5wp8cp50kd0ww")))))) + (define-public ghc-haskell-src-exts (package (name "ghc-haskell-src-exts") - (version "1.16.0.1") + (version "1.20.1") (source (origin (method url-fetch) @@ -910,13 +1006,13 @@ Happy works in a similar way to the yacc tool for C.") ".tar.gz")) (sha256 (base32 - "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz")))) + "1jsjl9hja2dpcfq4mzlfpwyr6axwnwgacfb7aa070kz4lbygzaa8")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) - ("ghc-mtl" ,ghc-mtl) ("ghc-happy" ,ghc-happy) - ("ghc-syb" ,ghc-syb))) + ("ghc-mtl" ,ghc-mtl) + ("ghc-pretty-show" ,ghc-pretty-show-for-haskell-src-exts))) (native-inputs `(("ghc-smallcheck" ,ghc-smallcheck) ("ghc-tasty" ,ghc-tasty) @@ -931,10 +1027,58 @@ are supported. Apart from these standard extensions, it also handles regular patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (license license:bsd-3))) +(define-public ghc-haskell-src-exts-util + (package + (name "ghc-haskell-src-exts-util") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "haskell-src-exts-util/haskell-src-exts-util-" + version ".tar.gz")) + (sha256 + (base32 + "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default" ,ghc-data-default) + ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-uniplate" ,ghc-uniplate))) + (home-page "https://github.com/pepeiborra/haskell-src-exts-util") + (synopsis "Helper functions for working with haskell-src-exts trees") + (description + "This package provides helper functions for working with +@code{haskell-src-exts} trees.") + (license license:bsd-3))) + +(define-public ghc-refact + (package + (name "ghc-refact") + (version "0.3.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "refact/refact-" + version ".tar.gz")) + (sha256 + (base32 + "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/refact") + (synopsis "Specify refactorings to perform with apply-refact") + (description + "This library provides a datatype which can be interpreted by +@code{apply-refact}. It exists as a seperate library so that applications can +specify refactorings without depending on GHC.") + (license license:bsd-3))) + (define-public hlint (package (name "hlint") - (version "1.9.21") + (version "2.1") (source (origin (method url-fetch) @@ -943,15 +1087,23 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "14v3rdjjlml9nimdk7d5dvir2bw78ai49yylvms9lnzmw29s3546")))) + "13chm0dhh1fn2iy3flnh7ahc3yzh8q0v10qxwd1739sywhykayg9")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-yaml" ,ghc-yaml) + ("ghc-vector" ,ghc-vector) + ("ghc-text" ,ghc-text) + ("ghc-data-default" ,ghc-data-default) ("ghc-cmdargs" ,ghc-cmdargs) ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-haskell-src-exts-util" ,ghc-haskell-src-exts-util) ("ghc-uniplate" ,ghc-uniplate) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-extra" ,ghc-extra) + ("ghc-refact" ,ghc-refact) + ("ghc-aeson" ,ghc-aeson) ("hscolour" ,hscolour))) (home-page "http://community.haskell.org/~ndm/hlint/") (synopsis "Suggest improvements for Haskell source code") @@ -963,7 +1115,7 @@ unwanted suggestions, and to add your own custom suggestions.") (define-public ghc-resourcet (package (name "ghc-resourcet") - (version "1.1.6") + (version "1.1.7.5") (source (origin (method url-fetch) @@ -973,7 +1125,7 @@ unwanted suggestions, and to add your own custom suggestions.") ".tar.gz")) (sha256 (base32 - "0zhsaaa4n8ry76vjih519a8npm2hrzk10d5asrgllcwpzmifl41y")))) + "0nj0gwfd05divpdn7m47gy6bpcrwn3zk81gc303k0smrbqi0xlq5")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-base" ,ghc-transformers-base) @@ -994,7 +1146,7 @@ code where you can safely allocate resources.") (define-public ghc-objectname (package (name "ghc-objectname") - (version "1.1.0.0") + (version "1.1.0.1") (source (origin (method url-fetch) @@ -1004,7 +1156,7 @@ code where you can safely allocate resources.") ".tar.gz")) (sha256 (base32 - "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg")))) + "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/ObjectName") (synopsis "Helper library for Haskell OpenGL") @@ -1043,7 +1195,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") (define-public ghc-sdl-mixer (package (name "ghc-sdl-mixer") - (version "0.6.1.1") + (version "0.6.2.0") (source (origin (method url-fetch) @@ -1053,7 +1205,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") ".tar.gz")) (sha256 (base32 - "0md3238hx79mxb9a7l43kg3b3d28x4mqvj0hjsbsh15ajnvy9x2z")))) + "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -1074,7 +1226,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") (define-public ghc-sdl-image (package (name "ghc-sdl-image") - (version "0.6.1.1") + (version "0.6.1.2") (source (origin (method url-fetch) @@ -1084,7 +1236,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") ".tar.gz")) (sha256 (base32 - "1m02q2426qp8m8pzz2jkk4srk2vb3j3ickiaga5jx9rkkhz732zq")))) + "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -1121,10 +1273,30 @@ PNG, PNM, TGA, TIFF, XCF, XPM, XV.") computation library for Haskell.") (license license:bsd-3))) +(define-public ghc-fixed + (package + (name "ghc-fixed") + (version "0.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/fixed/fixed-" + version ".tar.gz")) + (sha256 + (base32 + "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94")))) + (build-system haskell-build-system) + (home-page "https://github.com/ekmett/fixed") + (synopsis "Signed 15.16 precision fixed point arithmetic") + (description + "This package provides functions for signed 15.16 precision fixed point +arithmetic.") + (license license:bsd-3))) + (define-public ghc-openglraw (package (name "ghc-openglraw") - (version "2.5.1.0") + (version "3.2.7.0") (source (origin (method url-fetch) @@ -1134,10 +1306,11 @@ computation library for Haskell.") ".tar.gz")) (sha256 (base32 - "1kfq24mxg922ml3kkmym2qfpc56jbmrfbiix4rc2cxlwv05i191k")))) + "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2")))) (build-system haskell-build-system) (inputs `(("ghc-half" ,ghc-half) + ("ghc-fixed" ,ghc-fixed) ("glu" ,glu) ("ghc-text" ,ghc-text))) (home-page "http://www.haskell.org/haskellwiki/Opengl") @@ -1156,7 +1329,7 @@ found at runtime, a userError is thrown.") (define-public ghc-glut (package (name "ghc-glut") - (version "2.7.0.3") + (version "2.7.0.10") (source (origin (method url-fetch) @@ -1166,7 +1339,7 @@ found at runtime, a userError is thrown.") ".tar.gz")) (sha256 (base32 - "1qfilpc10jm47anan44c20y8mh76f2dv09m5d22gk0f7am7hg4k2")))) + "0sbm943bg896nf3qjmlnsg3zzrr3pl330rzh9g0hwv47nzwwn4ab")))) (build-system haskell-build-system) (inputs `(("ghc-statevar" ,ghc-statevar) @@ -1183,7 +1356,7 @@ programs.") (define-public ghc-gluraw (package (name "ghc-gluraw") - (version "1.5.0.2") + (version "2.0.0.2") (source (origin (method url-fetch) @@ -1193,7 +1366,7 @@ programs.") ".tar.gz")) (sha256 (base32 - "0gscd9lhp9mb10q8s716nx26m8qng9xbb4h6b3f48zzgkc1sy96x")))) + "1phmvxr0kkxq89ykmr8rj77inj8dvcxd6h72z1ncdgdazfz3sjw8")))) (build-system haskell-build-system) (inputs `(("ghc-openglraw" ,ghc-openglraw))) @@ -1207,7 +1380,7 @@ basis for a nicer interface.") (define-public ghc-opengl (package (name "ghc-opengl") - (version "2.12.0.1") + (version "3.0.1.0") (source (origin (method url-fetch) @@ -1217,7 +1390,7 @@ basis for a nicer interface.") ".tar.gz")) (sha256 (base32 - "1mcfb167jl75qc2hgylh83vf2jqizvyvkvhhb72adi2crc3zqz4b")))) + "1nm2mzrn1h2nnfs9vl5p088hqpll7rdvcsyqsn8q641im9jhqp7l")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text) @@ -1235,7 +1408,7 @@ version 1.3).") (define-public ghc-streaming-commons (package (name "ghc-streaming-commons") - (version "0.1.14.2") + (version "0.1.16") (source (origin (method url-fetch) @@ -1245,7 +1418,7 @@ version 1.3).") ".tar.gz")) (sha256 (base32 - "12nw9bwvy6zrabkgvbp371klca3ds6qjlfncg1b8pbwx1y7m8c8h")))) + "0vhhm0z88b1r6s50bskdfh73acwfypm614nycmi9jwiyh84zbz8p")))) (build-system haskell-build-system) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) @@ -1260,10 +1433,10 @@ version 1.3).") ("hspec-discover" ,hspec-discover))) (home-page "https://hackage.haskell.org/package/streaming-commons") (synopsis "Conduit and pipes needed by some streaming data libraries") - (description "Provides low-dependency functionality commonly needed by -various Haskell streaming data libraries, such as @code{conduit} and + (description "This package provides low-dependency functionality commonly +needed by various Haskell streaming data libraries, such as @code{conduit} and @code{pipe}s.") - (license license:bsd-3))) + (license license:expat))) (define-public cpphs (package @@ -1332,6 +1505,8 @@ configurations to coexist without resorting to mutable global variables or (sha256 (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=base"))) (home-page "https://hackage.haskell.org/package/old-locale") (synopsis "Adapt to locale conventions") (description @@ -1354,6 +1529,8 @@ date and time formats.") (base32 "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=base"))) (inputs `(("ghc-old-locale" ,ghc-old-locale))) (home-page "https://hackage.haskell.org/package/old-time") @@ -1390,7 +1567,7 @@ old @code{time} library. For new projects, the newer (define-public ghc-dlist (package (name "ghc-dlist") - (version "0.8.0.3") + (version "0.8.0.4") (source (origin (method url-fetch) @@ -1399,7 +1576,7 @@ old @code{time} library. For new projects, the newer version ".tar.gz")) (sha256 - (base32 "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7")))) + (base32 "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) @@ -1462,6 +1639,28 @@ Haskell software by automating the fetching, configuration, compilation and installation of Haskell libraries and programs.") (license license:bsd-3))) +(define-public cabal-doctest + (package + (name "cabal-doctest") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "cabal-doctest/cabal-doctest-" + version ".tar.gz")) + (sha256 + (base32 + "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny")))) + (build-system haskell-build-system) + (home-page "https://github.com/phadej/cabal-doctest") + (synopsis "Setup.hs helper for running doctests") + (description + "To properly work, the @code{doctest} package needs plenty of +configuration. This library provides the common bits for writing custom +@file{Setup.hs} files.") + (license license:bsd-3))) + (define-public ghc-mtl (package (name "ghc-mtl") @@ -1478,6 +1677,10 @@ installation of Haskell libraries and programs.") (base32 "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=transformers"))) + (inputs + `(("ghc-transformers" ,ghc-transformers))) (home-page "https://github.com/ekmett/mtl") (synopsis "Monad classes, using functional dependencies") @@ -1525,6 +1728,8 @@ School of Functional Programming', 1995. See (sha256 (base32 "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=base"))) (home-page "https://github.com/glguy/utf8-string/") (synopsis "Support for reading and writing UTF8 Strings") (description @@ -1651,7 +1856,7 @@ literals.") (define-public ghc-zlib (package (name "ghc-zlib") - (version "0.5.4.2") + (version "0.6.1.1") (outputs '("out" "doc")) (source (origin @@ -1662,8 +1867,10 @@ literals.") ".tar.gz")) (sha256 (base32 - "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm")))) + "0dd79dxf56d8f6ad9if3j87s9gg7yd17ckypjxwplrbkahlb9xf5")))) (build-system haskell-build-system) + ;; Tests require older versions of testy. + (arguments `(#:tests? #f)) (inputs `(("zlib" ,zlib))) (home-page "https://hackage.haskell.org/package/zlib") (synopsis @@ -1680,7 +1887,7 @@ access to the full zlib feature set.") (define-public ghc-stm (package (name "ghc-stm") - (version "2.4.4") + (version "2.4.5.0") (outputs '("out" "doc")) (source (origin @@ -1691,18 +1898,24 @@ access to the full zlib feature set.") ".tar.gz")) (sha256 (base32 - "0gc8zvdijp3rwmidkpxv76b4i0dc8dw6nbd92rxl4vxl0655iysx")))) + "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/stm") (synopsis "Software Transactional Memory") (description - "A modular composable concurrency abstraction.") + "Software Transactional Memory, or STM, is an abstraction for concurrent +communication. The main benefits of STM are composability and modularity. +That is, using STM you can write concurrent abstractions that can be easily +composed with any other abstraction built using STM, without exposing the +details of how your abstraction ensures safety. This is typically not the +case with other forms of concurrent communication, such as locks or +@code{MVar}s.") (license license:bsd-3))) (define-public ghc-parallel (package (name "ghc-parallel") - (version "3.2.0.6") + (version "3.2.1.0") (outputs '("out" "doc")) (source (origin @@ -1713,7 +1926,7 @@ access to the full zlib feature set.") ".tar.gz")) (sha256 (base32 - "0hp6vf4zxsw6vz6lj505xihmnfhgjp39c9q7nyzlgcmps3xx6a5r")))) + "09l52k1gsn667lmv0pp052cbwkzkbhfivp51f2xkrlfzf6xwvqsd")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/parallel") (synopsis "Parallel programming library") @@ -1724,7 +1937,7 @@ access to the full zlib feature set.") (define-public ghc-text (package (name "ghc-text") - (version "1.2.1.3") + (version "1.2.2.2") (outputs '("out" "doc")) (source (origin @@ -1735,10 +1948,12 @@ access to the full zlib feature set.") ".tar.gz")) (sha256 (base32 - "0gzqx5cpkdhshbz9xss51mpyq23pnf8dwjz4h3irbv2ryaa4qdlq")))) + "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii")))) (build-system haskell-build-system) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + ;; The test dependencies depend on ghc-text: ghc-test-framework -> ghc-xml -> ghc-text + (arguments `(#:tests? #f)) + (inputs + `(("ghc-random" ,ghc-random))) (home-page "https://github.com/bos/text") (synopsis "Efficient packed Unicode text type library") (description @@ -1751,6 +1966,29 @@ capabilities that are optimized for performance critical use, both in terms of large data quantities and high speed.") (license license:bsd-3))) +(define-public ghc-text-binary + (package + (name "ghc-text-binary") + (version "0.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "text-binary/text-binary-" + version ".tar.gz")) + (sha256 + (base32 + "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn")))) + (build-system haskell-build-system) + (inputs `(("ghc-text" ,ghc-text))) + (home-page "https://github.com/kawu/text-binary") + (synopsis "Binary instances for text types") + (description + "This package provides a compatibility layer providing @code{Binary} +instances for strict and lazy text types for versions older than 1.2.1 of the +text package.") + (license license:bsd-2))) + (define-public ghc-strict (package (name "ghc-strict") @@ -1774,7 +2012,7 @@ IO operations.") (define-public ghc-hashable (package (name "ghc-hashable") - (version "1.2.3.3") + (version "1.2.6.1") (outputs '("out" "doc")) (source (origin @@ -1785,22 +2023,49 @@ IO operations.") ".tar.gz")) (sha256 (base32 - "0kp4aj0x1iicz9qirpqxxqd8x5g1njbapxk1d90n406w3xykz4pw")))) + "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll")))) (build-system haskell-build-system) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (inputs - `(("ghc-text" ,ghc-text))) + `(("ghc-text" ,ghc-text) + ("ghc-random" ,ghc-random))) + (native-inputs + `(("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/tibbe/hashable") - (synopsis - "Class for types that can be converted to a hash value") + (synopsis "Class for types that can be converted to a hash value") (description - "This package defines a class, 'Hashable', for types that can be + "This package defines a class, @code{Hashable}, for types that can be converted to a hash value. This class exists for the benefit of hashing-based data structures. The package provides instances for basic types and a way to combine hash values.") (license license:bsd-3))) +(define-public ghc-hashable-time + (package + (name "ghc-hashable-time") + (version "0.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hashable-time/hashable-time-" + version + ".tar.gz")) + (sha256 + (base32 + "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm")))) + (build-system haskell-build-system) + (inputs `(("ghc-hashable" ,ghc-hashable))) + (home-page "http://hackage.haskell.org/package/hashable-time") + (synopsis "Hashable instances for Data.Time") + (description + "This package provides @code{Hashable} instances for types in +@code{Data.Time}.") + (license license:bsd-3))) + (define-public ghc-data-hash (package (name "ghc-data-hash") @@ -1870,7 +2135,7 @@ library, including the ability to split random number generators.") (define-public ghc-primitive (package (name "ghc-primitive") - (version "0.6.1.0") + (version "0.6.3.0") (outputs '("out" "doc")) (source (origin @@ -1881,7 +2146,7 @@ library, including the ability to split random number generators.") ".tar.gz")) (sha256 (base32 - "1j1q7l21rdm8kfs93vibr3xwkkhqis181w2k6klfhx5g5skiywwk")))) + "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd")))) (build-system haskell-build-system) (home-page "https://github.com/haskell/primitive") @@ -1948,7 +2213,7 @@ compatibility to run on old versions of the platform.") (define-public ghc-transformers-compat (package (name "ghc-transformers-compat") - (version "0.4.0.4") + (version "0.5.1.4") (source (origin (method url-fetch) @@ -1957,7 +2222,7 @@ compatibility to run on old versions of the platform.") "/transformers-compat-" version ".tar.gz")) (sha256 (base32 - "0lmg8ry6bgigb0v2lg0n74lxi8z5m85qq0qi4h1k9llyjb4in8ym")))) + "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq")))) (build-system haskell-build-system) (home-page "https://github.com/ekmett/transformers-compat/") (synopsis "Small compatibility shim between transformers 0.3 and 0.4") @@ -1970,7 +2235,7 @@ but also need those types.") (define-public ghc-unix-time (package (name "ghc-unix-time") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) @@ -1980,7 +2245,7 @@ but also need those types.") ".tar.gz")) (sha256 (base32 - "0dyvyxwaffb94bgri1wc4b9wqaasy32pyjn0lww3dqblxv8fn5ax")))) + "1qdlc9raih8s0m3x8x3n7q3ngh4faw2alv9l78sp6gnx648k0c8i")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This @@ -1997,7 +2262,7 @@ for Unix time in Haskell.") (define-public ghc-unix-compat (package (name "ghc-unix-compat") - (version "0.4.1.4") + (version "0.4.2.0") (source (origin (method url-fetch) @@ -2007,7 +2272,7 @@ for Unix time in Haskell.") ".tar.gz")) (sha256 (base32 - "0jxk7j5pz2kgfpqr4hznndjg31pqj5xg2qfc5308fcn9xyg1myps")))) + "036nv05w0yjxc3rfpar60ddjrlzc40mdgr5k6ihvwlvqfmq1gw9m")))) (build-system haskell-build-system) (home-page "https://github.com/jystic/unix-compat") @@ -2194,7 +2459,7 @@ Haskell library @code{regex-base}.") (define-public ghc-parsers (package (name "ghc-parsers") - (version "0.12.3") + (version "0.12.4") (source (origin (method url-fetch) @@ -2204,7 +2469,7 @@ Haskell library @code{regex-base}.") ".tar.gz")) (sha256 (base32 - "18wzmp8y3py4qa8hdsxqm0jfzmwy744dw7xa48r5s8ynhpimi462")))) + "07najh7f9y3ahh42z96sw4hnd0kc4x3wm0xlf739y0gh81ys5097")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy ; -package attoparsec-0.13.0.1" @@ -2228,7 +2493,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s (define-public ghc-trifecta (package (name "ghc-trifecta") - (version "1.6") + (version "1.7.1.1") (source (origin (method url-fetch) (uri (string-append @@ -2236,10 +2501,11 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s "trifecta-" version ".tar.gz")) (sha256 (base32 - "0rbhv9m17k7l1zr70i0yw5da0qjgxmfh1da8brj0zdzwjn9ac0mk")))) + "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31")))) (build-system haskell-build-system) (inputs - `(("ghc-reducers" ,ghc-reducers) + `(("ghc-doctest" ,ghc-doctest-0.13) + ("ghc-reducers" ,ghc-reducers) ("ghc-semigroups" ,ghc-semigroups) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) ("ghc-ansi-terminal" ,ghc-ansi-terminal) @@ -2258,16 +2524,39 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest))) (home-page "https://github.com/ekmett/trifecta/") (synopsis "Parser combinator library with convenient diagnostics") (description "Trifecta is a modern parser combinator library for Haskell, with slicing and Clang-style colored diagnostics.") (license license:bsd-3))) +(define-public ghc-time-locale-compat + (package + (name "ghc-time-locale-compat") + (version "0.1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "time-locale-compat/time-locale-compat-" + version ".tar.gz")) + (sha256 + (base32 + "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i")))) + (build-system haskell-build-system) + (inputs `(("ghc-old-locale" ,ghc-old-locale))) + (home-page "https://github.com/khibino/haskell-time-locale-compat") + (synopsis "Compatibility of TimeLocale between old-locale and time-1.5") + (description "This package contains a wrapped name module for +@code{TimeLocale}.") + (license license:bsd-3))) + (define-public ghc-attoparsec (package (name "ghc-attoparsec") - (version "0.13.0.1") + (version "0.13.2.2") (source (origin (method url-fetch) @@ -2277,16 +2566,20 @@ with slicing and Clang-style colored diagnostics.") ".tar.gz")) (sha256 (base32 - "0cprkr7bl4lrr80pz8mryb4rbfwdgpsrl7g0fbcaybhl8p5hm26f")))) + "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx")))) (build-system haskell-build-system) + ;; FIXME: at least on test fails with QuickCheck > 2.9.2. Once upstream + ;; has updated the tests to work with a later version of QuickCheck we can + ;; re-enable them. + (arguments `(#:tests? #f)) (inputs `(("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text))) (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-quickcheck-unicode" ,ghc-quickcheck-unicode) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) ("ghc-vector" ,ghc-vector))) (home-page "https://github.com/bos/attoparsec") (synopsis "Fast combinator parsing for bytestrings and text") @@ -2298,7 +2591,7 @@ complicated text/binary file formats.") (define-public ghc-zip-archive (package (name "ghc-zip-archive") - (version "0.2.3.7") + (version "0.3.0.5") (source (origin (method url-fetch) @@ -2308,13 +2601,14 @@ complicated text/binary file formats.") ".tar.gz")) (sha256 (base32 - "169nkxr5zlbymiz1ydlhlqr66vqiycmg85xh559phpkr64w3nqj1")))) + "1iwpzjck4jg9bz1yqky051i2wljsqc14q5zbi10dydfp8ip3d0yw")))) (build-system haskell-build-system) (inputs `(("ghc-old-time" ,ghc-old-time) ("ghc-digest" ,ghc-digest) ("zip" ,zip) ("ghc-mtl" ,ghc-mtl) + ("ghc-temporary" ,ghc-temporary) ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs @@ -2328,7 +2622,7 @@ modifying, and extracting files from zip archives in Haskell.") (define-public ghc-distributive (package (name "ghc-distributive") - (version "0.4.4") + (version "0.5.3") (source (origin (method url-fetch) @@ -2338,13 +2632,19 @@ modifying, and extracting files from zip archives in Haskell.") ".tar.gz")) (sha256 (base32 - "0s2ln9jv7bh4ri2y31178pvjl8x6nik5d0klx7j2b77yjlsgblc2")))) + "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: fails with "cannot satisfy -package - ; tagged-0.8.1". Suspected Cabal issue. (inputs `(("ghc-tagged" ,ghc-tagged) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + ("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-generic-deriving" ,ghc-generic-deriving))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest-0.12) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/ekmett/distributive/") (synopsis "Distributive functors for Haskell") (description "This package provides distributive functors for Haskell. @@ -2354,7 +2654,7 @@ Dual to @code{Traversable}.") (define-public ghc-cereal (package (name "ghc-cereal") - (version "0.4.1.1") + (version "0.5.3.0") (source (origin (method url-fetch) @@ -2364,8 +2664,13 @@ Dual to @code{Traversable}.") ".tar.gz")) (sha256 (base32 - "15rhfn9hrjm01ksh9xpz9syxsp9vkvpp6b736iqq38wv2wb7416z")))) + "1x4aib7nnaf4x2b9zlndq5n5zsqniw78jifkf55nhnbmvryf05n3")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-fail" ,ghc-fail) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (home-page "https://hackage.haskell.org/package/cereal") (synopsis "Binary serialization library") (description "This package provides a binary serialization library, @@ -2376,7 +2681,7 @@ parser isolation, and labeled blocks for better error messages.") (define-public ghc-comonad (package (name "ghc-comonad") - (version "4.2.7.2") + (version "5") (source (origin (method url-fetch) @@ -2386,7 +2691,7 @@ parser isolation, and labeled blocks for better error messages.") ".tar.gz")) (sha256 (base32 - "0arvbaxgkawzdp38hh53akkahjg2aa3kj2b4ns0ni8a5ylg2cqmp")))) + "0anb36m9z52y9xsipxzj9w1b41b2rj8r389cxd6d20dplnfv3rbq")))) (build-system haskell-build-system) (native-inputs `(("ghc-doctest" ,ghc-doctest))) @@ -2404,7 +2709,7 @@ parser isolation, and labeled blocks for better error messages.") (define-public hscolour (package (name "hscolour") - (version "1.23") + (version "1.24.1") (source (origin (method url-fetch) @@ -2414,7 +2719,7 @@ parser isolation, and labeled blocks for better error messages.") ".tar.gz")) (sha256 (base32 - "1c4i2zpami8g3w9949nm3f92g7xwh5c94vkx658zz7ihrjp7w5lp")))) + "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/hscolour") (synopsis "Script to colourise Haskell code") @@ -2428,7 +2733,7 @@ and mIRC chat codes.") (define-public ghc-polyparse (package (name "ghc-polyparse") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) @@ -2438,7 +2743,7 @@ and mIRC chat codes.") ".tar.gz")) (sha256 (base32 - "1z417f80b0jm4dgv25fk408p3d9mmcd1dlbya3ry0zdx4md09vrh")))) + "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) @@ -2458,7 +2763,7 @@ Strings.") (define-public ghc-extra (package (name "ghc-extra") - (version "1.4.2") + (version "1.6.3") (source (origin (method url-fetch) @@ -2468,9 +2773,11 @@ Strings.") ".tar.gz")) (sha256 (base32 - "1h9hxkrqrqscx420yz1lmivbrhi6jc3a5ap61vkxd2mhdgark9hf")))) + "06ds0jlx6sljwdf63l154qbzia9mnsri79i9qm3xikky3nj9ia1m")))) (build-system haskell-build-system) - (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) + (inputs + `(("ghc-clock" ,ghc-clock) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ndmitchell/extra") (synopsis "Extra Haskell functions") (description "This library provides extra functions for the standard @@ -2482,7 +2789,7 @@ this package makes them available back to GHC 7.2.") (define-public ghc-profunctors (package (name "ghc-profunctors") - (version "5.1.1") + (version "5.2.2") (source (origin (method url-fetch) @@ -2492,11 +2799,15 @@ this package makes them available back to GHC 7.2.") ".tar.gz")) (sha256 (base32 - "0lw2ipacpnp9yqmi8zsp01pzpn5hwj8af3y0f3079mddrmw48gw7")))) + "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9")))) (build-system haskell-build-system) (inputs - `(("ghc-distributive" ,ghc-distributive) + `(("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-bifunctors" ,ghc-bifunctors) ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-distributive" ,ghc-distributive) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-tagged" ,ghc-tagged))) (home-page "https://github.com/ekmett/profunctors/") (synopsis "Profunctors for Haskell") @@ -2506,7 +2817,7 @@ this package makes them available back to GHC 7.2.") (define-public ghc-reducers (package (name "ghc-reducers") - (version "3.12.1") + (version "3.12.2") (source (origin (method url-fetch) @@ -2516,7 +2827,7 @@ this package makes them available back to GHC 7.2.") ".tar.gz")) (sha256 (base32 - "0pkddg0s3cn759miq0nfrq7lnp3imk5sx784ihsilsbjh9kvffz4")))) + "1gbaa5x4zbvnbklcb0d4q4m8hk6w0gz4s0c4m288czi1nw43dl65")))) (build-system haskell-build-system) (inputs `(("ghc-fingertree" ,ghc-fingertree) @@ -2578,7 +2889,7 @@ exceptions.") (define-public ghc-generic-deriving (package (name "ghc-generic-deriving") - (version "1.8.0") + (version "1.11.1") (source (origin (method url-fetch) @@ -2588,8 +2899,11 @@ exceptions.") ".tar.gz")) (sha256 (base32 - "1kc6lhdanls6kgpk8xv5xi14lz1sngcd8xn930hkf7ilq4kxkcr6")))) + "1sdh5hpcwvh3b6zvgfk3pr3hla8p88l82njnih880c0gk5zl53dk")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) (home-page "https://hackage.haskell.org/package/generic-deriving") (synopsis "Generalise the deriving mechanism to arbitrary classes") (description "This package provides functionality for generalising the @@ -2599,7 +2913,7 @@ deriving mechanism in Haskell to arbitrary classes.") (define-public ghc-pcre-light (package (name "ghc-pcre-light") - (version "0.4.0.3") + (version "0.4.0.4") (source (origin (method url-fetch) @@ -2609,10 +2923,12 @@ deriving mechanism in Haskell to arbitrary classes.") ".tar.gz")) (sha256 (base32 - "0l1df2sk5qwf424bvb8mbdkr2xjg43fi92n5r22yd7vm1zz0jqvf")))) + "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82")))) (build-system haskell-build-system) (inputs `(("pcre" ,pcre))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/Daniel-Diaz/pcre-light") (synopsis "Haskell library for Perl 5 compatible regular expressions") (description "This package provides a small, efficient, and portable regex @@ -2683,6 +2999,8 @@ online}.") (base32 "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (native-inputs `(("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) @@ -2699,7 +3017,7 @@ for Haskell.") (define-public ghc-temporary (package (name "ghc-temporary") - (version "1.2.0.3") + (version "1.2.0.4") (source (origin (method url-fetch) @@ -2709,7 +3027,7 @@ for Haskell.") ".tar.gz")) (sha256 (base32 - "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a")))) + "0qk741yqnpd69sksgks2vb7zi50rglp9m498lzw4sh268a017rsi")))) (build-system haskell-build-system) (inputs `(("ghc-exceptions" ,ghc-exceptions))) (home-page "http://www.github.com/batterseapower/temporary") @@ -2803,7 +3121,7 @@ writing to stdout and other handles.") (define-public ghc-case-insensitive (package (name "ghc-case-insensitive") - (version "1.2.0.4") + (version "1.2.0.7") (outputs '("out" "doc")) (source (origin @@ -2814,7 +3132,7 @@ writing to stdout and other handles.") ".tar.gz")) (sha256 (base32 - "07nm40r9yw2p9qsfp3pjbsmyn4dabrxw34p48171zmccdd5hv0v3")))) + "1j6ahvrz1g5q89y2difyk838yhwjc8z67zr0v2z512qdznc3h38n")))) (build-system haskell-build-system) (inputs `(("ghc-hunit" ,ghc-hunit))) @@ -2880,6 +3198,8 @@ variety of traversals.") (base32 "0fbyb6jxy9whgrv6dgnkzz70cmy98arx3q2gnkhgl4a3d7idh36p")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-mtl" ,ghc-mtl) ("ghc-hspec" ,ghc-hspec) @@ -2927,7 +3247,7 @@ Partial and Infinite Values\"}.") (define-public ghc-unordered-containers (package (name "ghc-unordered-containers") - (version "0.2.5.1") + (version "0.2.7.1") (outputs '("out" "doc")) (source (origin @@ -2937,7 +3257,7 @@ Partial and Infinite Values\"}.") "/unordered-containers-" version ".tar.gz")) (sha256 (base32 - "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f")))) + "00npqiphivjp2d7ryqsdavfn4m5v3w1lq2azhdsrfh0wsvqpg4ig")))) (build-system haskell-build-system) (inputs `(("ghc-chasingbottoms" ,ghc-chasingbottoms) @@ -3078,7 +3398,7 @@ colored output using the ansi-terminal package.") (define-public ghc-split (package (name "ghc-split") - (version "0.2.2") + (version "0.2.3.1") (outputs '("out" "doc")) (source (origin @@ -3089,16 +3409,9 @@ colored output using the ansi-terminal package.") ".tar.gz")) (sha256 (base32 - "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr")) - (modules '((guix build utils))) - (snippet - ;; The Cabal file on Hackage is updated, but the tar.gz does not - ;; include it. See - ;; <https://hackage.haskell.org/package/split-0.2.2/revisions/>. - '(substitute* "split.cabal" - (("base <4.8") "base <4.9"))))) + "12660m16c6sib3laaxn6w9s453pyx1b49myrmzfij372vq5bc5bn")))) (build-system haskell-build-system) - (inputs + (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://hackage.haskell.org/package/split") (synopsis "Combinator library for splitting lists") @@ -3110,7 +3423,7 @@ mainstream languages.") (define-public ghc-parsec (package (name "ghc-parsec") - (version "3.1.9") + (version "3.1.11") (outputs '("out" "doc")) (source (origin @@ -3120,7 +3433,7 @@ mainstream languages.") version ".tar.gz")) (sha256 - (base32 "1ja20cmj6v336jy87c6h3jzjp00sdbakwbdwp11iln499k913xvi")))) + (base32 "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit))) @@ -3138,10 +3451,64 @@ defined as a monad transformer that can be stacked on arbitrary monads, and it is also parametric in the input stream type.") (license license:bsd-3))) +(define-public ghc-parser-combinators + (package + (name "ghc-parser-combinators") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "parser-combinators/parser-combinators-" + version ".tar.gz")) + (sha256 + (base32 + "1azkz0a6ikym02s8wydjcklp7rz8k512bs4s9lp9g1g03m0yj95i")))) + (build-system haskell-build-system) + (home-page "https://github.com/mrkkrp/parser-combinators") + (synopsis "Commonly useful parser combinators") + (description + "This is a lightweight package providing commonly useful parser +combinators.") + (license license:bsd-3))) + +(define-public ghc-megaparsec + (package + (name "ghc-megaparsec") + (version "6.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "megaparsec/megaparsec-" + version ".tar.gz")) + (sha256 + (base32 + "0h9azhs0dfrc359vrbd1jljrg3yfdbwd4p62cxqkn7mnh8913jpd")))) + (build-system haskell-build-system) + (inputs + `(("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-mtl" ,ghc-mtl) + ("ghc-parser-combinators" ,ghc-parser-combinators) + ("ghc-scientific" ,ghc-scientific) + ("ghc-text" ,ghc-text))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("ghc-hspec-expectations" ,ghc-hspec-expectations) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/mrkkrp/megaparsec") + (synopsis "Monadic parser combinators") + (description + "This is an industrial-strength monadic parser combinator library. +Megaparsec is a feature-rich package that strikes a nice balance between +speed, flexibility, and quality of parse errors.") + (license license:bsd-2))) + (define-public ghc-vector (package (name "ghc-vector") - (version "0.11.0.0") + (version "0.12.0.1") (outputs '("out" "doc")) (source (origin @@ -3152,13 +3519,20 @@ is also parametric in the input stream type.") ".tar.gz")) (sha256 (base32 - "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa")))) + "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i")))) (build-system haskell-build-system) + ;; FIXME: To simplify upgrading all Haskell packages, we leave the tests + ;; disabled for now. + (arguments `(#:tests? #f)) (inputs `(("ghc-primitive" ,ghc-primitive) - ("ghc-quickcheck" ,ghc-quickcheck))) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + ("ghc-random" ,ghc-random) + ("ghc-quickcheck" ,ghc-quickcheck) + ;; ("ghc-hunit" ,ghc-hunit) + ;; ("ghc-test-framework" ,ghc-test-framework) + ;; ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ;; ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + )) (home-page "https://github.com/haskell/vector") (synopsis "Efficient Arrays") (description "This library provides an efficient implementation of @@ -3169,7 +3543,7 @@ optimisation framework.") (define-public ghc-vector-binary-instances (package (name "ghc-vector-binary-instances") - (version "0.2.1.0") + (version "0.2.4") (source (origin (method url-fetch) @@ -3179,11 +3553,13 @@ optimisation framework.") version ".tar.gz")) (sha256 (base32 - "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l")))) + "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb")))) (build-system haskell-build-system) (inputs - `(("ghc-cereal" ,ghc-cereal) - ("ghc-vector" ,ghc-vector))) + `(("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) (home-page "https://github.com/bos/vector-binary-instances") (synopsis "Instances of Data.Binary and Data.Serialize for vector") (description "This library provides instances of @code{Binary} for the @@ -3196,7 +3572,7 @@ boxed and storable vectors.") (define-public ghc-network (package (name "ghc-network") - (version "2.6.2.1") + (version "2.6.3.1") (outputs '("out" "doc")) (source (origin @@ -3207,12 +3583,15 @@ boxed and storable vectors.") ".tar.gz")) (sha256 (base32 - "1yhvpd4wigz165jvyvw9zslx7lgqdj63jh3zv5s74b5ykdfa3zd3")))) + "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p")))) (build-system haskell-build-system) - (inputs - `(("ghc-hunit" ,ghc-hunit))) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + ;; The regression tests depend on an unpublished module. + (arguments `(#:tests? #f)) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-doctest" ,ghc-doctest) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) (home-page "https://github.com/haskell/network") (synopsis "Low-level networking interface") (description @@ -3222,7 +3601,7 @@ boxed and storable vectors.") (define-public ghc-network-uri (package (name "ghc-network-uri") - (version "2.6.0.3") + (version "2.6.1.0") (outputs '("out" "doc")) (source (origin @@ -3233,7 +3612,7 @@ boxed and storable vectors.") ".tar.gz")) (sha256 (base32 - "1pwbqb2rk4rnvllvdch42p5368xcvpkanp7bxckdhxya8zzwvhhg")))) + "1w27zkvn39kjr9lmw9421y8w43h572ycsfafsb7kyvr3a4ihlgj2")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. @@ -3275,7 +3654,7 @@ cursor, and changing the title.") (define-public ghc-vault (package (name "ghc-vault") - (version "0.3.0.4") + (version "0.3.0.6") (source (origin (method url-fetch) @@ -3285,7 +3664,7 @@ cursor, and changing the title.") ".tar.gz")) (sha256 (base32 - "0ah6qrg71krc87f4vjy4b4shdd0mgyil8fikb3j6fl4kfwlg67jn")))) + "0j7gcs440q7qlgzi2hn36crgp2c0w69k40g6vj9hxlm31zk3shqb")))) (build-system haskell-build-system) (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) @@ -3353,7 +3732,7 @@ with various performance characteristics.") (define-public ghc-mmorph (package (name "ghc-mmorph") - (version "1.0.4") + (version "1.0.6") (source (origin (method url-fetch) @@ -3363,10 +3742,12 @@ with various performance characteristics.") ".tar.gz")) (sha256 (base32 - "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2")))) + "1i8dzrc5qi3ryc9vrrmpn3sihmramsbhhd592w4w2k5g26qr3hql")))) (build-system haskell-build-system) - (home-page - "https://hackage.haskell.org/package/mmorph") + (inputs + `(("ghc-mtl" ,ghc-mtl) + ("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://hackage.haskell.org/package/mmorph") (synopsis "Monad morphisms") (description "This library provides monad morphism utilities, most commonly used for @@ -3376,7 +3757,7 @@ manipulating monad transformer stacks.") (define-public ghc-monad-control (package (name "ghc-monad-control") - (version "1.0.0.4") + (version "1.0.1.0") (source (origin (method url-fetch) @@ -3385,7 +3766,7 @@ manipulating monad transformer stacks.") "/monad-control-" version ".tar.gz")) (sha256 (base32 - "07pn1p4m80wdd7gw62s4yny8rbvm60ka1q8qx5y1plznd8sbg179")))) + "1x018gi5irznx5rgzmkr2nrgh26r8cvqwkcfc6n6y05pdjf21c6l")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) @@ -3411,6 +3792,7 @@ a subset of @code{MonadBase} into which generic control operations such as (sha256 (base32 "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d")))) (build-system haskell-build-system) + (arguments `(#:haddock? #f)) ; Package contains no documentation. (home-page "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail") (synopsis "Forward-compatible MonadFail class") (description @@ -3524,22 +3906,26 @@ interoperate with code that uses the new implementation.") (define-public ghc-blaze-markup (package (name "ghc-blaze-markup") - (version "0.7.0.3") + (version "0.8.2.0") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/blaze-markup/blaze-markup-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/" + "blaze-markup/blaze-markup-" + version ".tar.gz")) (sha256 (base32 - "080vlhd8dwjxrma4bb524lh8gxs5lm3xh122icy6lnnyipla0s9y")))) + "0m3h3ryxj5r74mv5g5dnfq5jbbwmvkl7ray18vi20d5vd93sydj4")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-text" ,ghc-text))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) (home-page "http://jaspervdj.be/blaze") (synopsis "Fast markup combinator library for Haskell") (description "This library provides core modules of a markup combinator @@ -3627,7 +4013,7 @@ simple general-purpose data structure\".") (define-public ghc-optparse-applicative (package (name "ghc-optparse-applicative") - (version "0.11.0.2") + (version "0.13.0.0") (source (origin (method url-fetch) @@ -3636,11 +4022,20 @@ simple general-purpose data structure\".") "/optparse-applicative-" version ".tar.gz")) (sha256 (base32 - "0ni52ii9555jngljvzxn1ngicr6i2w647ww3rzhdrmng04y95iii")))) + "1b0c5fdq8bd070g24vrjrwlq979r8dk8mys6aji9hy1l9pcv3inf")))) (build-system haskell-build-system) + ;; These tests fail because the package doesn't come with all needed test + ;; files: + ;; - prop_drops_back_contexts + ;; - prop_context_carry + ;; - prop_help_on_empty + ;; - prop_help_on_empty_sub + (arguments `(#:tests? #f)) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/pcapriotti/optparse-applicative") (synopsis "Utilities and combinators for parsing command line options") (description "This package provides utilities and combinators for parsing @@ -3696,7 +4091,7 @@ periodic, on-demand actions in Haskell.") (define-public ghc-tagged (package (name "ghc-tagged") - (version "0.8.1") + (version "0.8.5") (source (origin (method url-fetch) @@ -3706,8 +4101,10 @@ periodic, on-demand actions in Haskell.") ".tar.gz")) (sha256 (base32 - "1hc2qzhhz5p1xd8k03sklrdnhcflkwhgpl82k6fam8yckww9ipav")))) + "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74")))) (build-system haskell-build-system) + (inputs + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/tagged") (synopsis "Haskell phantom types to avoid passing dummy arguments") (description "This library provides phantom types for Haskell 98, to avoid @@ -3809,7 +4206,7 @@ Compatibility package for older packages.") (define-public ghc-nats (package (name "ghc-nats") - (version "1") + (version "1.1.1") (source (origin (method url-fetch) @@ -3819,7 +4216,7 @@ Compatibility package for older packages.") ".tar.gz")) (sha256 (base32 - "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0")))) + "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k")))) (build-system haskell-build-system) (arguments `(#:haddock? #f)) (inputs @@ -3858,7 +4255,7 @@ given term should not exist.") (define-public ghc-kan-extensions (package (name "ghc-kan-extensions") - (version "4.2.3") + (version "5.0.1") (source (origin (method url-fetch) @@ -3868,7 +4265,7 @@ given term should not exist.") ".tar.gz")) (sha256 (base32 - "0iywbadpy8s3isfzlx9dlz3apaywhqq4gdbxkwygksq8pzdhwkrk")))) + "1qm0kf4krmyjbjynn96ab0h3q117vwcia5nin7n2b8b4f3jrzph1")))) (build-system haskell-build-system) (inputs `(("ghc-adjunctions" ,ghc-adjunctions) @@ -3885,10 +4282,31 @@ given term should not exist.") forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (license license:bsd-3))) +(define-public ghc-call-stack + (package + (name "ghc-call-stack") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "call-stack/call-stack-" + version ".tar.gz")) + (sha256 + (base32 + "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj")))) + (build-system haskell-build-system) + (inputs `(("ghc-nanospec" ,ghc-nanospec))) + (home-page "https://github.com/sol/call-stack#readme") + (synopsis "Use GHC call-stacks in a backward compatible way") + (description "This package provides a compatibility layer for using GHC +call stacks with different versions of the compiler.") + (license license:expat))) + (define-public ghc-statevar (package (name "ghc-statevar") - (version "1.1.0.1") + (version "1.1.0.4") (source (origin (method url-fetch) @@ -3898,7 +4316,7 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") ".tar.gz")) (sha256 (base32 - "1ap51cvwq61xckx5hw44l82ihbxvsq3263xr5hqg42c5qp67kbhf")))) + "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm))) @@ -3911,22 +4329,20 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (define-public ghc-lens (package (name "ghc-lens") - (version "4.13") + (version "4.15.4") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lens/lens-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/lens/lens-" + version ".tar.gz")) (sha256 (base32 - "0g4g0xksrb2m8wgsmraaq8qnk1sssb42kr65fc7clgyid6zyfmim")))) + "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: doctest packagedb propagation problem. (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-doctest" ,ghc-doctest-0.13) ("ghc-distributive" ,ghc-distributive) ("ghc-exceptions" ,ghc-exceptions) ("ghc-free" ,ghc-free) @@ -3935,6 +4351,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("ghc-reflection" ,ghc-reflection) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-vector" ,ghc-vector) + ("ghc-call-stack" ,ghc-call-stack) ("ghc-comonad" ,ghc-comonad) ("ghc-contravariant" ,ghc-contravariant) ("ghc-hashable" ,ghc-hashable) @@ -3950,6 +4367,14 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("ghc-nats" ,ghc-nats) ("ghc-simple-reflect" ,ghc-simple-reflect) ("hlint" ,hlint))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-th" ,ghc-test-framework-th) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ekmett/lens/") (synopsis "Lenses, Folds and Traversals") (description "This library provides @code{Control.Lens}. The combinators @@ -3961,7 +4386,7 @@ indexed variants.") (define-public ghc-cheapskate (package (name "ghc-cheapskate") - (version "0.1.0.4") + (version "0.1.1") (source (origin (method url-fetch) @@ -3971,20 +4396,16 @@ indexed variants.") ".tar.gz")) (sha256 (base32 - "0drx1hlqvdcrij4097q6bxhbfcqm73jsqv1wwhd3hsnjdmr46ch2")))) + "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) (build-system haskell-build-system) (inputs - `(("ghc-aeson" ,ghc-aeson) + `(("ghc-mtl" ,ghc-mtl) + ("ghc-text" ,ghc-text) ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-data-default" ,ghc-data-default) - ("ghc-http-types" ,ghc-http-types) - ("ghc-mtl" ,ghc-mtl) ("ghc-syb" ,ghc-syb) - ("ghc-text" ,ghc-text) - ("ghc-uniplate" ,ghc-uniplate) - ("ghc-wai-extra" ,ghc-wai-extra) - ("ghc-wai" ,ghc-wai) - ("ghc-xss-sanitize" ,ghc-xss-sanitize))) + ("ghc-uniplate" ,ghc-uniplate))) (home-page "https://github.com/jgm/cheapskate") (synopsis "Experimental markdown processor") (description "Cheapskate is an experimental Markdown processor in pure @@ -3997,7 +4418,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (define-public ghc-bifunctors (package (name "ghc-bifunctors") - (version "5") + (version "5.5.2") (source (origin (method url-fetch) @@ -4007,11 +4428,19 @@ cross-site scripting (@dfn{XSS}) attacks.") ".tar.gz")) (sha256 (base32 - "13990xdgx0n23qgi18ghhmsywj5zkr0a5bim0g8a4nzi0cx95ps1")))) + "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark")))) (build-system haskell-build-system) (inputs - `(("ghc-tagged" ,ghc-tagged) + `(("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-comonad" ,ghc-comonad) + ("ghc-th-abstraction" ,ghc-th-abstraction) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-tagged" ,ghc-tagged) ("ghc-semigroups" ,ghc-semigroups))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ekmett/bifunctors/") (synopsis "Bifunctors for Haskell") (description "This package provides bifunctors for Haskell.") @@ -4020,7 +4449,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (define-public ghc-semigroupoids (package (name "ghc-semigroupoids") - (version "5.0.0.4") + (version "5.1") (source (origin (method url-fetch) @@ -4030,7 +4459,7 @@ cross-site scripting (@dfn{XSS}) attacks.") ".tar.gz")) (sha256 (base32 - "1jf7jnfhdvl6p18wdr21yi2fim1xb8alcn6szhrdswj0dkilgq6d")))) + "0dgqc59p4xx5cl8qkpm6sn4wd3n59rq7l6din76hf10bnklqrb0n")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: doctest packagedb propagation problem. (inputs @@ -4151,7 +4580,7 @@ definition of @code{Monad}.") (define-public ghc-adjunctions (package (name "ghc-adjunctions") - (version "4.2.2") + (version "4.3") (source (origin (method url-fetch) @@ -4161,7 +4590,7 @@ definition of @code{Monad}.") ".tar.gz")) (sha256 (base32 - "00p030iypjzjib8pxz1x6mxfi59wvyrwjj11zv9bh766dgkdbwjq")))) + "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r")))) (build-system haskell-build-system) (inputs `(("ghc-profunctors" ,ghc-profunctors) @@ -4212,7 +4641,7 @@ monad transformer (instead of the IO monad).") (define-public ghc-fast-logger (package (name "ghc-fast-logger") - (version "2.4.1") + (version "2.4.11") (source (origin (method url-fetch) @@ -4222,12 +4651,13 @@ monad transformer (instead of the IO monad).") ".tar.gz")) (sha256 (base32 - "0kjk1861qcls8m8y7i55msfpprws5wk6c5mxzi35g2qbl2sih4p5")))) + "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv")))) (build-system haskell-build-system) (inputs - `(("ghc-bytestring-builder" ,ghc-bytestring-builder) - ("ghc-auto-update" ,ghc-auto-update) - ("ghc-text" ,ghc-text))) + `(("ghc-auto-update" ,ghc-auto-update) + ("ghc-easy-file" ,ghc-easy-file) + ("ghc-text" ,ghc-text) + ("ghc-unix-time" ,ghc-unix-time))) (native-inputs `(("hspec-discover" ,hspec-discover) ("ghc-hspec" ,ghc-hspec))) @@ -4239,7 +4669,7 @@ monad transformer (instead of the IO monad).") (define-public ghc-doctest (package (name "ghc-doctest") - (version "0.10.1") + (version "0.11.0") (source (origin (method url-fetch) @@ -4249,7 +4679,7 @@ monad transformer (instead of the IO monad).") ".tar.gz")) (sha256 (base32 - "1jbyhzbi2hfrfg7vbkpj6vriaap8cn99nnmzwcfscwaijz09jyrm")))) + "0xv4vx1r3mk7cmiwywzrq25545cx3i7imhcx33mk47r88j5c49fj")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: missing test framework (inputs @@ -4270,10 +4700,41 @@ It is modeled after doctest for Python, see @uref{http://docs.python.org/library/doctest.html, the Doctest website}.") (license license:expat))) +(define-public ghc-doctest-0.12 + (package (inherit ghc-doctest) + (name "ghc-doctest") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/doctest/doctest-" + version + ".tar.gz")) + (sha256 + (base32 + "13h549cpgcvb7c54c7wif28g5wak84dxc3ais0hlqhzk1q6la91a")))) + (inputs + `(("ghc-code-page" ,ghc-code-page) + ,@(package-inputs ghc-doctest))))) + +(define-public ghc-doctest-0.13 + (package (inherit ghc-doctest-0.12) + (name "ghc-doctest") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "doctest/doctest-" version ".tar.gz")) + (sha256 + (base32 + "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b")))))) + (define-public ghc-lifted-base (package (name "ghc-lifted-base") - (version "0.2.3.6") + (version "0.2.3.8") (source (origin (method url-fetch) @@ -4283,7 +4744,7 @@ It is modeled after doctest for Python, see ".tar.gz")) (sha256 (base32 - "1yz14a1rsgknwyl08n4kxrlc26hfwmb95a3c2drbnsgmhdyq7iap")))) + "17yz4n7q96x4cp8vxai8csn2vmpigxvipkfh48arahf91f0xy18n")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Missing testing libraries. (inputs @@ -4303,7 +4764,7 @@ Kaseorg.") (define-public ghc-word8 (package (name "ghc-word8") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -4313,7 +4774,7 @@ Kaseorg.") ".tar.gz")) (sha256 (base32 - "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw")))) + "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -4346,10 +4807,42 @@ functions for breaking or splitting on substrings and replacing all occurrences of a substring (the first in case of overlaps) with another.") (license license:bsd-3))) +(define-public ghc-integer-logarithms + (package + (name "ghc-integer-logarithms") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "integer-logarithms/integer-logarithms-" + version ".tar.gz")) + (sha256 + (base32 + "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii")))) + (build-system haskell-build-system) + (inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-smallcheck" ,ghc-smallcheck))) + (home-page "https://github.com/phadej/integer-logarithms") + (synopsis "Integer logarithms") + (description + "This package provides the following modules: +@code{Math.NumberTheory.Logarithms} and +@code{Math.NumberTheory.Powers.Integer} from the @code{arithmoi} package, +@code{GHC.Integer.Logarithms.Compat} and +@code{Math.NumberTheory.Power.Natural}, as well as some additional functions +in migrated modules.") + (license license:expat))) + (define-public ghc-scientific (package (name "ghc-scientific") - (version "0.3.4.2") + (version "0.3.5.2") (source (origin (method url-fetch) @@ -4359,12 +4852,13 @@ occurrences of a substring (the first in case of overlaps) with another.") ".tar.gz")) (sha256 (base32 - "0mimdkva0cgzaychr6whv9if29z0r5wwhkss9bmd4rz8kq1kgngn")))) + "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w")))) (build-system haskell-build-system) (inputs - `(("ghc-hashable" ,ghc-hashable) - ("ghc-vector" ,ghc-vector) + `(("ghc-integer-logarithms" ,ghc-integer-logarithms) ("ghc-text" ,ghc-text) + ("ghc-hashable" ,ghc-hashable) + ("ghc-primitive" ,ghc-primitive) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-ant-xml" ,ghc-tasty-ant-xml) ("ghc-tasty-hunit" ,ghc-tasty-hunit) @@ -4428,10 +4922,33 @@ using a simple box model.") providing an 'rnf' implementation.") (license license:bsd-3))) +(define-public ghc-string-qq + (package + (name "ghc-string-qq") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/string-qq/string-qq-" + version + ".tar.gz")) + (sha256 + (base32 + "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/string-qq") + (synopsis + "QuasiQuoter for non-interpolated strings, texts and bytestrings.") + (description + "This package provides a quasiquoter for non-interpolated strings, texts +and bytestrings.") + (license license:public-domain))) + (define-public ghc-pandoc-types (package (name "ghc-pandoc-types") - (version "1.16.1.1") + (version "1.17.3.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -4439,12 +4956,20 @@ providing an 'rnf' implementation.") version ".tar.gz")) (sha256 (base32 - "094mzgdxva84kcpjf9m8b5n3chm1wm44bzflh5x6xhddz6pb7zpq")))) + "0dhp5bcjl6605n2chiab5rp51zir3671gxkmwy34znh0s3vp85jb")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-syb" ,ghc-syb) ("ghc-aeson" ,ghc-aeson) - ("ghc-deepseq-generics" ,ghc-deepseq-generics))) + ("ghc-string-qq" ,ghc-string-qq))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-hunit" ,ghc-hunit))) (home-page "http://johnmacfarlane.net/pandoc") (synopsis "Types for representing a structured document") (description @@ -4456,14 +4981,14 @@ building up, manipulating and serialising @code{Pandoc} structures.") (define-public ghc-texmath (package (name "ghc-texmath") - (version "0.8.6.5") + (version "0.10.1.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "texmath/texmath-" version ".tar.gz")) (sha256 (base32 - "143c8k7dyhwa9blpa8svy23ybx7i4xzb9jnfcimj8iigizbw7y1k")))) + "0q2fld5mdcd6j1n3rrg3bjpndbgbn17cwg0xbnvscrpa0s767jaj")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) @@ -4512,15 +5037,19 @@ providing the PCRE backend to accompany regex-base, with bundled code from (define-public ghc-diff (package (name "ghc-diff") - (version "0.3.2") + (version "0.3.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "Diff/Diff-" version ".tar.gz")) (sha256 (base32 - "13iqqmpadcm7fvqwbfrz94w030rvjh66w2bdls1253128ac2n0vz")))) + "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (home-page "http://hub.darcs.net/sterlingclover/Diff") (synopsis "O(ND) diff algorithm in Haskell") (description @@ -4587,6 +5116,34 @@ CommonMark, a fully specified variant of Markdown. It includes bundled libcmark sources, and does not require prior installation of the C library.") (license license:bsd-3))) +(define-public ghc-cmark-gfm + (package + (name "ghc-cmark-gfm") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "cmark-gfm/cmark-gfm-" + version ".tar.gz")) + (sha256 + (base32 + "1fkisbrydmdx5h8yad09fzk8h1b1j53r02g7vb81izgdwj9b673k")))) + (build-system haskell-build-system) + (inputs + `(("ghc-text" ,ghc-text))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/kivikakk/cmark-gfm-hs") + (synopsis + "Fast, accurate GitHub Flavored Markdown parser and renderer") + (description + "This package provides Haskell bindings for libcmark-gfm, the reference +parser for GitHub Flavored Markdown, a fully specified variant of Markdown. +It includes sources for libcmark-gfm and does not require prior installation +of the C library.") + (license license:bsd-3))) + (define-public ghc-executable-path (package (name "ghc-executable-path") @@ -4667,20 +5224,41 @@ asynchronous exceptions.") "This deprecated library provides an implementation of packed strings.") (license license:bsd-3))) +(define-public ghc-th-abstraction + (package + (name "ghc-th-abstraction") + (version "0.2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "th-abstraction/th-abstraction-" + version ".tar.gz")) + (sha256 + (base32 + "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5")))) + (build-system haskell-build-system) + (home-page "https://github.com/glguy/th-abstraction") + (synopsis "Nicer interface for reified information about data types") + (description + "This package normalizes variations in the interface for inspecting +datatype information via Template Haskell so that packages and support a +single, easier to use informational datatype while supporting many versions of +Template Haskell.") + (license license:isc))) + (define-public ghc-th-lift (package (name "ghc-th-lift") - (version "0.7.5") + (version "0.7.8") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "th-lift/th-lift-" version ".tar.gz")) (sha256 (base32 - "13xdkk1chdghf059sfx8d3d8r0mj1dbzdi5kf2zf0mjmz3qq7m7k")))) + "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c")))) (build-system haskell-build-system) - (inputs - `(("ghc-packedstring" ,ghc-packedstring))) (home-page "https://github.com/mboes/th-lift") (synopsis "Derive Template Haskell's Lift class for datatypes") (description @@ -4688,10 +5266,36 @@ asynchronous exceptions.") datatypes.") (license license:bsd-3))) +(define-public ghc-th-lift-instances + (package + (name "ghc-th-lift-instances") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "th-lift-instances/th-lift-instances-" + version ".tar.gz")) + (sha256 + (base32 + "1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-th-lift" ,ghc-th-lift) + ("ghc-vector" ,ghc-vector) + ("ghc-text" ,ghc-text) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/bennofs/th-lift-instances/") + (synopsis "Lift instances for template-haskell for common data types.") + (description "Most data types in the Haskell platform do not have Lift +instances. This package provides orphan instances for @code{containers}, +@code{text}, @code{bytestring} and @code{vector}.") + (license license:bsd-3))) + (define-public ghc-th-expand-syns (package (name "ghc-th-expand-syns") - (version "0.3.0.6") + (version "0.4.0.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -4699,7 +5303,7 @@ datatypes.") version ".tar.gz")) (sha256 (base32 - "03qv93pyqk8all39knsf0mzmbfdck5x61kqnyn8rbisw5c1ymx6j")))) + "1sjy7a17zwyvlbkc8gklii67sy78wpnw35fyb00lsbnpk4cryd2r")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) @@ -4713,7 +5317,7 @@ datatypes.") (define-public ghc-th-reify-many (package (name "ghc-th-reify-many") - (version "0.1.3") + (version "0.1.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -4721,7 +5325,7 @@ datatypes.") version ".tar.gz")) (sha256 (base32 - "00hryljcs434wcv1vaamfdbjk857f46djxv7mlwplkl3zsmfhlfx")))) + "1b76zjxkj0v0n8zj9l0nwav2irm0c43rx6qjihfw8klmmxvx59df")))) (build-system haskell-build-system) (inputs `(("ghc-mtl" ,ghc-mtl) @@ -4739,17 +5343,18 @@ function which generates instances.") (define-public ghc-th-orphans (package (name "ghc-th-orphans") - (version "0.13.0") + (version "0.13.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "th-orphans/th-orphans-" version ".tar.gz")) (sha256 (base32 - "105y03bxh0a2r69l603i7md17gg1vxs1jj1n40pn5q486lmfxbmx")))) + "0102vkyzpgnp2fys8pvw4khrhrh2y1b8dp1slgvn020vg4s351mc")))) (build-system haskell-build-system) (inputs `(("ghc-th-lift" ,ghc-th-lift) + ("ghc-th-lift-instances" ,ghc-th-lift-instances) ("ghc-th-reify-many" ,ghc-th-reify-many) ("ghc-mtl" ,ghc-mtl) ("ghc-generic-deriving" ,ghc-generic-deriving))) @@ -4811,7 +5416,7 @@ info for more informative bug reports.") (define-public ghc-haskell-src-meta (package (name "ghc-haskell-src-meta") - (version "0.6.0.12") + (version "0.8.0.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -4819,12 +5424,16 @@ info for more informative bug reports.") version ".tar.gz")) (sha256 (base32 - "1mzbfrfvl6pj8068w3m6alzry1403ir1gmz3czg66n5z198l4dql")))) + "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb")))) (build-system haskell-build-system) (inputs `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) ("ghc-syb" ,ghc-syb) ("ghc-th-orphans" ,ghc-th-orphans))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) (home-page "https://hackage.haskell.org/package/haskell-src-meta") (synopsis "Parse source to template-haskell abstract syntax") (description @@ -4870,7 +5479,7 @@ space as enumerator/iteratee and pipes.") (define-public ghc-logging-facade (package (name "ghc-logging-facade") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -4878,7 +5487,7 @@ space as enumerator/iteratee and pipes.") version ".tar.gz")) (sha256 (base32 - "0zhdbjyj0j9by19rma9alxysrxnnl3s4kks4zk4bx0dg5xa0264y")))) + "18ldv6rsff480rqpbs3iabjpvn1fhw0i2a0g80jnhxg9ajfz5yb0")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -4893,18 +5502,19 @@ back-ends.") (define-public ghc-mockery (package (name "ghc-mockery") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "mockery/mockery-" version ".tar.gz")) (sha256 (base32 - "0m0lp2z63sgkylz5318j53r5hnrkp705qh7nqbb149ir4gy7g1bg")))) + "1m7sq2vclgir3qbpngzl3g87ks4034blwwf7p3h02c0jlcwpl5b1")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) - ("ghc-logging-facade" ,ghc-logging-facade))) + ("ghc-logging-facade" ,ghc-logging-facade) + ("ghc-base-compat" ,ghc-base-compat))) (native-inputs `(("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) @@ -4917,14 +5527,14 @@ back-ends.") (define-public ghc-yaml (package (name "ghc-yaml") - (version "0.8.15.1") + (version "0.8.28") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "yaml/yaml-" version ".tar.gz")) (sha256 (base32 - "0v6c435xmgm99zxb30pqr7lhkb2a56wxqp70g4hjz8p7rj0vichx")))) + "0swgkzkfrwj0ac7lssn8rnrdfmh3lcsdn5fbq2iwv55di6jbc0pp")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) @@ -4935,8 +5545,9 @@ back-ends.") ("ghc-text" ,ghc-text) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-scientific" ,ghc-scientific) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-temporary" ,ghc-temporary) ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) - ("ghc-aeson-qq" ,ghc-aeson-qq) ("ghc-base-compat" ,ghc-base-compat))) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -5022,25 +5633,28 @@ TIFF and GIF formats.") (define-public ghc-hslua (package (name "ghc-hslua") - (version "0.4.1") + (version "0.9.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "hslua/hslua-" version ".tar.gz")) (sha256 (base32 - "0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid")))) + "1j2zk7f7nyywg2b0n6kb2yf6ljc7cn2sk9jz0h76g3ag2b70l12n")))) (build-system haskell-build-system) (arguments `(#:configure-flags '("-fsystem-lua"))) (inputs - `(("lua" ,lua-5.1) + `(("lua" ,lua) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-fail" ,ghc-fail) + ("ghc-mtl" ,ghc-mtl) ("ghc-text" ,ghc-text))) (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-hspec-contrib" ,ghc-hspec-contrib) - ("hspec-discover" ,hspec-discover) - ("ghc-hunit" ,ghc-hunit) + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) (home-page "https://hackage.haskell.org/package/hslua") @@ -5050,6 +5664,34 @@ TIFF and GIF formats.") described in @url{http://www.lua.org/}.") (license license:expat))) +(define-public ghc-hslua-module-text + (package + (name "ghc-hslua-module-text") + (version "0.1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hslua-module-text/hslua-module-text-" + version ".tar.gz")) + (sha256 + (base32 + "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hslua" ,ghc-hslua) + ("ghc-text" ,ghc-text))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/hslua/hslua-module-text") + (synopsis "Lua module for text") + (description + "This package provides a UTF-8 aware subset of Lua's @code{string} module +for Haskell. The functions provided by this module are @code{upper}, +@code{lower}, @code{len}, @code{reverse}, and @code{sub}.") + (license license:expat))) + (define-public ghc-byteable (package (name "ghc-byteable") @@ -5073,14 +5715,14 @@ wrapping a bytestring with stronger and more meaniful name.") (define-public ghc-hourglass (package (name "ghc-hourglass") - (version "0.2.9") + (version "0.2.10") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "hourglass/hourglass-" version ".tar.gz")) (sha256 (base32 - "1xha17nwzxdjizbcp63d2142c6q051y77facs7xribgcl5iz2m4v")))) + "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym")))) (build-system haskell-build-system) (inputs `(("ghc-mtl" ,ghc-mtl) @@ -5153,14 +5795,14 @@ set, memory copy, ..) and more") (define-public ghc-socks (package (name "ghc-socks") - (version "0.5.4") + (version "0.5.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "socks/socks-" version ".tar.gz")) (sha256 (base32 - "1nmldlwxqasmg359i2aa3a903gi3lmnlspvf12xk49jrg3mf3dg9")))) + "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) @@ -5174,7 +5816,7 @@ set, memory copy, ..) and more") (define-public ghc-connection (package (name "ghc-connection") - (version "0.2.5") + (version "0.2.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5182,7 +5824,7 @@ set, memory copy, ..) and more") version ".tar.gz")) (sha256 (base32 - "090il95jnm7ihwvcx3s9v6iwnp37nnsdx15q7722l845g51d95c8")))) + "1c1prsgad669cmf6qrqlb5hmh0dnam2imijqzpwcr4ja14l6rh83")))) (build-system haskell-build-system) (inputs `(("ghc-byteable" ,ghc-byteable) @@ -5202,10 +5844,85 @@ needs. It provides a very simple API to create sockets to a destination with the choice of SSL/TLS, and SOCKS.") (license license:bsd-3))) +(define-public ghc-skylighting + (package + (name "ghc-skylighting") + (version "0.5.1") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/skylighting-" + version "/skylighting-" version ".tar.gz")) + (sha256 + (base32 + "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-colour" ,ghc-colour) + ("ghc-diff" ,ghc-diff) + ("ghc-hxt" ,ghc-hxt) + ("ghc-mtl" ,ghc-mtl) + ("ghc-pretty-show" ,ghc-pretty-show) + ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) + ("ghc-safe" ,ghc-safe) + ("ghc-text" ,ghc-text) + ("ghc-utf8-string" ,ghc-utf8-string))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://hackage.haskell.org/package/skylighting") + (synopsis "Syntax highlighting library") + (description "Skylighting is a syntax highlighting library with support +for over one hundred languages. It derives its tokenizers from XML syntax +definitions used by KDE's @code{KSyntaxHighlighting} framework, so any syntax +supported by that framework can be added. An optional command-line program is +provided. Skylighting is intended to be the successor to highlighting-kate.") + (license license:gpl2))) + +(define-public ghc-doctemplates + (package + (name "ghc-doctemplates") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "doctemplates/doctemplates-" + version ".tar.gz")) + (sha256 + (base32 + "1bfs2kl5j5al2w2y4qpbn68p0xsnb65r7h51l356kpkzc326646p")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-text" ,ghc-text) + ("ghc-vector" ,ghc-vector) + ("ghc-parsec" ,ghc-parsec) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-scientific" ,ghc-scientific))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec))) + (home-page "https://github.com/jgm/doctemplates#readme") + (synopsis "Pandoc-style document templates") + (description + "This package provides a simple text templating system used by pandoc.") + (license license:bsd-3))) + (define-public ghc-pandoc (package (name "ghc-pandoc") - (version "1.17.2") + (version "2.0.6") (source (origin (method url-fetch) @@ -5213,53 +5930,56 @@ the choice of SSL/TLS, and SOCKS.") version ".tar.gz")) (sha256 (base32 - "1v78zq12p71gq0pc24h08inxcq5gxd0xb7m5ds0xw9pv9l2pswl1")))) + "1vhj6splykksb1mkxv5cs0361nj12qn23a3y1i8j5dc637lkdwpj")))) (build-system haskell-build-system) (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl) - ("ghc-text" ,ghc-text) - ("ghc-zip-archive" ,ghc-zip-archive) - ("ghc-http" ,ghc-http) - ("ghc-texmath" ,ghc-texmath) - ("ghc-xml" ,ghc-xml) - ("ghc-random" ,ghc-random) - ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-pandoc-types" ,ghc-pandoc-types) - ("ghc-aeson" ,ghc-aeson) - ("ghc-tagsoup" ,ghc-tagsoup) + `(("ghc-aeson" ,ghc-aeson) + ("ghc-aeson-pretty" ,ghc-aeson-pretty) ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-zlib" ,ghc-zlib) - ("ghc-highlighting-kate" ,ghc-highlighting-kate) - ("ghc-data-default" ,ghc-data-default) - ("ghc-temporary" ,ghc-temporary) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-yaml" ,ghc-yaml) - ("ghc-scientific" ,ghc-scientific) - ("ghc-vector" ,ghc-vector) - ("ghc-hslua" ,ghc-hslua) - ("ghc-sha" ,ghc-sha) - ("ghc-haddock-library" ,ghc-haddock-library) - ("ghc-old-time" ,ghc-old-time) + ("ghc-cmark-gfm" ,ghc-cmark-gfm) + ("ghc-data-default" ,ghc-data-default) ("ghc-deepseq-generics" ,ghc-deepseq-generics) - ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-filemanip" ,ghc-filemanip) - ("ghc-cmark" ,ghc-cmark) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-network" ,ghc-network) + ("ghc-diff" ,ghc-diff) + ("ghc-doctemplates" ,ghc-doctemplates) + ("ghc-executable-path" ,ghc-executable-path) + ("ghc-glob" ,ghc-glob) + ("ghc-haddock-library" ,ghc-haddock-library) + ("ghc-hslua" ,ghc-hslua) + ("ghc-hslua-module-text" ,ghc-hslua-module-text) + ("ghc-http" ,ghc-http) ("ghc-http-client" ,ghc-http-client) ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-http-types" ,ghc-http-types) - ("ghc-diff" ,ghc-diff) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-executable-path" ,ghc-executable-path))) + ("ghc-juicypixels" ,ghc-juicypixels) + ("ghc-mtl" ,ghc-mtl) + ("ghc-network" ,ghc-network) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-pandoc-types" ,ghc-pandoc-types) + ("ghc-parsec" ,ghc-parsec) + ("ghc-random" ,ghc-random) + ("ghc-scientific" ,ghc-scientific) + ("ghc-sha" ,ghc-sha) + ("ghc-skylighting" ,ghc-skylighting) + ("ghc-split" ,ghc-split) + ("ghc-syb" ,ghc-syb) + ("ghc-tagsoup" ,ghc-tagsoup) + ("ghc-temporary" ,ghc-temporary) + ("ghc-texmath" ,ghc-texmath) + ("ghc-text" ,ghc-text) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-xml" ,ghc-xml) + ("ghc-yaml" ,ghc-yaml) + ("ghc-zip-archive" ,ghc-zip-archive) + ("ghc-zlib" ,ghc-zlib))) (native-inputs - `(("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit))) (home-page "http://pandoc.org") @@ -5278,7 +5998,7 @@ provided for those who need a drop-in replacement for Markdown.pl.") (define-public ghc-hs-bibutils (package (name "ghc-hs-bibutils") - (version "5.5") + (version "6.2.0.1") (source (origin (method url-fetch) @@ -5287,7 +6007,7 @@ provided for those who need a drop-in replacement for Markdown.pl.") version ".tar.gz")) (sha256 (base32 - "0pf5lh179rw9jkmw16ss3kiwydlj6zgfk868mjl5s57kx55z7ycm")))) + "0c56sjgg82kjcg5rrplnyn7vf02ccsj3kkcbgc87zxlv0j880rjb")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) (home-page "https://hackage.haskell.org/package/hs-bibutils") @@ -5324,7 +6044,7 @@ better for some purposes.") (define-public ghc-conduit-extra (package (name "ghc-conduit-extra") - (version "1.1.13.2") + (version "1.1.13.3") (source (origin (method url-fetch) @@ -5333,7 +6053,7 @@ better for some purposes.") version ".tar.gz")) (sha256 (base32 - "108vsn9dpsfwvar7nssw6wkqy26rxlf3p4ran6swa5xh8l6d5k4z")))) + "0j3cqpkrn7lbpviv6w0gjh93fjjbh1an2sq0yz7svaawja8civy2")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) @@ -5387,7 +6107,7 @@ documents.") (define-public ghc-xml-conduit (package (name "ghc-xml-conduit") - (version "1.3.5") + (version "1.7.1.2") (source (origin (method url-fetch) @@ -5395,7 +6115,7 @@ documents.") "xml-conduit-" version ".tar.gz")) (sha256 (base32 - "10yw8jiksw21jgwqjjd1ixflavcblisgkp9qq3ba05vadc35lqr5")))) + "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) @@ -5404,10 +6124,9 @@ documents.") ("ghc-text" ,ghc-text) ("ghc-xml-types" ,ghc-xml-types) ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-blaze-builder" ,ghc-blaze-builder) + ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-data-default" ,ghc-data-default) ("ghc-monad-control" ,ghc-monad-control) ("ghc-hspec" ,ghc-hspec) ("ghc-hunit" ,ghc-hunit))) @@ -5421,7 +6140,7 @@ the @code{conduit} package.") (define-public ghc-pandoc-citeproc (package (name "ghc-pandoc-citeproc") - (version "0.10") + (version "0.12.2.5") (source (origin (method url-fetch) @@ -5430,7 +6149,7 @@ the @code{conduit} package.") version ".tar.gz")) (sha256 (base32 - "00mprphppk51ylsrkg817mbk23f9fsfvkwzbys9qqbcjbrxi2r94")))) + "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx")))) (build-system haskell-build-system) (arguments `(#:phases @@ -5522,7 +6241,7 @@ data quickly and efficiently, using the ByteString type.") (define-public ghc-binary (package (name "ghc-binary") - (version "0.8.4.1") + (version "0.8.5.1") (source (origin (method url-fetch) @@ -5531,9 +6250,11 @@ data quickly and efficiently, using the ByteString type.") version ".tar.gz")) (sha256 (base32 - "1fp7wxnf57cjzhbb7rgqs6fgws4690zh0dxgl924dj4nzq0cf4wd")))) + "15h5zqfw7xmcimvlq6bs8f20vxlfvz7g411fns5z7212crlimffy")))) (build-system haskell-build-system) - (inputs + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) + (native-inputs `(("ghc-random" ,ghc-random) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) @@ -5573,7 +6294,7 @@ been observed, so this library should be suitable for high performance scenarios (define-public ghc-haskeline (package (name "ghc-haskeline") - (version "0.7.2.3") + (version "0.7.4.2") (source (origin (method url-fetch) @@ -5582,12 +6303,13 @@ been observed, so this library should be suitable for high performance scenarios version ".tar.gz")) (sha256 (base32 - "09wd6sxgn65xxpk7dhy1cg3ywlbk0ccqq7xylycwk4zazy3gjgkd")))) + "1sxhdhy9asinxn0gvd4zandbk6xkb04vy1y7lmh66f9jv66fqhsm")))) (build-system haskell-build-system) - (inputs - `(("ncurses" ,ncurses))) (arguments `(#:configure-flags (list "-fterminfo"))) + (inputs + `(("ncurses" ,ncurses) + ("ghc-stm" ,ghc-stm))) (home-page "https://github.com/judah/haskeline") (synopsis "Command-line interface for user input") (description @@ -5742,6 +6464,8 @@ this problem.") (base32 "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq")))) (build-system haskell-build-system) + ;; FIXME: 2/24 tests fail. + (arguments `(#:tests? #f)) (inputs `(("ghc-bytestring-handle" ,ghc-bytestring-handle) ("ghc-quickcheck" ,ghc-quickcheck) @@ -5953,10 +6677,11 @@ Colours can be blended and composed. Various colour spaces are supported. A module of colour names (\"Data.Colour.Names\") is provided.") (license license:expat))) +;; Do not use this as an input. It is part of GHC. (define-public ghc-directory (package (name "ghc-directory") - (version "1.3.1.5") + (version "1.3.2.0") (source (origin (method url-fetch) @@ -5965,7 +6690,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") version ".tar.gz")) (sha256 (base32 - "0zkqihmdfz7bzv3sxh1p9ijl4vra880kfy3qy9h96flq7d2if0f2")))) + "0ffhanigxrx5wpin8l0wfp7d24lpgsjwj0hxrfp8bpy2wj1snxny")))) (build-system haskell-build-system) (home-page "http://hackage.haskell.org/package/directory") (synopsis "Platform-agnostic library for file system operations") @@ -5978,7 +6703,7 @@ files and directories in a portable way.") (define-public ghc-process (package (name "ghc-process") - (version "1.4.2.0") + (version "1.6.3.0") (source (origin (method url-fetch) @@ -5987,7 +6712,7 @@ files and directories in a portable way.") version ".tar.gz")) (sha256 (base32 - "1v1bav5isqxq9fc4lw714x94qbfsjbm2nn12kjp69r1ql8jaaaqw")))) + "0lxkl0gmyy2sn3r9c7dyz8vz1cm6nvygmgrizilliir5bp42m8cc")))) (build-system haskell-build-system) (arguments `(#:phases @@ -6039,6 +6764,8 @@ files and directories in a portable way.") (base32 "0ln1szgfy8fa78l3issq4fx3aqnnd54w3cb4wssrfi48vd5rkfjm")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-fgl" ,ghc-fgl) ("ghc-quickcheck" ,ghc-quickcheck) @@ -6064,6 +6791,8 @@ for generating graph-like data structures.") (base32 "1z453is01v0rnxlv6xx4iyaqv5vrp3bpz829mpv1a341sck2135h")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-colour" ,ghc-colour) @@ -6241,7 +6970,7 @@ which can't be decoded in the current locale encoding.") (define-public ghc-shelly (package (name "ghc-shelly") - (version "1.6.8") + (version "1.7.0.1") (source (origin (method url-fetch) @@ -6250,7 +6979,7 @@ which can't be decoded in the current locale encoding.") version ".tar.gz")) (sha256 (base32 - "0bg1pj5bhswfgwfgz66xr82i8cmjgrnx5ljvjy37052zxb82imnk")))) + "0a4ngy8jqcscqhimgiyz7f9kqm23is7x7gyjxr0j6iq1dy57ahq3")))) (build-system haskell-build-system) (inputs `(("ghc-mtl" ,ghc-mtl) @@ -6406,7 +7135,7 @@ easily work with command-line options.") (define-public ghc-system-filepath (package (name "ghc-system-filepath") - (version "0.4.13.4") + (version "0.4.14") (source (origin (method url-fetch) @@ -6415,8 +7144,14 @@ easily work with command-line options.") version ".tar.gz")) (sha256 (base32 - "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l")))) + "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn")))) (build-system haskell-build-system) + ;; FIXME: One of the tests fails: + ;; [ FAIL ] tests.validity.posix + ;; note: seed=7310214548328823169 + ;; *** Failed! Falsifiable (after 24 tests): + ;; FilePath "/r2\ENQ52\t ;$/o\US=/okG\146\&6\n<u\DC3/5\182\223a\DELN\EOT#\NUL/`[m/\USEKV\ETX([)b6/\ACK\SOo\245\ETBO/f\128\STX`|\EM\"/*\EMA\USD3/\143\&4/\CAN?\SUBee\CANR/9/B0\187Kx4/Vqr\232'b:/\a\234\DLE.\"\179/\ENQ{J/|/G)@^\237/\219ml/\DC3pd\ESC" + (arguments `(#:tests? #f)) (inputs `(("ghc-text" ,ghc-text) ("ghc-chell" ,ghc-chell) @@ -6941,8 +7676,7 @@ files in Haskell.") `(("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-directory", ghc-directory) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-process" ,ghc-process))) + ("ghc-old-locale" ,ghc-old-locale))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "http://software.complete.org/hslogger") @@ -7760,6 +8494,8 @@ IPv4, IPv6 and MAC addresses.") (base32 "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-random" ,ghc-random) ("ghc-text" ,ghc-text))) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ef2a7cb07c..5f209a2c20 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -766,6 +766,57 @@ but also for getting notified upon idle time events, such as custom timeouts, or user activity.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kirigami + ;; Kirigami is listed as tier 1 framework, but optionally includes + ;; plasma-framework which is tier 3. + (package + (name "kirigami") + (version "5.39.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + "kirigami2-" version ".tar.xz")) + (sha256 + (base32 + "0spgylk4yjy74rs5d5b28qv72qz5ra9j3wfmk6vx2b6cvf1fw517")))) + (properties `((upstream-name . "kirigami2"))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ;; TODO: Find a way to activate this optional include without + ;; introducing a recursive dependency. + ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsvg" ,qtsvg) + ;; Run-time dependency + ("qtgraphicaleffects" ,qtgraphicaleffects))) + (arguments + `(#:tests? #f ;; FIXME: Test suite is broken, + ;; see https://bugs.kde.org/show_bug.cgi?id=386456 + ;; Note for when enabling the tests: The test-suite is meant to be run + ;; without prior installation, see + ;; https://cgit.kde.org/kirigami.git/commit/?id=24ad2c9 + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key outputs #:allow-other-keys) + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "QtQuick components for mobile user interfaces") + (description "Kirigami is a set of high level QtQuick components looking +and feeling well on both mobile and desktop devices. They ease the creation +of applications that follow the Kirigami Human Interface Guidelines.") + (license license:lgpl2.1+))) + (define-public kitemmodels (package (name "kitemmodels") diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 42456995bb..b4ed90ebb4 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> -;;; Copyright © 2017 ng0 <ng0@infotropique.org> +;;; Copyright © 2017, 2018 ng0 <ng0@crash.cx> ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,7 +139,7 @@ sounds for various system events.") (source (origin (method url-fetch) - (uri (string-append "https://d.n0.is/releases/pycanberra/" + (uri (string-append "https://files.crash.cx/releases/" "pycanberra-" version ".tar.xz")) (sha256 (base32 @@ -152,5 +152,5 @@ sounds for various system events.") (synopsis "Ctypes wrapper for the libcanberra API") (description "Pycanberra is a basic Python wrapper for libcanberra.") - (home-page "https://c.n0.is/pycanberra/") + (home-page "https://code.crash.cx/pycanberra/log.html") (license lgpl2.1+))) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3c04ba8c49..9b60c06a8d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. @@ -54,6 +54,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) @@ -839,22 +840,10 @@ and to return information on pronunciations, meanings and synonyms.") (license (non-copyleft "file://COPYING" "See COPYING in the distribution.")))) -;; LibreOffice requires an xmlsec source tarball; it does not even check -;; for the presence of an externally compiled library. -(define xmlsec-src-libreoffice - (origin - (method url-fetch) - (uri - (string-append - "http://dev-www.libreoffice.org/src/" - "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz")) - (sha256 (base32 - "17qfw5crkqn4v6xbkjxrjvcccfc00dy053892wrwv54qdk8n7m21")))) - (define-public libreoffice (package (name "libreoffice") - (version "5.3.7.2") + (version "5.4.5.1") (source (origin (method url-fetch) @@ -863,16 +852,11 @@ and to return information on pronunciations, meanings and synonyms.") "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "0z7fssp0jcj09wxad1wmhy69n71a2mwl933lxp9dz5sdvzncxmy3")))) + "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb")))) (build-system gnu-build-system) (native-inputs - `(;; autoreconf is run by the LibreOffice build system, since after - ;; unpacking the external xmlsec tarball, it applies a series of - ;; patches to Makefile.am, configure.in, config.guess and config.sub. - ("autoconf" ,autoconf) - ("automake" ,automake) - ("bison" ,bison) - ("cppunit" ,cppunit) + `(("bison" ,bison) + ("cppunit" ,cppunit-1.14) ("flex" ,flex) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -888,6 +872,7 @@ and to return information on pronunciations, meanings and synonyms.") ("glew" ,glew) ("glm" ,glm) ("gperf" ,gperf) + ("gpgme" ,gpgme) ("graphite2" ,graphite2) ("gst-plugins-base" ,gst-plugins-base) ("gtk+" ,gtk+) @@ -897,12 +882,14 @@ and to return information on pronunciations, meanings and synonyms.") ("libabw" ,libabw) ("libcdr" ,libcdr) ("libcmis" ,libcmis) - ("libjpeg" ,libjpeg) + ("libjpeg-turbo" ,libjpeg-turbo) ("libe-book" ,libe-book) ("libetonyek" ,libetonyek) ("libexttextcat" ,libexttextcat) ("libfreehand" ,libfreehand) ("liblangtag" ,liblangtag) + ;; XXX: Perhaps this should be propagated from xmlsec. + ("libltdl" ,libltdl) ("libmspub" ,libmspub) ("libmwaw" ,libmwaw) ("libodfgen" ,libodfgen) @@ -935,7 +922,7 @@ and to return information on pronunciations, meanings and synonyms.") ("unixodbc" ,unixodbc) ("unzip" ,unzip) ("vigra" ,vigra) - ("xmlsec-src" ,xmlsec-src-libreoffice) + ("xmlsec" ,xmlsec-nss) ("zip" ,zip))) (arguments `(#:tests? #f ; Building the tests already fails. @@ -944,7 +931,7 @@ and to return information on pronunciations, meanings and synonyms.") (modify-phases %standard-phases (add-before 'configure 'prepare-src (lambda* (#:key inputs #:allow-other-keys) - (let ((xmlsec (assoc-ref inputs "xmlsec-src"))) + (let ((gpgme (assoc-ref inputs "gpgme"))) (substitute* "sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx" ;; This header was renamed in Poppler 0.62.0. @@ -956,20 +943,21 @@ and to return information on pronunciations, meanings and synonyms.") "solenv/gbuild/gbuild.mk" "solenv/gbuild/platform/unxgcc.mk") (("/bin/sh") (which "sh"))) - (mkdir "external/tarballs") - (symlink - xmlsec - (string-append "external/tarballs/" - "86b1daaa438f5a7bea9a52d7b9799ac0-" - "xmlsec1-1.2.23.tar.gz")) - ;; The following is required for building xmlsec from the - ;; unpatched external tarball; since "configure" starts with - ;; "/bin/sh", it needs to be executed by a command invoking - ;; the shell. - (setenv "SHELL" (which "bash")) - (setenv "CONFIG_SHELL" (which "bash")) - (substitute* "external/libxmlsec/ExternalProject_xmlsec.mk" - (("./configure") "$(CONFIG_SHELL) ./configure" )) + + ;; GPGME++ headers are installed in a gpgme++ subdirectory, + ;; but files in "xmlsecurity/source/gpg/" expect to find them + ;; on the include path without a prefix. + (substitute* "xmlsecurity/Library_xsec_xmlsec.mk" + (("\\$\\$\\(INCLUDE\\)") + (string-append "$$(INCLUDE) -I" gpgme "/include/gpgme++"))) + + ;; XXX: When GTK2 is disabled, one header file is not included. + ;; This is likely fixed in later versions. See also + ;; <https://bugs.gentoo.org/641812>. + (substitute* "vcl/unx/gtk3/gtk3gtkframe.cxx" + (("#include <unx/gtk/gtkgdi.hxx>") + "#include <unx/gtk/gtkgdi.hxx>\n#include <unx/gtk/gtksalmenu.hxx>")) + #t))) (add-after 'install 'bin-and-desktop-install ;; Create 'soffice' and 'libreoffice' symlinks to the executable @@ -1043,6 +1031,10 @@ and to return information on pronunciations, meanings and synonyms.") "--disable-coinmp" "--disable-firebird-sdbc" ; embedded firebird "--disable-gltf" + ;; XXX: PDFium support requires fetching an external tarball and + ;; patching the build scripts to work with GCC5. Try enabling this + ;; when our default compiler is >=GCC 6. + "--disable-pdfium" "--disable-gtk" ; disable use of GTK+ 2 "--without-doxygen"))) (home-page "https://www.libreoffice.org/") diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index e4301c5208..10a5a91db4 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -287,14 +287,14 @@ proposed for standardization.") (define-public gmtp (package (name "gmtp") - (version "1.3.10") + (version "1.3.11") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gmtp/gMTP-" version "/gmtp-" version ".tar.gz")) (sha256 (base32 - "0fyi3pdl2g57vr0p46ip2wwzyap3l0by7iqaqygv0yxfcs79l6xj")))) + "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a3a4737d59..3d038914f2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> -;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2017 Dave Love <fx@gnu.org> ;;; @@ -382,8 +382,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.15.2") -(define %linux-libre-hash "0rzncbk513a8q60z9psb9yz7liadsb7nghj12s1kmwn441z1zv93") +(define %linux-libre-version "4.15.3") +(define %linux-libre-hash "1svn7v0gdqh7mi1f139g3nhf18g4vr9958x1zh24zww0lyic8l27") (define-public linux-libre (make-linux-libre %linux-libre-version @@ -391,8 +391,8 @@ It has been modified to remove all non-free binary blobs.") %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.18") -(define %linux-libre-4.14-hash "1kl6zc9dzi02hzxwmzskxb4cqh5lph4afy94677bj5ribanmizn5") +(define %linux-libre-4.14-version "4.14.19") +(define %linux-libre-4.14-hash "1zns8nxx1j1fxpgqgsm9z0kffn0ji1pcsav1r77gxqllsn49wa8m") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version @@ -401,8 +401,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.80" - "094c66sh4h1n46as20n0ip2clp89khsn91ngxwg5p85gf3jqk1h9" + (make-linux-libre "4.9.81" + "1x89llah2hklh36rgx7cywacdmvbs9334101qhpycicdi5sv7mnn" %intel-compatible-systems #:configuration-file kernel-config)) @@ -3065,7 +3065,7 @@ is flexible, efficient and uses a modular implementation.") (define-public fuse-exfat (package (name "fuse-exfat") - (version "1.2.7") + (version "1.2.8") (source (origin (method url-fetch) (uri (string-append @@ -3073,7 +3073,7 @@ is flexible, efficient and uses a modular implementation.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0df0ccnd0dgwc6rvk9qmrz0nfb8whc5s3wg9qnw1mzbrh4rcvhw2")))) + "1jwnxw0bg9v5ij8xvbg4xpjr50nykq8a1lmc2xkblz204rq7wd8z")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0263fc107c..13b9fe5786 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018 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 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> @@ -698,7 +698,9 @@ incompatible with HDF5.") #:configure-flags '("--enable-cxx" "--enable-fortran" "--enable-fortran2003") - + ;; Use -fPIC to allow the R bindings to link with the static libraries + #:make-flags (list "CFLAGS=-fPIC" + "CXXFLAGS=-fPIC") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-configure @@ -1893,12 +1895,12 @@ programming problems.") (define-public r-pracma (package (name "r-pracma") - (version "2.1.1") + (version "2.1.4") (source (origin (method url-fetch) (uri (cran-uri "pracma" version)) (sha256 - (base32 "1mylrrkyycaw9m01mmg6xkn5wgdlabs5l0qyws60r0n2ycblp897")))) + (base32 "1ygm81i7mqvh229dp9935djjyb120p3bqvaf4k572sa4q63fzjhc")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) diff --git a/gnu/packages/patches/mpv-CVE-2018-6360-1.patch b/gnu/packages/patches/mpv-CVE-2018-6360-1.patch deleted file mode 100644 index 55fc7daaf3..0000000000 --- a/gnu/packages/patches/mpv-CVE-2018-6360-1.patch +++ /dev/null @@ -1,138 +0,0 @@ -Fix CVE-2018-6360: - -https://github.com/mpv-player/mpv/issues/5456 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6360 -https://security-tracker.debian.org/tracker/CVE-2018-6360 - -Patch copied from upstream source repository: - -https://github.com/mpv-player/mpv/commit/e6e6b0dcc7e9b0dbf35154a179b3dc1fcfcaff43 - -To apply the patch to mpv 0.28.0 release tarball, hunk #4 is removed. Hunk #4 -checks if 'mpd_url' is safe, but the support for 'mpd_url' is not available -for the 0.28.0 release. So it should be safe to remove hunk #4. - -From e6e6b0dcc7e9b0dbf35154a179b3dc1fcfcaff43 Mon Sep 17 00:00:00 2001 -From: Ricardo Constantino <wiiaboo@gmail.com> -Date: Fri, 26 Jan 2018 01:19:04 +0000 -Subject: [PATCH] ytdl_hook: whitelist protocols from urls retrieved from - youtube-dl - -Not very clean since there's a lot of potential unsafe urls that youtube-dl -can give us, depending on whether it's a single url, split tracks, -playlists, segmented dash, etc. ---- - player/lua/ytdl_hook.lua | 54 +++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 47 insertions(+), 7 deletions(-) - -diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua -index dd96ecc01d..b480c21625 100644 ---- a/player/lua/ytdl_hook.lua -+++ b/player/lua/ytdl_hook.lua -@@ -16,6 +16,18 @@ local ytdl = { - - local chapter_list = {} - -+function Set (t) -+ local set = {} -+ for _, v in pairs(t) do set[v] = true end -+ return set -+end -+ -+local safe_protos = Set { -+ "http", "https", "ftp", "ftps", -+ "rtmp", "rtmps", "rtmpe", "rtmpt", "rtmpts", "rtmpte", -+ "data" -+} -+ - local function exec(args) - local ret = utils.subprocess({args = args}) - return ret.status, ret.stdout, ret -@@ -183,6 +195,9 @@ local function edl_track_joined(fragments, protocol, is_live, base) - - for i = offset, #fragments do - local fragment = fragments[i] -+ if not url_is_safe(join_url(base, fragment)) then -+ return nil -+ end - table.insert(parts, edl_escape(join_url(base, fragment))) - if fragment.duration then - parts[#parts] = -@@ -208,6 +223,15 @@ local function proto_is_dash(json) - or json["protocol"] == "http_dash_segments" - end - -+local function url_is_safe(url) -+ local proto = type(url) == "string" and url:match("^(.+)://") or nil -+ local safe = proto and safe_protos[proto] -+ if not safe then -+ msg.error(("Ignoring potentially unsafe url: '%s'"):format(url)) -+ end -+ return safe -+end -+ - local function add_single_video(json) - local streamurl = "" - local max_bitrate = 0 -@@ -238,14 +264,18 @@ local function add_single_video(json) - edl_track = edl_track_joined(track.fragments, - track.protocol, json.is_live, - track.fragment_base_url) -+ local url = edl_track or track.url -+ if not url_is_safe(url) then -+ return -+ end - if track.acodec and track.acodec ~= "none" then - -- audio track - mp.commandv("audio-add", -- edl_track or track.url, "auto", -+ url, "auto", - track.format_note or "") - elseif track.vcodec and track.vcodec ~= "none" then - -- video track -- streamurl = edl_track or track.url -+ streamurl = url - end - end - -@@ -264,7 +294,13 @@ local function add_single_video(json) - - msg.debug("streamurl: " .. streamurl) - -- mp.set_property("stream-open-filename", streamurl:gsub("^data:", "data://", 1)) -+ streamurl = streamurl:gsub("^data:", "data://", 1) -+ -+ if not url_is_safe(streamurl) then -+ return -+ end -+ -+ mp.set_property("stream-open-filename", streamurl) - - mp.set_property("file-local-options/force-media-title", json.title) - -@@ -526,14 +562,18 @@ mp.add_hook(o.try_ytdl_first and "on_load" or "on_load_fail", 10, function () - site = entry["webpage_url"] - end - -- if not (site:find("https?://") == 1) then -- site = "ytdl://" .. site -+ -- links with only youtube id as returned by --flat-playlist -+ if not site:find("://") then -+ table.insert(playlist, "ytdl://" .. site) -+ elseif url_is_safe(site) then -+ table.insert(playlist, site) - end -- table.insert(playlist, site) - - end - -- mp.set_property("stream-open-filename", "memory://" .. table.concat(playlist, "\n")) -+ if #playlist > 0 then -+ mp.set_property("stream-open-filename", "memory://" .. table.concat(playlist, "\n")) -+ end - end - - else -- probably a video --- -2.16.1 - diff --git a/gnu/packages/patches/mpv-CVE-2018-6360-2.patch b/gnu/packages/patches/mpv-CVE-2018-6360-2.patch deleted file mode 100644 index b37e33a641..0000000000 --- a/gnu/packages/patches/mpv-CVE-2018-6360-2.patch +++ /dev/null @@ -1,59 +0,0 @@ -Fix CVE-2018-6360: - -https://github.com/mpv-player/mpv/issues/5456 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6360 -https://security-tracker.debian.org/tracker/CVE-2018-6360 - -Patch copied from upstream source repository: - -https://github.com/mpv-player/mpv/commit/f8263e82cc74a9ac6530508bec39c7b0dc02568f - -From f8263e82cc74a9ac6530508bec39c7b0dc02568f Mon Sep 17 00:00:00 2001 -From: Ricardo Constantino <wiiaboo@gmail.com> -Date: Fri, 26 Jan 2018 11:26:27 +0000 -Subject: [PATCH] ytdl_hook: move url_is_safe earlier in code - -lua isn't javascript. ---- - player/lua/ytdl_hook.lua | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua -index b480c21625..458c94af38 100644 ---- a/player/lua/ytdl_hook.lua -+++ b/player/lua/ytdl_hook.lua -@@ -84,6 +84,15 @@ local function edl_escape(url) - return "%" .. string.len(url) .. "%" .. url - end - -+local function url_is_safe(url) -+ local proto = type(url) == "string" and url:match("^(.+)://") or nil -+ local safe = proto and safe_protos[proto] -+ if not safe then -+ msg.error(("Ignoring potentially unsafe url: '%s'"):format(url)) -+ end -+ return safe -+end -+ - local function time_to_secs(time_string) - local ret - -@@ -223,15 +232,6 @@ local function proto_is_dash(json) - or json["protocol"] == "http_dash_segments" - end - --local function url_is_safe(url) -- local proto = type(url) == "string" and url:match("^(.+)://") or nil -- local safe = proto and safe_protos[proto] -- if not safe then -- msg.error(("Ignoring potentially unsafe url: '%s'"):format(url)) -- end -- return safe --end -- - local function add_single_video(json) - local streamurl = "" - local max_bitrate = 0 --- -2.16.1 - diff --git a/gnu/packages/patches/mpv-CVE-2018-6360-3.patch b/gnu/packages/patches/mpv-CVE-2018-6360-3.patch deleted file mode 100644 index dc3e272d37..0000000000 --- a/gnu/packages/patches/mpv-CVE-2018-6360-3.patch +++ /dev/null @@ -1,84 +0,0 @@ -Fix CVE-2018-6360: - -https://github.com/mpv-player/mpv/issues/5456 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6360 -https://security-tracker.debian.org/tracker/CVE-2018-6360 - -Patch copied from upstream source repository: - -https://github.com/mpv-player/mpv/commit/ce42a965330dfeb7d2f6c69ea42d35454105c828 - -From ce42a965330dfeb7d2f6c69ea42d35454105c828 Mon Sep 17 00:00:00 2001 -From: Ricardo Constantino <wiiaboo@gmail.com> -Date: Fri, 26 Jan 2018 18:54:17 +0000 -Subject: [PATCH] ytdl_hook: fix safe url checking with EDL urls - ---- - player/lua/ytdl_hook.lua | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua -index 458c94af38..6c8e78657d 100644 ---- a/player/lua/ytdl_hook.lua -+++ b/player/lua/ytdl_hook.lua -@@ -264,18 +264,17 @@ local function add_single_video(json) - edl_track = edl_track_joined(track.fragments, - track.protocol, json.is_live, - track.fragment_base_url) -- local url = edl_track or track.url -- if not url_is_safe(url) then -+ if not edl_track and not url_is_safe(track.url) then - return - end - if track.acodec and track.acodec ~= "none" then - -- audio track - mp.commandv("audio-add", -- url, "auto", -+ edl_track or track.url, "auto", - track.format_note or "") - elseif track.vcodec and track.vcodec ~= "none" then - -- video track -- streamurl = url -+ streamurl = edl_track or track.url - end - end - -@@ -284,6 +283,9 @@ local function add_single_video(json) - edl_track = edl_track_joined(json.fragments, json.protocol, - json.is_live, json.fragment_base_url) - -+ if not edl_track and not url_is_safe(json.url) then -+ return -+ end - -- normal video or single track - streamurl = edl_track or json.url - set_http_headers(json.http_headers) -@@ -294,13 +296,7 @@ local function add_single_video(json) - - msg.debug("streamurl: " .. streamurl) - -- streamurl = streamurl:gsub("^data:", "data://", 1) -- -- if not url_is_safe(streamurl) then -- return -- end -- -- mp.set_property("stream-open-filename", streamurl) -+ mp.set_property("stream-open-filename", streamurl:gsub("^data:", "data://", 1)) - - mp.set_property("file-local-options/force-media-title", json.title) - -@@ -499,6 +495,10 @@ mp.add_hook(o.try_ytdl_first and "on_load" or "on_load_fail", 10, function () - - msg.debug("EDL: " .. playlist) - -+ if not playlist then -+ return -+ end -+ - -- can't change the http headers for each entry, so use the 1st - if json.entries[1] then - set_http_headers(json.entries[1].http_headers) --- -2.16.1 - diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6802b7b383..5c7ca0d5ec 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -318,14 +318,14 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") (define-public r-mass (package (name "r-mass") - (version "7.3-47") + (version "7.3-48") (source (origin (method url-fetch) (uri (cran-uri "MASS" version)) (sha256 (base32 - "1gy6z7ly9wn86rfn9xrmqiqq1ijw3pkasrr2299kbzsgx2mwsi7d")))) + "02q95ba909p2gxnzfp295ipxjnv14f7bm55nicxwn2kj8hizpzqd")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") @@ -511,14 +511,14 @@ nonlinear mixed-effects models.") (define-public r-mgcv (package (name "r-mgcv") - (version "1.8-22") + (version "1.8-23") (source (origin (method url-fetch) (uri (cran-uri "mgcv" version)) (sha256 (base32 - "1546p6aflg3z6xl2mns1n2c3j8q2spr9cjggj9rn33vrrhsv4fss")))) + "1lsrhf1yzn25pfn3f5x8yxjqnfryim4jx3iqd7ah8aalh5asqwbp")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix) @@ -554,14 +554,14 @@ single hidden layer, and for multinomial log-linear models.") (define-public r-rpart (package (name "r-rpart") - (version "4.1-11") + (version "4.1-12") (source (origin (method url-fetch) (uri (cran-uri "rpart" version)) (sha256 (base32 - "165djqj7lk81jr7z5fwccq3h7ayys26hx1kj9hndvg2rkyaq1arq")))) + "177p03w4m0qshb3sqkdyixim3f44g2an31v3vlbjmpzjvd5ff6yq")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/rpart") (synopsis "Recursive partitioning and regression trees") @@ -704,13 +704,13 @@ effects of different types of color-blindness.") (define-public r-digest (package (name "r-digest") - (version "0.6.13") + (version "0.6.15") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "1bsgl07bvf4nk6bn7n3l2ilvk4qvn3nk7yxp22miil7x405xdks6")))) + (base32 "1ia4ak956gnn0f5aqhwgam6g9z6f1y57zz8jv45jc8h79yxp8bl8")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. @@ -734,13 +734,13 @@ OpenSSL should be used.") (define-public r-estimability (package (name "r-estimability") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (cran-uri "estimability" version)) (sha256 (base32 - "13b80bpnbrarazjvnpnk91ljjsqgfm2fm3gy66aj09cmmsmv199h")))) + "0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/estimability") (synopsis "Tools for assessing estimability of linear predictions") @@ -1347,17 +1347,16 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.") (define-public r-knitr (package (name "r-knitr") - (version "1.17") + (version "1.19") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "00gljbz57n9lkvbd6az4n37gpbs8vg3fxx5p9biamhmhqyra514l")))) + "1gyj9bw90h4h9rc9k1iqrnzirm2f8mj45zi8bkjc6rp610vlh63j")))) (build-system r-build-system) (propagated-inputs `(("r-evaluate" ,r-evaluate) - ("r-digest" ,r-digest) ("r-highr" ,r-highr) ("r-markdown" ,r-markdown) ("r-stringr" ,r-stringr) @@ -1398,16 +1397,14 @@ from knitr Rmarkdown.") (define-public r-microbenchmark (package (name "r-microbenchmark") - (version "1.4-2.1") + (version "1.4-4") (source (origin (method url-fetch) (uri (cran-uri "microbenchmark" version)) (sha256 (base32 - "0qn5r1a6qidghcisc2hpbdmj62pnixc3zz6p4ipk8mvakf0hdsvg")))) + "0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c")))) (build-system r-build-system) - (propagated-inputs - `(("r-ggplot2" ,r-ggplot2))) (home-page "https://cran.r-project.org/web/packages/microbenchmark/") (synopsis "Accurate timing functions for R") (description @@ -1552,13 +1549,13 @@ defined in different packages.") (define-public r-rlang (package (name "r-rlang") - (version "0.1.4") + (version "0.1.6") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "1x5rwwsx7xrlyspy41yl5nhyvfgzl73195nsdb4rc6z85ab6r6wd")))) + "1x62assn8m7cd0q75r809gxsdqmxmd2br1xz53ykzhrfz3j768kp")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") @@ -1570,18 +1567,20 @@ like tidy evaluation.") (define-public r-tibble (package (name "r-tibble") - (version "1.3.4") + (version "1.4.2") (source (origin (method url-fetch) (uri (cran-uri "tibble" version)) (sha256 (base32 - "02vn6yqzcvmazy5jaqar3wwbrmh83a1bfgsqgk0hgz38i80zgvm7")))) + "05svbjkm1xqv56ybjgsqqg2pp8nn6hams1yxcr8aanbhzx9h6rqi")))) (build-system r-build-system) (propagated-inputs `(("r-rlang" ,r-rlang) - ("r-rcpp" ,r-rcpp))) + ("r-cli" ,r-cli) + ("r-crayon" ,r-crayon) + ("r-pillar" ,r-pillar))) (home-page "https://github.com/hadley/tibble") (synopsis "Simple data frames") (description @@ -1628,14 +1627,14 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "17gn8vr4a6m9ynarjbm9xsrhcvgn5lnxhb2qhiiglmhh5mm4a7kv")))) + "17br61mhssi2pm6v8604f89ykglng3qp9ymfzmhw10cary6zm982")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) @@ -1645,7 +1644,8 @@ database.") ("r-purrr" ,r-purrr) ("r-r6" ,r-r6) ("r-rlang" ,r-rlang) - ("r-tibble" ,r-tibble))) + ("r-tibble" ,r-tibble) + ("r-tidyselect" ,r-tidyselect))) (home-page "https://github.com/tidyverse/dbplyr") (synopsis "Dplyr back end for databases") (description @@ -1722,13 +1722,13 @@ and density estimation.") (define-public r-chron (package (name "r-chron") - (version "2.3-51") + (version "2.3-52") (source (origin (method url-fetch) (uri (cran-uri "chron" version)) (sha256 (base32 - "05aznigw9nwv3hbwjnjbvqhfjqkwsw2csgrjx8500gzr2fvla5w8")))) + "185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/chron") (synopsis "Chronological R objects which can handle dates and times") @@ -1923,20 +1923,22 @@ and environmental data in the framework of Euclidean exploratory methods.") (define-public r-xml2 (package (name "r-xml2") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "xml2" version)) (sha256 (base32 - "05iifrcgzx53w5ciw8bbm4vdwc3giv4xsvazv8chqxkndfvf7wq0")))) + "154lmksfiwkhnlmryas25mjhfg6k4mmnnk7bbb29mnn5x5pr2yha")))) (build-system r-build-system) (inputs - `(("libxml2" ,libxml2))) + `(("libxml2" ,libxml2) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (propagated-inputs - `(("r-rcpp" ,r-rcpp) - ("r-bh" ,r-bh))) + `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/hadley/xml2") (synopsis "Parse XML with R") (description @@ -2229,14 +2231,14 @@ collation, and NAMESPACE files.") (define-public r-openssl (package (name "r-openssl") - (version "0.9.9") + (version "1.0") (source (origin (method url-fetch) (uri (cran-uri "openssl" version)) (sha256 (base32 - "1ir7ggs0rxgn83h40r6jg9dzhb7hbcwhkcj5nsdzj7jz61sfgv77")))) + "1j8smqrb79lnaf2n9icksjiy641fcazsbkhmgg916s3nnyjngjz3")))) (build-system r-build-system) (inputs `(("libressl" ,libressl))) @@ -2284,13 +2286,13 @@ functions make it easy to control additional request components.") (define-public r-git2r (package (name "r-git2r") - (version "0.20.0") + (version "0.21.0") (source (origin (method url-fetch) (uri (cran-uri "git2r" version)) (sha256 (base32 - "1pqggijvsalb5cc2pr5gwfj3s713s63f4xii1xrd0qagfgbgz846")))) + "11xgddmxzh9cy85k8fb90il43qswpvryz0h9r0j1gbclfg2f9004")))) (build-system r-build-system) ;; This R package contains modified sources of libgit2. This modified ;; version of libgit2 is built as the package is built. Hence libgit2 is @@ -2354,16 +2356,14 @@ tools to simplify the devolpment of R packages.") (define-public r-withr (package (name "r-withr") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "withr" version)) (sha256 (base32 - "12v263fj6l3ds9nrsj6q7h6zhbivp3w2jk7w9dpk1610d3nx9gf8")))) + "17pbllxv18gf1mli9mm5px4wzp364907a4wrl20r1y5q8qwawpxx")))) (build-system r-build-system) - (propagated-inputs - `(("r-lattice" ,r-lattice))) (home-page "https://github.com/jimhester/withr") (synopsis "Run code with temporarily modified global state") (description @@ -2375,14 +2375,14 @@ were originally a part of the r-devtools package.") (define-public r-hms (package (name "r-hms") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (cran-uri "hms" version)) (sha256 (base32 - "07sh75flp15lx2b00s3nxh04xr9gk4qhlbh125qx25isf71zw6zl")))) + "0vr7k3a7k52a5yf67bwzl88lkjz09v1avw5axdk1y9v3nz33zl2h")))) (build-system r-build-system) (propagated-inputs `(("r-rlang" ,r-rlang) @@ -2551,14 +2551,14 @@ encoder/decoder, round-off-error-free sum and cumsum, etc.") (define-public r-rprojroot (package (name "r-rprojroot") - (version "1.3-1") + (version "1.3-2") (source (origin (method url-fetch) (uri (cran-uri "rprojroot" version)) (sha256 (base32 - "1jigr2jh3hzy35h94im52yq81lyikw7nfvmbxij84a1b9c32r332")))) + "12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports))) @@ -3023,18 +3023,19 @@ using the multicore functionality of the parallel package.") (define-public r-dt (package (name "r-dt") - (version "0.2") + (version "0.4") (source (origin (method url-fetch) (uri (cran-uri "DT" version)) (sha256 (base32 - "1g86p0jcjqi2ph5rhm45jkzibsa6yfcj8n5cg3giy90sqgjzkdx1")))) + "06gsqz7p2fv6hc3fm3759gaa50krcfrqrmy7qbxyam6a36w9daix")))) (properties `((upstream-name . "DT"))) (build-system r-build-system) (propagated-inputs - `(("r-htmltools" ,r-htmltools) + `(("r-crosstalk" ,r-crosstalk) + ("r-htmltools" ,r-htmltools) ("r-htmlwidgets" ,r-htmlwidgets) ("r-magrittr" ,r-magrittr))) (home-page "http://rstudio.github.io/DT") @@ -3075,14 +3076,14 @@ flexible than the orphaned \"base64\" package.") (define-public r-irlba (package (name "r-irlba") - (version "2.3.1") + (version "2.3.2") (source (origin (method url-fetch) (uri (cran-uri "irlba" version)) (sha256 (base32 - "1dclzzkm75sbbqda5scj2hlqnw2sksgxbiqagxs4359fwfszi0k0")))) + "0f7wb12wa0zbyllk5adcf4f517wgjpkhsx4j176i9ax6xy7jvprz")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) @@ -3261,19 +3262,20 @@ bigmemory and synchronicity packages.") (define-public r-synchronicity (package (name "r-synchronicity") - (version "1.1.9.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "synchronicity" version)) (sha256 (base32 - "0d9skpwmsnkn4xb3f2kgyyv8bhdi0r9p1kj3cvi0s92fjjnpi00c")))) + "1idrjzl7nkamf1ip55s6qcf64s63xs9j8z9jv3r89p6r5lw7k5mv")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) ("r-bigmemory-sri" ,r-bigmemory-sri) - ("r-rcpp" ,r-rcpp))) + ("r-rcpp" ,r-rcpp) + ("r-uuid" ,r-uuid))) (home-page "http://www.bigmemory.org") (synopsis "Boost mutex functionality in R") (description "This package provides support for synchronization @@ -3285,14 +3287,14 @@ message passing.") (define-public r-bigmemory (package (name "r-bigmemory") - (version "4.5.31") + (version "4.5.33") (source (origin (method url-fetch) (uri (cran-uri "bigmemory" version)) (sha256 (base32 - "0wv0p746zz5a6r1yd0fgpj2kfcyzk2f4rxqz92p6lp9jzakv4lfs")))) + "0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) @@ -3418,13 +3420,13 @@ developing R packages.") (define-public r-r-cache (package (name "r-r-cache") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (cran-uri "R.cache" version)) (sha256 (base32 - "006x52w9r8phw5hgqmyp0bz8z42vn8p5yibibnzi1sfa1xlw8iyx")))) + "1hf5cb7xvnca5zlh9245b5g62sgsaxwdhiv7x59yld37cydakm6k")))) (properties `((upstream-name . "R.cache"))) (build-system r-build-system) (propagated-inputs @@ -3444,17 +3446,18 @@ persistent (on the file system).") (define-public r-r-rsp (package (name "r-r-rsp") - (version "0.41.0") + (version "0.42.0") (source (origin (method url-fetch) (uri (cran-uri "R.rsp" version)) (sha256 (base32 - "01l430avj5ggmdsla2kiriix72g0dlzx9klniq321bs0za808v3c")))) + "1zcq0hzi0j7fvj2rs796a1i120wbr0387vck17rrd644awwbsbm0")))) (properties `((upstream-name . "R.rsp"))) (build-system r-build-system) (propagated-inputs - `(("r-r-cache" ,r-r-cache) + `(("r-digest" ,r-digest) + ("r-r-cache" ,r-r-cache) ("r-r-methodss3" ,r-r-methodss3) ("r-r-oo" ,r-r-oo) ("r-r-utils" ,r-r-utils))) @@ -3475,13 +3478,13 @@ vignettes.") (define-public r-mvtnorm (package (name "r-mvtnorm") - (version "1.0-6") + (version "1.0-7") (source (origin (method url-fetch) (uri (cran-uri "mvtnorm" version)) (sha256 (base32 - "0i74s9dl4jf1gln6agra8h38qn9ifd5v0gi13caj1da5nrbmn0aa")))) + "0f7hzflygdnbwvzadr3knhybhanwg7agqddclj6mhbvwqpgb0qyh")))) (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) @@ -3494,13 +3497,13 @@ t-probabilities, quantiles, random deviates and densities.") (define-public r-matrixstats (package (name "r-matrixstats") - (version "0.52.2") + (version "0.53.1") (source (origin (method url-fetch) (uri (cran-uri "matrixStats" version)) (sha256 (base32 - "19fjf19cr0p3j9pj17myz39zpi5bh7ci72db3la9my09n6k6mnir")))) + "0bkiz5fm09d3512mfr2ymj9qsb1b8aic5l5m6fkaf5j7nsgvqw6z")))) (properties `((upstream-name . "matrixStats"))) (build-system r-build-system) (native-inputs @@ -3518,13 +3521,13 @@ memory usage.") (define-public r-viridis (package (name "r-viridis") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "viridis" version)) (sha256 (base32 - "03mha2935k1mw7mjjkq7mrx185hl0m3vq3967iiwbknpivbdxllk")))) + "1ka6amybgzqkg3cbwfxwwqzzzpfn6q5jcia5am0bw48y5hbpg97y")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) @@ -3545,14 +3548,14 @@ most common form of color blindness.") (define-public r-viridislite (package (name "r-viridislite") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "viridisLite" version)) (sha256 (base32 - "1546h44ng4dxs130jkh6lkh990hmp90m1w45sq5p47n546gr0k9d")))) + "1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq")))) (properties `((upstream-name . "viridisLite"))) (build-system r-build-system) (home-page "https://github.com/sjmgarnier/viridisLite") @@ -3596,14 +3599,14 @@ selection.") (define-public r-tidyr (package (name "r-tidyr") - (version "0.7.2") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "tidyr" version)) (sha256 (base32 - "1700fry2b3d3ksj7x2f09xl6agjrdnx1rqsc1r8gvzsp5cpflb06")))) + "1qjpbj1a2vw6nw4hdb6fgassnrxrdpqwf9a8i6wqnv3wxvjb6zqb")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -3629,17 +3632,14 @@ and tidyr provides no margins or aggregation.") (define-public r-hexbin (package (name "r-hexbin") - ;; The package tarball was updated in place, resulting in a change in the - ;; hash value. We decided to bump the version to 1.27.1-1 instead of - ;; keeping the version at upstream's 1.27.1. - (version "1.27.1-1") + (version "1.27.2") (source (origin (method url-fetch) - (uri (cran-uri "hexbin" "1.27.1")) + (uri (cran-uri "hexbin" version)) (sha256 (base32 - "025d609z1nyy684hwvp34b9mjzkgvild7fvfr95f941dmsikan87")))) + "0lpfl0015lg5x7lvv9dr302bca22c7fs91pnd896ypgpzqg7pm26")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -3877,14 +3877,14 @@ package instead.") (define-public r-hmisc (package (name "r-hmisc") - (version "4.0-3") + (version "4.1-1") (source (origin (method url-fetch) (uri (cran-uri "Hmisc" version)) (sha256 (base32 - "1a7i7azag6pldgala85d8hh7wnx1shamyiriy4jfc65nxrr2lq8w")))) + "160l50ppjs69ipcaya1mlcz29zbn5rmqg91r09dvzzvkvwfb47cr")))) (properties `((upstream-name . "Hmisc"))) (build-system r-build-system) (native-inputs @@ -4158,13 +4158,13 @@ mechanism.") (define-public r-zoo (package (name "r-zoo") - (version "1.8-0") + (version "1.8-1") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "0mqklbx92ifwa0awm7gpm4r9dvwa09p55zjxjnypiqsxy532r4h9")))) + "16nc5jnpkf5j9vgq3pzssv7knj30mi055wj7q3sygz3l0d88hgfr")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -4676,14 +4676,14 @@ regression methodology including model selections and multivariate statistics.") (define-public r-pcapp (package (name "r-pcapp") - (version "1.9-72") + (version "1.9-73") (source (origin (method url-fetch) (uri (cran-uri "pcaPP" version)) (sha256 (base32 - "0i2822bv86dpqmk3q17x61nsp3gjjnn4nr8191rwvbiib7xhpgaq")))) + "1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa")))) (properties `((upstream-name . "pcaPP"))) (build-system r-build-system) (propagated-inputs @@ -4802,14 +4802,14 @@ of the points.") (define-public r-fpc (package (name "r-fpc") - (version "2.1-10") + (version "2.1-11") (source (origin (method url-fetch) (uri (cran-uri "fpc" version)) (sha256 (base32 - "15m0p9l9w2v7sl0cnzyg81i2fmx3hrhvr3371544mwn3fpsca5sx")))) + "04alsqb5gbhsjg1000d8w52pmpnlwca29r0s12f7n7mdccdv6xar")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) @@ -4836,14 +4836,14 @@ groupings.") (define-public r-vgam (package (name "r-vgam") - (version "1.0-4") + (version "1.0-5") (source (origin (method url-fetch) (uri (cran-uri "VGAM" version)) (sha256 (base32 - "0r59hyp3afmvms890b3v2yyckf8v0qkjf2w11rnqd2zgg1gri0g5")))) + "0ik3wyv6jj54bg34z0fzzk4xg0h6x98jqx4q2r7g1f0in0qgbb01")))) (properties `((upstream-name . "VGAM"))) (build-system r-build-system) (inputs @@ -4861,14 +4861,14 @@ VGLMs can be loosely thought of as multivariate generalised linear models.") (define-public r-pbapply (package (name "r-pbapply") - (version "1.3-3") + (version "1.3-4") (source (origin (method url-fetch) (uri (cran-uri "pbapply" version)) (sha256 (base32 - "0iqhymf65jffh00qf056h1p76xf92bfmij6aymlmgnvn24fv4ybk")))) + "0lk5kxac09xzdv6vf7ix6r5bfrm7cnpyr2l5mkd4igpciadszzfd")))) (build-system r-build-system) (home-page "https://github.com/psolymos/pbapply") (synopsis "Adding progress bar to apply functions") @@ -4925,14 +4925,14 @@ based on an interface to Fortran implementations by M. J. D. Powell.") (define-public r-rcppeigen (package (name "r-rcppeigen") - (version "0.3.3.3.1") + (version "0.3.3.4.0") (source (origin (method url-fetch) (uri (cran-uri "RcppEigen" version)) (sha256 (base32 - "093g2wmqyk86693l0lzh2va8119w3k7rvw5q24p842jdfv5x5z8l")))) + "1m6ssq6lvi36ggf26y4hhq996583pxxdb978jnn1x6r9gdb0q0hi")))) (properties `((upstream-name . "RcppEigen"))) (build-system r-build-system) (propagated-inputs @@ -4994,14 +4994,14 @@ using modular prediction and response module classes.") (define-public r-quantreg (package (name "r-quantreg") - (version "5.34") + (version "5.35") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 (base32 - "0bmgfgnmzqwmwwaraliry682yb8kcr396q3rlzrd2qzaa9sgxxh4")))) + "18f3qxv1j1bqmq55hzssz8mnp5ww4flhy80rm2v1rk0mmg9paz7m")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) @@ -5048,14 +5048,14 @@ algorithms.") (define-public r-lme4 (package (name "r-lme4") - (version "1.1-14") + (version "1.1-15") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "1vars93604q7kyz6y1f8f886l05jkgj8bs78033l2czypvzki5la")))) + "0sc6rvhiizxxpkdc3wps200wg3pqc0d89crn29lzm75fk8qdd7vx")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp) @@ -5274,14 +5274,14 @@ diagnostic tools (@code{ctlcurves} and @code{DiscrFact}).") (define-public r-ranger (package (name "r-ranger") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "ranger" version)) (sha256 (base32 - "1fdbm879wx3hlng8s4c4f8f2x5yxz57llakcqnpa0lymybidw3vz")))) + "1pilj5pxl8jl0gsy9vsyqxqdqfcxzvphbgvrlp4hf7r9mrfw9v0p")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) @@ -5352,14 +5352,14 @@ is supported.") (define-public r-lubridate (package (name "r-lubridate") - (version "1.7.1") + (version "1.7.2") (source (origin (method url-fetch) (uri (cran-uri "lubridate" version)) (sha256 (base32 - "0pzvazzybzvln3y676yims7whsc74g8i7kgf2nsfbxdq5943z349")))) + "0k417a1xp5gxf77ycbnx5apzpc5d25sjm83ss7wmqpbnhnr5dcav")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8e7ce1ee8..29be20699d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1602,7 +1602,7 @@ be served with a HTTP file server of your choice.") (define-public darcs (package (name "darcs") - (version "2.12.4") + (version "2.12.5") (source (origin (method url-fetch) @@ -1610,7 +1610,7 @@ be served with a HTTP file server of your choice.") "darcs-" version ".tar.gz")) (sha256 (base32 - "0jfwiwl5k8wspciq1kpmvh5yap4japrf97s9pvhcybxxhaj3ds28")) + "0lrm0sal5pl453mkqn8b9fc9l7lwinc140iqihya9g17bk408nrm")) (modules '((guix build utils))) ;; Remove time-dependent code for reproducibility. (snippet @@ -1625,8 +1625,10 @@ be served with a HTTP file server of your choice.") (arguments `(#:configure-flags '("-fpkgconfig" "-fcurl" "-flibiconv" "-fthreaded" "-fnetwork-uri" "-fhttp" "--flag=executable" - "--flag=library") - #:tests? #f)) ; 20 failing shell tests out of over 400 + "--flag=library" + "--allow-newer=shelly") + ;; FIXME: darcs is not compatible with the latest QuickCheck + #:tests? #f)) (inputs `(("ghc-cmdargs" ,ghc-cmdargs) ("ghc-split" ,ghc-split) @@ -1644,7 +1646,6 @@ be served with a HTTP file server of your choice.") ("ghc-bytestring-builder" ,ghc-bytestring-builder) ("ghc-cryptohash" ,ghc-cryptohash) ("ghc-data-ordlist" ,ghc-data-ordlist) - ("ghc-directory" ,ghc-directory) ("ghc-fgl" ,ghc-fgl) ("ghc-system-filepath" ,ghc-system-filepath) ("ghc-graphviz" ,ghc-graphviz) @@ -1655,7 +1656,6 @@ be served with a HTTP file server of your choice.") ("ghc-mtl" ,ghc-mtl) ("ghc-old-time" ,ghc-old-time) ("ghc-parsec" ,ghc-parsec) - ("ghc-process" ,ghc-process) ("ghc-random" ,ghc-random) ("ghc-regex-applicative" ,ghc-regex-applicative) ("ghc-regex-compat-tdfa" ,ghc-regex-compat-tdfa) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e550d19bad..5dfd26482d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> -;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; @@ -1009,7 +1009,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.28.0") + (version "0.28.1") (source (origin (method url-fetch) (uri (string-append @@ -1017,10 +1017,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ".tar.gz")) (sha256 (base32 - "1d2p6k3y9lqx8bpdal4grrj8ljy7pvd8qgdq8004fmr38afmbb7f")) - (patches (search-patches "mpv-CVE-2018-6360-1.patch" - "mpv-CVE-2018-6360-2.patch" - "mpv-CVE-2018-6360-3.patch")) + "1i1czric6dhbwvyxamzrnwjwsznrn9cpzp6m0m6aahiwpbfbl282")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index abd25bc9d6..79bd920436 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -717,7 +717,7 @@ refactor Vim in order to: (define-public vifm (package (name "vifm") - (version "0.9") + (version "0.9.1") (source (origin (method url-fetch) @@ -728,7 +728,7 @@ refactor Vim in order to: "vifm-" version ".tar.bz2"))) (sha256 (base32 - "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b")))) + "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-build-timestamp") diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 14b5994bcf..db23b4d8df 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> +;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; @@ -36,7 +36,7 @@ (define-public w3m (package (name "w3m") - (version "0.5.3+git20170102") + (version "0.5.3+git20180125") (source (origin (method git-fetch) ;; Debian's fork of w3m is the only one that is still @@ -47,7 +47,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0p8csd49b550q69bk45ncs2y2x48xij7jj11xapp0s8dn1j7kcgx")))) + "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 24bbbd347d..a0b59f3969 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3,7 +3,8 @@ ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de> ;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> @@ -85,6 +86,7 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) + #:use-module (gnu packages lisp) #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) @@ -3881,13 +3883,13 @@ directory.") (define-public r-htmlwidgets (package (name "r-htmlwidgets") - (version "0.9") + (version "1.0") (source (origin (method url-fetch) (uri (cran-uri "htmlwidgets" version)) (sha256 (base32 - "0plqkfqys1ca3ki7sb7yc6gwjpi7yy4g3mzh7hfy8s6qri0vam0i")))) + "09lkmzh35l1420sg0dyh4vgyishqx3g8xmgs2y9z7lbi09xgwwwr")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) @@ -3904,26 +3906,24 @@ applications.") (define-public r-htmltable (package (name "r-htmltable") - (version "1.11.0") + (version "1.11.2") (source (origin (method url-fetch) (uri (cran-uri "htmlTable" version)) (sha256 (base32 - "0x0qrzx6igg5z8jh901d2a8g2idpm5f4frwp1m02910scifcrxwf")))) + "1lbpi0kkk8b41w10scmlf27dg5azcv51a4q3p5bpqyphrnqp78k4")))) (properties `((upstream-name . "htmlTable"))) (build-system r-build-system) (propagated-inputs `(("r-checkmate" ,r-checkmate) - ("r-dplyr" ,r-dplyr) ("r-htmltools" ,r-htmltools) ("r-htmlwidgets" ,r-htmlwidgets) ("r-knitr" ,r-knitr) ("r-magrittr" ,r-magrittr) ("r-rstudioapi" ,r-rstudioapi) - ("r-stringr" ,r-stringr) - ("r-tidyr" ,r-tidyr))) + ("r-stringr" ,r-stringr))) (home-page "http://gforge.se/packages/") (synopsis "Advanced tables for Markdown/HTML") (description @@ -5418,6 +5418,47 @@ extensive prebuilt widgets make it possible to build beautiful, responsive, and powerful applications with minimal effort.") (license l:artistic2.0))) +(define-public r-shinydashboard + (package + (name "r-shinydashboard") + (version "0.6.1") + (source (origin + (method url-fetch) + (uri (cran-uri "shinydashboard" version)) + (sha256 + (base32 + "14zi7g5wrngy6lwi9xpvaid7727m6rfdijbb89al9likfhjqzqqy")))) + (build-system r-build-system) + ;; The directory inst/AdminLTE/ contains a minified JavaScript file. + ;; Regenerate it from the included sources. + (arguments + `(#:modules ((guix build utils) + (guix build r-build-system) + (ice-9 popen)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'generate-minified-javascript + (lambda _ + (with-directory-excursion "inst/AdminLTE" + (delete-file "app.min.js") + (let ((minified (open-pipe* OPEN_READ "uglify-js" "app.js"))) + (call-with-output-file "app.min.js" + (lambda (port) + (dump-port minified port)))))))))) + (propagated-inputs + `(("r-htmltools" ,r-htmltools) + ("r-shiny" ,r-shiny))) + (native-inputs + `(("uglify-js" ,uglify-js))) + (home-page "http://rstudio.github.io/shinydashboard/") + (synopsis "Create dashboards with shiny") + (description "This package provides an extension to the Shiny web +application framework for R, making it easy to create attractive dashboards.") + ;; This package includes software that was released under the Expat + ;; license, but the whole package is released under GPL version 2 or + ;; later. + (license l:gpl2+))) + (define-public r-crosstalk (package (name "r-crosstalk") diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 12a68abae3..055bf8dee7 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Raimon Grau <raimonster@gmail.com> @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> @@ -41,6 +41,9 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) #:use-module (gnu packages java) + #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-check) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages python) @@ -54,6 +57,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system haskell) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config)) @@ -935,6 +939,15 @@ Libxml2).") (license (license:x11-style "file://COPYING" "See 'COPYING' in the distribution.")))) +(define-public xmlsec-nss + (package + (inherit xmlsec) + (name "xmlsec-nss") + (inputs + `(("nss" ,nss) + ("libltdl" ,libltdl))) + (synopsis "XML Security Library (using NSS instead of GnuTLS)"))) + (define-public minixml (package (name "minixml") @@ -1958,3 +1971,109 @@ outputting XML data from Java code.") (description "XStream is a simple library to serialize Java objects to XML and back again.") (license license:bsd-3))) + +(define-public ghc-hxt-charproperties + (package + (name "ghc-hxt-charproperties") + (version "9.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hxt-charproperties/hxt-charproperties-" + version ".tar.gz")) + (sha256 + (base32 + "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4")))) + (build-system haskell-build-system) + (home-page "https://github.com/UweSchmidt/hxt") + (synopsis "Character properties and classes for XML and Unicode") + (description + "The modules provided by this package contain predicates for Unicode +blocks and char properties and character predicates defined by XML. The +supported Unicode version is 7.0.0") + (license license:expat))) + +(define-public ghc-hxt-unicode + (package + (name "ghc-hxt-unicode") + (version "9.0.2.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hxt-unicode/hxt-unicode-" + version + ".tar.gz")) + (sha256 + (base32 + "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties))) + (home-page + "http://www.fh-wedel.de/~si/HXmlToolbox/index.html https://github.com/UweSchmidt/hxt") + (synopsis + "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings") + (description + "This package provides Unicode encoding and decoding functions for +encodings used in the Haskell XML Toolbox. ISO Latin 1-16, utf8, utf16, ASCII +are supported. Decoding is done with lazy functions, errors may be detected or +ignored.") + (license license:expat))) + +(define-public ghc-hxt-regex-xmlschema + (package + (name "ghc-hxt-regex-xmlschema") + (version "9.2.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hxt-regex-xmlschema/hxt-regex-xmlschema-" + version ".tar.gz")) + (sha256 + (base32 + "1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) + ("ghc-parsec" ,ghc-parsec) + ("ghc-text" ,ghc-text) + ("ghc-hunit" ,ghc-hunit))) + (home-page "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema") + (synopsis "Regular expression library for W3C XML Schema regular expressions") + (description + "This library supports full W3C XML Schema regular expressions inclusive +all Unicode character sets and blocks. It is implemented by the technique of +derivations of regular expressions.") + (license license:expat))) + +(define-public ghc-hxt + (package + (name "ghc-hxt") + (version "9.3.1.16") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hxt/hxt-" + version + ".tar.gz")) + (sha256 + (base32 + "1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d")))) + (build-system haskell-build-system) + (inputs + `(("ghc-parsec" ,ghc-parsec) + ("ghc-mtl" ,ghc-mtl) + ("ghc-hxt-charproperties" ,ghc-hxt-charproperties) + ("ghc-hxt-unicode" ,ghc-hxt-unicode) + ("ghc-hxt-regex-xmlschema" ,ghc-hxt-regex-xmlschema) + ("ghc-network-uri" ,ghc-network-uri))) + (home-page "https://github.com/UweSchmidt/hxt") + (synopsis "Collection of tools for processing XML with Haskell") + (description + "The Haskell XML Toolbox bases on the ideas of HaXml and HXML, but +introduces a more general approach for processing XML with Haskell.") + (license license:expat))) diff --git a/po/guix/zh_CN.po b/po/guix/zh_CN.po index 5589d5d129..e58852d817 100644 --- a/po/guix/zh_CN.po +++ b/po/guix/zh_CN.po @@ -2,103 +2,139 @@ # Copyright (C) 2015 Free Software Foundation, Inc. # This file is distributed under the same license as the guix package. # Mingye Wang <arthur200126@gmail.com>, 2016. +# Boyuan Yang <073plan@gmail.com>, 2018. # msgid "" msgstr "" -"Project-Id-Version: guix 0.9.1\n" +"Project-Id-Version: guix 0.14.0\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" -"POT-Creation-Date: 2016-03-04 16:52+0100\n" -"PO-Revision-Date: 2016-04-27 20:31-0400\n" -"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n" +"POT-Creation-Date: 2017-11-28 08:56+0100\n" +"PO-Revision-Date: 2018-02-12 16:47+0800\n" +"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.7\n" +"X-Generator: Poedit 2.0.6\n" -#: gnu/packages.scm:73 +#: gnu.scm:82 +#, scheme-format +msgid "module ~a not found" +msgstr "未找到模块 ~a" + +#: gnu.scm:100 +msgid "" +"You may use @command{guix package --show=foo | grep location} to search\n" +"for the location of package @code{foo}.\n" +"If you get the line @code{location: gnu/packages/bar.scm:174:2},\n" +"add @code{bar} to the @code{use-package-modules} form." +msgstr "" + +#: gnu.scm:108 +#, scheme-format +msgid "Try adding @code{(use-package-modules ~a)}." +msgstr "" + +#: gnu.scm:123 +#, scheme-format +msgid "" +"You may use @command{guix system search ~a} to search for a service\n" +"matching @code{~a}.\n" +"If you get the line @code{location: gnu/services/foo.scm:188:2},\n" +"add @code{foo} to the @code{use-service-modules} form." +msgstr "" + +#: gnu.scm:132 +#, scheme-format +msgid "Try adding @code{(use-service-modules ~a)}." +msgstr "" + +#: gnu/packages.scm:92 #, scheme-format msgid "~a: patch not found" msgstr "~a: 未找到补丁" -#: gnu/packages.scm:84 +#: gnu/packages.scm:108 #, scheme-format msgid "could not find bootstrap binary '~a' for system '~a'" msgstr "无法找到引导二进制 '~a'，用于系统 '~a'" -#: gnu/packages.scm:136 -#, scheme-format -msgid "cannot access `~a': ~a~%" -msgstr "无法访问 `~a': ~a~%" - -#: gnu/packages.scm:289 +#: gnu/packages.scm:240 #, scheme-format msgid "ambiguous package specification `~a'~%" msgstr "含糊的软件包规范 `~a'~%" -#: gnu/packages.scm:290 -#, scheme-format -msgid "choosing ~a from ~a~%" +#: gnu/packages.scm:241 +#, fuzzy, scheme-format +#| msgid "choosing ~a from ~a~%" +msgid "choosing ~a@~a from ~a~%" msgstr "选择 ~a，从 ~a~%" -#: gnu/packages.scm:294 -#, scheme-format -msgid "deprecated NAME-VERSION syntax.~%" -msgstr "" +#: gnu/packages.scm:246 guix/scripts/package.scm:271 +#, fuzzy, scheme-format +#| msgid "package `~a' lacks output `~a'~%" +msgid "package '~a' has been superseded by '~a'~%" +msgstr "包 `~a' 缺乏输出 `~a'~%" -#: gnu/packages.scm:298 +#: gnu/packages.scm:253 #, scheme-format msgid "~A: package not found for version ~a~%" msgstr "~A: 无法找到供版本 ~a~% 的软件包" -#: gnu/packages.scm:305 +#: gnu/packages.scm:254 #, scheme-format msgid "~A: unknown package~%" msgstr "~A: 未知包~%" -#: gnu/packages.scm:333 +#: gnu/packages.scm:282 #, scheme-format msgid "package `~a' lacks output `~a'~%" msgstr "包 `~a' 缺乏输出 `~a'~%" -#: gnu/services.scm:527 +#: gnu/services.scm:235 +#, scheme-format +msgid "~a: no value specified for service of type '~a'" +msgstr "" + +#: gnu/services.scm:650 #, scheme-format -msgid "no target of type '~a' for service ~s" +msgid "no target of type '~a' for service '~a'" msgstr "" -#: gnu/services.scm:538 gnu/services.scm:599 +#: gnu/services.scm:662 gnu/services.scm:723 #, scheme-format msgid "more than one target service of type '~a'" msgstr "" -#: gnu/services.scm:589 +#: gnu/services.scm:713 #, scheme-format msgid "service of type '~a' not found" msgstr "" -#: gnu/system.scm:546 +#: gnu/system.scm:305 +#, scheme-format +msgid "unrecognized boot parameters for '~a'~%" +msgstr "" + +#: gnu/system.scm:695 #, scheme-format msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%" msgstr "" -#: gnu/system.scm:562 +#: gnu/system.scm:711 #, scheme-format msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%" msgstr "" -#: gnu/system.scm:679 +#: gnu/system.scm:856 #, fuzzy, scheme-format #| msgid "~a: invalid number~%" msgid "~a: invalid locale name" msgstr "~a: 无效的数字~%" -#: gnu/system.scm:798 -#, scheme-format -msgid "unrecognized boot parameters for '~a'~%" -msgstr "" - #: gnu/services/shepherd.scm:166 #, scheme-format msgid "service '~a' provided more than once" @@ -106,63 +142,82 @@ msgstr "" #: gnu/services/shepherd.scm:181 #, scheme-format -msgid "service '~a' requires '~a', which is undefined" +msgid "service '~a' requires '~a', which is not provided by any service" msgstr "" -#: gnu/system/shadow.scm:213 +#: gnu/system/shadow.scm:231 #, scheme-format msgid "supplementary group '~a' of user '~a' is undeclared" msgstr "" -#: gnu/system/shadow.scm:223 +#: gnu/system/shadow.scm:241 #, scheme-format msgid "primary group '~a' of user '~a' is undeclared" msgstr "" -#: guix/scripts.scm:52 +#: guix/scripts.scm:56 #, scheme-format msgid "invalid argument: ~a~%" msgstr "无效参数: ~a~%" -#: guix/scripts.scm:78 guix/scripts/download.scm:97 guix/scripts/gc.scm:157 -#: guix/scripts/import/cran.scm:78 guix/scripts/import/elpa.scm:77 -#: guix/scripts/pull.scm:219 guix/scripts/lint.scm:874 -#: guix/scripts/publish.scm:354 guix/scripts/graph.scm:346 +#: guix/scripts.scm:84 guix/scripts/download.scm:135 +#: guix/scripts/import/cran.scm:82 guix/scripts/import/elpa.scm:77 +#: guix/scripts/publish.scm:844 guix/scripts/edit.scm:81 #, scheme-format msgid "~A: unrecognized option~%" msgstr "~A: 无法识别的选项~%" -#: guix/scripts/build.scm:112 +#: guix/scripts.scm:179 +#, scheme-format +msgid "Your Guix installation is ~a day old.\n" +msgid_plural "Your Guix installation is ~a days old.\n" +msgstr[0] "" + +#: guix/scripts.scm:184 +#, scheme-format +msgid "" +"Consider running 'guix pull' followed by\n" +"'~a' to get up-to-date packages and security updates.\n" +msgstr "" + +#: guix/scripts/build.scm:124 #, scheme-format msgid "failed to create GC root `~a': ~a~%" msgstr "" -#: guix/scripts/build.scm:189 +#: guix/scripts/build.scm:206 #, fuzzy, scheme-format #| msgid "ambiguous package specification `~a'~%" msgid "invalid replacement specification: ~s~%" msgstr "含糊的软件包规范 `~a'~%" -#: guix/scripts/build.scm:237 +#: guix/scripts/build.scm:263 msgid "" "\n" " --with-source=SOURCE\n" " use SOURCE when building the corresponding package" msgstr "" -#: guix/scripts/build.scm:240 +#: guix/scripts/build.scm:266 msgid "" "\n" " --with-input=PACKAGE=REPLACEMENT\n" " replace dependency PACKAGE by REPLACEMENT" msgstr "" -#: guix/scripts/build.scm:265 +#: guix/scripts/build.scm:269 +msgid "" +"\n" +" --with-graft=PACKAGE=REPLACEMENT\n" +" graft REPLACEMENT on packages that refer to PACKAGE" +msgstr "" + +#: guix/scripts/build.scm:294 #, scheme-format msgid "transformation '~a' had no effect on ~a~%" msgstr "" -#: guix/scripts/build.scm:283 +#: guix/scripts/build.scm:312 msgid "" "\n" " -L, --load-path=DIR prepend DIR to the package module search path" @@ -170,7 +225,7 @@ msgstr "" "\n" " -L, --load-path=目录 将 <目录> 加入到软件包模块搜索目录之前" -#: guix/scripts/build.scm:285 +#: guix/scripts/build.scm:314 msgid "" "\n" " -K, --keep-failed keep build tree of failed builds" @@ -178,7 +233,7 @@ msgstr "" "\n" " -K, --keep-failed 保留失败构建的构建树" -#: guix/scripts/build.scm:287 +#: guix/scripts/build.scm:316 #, fuzzy #| msgid "" #| "\n" @@ -190,7 +245,7 @@ msgstr "" "\n" " -n, --dry-run 不要构建派生包" -#: guix/scripts/build.scm:289 +#: guix/scripts/build.scm:318 msgid "" "\n" " -n, --dry-run do not build the derivations" @@ -198,7 +253,7 @@ msgstr "" "\n" " -n, --dry-run 不要构建派生包" -#: guix/scripts/build.scm:291 +#: guix/scripts/build.scm:320 msgid "" "\n" " --fallback fall back to building when the substituter fails" @@ -206,7 +261,7 @@ msgstr "" "\n" " --fallback 如果替换器失败，回落到构建" -#: guix/scripts/build.scm:293 +#: guix/scripts/build.scm:322 msgid "" "\n" " --no-substitutes build instead of resorting to pre-built substitutes" @@ -214,7 +269,7 @@ msgstr "" "\n" " --no-substitutes 构建而不使用预先构建的替代品" -#: guix/scripts/build.scm:295 guix/scripts/size.scm:215 +#: guix/scripts/build.scm:324 guix/scripts/size.scm:232 msgid "" "\n" " --substitute-urls=URLS\n" @@ -224,93 +279,93 @@ msgstr "" " --substitute-urls=URLS\n" " 从 URLS 获取替代品，如果这些链接被授权的话" -#: guix/scripts/build.scm:298 +#: guix/scripts/build.scm:327 msgid "" "\n" " --no-grafts do not graft packages" msgstr "" -#: guix/scripts/build.scm:300 +#: guix/scripts/build.scm:329 msgid "" "\n" " --no-build-hook do not attempt to offload builds via the build hook" msgstr "" -#: guix/scripts/build.scm:302 +#: guix/scripts/build.scm:331 msgid "" "\n" " --max-silent-time=SECONDS\n" " mark the build as failed after SECONDS of silence" msgstr "" -#: guix/scripts/build.scm:305 +#: guix/scripts/build.scm:334 msgid "" "\n" " --timeout=SECONDS mark the build as failed after SECONDS of activity" msgstr "" -#: guix/scripts/build.scm:307 +#: guix/scripts/build.scm:336 msgid "" "\n" " --verbosity=LEVEL use the given verbosity LEVEL" msgstr "" -#: guix/scripts/build.scm:309 +#: guix/scripts/build.scm:338 msgid "" "\n" " --rounds=N build N times in a row to detect non-determinism" msgstr "" -#: guix/scripts/build.scm:311 +#: guix/scripts/build.scm:340 msgid "" "\n" " -c, --cores=N allow the use of up to N CPU cores for the build" msgstr "" -#: guix/scripts/build.scm:313 +#: guix/scripts/build.scm:342 msgid "" "\n" " -M, --max-jobs=N allow at most N build jobs" msgstr "" -#: guix/scripts/build.scm:419 guix/scripts/build.scm:426 +#: guix/scripts/build.scm:448 guix/scripts/build.scm:455 #, scheme-format msgid "not a number: '~a' option argument: ~a~%" msgstr "" -#: guix/scripts/build.scm:446 +#: guix/scripts/build.scm:474 msgid "" "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n" "Build the given PACKAGE-OR-DERIVATION and return their output paths.\n" msgstr "" -#: guix/scripts/build.scm:448 +#: guix/scripts/build.scm:476 msgid "" "\n" " -e, --expression=EXPR build the package or derivation EXPR evaluates to" msgstr "" -#: guix/scripts/build.scm:450 +#: guix/scripts/build.scm:478 msgid "" "\n" " -f, --file=FILE build the package or derivation that the code within\n" " FILE evaluates to" msgstr "" -#: guix/scripts/build.scm:453 +#: guix/scripts/build.scm:481 msgid "" "\n" " -S, --source build the packages' source derivations" msgstr "" -#: guix/scripts/build.scm:455 +#: guix/scripts/build.scm:483 msgid "" "\n" " --sources[=TYPE] build source derivations; TYPE may optionally be one\n" " of \"package\", \"all\" (default), or \"transitive\"" msgstr "" -#: guix/scripts/build.scm:458 +#: guix/scripts/build.scm:486 guix/scripts/pack.scm:338 msgid "" "\n" " -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"" @@ -318,46 +373,66 @@ msgstr "" "\n" " -s, --system=系统 尝试为 <系统> 构建包——比如，\"i686-linux\"" -#: guix/scripts/build.scm:460 +#: guix/scripts/build.scm:488 guix/scripts/pack.scm:340 msgid "" "\n" " --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"" msgstr "" -#: guix/scripts/build.scm:462 +#: guix/scripts/build.scm:490 msgid "" "\n" " -d, --derivations return the derivation paths of the given packages" msgstr "" -#: guix/scripts/build.scm:464 +#: guix/scripts/build.scm:492 msgid "" "\n" " --check rebuild items to check for non-determinism issues" msgstr "" -#: guix/scripts/build.scm:466 +#: guix/scripts/build.scm:494 +msgid "" +"\n" +" --repair repair the specified items" +msgstr "" + +#: guix/scripts/build.scm:496 msgid "" "\n" " -r, --root=FILE make FILE a symlink to the result, and register it\n" " as a garbage collector root" msgstr "" -#: guix/scripts/build.scm:469 +#: guix/scripts/build.scm:499 +#, fuzzy +#| msgid "" +#| "\n" +#| " -n, --dry-run do not build the derivations" +msgid "" +"\n" +" -q, --quiet do not show the build log" +msgstr "" +"\n" +" -n, --dry-run 不要构建派生包" + +#: guix/scripts/build.scm:501 msgid "" "\n" " --log-file return the log file names for the given derivations" msgstr "" -#: guix/scripts/build.scm:476 guix/scripts/download.scm:54 -#: guix/scripts/package.scm:386 guix/scripts/gc.scm:70 -#: guix/scripts/hash.scm:56 guix/scripts/import.scm:91 -#: guix/scripts/import/cran.scm:46 guix/scripts/pull.scm:83 -#: guix/scripts/substitute.scm:758 guix/scripts/system.scm:631 -#: guix/scripts/lint.scm:823 guix/scripts/publish.scm:63 -#: guix/scripts/edit.scm:44 guix/scripts/size.scm:223 -#: guix/scripts/graph.scm:327 guix/scripts/challenge.scm:181 -#: guix/scripts/container.scm:33 guix/scripts/container/exec.scm:43 +#: guix/scripts/build.scm:508 guix/scripts/download.scm:83 +#: guix/scripts/package.scm:425 guix/scripts/gc.scm:74 +#: guix/scripts/hash.scm:59 guix/scripts/import.scm:92 +#: guix/scripts/import/cran.scm:47 guix/scripts/pull.scm:110 +#: guix/scripts/substitute.scm:889 guix/scripts/system.scm:870 +#: guix/scripts/lint.scm:1090 guix/scripts/publish.scm:94 +#: guix/scripts/edit.scm:44 guix/scripts/size.scm:243 +#: guix/scripts/graph.scm:432 guix/scripts/challenge.scm:241 +#: guix/scripts/copy.scm:122 guix/scripts/pack.scm:349 +#: guix/scripts/weather.scm:156 guix/scripts/container.scm:33 +#: guix/scripts/container/exec.scm:43 msgid "" "\n" " -h, --help display this help and exit" @@ -365,15 +440,17 @@ msgstr "" "\n" " -h, --help 显示这份说明然后离开" -#: guix/scripts/build.scm:478 guix/scripts/download.scm:56 -#: guix/scripts/package.scm:388 guix/scripts/gc.scm:72 -#: guix/scripts/hash.scm:58 guix/scripts/import.scm:93 -#: guix/scripts/import/cran.scm:48 guix/scripts/pull.scm:85 -#: guix/scripts/substitute.scm:760 guix/scripts/system.scm:633 -#: guix/scripts/lint.scm:827 guix/scripts/publish.scm:65 -#: guix/scripts/edit.scm:46 guix/scripts/size.scm:225 -#: guix/scripts/graph.scm:329 guix/scripts/challenge.scm:183 -#: guix/scripts/container.scm:35 guix/scripts/container/exec.scm:45 +#: guix/scripts/build.scm:510 guix/scripts/download.scm:85 +#: guix/scripts/package.scm:427 guix/scripts/gc.scm:76 +#: guix/scripts/hash.scm:61 guix/scripts/import.scm:94 +#: guix/scripts/import/cran.scm:49 guix/scripts/pull.scm:112 +#: guix/scripts/substitute.scm:891 guix/scripts/system.scm:872 +#: guix/scripts/lint.scm:1094 guix/scripts/publish.scm:96 +#: guix/scripts/edit.scm:46 guix/scripts/size.scm:245 +#: guix/scripts/graph.scm:434 guix/scripts/challenge.scm:243 +#: guix/scripts/copy.scm:124 guix/scripts/pack.scm:351 +#: guix/scripts/weather.scm:158 guix/scripts/container.scm:35 +#: guix/scripts/container/exec.scm:45 msgid "" "\n" " -V, --version display version information and exit" @@ -381,143 +458,171 @@ msgstr "" "\n" " -v, --version 显示程序版本然后离开" -#: guix/scripts/build.scm:505 +#: guix/scripts/build.scm:537 #, scheme-format msgid "" "invalid argument: '~a' option argument: ~a, ~\n" "must be one of 'package', 'all', or 'transitive'~%" msgstr "" -#: guix/scripts/build.scm:549 +#: guix/scripts/build.scm:590 #, scheme-format msgid "~s: not something we can build~%" msgstr "" -#: guix/scripts/build.scm:629 +#: guix/scripts/build.scm:644 +#, scheme-format +msgid "~a: warning: package '~a' has no source~%" +msgstr "" + +#: guix/scripts/build.scm:678 #, scheme-format msgid "no build log for '~a'~%" msgstr "" -#: guix/scripts/download.scm:45 +#: guix/discovery.scm:88 +#, scheme-format +msgid "cannot access `~a': ~a~%" +msgstr "无法访问 `~a': ~a~%" + +#: guix/scripts/download.scm:69 msgid "" "Usage: guix download [OPTION] URL\n" -"Download the file at URL, add it to the store, and print its store path\n" -"and the hash of its contents.\n" +"Download the file at URL to the store or to the given file, and print its\n" +"file name and the hash of its contents.\n" "\n" "Supported formats: 'nix-base32' (default), 'base32', and 'base16'\n" "('hex' and 'hexadecimal' can be used as well).\n" msgstr "" -#: guix/scripts/download.scm:51 guix/scripts/hash.scm:51 +#: guix/scripts/download.scm:75 guix/scripts/hash.scm:54 msgid "" "\n" " -f, --format=FMT write the hash in the given format" msgstr "" -#: guix/scripts/download.scm:74 guix/scripts/hash.scm:76 +#: guix/scripts/download.scm:77 +msgid "" +"\n" +" --no-check-certificate\n" +" do not validate the certificate of HTTPS servers " +msgstr "" + +#: guix/scripts/download.scm:80 +msgid "" +"\n" +" -o, --output=FILE download to FILE" +msgstr "" + +#: guix/scripts/download.scm:103 guix/scripts/hash.scm:82 #, scheme-format msgid "unsupported hash format: ~a~%" msgstr "" -#: guix/scripts/download.scm:100 guix/scripts/package.scm:836 -#: guix/scripts/publish.scm:356 +#: guix/scripts/download.scm:138 guix/scripts/package.scm:906 +#: guix/scripts/publish.scm:846 #, scheme-format msgid "~A: extraneous argument~%" msgstr "" -#: guix/scripts/download.scm:109 +#: guix/scripts/download.scm:146 #, scheme-format msgid "no download URI was specified~%" msgstr "" -#: guix/scripts/download.scm:111 +#: guix/scripts/download.scm:151 #, scheme-format msgid "~a: failed to parse URI~%" msgstr "" -#: guix/scripts/download.scm:122 +#: guix/scripts/download.scm:161 #, scheme-format msgid "~a: download failed~%" -msgstr "" +msgstr "~a：下载失败~%" -#: guix/scripts/package.scm:103 +#: guix/scripts/package.scm:112 #, scheme-format msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%" msgstr "" -#: guix/scripts/package.scm:125 +#: guix/scripts/package.scm:134 #, scheme-format msgid "error: while creating directory `~a': ~a~%" msgstr "" -#: guix/scripts/package.scm:129 +#: guix/scripts/package.scm:138 #, scheme-format msgid "Please create the `~a' directory, with you as the owner.~%" msgstr "" -#: guix/scripts/package.scm:136 +#: guix/scripts/package.scm:145 #, scheme-format msgid "error: directory `~a' is not owned by you~%" msgstr "" -#: guix/scripts/package.scm:139 +#: guix/scripts/package.scm:148 #, scheme-format msgid "Please change the owner of `~a' to user ~s.~%" msgstr "" -#: guix/scripts/package.scm:174 +#: guix/scripts/package.scm:183 #, scheme-format msgid "not removing generation ~a, which is current~%" msgstr "" -#: guix/scripts/package.scm:181 +#: guix/scripts/package.scm:190 #, scheme-format msgid "no matching generation~%" msgstr "" -#: guix/scripts/package.scm:184 guix/scripts/package.scm:657 -#: guix/scripts/system.scm:459 +#: guix/scripts/package.scm:193 guix/scripts/package.scm:716 +#: guix/scripts/system.scm:558 #, scheme-format msgid "invalid syntax: ~a~%" msgstr "无效语法: ~a~%" -#: guix/scripts/package.scm:209 +#: guix/scripts/package.scm:219 #, scheme-format msgid "nothing to be done~%" msgstr "" -#: guix/scripts/package.scm:223 +#: guix/scripts/package.scm:233 #, scheme-format msgid "~a package in profile~%" msgid_plural "~a packages in profile~%" msgstr[0] "" -#: guix/scripts/package.scm:311 +#: guix/scripts/package.scm:313 +#, scheme-format +msgid "package '~a' no longer exists~%" +msgstr "软件包“~a”已不再存在~%" + +#: guix/scripts/package.scm:351 #, scheme-format msgid "The following environment variable definitions may be needed:~%" msgstr "" -#: guix/scripts/package.scm:327 +#: guix/scripts/package.scm:366 msgid "" "Usage: guix package [OPTION]...\n" "Install, remove, or upgrade packages in a single transaction.\n" msgstr "" -#: guix/scripts/package.scm:329 +#: guix/scripts/package.scm:368 msgid "" "\n" " -i, --install PACKAGE ...\n" " install PACKAGEs" msgstr "" -#: guix/scripts/package.scm:332 +#: guix/scripts/package.scm:371 msgid "" "\n" " -e, --install-from-expression=EXP\n" " install the package EXP evaluates to" msgstr "" -#: guix/scripts/package.scm:335 +#: guix/scripts/package.scm:374 msgid "" "\n" " -f, --install-from-file=FILE\n" @@ -525,188 +630,204 @@ msgid "" " evaluates to" msgstr "" -#: guix/scripts/package.scm:339 +#: guix/scripts/package.scm:378 msgid "" "\n" " -r, --remove PACKAGE ...\n" " remove PACKAGEs" msgstr "" -#: guix/scripts/package.scm:342 +#: guix/scripts/package.scm:381 msgid "" "\n" " -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP" msgstr "" -#: guix/scripts/package.scm:344 +#: guix/scripts/package.scm:383 msgid "" "\n" " -m, --manifest=FILE create a new profile generation with the manifest\n" " from FILE" msgstr "" -#: guix/scripts/package.scm:347 +#: guix/scripts/package.scm:386 msgid "" "\n" " --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP" msgstr "" -#: guix/scripts/package.scm:349 +#: guix/scripts/package.scm:388 msgid "" "\n" " --roll-back roll back to the previous generation" msgstr "" -#: guix/scripts/package.scm:351 +#: guix/scripts/package.scm:390 msgid "" "\n" " --search-paths[=KIND]\n" " display needed environment variable definitions" msgstr "" -#: guix/scripts/package.scm:354 +#: guix/scripts/package.scm:393 msgid "" "\n" " -l, --list-generations[=PATTERN]\n" " list generations matching PATTERN" msgstr "" -#: guix/scripts/package.scm:357 +#: guix/scripts/package.scm:396 msgid "" "\n" " -d, --delete-generations[=PATTERN]\n" " delete generations matching PATTERN" msgstr "" -#: guix/scripts/package.scm:360 +#: guix/scripts/package.scm:399 msgid "" "\n" " -S, --switch-generation=PATTERN\n" " switch to a generation matching PATTERN" msgstr "" -#: guix/scripts/package.scm:363 +#: guix/scripts/package.scm:402 msgid "" "\n" " -p, --profile=PROFILE use PROFILE instead of the user's default profile" msgstr "" -#: guix/scripts/package.scm:366 +#: guix/scripts/package.scm:405 msgid "" "\n" " --bootstrap use the bootstrap Guile to build the profile" msgstr "" -#: guix/scripts/package.scm:368 guix/scripts/pull.scm:76 +#: guix/scripts/package.scm:407 guix/scripts/pull.scm:98 msgid "" "\n" " --verbose produce verbose output" msgstr "" "\n" -" --verbose 生成详细啰嗦的输出" +" --verbose 生成详细的输出" -#: guix/scripts/package.scm:371 +#: guix/scripts/package.scm:410 msgid "" "\n" " -s, --search=REGEXP search in synopsis and description using REGEXP" msgstr "" -#: guix/scripts/package.scm:373 +#: guix/scripts/package.scm:412 msgid "" "\n" " -I, --list-installed[=REGEXP]\n" " list installed packages matching REGEXP" msgstr "" -#: guix/scripts/package.scm:376 +#: guix/scripts/package.scm:415 msgid "" "\n" " -A, --list-available[=REGEXP]\n" " list available packages matching REGEXP" msgstr "" -#: guix/scripts/package.scm:379 +#: guix/scripts/package.scm:418 msgid "" "\n" " --show=PACKAGE show details about PACKAGE" msgstr "" -#: guix/scripts/package.scm:474 +#: guix/scripts/package.scm:470 +#, scheme-format +msgid "upgrade regexp '~a' looks like a command-line option~%" +msgstr "" + +#: guix/scripts/package.scm:473 +#, scheme-format +msgid "is this intended?~%" +msgstr "" + +#: guix/scripts/package.scm:518 #, scheme-format msgid "~a: unsupported kind of search path~%" msgstr "" -#: guix/scripts/package.scm:753 +#: guix/scripts/package.scm:815 #, scheme-format msgid "cannot switch to generation '~a'~%" msgstr "" -#: guix/scripts/package.scm:769 +#: guix/scripts/package.scm:831 #, scheme-format msgid "would install new manifest from '~a' with ~d entries~%" msgstr "" -#: guix/scripts/package.scm:771 +#: guix/scripts/package.scm:833 #, scheme-format msgid "installing new manifest from '~a' with ~d entries~%" msgstr "" -#: guix/scripts/gc.scm:40 +#: guix/scripts/gc.scm:42 msgid "" "Usage: guix gc [OPTION]... PATHS...\n" "Invoke the garbage collector.\n" msgstr "" -#: guix/scripts/gc.scm:42 +#: guix/scripts/gc.scm:44 msgid "" "\n" " -C, --collect-garbage[=MIN]\n" " collect at least MIN bytes of garbage" msgstr "" -#: guix/scripts/gc.scm:45 +#: guix/scripts/gc.scm:47 +msgid "" +"\n" +" -F, --free-space=FREE attempt to reach FREE available space in the store" +msgstr "" + +#: guix/scripts/gc.scm:49 msgid "" "\n" " -d, --delete attempt to delete PATHS" msgstr "" -#: guix/scripts/gc.scm:47 +#: guix/scripts/gc.scm:51 msgid "" "\n" " --optimize optimize the store by deduplicating identical files" msgstr "" -#: guix/scripts/gc.scm:49 +#: guix/scripts/gc.scm:53 msgid "" "\n" " --list-dead list dead paths" msgstr "" -#: guix/scripts/gc.scm:51 +#: guix/scripts/gc.scm:55 msgid "" "\n" " --list-live list live paths" msgstr "" -#: guix/scripts/gc.scm:54 +#: guix/scripts/gc.scm:58 msgid "" "\n" " --references list the references of PATHS" msgstr "" -#: guix/scripts/gc.scm:56 +#: guix/scripts/gc.scm:60 msgid "" "\n" " -R, --requisites list the requisites of PATHS" msgstr "" -#: guix/scripts/gc.scm:58 +#: guix/scripts/gc.scm:62 msgid "" "\n" " --referrers list the referrers of PATHS" msgstr "" -#: guix/scripts/gc.scm:61 +#: guix/scripts/gc.scm:65 msgid "" "\n" " --verify[=OPTS] verify the integrity of the store; OPTS is a\n" @@ -714,30 +835,42 @@ msgid "" " 'contents'" msgstr "" -#: guix/scripts/gc.scm:65 +#: guix/scripts/gc.scm:69 msgid "" "\n" " --list-failures list cached build failures" msgstr "" -#: guix/scripts/gc.scm:67 +#: guix/scripts/gc.scm:71 msgid "" "\n" " --clear-failures remove PATHS from the set of cached failures" msgstr "" -#: guix/scripts/gc.scm:96 +#: guix/scripts/gc.scm:100 #, scheme-format msgid "invalid amount of storage: ~a~%" msgstr "" -#: guix/scripts/gc.scm:187 +#: guix/scripts/gc.scm:185 +msgid "already ~h bytes available on ~a, nothing to do~%" +msgstr "" + +#: guix/scripts/gc.scm:188 +msgid "freeing ~h bytes~%" +msgstr "" + +#: guix/scripts/gc.scm:200 #, fuzzy, scheme-format #| msgid "invalid argument: ~a~%" msgid "extraneous arguments: ~{~a ~}~%" msgstr "无效参数: ~a~%" -#: guix/scripts/hash.scm:46 +#: guix/scripts/gc.scm:220 guix/scripts/gc.scm:223 +msgid "freed ~h bytes~%" +msgstr "" + +#: guix/scripts/hash.scm:47 msgid "" "Usage: guix hash [OPTION] FILE\n" "Return the cryptographic hash of FILE.\n" @@ -746,70 +879,78 @@ msgid "" "and 'hexadecimal' can be used as well).\n" msgstr "" -#: guix/scripts/hash.scm:53 +#: guix/scripts/hash.scm:52 msgid "" "\n" -" -r, --recursive compute the hash on FILE recursively" +" -x, --exclude-vcs exclude version control directories" msgstr "" -#: guix/scripts/hash.scm:104 -#, scheme-format -msgid "unrecognized option: ~a~%" -msgstr "无法识别的选项: ~a~%" +#: guix/scripts/hash.scm:56 +msgid "" +"\n" +" -r, --recursive compute the hash on FILE recursively" +msgstr "" -#: guix/scripts/hash.scm:135 guix/ui.scm:460 +#: guix/scripts/hash.scm:150 guix/ui.scm:326 guix/ui.scm:601 guix/ui.scm:654 #, scheme-format msgid "~a~%" msgstr "" -#: guix/scripts/hash.scm:138 guix/scripts/system.scm:761 +#: guix/scripts/hash.scm:153 guix/scripts/system.scm:1022 +#: guix/scripts/system.scm:1031 guix/scripts/system.scm:1038 #, scheme-format msgid "wrong number of arguments~%" msgstr "" -#: guix/scripts/import.scm:85 +#: guix/scripts/import.scm:86 msgid "" "Usage: guix import IMPORTER ARGS ...\n" "Run IMPORTER with ARGS.\n" msgstr "" -#: guix/scripts/import.scm:88 +#: guix/scripts/import.scm:89 msgid "IMPORTER must be one of the importers listed below:\n" msgstr "" -#: guix/scripts/import.scm:102 +#: guix/scripts/import.scm:103 #, scheme-format msgid "guix import: missing importer name~%" msgstr "" -#: guix/scripts/import.scm:113 +#: guix/scripts/import.scm:123 #, scheme-format -msgid "guix import: invalid importer~%" +msgid "'~a' import failed~%" msgstr "" -#: guix/scripts/import/cran.scm:42 +#: guix/scripts/import.scm:124 +#, fuzzy, scheme-format +#| msgid "~a: invalid number~%" +msgid "~a: invalid importer~%" +msgstr "~a: 无效的数字~%" + +#: guix/scripts/import/cran.scm:43 msgid "" "Usage: guix import cran PACKAGE-NAME\n" "Import and convert the CRAN package for PACKAGE-NAME.\n" msgstr "" -#: guix/scripts/import/cran.scm:44 +#: guix/scripts/import/cran.scm:45 msgid "" "\n" " -a, --archive=ARCHIVE specify the archive repository" msgstr "" -#: guix/scripts/import/cran.scm:94 +#: guix/scripts/import/cran.scm:108 #, scheme-format msgid "failed to download description for package '~a'~%" msgstr "" -#: guix/scripts/import/cran.scm:98 guix/scripts/import/elpa.scm:95 +#: guix/scripts/import/cran.scm:112 guix/scripts/import/elpa.scm:95 #, scheme-format msgid "too few arguments~%" msgstr "太少参数~%" -#: guix/scripts/import/cran.scm:100 guix/scripts/import/elpa.scm:97 +#: guix/scripts/import/cran.scm:114 guix/scripts/import/elpa.scm:97 #, scheme-format msgid "too many arguments~%" msgstr "太多参数~%" @@ -847,159 +988,212 @@ msgstr "" msgid "failed to download package '~a'~%" msgstr "" -#: guix/scripts/pull.scm:74 +#: guix/scripts/pull.scm:60 +#, scheme-format +msgid "" +"Guile-Git is missing but it is now required by 'guix pull'.\n" +"Install it by running:\n" +"\n" +" guix package -i ~a\n" +" export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/~a:$GUILE_LOAD_PATH\n" +" export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/~a/site-ccache:$GUILE_LOAD_COMPILED_PATH\n" +"\n" +msgstr "" + +#: guix/scripts/pull.scm:96 msgid "" "Usage: guix pull [OPTION]...\n" "Download and deploy the latest version of Guix.\n" msgstr "" -#: guix/scripts/pull.scm:78 +#: guix/scripts/pull.scm:100 msgid "" "\n" -" --url=URL download the Guix tarball from URL" +" --url=URL download from the Git repository at URL" msgstr "" -#: guix/scripts/pull.scm:80 +#: guix/scripts/pull.scm:102 msgid "" "\n" -" --bootstrap use the bootstrap Guile to build the new Guix" +" --commit=COMMIT download the specified COMMIT" msgstr "" -#: guix/scripts/pull.scm:134 -msgid "tarball did not produce a single source directory" -msgstr "" - -#: guix/scripts/pull.scm:152 -#, scheme-format -msgid "unpacking '~a'...~%" +#: guix/scripts/pull.scm:104 +msgid "" +"\n" +" --branch=BRANCH download the tip of the specified BRANCH" msgstr "" -#: guix/scripts/pull.scm:161 -msgid "failed to unpack source code" +#: guix/scripts/pull.scm:106 +msgid "" +"\n" +" --bootstrap use the bootstrap Guile to build the new Guix" msgstr "" -#: guix/scripts/pull.scm:204 +#: guix/scripts/pull.scm:192 msgid "Guix already up to date\n" msgstr "" -#: guix/scripts/pull.scm:209 +#: guix/scripts/pull.scm:197 #, scheme-format msgid "updated ~a successfully deployed under `~a'~%" msgstr "" -#: guix/scripts/pull.scm:212 +#: guix/scripts/pull.scm:200 #, scheme-format msgid "failed to update Guix, check the build log~%" msgstr "" -#: guix/scripts/pull.scm:221 +#: guix/scripts/pull.scm:216 #, scheme-format -msgid "~A: unexpected argument~%" -msgstr "~A: 未预期的参数~%" +msgid "cannot enforce use of the Let's Encrypt certificates~%" +msgstr "" + +#: guix/scripts/pull.scm:218 +#, scheme-format +msgid "please upgrade Guile-Git~%" +msgstr "请升级 Guile-Git~%" + +#: guix/scripts/pull.scm:226 +#, scheme-format +msgid "Git error ~a~%" +msgstr "Git 错误 ~a~%" + +#: guix/scripts/pull.scm:228 +#, scheme-format +msgid "Git error: ~a~%" +msgstr "Git 错误：~a~%" -#: guix/scripts/pull.scm:230 -msgid "failed to download up-to-date source, exiting\n" +#: guix/scripts/pull.scm:262 +#, scheme-format +msgid "Updating from Git repository at '~a'...~%" msgstr "" -#: guix/scripts/substitute.scm:103 +#: guix/scripts/pull.scm:271 +#, scheme-format +msgid "Building from Git commit ~a...~%" +msgstr "" + +#: guix/scripts/substitute.scm:125 #, scheme-format msgid "authentication and authorization of substitutes disabled!~%" msgstr "" -#: guix/scripts/substitute.scm:179 +#: guix/scripts/substitute.scm:200 #, scheme-format msgid "download from '~a' failed: ~a, ~s~%" msgstr "" -#: guix/scripts/substitute.scm:191 +#: guix/scripts/substitute.scm:213 #, scheme-format msgid "while fetching ~a: server is somewhat slow~%" msgstr "" -#: guix/scripts/substitute.scm:193 +#: guix/scripts/substitute.scm:215 #, scheme-format msgid "try `--no-substitutes' if the problem persists~%" msgstr "" -#: guix/scripts/substitute.scm:266 +#: guix/scripts/substitute.scm:233 +#, scheme-format +msgid "unsupported substitute URI scheme: ~a~%" +msgstr "" + +#: guix/scripts/substitute.scm:268 +#, fuzzy, scheme-format +#| msgid "failed to connect to `~a': ~a~%" +msgid "while fetching '~a': ~a (~s)~%" +msgstr "连接到 `~a' 失败：~a~%" + +#: guix/scripts/substitute.scm:273 +#, scheme-format +msgid "ignoring substitute server at '~s'~%" +msgstr "" + +#: guix/scripts/substitute.scm:323 #, scheme-format msgid "signature version must be a number: ~s~%" msgstr "" -#: guix/scripts/substitute.scm:270 +#: guix/scripts/substitute.scm:327 #, scheme-format msgid "unsupported signature version: ~a~%" msgstr "" -#: guix/scripts/substitute.scm:278 +#: guix/scripts/substitute.scm:335 #, scheme-format msgid "signature is not a valid s-expression: ~s~%" msgstr "" -#: guix/scripts/substitute.scm:282 +#: guix/scripts/substitute.scm:339 #, scheme-format msgid "invalid format of the signature field: ~a~%" msgstr "" -#: guix/scripts/substitute.scm:317 +#: guix/scripts/substitute.scm:374 #, scheme-format msgid "invalid signature for '~a'~%" msgstr "'~a'~% 签名无效" -#: guix/scripts/substitute.scm:319 +#: guix/scripts/substitute.scm:376 #, scheme-format msgid "hash mismatch for '~a'~%" msgstr "" -#: guix/scripts/substitute.scm:321 +#: guix/scripts/substitute.scm:378 #, scheme-format msgid "'~a' is signed with an unauthorized key~%" msgstr "" -#: guix/scripts/substitute.scm:323 +#: guix/scripts/substitute.scm:380 #, scheme-format msgid "signature on '~a' is corrupt~%" msgstr "" -#: guix/scripts/substitute.scm:361 +#: guix/scripts/substitute.scm:465 #, scheme-format -msgid "substitute at '~a' lacks a signature~%" +msgid "'~a' does not name a store item~%" msgstr "" -#: guix/scripts/substitute.scm:537 +#: guix/scripts/substitute.scm:629 #, scheme-format msgid "updating list of substitutes from '~a'... ~5,1f%" msgstr "" -#: guix/scripts/substitute.scm:585 +#: guix/scripts/substitute.scm:693 #, scheme-format msgid "~s: unsupported server URI scheme~%" msgstr "" -#: guix/scripts/substitute.scm:596 +#: guix/scripts/substitute.scm:703 #, scheme-format msgid "'~a' uses different store '~a'; ignoring it~%" msgstr "" -#: guix/scripts/substitute.scm:739 +#: guix/scripts/substitute.scm:863 #, scheme-format msgid "host name lookup error: ~a~%" msgstr "" -#: guix/scripts/substitute.scm:748 +#: guix/scripts/substitute.scm:868 +#, scheme-format +msgid "TLS error in procedure '~a': ~a~%" +msgstr "" + +#: guix/scripts/substitute.scm:879 msgid "" "Usage: guix substitute [OPTION]...\n" "Internal tool to substitute a pre-built binary to a local build.\n" msgstr "" -#: guix/scripts/substitute.scm:750 +#: guix/scripts/substitute.scm:881 msgid "" "\n" " --query report on the availability of substitutes for the\n" " store file names passed on the standard input" msgstr "" -#: guix/scripts/substitute.scm:753 +#: guix/scripts/substitute.scm:884 msgid "" "\n" " --substitute STORE-FILE DESTINATION\n" @@ -1007,523 +1201,788 @@ msgid "" " DESTINATION" msgstr "" -#: guix/scripts/substitute.scm:878 +#: guix/scripts/substitute.scm:949 +#, fuzzy, scheme-format +#| msgid "invalid signature for '~a'~%" +msgid "no valid substitute for '~a'~%" +msgstr "'~a'~% 签名无效" + +#: guix/scripts/substitute.scm:956 +#, scheme-format +msgid "Downloading ~a...~%" +msgstr "" + +#: guix/scripts/substitute.scm:1012 msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n" msgstr "" -#: guix/scripts/substitute.scm:960 +#: guix/scripts/substitute.scm:1066 +#, fuzzy, scheme-format +#| msgid "~a: invalid number~%" +msgid "~a: invalid URI~%" +msgstr "~a: 无效的数字~%" + +#: guix/scripts/substitute.scm:1126 #, scheme-format msgid "~a: unrecognized options~%" msgstr "" -#: guix/scripts/authenticate.scm:58 +#: guix/scripts/authenticate.scm:59 #, scheme-format msgid "cannot find public key for secret key '~a'~%" msgstr "" -#: guix/scripts/authenticate.scm:78 +#: guix/scripts/authenticate.scm:79 #, scheme-format msgid "error: invalid signature: ~a~%" msgstr "" -#: guix/scripts/authenticate.scm:80 +#: guix/scripts/authenticate.scm:81 #, scheme-format msgid "error: unauthorized public key: ~a~%" msgstr "" -#: guix/scripts/authenticate.scm:82 +#: guix/scripts/authenticate.scm:83 #, scheme-format msgid "error: corrupt signature data: ~a~%" msgstr "" -#: guix/scripts/authenticate.scm:120 +#: guix/scripts/authenticate.scm:121 msgid "" "Usage: guix authenticate OPTION...\n" "Sign or verify the signature on the given file. This tool is meant to\n" "be used internally by 'guix-daemon'.\n" msgstr "" -#: guix/scripts/authenticate.scm:126 +#: guix/scripts/authenticate.scm:127 msgid "wrong arguments" msgstr "参数有误" -#: guix/scripts/system.scm:111 +#: guix/scripts/system.scm:135 #, scheme-format msgid "failed to register '~a' under '~a'~%" msgstr "" -#: guix/scripts/system.scm:143 -#, scheme-format -msgid "failed to install GRUB on device '~a'~%" -msgstr "" +#: guix/scripts/system.scm:174 +#, fuzzy, scheme-format +#| msgid "failed to connect to `~a': ~a~%" +msgid "failed to install bootloader ~a~%" +msgstr "连接到 `~a' 失败：~a~%" -#: guix/scripts/system.scm:161 +#: guix/scripts/system.scm:194 #, scheme-format msgid "initializing the current root file system~%" msgstr "" -#: guix/scripts/system.scm:175 +#: guix/scripts/system.scm:208 #, scheme-format msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%" msgstr "" -#: guix/scripts/system.scm:233 +#: guix/scripts/system.scm:253 #, scheme-format msgid "while talking to shepherd: ~a~%" msgstr "" -#: guix/scripts/system.scm:279 +#: guix/scripts/system.scm:260 +#, fuzzy, scheme-format +#| msgid "guix: ~a: command not found~%" +msgid "service '~a' could not be found~%" +msgstr "guix：~a：未找到命令~%" + +#: guix/scripts/system.scm:263 +#, scheme-format +msgid "service '~a' does not have an action '~a'~%" +msgstr "" + +#: guix/scripts/system.scm:267 +#, scheme-format +msgid "exception caught while executing '~a' on service '~a':~%" +msgstr "" + +#: guix/scripts/system.scm:275 +#, scheme-format +msgid "something went wrong: ~s~%" +msgstr "" + +#: guix/scripts/system.scm:278 +#, scheme-format +msgid "shepherd error~%" +msgstr "" + +#: guix/scripts/system.scm:295 +#, scheme-format +msgid "failed to obtain list of shepherd services~%" +msgstr "" + +#: guix/scripts/system.scm:315 #, scheme-format msgid "unloading service '~a'...~%" msgstr "" -#: guix/scripts/system.scm:287 +#: guix/scripts/system.scm:323 #, scheme-format msgid "loading new services:~{ ~a~}...~%" msgstr "" -#: guix/scripts/system.scm:311 +#: guix/scripts/system.scm:347 #, scheme-format msgid "activating system...~%" msgstr "" -#: guix/scripts/system.scm:402 +#: guix/scripts/system.scm:423 +#, scheme-format +msgid "cannot switch to system generation '~a'~%" +msgstr "" + +#: guix/scripts/system.scm:494 msgid "the DAG of services" msgstr "" -#: guix/scripts/system.scm:415 +#: guix/scripts/system.scm:507 msgid "the dependency graph of shepherd services" msgstr "" -#: guix/scripts/system.scm:436 +#: guix/scripts/system.scm:531 #, scheme-format msgid " file name: ~a~%" msgstr " 文件名：~a~%" -#: guix/scripts/system.scm:437 +#: guix/scripts/system.scm:532 #, scheme-format msgid " canonical file name: ~a~%" msgstr "" #. TRANSLATORS: Please preserve the two-space indentation. -#: guix/scripts/system.scm:439 +#: guix/scripts/system.scm:534 #, scheme-format msgid " label: ~a~%" msgstr "" -#: guix/scripts/system.scm:440 +#: guix/scripts/system.scm:535 +#, fuzzy, scheme-format +#| msgid " file name: ~a~%" +msgid " bootloader: ~a~%" +msgstr " 文件名：~a~%" + +#: guix/scripts/system.scm:536 #, scheme-format msgid " root device: ~a~%" msgstr "" -#: guix/scripts/system.scm:441 +#: guix/scripts/system.scm:540 #, scheme-format msgid " kernel: ~a~%" msgstr " 内核：~a~%" -#: guix/scripts/system.scm:549 +#: guix/scripts/system.scm:600 +#, scheme-format +msgid "~a: error: file system with label '~a' not found~%" +msgstr "" + +#: guix/scripts/system.scm:606 +#, scheme-format +msgid "~a: error: file system with UUID '~a' not found~%" +msgstr "" + +#: guix/scripts/system.scm:658 +#, scheme-format +msgid "~a not found: 'guix pull' was never run~%" +msgstr "" + +#: guix/scripts/system.scm:659 +#, scheme-format +msgid "Consider running 'guix pull' before 'reconfigure'.~%" +msgstr "" + +#: guix/scripts/system.scm:660 +#, scheme-format +msgid "Failing to do that may downgrade your system!~%" +msgstr "" + +#: guix/scripts/system.scm:767 #, scheme-format msgid "initializing operating system under '~a'...~%" msgstr "" -#: guix/scripts/system.scm:588 +#: guix/scripts/system.scm:812 msgid "" -"Usage: guix system [OPTION] ACTION [FILE]\n" +"Usage: guix system [OPTION ...] ACTION [ARG ...] [FILE]\n" "Build the operating system declared in FILE according to ACTION.\n" +"Some ACTIONS support additional ARGS.\n" msgstr "" -#: guix/scripts/system.scm:591 guix/scripts/container.scm:28 +#: guix/scripts/system.scm:816 guix/scripts/container.scm:28 msgid "The valid values for ACTION are:\n" msgstr "" -#: guix/scripts/system.scm:593 +#: guix/scripts/system.scm:818 +msgid " search search for existing service types\n" +msgstr "" + +#: guix/scripts/system.scm:820 msgid " reconfigure switch to a new operating system configuration\n" msgstr "" -#: guix/scripts/system.scm:595 +#: guix/scripts/system.scm:822 +msgid " roll-back switch to the previous operating system configuration\n" +msgstr "" + +#: guix/scripts/system.scm:824 +msgid " switch-generation switch to an existing operating system configuration\n" +msgstr "" + +#: guix/scripts/system.scm:826 msgid " list-generations list the system generations\n" msgstr "" -#: guix/scripts/system.scm:597 +#: guix/scripts/system.scm:828 msgid " build build the operating system without installing anything\n" msgstr "" -#: guix/scripts/system.scm:599 +#: guix/scripts/system.scm:830 msgid " container build a container that shares the host's store\n" msgstr "" -#: guix/scripts/system.scm:601 +#: guix/scripts/system.scm:832 msgid " vm build a virtual machine image that shares the host's store\n" msgstr "" -#: guix/scripts/system.scm:603 +#: guix/scripts/system.scm:834 msgid " vm-image build a freestanding virtual machine image\n" msgstr "" -#: guix/scripts/system.scm:605 +#: guix/scripts/system.scm:836 msgid " disk-image build a disk image, suitable for a USB stick\n" msgstr "" -#: guix/scripts/system.scm:607 +#: guix/scripts/system.scm:838 msgid " init initialize a root file system to run GNU\n" msgstr "" -#: guix/scripts/system.scm:609 +#: guix/scripts/system.scm:840 msgid " extension-graph emit the service extension graph in Dot format\n" msgstr "" -#: guix/scripts/system.scm:611 +#: guix/scripts/system.scm:842 msgid " shepherd-graph emit the graph of shepherd services in Dot format\n" msgstr "" -#: guix/scripts/system.scm:615 +#: guix/scripts/system.scm:846 msgid "" "\n" " -d, --derivation return the derivation of the given system" msgstr "" -#: guix/scripts/system.scm:617 +#: guix/scripts/system.scm:848 msgid "" "\n" " --on-error=STRATEGY\n" " apply STRATEGY when an error occurs while reading FILE" msgstr "" -#: guix/scripts/system.scm:620 +#: guix/scripts/system.scm:851 +msgid "" +"\n" +" --file-system-type=TYPE\n" +" for 'disk-image', produce a root file system of TYPE\n" +" (one of 'ext4', 'iso9660')" +msgstr "" + +#: guix/scripts/system.scm:855 msgid "" "\n" " --image-size=SIZE for 'vm-image', produce an image of SIZE" msgstr "" -#: guix/scripts/system.scm:622 +#: guix/scripts/system.scm:857 msgid "" "\n" -" --no-grub for 'init', do not install GRUB" +" --no-bootloader for 'init', do not install a bootloader" msgstr "" -#: guix/scripts/system.scm:624 +#: guix/scripts/system.scm:859 msgid "" "\n" " --share=SPEC for 'vm', share host file system according to SPEC" msgstr "" -#: guix/scripts/system.scm:626 +#: guix/scripts/system.scm:861 +msgid "" +"\n" +" -r, --root=FILE for 'vm', 'vm-image', 'disk-image', 'container',\n" +" and 'build', make FILE a symlink to the result, and\n" +" register it as a garbage collector root" +msgstr "" + +#: guix/scripts/system.scm:865 msgid "" "\n" " --expose=SPEC for 'vm', expose host file system according to SPEC" msgstr "" -#: guix/scripts/system.scm:628 +#: guix/scripts/system.scm:867 msgid "" "\n" " --full-boot for 'vm', make a full boot sequence" msgstr "" -#: guix/scripts/system.scm:713 +#: guix/scripts/system.scm:959 #, scheme-format msgid "no configuration file specified~%" -msgstr "" +msgstr "未指定配置文件~%" -#: guix/scripts/system.scm:776 +#: guix/scripts/system.scm:1057 #, scheme-format msgid "~a: unknown action~%" msgstr "~a：未知操作~%" -#: guix/scripts/system.scm:791 +#: guix/scripts/system.scm:1072 #, scheme-format msgid "wrong number of arguments for action '~a'~%" msgstr "" -#: guix/scripts/system.scm:796 +#: guix/scripts/system.scm:1077 #, scheme-format msgid "guix system: missing command name~%" msgstr "" -#: guix/scripts/system.scm:798 +#: guix/scripts/system.scm:1079 #, scheme-format msgid "Try 'guix system --help' for more information.~%" msgstr "" -#: guix/scripts/lint.scm:127 +#: guix/scripts/system/search.scm:64 guix/ui.scm:1057 guix/ui.scm:1071 +msgid "unknown" +msgstr "未知" + +#: guix/scripts/lint.scm:138 #, scheme-format msgid "Available checkers:~%" msgstr "" -#: guix/scripts/lint.scm:147 +#: guix/scripts/lint.scm:162 msgid "description should not be empty" -msgstr "" +msgstr "描述不应为空" -#: guix/scripts/lint.scm:157 +#: guix/scripts/lint.scm:172 msgid "Texinfo markup in description is invalid" msgstr "" -#: guix/scripts/lint.scm:165 +#: guix/scripts/lint.scm:182 +#, scheme-format +msgid "" +"description should not contain ~\n" +"trademark sign '~a' at ~d" +msgstr "" + +#. TRANSLATORS: '@code' is Texinfo markup and must be kept +#. as is. +#: guix/scripts/lint.scm:195 +msgid "use @code or similar ornament instead of quotes" +msgstr "" + +#: guix/scripts/lint.scm:202 msgid "description should start with an upper-case letter or digit" msgstr "" -#: guix/scripts/lint.scm:181 +#: guix/scripts/lint.scm:218 #, scheme-format msgid "" "sentences in description should be followed ~\n" "by two spaces; possible infraction~p at ~{~a~^, ~}" msgstr "" -#: guix/scripts/lint.scm:205 -msgid "pkg-config should probably be a native input" +#: guix/scripts/lint.scm:236 +#, scheme-format +msgid "invalid description: ~s" +msgstr "无效的描述：~s" + +#: guix/scripts/lint.scm:281 +#, scheme-format +msgid "'~a' should probably be a native input" +msgstr "" + +#: guix/scripts/lint.scm:297 +#, scheme-format +msgid "'~a' should probably not be an input at all" msgstr "" -#: guix/scripts/lint.scm:220 +#: guix/scripts/lint.scm:314 msgid "synopsis should not be empty" msgstr "" -#: guix/scripts/lint.scm:228 +#: guix/scripts/lint.scm:322 msgid "no period allowed at the end of the synopsis" msgstr "" -#: guix/scripts/lint.scm:240 +#: guix/scripts/lint.scm:334 msgid "no article allowed at the beginning of the synopsis" msgstr "" -#: guix/scripts/lint.scm:247 +#: guix/scripts/lint.scm:341 msgid "synopsis should be less than 80 characters long" msgstr "" -#: guix/scripts/lint.scm:253 +#: guix/scripts/lint.scm:347 msgid "synopsis should start with an upper-case letter or digit" msgstr "" -#: guix/scripts/lint.scm:260 +#: guix/scripts/lint.scm:354 msgid "synopsis should not start with the package name" msgstr "" -#: guix/scripts/lint.scm:354 guix/scripts/lint.scm:366 +#: guix/scripts/lint.scm:364 +msgid "Texinfo markup in synopsis is invalid" +msgstr "" + +#: guix/scripts/lint.scm:383 +#, fuzzy, scheme-format +#| msgid "invalid syntax: ~a~%" +msgid "invalid synopsis: ~s" +msgstr "无效语法: ~a~%" + +#: guix/scripts/lint.scm:502 +#, scheme-format +msgid "URI ~a returned suspiciously small file (~a bytes)" +msgstr "" + +#: guix/scripts/lint.scm:512 +#, scheme-format +msgid "permanent redirect from ~a to ~a" +msgstr "" + +#: guix/scripts/lint.scm:519 +#, fuzzy, scheme-format +#| msgid "ambiguous package specification `~a'~%" +msgid "invalid permanent redirect from ~a" +msgstr "含糊的软件包规范 `~a'~%" + +#: guix/scripts/lint.scm:526 guix/scripts/lint.scm:538 #, scheme-format msgid "URI ~a not reachable: ~a (~s)" msgstr "" -#: guix/scripts/lint.scm:373 +#: guix/scripts/lint.scm:545 #, scheme-format msgid "URI ~a domain not found: ~a" msgstr "" -#: guix/scripts/lint.scm:381 +#: guix/scripts/lint.scm:553 #, scheme-format msgid "URI ~a unreachable: ~a" msgstr "" -#: guix/scripts/lint.scm:407 +#: guix/scripts/lint.scm:562 +#, scheme-format +msgid "TLS certificate error: ~a" +msgstr "TLS 证书错误：~a" + +#: guix/scripts/lint.scm:583 msgid "invalid value for home page" -msgstr "" +msgstr "无效的主页值" -#: guix/scripts/lint.scm:410 +#: guix/scripts/lint.scm:586 #, scheme-format msgid "invalid home page URL: ~s" -msgstr "" +msgstr "无效的主页 URL：~s" -#: guix/scripts/lint.scm:430 +#: guix/scripts/lint.scm:606 msgid "file names of patches should start with the package name" msgstr "" -#: guix/scripts/lint.scm:467 +#: guix/scripts/lint.scm:644 #, scheme-format msgid "~a: ~a: proposed synopsis: ~s~%" msgstr "" -#: guix/scripts/lint.scm:479 +#: guix/scripts/lint.scm:657 #, scheme-format msgid "~a: ~a: proposed description:~% \"~a\"~%" msgstr "" -#: guix/scripts/lint.scm:516 +#: guix/scripts/lint.scm:699 msgid "all the source URIs are unreachable:" msgstr "" -#: guix/scripts/lint.scm:539 +#: guix/scripts/lint.scm:721 msgid "the source file name should contain the package name" msgstr "" -#: guix/scripts/lint.scm:548 guix/scripts/lint.scm:552 +#: guix/scripts/lint.scm:737 +#, scheme-format +msgid "URL should be 'mirror://~a/~a'" +msgstr "" + +#: guix/scripts/lint.scm:755 guix/scripts/lint.scm:759 #, scheme-format msgid "failed to create derivation: ~a" msgstr "" -#: guix/scripts/lint.scm:566 +#: guix/scripts/lint.scm:773 #, scheme-format msgid "failed to create derivation: ~s~%" msgstr "" -#: guix/scripts/lint.scm:576 +#: guix/scripts/lint.scm:783 msgid "invalid license field" -msgstr "" +msgstr "无效的许可证字段" -#: guix/scripts/lint.scm:602 +#: guix/scripts/lint.scm:799 #, scheme-format -msgid "failed to retrieve CVE vulnerabilities from ~s: ~a (~s)~%" +msgid "~a: HTTP GET error for ~a: ~a (~s)~%" msgstr "" -#: guix/scripts/lint.scm:607 guix/scripts/lint.scm:615 +#: guix/scripts/lint.scm:809 #, scheme-format -msgid "assuming no CVE vulnerabilities~%" +msgid "~a: host lookup failure: ~a~%" msgstr "" -#: guix/scripts/lint.scm:613 -#, fuzzy, scheme-format -#| msgid "failed to connect to `~a': ~a~%" -msgid "failed to lookup NIST host: ~a~%" -msgstr "连接到 `~a' 失败：~a~%" +#: guix/scripts/lint.scm:814 +#, scheme-format +msgid "~a: TLS certificate error: ~a" +msgstr "~a：TLS 证书错误：~a" -#: guix/scripts/lint.scm:644 +#: guix/scripts/lint.scm:829 +msgid "while retrieving CVE vulnerabilities" +msgstr "" + +#: guix/scripts/lint.scm:866 #, scheme-format msgid "probably vulnerable to ~a" msgstr "" -#: guix/scripts/lint.scm:659 +#: guix/scripts/lint.scm:873 +#, scheme-format +msgid "while retrieving upstream info for '~a'" +msgstr "" + +#: guix/scripts/lint.scm:881 +#, scheme-format +msgid "can be upgraded to ~a" +msgstr "可升级至 ~a" + +#: guix/scripts/lint.scm:896 #, scheme-format msgid "tabulation on line ~a, column ~a" msgstr "" -#: guix/scripts/lint.scm:668 +#: guix/scripts/lint.scm:905 #, scheme-format msgid "trailing white space on line ~a" msgstr "" -#: guix/scripts/lint.scm:678 +#: guix/scripts/lint.scm:915 #, scheme-format msgid "line ~a is way too long (~a characters)" msgstr "" -#: guix/scripts/lint.scm:689 +#: guix/scripts/lint.scm:926 #, scheme-format msgid "line ~a: parentheses feel lonely, move to the previous or next line" msgstr "" -#: guix/scripts/lint.scm:744 +#: guix/scripts/lint.scm:996 msgid "Validate package descriptions" msgstr "" -#: guix/scripts/lint.scm:748 +#: guix/scripts/lint.scm:1000 msgid "Validate synopsis & description of GNU packages" msgstr "" -#: guix/scripts/lint.scm:752 +#: guix/scripts/lint.scm:1004 msgid "Identify inputs that should be native inputs" msgstr "" -#: guix/scripts/lint.scm:756 +#: guix/scripts/lint.scm:1008 +msgid "Identify inputs that should be inputs at all" +msgstr "" + +#: guix/scripts/lint.scm:1012 msgid "Validate file names and availability of patches" msgstr "" -#: guix/scripts/lint.scm:760 +#: guix/scripts/lint.scm:1016 msgid "Validate home-page URLs" msgstr "" #. TRANSLATORS: <license> is the name of a data type and must not be #. translated. -#: guix/scripts/lint.scm:766 +#: guix/scripts/lint.scm:1022 msgid "Make sure the 'license' field is a <license> or a list thereof" msgstr "" -#: guix/scripts/lint.scm:771 +#: guix/scripts/lint.scm:1027 msgid "Validate source URLs" msgstr "" -#: guix/scripts/lint.scm:775 +#: guix/scripts/lint.scm:1031 +msgid "Suggest 'mirror://' URLs" +msgstr "" + +#: guix/scripts/lint.scm:1035 msgid "Validate file names of sources" msgstr "" -#: guix/scripts/lint.scm:779 +#: guix/scripts/lint.scm:1039 msgid "Report failure to compile a package to a derivation" msgstr "" -#: guix/scripts/lint.scm:783 +#: guix/scripts/lint.scm:1043 msgid "Validate package synopses" msgstr "" -#: guix/scripts/lint.scm:787 +#: guix/scripts/lint.scm:1047 msgid "Check the Common Vulnerabilities and Exposures (CVE) database" msgstr "" -#: guix/scripts/lint.scm:792 +#: guix/scripts/lint.scm:1052 +msgid "Check the package for new upstream releases" +msgstr "" + +#: guix/scripts/lint.scm:1056 msgid "Look for formatting issues in the source" msgstr "" -#: guix/scripts/lint.scm:817 +#: guix/scripts/lint.scm:1084 msgid "" "Usage: guix lint [OPTION]... [PACKAGE]...\n" "Run a set of checkers on the specified package; if none is specified,\n" "run the checkers on all packages.\n" msgstr "" -#: guix/scripts/lint.scm:820 +#: guix/scripts/lint.scm:1087 msgid "" "\n" " -c, --checkers=CHECKER1,CHECKER2...\n" " only run the specified checkers" msgstr "" -#: guix/scripts/lint.scm:825 +#: guix/scripts/lint.scm:1092 msgid "" "\n" " -l, --list-checkers display the list of available lint checkers" msgstr "" -#: guix/scripts/lint.scm:845 +#: guix/scripts/lint.scm:1112 #, scheme-format msgid "~a: invalid checker~%" msgstr "" -#: guix/scripts/publish.scm:52 +#: guix/scripts/publish.scm:68 #, scheme-format msgid "" "Usage: guix publish [OPTION]...\n" "Publish ~a over HTTP.\n" msgstr "" -#: guix/scripts/publish.scm:54 +#: guix/scripts/publish.scm:70 msgid "" "\n" " -p, --port=PORT listen on PORT" msgstr "" -#: guix/scripts/publish.scm:56 +#: guix/scripts/publish.scm:72 msgid "" "\n" " --listen=HOST listen on the network interface for HOST" msgstr "" -#: guix/scripts/publish.scm:58 +#: guix/scripts/publish.scm:74 msgid "" "\n" " -u, --user=USER change privileges to USER as soon as possible" msgstr "" -#: guix/scripts/publish.scm:60 +#: guix/scripts/publish.scm:76 +#, fuzzy +#| msgid "" +#| "\n" +#| " --substitute-urls=URLS\n" +#| " compare build results with those at URLS" +msgid "" +"\n" +" -C, --compression[=LEVEL]\n" +" compress archives at LEVEL" +msgstr "" +"\n" +" --substitute-urls=URLS\n" +" 与 URLS 的构建结果对比" + +#: guix/scripts/publish.scm:79 +msgid "" +"\n" +" -c, --cache=DIRECTORY cache published items to DIRECTORY" +msgstr "" + +#: guix/scripts/publish.scm:81 +msgid "" +"\n" +" --workers=N use N workers to bake items" +msgstr "" + +#: guix/scripts/publish.scm:83 +msgid "" +"\n" +" --ttl=TTL announce narinfos can be cached for TTL seconds" +msgstr "" + +#: guix/scripts/publish.scm:85 +msgid "" +"\n" +" --nar-path=PATH use PATH as the prefix for nar URLs" +msgstr "" + +#: guix/scripts/publish.scm:87 +msgid "" +"\n" +" --public-key=FILE use FILE as the public key for signatures" +msgstr "" + +#: guix/scripts/publish.scm:89 +msgid "" +"\n" +" --private-key=FILE use FILE as the private key for signatures" +msgstr "" + +#: guix/scripts/publish.scm:91 msgid "" "\n" " -r, --repl[=PORT] spawn REPL server on PORT" msgstr "" -#: guix/scripts/publish.scm:76 +#: guix/scripts/publish.scm:107 #, scheme-format msgid "lookup of host '~a' failed: ~a~%" msgstr "" -#: guix/scripts/publish.scm:100 +#: guix/scripts/publish.scm:152 #, scheme-format msgid "lookup of host '~a' returned nothing" msgstr "" -#: guix/scripts/publish.scm:342 +#: guix/scripts/publish.scm:165 +#, scheme-format +msgid "zlib support is missing; compression disabled~%" +msgstr "" + +#: guix/scripts/publish.scm:179 +#, fuzzy, scheme-format +#| msgid "~a: invalid number~%" +msgid "~a: invalid duration~%" +msgstr "~a: 无效的数字~%" + +#: guix/scripts/publish.scm:832 #, scheme-format msgid "user '~a' not found: ~a~%" msgstr "" -#: guix/scripts/publish.scm:377 +#: guix/scripts/publish.scm:873 #, scheme-format msgid "server running as root; consider using the '--user' option!~%" msgstr "" -#: guix/scripts/publish.scm:379 +#: guix/scripts/publish.scm:878 #, scheme-format msgid "publishing ~a on ~a, port ~d~%" msgstr "" @@ -1539,42 +1998,47 @@ msgstr "" msgid "file '~a' not found in search path ~s~%" msgstr "" -#: guix/scripts/edit.scm:83 +#: guix/scripts/edit.scm:90 #, scheme-format msgid "source location of package '~a' is unknown~%" msgstr "" -#: guix/scripts/edit.scm:96 +#: guix/scripts/edit.scm:103 #, fuzzy, scheme-format #| msgid "failed to connect to `~a': ~a~%" msgid "failed to launch '~a': ~a~%" msgstr "连接到 `~a' 失败：~a~%" -#: guix/scripts/size.scm:75 +#: guix/scripts/size.scm:77 #, scheme-format msgid "no available substitute information for '~a'~%" msgstr "" -#: guix/scripts/size.scm:83 +#: guix/scripts/size.scm:99 msgid "store item" msgstr "" -#: guix/scripts/size.scm:83 +#: guix/scripts/size.scm:99 msgid "total" msgstr "总用量" -#: guix/scripts/size.scm:83 +#: guix/scripts/size.scm:99 msgid "self" msgstr "" +#: guix/scripts/size.scm:107 +#, scheme-format +msgid "total: ~,1f MiB~%" +msgstr "" + #. TRANSLATORS: This is the title of a graph, meaning that the graph #. represents a profile of the store (the "store" being the place where #. packages are stored.) -#: guix/scripts/size.scm:204 +#: guix/scripts/size.scm:221 msgid "store profile" msgstr "" -#: guix/scripts/size.scm:213 +#: guix/scripts/size.scm:230 msgid "" "Usage: guix size [OPTION]... PACKAGE\n" "Report the size of PACKAGE and its dependencies.\n" @@ -1582,7 +2046,7 @@ msgstr "" "用法：guix size [选项]... 软件包\n" "报告 <软件包> 及其依赖的大小。\n" -#: guix/scripts/size.scm:218 +#: guix/scripts/size.scm:235 msgid "" "\n" " -s, --system=SYSTEM consider packages for SYSTEM--e.g., \"i686-linux\"" @@ -1590,126 +2054,193 @@ msgstr "" "\n" " -s, --system=系统 为 <系统> 考虑包——比如，\"i686-linux\"" -#: guix/scripts/size.scm:220 +#. TRANSLATORS: "closure" and "self" must not be translated. +#: guix/scripts/size.scm:238 +msgid "" +"\n" +" --sort=KEY sort according to KEY--\"closure\" or \"self\"" +msgstr "" + +#: guix/scripts/size.scm:240 msgid "" "\n" " -m, --map-file=FILE write to FILE a graphical map of disk usage" msgstr "" -#: guix/scripts/size.scm:274 +#: guix/scripts/size.scm:271 +#, fuzzy, scheme-format +#| msgid "~a: invalid number~%" +msgid "~a: invalid sorting key~%" +msgstr "~a: 无效的数字~%" + +#: guix/scripts/size.scm:306 msgid "missing store item argument\n" msgstr "" -#: guix/scripts/size.scm:292 -msgid "too many arguments\n" -msgstr "太多参数\n" +#: guix/scripts/graph.scm:84 +#, scheme-format +msgid "~a: invalid argument (package name expected)" +msgstr "" -#: guix/scripts/graph.scm:77 +#: guix/scripts/graph.scm:95 msgid "the DAG of packages, excluding implicit inputs" msgstr "" -#: guix/scripts/graph.scm:133 +#: guix/scripts/graph.scm:121 +msgid "the reverse DAG of packages" +msgstr "" + +#: guix/scripts/graph.scm:171 msgid "the DAG of packages, including implicit inputs" msgstr "" -#: guix/scripts/graph.scm:142 +#: guix/scripts/graph.scm:181 msgid "the DAG of packages and origins, including implicit inputs" msgstr "" -#: guix/scripts/graph.scm:172 +#: guix/scripts/graph.scm:211 msgid "same as 'bag', but without the bootstrap nodes" msgstr "" -#: guix/scripts/graph.scm:217 +#: guix/scripts/graph.scm:253 msgid "the DAG of derivations" msgstr "" -#: guix/scripts/graph.scm:241 +#: guix/scripts/graph.scm:265 +msgid "unsupported argument for derivation graph" +msgstr "" + +#: guix/scripts/graph.scm:291 +msgid "unsupported argument for this type of graph" +msgstr "" + +#: guix/scripts/graph.scm:304 #, scheme-format msgid "references for '~a' are not known~%" msgstr "" -#: guix/scripts/graph.scm:248 +#: guix/scripts/graph.scm:311 msgid "the DAG of run-time dependencies (store references)" msgstr "" -#: guix/scripts/graph.scm:278 +#: guix/scripts/graph.scm:327 +msgid "the DAG of referrers in the store" +msgstr "" + +#: guix/scripts/graph.scm:354 #, scheme-format msgid "~a: unknown node type~%" msgstr "~a: 未知节点类型~%" -#: guix/scripts/graph.scm:282 +#: guix/scripts/graph.scm:361 +#, scheme-format +msgid "~a: unknown backend~%" +msgstr "~a：未知后端~%" + +#: guix/scripts/graph.scm:365 msgid "The available node types are:\n" msgstr "" +#: guix/scripts/graph.scm:375 +msgid "The available backend types are:\n" +msgstr "" + #. TRANSLATORS: Here 'dot' is the name of a program; it must not be #. translated. -#: guix/scripts/graph.scm:318 +#: guix/scripts/graph.scm:419 msgid "" "Usage: guix graph PACKAGE...\n" -"Emit a Graphviz (dot) representation of the dependencies of PACKAGE...\n" +"Emit a representation of the dependency graph of PACKAGE...\n" +msgstr "" + +#: guix/scripts/graph.scm:421 +msgid "" +"\n" +" -b, --backend=TYPE produce a graph with the given backend TYPE" +msgstr "" + +#: guix/scripts/graph.scm:423 +msgid "" +"\n" +" --list-backends list the available graph backends" msgstr "" -#: guix/scripts/graph.scm:320 +#: guix/scripts/graph.scm:425 msgid "" "\n" " -t, --type=TYPE represent nodes of the given TYPE" msgstr "" -#: guix/scripts/graph.scm:322 +#: guix/scripts/graph.scm:427 msgid "" "\n" " --list-types list the available graph types" msgstr "" -#: guix/scripts/graph.scm:324 +#: guix/scripts/graph.scm:429 guix/scripts/pack.scm:336 msgid "" "\n" " -e, --expression=EXPR consider the package EXPR evaluates to" msgstr "" -#: guix/scripts/challenge.scm:104 +#: guix/scripts/challenge.scm:191 #, scheme-format -msgid "~a: no substitute at '~a'~%" +msgid " local hash: ~a~%" msgstr "" -#: guix/scripts/challenge.scm:120 +#: guix/scripts/challenge.scm:192 #, scheme-format -msgid "no substitutes for '~a'~%" +msgid " no local build for '~a'~%" msgstr "" -#: guix/scripts/challenge.scm:137 guix/scripts/challenge.scm:157 +#: guix/scripts/challenge.scm:194 #, scheme-format -msgid "no local build for '~a'~%" +msgid " ~50a: ~a~%" msgstr "" -#: guix/scripts/challenge.scm:154 +#: guix/scripts/challenge.scm:202 #, scheme-format msgid "~a contents differ:~%" msgstr "" -#: guix/scripts/challenge.scm:156 +#: guix/scripts/challenge.scm:205 #, scheme-format -msgid " local hash: ~a~%" +msgid "could not challenge '~a': no local build~%" msgstr "" -#: guix/scripts/challenge.scm:161 +#: guix/scripts/challenge.scm:207 #, scheme-format -msgid " ~50a: ~a~%" +msgid "could not challenge '~a': no substitutes~%" msgstr "" -#: guix/scripts/challenge.scm:165 +#: guix/scripts/challenge.scm:210 #, scheme-format -msgid " ~50a: unavailable~%" +msgid "~a contents match:~%" msgstr "" -#: guix/scripts/challenge.scm:175 +#: guix/scripts/challenge.scm:219 +msgid "~h store items were analyzed:~%" +msgstr "" + +#: guix/scripts/challenge.scm:220 +msgid " - ~h (~,1f%) were identical~%" +msgstr "" + +#: guix/scripts/challenge.scm:222 +msgid " - ~h (~,1f%) differed~%" +msgstr "" + +#: guix/scripts/challenge.scm:224 +msgid " - ~h (~,1f%) were inconclusive~%" +msgstr "" + +#: guix/scripts/challenge.scm:233 msgid "" "Usage: guix challenge [PACKAGE...]\n" "Challenge the substitutes for PACKAGE... provided by one or more servers.\n" msgstr "" -#: guix/scripts/challenge.scm:177 +#: guix/scripts/challenge.scm:235 msgid "" "\n" " --substitute-urls=URLS\n" @@ -1719,18 +2250,205 @@ msgstr "" " --substitute-urls=URLS\n" " 与 URLS 的构建结果对比" -#: guix/gnu-maintenance.scm:542 +#: guix/scripts/challenge.scm:238 +msgid "" +"\n" +" -v, --verbose show details about successful comparisons" +msgstr "" + +#: guix/scripts/copy.scm:59 +#, fuzzy, scheme-format +#| msgid "~a: invalid number~%" +msgid "~a: invalid TCP port number~%" +msgstr "~a: 无效的数字~%" + +#: guix/scripts/copy.scm:61 +#, fuzzy, scheme-format +#| msgid "ambiguous package specification `~a'~%" +msgid "~a: invalid SSH specification~%" +msgstr "含糊的软件包规范 `~a'~%" + +#: guix/scripts/copy.scm:113 +msgid "" +"Usage: guix copy [OPTION]... ITEMS...\n" +"Copy ITEMS to or from the specified host over SSH.\n" +msgstr "" + +#: guix/scripts/copy.scm:115 +msgid "" +"\n" +" --to=HOST send ITEMS to HOST" +msgstr "" + +#: guix/scripts/copy.scm:117 +msgid "" +"\n" +" --from=HOST receive ITEMS from HOST" +msgstr "" + +#: guix/scripts/copy.scm:168 +#, scheme-format +msgid "use '--to' or '--from'~%" +msgstr "" + +#: guix/scripts/pack.scm:76 +#, fuzzy, scheme-format +#| msgid "~a: package not found~%" +msgid "~a: compressor not found~%" +msgstr "~a: 包未找到~%" + +#: guix/scripts/pack.scm:318 +#, fuzzy, scheme-format +#| msgid "ambiguous package specification `~a'~%" +msgid "~a: invalid symlink specification~%" +msgstr "含糊的软件包规范 `~a'~%" + +#: guix/scripts/pack.scm:328 +#, fuzzy +#| msgid "" +#| "Usage: guix size [OPTION]... PACKAGE\n" +#| "Report the size of PACKAGE and its dependencies.\n" +msgid "" +"Usage: guix pack [OPTION]... PACKAGE...\n" +"Create a bundle of PACKAGE.\n" +msgstr "" +"用法：guix size [选项]... 软件包\n" +"报告 <软件包> 及其依赖的大小。\n" + +#: guix/scripts/pack.scm:334 +msgid "" +"\n" +" -f, --format=FORMAT build a pack in the given FORMAT" +msgstr "" + +#: guix/scripts/pack.scm:342 +msgid "" +"\n" +" -C, --compression=TOOL compress using TOOL--e.g., \"lzip\"" +msgstr "" + +#: guix/scripts/pack.scm:344 +msgid "" +"\n" +" -S, --symlink=SPEC create symlinks to the profile according to SPEC" +msgstr "" + +#: guix/scripts/pack.scm:346 +msgid "" +"\n" +" --localstatedir include /var/guix in the resulting pack" +msgstr "" + +#: guix/scripts/pack.scm:390 +#, scheme-format +msgid "~a: unknown pack format" +msgstr "" + +#: guix/scripts/weather.scm:74 +msgid "computing ~h package derivations for ~a...~%" +msgstr "" + +#: guix/scripts/weather.scm:110 +#, fuzzy +#| msgid "looking for the latest release of GNU ~a..." +msgid "looking for ~h store items on ~a...~%" +msgstr "寻找最新版的 GNU~a..." + +#: guix/scripts/weather.scm:120 +msgid " ~2,1f% substitutes available (~h out of ~h)~%" +msgstr "" + +#: guix/scripts/weather.scm:126 +#, scheme-format +msgid " unknown substitute sizes~%" +msgstr "" + +#: guix/scripts/weather.scm:129 +msgid " ~,1h MiB of nars (compressed)~%" +msgstr "" + +#: guix/scripts/weather.scm:130 +msgid " at least ~,1h MiB of nars (compressed)~%" +msgstr "" + +#: guix/scripts/weather.scm:132 +msgid " ~,1h MiB on disk (uncompressed)~%" +msgstr "" + +#: guix/scripts/weather.scm:134 +msgid " ~,3h seconds per request (~,1h seconds in total)~%" +msgstr "" + +#: guix/scripts/weather.scm:136 +msgid " ~,1h requests per second~%" +msgstr "" + +#: guix/scripts/weather.scm:145 +msgid "" +"Usage: guix weather [OPTIONS]\n" +"Report the availability of substitutes.\n" +msgstr "" + +#: guix/scripts/weather.scm:147 +#, fuzzy +#| msgid "" +#| "\n" +#| " --substitute-urls=URLS\n" +#| " compare build results with those at URLS" +msgid "" +"\n" +" --substitute-urls=URLS\n" +" check for available substitutes at URLS" +msgstr "" +"\n" +" --substitute-urls=URLS\n" +" 与 URLS 的构建结果对比" + +#: guix/scripts/weather.scm:150 +msgid "" +"\n" +" -m, --manifest=MANIFEST\n" +" look up substitutes for packages specified in MANIFEST" +msgstr "" + +#: guix/scripts/weather.scm:153 +#, fuzzy +#| msgid "" +#| "\n" +#| " -s, --system=SYSTEM consider packages for SYSTEM--e.g., \"i686-linux\"" +msgid "" +"\n" +" -s, --system=SYSTEM consider substitutes for SYSTEM--e.g., \"i686-linux\"" +msgstr "" +"\n" +" -s, --system=系统 为 <系统> 考虑包——比如，\"i686-linux\"" + +#: guix/scripts/weather.scm:177 +#, fuzzy, scheme-format +#| msgid "~a: invalid number~%" +msgid "~a: invalid URL~%" +msgstr "~a: 无效的数字~%" + +#: guix/gnu-maintenance.scm:567 msgid "Updater for GNU packages" msgstr "" -#: guix/gnu-maintenance.scm:549 -msgid "Updater for GNOME packages" +#: guix/gnu-maintenance.scm:576 +msgid "Updater for GNU packages only available via FTP" +msgstr "" + +#: guix/gnu-maintenance.scm:585 +msgid "Updater for KDE packages" msgstr "" -#: guix/gnu-maintenance.scm:556 +#: guix/gnu-maintenance.scm:592 msgid "Updater for X.org packages" msgstr "" +#: guix/gnu-maintenance.scm:599 +msgid "Updater for packages hosted on kernel.org" +msgstr "" + #: guix/scripts/container.scm:25 msgid "" "Usage: guix container ACTION ARGS...\n" @@ -1763,92 +2481,129 @@ msgstr "" msgid "~a: extraneous argument~%" msgstr "~A: 未预期的参数~%" -#: guix/scripts/container/exec.scm:80 +#: guix/scripts/container/exec.scm:87 #, scheme-format msgid "no pid specified~%" msgstr "" -#: guix/scripts/container/exec.scm:83 +#: guix/scripts/container/exec.scm:90 #, scheme-format msgid "no command specified~%" msgstr "" -#: guix/scripts/container/exec.scm:86 +#: guix/scripts/container/exec.scm:93 #, scheme-format msgid "no such process ~d~%" msgstr "" -#: guix/scripts/container/exec.scm:94 +#: guix/scripts/container/exec.scm:105 #, scheme-format msgid "exec failed with status ~d~%" msgstr "" -#: guix/upstream.scm:158 +#: guix/upstream.scm:249 #, scheme-format msgid "signature verification failed for `~a'~%" msgstr "" -#: guix/upstream.scm:160 +#: guix/upstream.scm:251 #, scheme-format msgid "(could be because the public key is not in your keyring)~%" msgstr "" -#: guix/upstream.scm:192 -msgid "gz" -msgstr "" - -#: guix/upstream.scm:255 +#: guix/upstream.scm:330 #, scheme-format msgid "~a: could not locate source file" msgstr "" -#: guix/upstream.scm:260 +#: guix/upstream.scm:335 #, scheme-format msgid "~a: ~a: no `version' field in source; skipping~%" msgstr "" -#: guix/ui.scm:236 +#: guix/ui.scm:159 +#, scheme-format +msgid "~a: unbound variable" +msgstr "" + +#: guix/ui.scm:235 msgid "entering debugger; type ',bt' for a backtrace\n" msgstr "" -#: guix/ui.scm:252 guix/ui.scm:269 +#: guix/ui.scm:284 +#, fuzzy, scheme-format +#| msgid "deleting ~a~%" +msgid "hint: ~a~%" +msgstr "正删除 ~a~%" + +#: guix/ui.scm:294 guix/ui.scm:342 guix/ui.scm:349 #, scheme-format msgid "failed to load '~a': ~a~%" msgstr "" -#: guix/ui.scm:255 +#: guix/ui.scm:301 +#, scheme-format +msgid "~amissing closing parenthesis~%" +msgstr "" + +#: guix/ui.scm:306 guix/ui.scm:322 guix/ui.scm:596 #, scheme-format msgid "~a: error: ~a~%" msgstr "~a：错误：~a~%" -#: guix/ui.scm:258 guix/ui.scm:512 +#: guix/ui.scm:314 +msgid "Did you forget a @code{use-modules} form?" +msgstr "" + +#: guix/ui.scm:316 +#, scheme-format +msgid "Try adding @code{(use-modules ~a)}." +msgstr "" + +#: guix/ui.scm:329 guix/ui.scm:657 #, scheme-format msgid "exception thrown: ~s~%" msgstr "" -#: guix/ui.scm:260 guix/ui.scm:278 +#: guix/ui.scm:333 guix/ui.scm:355 #, scheme-format msgid "failed to load '~a':~%" msgstr "" -#: guix/ui.scm:272 +#: guix/ui.scm:345 #, scheme-format msgid "~a: warning: ~a~%" msgstr "" -#: guix/ui.scm:275 +#: guix/ui.scm:352 #, scheme-format msgid "failed to load '~a': exception thrown: ~s~%" msgstr "" -#: guix/ui.scm:287 +#: guix/ui.scm:364 #, scheme-format msgid "failed to install locale: ~a~%" msgstr "" -#: guix/ui.scm:306 +#. TRANSLATORS: Translate "(C)" to the copyright symbol +#. (C-in-a-circle), if this symbol is available in the user's +#. locale. Otherwise, do not translate "(C)"; leave it as-is. */ +#: guix/ui.scm:394 +msgid "(C)" +msgstr "" + +#: guix/ui.scm:395 +msgid "the Guix authors\n" +msgstr "Guix 作者\n" + +#: guix/ui.scm:396 +#, fuzzy +#| msgid "" +#| "Copyright (C) 2016 the Guix authors\n" +#| "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n" +#| "This is free software: you are free to change and redistribute it.\n" +#| "There is NO WARRANTY, to the extent permitted by law.\n" msgid "" -"Copyright (C) 2016 the Guix authors\n" "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" @@ -1858,7 +2613,11 @@ msgstr "" "本软件是自由软件：您可以自由修改和重新发布它。\n" "在法律允许的范围内没有其他保证。\n" -#: guix/ui.scm:314 +#. TRANSLATORS: The placeholder indicates the bug-reporting address for this +#. package. Please add another line saying "Report translation bugs to +#. ...\n" with the address for translation bugs (typically your translation +#. team's web or email address). +#: guix/ui.scm:408 #, scheme-format msgid "" "\n" @@ -1866,9 +2625,9 @@ msgid "" msgstr "" "\n" "报告程序缺陷到：~a。\n" -"报告翻译错误到：https://translationproject.org/teams" +"报告简体中文翻译错误到：https://translationproject.org/team/zh_CN.html ." -#: guix/ui.scm:316 +#: guix/ui.scm:410 #, scheme-format msgid "" "\n" @@ -1877,7 +2636,7 @@ msgstr "" "\n" "~a 项目首页:<~a>" -#: guix/ui.scm:318 +#: guix/ui.scm:412 msgid "" "\n" "General help using GNU software: <http://www.gnu.org/gethelp/>" @@ -1885,238 +2644,281 @@ msgstr "" "\n" "使用 GNU 软件的一般性帮助：<http://www.gnu.org/gethelp/>" -#: guix/ui.scm:363 +#: guix/ui.scm:457 #, scheme-format msgid "'~a' is not a valid regular expression: ~a~%" msgstr "" -#: guix/ui.scm:369 +#: guix/ui.scm:463 #, scheme-format msgid "~a: invalid number~%" msgstr "~a: 无效的数字~%" -#: guix/ui.scm:386 +#: guix/ui.scm:480 #, scheme-format msgid "invalid number: ~a~%" msgstr "无效的数字：~a~%" -#: guix/ui.scm:409 +#: guix/ui.scm:503 #, scheme-format msgid "unknown unit: ~a~%" msgstr "" -#: guix/ui.scm:420 +#: guix/ui.scm:520 #, scheme-format msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%" msgstr "" -#: guix/ui.scm:427 +#: guix/ui.scm:527 #, scheme-format msgid "~a: ~a: build system `~a' does not support cross builds~%" msgstr "" -#: guix/ui.scm:432 +#: guix/ui.scm:533 +#, fuzzy, scheme-format +#| msgid "signature is not a valid s-expression" +msgid "~s: invalid G-expression input~%" +msgstr "签名不是有效的 S-表达式" + +#: guix/ui.scm:536 #, scheme-format msgid "profile '~a' does not exist~%" msgstr "" -#: guix/ui.scm:435 +#: guix/ui.scm:539 #, scheme-format msgid "generation ~a of profile '~a' does not exist~%" msgstr "" -#: guix/ui.scm:442 +#: guix/ui.scm:548 +#, scheme-format +msgid " ... propagated from ~a@~a~%" +msgstr "" + +#: guix/ui.scm:553 +#, scheme-format +msgid "profile contains conflicting entries for ~a:~a~%" +msgstr "" + +#: guix/ui.scm:556 +#, scheme-format +msgid " first entry: ~a@~a:~a ~a~%" +msgstr "" + +#: guix/ui.scm:562 +#, scheme-format +msgid " second entry: ~a@~a:~a ~a~%" +msgstr "" + +#: guix/ui.scm:573 #, scheme-format msgid "corrupt input while restoring '~a' from ~s~%" msgstr "" -#: guix/ui.scm:444 +#: guix/ui.scm:575 #, scheme-format msgid "corrupt input while restoring archive from ~s~%" msgstr "" -#: guix/ui.scm:447 +#: guix/ui.scm:578 #, scheme-format msgid "failed to connect to `~a': ~a~%" msgstr "连接到 `~a' 失败：~a~%" -#: guix/ui.scm:452 +#: guix/ui.scm:583 #, scheme-format msgid "build failed: ~a~%" msgstr "" -#: guix/ui.scm:455 +#: guix/ui.scm:586 #, scheme-format msgid "reference to invalid output '~a' of derivation '~a'~%" msgstr "" -#: guix/ui.scm:466 +#: guix/ui.scm:590 +#, scheme-format +msgid "file '~a' could not be found in these directories:~{ ~a~}~%" +msgstr "" + +#: guix/ui.scm:607 #, scheme-format msgid "~a: ~a~%" msgstr "" -#: guix/ui.scm:501 +#: guix/ui.scm:642 #, scheme-format msgid "failed to read expression ~s: ~s~%" msgstr "" -#: guix/ui.scm:507 +#: guix/ui.scm:648 #, scheme-format msgid "failed to evaluate expression '~a':~%" msgstr "" -#: guix/ui.scm:510 +#: guix/ui.scm:651 #, scheme-format msgid "syntax error: ~a~%" msgstr "语法错误：~a~%" -#: guix/ui.scm:524 +#: guix/ui.scm:669 #, scheme-format msgid "expression ~s does not evaluate to a package~%" msgstr "" -#: guix/ui.scm:586 +#: guix/ui.scm:688 +msgid "at least ~,1h MB needed but only ~,1h MB available in ~a~%" +msgstr "" + +#: guix/ui.scm:756 #, scheme-format msgid "~:[The following derivation would be built:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following derivations would be built:~%~{ ~a~%~}~;~]" msgstr[0] "" -#: guix/ui.scm:591 +#. TRANSLATORS: "MB" is for "megabyte"; it should be +#. translated to the corresponding abbreviation. +#: guix/ui.scm:764 +msgid "~:[~,1h MB would be downloaded:~%~{ ~a~%~}~;~]" +msgstr "" + +#: guix/ui.scm:769 #, scheme-format msgid "~:[The following file would be downloaded:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following files would be downloaded:~%~{ ~a~%~}~;~]" msgstr[0] "" -#: guix/ui.scm:597 +#: guix/ui.scm:776 #, scheme-format msgid "~:[The following derivation will be built:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following derivations will be built:~%~{ ~a~%~}~;~]" msgstr[0] "" -#: guix/ui.scm:602 +#. TRANSLATORS: "MB" is for "megabyte"; it should be +#. translated to the corresponding abbreviation. +#: guix/ui.scm:784 +msgid "~:[~,1h MB will be downloaded:~%~{ ~a~%~}~;~]" +msgstr "" + +#: guix/ui.scm:789 #, scheme-format msgid "~:[The following file will be downloaded:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following files will be downloaded:~%~{ ~a~%~}~;~]" msgstr[0] "" -#: guix/ui.scm:657 +#: guix/ui.scm:849 #, scheme-format msgid "The following package would be removed:~%~{~a~%~}~%" msgid_plural "The following packages would be removed:~%~{~a~%~}~%" msgstr[0] "" -#: guix/ui.scm:662 +#: guix/ui.scm:854 #, scheme-format msgid "The following package will be removed:~%~{~a~%~}~%" msgid_plural "The following packages will be removed:~%~{~a~%~}~%" msgstr[0] "" -#: guix/ui.scm:675 +#: guix/ui.scm:867 #, scheme-format msgid "The following package would be downgraded:~%~{~a~%~}~%" msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%" msgstr[0] "" -#: guix/ui.scm:680 +#: guix/ui.scm:872 #, scheme-format msgid "The following package will be downgraded:~%~{~a~%~}~%" msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%" msgstr[0] "" -#: guix/ui.scm:693 +#: guix/ui.scm:885 #, scheme-format msgid "The following package would be upgraded:~%~{~a~%~}~%" msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%" msgstr[0] "" -#: guix/ui.scm:698 +#: guix/ui.scm:890 #, scheme-format msgid "The following package will be upgraded:~%~{~a~%~}~%" msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%" msgstr[0] "" -#: guix/ui.scm:709 +#: guix/ui.scm:901 #, scheme-format msgid "The following package would be installed:~%~{~a~%~}~%" msgid_plural "The following packages would be installed:~%~{~a~%~}~%" msgstr[0] "" -#: guix/ui.scm:714 +#: guix/ui.scm:906 #, scheme-format msgid "The following package will be installed:~%~{~a~%~}~%" msgid_plural "The following packages will be installed:~%~{~a~%~}~%" msgstr[0] "" -#: guix/ui.scm:731 +#: guix/ui.scm:923 msgid "<unknown location>" msgstr "<未知位置>" -#: guix/ui.scm:750 -#, scheme-format -msgid "failed to create configuration directory `~a': ~a~%" -msgstr "" - -#: guix/ui.scm:869 guix/ui.scm:883 -msgid "unknown" -msgstr "未知" - -#: guix/ui.scm:1033 +#: guix/ui.scm:1285 #, scheme-format msgid "Generation ~a\t~a" msgstr "" -#: guix/ui.scm:1040 +#. TRANSLATORS: The word "current" here is an adjective for +#. "Generation", as in "current generation". Use the appropriate +#. gender where applicable. +#: guix/ui.scm:1295 #, scheme-format msgid "~a\t(current)~%" msgstr "~a\t(当前)~%" -#: guix/ui.scm:1057 +#: guix/ui.scm:1338 #, scheme-format msgid "switched from generation ~a to ~a~%" msgstr "" -#: guix/ui.scm:1073 +#: guix/ui.scm:1354 #, scheme-format msgid "deleting ~a~%" msgstr "正删除 ~a~%" -#: guix/ui.scm:1121 +#: guix/ui.scm:1385 #, scheme-format msgid "Try `guix --help' for more information.~%" msgstr "请尝试 “guix --help”，以获取更多信息。~%" -#: guix/ui.scm:1148 +#: guix/ui.scm:1413 msgid "" "Usage: guix COMMAND ARGS...\n" "Run COMMAND with ARGS.\n" msgstr "" -#: guix/ui.scm:1151 +#: guix/ui.scm:1416 msgid "COMMAND must be one of the sub-commands listed below:\n" msgstr "" -#: guix/ui.scm:1171 +#: guix/ui.scm:1436 #, scheme-format msgid "guix: ~a: command not found~%" msgstr "guix：~a：未找到命令~%" -#: guix/ui.scm:1188 +#: guix/ui.scm:1466 #, scheme-format msgid "guix: missing command name~%" msgstr "" -#: guix/ui.scm:1196 +#: guix/ui.scm:1474 #, scheme-format msgid "guix: unrecognized option '~a'~%" -msgstr "" +msgstr "guix: 无法识别的选项“~a”~%" -#: guix/http-client.scm:261 +#: guix/http-client.scm:269 #, scheme-format msgid "following redirection to `~a'...~%" msgstr "" -#: guix/http-client.scm:270 -msgid "download failed" +#: guix/http-client.scm:281 +#, fuzzy, scheme-format +#| msgid "download failed" +msgid "~a: HTTP download failed: ~a (~s)" msgstr "下载失败" #: guix/nar.scm:155 @@ -2162,139 +2964,145 @@ msgstr "" msgid "invalid inter-file archive mark" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:61 +#: nix/nix-daemon/guix-daemon.cc:66 msgid "guix-daemon -- perform derivation builds and store accesses" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:63 +#: nix/nix-daemon/guix-daemon.cc:68 msgid "This program is a daemon meant to run in the background. It serves requests sent over a Unix-domain socket. It accesses the store, and builds derivations on behalf of its clients." msgstr "" -#: nix/nix-daemon/guix-daemon.cc:87 +#: nix/nix-daemon/guix-daemon.cc:94 msgid "SYSTEM" msgstr "系统" -#: nix/nix-daemon/guix-daemon.cc:88 +#: nix/nix-daemon/guix-daemon.cc:95 msgid "assume SYSTEM as the current system type" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:89 nix/nix-daemon/guix-daemon.cc:92 +#: nix/nix-daemon/guix-daemon.cc:96 nix/nix-daemon/guix-daemon.cc:99 msgid "N" msgstr "N" -#: nix/nix-daemon/guix-daemon.cc:90 +#: nix/nix-daemon/guix-daemon.cc:97 msgid "use N CPU cores to build each derivation; 0 means as many as available" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:93 +#: nix/nix-daemon/guix-daemon.cc:100 msgid "allow at most N build jobs" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:95 +#: nix/nix-daemon/guix-daemon.cc:101 nix/nix-daemon/guix-daemon.cc:103 +msgid "SECONDS" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:102 +msgid "mark builds as failed after SECONDS of activity" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:104 +msgid "mark builds as failed after SECONDS of silence" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:106 msgid "disable chroot builds" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:96 +#: nix/nix-daemon/guix-daemon.cc:107 msgid "DIR" msgstr "目录" -#: nix/nix-daemon/guix-daemon.cc:97 +#: nix/nix-daemon/guix-daemon.cc:108 msgid "add DIR to the build chroot" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:98 +#: nix/nix-daemon/guix-daemon.cc:109 msgid "GROUP" msgstr "组" -#: nix/nix-daemon/guix-daemon.cc:99 +#: nix/nix-daemon/guix-daemon.cc:110 msgid "perform builds as a user of GROUP" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:101 +#: nix/nix-daemon/guix-daemon.cc:112 msgid "do not use substitutes" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:102 +#: nix/nix-daemon/guix-daemon.cc:113 msgid "URLS" -msgstr "网址们" +msgstr "网址" -#: nix/nix-daemon/guix-daemon.cc:103 +#: nix/nix-daemon/guix-daemon.cc:114 msgid "use URLS as the default list of substitute providers" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:105 +#: nix/nix-daemon/guix-daemon.cc:116 msgid "do not use the 'build hook'" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:107 +#: nix/nix-daemon/guix-daemon.cc:118 msgid "cache build failures" -msgstr "" +msgstr "对构建失败进行缓存" -#: nix/nix-daemon/guix-daemon.cc:109 +#: nix/nix-daemon/guix-daemon.cc:120 msgid "build each derivation N times in a row" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:111 +#: nix/nix-daemon/guix-daemon.cc:122 msgid "do not keep build logs" -msgstr "" +msgstr "不要保留构建日志" -#: nix/nix-daemon/guix-daemon.cc:113 +#: nix/nix-daemon/guix-daemon.cc:124 msgid "disable compression of the build logs" -msgstr "" +msgstr "禁用构建日志压缩" -#: nix/nix-daemon/guix-daemon.cc:118 +#: nix/nix-daemon/guix-daemon.cc:129 msgid "disable automatic file \"deduplication\" in the store" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:128 +#: nix/nix-daemon/guix-daemon.cc:139 msgid "impersonate Linux 2.6" msgstr "模拟 Linux 2.6" -#: nix/nix-daemon/guix-daemon.cc:132 +#: nix/nix-daemon/guix-daemon.cc:143 msgid "tell whether the GC must keep outputs of live derivations" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:135 +#: nix/nix-daemon/guix-daemon.cc:146 msgid "tell whether the GC must keep derivations corresponding to live outputs" msgstr "" -#: nix/nix-daemon/guix-daemon.cc:138 +#: nix/nix-daemon/guix-daemon.cc:149 msgid "SOCKET" msgstr "套接字" -#: nix/nix-daemon/guix-daemon.cc:139 +#: nix/nix-daemon/guix-daemon.cc:150 msgid "listen for connections on SOCKET" msgstr "侦听 <套接字> 上的链接" -#: nix/nix-daemon/guix-daemon.cc:141 +#: nix/nix-daemon/guix-daemon.cc:152 msgid "produce debugging output" msgstr "生成调试输出" -#: nix/nix-daemon/guix-daemon.cc:201 -#, c-format -msgid "error: %s: invalid number of rounds\n" -msgstr "" +#~ msgid "unrecognized option: ~a~%" +#~ msgstr "无法识别的选项: ~a~%" -#: nix/nix-daemon/guix-daemon.cc:220 nix/nix-daemon/guix-daemon.cc:396 -#, c-format -msgid "error: %s\n" -msgstr "错误：%s\n" +#~ msgid "~A: unexpected argument~%" +#~ msgstr "~A: 未预期的参数~%" -#: nix/nix-daemon/guix-daemon.cc:281 -#, c-format -msgid "error: libgcrypt version mismatch\n" -msgstr "错误：libgcrypt 版本不匹配\n" +#, fuzzy +#~| msgid "failed to connect to `~a': ~a~%" +#~ msgid "failed to lookup NIST host: ~a~%" +#~ msgstr "连接到 `~a' 失败：~a~%" -#: nix/nix-daemon/guix-daemon.cc:372 -#, c-format -msgid "warning: daemon is running as root, so using `--build-users-group' is highly recommended\n" -msgstr "" +#~ msgid "too many arguments\n" +#~ msgstr "太多参数\n" -#~ msgid "looking for the latest release of GNU ~a..." -#~ msgstr "寻找最新版的 GNU~a..." +#~ msgid "error: %s\n" +#~ msgstr "错误：%s\n" + +#~ msgid "error: libgcrypt version mismatch\n" +#~ msgstr "错误：libgcrypt 版本不匹配\n" #~ msgid "~a: note: using ~a but ~a is available upstream~%" #~ msgstr "~a: 注意: 使用 ~a 但 ~a 在上游可用~%" - -#~ msgid "~a: package not found~%" -#~ msgstr "~a: 包未找到~%" |