Merge branch 'master' into core-updates

This commit is contained in:
Leo Famulari 2017-07-23 03:42:12 -04:00
commit 6c1a317e29
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
132 changed files with 5502 additions and 1723 deletions

View file

@ -34,6 +34,7 @@
(package
(name "pcre")
(version "8.40")
(replacement pcre-8.41)
(source (origin
(method url-fetch)
(uri (list
@ -72,6 +73,21 @@ POSIX regular expression API.")
(license license:bsd-3)
(home-page "http://www.pcre.org/")))
(define pcre-8.41
(package
(inherit pcre)
(version "8.41")
(source (origin
(method url-fetch)
(uri (list (string-append "mirror://sourceforge/pcre/pcre/"
version "/pcre-" version ".tar.bz2")
(string-append "ftp://ftp.csx.cam.ac.uk"
"/pub/software/programming/pcre/"
"pcre-" version ".tar.bz2")))
(sha256
(base32
"0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76"))))))
(define-public pcre2
(package
(name "pcre2")