summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/guix.texi4
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/bash.scm5
-rw-r--r--gnu/packages/bioinformatics.scm67
-rw-r--r--gnu/packages/compression.scm19
-rw-r--r--gnu/packages/crypto.scm2
-rw-r--r--gnu/packages/dns.scm13
-rw-r--r--gnu/packages/enlightenment.scm5
-rw-r--r--gnu/packages/freedesktop.scm4
-rw-r--r--gnu/packages/guile.scm116
-rw-r--r--gnu/packages/haskell.scm13
-rw-r--r--gnu/packages/image.scm4
-rw-r--r--gnu/packages/imagemagick.scm4
-rw-r--r--gnu/packages/irc.scm4
-rw-r--r--gnu/packages/linux.scm20
-rw-r--r--gnu/packages/onc-rpc.scm8
-rw-r--r--gnu/packages/openstack.scm8
-rw-r--r--gnu/packages/patches/bash-completion-directories.patch8
-rw-r--r--gnu/packages/patches/libtirpc-missing-headers.patch40
-rw-r--r--gnu/packages/python-crypto.scm19
-rw-r--r--gnu/packages/statistics.scm4
-rw-r--r--gnu/packages/terminals.scm17
-rw-r--r--gnu/packages/tls.scm6
-rw-r--r--gnu/packages/web.scm6
-rw-r--r--gnu/packages/xdisorg.scm4
-rw-r--r--gnu/packages/xml.scm8
-rw-r--r--gnu/services/mcron.scm8
-rw-r--r--gnu/tests/base.scm4
28 files changed, 191 insertions, 230 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index b768b20d6b..4de8e9cb5a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10479,7 +10479,7 @@ gexps to introduce job definitions that are passed to mcron
for more information on mcron job specifications. Below is the
reference of the mcron service.
-@deffn {Scheme Procedure} mcron-service @var{jobs} [#:mcron @var{mcron2}]
+@deffn {Scheme Procedure} mcron-service @var{jobs} [#:mcron @var{mcron}]
Return an mcron service running @var{mcron} that schedules @var{jobs}, a
list of gexps denoting mcron job specifications.
@@ -10504,7 +10504,7 @@ mcron jobs to run.
Data type representing the configuration of mcron.
@table @asis
-@item @code{mcron} (default: @var{mcron2})
+@item @code{mcron} (default: @var{mcron})
The mcron package to use.
@item @code{jobs}
diff --git a/gnu/local.mk b/gnu/local.mk
index 61566d57d9..686595cd58 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -867,7 +867,6 @@ dist_patch_DATA = \
%D%/packages/patches/libtasn1-CVE-2017-10790.patch \
%D%/packages/patches/libtasn1-CVE-2018-6003.patch \
%D%/packages/patches/libtheora-config-guess.patch \
- %D%/packages/patches/libtirpc-missing-headers.patch \
%D%/packages/patches/libtiff-CVE-2017-9935.patch \
%D%/packages/patches/libtiff-CVE-2017-18013.patch \
%D%/packages/patches/libtool-skip-tests2.patch \
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index b8b0ae58f6..b98ffe1c12 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -263,7 +264,7 @@ without modification.")
(define-public bash-completion
(package
(name "bash-completion")
- (version "2.7")
+ (version "2.8")
(source (origin
(method url-fetch)
(uri (string-append
@@ -271,7 +272,7 @@ without modification.")
version "/" name "-" version ".tar.xz"))
(sha256
(base32
- "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1"))
+ "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0"))
(patches
(search-patches "bash-completion-directories.patch"))))
(build-system gnu-build-system)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 78754793a5..a3de3f6412 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -8434,7 +8434,7 @@ paired-end data.")
("r-testthat" ,r-testthat)
;; During vignette building knitr checks that "pandoc-citeproc"
;; is in the PATH.
- ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc)))
+ ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1)))
(propagated-inputs
`(("r-data-table" ,r-data-table)
("r-biomart" ,r-biomart)
@@ -11514,7 +11514,7 @@ Browser.")
(delete 'configure)
(delete 'build)
(replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out")
"/bin"))
(docdir (string-append (assoc-ref outputs "out")
@@ -11537,7 +11537,16 @@ Browser.")
scripts)
(for-each (lambda (file) (install-file file docdir))
docs)
+ ;; Fix references to gunzip
+ (substitute* (map (lambda (file)
+ (string-append bin "/" file))
+ scripts)
+ (("\"gunzip -c")
+ (string-append "\"" (assoc-ref inputs "gzip")
+ "/bin/gunzip -c")))
#t))))))
+ (inputs
+ `(("gzip" ,gzip)))
(home-page "http://www.bioinformatics.babraham.ac.uk/projects/bismark/")
(synopsis "Map bisulfite treated sequence reads and analyze methylation")
(description "Bismark is a program to map bisulfite treated sequencing
@@ -12663,7 +12672,7 @@ once. This package provides tools to perform Drop-seq analyses.")
(define-public pigx-rnaseq
(package
(name "pigx-rnaseq")
- (version "0.0.2")
+ (version "0.0.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_rnaseq/"
@@ -12671,7 +12680,7 @@ once. This package provides tools to perform Drop-seq analyses.")
"/pigx_rnaseq-" version ".tar.gz"))
(sha256
(base32
- "168hx2ig3rarphx3l21ay9yyg8ipaakzixnrhpbdi0sknhyvrrk8"))))
+ "0pz080k4ajlc4rlznkn3najy2a6874gb56rf9g4ag9wqz31q174j"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-tests? #f ; not supported
@@ -12693,7 +12702,8 @@ once. This package provides tools to perform Drop-seq analyses.")
`("PYTHONPATH" ":" = (,(getenv "PYTHONPATH")))))
#t)))))
(inputs
- `(("snakemake" ,snakemake)
+ `(("gzip" ,gzip)
+ ("snakemake" ,snakemake)
("fastqc" ,fastqc)
("multiqc" ,multiqc)
("star" ,star)
@@ -12720,8 +12730,8 @@ once. This package provides tools to perform Drop-seq analyses.")
("r-rtracklayer" ,r-rtracklayer)
("r-rjson" ,r-rjson)
("salmon" ,salmon)
- ("ghc-pandoc" ,ghc-pandoc)
- ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc)
+ ("ghc-pandoc" ,ghc-pandoc-1)
+ ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1)
("python-wrapper" ,python-wrapper)
("python-pyyaml" ,python-pyyaml)))
(home-page "http://bioinformatics.mdc-berlin.de/pigx/")
@@ -12737,7 +12747,7 @@ expression report comparing samples in an easily configurable manner.")
(define-public pigx-chipseq
(package
(name "pigx-chipseq")
- (version "0.0.2")
+ (version "0.0.8")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/"
@@ -12745,10 +12755,11 @@ expression report comparing samples in an easily configurable manner.")
"/pigx_chipseq-" version ".tar.gz"))
(sha256
(base32
- "1jliwhifnjgl9x0z730bzpxswi2s84fyg5y8cagbyzpw509452f5"))))
+ "1plw0bz0b7flj0g9irbn8n520005lmajkiq5flpizzapsl0a0r9g"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
+ `(#:tests? #f ; parts of the tests rely on access to the network
+ #:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-executable
;; Make sure the executable finds all R modules.
@@ -12773,13 +12784,16 @@ expression report comparing samples in an easily configurable manner.")
("r-ggplot2" ,r-ggplot2)
("r-plotly" ,r-plotly)
("python-wrapper" ,python-wrapper)
+ ("python-magic" ,python-magic)
("python-pyyaml" ,python-pyyaml)
+ ("python-xlrd" ,python-xlrd)
("snakemake" ,snakemake)
+ ("trim-galore" ,trim-galore)
("macs" ,macs)
("multiqc" ,multiqc)
("perl" ,perl)
- ("ghc-pandoc" ,ghc-pandoc)
- ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc)
+ ("ghc-pandoc" ,ghc-pandoc-1)
+ ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1)
("fastqc" ,fastqc)
("bowtie" ,bowtie)
("idr" ,idr)
@@ -12803,7 +12817,7 @@ in an easily configurable manner.")
(define-public pigx-bsseq
(package
(name "pigx-bsseq")
- (version "0.0.5")
+ (version "0.0.7")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_bsseq/"
@@ -12811,7 +12825,7 @@ in an easily configurable manner.")
"/pigx_bsseq-" version ".tar.gz"))
(sha256
(base32
- "1h8ma99vi7hs83nafvjpq8jmaq9977j3n11c4zd95hai0cf7zxmp"))))
+ "0pw797gxx6x1n56lyrvglj7q5hqq4ylfqkvlcrzq1z3j5lxcyl69"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -12835,7 +12849,10 @@ in an easily configurable manner.")
(native-inputs
`(("tzdata" ,tzdata)))
(inputs
- `(("r-minimal" ,r-minimal)
+ `(("coreutils" ,coreutils)
+ ("sed" ,sed)
+ ("grep" ,grep)
+ ("r-minimal" ,r-minimal)
("r-annotationhub" ,r-annotationhub)
("r-dt" ,r-dt)
("r-genomation" ,r-genomation)
@@ -12845,8 +12862,8 @@ in an easily configurable manner.")
("r-bookdown" ,r-bookdown)
("r-ggplot2" ,r-ggplot2)
("r-ggbio" ,r-ggbio)
- ("ghc-pandoc" ,ghc-pandoc)
- ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc)
+ ("ghc-pandoc" ,ghc-pandoc-1)
+ ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1)
("python-wrapper" ,python-wrapper)
("python-pyyaml" ,python-pyyaml)
("snakemake" ,snakemake)
@@ -12867,7 +12884,7 @@ methylation and segmentation.")
(define-public pigx-scrnaseq
(package
(name "pigx-scrnaseq")
- (version "0.0.2")
+ (version "0.0.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_scrnaseq/"
@@ -12875,7 +12892,7 @@ methylation and segmentation.")
"/pigx_scrnaseq-" version ".tar.gz"))
(sha256
(base32
- "03gwp83823ji59y6nvyz89i4yd3faaqpc3791qia71i91470vfsg"))))
+ "12qdq0nj1wdkyighdxj6924bmbpd1a0b3gam6w64l4hiqrv5sijz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -12894,7 +12911,9 @@ methylation and segmentation.")
`("PYTHONPATH" ":" = (,(getenv "PYTHONPATH")))))
#t)))))
(inputs
- `(("dropseq-tools" ,dropseq-tools)
+ `(("coreutils" ,coreutils)
+ ("perl" ,perl)
+ ("dropseq-tools" ,dropseq-tools)
("fastqc" ,fastqc)
("java-picard" ,java-picard)
("java" ,icedtea-8)
@@ -12903,8 +12922,8 @@ methylation and segmentation.")
("python-pandas" ,python-pandas)
("python-numpy" ,python-numpy)
("python-loompy" ,python-loompy)
- ("ghc-pandoc" ,ghc-pandoc)
- ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc)
+ ("ghc-pandoc" ,ghc-pandoc-1)
+ ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1)
("snakemake" ,snakemake)
("star" ,star)
("r-minimal" ,r-minimal)
@@ -12944,7 +12963,7 @@ based methods.")
(define-public pigx
(package
(name "pigx")
- (version "0.0.1")
+ (version "0.0.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx/"
@@ -12952,7 +12971,7 @@ based methods.")
"/pigx-" version ".tar.gz"))
(sha256
(base32
- "1nxb2hbp40yg3j7n56k4dhsd2fl1j8g0wpiiln56prqzljwnlgmf"))))
+ "0sb708sl42h3s5z872jb1w70bbqplwapnsc1wm27zcsvi7li4gw8"))))
(build-system gnu-build-system)
(inputs
`(("python" ,python)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index f92239d505..26decfaf84 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1807,16 +1807,15 @@ recreates the stored directory structure by default.")
(define-public zziplib
(package
(name "zziplib")
- (version "0.13.68")
+ (version "0.13.69")
+ (home-page "https://github.com/gdraheim/zziplib")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/zziplib/zziplib13/"
- version "/zziplib-"
- version ".tar.bz2"))
+ (uri (string-append home-page "/archive/v" version ".tar.gz"))
(sha256
(base32
- "1s0wz1hf2q4qxcp4lkg4rzpbz2814xagmvlyicqdj0ww0cvxv036"))))
+ "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"))))
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)))
@@ -1826,16 +1825,12 @@ recreates the stored directory structure by default.")
;; http://forums.gentoo.org/viewtopic-t-863161-start-0.html
("python" ,python-2)
("zip" ,zip))) ; to create test files
- (arguments
- ;; XXX: "make check" is broken, and the alternative (test/zziptests.py)
- ;; requires network access. See <https://github.com/gdraheim/zziplib/issues/20>
- ;; and <https://github.com/gdraheim/zziplib/issues/24>.
- `(#:tests? #f))
- (home-page "http://zziplib.sourceforge.net/")
(synopsis "Library for accessing zip files")
(description
"ZZipLib is a library based on zlib for accessing zip files.")
- (license license:lgpl2.0+)))
+ ;; zziplib is dual licensed under LGPL2.0+ and MPL1.1. Some example source
+ ;; files carry the Zlib license; see "docs/copying.html" for details.
+ (license (list license:lgpl2.0+ license:mpl1.1))))
(define-public perl-archive-zip
(package
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 7716205947..84a3b7876f 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -576,7 +576,7 @@ cryptographically-secure replacement for Perl's built-in @code{rand} function.
@item No matter how many numbers you see generated by the random number
generator, you cannot guess the future numbers, and you cannot guess the seed.
@item There are so many possible seeds that it would take decades, centuries,
-or millenia for an attacker to try them all.
+or millennia for an attacker to try them all.
@item The seed comes from a source that generates relatively strong random
data on your platform, so the seed itself will be as random as possible.
@end enumerate\n")
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index d093b0d9b5..bd61784ebd 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -59,7 +59,7 @@
(define-public dnsmasq
(package
(name "dnsmasq")
- (version "2.78")
+ (version "2.79")
(source (origin
(method url-fetch)
(uri (string-append
@@ -67,7 +67,7 @@
version ".tar.xz"))
(sha256
(base32
- "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"))))
+ "07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -79,16 +79,15 @@
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc"
"COPTS=\"-DHAVE_DBUS\"")
- ;; No 'check' target.
- #:tests? #f))
+ #:tests? #f)) ; no ‘check’ target
(home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html")
(synopsis "Small caching DNS proxy and DHCP/TFTP server")
(description
- "Dnsmasq is a lightweight DNS forwarder and DHCP server. It is designed
-to provide DNS and optionally, DHCP, to a small network. It can serve the
+ "Dnsmasq is a light-weight DNS forwarder and DHCP server. It is designed
+to provide DNS and, optionally, DHCP to a small network. It can serve the
names of local machines which are not in the global DNS. The DHCP server
integrates with the DNS server and allows machines with DHCP-allocated
-addresses to appear in the DNS with names configured either in each host or in
+addresses to appear in the DNS with names configured either on each host or in
a central configuration file. Dnsmasq supports static and dynamic DHCP leases
and BOOTP/TFTP for network booting of diskless machines.")
;; Source files only say GPL2 and GPL3 are allowed.
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index a0bf841415..c04493a192 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 ng0 <ng0@infotropique.org>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -258,7 +259,7 @@ Libraries with some extra bells and whistles.")
(define-public enlightenment
(package
(name "enlightenment")
- (version "0.22.1")
+ (version "0.22.2")
(source (origin
(method url-fetch)
(uri
@@ -266,7 +267,7 @@ Libraries with some extra bells and whistles.")
name "/" name "-" version ".tar.xz"))
(sha256
(base32
- "1q57fz57d0b26z06m1wiq7c1sniwh885b0vs02mk4jgwva46nyr0"))))
+ "0b33w75s4w7xmz9cv8dyp8vy2gcffnrvjys20fhcpw26abw1wn2d"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-mount-eeze")
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 202ccc2ba2..91eb37fb7a 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1141,7 +1141,7 @@ manually by a user.")
(define-public perl-file-basedir
(package
(name "perl-file-basedir")
- (version "0.07")
+ (version "0.08")
(source
(origin
(method url-fetch)
@@ -1149,7 +1149,7 @@ manually by a user.")
"File-BaseDir-" version ".tar.gz"))
(sha256
(base32
- "0aq8d4hsaxqibp36f773y6dfck7zd82v85sp8vhi6pjkg3pmf2hj"))))
+ "1qq5ag9zffx8zc5i9b4z03ar80pqj4drgk3vjdlyfapjwb9zqrf0"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index ddd34ae7dc..33ef822b16 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -662,18 +662,51 @@ library.")
(define-public mcron
(package
(name "mcron")
- (version "1.0.8")
+ (version "1.1")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/mcron/mcron-"
- version ".tar.gz"))
- (sha256
- (base32
- "0zparwgf01jgl1x53ik71ghabldq6zz18ha4dscps1i0qrzgap1b"))
- (patches (search-patches "mcron-install.patch"))))
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/mcron/mcron-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1f547sqqfbp0k02sqk4ivwx8y9mx8l0rrx1c9rrj033av073h6xq"))))
(build-system gnu-build-system)
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.0)))
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'check 'set-timezone
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; 'tests/schedule.sh' expects to be running in UTC+1.
+ (let ((tzdata (assoc-ref inputs "tzdata")))
+ (setenv "TZDIR"
+ (string-append tzdata
+ "/share/zoneinfo"))
+ (setenv "TZ" "UTC+1")
+ #t)))
+ (add-before 'check 'disable-schedule-test
+ (lambda _
+ ;; But! As it turns out, that test additionally relies
+ ;; on non-deterministic behavior; see
+ ;; <https://lists.gnu.org/archive/html/bug-mcron/2018-03/msg00001.html>.
+ (substitute* "tests/schedule.sh"
+ (("mkdir cron") "exit 77\n"))
+ #t))
+ (add-after 'install 'wrap-programs
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; By default mcron doesn't have its own modules in the
+ ;; search path, so the 'mcron' command fails to start.
+ (let* ((output (assoc-ref outputs "out"))
+ (modules (string-append output
+ "/share/guile/site/2.2"))
+ (go (string-append output
+ "/lib/guile/2.2/site-ccache")))
+ (wrap-program (string-append output "/bin/mcron")
+ `("GUILE_LOAD_PATH" ":" prefix
+ (,modules))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go)))
+ #t))))))
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("tzdata" ,tzdata-for-tests)))
+ (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.2)))
(home-page "https://www.gnu.org/software/mcron/")
(synopsis "Run jobs at scheduled times")
(description
@@ -684,67 +717,8 @@ format is also supported.")
(license license:gpl3+)))
(define-public mcron2
- ;; This is mthl's mcron development branch, not yet merged in mcron.
- (let ((commit "31baff1a5187d8ddc89324cbe42dbeffc309c962"))
- (package
- (inherit mcron)
- (name "mcron2")
- (version (string-append (package-version mcron) "-0."
- (string-take commit 7)))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://notabug.org/mthl/mcron/")
- (commit commit)))
- (sha256
- (base32
- "1h5wxy997hxi718hpx419c23q09939kbxrjbbq54lv0cgw1bb63z"))
- (file-name (string-append name "-" version "-checkout"))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo)
- ("help2man" ,help2man)))
- (inputs
- `(("guile-2.2" ,guile-2.2)
- ,@(srfi-1:alist-delete "guile" (package-inputs mcron))))
- (arguments
- `(#:modules ((ice-9 match) (ice-9 ftw)
- ,@%gnu-build-system-modules)
- ;; When building the targets in parallel, help2man tries to generate
- ;; the manpage from ./cron --help before it is built, which fails.
- #:parallel-build? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'use-guile-2.2
- (lambda _
- (substitute* "configure.ac"
- (("PKG_CHECK_MODULES\\(\\[GUILE\\],.*$")
- "PKG_CHECK_MODULES([GUILE], [guile-2.2])\n")
- (("guile/site/2.0")
- "guile/site/2.2"))
- #t))
- (add-after 'use-guile-2.2 'bootstrap
- (lambda _
- (invoke "autoreconf" "-vfi")))
- (add-after 'install 'wrap-mcron
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Wrap the 'mcron' command to refer to the right
- ;; modules.
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (site (string-append
- out "/share/guile/site")))
- (match (scandir site)
- (("." ".." version)
- (let ((modules (string-append site "/" version)))
- (wrap-program (string-append bin "/mcron")
- `("GUILE_LOAD_PATH" ":" prefix
- (,modules))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix
- (,modules)))
- #t))))))))))))
+ ;; This was mthl's mcron development branch, and it became mcron 1.1.
+ (deprecated-package "mcron2" mcron))
(define-public guile-ics
(package
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 9c59f56139..d00bbea7b5 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -6396,6 +6396,19 @@ and also has a mode for converting bibliographic databases a YAML format
suitable for inclusion in pandoc YAML metadata.")
(license license:bsd-3)))
+(define-public ghc-pandoc-citeproc-with-pandoc-1
+ (let ((for-pandoc-1
+ (package-input-rewriting
+ `((,ghc-aeson . ,ghc-aeson-for-pandoc-1)
+ (,ghc-yaml . ,ghc-yaml-for-pandoc-1)
+ (,ghc-texmath . ,ghc-texmath-for-pandoc-1)
+ (,ghc-pandoc-types . ,ghc-pandoc-types-for-pandoc-1)
+ (,ghc-hslua . ,ghc-hslua-for-pandoc-1)
+ (,ghc-skylighting . ,ghc-skylighting-for-pandoc-1)
+ (,ghc-doctemplates . ,ghc-doctemplates-for-pandoc-1)
+ (,ghc-pandoc . ,ghc-pandoc-1)))))
+ (for-pandoc-1 ghc-pandoc-citeproc)))
+
(define-public ghc-union-find
(package
(name "ghc-union-find")
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index c20c34b918..f398e09a2b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -636,7 +636,7 @@ compose, and analyze GIF images.")
(define-public imlib2
(package
(name "imlib2")
- (version "1.5.0")
+ (version "1.5.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -644,7 +644,7 @@ compose, and analyze GIF images.")
"/imlib2-" version ".tar.bz2"))
(sha256
(base32
- "0kg28b5wp886hiy12v7abdybrvlymb7g3nvg0ysn2y8h883s5w8m"))))
+ "1bms2iwmvnvpz5jqq3r52glarqkafif47zbh1ykz8hw85d2mfkps"))))
(build-system gnu-build-system)
(native-inputs
`(("pkgconfig" ,pkg-config)))
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index d798833742..d3cc656f11 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -47,14 +47,14 @@
;; The 7 release series has an incompatible API, while the 6 series is still
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API.
- (version "6.9.9-37")
+ (version "6.9.9-39")
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz"))
(sha256
(base32
- "1hmfw0jcpc3s3gz9zrzjy9amyrfz6gzzjdsyaw3xw994aq9qf4lq"))))
+ "0cgrvfg8722cdv2y0hw2f7xhzdfmfiqc1348l71ki38dg4b0q4sn"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index bad27dacb6..22ac3c662a 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -155,14 +155,14 @@ SILC and ICB protocols via plugins.")
(define-public weechat
(package
(name "weechat")
- (version "2.0.1")
+ (version "2.1")
(source (origin
(method url-fetch)
(uri (string-append "https://weechat.org/files/src/weechat-"
version ".tar.xz"))
(sha256
(base32
- "1l854dramvn9vfba7jpazkjwm4k4i5pshq58vjv6z2mxmcp5hhv9"))
+ "0f7d2vdbxc5kgjl7lkamnbxvidgxwa8f9j3nr9fd4gr4z0gzi86d"))
(patches (search-patches "weechat-python.patch"))))
(build-system cmake-build-system)
(native-inputs
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d63d3ba925..2e0912a8bf 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -383,8 +383,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.10")
-(define %linux-libre-hash "10fp8jmy0fxq8l01m1nnagpq1hznl9jmhcwknk8izjmdcb5snq6c")
+(define %linux-libre-version "4.15.11")
+(define %linux-libre-hash "0nrsmw7x5nsc3906dfvfakkibv8pv09r1sf5ckzbkcbkwpyq62h8")
(define-public linux-libre
(make-linux-libre %linux-libre-version
@@ -392,8 +392,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.27")
-(define %linux-libre-4.14-hash "0mgkka9niyd0lj4qliy4v7jjh9lg1a5jwlv60yw7z0s4k7ajyyrp")
+(define %linux-libre-4.14-version "4.14.28")
+(define %linux-libre-4.14-hash "0xg3zsm1yjsvxir8sz7zliz8gcc8d45xh23qyiszl75cfqjl36l3")
(define-public linux-libre-4.14
(make-linux-libre %linux-libre-4.14-version
@@ -402,14 +402,14 @@ 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.87"
- "1p8phvmxp04npzqzqcfmv8k9l5l65s7vpjcakdm0fxfkzvnswsp6"
+ (make-linux-libre "4.9.88"
+ "0qlhd8xw3g00i7krpfndkwxzjszk067h26qsxxsszvxyx2s6gp4x"
%intel-compatible-systems
#:configuration-file kernel-config))
(define-public linux-libre-4.4
- (make-linux-libre "4.4.121"
- "1d7djrhiib0ds9ssjkali6b5w6rzap4zgj5hf9jq1jmqpp54jkm4"
+ (make-linux-libre "4.4.122"
+ "1ayilv7474vsif3jpb723jbcy4kymv1fpdr96c1g743bad1wkqqq"
%intel-compatible-systems
#:configuration-file kernel-config))
@@ -2540,14 +2540,14 @@ thanks to the use of namespaces.")
(define-public hdparm
(package
(name "hdparm")
- (version "9.54")
+ (version "9.55")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/"
name "-" version ".tar.gz"))
(sha256
(base32
- "0ghnhdj7wfw6acfyhdawpfa5n9kvkvzgi1fw6i7sghgbjx5nhyjd"))))
+ "1ivdvrzimaayiq03by8mcq0mhmdljndj06h012zkdpw34irnpixm"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (let ((out (assoc-ref %outputs "out")))
diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index 03d51d9517..44400ebe57 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -33,16 +33,15 @@
(define-public libtirpc
(package
(name "libtirpc")
- (version "1.0.2")
+ (version "1.0.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/libtirpc/libtirpc/"
version "/libtirpc-"
version ".tar.bz2"))
- (patches (search-patches "libtirpc-missing-headers.patch"))
(sha256
(base32
- "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j"))))
+ "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -59,7 +58,8 @@
;; Remove the dangling symlinks since it breaks the
;; 'patch-source-shebangs' file tree traversal.
- (delete-file "INSTALL"))))))
+ (delete-file "INSTALL")
+ #t)))))
(inputs `(("mit-krb5" ,mit-krb5)))
(home-page "https://sourceforge.net/projects/libtirpc/")
(synopsis "Transport-independent Sun/ONC RPC implementation")
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index c1380a1af5..5875562aa1 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -452,14 +452,14 @@ pipeline and used by various modules such as logging.")
(define-public python-oslo.i18n
(package
(name "python-oslo.i18n")
- (version "3.19.0")
+ (version "3.20.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslo.i18n" version))
(sha256
(base32
- "18lbfq55cqrbmwm5p6vci9mkjfzr0zwz54ax3ysa463wba5m84cp"))))
+ "0kjcdw4bk3mi4vqmqwhhq053kxbbbj05si6nwxd1pzx33z067ky3"))))
(build-system python-build-system)
(propagated-inputs
`(("python-babel" ,python-babel)
@@ -680,14 +680,14 @@ and better support for mocking results.")
(define-public python-oslo.utils
(package
(name "python-oslo.utils")
- (version "3.35.0")
+ (version "3.36.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslo.utils" version))
(sha256
(base32
- "1ai9yyasyh1563khsri6ryk6iqdprmyiashg377m9h4nmv700ybx"))))
+ "0zvm31qdvqywxppqdjwbxxsqaga3dg4slpvbbmqqm9ig4n78mhay"))))
(build-system python-build-system)
(propagated-inputs
`(("python-debtcollector" ,python-debtcollector)
diff --git a/gnu/packages/patches/bash-completion-directories.patch b/gnu/packages/patches/bash-completion-directories.patch
index 351a8e02fb..164096f16c 100644
--- a/gnu/packages/patches/bash-completion-directories.patch
+++ b/gnu/packages/patches/bash-completion-directories.patch
@@ -8,9 +8,9 @@ directory, but also in the user's profile and in the system profile.
This is what this patch does.
---- a/bash_completion 2016-08-03 10:23:02.356782287 +0200
-+++ b/bash_completion 2016-08-03 10:27:50.120140403 +0200
-@@ -1960,7 +1960,13 @@
+--- a/bash_completion
++++ b/bash_completion
+@@ -2016,7 +2016,13 @@ complete -F _minimal ''
__load_completion()
{
@@ -22,6 +22,6 @@ This is what this patch does.
+ "/run/current-system/profile/etc/bash_completion.d/$base"
+ ${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions )
+
- local OIFS=$IFS IFS=: dir cmd="$1" compfile
+ local OIFS=$IFS IFS=: dir cmd="${1##*/}" compfile
for dir in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do
dirs+=( $dir/bash-completion/completions )
diff --git a/gnu/packages/patches/libtirpc-missing-headers.patch b/gnu/packages/patches/libtirpc-missing-headers.patch
deleted file mode 100644
index 5a96711820..0000000000
--- a/gnu/packages/patches/libtirpc-missing-headers.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Fix compilation failure with glibc 2.26 caused by missing type
-declarations:
-
-------
-xdr_sizeof.c: In function ‘x_inline’:
-xdr_sizeof.c:93:13: error: ‘uintptr_t’ undeclared (first use in this function)
- if (len < (uintptr_t)xdrs->x_base) {
-------
-
-Patch copied from upstream source repository:
-
-http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=acb9a37977cf0a9630eac74af9adebf35e38e719
-
-From acb9a37977cf0a9630eac74af9adebf35e38e719 Mon Sep 17 00:00:00 2001
-From: Thorsten Kukuk <kukuk@thkukuk.de>
-Date: Tue, 14 Nov 2017 10:39:08 -0500
-Subject: [PATCH] Include stdint.h from xdr_sizeof.c to avoid missing
- declaration errors.
-
-Signed-off-by: Thorsten Kukuk <kukuk@suse.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- src/xdr_sizeof.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c
-index d23fbd1..79d6707 100644
---- a/src/xdr_sizeof.c
-+++ b/src/xdr_sizeof.c
-@@ -39,6 +39,7 @@
- #include <rpc/xdr.h>
- #include <sys/types.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include "un-namespace.h"
-
- /* ARGSUSED */
---
-1.8.3.1
-
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 3734b6ba10..3fbaf1c3c4 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -122,14 +122,14 @@ John the Ripper).")
(define-public python-paramiko
(package
(name "python-paramiko")
- (version "2.1.2")
+ (version "2.1.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "paramiko" version))
(sha256
(base32
- "04734n0wy3hxk6rij4fr29in5jmr70nxpc7pqi2ksbjysfz4kbjz"))))
+ "1pf0zxzhgyy4avby3ajg5hp18b0d8iirbkdfw53z0h6w611bp0wk"))))
(build-system python-build-system)
(arguments
'(#:phases
@@ -281,14 +281,14 @@ is used by the Requests library to verify HTTPS requests.")
(define-public python-cryptography-vectors
(package
(name "python-cryptography-vectors")
- (version "2.1.4")
+ (version "2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography_vectors" version))
(sha256
(base32
- "1jm5c33qaz297sf99kz9kw8xi792ap9m6bwf0dfylls8z3rv9i3q"))))
+ "03cpmi5azvipphmva7dxv8k3w7ffblvn5452rs5r6smdhxyiqq6g"))))
(build-system python-build-system)
(home-page "https://github.com/pyca/cryptography")
(synopsis "Test vectors for the cryptography package")
@@ -303,14 +303,14 @@ is used by the Requests library to verify HTTPS requests.")
(define-public python-cryptography
(package
(name "python-cryptography")
- (version "2.1.4")
+ (version "2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography" version))
(sha256
(base32
- "14aj5ipbj1w5kba2hv6323954pachhflfrjhhmkjwssv3hvngng4"))))
+ "0j2gwr4qxvskip77z4n9nqvr4vi243n3bzij18ay4drc6sg2g87m"))))
(build-system python-build-system)
(inputs
`(("openssl" ,openssl)))
@@ -556,7 +556,7 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.")
(define-public python-pynacl
(package
(name "python-pynacl")
- (version "1.1.2")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
@@ -566,7 +566,7 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.")
(snippet '(delete-file-recursively "src/libsodium"))
(sha256
(base32
- "135gz0020fqx8fbr9izpwyq49aww202nkqacq0cw61xz99sjpx9j"))))
+ "01vjq0pxyw1mxaqy013hzs8nknmvg3kpzlzmh69jxznyipgvria5"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -576,7 +576,8 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.")
(setenv "SODIUM_INSTALL" "system")
#t)))))
(native-inputs
- `(("python-pytest" ,python-pytest)))
+ `(("python-hypothesis" ,python-hypothesis)
+ ("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-cffi" ,python-cffi)
("python-six" ,python-six)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 8afccb0737..19a05ea10b 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2358,13 +2358,13 @@ tools to simplify the devolpment of R packages.")
(define-public r-withr
(package
(name "r-withr")
- (version "2.1.1")
+ (version "2.1.2")
(source (origin
(method url-fetch)
(uri (cran-uri "withr" version))
(sha256
(base32
- "17pbllxv18gf1mli9mm5px4wzp364907a4wrl20r1y5q8qwawpxx"))))
+ "11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"))))
(build-system r-build-system)
(home-page "https://github.com/jimhester/withr")
(synopsis "Run code with temporarily modified global state")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 6540a9feaf..6f3453670c 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 David Craven <david@craven.ch>
@@ -65,22 +65,21 @@
(define-public tilda
(package
(name "tilda")
- (version "1.3.3")
+ (version "1.4.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/lanoxx/tilda/archive/"
"tilda-" version ".tar.gz"))
(sha256
(base32
- "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki"))))
+ "0w2hry2bqcqrkik4l100b1a9jlsih6sq8zwhfpl8zzfq20i00lfs"))))
(build-system glib-or-gtk-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'patch-source-shebangs 'autogen
- (lambda _ ; Avoid running ./configure.
- (substitute* "autogen.sh"
- (("^.*\\$srcdir/configure.*") ""))
- (zero? (system* "sh" "autogen.sh")))))))
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'patch-source-shebangs 'bootstrap
+ (lambda _
+ (setenv "NOCONFIGURE" "true")
+ (invoke "sh" "autogen.sh"))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index bd86b2e0d9..299ac85dc9 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -512,13 +512,13 @@ netcat implementation that supports TLS.")
(package
(name "python-acme")
;; Remember to update the hash of certbot when updating python-acme.
- (version "0.22.0")
+ (version "0.22.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "acme" version))
(sha256
(base32
- "1s2zamyb99zdyga3c75xxgnj0z2hixw8wv24v1l4p49fncnxab2a"))))
+ "0cbw062xmaqhmdb5d04d2xs9aacmq1i7yvnd37gw1d71qgxlnmsz"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -567,7 +567,7 @@ netcat implementation that supports TLS.")
(uri (pypi-uri name version))
(sha256
(base32
- "1cyb3lhxrw7ghyhrl2wc95vqhdaxz6n4pai66c573gcly7c7sc7f"))))
+ "1d9abvlwi2d4d991dakds7jyrzxcsqkl13sd0clkriav9cdqwhv4"))))
(build-system python-build-system)
(arguments
`(,@(substitute-keyword-arguments (package-arguments python-acme)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index fc8e380a5b..51640ea097 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4056,14 +4056,14 @@ a pure C99 library.")
(define-public uwsgi
(package
(name "uwsgi")
- (version "2.0.15")
+ (version "2.0.17")
(source (origin
(method url-fetch)
- (uri (string-append "http://projects.unbit.it/downloads/uwsgi-"
+ (uri (string-append "https://projects.unbit.it/downloads/uwsgi-"
version ".tar.gz"))
(sha256
(base32
- "1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp"))))
+ "1wlbaairsmhp6bx5wv282q9pgh6w7w6yrb8vxjznfaxrinsfkhix"))))
(build-system gnu-build-system)
(outputs '("out" "python"))
(arguments
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index de832d5368..2db5b3d896 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1101,7 +1101,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.")
(define-public rofi
(package
(name "rofi")
- (version "1.5.0")
+ (version "1.5.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/DaveDavenport/rofi/"
@@ -1109,7 +1109,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.")
version "/rofi-" version ".tar.xz"))
(sha256
(base32
- "0li2hl55sxzdpbxxiwgxsvkhyy6bh8qd2j1r8xh8y6q8a318zsz9"))))
+ "10r1jd3h5i22pdr619hmvxv6dhzf9i13j50c28g7yffdggx8ncjg"))))
(build-system gnu-build-system)
(inputs
`(("pango" ,pango)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 212b1c8e8a..ab7b9bf986 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -560,7 +560,7 @@ callback.")
(define-public perl-xml-simple
(package
(name "perl-xml-simple")
- (version "2.22")
+ (version "2.25")
(source (origin
(method url-fetch)
(uri (string-append
@@ -568,7 +568,7 @@ callback.")
version ".tar.gz"))
(sha256
(base32
- "0jgbk30jizafpl7078jhw1di1yh08gf8d85dsvjllr595vr0widr"))))
+ "1y6vh328zrh085d40852v4ij2l4g0amxykswxd1nfhd2pspds7sk"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-xml-parser" ,perl-xml-parser)
@@ -707,14 +707,14 @@ a schema.")
(define-public perl-xml-compile-soap
(package
(name "perl-xml-compile-soap")
- (version "3.21")
+ (version "3.24")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/"
"XML-Compile-SOAP-" version ".tar.gz"))
(sha256
(base32
- "0rxidh7kjyhnw2y789bqbwccnp8n0m3xskn524y9c752s64qpjcz"))))
+ "0pkcph562l2ij7rlwlvm58v6y062qsbydfpaz2qnph2ixqy0xfd1"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-file-slurp-tiny" ,perl-file-slurp-tiny)
diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm
index b6cb8bc726..5bee02a587 100644
--- a/gnu/services/mcron.scm
+++ b/gnu/services/mcron.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,7 +20,7 @@
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu services shepherd)
- #:autoload (gnu packages guile) (mcron2)
+ #:autoload (gnu packages guile) (mcron)
#:use-module (guix records)
#:use-module (guix gexp)
#:use-module (srfi srfi-1)
@@ -53,7 +53,7 @@
make-mcron-configuration
mcron-configuration?
(mcron mcron-configuration-mcron ;package
- (default mcron2))
+ (default mcron))
(jobs mcron-configuration-jobs ;list of <mcron-job>
(default '())))
@@ -100,7 +100,7 @@
jobs)))))
(default-value (mcron-configuration)))) ;empty job list
-(define* (mcron-service jobs #:optional (mcron mcron2))
+(define* (mcron-service jobs #:optional (mcron mcron))
"Return an mcron service running @var{mcron} that schedules @var{jobs}, a
list of gexps denoting mcron job specifications.
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 378c7ff021..63d2789cc5 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -477,7 +477,7 @@ in a loop. See <http://bugs.gnu.org/26931>.")
(define %mcron-os
;; System with an mcron service, with one mcron job for "root" and one mcron
- ;; job for an unprivileged user (note: #:user is an 'mcron2' thing.)
+ ;; job for an unprivileged user.
(let ((job1 #~(job next-second-from
(lambda ()
(call-with-output-file "witness"