Commit Graph

77 Commits

Author SHA1 Message Date
Jared Tobin
c078c16eba
build: remove urbit-large-log-limit derivation
Made unnecessary by 578593d45.
2020-03-01 23:04:22 +04:00
Jared Tobin
ce3c1a0e21
build: better vere label patch
Moves the secondary URBIT_VERSION assignment to a different hunk to
avoid undesirable patching conflicts.
2020-02-24 15:15:56 +04:00
Jared Tobin
05a0a9092a
build: add configurePhase for urbit derivation
46a438f introduced use of the stdenv generic builder instead of an
explicit builder.sh script.  This was reverted in 1daaf041a as it proved
to cause problems when building on some Linux variants.

This fixes the problem encountered on Linux by calling the standard
configure script with bash in an explicit configurePhase.
2020-02-24 14:40:10 +04:00
Jared Tobin
f66d750e1c
build: label large-log-limit vere version
Ensures that large log limit Vere builds are labelled as such, and are
thus easily identifiable.
2020-02-24 14:40:10 +04:00
Jared Tobin
813261dc31
Revert "Revert "Merge branch 'jt/urbit-large-log' (#2211)""
This reverts a revert, commit 1daaf041a7,
in order to fix the problems that led to it being reverted.
2020-02-24 14:37:41 +04:00
Jared Tobin
1daaf041a7
Revert "Merge branch 'jt/urbit-large-log' (#2211)"
This reverts commit 0fc9056074, reversing
changes made to 1e3a1434e0.

The changes made here evidently broke builds on some Linux variants.
2020-01-31 15:26:15 +04:00
Jared Tobin
a6e15c9418
build: add urbit-large-log derivation
Adds a derivation that uses a patched pkg/urbit/vere/lmdb.c that employs
a sixty gigabyte log limit, instead of the default forty.  This is
useful for ships e.g. ~zod that receive a lot of traffic on mainnet.
2020-01-30 13:57:03 +04:00
Jared Tobin
46a438f26e
build: use generic builder in urbit derivation
'installPhase' captures all the important stuff that builder.sh
previously did, and use of the generic builder allows stages of the
build to be more easily overridden.
2020-01-30 11:20:40 +04:00
Brendan Hay
122e01b13d
build: allow baking multiple pills into docker images
By baking (potentially) multiple pills into an image, we can provide
mainnet vs ropsten images. It is still up to the operator to pass
along the pill path(s) to the entrypoint. For example, using Docker:

docker run --tty urbit -B /share/brass.pill -J /share/ivory.pill ...

The main .image attribute still uses only the solid pill, and image-ropsten
has been provided with brass and ivory pills.

Additionally herb has been added to the image for convenience.
2019-12-18 12:02:18 +01:00
Brendan Hay
249c02fe9f
build: trimming unnecessary image configuration 2019-12-16 09:20:28 +01:00
Jared Tobin
9d02b5e88e
Merge branch 'bh/cross-debug' (#2030)
* bh/cross-debug:
  build: add support for releasing cross-compiled debug binaries

Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-06 21:19:20 +08:00
Joe Bryan
68a94f420f nix: actually enables debug symbols in release builds 2019-12-05 17:17:33 -08:00
Jared Tobin
2047d6a676
Merge branch 'debug-release' (#2029)
* debug-release:
  nix: enables debug symbols in release builds

Signed-off-by: Jared Tobin <jared@tlon.io>
2019-12-05 16:49:12 +08:00
Brendan Hay
5339a9a826
build: add support for releasing cross-compiled debug binaries
sh/cross can now be invoked as follows:

sh/cross urbit linux64
sh/cross urbit darwin

sh/cross urbit-debug linux64
sh/cross urbit-debug darwin
2019-12-05 09:38:09 +01:00
Joe Bryan
80628e0cac nix: enables debug symbols in release builds 2019-12-04 22:59:53 -08:00
Joe Bryan
13f61ad373 nix: removes unnecessary use of cat in ivory-header build 2019-12-04 22:57:07 -08:00
Philip Monk
0431c3c073
Merge remote-tracking branch 'origin/jam-cue-rock' into rc 2019-12-02 02:08:37 -08:00
Jared Tobin
25fbb5c54a
arvo-ropsten: revert ALEF to AMES [ci skip]
f035955a renamed %alef to %ames, so the Ropsten Arvo derivation should
be updated accordingly.
2019-12-02 16:04:06 +08:00
Philip Monk
4d1457bbaa
Merge remote-tracking branch 'origin/master' into philip/mall-real 2019-11-24 00:01:04 -08:00
Joe Bryan
9c82eadd11 ci: runs |pack after tests 2019-11-22 17:25:18 -08:00
Philip Monk
a5412f01de
Merge branch 'alef-testnet-merge' into philip/mall-real 2019-11-19 13:03:07 -08:00
Jared Tobin
c9c2e33f63 zuse, build: remove default testnet config
Returns the target %zuse contract configuration to mainnet, and also
tweaks the 'arvo-ropsten' build to use %alef instead of %ames.

Also fixes a merge conflict artifact in nix/ops/default.nix.
2019-11-15 19:26:43 +09:00
Brendan Hay
ee856536b4
build: remove unused let binding from image expression 2019-11-12 08:45:02 +01:00
Jared Tobin
999bc1704e
build: give arvo a high priority
0bdced981e introduced the 'arvo-ropsten' derivation.  Attempting to
install both 'arvo' and 'arvo-ropsten' via nix-env will result in a
priority error; this assigns a higher priority to 'arvo' to resolve the
conflict.

Fixes #1912.
2019-11-05 07:10:04 +08:00
Ted Blackman
9a02c64b45 Merge branch 'master' into alef-testnet-merge
Untested, has not been run.
Uses master pills for now.  Will need refreshing.
2019-11-02 23:37:01 -04:00
Joe Bryan
46934cef17 nix: fix ivory-header error conditions (detecting lfs pointers) 2019-11-01 14:47:57 -07:00
Jared Tobin
0bdced981e
build: add Ropsten derivations for arvo and pills
Arvo testnets typically use Ropsten's deploy of the Azimuth contract
instead of mainnet's.  This commit adds an 'arvo-ropsten' derivation for
Arvo as specialised to Ropsten.

In addition to using a different Azimuth address in %zuse, this also
configures %ames and :acme appropriately for running an alternate
network on Ropsten.  %ames has its protocol version incremented, and
:acme uses the Let's Encrypt staging API.

Included here are derivations for creating brass and ivory pills using
arvo-ropsten, to boot.
2019-10-24 10:03:52 +08:00
Jared Tobin
d8f5836876
Merge branch 'image-build' (#1856)
* image-build:
  build: simplify image build interface

Signed-off-by: Jared Tobin <jared@tlon.io>
2019-10-22 10:25:55 +08:00
Brendan Hay
4813d9829b
build: simplify image build interface
This removes the baked in codedump inspection and wrapper scripts
in favour of downstream tooling overriding this as necessary by
using FROM <image> in their respective dockerfile.
2019-10-22 10:18:37 +08:00
Jared Tobin
71b27b0300
Merge branch 'pretty-userspace' (#1847)
* pretty-userspace:
  pills
  hoon: moves new pretty-printer back into userspace

Signed-off-by: Jared Tobin <jared@tlon.io>
2019-10-22 10:12:05 +08:00
Joe Bryan
10645a8d23 build: always include debug symbols 2019-10-17 18:20:23 -07:00
Joe Bryan
fa01bfb0a5 hoon: moves new pretty-printer back into userspace 2019-10-17 17:52:45 -07:00
Jared Tobin
9068188e4b
build: fix 'solid' derivation [ci skip]
578adc93 introduced a 'meta' attribute for handling, amongst other
things, conditional construction of the debug executable.  It missed the
'solid' derivation, causing it to break.
2019-10-15 11:56:16 +04:00
Jared Tobin
8a4a3335d5
build: fix typo [ci skip]
s/ubit/urbit
2019-10-15 11:56:05 +04:00
Ted Blackman
625f855f24 master without pills, hopefully 2019-10-14 16:02:27 -04:00
Brendan Hay
578adc9363
build: move ops debug conditional usage to drv metadata
Rather than conditional reconstructing the "urbit/bin/urbit-debug -g"
string everytime using the debug conditional, this information has been
added to the derivation's .meta attribute.
2019-10-14 10:25:34 +02:00
Brendan Hay
9fee1ffb12
Adding conditional gdb/coredump logging for debug images 2019-10-04 22:31:25 +02:00
Brendan Hay
a312651e58
Adding nix expressions to build/bake docker images 2019-10-03 20:21:41 +02:00
Philip Monk
bd36e61b22
Merge remote-tracking branch 'origin/master' into philip/kale 2019-08-08 14:51:14 -07:00
Philip Monk
900e7fc12c
review fixes 2019-08-07 13:44:41 -07:00
Philip Monk
b0dee239e7
Merge remote-tracking branch 'origin/master' into philip/kale 2019-08-06 15:47:20 -07:00
Joe Bryan
c6a90db71a updates solid pill staging to handle :lens and +solid changes 2019-08-06 11:03:14 -07:00
Joe Bryan
8801854d4c updates :lens app during solid pill staging 2019-08-05 16:34:17 -07:00
Philip Monk
21e4baa2ed
Merge remote-tracking branch 'origin/master' into philip/kale 2019-08-05 13:02:31 -07:00
Joe Bryan
47d7d48928 moves ca-bundle header generation into a separate nix derivation 2019-08-02 13:57:34 -07:00
Joe Bryan
e9def4d3d8 moves ivory header generation into a separate nix derivation 2019-08-02 13:55:15 -07:00
Philip Monk
1391ecafd3
pills and fix pill generation 2019-08-01 13:17:14 -07:00
Joe Bryan
0d3df28fdb automatically generates header for embedded ivory.pill 2019-07-23 12:25:26 -07:00
Logan Allen
d4b5e0114c Added update-ivory-pill script 2019-07-19 16:05:46 -07:00
Joe Bryan
77a23ee542 Merge branch 'v0.8.0.rc' into xcompile-curl-tls
* v0.8.0.rc:
  Move urbit output binary to a build directory.
  80 cols
  changed name of app to be consistent
  updated publish files
2019-07-11 17:05:58 -07:00