[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: gnu: solidity: Use G-expressions.
From: |
guix-commits |
Subject: |
04/09: gnu: solidity: Use G-expressions. |
Date: |
Mon, 4 Jul 2022 06:30:04 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit da6ea4ab884dfb69557c688bf210aa948e1a1984
Author: Zhu Zihao <all_but_last@163.com>
AuthorDate: Sun Jul 3 13:10:43 2022 +0800
gnu: solidity: Use G-expressions.
* gnu/packages/solidity.scm (solidity)[arguments]: Use G-expressions.
[native-inputs]: Use label-less style inputs.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/solidity.scm | 62 +++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/solidity.scm b/gnu/packages/solidity.scm
index 39176656d0..29a0c477f2 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 @@
#: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,37 +46,35 @@
(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")))
+ (replace 'check
+ (lambda _
+ (invoke "./scripts/tests.sh"))))))
(inputs
(list boost-static jsoncpp z3))
(native-inputs
- branch master updated (7cddd130df -> 31e4eaf52c), guix-commits, 2022/07/04
- 03/09: gnu: z3: Prefer CMake to build the package., guix-commits, 2022/07/04
- 05/09: gnu: Add fmt-for-solidity., guix-commits, 2022/07/04
- 06/09: gnu: solidity: Update to 0.8.15., guix-commits, 2022/07/04
- 01/09: gnu: z3: Use G-expressions., guix-commits, 2022/07/04
- 02/09: gnu: z3: Update to 4.8.17., guix-commits, 2022/07/04
- 07/09: gnu: Add giza, guix-commits, 2022/07/04
- 04/09: gnu: solidity: Use G-expressions.,
guix-commits <=
- 08/09: gnu: vpnc: Fix cross-compilation., guix-commits, 2022/07/04
- 09/09: gnu: vpnc: Add bsd-2 license., guix-commits, 2022/07/04