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/parallel.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/parallel.scm')
| -rw-r--r-- | gnu/packages/parallel.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 66b67eac6d..c1f962a4b6 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -45,7 +45,7 @@ (define-public parallel (package (name "parallel") - (version "20170422") + (version "20170522") (source (origin (method url-fetch) @@ -53,7 +53,7 @@ version ".tar.bz2")) (sha256 (base32 - "0afk1q8mqzz02h6imyykgi9gwk5gj08hzs6lwgd65ilj4slkh93s")))) + "1k5wlcc0dr2fxna0vi48s0l6pvbyl4pbclbih4103f1155im23ca")))) (build-system gnu-build-system) (arguments `(#:phases |