ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fmt-for-solidity: Rename to fmt-8.0.

Browse source 
* 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.
This commit is contained in:
Maxim Cournoyer 2022-11-03 15:01:00 -04:00
parent 9e417d5cf6
commit 76b86238ac
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/irods.scm
View file

@ -142,7 +142,7 @@ (define-public irods
`(("avro-cpp" ,avro-cpp-1.9-for-irods) `(("avro-cpp" ,avro-cpp-1.9-for-irods)
("boost" ,boost-for-irods) ("boost" ,boost-for-irods)
("cppzmq" ,cppzmq) ("cppzmq" ,cppzmq)
("fmt" ,fmt-for-irods) ("fmt" ,fmt-6)
("json" ,json-modern-cxx) ("json" ,json-modern-cxx)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi ("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi
@ -245,7 +245,7 @@ (define-public irods-client-icommands
`(("avro-cpp" ,avro-cpp-1.9-for-irods) `(("avro-cpp" ,avro-cpp-1.9-for-irods)
("boost" ,boost-for-irods) ("boost" ,boost-for-irods)
("cppzmq" ,cppzmq) ("cppzmq" ,cppzmq)
("fmt" ,fmt-for-irods) ("fmt" ,fmt-6)
("irods" ,irods) ("irods" ,irods)
("json" ,json-modern-cxx) ("json" ,json-modern-cxx)
("libarchive" ,libarchive) ("libarchive" ,libarchive)

11
gnu/packages/pretty-print.scm
View file

@ -188,10 +188,9 @@ (define-public fmt
;; The library is bsd-2, but documentation and tests include other licenses. ;; The library is bsd-2, but documentation and tests include other licenses.
(license (list bsd-2 bsd-3 psfl)))) (license (list bsd-2 bsd-3 psfl))))
(define-public fmt-for-solidity (define-public fmt-8.0
(package (package
(inherit fmt) (inherit fmt)
(name "fmt-for-solidity")
(version "8.0.1") (version "8.0.1")
(source (source
(origin (origin
@ -202,7 +201,8 @@ (define-public fmt-for-solidity
(base32 "1gqmsk4r93x65cqs8w7zhfiv70w5fv8279nrblggqm4mmdpaa9x6")))))) (base32 "1gqmsk4r93x65cqs8w7zhfiv70w5fv8279nrblggqm4mmdpaa9x6"))))))
(define-public fmt-7 (define-public fmt-7
(package (inherit fmt) (package
(inherit fmt)
(version "7.1.3") (version "7.1.3")
(source (source
(origin (origin
@ -212,10 +212,9 @@ (define-public fmt-7
(sha256 (sha256
(base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x")))))) (base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x"))))))
(define-public fmt-for-irods (define-public fmt-6
(package (package
(inherit fmt) (inherit fmt)
(name "fmt-for-irods")
(version "6.1.2") (version "6.1.2")
(source (source
(origin (origin
@ -226,7 +225,7 @@ (define-public fmt-for-irods
(base32 "1s1hxaby5byb07rgmrk4a0q11fxhz7b42khch7sp2qx974y0yrb3")))) (base32 "1s1hxaby5byb07rgmrk4a0q11fxhz7b42khch7sp2qx974y0yrb3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; TODO: posix-mock-test segfaults '(#:tests? #f ; TODO: posix-mock-test segfaults
#:configure-flags #:configure-flags
'("-DBUILD_SHARED_LIBS=ON" '("-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_CXX_COMPILER=clang++" "-DCMAKE_CXX_COMPILER=clang++"

2
gnu/packages/solidity.scm
View file

@ -58,7 +58,7 @@ (define-public solidity
(("include\\(jsoncpp\\)") (("include\\(jsoncpp\\)")
"find_package(jsoncpp)"))))))) "find_package(jsoncpp)")))))))
(inputs (inputs
(list boost-static fmt-for-solidity jsoncpp range-v3 z3)) (list boost-static fmt-8.0 jsoncpp range-v3 z3))
(native-inputs (native-inputs
(list python ncurses findutils)) (list python ncurses findutils))
(home-page "https://solidity.readthedocs.io") (home-page "https://solidity.readthedocs.io")