summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-11-03 15:06:55 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-11-06 00:08:04 -0400
commit451d2802f6471d1a5f2eea08ae7ce2ad8747f797 (patch)
tree4713e5eb96f9efd7a0adb3587368600c64634f25 /gnu
parent76b86238acbe462427df670a287b004cbc9a49af (diff)
gnu: fmt: Update to 9.1.0.
* gnu/packages/pretty-print.scm (fmt): Update to 9.1.0. (fmt-8): New variable. * gnu/packages/hyperledger.scm (hyperledger-iroha) [snippet]: Delete trailing #t. [native-inputs]: Re-indent. Replace fmt with fmt-8. * gnu/packages/networking.scm (opendht) [inputs]: Replace fmt with fmt-8. * gnu/packages/storage.scm (ceph): Likewise. * gnu/packages/video.scm (mkvtoolnix): Likewise. * gnu/packages/aidc.scm (zxing-cpp): Likewise. * gnu/packages/wm.scm (waybar): Likewise. * gnu/packages/geo.scm (osm2pgsql): Likewise. * gnu/packages/graphics.scm (openimageio): Likewise. * gnu/packages/build-tools.scm (bear): Likewise. * gnu/packages/networking.scm (restinio): Likewise.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/aidc.scm3
-rw-r--r--gnu/packages/build-tools.scm2
-rw-r--r--gnu/packages/geo.scm2
-rw-r--r--gnu/packages/graphics.scm2
-rw-r--r--gnu/packages/hyperledger.scm9
-rw-r--r--gnu/packages/networking.scm4
-rw-r--r--gnu/packages/pretty-print.scm30
-rw-r--r--gnu/packages/storage.scm2
-rw-r--r--gnu/packages/video.scm2
-rw-r--r--gnu/packages/wm.scm2
10 files changed, 35 insertions, 23 deletions
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 5e77ae3c5a..b0fc1b30d9 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -64,8 +64,7 @@
(base32
"1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5"))))
(build-system cmake-build-system)
- (native-inputs
- (list fmt googletest))
+ (native-inputs (list fmt-8 googletest))
(synopsis "C++ port of ZXing")
(description "ZXing-CPP is a barcode scanning library.")
(home-page "https://github.com/nu-book/zxing-cpp")
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 376c4d3486..9cd11f08ea 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -135,7 +135,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(invoke "ctest")))))))
(inputs
`(("c-ares" ,c-ares)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-8)
("grpc" ,grpc)
("json-modern-cxx" ,json-modern-cxx)
("protobuf" ,protobuf)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index dc5a77e820..9895756864 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1384,7 +1384,7 @@ based on the Osmium library.")
(list boost
bzip2
expat
- fmt
+ fmt-8
libosmium
lua
postgresql
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 8ac4a8dc6e..e15a533f5b 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1251,7 +1251,7 @@ with strong support for multi-part, multi-channel use cases.")
(list pkg-config))
(inputs
`(("boost" ,boost)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-8)
("libheif" ,libheif)
("libpng" ,libpng)
("libjpeg" ,libjpeg-turbo)
diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm
index 2a4b87e927..45436da7db 100644
--- a/gnu/packages/hyperledger.scm
+++ b/gnu/packages/hyperledger.scm
@@ -166,8 +166,7 @@ link-time. New implementations can be added as well.")
;; https://github.com/hyperledger/iroha/commit/4dc710d2e9a067af866771318f673c7392797e48
;; Backport unversioned fmt dependency, remove next update:
(substitute* "libs/logger/logger.hpp"
- (("fmt::v5") "fmt"))
- #t))))
+ (("fmt::v5") "fmt"))))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@@ -179,7 +178,11 @@ link-time. New implementations can be added as well.")
#:test-target "."))
;; https://github.com/hyperledger/iroha/blob/master/vcpkg/VCPKG_DEPS_LIST
(native-inputs
- (list fmt googletest rapidjson rxcpp spdlog))
+ (list fmt-8
+ googletest
+ rapidjson
+ rxcpp
+ spdlog))
(inputs
(list boost
gflags
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index cd095a0ed8..b0393a7e69 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3649,7 +3649,7 @@ communication over HTTP.")
pcre2
sobjectizer))
(propagated-inputs
- (list asio fmt http-parser))
+ (list asio fmt-8 http-parser))
(arguments
`(#:configure-flags '("-DRESTINIO_INSTALL=on")
#:tests? #f ; TODO: The tests are called from the root CMakelist, need RESTINIO_TEST=on.
@@ -3737,7 +3737,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
(chmod dhtcluster #o555)
(wrap-program dhtcluster
`("GUIX_PYTHONPATH" prefix (,site-packages)))))))))
- (inputs (list bash-minimal fmt readline))
+ (inputs (list bash-minimal fmt-8 readline))
(propagated-inputs
(list msgpack ;included in several installed headers
restinio ;included in opendht/http.h
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 6dcf1675c4..7bc54c4a0b 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -166,28 +167,37 @@ different programming languages.")
(define-public fmt
(package
(name "fmt")
- (version "8.1.1")
+ (version "9.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
version "/fmt-" version ".zip"))
(sha256
- (base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3"))))
+ (base32 "15n9yi6xzzs7g9rm87kg8y5yhl2zrqj3bjr845saa63f6swlrsyc"))))
(build-system cmake-build-system)
- (arguments
- '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
- (native-inputs
- (list unzip))
+ (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+ (native-inputs (list unzip))
(home-page "https://fmt.dev")
(synopsis "Small and fast C++ formatting library")
- (description
- "@code{fmt} (formerly @code{cppformat}) is a formatting library for C++.
-It can be used as a safe alternative to @code{printf} or as a fast alternative
-to @code{IOStreams}.")
+ (description "@code{fmt} (formerly @code{cppformat}) is a formatting
+library for C++. It can be used as a safe alternative to @code{printf} or as
+a fast alternative to @code{IOStreams}.")
;; The library is bsd-2, but documentation and tests include other licenses.
(license (list bsd-2 bsd-3 psfl))))
+(define-public fmt-8
+ (package
+ (inherit fmt)
+ (version "8.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
+ version "/fmt-" version ".zip"))
+ (sha256
+ (base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3"))))))
+
(define-public fmt-8.0
(package
(inherit fmt)
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index 86ae1c883f..9d360e8eb3 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -201,7 +201,7 @@
("cryptsetup" ,cryptsetup)
("expat" ,expat)
("fcgi" ,fcgi)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-8)
("fuse" ,fuse)
("icu4c" ,icu4c)
("jemalloc" ,jemalloc)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c95bb02507..c8f3c6f8a5 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1029,7 +1029,7 @@ H.264 (MPEG-4 AVC) video streams.")
libebml
file
flac
- fmt
+ fmt-8
libdvdread
libmatroska
libogg
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index eedd339c6c..54e1c9c016 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1734,7 +1734,7 @@ display a clock or apply image manipulation techniques to the background image."
(base32 "15fy21cipih80amv78g7g4k2gylf107phbv0fjacn3w3n0i3cf2k"))))
(build-system meson-build-system)
(inputs (list date
- fmt
+ fmt-8
gtk-layer-shell
gtkmm-3
jsoncpp