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/cpp.scm | |
| parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
| parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
| download | patches-18af6870370226b4d502d7372844e7f2aded5887.tar patches-18af6870370226b4d502d7372844e7f2aded5887.tar.gz | |
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/cpp.scm')
| -rw-r--r-- | gnu/packages/cpp.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 0c5692b125..ce816a528a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> +;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -444,7 +445,7 @@ point and then, after each tween step, plugging back the result.") (define-public abseil-cpp (package (name "abseil-cpp") - (version "20200225") + (version "20200225.1") (source (origin (method git-fetch) (uri (git-reference @@ -453,7 +454,7 @@ point and then, after each tween step, plugging back the result.") (file-name (git-file-name name version)) (sha256 (base32 - "0wb04pszzrl39ny1pz9jvvq8lbbm355dd60jspcyqfwxnk6njgd1")))) + "035bffayslawc19q2gmlkr6n6r7k7mvriaq7352rv6gyzaplr98w")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" |