Commit Graph

17256 Commits

Author SHA1 Message Date
Jared Tobin
6f5b87f148
Merge branch 'ford-re-pit' (#2384)
* origin/ford-re-pit:
  test: use %ford pit-shortcircuit instead of cache-priming
  ford: restores pit-shortcircuit, but only during boot

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-03-03 16:49:50 +04:00
Jared Tobin
be2c07d80d
Merge branch 'jt/urbit-large-log' (#2344)
* origin/jt/urbit-large-log:
  build: remove urbit-large-log-limit derivation
  vere: use 40G mapsize only on macOS, 60G otherwise
  build: better vere label patch
  build: add configurePhase for urbit derivation
  build: label large-log-limit vere version
  Revert "Revert "Merge branch 'jt/urbit-large-log' (#2211)""

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-03-03 16:26:50 +04:00
Joe Bryan
3444e20a92 test: use %ford pit-shortcircuit instead of cache-priming 2020-03-02 12:20:53 -08:00
Joe Bryan
18f199b2c3 ford: restores pit-shortcircuit, but only during boot 2020-03-02 12:20:21 -08:00
Jared Tobin
d72bddd66d
Merge branch 'reignore' (#2362)
* origin/reignore:
  gitignore: re-add mystery lines [ci skip]
  gitattributes: export-ignore pkg/urbit/.gitignore [ci skip]
  gitignore: tweaks [ci skip]
  Revert "meta: remove herb, urbit .gitignore files [ci skip]"

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-03-01 23:40:18 +04:00
Jared Tobin
88fd8bceda
gitignore: re-add mystery lines [ci skip]
Previously removed in 44c88cc.  What do they ignore?  Nobody knows.  But
just in case they're still relevant..
2020-03-01 23:19:01 +04:00
Jared Tobin
c078c16eba
build: remove urbit-large-log-limit derivation
Made unnecessary by 578593d45.
2020-03-01 23:04:22 +04:00
Jared Tobin
578593d347
vere: use 40G mapsize only on macOS, 60G otherwise
Per discussion in urbit/urbit#2344, there doesn't seem to be any problem
in raising the default LMDB mapsize on non-mac operating systems.
2020-03-01 22:58:20 +04:00
Jared Tobin
9c1d3090c9
Merge branch 'lukechampine/crypto-tests' (#2222)
* lukechampine/crypto-tests:
  test: add bip32 vectors
  test: add scrypt vectors
  test: add hmac vectors
  test: add ed25519 vectors
  test: add expect arm
  test: add AES SIV mode vectors
  zuse: split sivb keys at correct offset
  test: add AES-CMAC vectors
  test: add AES CTR mode vectors
  test: add AES CBC mode vectors
  test: add AES ECB mode vectors
2020-02-29 19:39:35 +04:00
Jared Tobin
70d099e969
gitattributes: export-ignore pkg/urbit/.gitignore [ci skip] 2020-02-29 18:05:17 +04:00
Jared Tobin
44c88cc645
gitignore: tweaks [ci skip]
Removes the herb .gitignore previously removed in 7fab8be0dc, replacing
its contents with a cross-project ignore of Nix's 'result' symlink
artifact in the root .gitignore.

Moves some entries from the Vere .gitignore into the root file, as it
seems they can safely be assumed to be undesirable everywhere.

Also cleans up the root .gitignore, removing duplicate entries,
superfluous patterns, etc.
2020-02-29 18:00:25 +04:00
Jared Tobin
bd2d90440f
Merge branch 'ted/ford-no-pit' (#2322)
* origin/ted/ford-no-pit:
  pills: update solid
  http.c: revert timeout to original ~m10
  tests: prime ford %reef cache
  http.c: bump timeout from ~m20 to ~m30
  http.c: bump timeout from ~m10 to ~m20
  tests: fix ford tests for no %reef short-circuit
  ford: remove pit short-circuit
2020-02-28 20:48:24 +04:00
lukechampine
f214ac8191 test: add bip32 vectors 2020-02-28 11:47:43 -05:00
lukechampine
0688c31d8a test: add scrypt vectors 2020-02-28 11:47:43 -05:00
lukechampine
58cdceafd6 test: add hmac vectors 2020-02-28 11:47:43 -05:00
lukechampine
b300a97ca4 test: add ed25519 vectors 2020-02-28 11:47:43 -05:00
Jared Tobin
d4225848be
pills: update solid 2020-02-28 20:31:32 +04:00
Jared Tobin
046506f9d4
Merge branch 'liam-fitzgerald/hoon-spot' (#2247)
* liam-fitzgerald/hoon-spot:
  hoon: toggle spot typehints on flag
  hoon: support %spot hint in xray
  hoon: add %spot typehint

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-28 20:02:39 +04:00
Jared Tobin
6ef08962ef
Merge branch 'joemfb/cache-skip-pr' (#2363)
* joemfb/cache-skip-pr:
  ci: skip cachix push if env is not set and in a pr build

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-27 20:04:30 +04:00
Joe Bryan
871828ee66 ci: skip cachix push if env is not set and in a pr build 2020-02-26 17:44:13 -08:00
Joe Bryan
c6bfdf9426 Revert "meta: remove herb, urbit .gitignore files [ci skip]"
This reverts commit 7fab8be0dc.
2020-02-26 16:50:04 -08:00
Ted Blackman
17a621e8e7 http.c: revert timeout to original ~m10 2020-02-26 15:43:46 -05:00
Jared Tobin
686aaa565e
Merge branch 'ixv/publish-invitatory' (#2351)
* origin/ixv/publish-invitatory:
  publish: add publish invite path

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-26 11:11:10 +04:00
Liam Fitzgerald
8c6ae6f917 Merge branch 'master' into hoon-spot 2020-02-26 09:29:54 +10:00
Liam Fitzgerald
df51577022 hoon: toggle spot typehints on flag
Hides %spot typehints behind a compiler flag. Adds ++mind:ut to
expose this flag conveniently.
2020-02-26 08:07:02 +10:00
Isaac Visintainer
9581a0535c publish: add publish invite path 2020-02-25 13:43:06 -08:00
Ted Blackman
44b3c9b2a3 tests: prime ford %reef cache 2020-02-25 15:53:08 -05:00
Ted Blackman
3d6f1b565f http.c: bump timeout from ~m20 to ~m30 2020-02-25 13:14:41 -05:00
Ted Blackman
3c54e61a04 http.c: bump timeout from ~m10 to ~m20 2020-02-25 04:44:51 -05:00
Ted Blackman
af04767dfe tests: fix ford tests for no %reef short-circuit 2020-02-24 18:11:47 -05: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
024908dd6a
Merge branch 'm/dbug-default' (#2343)
* origin/m/dbug-default:
  dbug: default to %state

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-24 13:44:10 +04:00
Jared Tobin
24ec14d53f
Merge branch 'm/permission-hook-state-hygiene' (#2335)
* origin/m/permission-hook-state-hygiene:
  permission-hook: clean up access-control on %delete

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-24 13:43:57 +04:00
Fang
a61718fd51
dbug: default to %state 2020-02-23 01:46:26 +01:00
Fang
d80b5d24bc
permission-hook: clean up access-control on %delete
If we %add-owned, then we add an entry to the access-control jug matching the
data we put into the synced map. When a permission gets deleted, we remove it
from synced, but previously neglected to clean up the matching access-control
entry.

This ensures that if a permission was deleted, and we had it registered as
owned, that the relevant access-control entry is removed from state.
2020-02-21 21:45:04 +01:00
Ted Blackman
d917eebe56 ford: remove pit short-circuit 2020-02-20 16:38:21 -05:00
Jared Tobin
f4bc103a25
Merge branch 'jt/sh-king-tweak'
* jt/sh-king-tweak:
  sh: ensure release dir exists in static king build

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-20 20:00:03 +04:00
Jared Tobin
4c6b665e94
sh: ensure release dir exists in static king build
Fixes a minor bug that can occur when copying the resulting binary.

(Also removes the use of ldd, which doesn't apply in the static binary
case.)
2020-02-20 19:55:49 +04:00
Jared Tobin
fe05a61b8b
Merge branch 'bs/king-uncursed' (#2313)
* origin/bs/king-uncursed:
  king: Terminal input line wasn't being shown b/c line buffering.
  king: Remove TERMINFO_DIRS hack.
  king: First stab at removing terminfo dependency.
  king: New dependency: `ansi-terminal`
  king: Factored all terminal rendering logic into its own module.

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-20 14:42:55 +04:00
Benjamin Summers
957c0da9bb
king: Terminal input line wasn't being shown b/c line buffering. 2020-02-20 14:41:07 +04:00
Benjamin Summers
e1f6db7250
king: Remove TERMINFO_DIRS hack. 2020-02-20 14:41:07 +04:00
Benjamin Summers
9d2d6c42c6
king: First stab at removing terminfo dependency. 2020-02-20 14:41:07 +04:00
Benjamin Summers
a318462836
king: New dependency: ansi-terminal 2020-02-20 14:41:06 +04:00
Benjamin Summers
3b1bd6600a
king: Factored all terminal rendering logic into its own module. 2020-02-20 14:41:03 +04:00
Jared Tobin
bed28da17f
Merge branch 'kh/release-build' (#2293)
* origin/kh/release-build:
  king: Use newer static-haskell-nix script for KH build.

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-20 09:33:36 +04:00
Jared Tobin
618cfa862b
MAINTAINERS: several updates [ci skip]
* recommend using sh/merge-with-custom-msg
* recommend cherry-picking merge commits
* drop hep from release candidate tag format
* minor other additions
2020-02-18 16:51:07 +04:00
Jared Tobin
915bf1332f
sh/release-archive: 'set -e' in header [ci skip]
Bail out on encountering any errors.
2020-02-18 16:32:21 +04:00