From 7ec422d6f592a129f2e03fa57cfe3afb95febf29 Mon Sep 17 00:00:00 2001
* gnu/packages/solidity.scm (solidity)[arguments]: Use G-expressions.
[native-inputs]: Use label-less style inputs.
---
gnu/packages/solidity.scm | 69 ++++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 34 deletions(-)
Toggle diff (97 lines)
diff --git a/gnu/packages/solidity.scm b/gnu/packages/solidity.scm
index a5b5002ce8..606e078e42 100644
--- a/gnu/packages/solidity.scm
+++ b/gnu/packages/solidity.scm
@@ -1,4 +1,5 @@
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,6 +24,7 @@ (define-module (gnu packages solidity)
#:use-module (gnu packages python)
#:use-module (gnu packages ncurses)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:))
@@ -44,43 +46,42 @@ (define-public solidity
(base32 "1mswhjymiwnd3n7h3sjvjx5x8223yih0yvfcr0zpqr4aizpfx5z8"))))
(build-system cmake-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'create-commit_hash.txt
- (lambda _
- (with-output-to-file "commit_hash.txt"
- (lambda _
- (display
- (substring ,commit 0 8))))))
- (delete 'configure)
- (delete 'install)
- (replace 'build
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Unbundle jsoncpp
- (delete-file "./cmake/jsoncpp.cmake")
- (substitute* "CMakeLists.txt"
- (("include\\(jsoncpp\\)") ""))
- ;; Bug list is always sorted since we only build releases
- (substitute* "./test/cmdlineTests.sh"
- (("\"\\$REPO_ROOT\"/scripts/update_bugs_by_version\\.py") ""))
- (substitute* "./scripts/build.sh"
- (("sudo\\ make\\ install") "make install")
- (("cmake\\ ..")
- (string-append "cmake .. -DCMAKE_INSTALL_PREFIX="
- (assoc-ref outputs "out"))))
- (setenv "CIRCLECI" "1")
- (invoke "./scripts/build.sh")
- #t))
- (replace 'check
- (lambda _
- (invoke "./scripts/tests.sh")
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'create-commit_hash.txt
+ (lambda _
+ (with-output-to-file "commit_hash.txt"
+ (lambda _
+ (display
+ (substring #$commit 0 8))))))
+ (delete 'configure)
+ (delete 'install)
+ (replace 'build
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Unbundle jsoncpp
+ (delete-file "./cmake/jsoncpp.cmake")
+ (substitute* "CMakeLists.txt"
+ (("include\\(jsoncpp\\)") ""))
+ ;; Bug list is always sorted since we only build releases
+ (substitute* "./test/cmdlineTests.sh"
+ (("\"\\$REPO_ROOT\"/scripts/update_bugs_by_version\\.py") ""))
+ (substitute* "./scripts/build.sh"
+ (("sudo\\ make\\ install") "make install")
+ (("cmake\\ ..")
+ (string-append "cmake .. -DCMAKE_INSTALL_PREFIX="
+ (assoc-ref outputs "out"))))
+ (setenv "CIRCLECI" "1")
+ (invoke "./scripts/build.sh")
+ #t))
+ (replace 'check
+ (lambda _
+ (invoke "./scripts/tests.sh")
+ #t)))))
(inputs
(list boost-static jsoncpp z3))
(native-inputs
- `(("python" ,python)
- ("tput" ,ncurses)
- ("xargs" ,findutils)))
+ (list python ncurses findutils))
(home-page "https://solidity.readthedocs.io")
(synopsis "Contract-Oriented Programming Language")
(description
--
2.36.1
