* [PATCH] gnu: Add stellar-core.
@ 2016-02-19 22:04 Christopher Allan Webber
2016-02-19 22:37 ` Christopher Allan Webber
0 siblings, 1 reply; 4+ messages in thread
From: Christopher Allan Webber @ 2016-02-19 22:04 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: 0001-gnu-Add-stellar-core.patch --]
[-- Type: text/x-diff, Size: 6567 bytes --]
From 338d0f3246ede034fde0eb9a3be1b640159e3bd9 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 19 Feb 2016 13:47:19 -0800
Subject: [PATCH] gnu: Add stellar-core.
* gnu/packages/finance.scm (stellar-core): New variable.
* gnu/packages/patches/stellar-core-find-mk-files.patch: New file.
---
gnu/packages/finance.scm | 75 ++++++++++++++++++++++
.../patches/stellar-core-find-mk-files.patch | 33 ++++++++++
2 files changed, 108 insertions(+)
create mode 100644 gnu/packages/patches/stellar-core-find-mk-files.patch
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index e9487d4..c461ca7 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,9 +22,15 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build utils)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages autogen)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages flex)
#:use-module (gnu packages databases)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
@@ -81,3 +88,71 @@ collectively by the network. Bitcoin Core is the reference implementation
of the bitcoin protocol. This package provides the Bitcoin Core command
line client and a client based on Qt.")
(license license:expat)))
+
+(define-public stellar-core
+ (package
+ (name "stellar-core")
+ (version "0.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stellar/stellar-core.git")
+ (commit "v0.4.1")
+ (recursive? #t)))
+ (sha256
+ (base32
+ "15mm1jk2kk5x34vn9gqwp7ijhsmhm6dwymznz7hqvjj8kjd088fi"))
+ ;; This is a pain in the butt.
+ ;; autogen.sh calls make-mks which does git ls-files, which
+ ;; obviously we can't do.
+ ;; As a workaround, we provide the results of the
+ ;; .mk files generated by this script, but if a new version
+ ;; comes out, you might need to provide new versions
+ ;; of this patch by running autogen and then adding the results
+ ;; manually! Not nice at all.
+ ;; Alternative paths forward might be to de-bundle things
+ ;; or maybe run autogen as part of the git-fetch phase...
+ ;; which seems hard to do.
+ ;; Anyway, you'll need to provide the contents of:
+ ;; - src/src.mk
+ ;; - lib/medida.mk
+ ;; - lib/lib.mk
+ (patches (list (search-patch
+ "stellar-core-find-mk-files.patch")))))
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'autogen-self-and-submodules
+ (lambda _
+ (and (zero? (system* "sh" "autogen.sh"
+ ;; we'll handle submodules manually
+ "--skip-submodules"))
+ ;; Run autogen on libsodium too.
+ ;; In the future, we might also have to manually
+ ;; run this on other git submodules which are
+ ;; introduced
+ (begin (chdir "lib/libsodium") #t)
+ (zero? (system* "sh" "autogen.sh"))
+ (begin (chdir "../..") #t)))))
+ ;; Tries to run tests with a running postgres server...
+ ;; well, sorry, we can't do that!
+ #:tests? #f))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("autogen" ,autogen)
+ ;; used by libsodium git submodule
+ ("libtool" ,libtool)))
+ (inputs
+ `(("bison" ,bison)
+ ("flex" ,flex)
+ ("postgresql" ,postgresql)))
+ (home-page "https://www.stellar.org/")
+ (synopsis "Communicate with the Stellar peer-to-peer network")
+ (description "Stellar-core is a replicated state machine that
+maintains a local copy of a cryptographic ledger and processes
+transactions against it, in consensus with a set of peers.
+It implements the Stellar Consensus Protocol, a federated consensus
+protocol.")
+ (license license:asl2.0)))
diff --git a/gnu/packages/patches/stellar-core-find-mk-files.patch b/gnu/packages/patches/stellar-core-find-mk-files.patch
new file mode 100644
index 0000000..2b26171
--- /dev/null
+++ b/gnu/packages/patches/stellar-core-find-mk-files.patch
@@ -0,0 +1,33 @@
+Use "find" instead of "git ls-files" to fill in the src/src.mk file
+
+(Guix removes the .git directory, so we have to do this!)
+
+diff --git a/make-mks b/make-mks
+index f3edf10..5972ebf 100755
+--- a/make-mks
++++ b/make-mks
+@@ -6,21 +6,17 @@ case "$0" in
+ ;;
+ esac
+
+-# Bail if not under git
+-git rev-parse
+-
+ trap 'rm -f src/src.mk lib/medida.mk lib/lib.mk' 0
+
+ message="# This file was generated by make-mks; don't edit it by hand."
+
+-# Use only files git knows about, to avoid picking up autogenrated
+-# files or other random cruft. When adding a new file foo.cpp, you
+-# must run "git add -N foo.cpp" before running this script.
++# Since Guix is running not from git, we can just use find to fill
++# in this information instead of `git lsfiles`
+ (cd src
+ echo "$message"
+- echo "SRC_H_FILES" = $(git ls-files '*.h' '*.[ih]pp')
+- echo "SRC_CXX_FILES" = $(git ls-files '*.cpp')
+- echo "SRC_X_FILES" = $(git ls-files '*.x')
++ echo "SRC_H_FILES" = $(find . -name '*.h') $(find . -name '*.[ih]pp')
++ echo "SRC_CXX_FILES" = $(find . -name '*.cpp')
++ echo "SRC_X_FILES" = $(find . -name '*.x')
+ ) > src/src.mk
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] gnu: Add stellar-core.
2016-02-19 22:04 [PATCH] gnu: Add stellar-core Christopher Allan Webber
@ 2016-02-19 22:37 ` Christopher Allan Webber
2016-02-20 4:56 ` Leo Famulari
0 siblings, 1 reply; 4+ messages in thread
From: Christopher Allan Webber @ 2016-02-19 22:37 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 126 bytes --]
I forgot that I *did* make a nicer workaround, and thus the comment in
the middle of the package definition was unnecessary.
[-- Attachment #2: 0001-gnu-Add-stellar-core.patch --]
[-- Type: text/x-diff, Size: 5707 bytes --]
From 056400626d070fd8653cdc03a9b0fbcdc49be5df Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 19 Feb 2016 13:47:19 -0800
Subject: [PATCH] gnu: Add stellar-core.
* gnu/packages/finance.scm (stellar-core): New variable.
* gnu/packages/patches/stellar-core-find-mk-files.patch: New file.
---
gnu/packages/finance.scm | 60 ++++++++++++++++++++++
.../patches/stellar-core-find-mk-files.patch | 33 ++++++++++++
2 files changed, 93 insertions(+)
create mode 100644 gnu/packages/patches/stellar-core-find-mk-files.patch
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index e9487d4..e208791 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,9 +22,15 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build utils)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages autogen)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages flex)
#:use-module (gnu packages databases)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
@@ -81,3 +88,56 @@ collectively by the network. Bitcoin Core is the reference implementation
of the bitcoin protocol. This package provides the Bitcoin Core command
line client and a client based on Qt.")
(license license:expat)))
+
+(define-public stellar-core
+ (package
+ (name "stellar-core")
+ (version "0.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stellar/stellar-core.git")
+ (commit "v0.4.1")
+ (recursive? #t)))
+ (sha256
+ (base32
+ "15mm1jk2kk5x34vn9gqwp7ijhsmhm6dwymznz7hqvjj8kjd088fi"))
+ (patches (list (search-patch
+ "stellar-core-find-mk-files.patch")))))
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'autogen-self-and-submodules
+ (lambda _
+ (and (zero? (system* "sh" "autogen.sh"
+ ;; we'll handle submodules manually
+ "--skip-submodules"))
+ ;; Run autogen on libsodium too.
+ ;; In the future, we might also have to manually
+ ;; run this on other git submodules which are
+ ;; introduced
+ (begin (chdir "lib/libsodium") #t)
+ (zero? (system* "sh" "autogen.sh"))
+ (begin (chdir "../..") #t)))))
+ ;; Tries to run tests with a running postgres server...
+ ;; well, sorry, we can't do that!
+ #:tests? #f))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("autogen" ,autogen)
+ ;; used by libsodium git submodule
+ ("libtool" ,libtool)))
+ (inputs
+ `(("bison" ,bison)
+ ("flex" ,flex)
+ ("postgresql" ,postgresql)))
+ (home-page "https://www.stellar.org/")
+ (synopsis "Communicate with the Stellar peer-to-peer network")
+ (description "Stellar-core is a replicated state machine that
+maintains a local copy of a cryptographic ledger and processes
+transactions against it, in consensus with a set of peers.
+It implements the Stellar Consensus Protocol, a federated consensus
+protocol.")
+ (license license:asl2.0)))
diff --git a/gnu/packages/patches/stellar-core-find-mk-files.patch b/gnu/packages/patches/stellar-core-find-mk-files.patch
new file mode 100644
index 0000000..2b26171
--- /dev/null
+++ b/gnu/packages/patches/stellar-core-find-mk-files.patch
@@ -0,0 +1,33 @@
+Use "find" instead of "git ls-files" to fill in the src/src.mk file
+
+(Guix removes the .git directory, so we have to do this!)
+
+diff --git a/make-mks b/make-mks
+index f3edf10..5972ebf 100755
+--- a/make-mks
++++ b/make-mks
+@@ -6,21 +6,17 @@ case "$0" in
+ ;;
+ esac
+
+-# Bail if not under git
+-git rev-parse
+-
+ trap 'rm -f src/src.mk lib/medida.mk lib/lib.mk' 0
+
+ message="# This file was generated by make-mks; don't edit it by hand."
+
+-# Use only files git knows about, to avoid picking up autogenrated
+-# files or other random cruft. When adding a new file foo.cpp, you
+-# must run "git add -N foo.cpp" before running this script.
++# Since Guix is running not from git, we can just use find to fill
++# in this information instead of `git lsfiles`
+ (cd src
+ echo "$message"
+- echo "SRC_H_FILES" = $(git ls-files '*.h' '*.[ih]pp')
+- echo "SRC_CXX_FILES" = $(git ls-files '*.cpp')
+- echo "SRC_X_FILES" = $(git ls-files '*.x')
++ echo "SRC_H_FILES" = $(find . -name '*.h') $(find . -name '*.[ih]pp')
++ echo "SRC_CXX_FILES" = $(find . -name '*.cpp')
++ echo "SRC_X_FILES" = $(find . -name '*.x')
+ ) > src/src.mk
--
2.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] gnu: Add stellar-core.
2016-02-19 22:37 ` Christopher Allan Webber
@ 2016-02-20 4:56 ` Leo Famulari
2016-02-20 5:19 ` Christopher Allan Webber
0 siblings, 1 reply; 4+ messages in thread
From: Leo Famulari @ 2016-02-20 4:56 UTC (permalink / raw)
To: Christopher Allan Webber; +Cc: guix-devel
On Fri, Feb 19, 2016 at 02:37:38PM -0800, Christopher Allan Webber wrote:
> I forgot that I *did* make a nicer workaround, and thus the comment in
> the middle of the package definition was unnecessary.
>
> From 056400626d070fd8653cdc03a9b0fbcdc49be5df Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber <cwebber@dustycloud.org>
> Date: Fri, 19 Feb 2016 13:47:19 -0800
> Subject: [PATCH] gnu: Add stellar-core.
>
> * gnu/packages/finance.scm (stellar-core): New variable.
> * gnu/packages/patches/stellar-core-find-mk-files.patch: New file.
Please remember to register the patch in gnu-system.am (dist_patch_DATA).
> ---
> gnu/packages/finance.scm | 60 ++++++++++++++++++++++
> .../patches/stellar-core-find-mk-files.patch | 33 ++++++++++++
> 2 files changed, 93 insertions(+)
> create mode 100644 gnu/packages/patches/stellar-core-find-mk-files.patch
>
> diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
> index e9487d4..e208791 100644
> --- a/gnu/packages/finance.scm
> +++ b/gnu/packages/finance.scm
> @@ -1,6 +1,7 @@
> ;;; GNU Guix --- Functional package management for GNU
> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
> +;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -21,9 +22,15 @@
> #:use-module ((guix licenses) #:prefix license:)
> #:use-module (guix packages)
> #:use-module (guix download)
> + #:use-module (guix git-download)
> #:use-module (guix build utils)
> #:use-module (guix build-system gnu)
> + #:use-module (gnu packages)
> + #:use-module (gnu packages autogen)
> + #:use-module (gnu packages autotools)
> #:use-module (gnu packages boost)
> + #:use-module (gnu packages bison)
> + #:use-module (gnu packages flex)
> #:use-module (gnu packages databases)
> #:use-module (gnu packages linux)
> #:use-module (gnu packages pkg-config)
> @@ -81,3 +88,56 @@ collectively by the network. Bitcoin Core is the reference implementation
> of the bitcoin protocol. This package provides the Bitcoin Core command
> line client and a client based on Qt.")
> (license license:expat)))
> +
> +(define-public stellar-core
> + (package
> + (name "stellar-core")
> + (version "0.4.1")
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/stellar/stellar-core.git")
> + (commit "v0.4.1")
> + (recursive? #t)))
I had to look up this property. A first time for everything!
> + (sha256
> + (base32
> + "15mm1jk2kk5x34vn9gqwp7ijhsmhm6dwymznz7hqvjj8kjd088fi"))
> + (patches (list (search-patch
> + "stellar-core-find-mk-files.patch")))))
> + (arguments
> + '(#:phases (modify-phases %standard-phases
> + (add-before 'configure 'autogen-self-and-submodules
> + (lambda _
> + (and (zero? (system* "sh" "autogen.sh"
> + ;; we'll handle submodules manually
> + "--skip-submodules"))
> + ;; Run autogen on libsodium too.
Upstream bundles libsodium? What's their security policy / practices?
Their libsodium submodule was last updated in July 2015, if I understand
correctly (I have no hands-on experience with submodules), but libsodium
has released 5 minor versions since then.
Is it possible to use our libsodium package?
> + ;; In the future, we might also have to manually
> + ;; run this on other git submodules which are
> + ;; introduced
> + (begin (chdir "lib/libsodium") #t)
> + (zero? (system* "sh" "autogen.sh"))
> + (begin (chdir "../..") #t)))))
This is just me asking a question for my own knowledge:
What is the difference between (begin (chdir "foo") #t) and
(chdir "foo")?
> + ;; Tries to run tests with a running postgres server...
> + ;; well, sorry, we can't do that!
> + #:tests? #f))
Is the Postgres server required for the entire test suite, or is it just
a small subset of the tests that could be disabled individually?
> + (build-system gnu-build-system)
> + (native-inputs
> + `(("pkg-config" ,pkg-config)
> + ("autoconf" ,autoconf)
> + ("automake" ,automake)
> + ("autogen" ,autogen)
> + ;; used by libsodium git submodule
> + ("libtool" ,libtool)))
> + (inputs
> + `(("bison" ,bison)
> + ("flex" ,flex)
> + ("postgresql" ,postgresql)))
> + (home-page "https://www.stellar.org/")
> + (synopsis "Communicate with the Stellar peer-to-peer network")
> + (description "Stellar-core is a replicated state machine that
> +maintains a local copy of a cryptographic ledger and processes
> +transactions against it, in consensus with a set of peers.
> +It implements the Stellar Consensus Protocol, a federated consensus
> +protocol.")
> + (license license:asl2.0)))
> diff --git a/gnu/packages/patches/stellar-core-find-mk-files.patch b/gnu/packages/patches/stellar-core-find-mk-files.patch
"Interesting" upstream packaging...
[...]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] gnu: Add stellar-core.
2016-02-20 4:56 ` Leo Famulari
@ 2016-02-20 5:19 ` Christopher Allan Webber
0 siblings, 0 replies; 4+ messages in thread
From: Christopher Allan Webber @ 2016-02-20 5:19 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
Leo Famulari writes:
> On Fri, Feb 19, 2016 at 02:37:38PM -0800, Christopher Allan Webber wrote:
>> I forgot that I *did* make a nicer workaround, and thus the comment in
>> the middle of the package definition was unnecessary.
>>
>
>> From 056400626d070fd8653cdc03a9b0fbcdc49be5df Mon Sep 17 00:00:00 2001
>> From: Christopher Allan Webber <cwebber@dustycloud.org>
>> Date: Fri, 19 Feb 2016 13:47:19 -0800
>> Subject: [PATCH] gnu: Add stellar-core.
>>
>> * gnu/packages/finance.scm (stellar-core): New variable.
>> * gnu/packages/patches/stellar-core-find-mk-files.patch: New file.
>
> Please remember to register the patch in gnu-system.am (dist_patch_DATA).
Done. I keep forgetting to do that! When things build, I forget to do
the other steps that aren't just building things! ;)
>> ---
>> gnu/packages/finance.scm | 60 ++++++++++++++++++++++
>> .../patches/stellar-core-find-mk-files.patch | 33 ++++++++++++
>> 2 files changed, 93 insertions(+)
>> create mode 100644 gnu/packages/patches/stellar-core-find-mk-files.patch
>>
>> diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
>> index e9487d4..e208791 100644
>> --- a/gnu/packages/finance.scm
>> +++ b/gnu/packages/finance.scm
>> @@ -1,6 +1,7 @@
>> ;;; GNU Guix --- Functional package management for GNU
>> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
>> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
>> +;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
>> ;;;
>> ;;; This file is part of GNU Guix.
>> ;;;
>> @@ -21,9 +22,15 @@
>> #:use-module ((guix licenses) #:prefix license:)
>> #:use-module (guix packages)
>> #:use-module (guix download)
>> + #:use-module (guix git-download)
>> #:use-module (guix build utils)
>> #:use-module (guix build-system gnu)
>> + #:use-module (gnu packages)
>> + #:use-module (gnu packages autogen)
>> + #:use-module (gnu packages autotools)
>> #:use-module (gnu packages boost)
>> + #:use-module (gnu packages bison)
>> + #:use-module (gnu packages flex)
>> #:use-module (gnu packages databases)
>> #:use-module (gnu packages linux)
>> #:use-module (gnu packages pkg-config)
>> @@ -81,3 +88,56 @@ collectively by the network. Bitcoin Core is the reference implementation
>> of the bitcoin protocol. This package provides the Bitcoin Core command
>> line client and a client based on Qt.")
>> (license license:expat)))
>> +
>> +(define-public stellar-core
>> + (package
>> + (name "stellar-core")
>> + (version "0.4.1")
>> + (source (origin
>> + (method git-fetch)
>> + (uri (git-reference
>> + (url "https://github.com/stellar/stellar-core.git")
>> + (commit "v0.4.1")
>> + (recursive? #t)))
>
> I had to look up this property. A first time for everything!
Indeed, and afaict, stellar-core would be the second use!
>> + (sha256
>> + (base32
>> + "15mm1jk2kk5x34vn9gqwp7ijhsmhm6dwymznz7hqvjj8kjd088fi"))
>> + (patches (list (search-patch
>> + "stellar-core-find-mk-files.patch")))))
>> + (arguments
>> + '(#:phases (modify-phases %standard-phases
>> + (add-before 'configure 'autogen-self-and-submodules
>> + (lambda _
>> + (and (zero? (system* "sh" "autogen.sh"
>> + ;; we'll handle submodules manually
>> + "--skip-submodules"))
>> + ;; Run autogen on libsodium too.
>
> Upstream bundles libsodium? What's their security policy / practices?
> Their libsodium submodule was last updated in July 2015, if I understand
> correctly (I have no hands-on experience with submodules), but libsodium
> has released 5 minor versions since then.
>
> Is it possible to use our libsodium package?
I don't know whether it's possible to use our libsodium package.
Frankly, I don't understand enough about C packaging to understand what
to do.
"5 minor versions since then" does sound like a concern... it would be
nice to use our version rather than the bundled one, because we can
likely keep it up to date more easily. However, I don't really
understand how their bundling works, and if un-bundling is possible.
I'll ask them.
>> + ;; Tries to run tests with a running postgres server...
>> + ;; well, sorry, we can't do that!
>> + #:tests? #f))
>
> Is the Postgres server required for the entire test suite, or is it just
> a small subset of the tests that could be disabled individually?
There's a src/test/selftest-nopg and a src/test/selftest-pg. If we
could maybe run the former and not the latter, we could at least run
some tests. We *do* want to build postgres support in though, almost
certainly.
I'll try to ask them if there's any simple way to do this.
>> + ;; In the future, we might also have to manually
>> + ;; run this on other git submodules which are
>> + ;; introduced
>> + (begin (chdir "lib/libsodium") #t)
>> + (zero? (system* "sh" "autogen.sh"))
>> + (begin (chdir "../..") #t)))))
>
> This is just me asking a question for my own knowledge:
>
> What is the difference between (begin (chdir "foo") #t) and
> (chdir "foo")?
One of them returns #t, and one of them returns undefined :) This is so
that the (and) can aggregate the results of the (zero?) calls. (chdir)
will error out.
This was the easiest way to do those consectuive calls and have the
return status passed back.
>> + (build-system gnu-build-system)
>> + (native-inputs
>> + `(("pkg-config" ,pkg-config)
>> + ("autoconf" ,autoconf)
>> + ("automake" ,automake)
>> + ("autogen" ,autogen)
>> + ;; used by libsodium git submodule
>> + ("libtool" ,libtool)))
>> + (inputs
>> + `(("bison" ,bison)
>> + ("flex" ,flex)
>> + ("postgresql" ,postgresql)))
>> + (home-page "https://www.stellar.org/")
>> + (synopsis "Communicate with the Stellar peer-to-peer network")
>> + (description "Stellar-core is a replicated state machine that
>> +maintains a local copy of a cryptographic ledger and processes
>> +transactions against it, in consensus with a set of peers.
>> +It implements the Stellar Consensus Protocol, a federated consensus
>> +protocol.")
>> + (license license:asl2.0)))
>> diff --git a/gnu/packages/patches/stellar-core-find-mk-files.patch b/gnu/packages/patches/stellar-core-find-mk-files.patch
>
> "Interesting" upstream packaging...
>
> [...]
Yes... I don't really understand why the make-mks things are done. But
I don't know much about autotools, though it seems like they're doing
some clever things related to it. Nonetheless, my hacky patch seems to
set things working in our git-less git-checkout environment.
Okay, it looks like there are a couple things to look into. The
unbundling bit seems like the most important thing... the tests would be
a nice-to-have.
- Chris
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-20 5:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-19 22:04 [PATCH] gnu: Add stellar-core Christopher Allan Webber
2016-02-19 22:37 ` Christopher Allan Webber
2016-02-20 4:56 ` Leo Famulari
2016-02-20 5:19 ` Christopher Allan Webber
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).