Commit Graph

109 Commits

Author SHA1 Message Date
fang
292a65f64c
Merge branch 'next/arvo' into yu/content-dist-merged
Includes patched versions of ames' and clay's +load arms.

In clay, we do a dumb ;; hack to get the state to adapt properly. This
shouldn't be needed ($case had an extra... case added to it, old ones
should still nest), and so we should revisit the logic there to make it
cleaner/better before release.
2022-06-30 16:27:02 +02:00
Joe Bryan
f4aeb62896 nix: vere is always built for a pace 2022-05-25 21:52:09 -04:00
Joe Bryan
6c9ef83c6c nix: macos: build mostly-static binary 2022-05-25 18:56:45 -04:00
fang
a0f7891f50
Merge branch 'philip/tomb' into lf/content-dist-rc
Beware, the ames conflict was particularly nasty. State migrations as of
yet untested.

Includes patched-up fine tests.
2022-05-19 17:07:35 +02:00
Liam Fitzgerald
8d939a9ab9 Merge remote-tracking branch 'origin/next/vere' into lf/content-dist-rc 2022-04-15 16:07:15 -05:00
Joe Bryan
cbfbfc3247 vere: removes all reference to urbit-worker 2022-04-09 22:52:09 -04:00
Joe Bryan
4aa7745630 build: remove herb from pill builders 2022-04-05 12:41:50 -04:00
Joe Bryan
77634b14f7 build: remove debug symbols from macos release 2022-04-04 19:59:58 -04:00
Liam Fitzgerald
90cdc2de6a wip 2022-01-26 22:38:26 -06:00
Jōshin
aebce8dbf5
Merge branch 'next/vere' into jo/khan-c3 2022-01-25 08:50:45 -08:00
Jōshin
da2b62fcf5
build: only exclude debug symbols on m1 2022-01-25 08:42:14 -08:00
Jōshin
ba1d5024a8
build: do not include debug symbols in release
On M1 Macs, the compiler seems to infinite-loop, consuming ever more RAM
and CPU, while trying to build `noun/allocate.c` with `-O3 -g`. `-O3` is
fine, `-g` is fine. Both at once seems to try to summon demons.

Other possible solutions aside from this:

- try lower levels of optimization until we find one that doesn't hang,
  and ship that.

- do not support M1 Mac until the underlying issue here is fixed.

- ship debug binaries on M1 for now.

The path of least resistance is of course the second option, as that's
what is already tacitly happening.
2022-01-24 12:30:46 -08:00
Jōshin
0682eb8a3a
nix,vere: move ivory def to its own source file 2021-12-26 22:31:35 +00:00
Brendan Hay
16379db9b0
build: remove haskell related nix code and haskell.nix dependency
* Upgrades the nixpkgs pin to 21.11.
* Removes nix code, sources, and attributes related to haskell.nix and
  the code under pkg/hs.
* Continuous integration no longer builds (or packages/releases)
  urbit-king (haskell).
* To continue to developing any haskell code under pkg/hs it's left as
  a user exercise uto install and configure GHC/Stack.

As a consequence running nix-shell should be considerably more
performant and requires downloading or building less dependencies.
2021-12-08 10:06:42 +01:00
Joe Bryan
9a1b9b4450 Merge branch 'master' into release/next-vere
* master: (595 commits)
  grid: updating glob
  landscape: updating glob
  graph-store: clean up merge artefact
  interface: reduce %all-stats correctly
  docket: correctly en-vase a docket definition
  kiln: don't +mean the tang noun alongside the tang
  hood: scry for list of desks with empty desk name
  hood: remove needless weld
  hood: report %kids desk hash in +report-vats
  landscape: fix joining indicator in statusbar
  interface: reduce %saw-place correctly
  app-prefs: fixing logic around enabled
  pull-hook: add nice flag to kick poke
  graph-pull-hook: renegotiate subscriptions
  graph-store: Handle missing update-logs gracefully in scries
  arvo: update jamfiles
  landscape: correctly freeze graph-update-2
  jael: on rekey, update life if moon
  tmp/ jamfiles
  btc: updating glob
  ...
2021-10-05 11:33:08 -04:00
Edward Amsden
25d32e1d5d
nix: fix broken symlinks in arvo and ropsten-patched arvo 2021-09-26 15:26:48 -04:00
Joe Bryan
dfb42f4c6f build: remove obsolete (urcrypt-vendored) dependencies 2021-08-19 20:35:48 -04:00
Joe Bryan
d137436fe8 build: normalize our use of pkg-config, rename urcrypt config 2021-08-19 20:32:55 -04:00
Joe Bryan
e3cd08b96a build: implements static builds in urbit ./configure, prunes deps 2021-08-19 20:32:53 -04:00
Joe Bryan
b993ca2c25 build: force static urcrypt on darwin 2021-08-19 20:32:50 -04:00
Joe Bryan
0b19f51a6b Merge remote-tracking branch 'frodwith/urcrypt' into jb/urcrypt-prep
* frodwith/urcrypt: (75 commits)
  move libaes_siv to deps
  fix typo in urcrypt.h
  libaes_siv now using tip of dfoxfranke master
  check for recovery header presence in configure, put -O3 in flags, move pc to distcleanfiles
  clean generated pkg-config file
  update urbit's configure to use a liburcrypt version
  add a versioning scheme to urcrypt
  remove scrypt from urbit build (in urcrypt now)
  move the rest of the scrypt jets to urcrypt, enable them, and correct the hoon test to match the source rfc.
  scr-pbk->urcrypt
  start scrypt porting
  Squashed 'pkg/urcrypt/scrypt/' content from commit a402f4116
  finish porting secp jets to urcrypt
  pkg-config support for urcrypt, update urbit build
  cosmetic configure things
  require shared ssl when building a shared urcrypt
  remove some old files
  add autogen.sh
  use srcdir in -I to support out of tree builds
  whitespace and symbol cleanup
  ...
2021-08-19 20:03:19 -04:00
Joe Bryan
44c7eedbd2 build: updates libaes_siv, builds from upstream 2021-08-04 23:38:31 -04:00
Brendan Hay
d72db74492
king: ensure lmdb is statically linked on osx
By way of ensuring the lmdb package's cabal extra-libraries field
is ignored and our lmdb overlay is used. Don't ask.
2021-04-27 19:50:16 +02:00
Pax Dickinson
cc3fdf80d5 docker: make reset-urbit-code work properly 2021-04-18 16:00:15 -04:00
Pax Dickinson
a77eeed64a docker: add curl, implement scripts for obtaining +code from loopback 2021-04-18 10:14:39 -04:00
wexpertsystems
2bab57d6b5
Escape the nix quotation properly.
Fixes nix syntax error

Co-authored-by: Edward Amsden <edward@blackriversoft.com>
2021-04-15 17:28:15 -04:00
Pax Dickinson
ef1b438c22 docker: allow setting Ames port via docker run argument 2021-04-15 14:59:52 -04:00
Pax Dickinson
685ef12e8f docker: add exec to final urbit invocation 2021-04-14 15:19:31 -04:00
pilfer-pandex
3ca526bd5b hs: it seems I misread bren, again 2021-03-22 16:35:19 -04:00
pilfer-pandex
a7dbc692e5 hs: dunno, try this 2021-03-22 16:01:14 -04:00
pilfer-pandex
e2b2c29990 Merge branch 'release/next-vere' into pp/lmdb 2021-03-22 15:55:38 -04:00
pilfer-pandex
5bb01e5bae hs: modify hs/default.nix accordingly 2021-03-22 15:55:15 -04:00
Joe Bryan
027c5d4603 build: patch lmdb to use F_FULLFSYNC on darwin 2021-03-15 15:20:57 -07:00
Paul Driver
0d064dfd54 move libaes_siv to deps 2021-03-11 10:55:04 -08:00
Edward Amsden
8d8dc826cb
docker-image: Pass -t flag to vere if not in an interactive container
Vere will not run a ship if STDIN is closed, unless passed the `-t`
flag. Hosted docker containers will not be interactive, but we would
like the docker image to be usable locally and interactively as well.

Thus, we check for STDIN being closed in the shell prior to launching
Vere, and if it is closed, pass the `-t` flag.
2021-01-16 19:44:04 -05:00
Edward Amsden
d3c5aa74c1
build: A 'smart' docker image
This commit adds the `docker-image` attribute to the main Nix
entrypoint, invoking `nix/pkgs/docker-image` which will build
a 'smart' docker image that can load keyfiles or a pier and
boot a ship

It includes a README for the official docker image, suitable
for posting as the README to a Docker Hub or similar docker
image repository.
2021-01-13 07:37:28 -05:00
Joe Bryan
3e4d495500 nix: remove lib/base64 from solid pill staging 2020-12-08 16:22:58 -08:00
Joe Bryan
548440a85d nix: trims trailing whitespace from solid pill builder 2020-11-20 15:23:56 -08:00
Joe Bryan
b1e3b0def2 hoon: moves $xray into userspace 2020-11-20 15:23:56 -08:00
Joe Bryan
aea0f571d7 hoon: moves $plum and +plume to userspace 2020-11-20 15:23:56 -08:00
Brendan Hay
983261a3d8
build: move darwin install_name_tool fixup from vere to king haskell
As well as some variable naming consistency to appease the nixpkgs
gremlins and keep the git history lords on their toes.
2020-11-06 09:47:11 +01:00
Brendan Hay
767a6f85a4 build: remove {sha256,md5} output for push-storage-object effects 2020-11-05 11:39:05 -08:00
Brendan Hay
644acd5002
build: ensure urbit tests are run with the -g argument 2020-11-05 10:25:31 +01:00
Brendan Hay
dd782e062e
vere: ensure debug symbols aren't stripped by default (by nix) 2020-11-05 10:25:30 +01:00
Brendan Hay
8d0a65bb6e
vere: remove dependency on nix-store path for static darwin binary
Poached from @eglaysher's work in #3380.
2020-11-04 20:50:45 +01:00
Brendan Hay
9e1f75da64
build: simplify build tool selection for shell.nix 2020-11-04 15:34:03 +01:00
Brendan Hay
6599a85b99
king: ensure tests are enabled on ci and don't depend on lfs pills 2020-10-29 16:20:41 +01:00
Brendan Hay
fada33dfe6
build: remove checkMaterialization flag 2020-10-28 18:19:53 +01:00
Brendan Hay
689c0eb6a0
build: ensuring release tarball contains singular parent directory
This ensures parity with the current release tarballs.
2020-10-28 11:05:58 +01:00
Brendan Hay
ce3cbf0857
build: rework all nix expressions to support hercules-ci builds
This also removes nixcrpkgs and OSX cross compilation in favour of
compiling on the target. x86_64/musl targets are still supported
on Linux.

All sources are now managed via niv (see nix/sources.json) and Haskell
package sets are provided/organised via IOHK's haskell.nix.

Some effort has been made to expose similar top-level attributes for
development, but in some cases there have been changes. Please see
the comments in the top-level default.nix and ci.nix files for usage.
2020-10-27 13:55:49 +01:00