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.
This commit is contained in:
Maxim Cournoyer 2022-11-03 15:06:55 -04:00
parent 76b86238ac
commit 451d2802f6
No known key found for this signature in database
GPG key ID: 1260E46482E63562
10 changed files with 39 additions and 27 deletions

View file

@ -64,8 +64,7 @@ (define-public zxing-cpp
(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")

View file

@ -135,7 +135,7 @@ (define-public bear
(invoke "ctest")))))))
(inputs
`(("c-ares" ,c-ares)
("fmt" ,fmt)
("fmt" ,fmt-8)
("grpc" ,grpc)
("json-modern-cxx" ,json-modern-cxx)
("protobuf" ,protobuf)

View file

@ -1384,7 +1384,7 @@ (define-public osm2pgsql
(list boost
bzip2
expat
fmt
fmt-8
libosmium
lua
postgresql

View file

@ -1251,7 +1251,7 @@ (define-public openimageio
(list pkg-config))
(inputs
`(("boost" ,boost)
("fmt" ,fmt)
("fmt" ,fmt-8)
("libheif" ,libheif)
("libpng" ,libpng)
("libjpeg" ,libjpeg-turbo)

View file

@ -166,8 +166,7 @@ (define-public hyperledger-iroha
;; 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 @@ (define-public hyperledger-iroha
#: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

View file

@ -3649,7 +3649,7 @@ (define-public restinio
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 @@ (define-public opendht
(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

View file

@ -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,6 +167,28 @@ (define-public enscript
(define-public fmt
(package
(name "fmt")
(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 "15n9yi6xzzs7g9rm87kg8y5yhl2zrqj3bjr845saa63f6swlrsyc"))))
(build-system cmake-build-system)
(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}.")
;; 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
@ -173,20 +196,7 @@ (define-public fmt
(uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
version "/fmt-" version ".zip"))
(sha256
(base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3"))))
(build-system cmake-build-system)
(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}.")
;; The library is bsd-2, but documentation and tests include other licenses.
(license (list bsd-2 bsd-3 psfl))))
(base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3"))))))
(define-public fmt-8.0
(package

View file

@ -201,7 +201,7 @@ (define-public ceph
("cryptsetup" ,cryptsetup)
("expat" ,expat)
("fcgi" ,fcgi)
("fmt" ,fmt)
("fmt" ,fmt-8)
("fuse" ,fuse)
("icu4c" ,icu4c)
("jemalloc" ,jemalloc)

View file

@ -1029,7 +1029,7 @@ (define-public mkvtoolnix
libebml
file
flac
fmt
fmt-8
libdvdread
libmatroska
libogg

View file

@ -1734,7 +1734,7 @@ (define-public waybar
(base32 "15fy21cipih80amv78g7g4k2gylf107phbv0fjacn3w3n0i3cf2k"))))
(build-system meson-build-system)
(inputs (list date
fmt
fmt-8
gtk-layer-shell
gtkmm-3
jsoncpp