diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /gnu/packages/distributed.scm | |
parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'gnu/packages/distributed.scm')
-rw-r--r-- | gnu/packages/distributed.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm index c5207aace4..e1e6636219 100644 --- a/gnu/packages/distributed.scm +++ b/gnu/packages/distributed.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Brant Gardner <brantcgardner@brantware.com> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,7 +44,7 @@ (define-public boinc-client (package (name "boinc-client") - (version "7.16.4") + (version "7.16.5") (source (origin (method git-fetch) (uri (git-reference @@ -54,7 +55,7 @@ (file-name (git-file-name "boinc" version)) (sha256 (base32 - "08xx2kzb7c46k1zb91w74kyig3b5kilxdw5ilfs67r8p55mxk0g1")))) + "107rpw9qd5x4pyxm9jd1lqxva5nxwb01dm5h61d6msv2vgiy0r8n")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-server"))) (inputs `(("openssl" ,openssl) @@ -88,9 +89,9 @@ resources). It supports virtualized, parallel, and GPU-based applications.") #:tests? #f)) ; FIXME: Looks like bad test syntax in the ; source package, 2 tests fail. Disable for ; now. - (inputs `(("openssl" ,openssl) + (inputs `(("openssl" ,openssl-1.0) ("curl" ,curl) - ("mariadb" ,mariadb) + ("mariadb:dev" ,mariadb "dev") ("zlib" ,zlib))) (propagated-inputs `(("python" ,python-wrapper) ("perl" ,perl))))) |