diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-06-03 17:51:21 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-03 17:51:21 +0200 |
commit | d0c45d2d822fdf31b8a8edc73fe7be12a0676705 (patch) | |
tree | 04ae8108a67013fce99273db4582c29e7845f0a7 /gnu/packages/regex.scm | |
parent | 0b70f7d557181febd80b16c8e3a03887df3871af (diff) | |
parent | ac1560f18c25e4312c1f32c001405c176daa1764 (diff) | |
download | guix-d0c45d2d822fdf31b8a8edc73fe7be12a0676705.tar guix-d0c45d2d822fdf31b8a8edc73fe7be12a0676705.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
(incorporated libtiff graft)
Diffstat (limited to 'gnu/packages/regex.scm')
-rw-r--r-- | gnu/packages/regex.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 2b32aa3381..18b7a7ed79 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -28,7 +28,7 @@ (define-public re2 (package (name "re2") - (version "2017-05-01") + (version "2017-06-01") (source (origin (method url-fetch) (uri @@ -38,7 +38,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "19glvic4ipd122yhcavf7ifg7ms5k61398vq7gyb90wggf2w0z9k")))) + "0bjhmmcx17mc8gfbf3cc4bwjcyf415mas3026v3c35g5fsaxyq5v")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) |