diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
commit | 829ecd002e70682d11a22e26a7fe7e87248a8fec (patch) | |
tree | 0e44e654b30809882b2b1a7a9f5a67d23bb2bd3e /gnu/packages/parallel.scm | |
parent | 3bb33e24bb495d78e6be663b5763245a1d63bc90 (diff) | |
parent | 65f7c35d02175806f676b8e130236dd3e6c8ec60 (diff) | |
download | guix-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar.gz |
Merge branch 'master' into core-updates
Conflicts: gnu/packages/libwebsockets.scm
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 684ef1821e..175b066113 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -27,7 +27,7 @@ (define-public parallel (package (name "parallel") - (version "20140122") + (version "20140222") (source (origin (method url-fetch) @@ -35,7 +35,7 @@ version ".tar.bz2")) (sha256 (base32 - "17y72p7qwr7n0qy9nzxwhcn3q47829fd0d69gql2x6szlsxkk0xi")))) + "0zb3hg92br6a53jn0pzfl16ffc1hfw81jk7nzw5spkshsdrcqx3y")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (home-page "http://www.gnu.org/software/parallel/") |