summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-11-03 15:01:00 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-11-06 00:08:04 -0400
commit76b86238acbe462427df670a287b004cbc9a49af (patch)
tree21dcaa9243ff6945061fb1634c356cda14e9f056
parent9e417d5cf6cd6d1d87cb4ddc48ebdd84ca811fd6 (diff)
gnu: fmt-for-solidity: Rename to fmt-8.0.
* gnu/packages/pretty-print.scm (fmt-for-solidity): Rename to... (fmt-8.0): ... this. (fmt-for-irods): Rename to... (fmt-6): ... this. * gnu/packages/solidity.scm (solidity): Adjust accordingly. * gnu/packages/irods.scm (irods, irods-client-icommands): Likewise.
-rw-r--r--gnu/packages/irods.scm4
-rw-r--r--gnu/packages/pretty-print.scm11
-rw-r--r--gnu/packages/solidity.scm2
3 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/irods.scm b/gnu/packages/irods.scm
index 58ef3bf474..5c9b66000c 100644
--- a/gnu/packages/irods.scm
+++ b/gnu/packages/irods.scm
@@ -142,7 +142,7 @@
`(("avro-cpp" ,avro-cpp-1.9-for-irods)
("boost" ,boost-for-irods)
("cppzmq" ,cppzmq)
- ("fmt" ,fmt-for-irods)
+ ("fmt" ,fmt-6)
("json" ,json-modern-cxx)
("libarchive" ,libarchive)
("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi
@@ -245,7 +245,7 @@ stored.")
`(("avro-cpp" ,avro-cpp-1.9-for-irods)
("boost" ,boost-for-irods)
("cppzmq" ,cppzmq)
- ("fmt" ,fmt-for-irods)
+ ("fmt" ,fmt-6)
("irods" ,irods)
("json" ,json-modern-cxx)
("libarchive" ,libarchive)
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 9745a9ba10..6dcf1675c4 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -188,10 +188,9 @@ 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-for-solidity
+(define-public fmt-8.0
(package
(inherit fmt)
- (name "fmt-for-solidity")
(version "8.0.1")
(source
(origin
@@ -202,7 +201,8 @@ to @code{IOStreams}.")
(base32 "1gqmsk4r93x65cqs8w7zhfiv70w5fv8279nrblggqm4mmdpaa9x6"))))))
(define-public fmt-7
- (package (inherit fmt)
+ (package
+ (inherit fmt)
(version "7.1.3")
(source
(origin
@@ -212,10 +212,9 @@ to @code{IOStreams}.")
(sha256
(base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x"))))))
-(define-public fmt-for-irods
+(define-public fmt-6
(package
(inherit fmt)
- (name "fmt-for-irods")
(version "6.1.2")
(source
(origin
@@ -226,7 +225,7 @@ to @code{IOStreams}.")
(base32 "1s1hxaby5byb07rgmrk4a0q11fxhz7b42khch7sp2qx974y0yrb3"))))
(build-system cmake-build-system)
(arguments
- '(#:tests? #f ; TODO: posix-mock-test segfaults
+ '(#:tests? #f ; TODO: posix-mock-test segfaults
#:configure-flags
'("-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_CXX_COMPILER=clang++"
diff --git a/gnu/packages/solidity.scm b/gnu/packages/solidity.scm
index 9ab555b919..3cce3abcf2 100644
--- a/gnu/packages/solidity.scm
+++ b/gnu/packages/solidity.scm
@@ -58,7 +58,7 @@
(("include\\(jsoncpp\\)")
"find_package(jsoncpp)")))))))
(inputs
- (list boost-static fmt-for-solidity jsoncpp range-v3 z3))
+ (list boost-static fmt-8.0 jsoncpp range-v3 z3))
(native-inputs
(list python ncurses findutils))
(home-page "https://solidity.readthedocs.io")