diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/hyperledger.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/hyperledger.scm')
| -rw-r--r-- | gnu/packages/hyperledger.scm | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 82680cd5e4..2a4b87e927 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -63,10 +63,7 @@ (file-name (git-file-name name version)))) (build-system go-build-system) (native-inputs - `(("which" ,which) - ("docker-cli" ,docker-cli) - ("git" ,git) - ("curl" ,curl))) + (list which docker-cli git curl)) (arguments `(#:import-path "github.com/hyperledger/fabric" #:unpack-path "github.com/hyperledger/fabric" @@ -122,7 +119,7 @@ different components.") "0kr1zwah8mhnpfrpk3h6hdafyqdl3ixhs7czdfscqv6vxqfiabc4")))) (build-system cmake-build-system) (native-inputs - `(("googletest" ,googletest))) + (list googletest)) (arguments `(#:tests? #f ; Tests don't build because CMake cannot find GTest main. #:configure-flags '("-DHUNTER_ENABLED=OFF" @@ -182,20 +179,16 @@ link-time. New implementations can be added as well.") #:test-target ".")) ;; https://github.com/hyperledger/iroha/blob/master/vcpkg/VCPKG_DEPS_LIST (native-inputs - `(("fmt" ,fmt) - ("googletest" ,googletest) - ("rapidjson" ,rapidjson) - ("rxcpp" ,rxcpp) - ("spdlog" ,spdlog))) + (list fmt googletest rapidjson rxcpp spdlog)) (inputs - `(("boost" ,boost) - ("gflags" ,gflags) - ("grpc" ,grpc-1.16.1) - ("hyperledger-iroha-ed25519" ,hyperledger-iroha-ed25519) - ("postgresql" ,postgresql) - ("protobuf" ,protobuf) - ("soci" ,soci) - ("tbb" ,tbb))) + (list boost + gflags + grpc-1.16.1 + hyperledger-iroha-ed25519 + postgresql + protobuf + soci + tbb)) (synopsis "Simple, decentralized ledger") (description "Iroha is a distributed ledger technology (DLT). Iroha has essential functionality for your asset, information and identity management |