diff options
| -rw-r--r-- | packages/komodo/komodo.scm | 60 | ||||
| -rw-r--r-- | packages/komodo/wally.scm | 61 |
2 files changed, 63 insertions, 58 deletions
diff --git a/packages/komodo/komodo.scm b/packages/komodo/komodo.scm index 677bf34..df9731d 100644 --- a/packages/komodo/komodo.scm +++ b/packages/komodo/komodo.scm @@ -31,7 +31,8 @@ #:use-module (refl-cpp) #:use-module (sortfilterproxymodel) #:use-module (strong-type) - #:use-module (taskflow-2)) + #:use-module (taskflow-2) + #:use-module (wally)) ;;; DATA LAYER @@ -100,23 +101,6 @@ (define mm2-src "mm2-src/") -(define wally-description-lines - (list "Wally is a cross-platform, cross-language collection of useful " - "primitives for cryptocurrency wallets.")) - -(define wally-git-url "https://github.com/KomodoPlatform/libwally-core.git") - -(define wally-hash "1c3w3qdg4l30wvijzi1rf4p0jynwdpb99x717h4v2i6fw140sz7f") - -(define wally-home-page "https://github.com/ElementsProject/libwally-core") - -(define wally-name "wally") - -(define wally-synopsis-lines - (list "Useful primitives for wallets")) - -(define wally-version "release_0.7.7") - ;;; ABSTRACTION LAYER -8 (define expected-file-name @@ -292,11 +276,6 @@ (("include\\(vcpkg_prerequisites\\)") ,vcpkg-replacement))) -(define wally-git-commit wally-version) - -(define wally-hash-get - (content-hash (base32 wally-hash))) - ;;; ABSTRACTION LAYER -3 (define cmake-modification @@ -327,10 +306,6 @@ (git-reference (url entt-komodo-git-reference-url) (commit entt-komodo-version))) -(define wally-git-reference-get - (git-reference (url wally-git-url) - (commit wally-git-commit))) - ;;; ABSTRACTION LAYER -2 (define entt-komodo-origin-get @@ -338,15 +313,6 @@ (method git-fetch) (hash entt-komodo-content-hash-get))) -(define get-wally-name wally-name) - -(define get-wally-origin - (origin (uri wally-git-reference-get) - (method git-fetch) - (hash wally-hash-get))) - -(define get-wally-version wally-version) - (define libsodium-komodo-arguments (list #:phases libsodium-komodo-phases #:tests? #f)) @@ -361,17 +327,6 @@ 'delete-vcpkg ,cmake-modification)) -(define wally-description-get - (string-concatenate wally-description-lines)) - -(define wally-home-page-get wally-home-page) - -(define wally-inputs-get - (list autoconf automake libtool python python-2)) - -(define wally-synopsis-get - (string-concatenate wally-synopsis-lines)) - ;;; ABSTRACTION LAYER -1 (define date-komodo @@ -433,17 +388,6 @@ "-DSPDLOG_BUILD_SHARED=OFF") #:tests? #f)))) -(define wally - (package (name get-wally-name) - (version get-wally-version) - (source get-wally-origin) - (build-system gnu-build-system) - (inputs wally-inputs-get) - (synopsis wally-synopsis-get) - (description wally-description-get) - (license license:expat) - (home-page wally-home-page-get))) - ;;; ABSTRACTION LAYER 0 (define komodo-wallet-arguments diff --git a/packages/komodo/wally.scm b/packages/komodo/wally.scm new file mode 100644 index 0000000..50ffb06 --- /dev/null +++ b/packages/komodo/wally.scm @@ -0,0 +1,61 @@ +(define-module (wally) + #:use-module (gnu packages autotools) + #:use-module (gnu packages python) + #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix packages)) + +;; DATA LAYER + +(define description + (string-append "Wally is a cross-platform, cross-language collection of " + "useful primitives for cryptocurrency wallets.")) + +(define hash + (base32 "1c3w3qdg4l30wvijzi1rf4p0jynwdpb99x717h4v2i6fw140sz7f")) + +(define home-page + "https://github.com/ElementsProject/libwally-core") + +(define name + "wally") + +(define synopsis + "Useful primitives for wallets") + +(define url + "https://github.com/KomodoPlatform/libwally-core.git") + +(define version + "release_0.7.7") + +;; ABSTRACTION LAYER -1 + +(define uri + (git-reference (url url) + (commit version))) + +;; ABSTRACTION LAYER -0 + +(define inputs + (list autoconf automake libtool python python-2)) + +(define source + (origin (uri uri) + (method git-fetch) + (sha256 hash))) + +;; SURFACE LAYER + +(define-public wally + (package (name name) + (version version) + (source source) + (build-system gnu-build-system) + (inputs inputs) + (synopsis synopsis) + (description description) + (license license:expat) + (home-page home-page))) |