Commit Graph

17216 Commits

Author SHA1 Message Date
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
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
Jared Tobin
6acb751560
sh/merge-with-custom-msg: add checks [ci skip]
* Use 'set -e' to bail on any errors.
* If the pull request number is not specified, bail out.
* Print a simple pre-merge checklist before prompting for merge.
2020-02-17 18:21:34 +04:00
Jared Tobin
36e770f722
Merge branch 'philip/gall-ack-fix' (#2288)
* origin/philip/gall-ack-fix:
  gall: give both acks in case of unexpected ack
  gall: make 2140e07 ota-able
  gall: properly track remote acknowledgments

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-14 20:00:50 +04:00
Benjamin Summers
4be4551f18 king: Use newer static-haskell-nix script for KH build. 2020-02-14 07:13:55 -08:00
Jared Tobin
696a1314f7
sh/merge-with-custom-msg: 'origin' handling fix [ci skip]
The KERNEL_CHANGED and PILLS_CHANGED variables used the revision with
'origin' stripped from it (intended for using in messages only), which
caused them to miss remote revisions.

Also tweaks the conditional so that the kernel diff only displays when
pills haven't been updated.
2020-02-14 10:47:18 +04:00
Jared Tobin
e2c4f2cc3f
Merge branch 'm/rep-comment' (#2287)
* origin/m/rep-comment:
  hoon: clarify comments for +rep:in and +rep:by

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-14 10:47:08 +04:00
Philip Monk
4fda5e8e38
gall: give both acks in case of unexpected ack
It's hard to say what's the safest thing to do when we get an ack we
weren't expecting due to losing outstanding.agents.state in +load
3-to-4, so this gives both a watch-ack and a poke-ack.  This seems most
likely to succeed.
2020-02-13 17:48:33 -08:00
Philip Monk
e082845e0d
gall: make 2140e07 ota-able
Does not change state type, but clears outstanding.agents.state since
it's full of garbage values.  This introduces a possibility that we may
have been in the middle of something, so we handle that in a reasonably
sane way.
2020-02-13 17:20:27 -08:00
Philip Monk
2140e07a99
gall: properly track remote acknowledgments
outstanding.agents.state is a queue of what sort of message we sent to a
foreign app.  We use it so that when the acknowledgment comes back we
know whether to treat it as a watch-ack, poke-ack, or neither.  We used
to put this info in the wire, but this gave us a different ames flow,
which meant %leave and %watch didn't get associated (causing #2079).

The error was that when when retrieving the item from the queue, we put
the new 1-item-shorter queue back in outstanding.agents.state at a
different wire than it came from, so the queues never actually got
shorter, and acknowledgments of the wrong sort were commonly produced.
This caused problems mainly in situations where we poke and peer on the
same wire, and possibly when a subscription was cancelled.

Possibly related to #2206 and #2176.  I would expect this bug to cause
those issues, but I haven't verified the converse.  Also possibly
related to #2153 and #2079.
2020-02-13 15:12:07 -08:00
Fang
fa138ef216
hoon: clarify comments for +rep:in and +rep:by
"Replace" suggests this function either produces an updated set/map when done,
like +snap, or changes all values in-place, like +turn. In truth, it's more
similar to +roll, which does reduction/accumulation.

("Reduce" specifically was chosen because it maintains the mnemonic relation to
the arm name.)
2020-02-13 23:56:44 +01:00
Jared Tobin
7be9ed95ab
sh/merge-with-custom-msg: add pill update check [ci skip]
It's very easy to forget to verify that pills have been updated
accordingly when the kernel changes.  This adds a warning that prints
when the kernel in the target has changed but the pills have not.

Also prompts the user for confirmation pre-merge.
2020-02-13 19:05:18 +04:00
Jared Tobin
f848d60b68
Merge branch 'philip/ames-fix' (#2268)
* origin/philip/ames-fix:
  ames: make routing simpler

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-12 16:44:10 +04:00
Philip Monk
41fd367bff
ames: make routing simpler 2020-02-10 17:49:18 -08:00
Jared Tobin
be5fb8b9cf
Merge branch 'king-haskell' (#2107)
* origin/king-haskell: (411 commits)
  Fix counting bug in event log replay.
  fix progress bar in daemon mode
  Got Linux release builds working again.
  king: style improvements
  king: Build without warnings.
  Fix king-haskell Linux release build.
  Update scripts to point to `urbit-king`.
  Renamed modules Ur.** to Urbit.** to be consistent with urbit-{atom,hob}
  king: Rename `king` package to `urbit-king`.
  Clean up `Urbit.Atom` and move it into it's own package.
  Module structure, doc strings
  Bump stackage version.
  Got docs to build.
  king haskell: automatically connect to terminal when running a ship
  king: add partial-replay and --dry-from
  Make sure we close HTTP sockets on close (or reconfigure).
  Hack around terminfo database problem.
  Fixed bug in HTTP Server (only first block from stream was handled).
  Logging for event sourced responses.
  Cleanup port binding logic.
  ...

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-10 18:53:41 +04:00
Benjamin Summers
faec933b56 Merge branch 'master' of github.com:urbit/urbit into king-haskell 2020-02-05 15:44:11 -08:00
benjamin-tlon
8836513a7c
Merge pull request #2236 from urbit/bs/fix-log-replay
king: Fix log replay bug.
2020-02-05 15:43:33 -08:00
Benjamin Summers
3b42c5412f Fix counting bug in event log replay. 2020-02-05 15:20:32 -08:00
Jared Tobin
b49d4a0538
Merge branch 'risruc-habteb/patch-1' (#2232)
* risruc-habteb/patch-1:
  Update frontpage.hoon

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-05 17:04:54 +04:00
risruc-habteb
67221aad29
Update frontpage.hoon
Swapped "p.bek" for "our" and uncommented line 22.
2020-02-04 21:40:14 -05:00
ixv
66b5f681ca
Merge pull request #2165 from urbit/king-auto-connect
king haskell: automatically connect to terminal when running a ship
2020-02-03 17:49:47 -08:00
Isaac Visintainer
98fa24908a fix progress bar in daemon mode 2020-02-03 17:27:16 -08:00
Isaac Visintainer
e25d30163d Merge branch 'king-haskell' of https://github.com/urbit/urbit into king-auto-connect 2020-02-03 14:23:44 -08:00
Jared Tobin
769996d09f
Merge branch 'liam-fitzgerald/langserver-doc-autocomplete' (#2204)
* liam-fitzgerald/langserver-doc-autocomplete:
  language-server: magic-spoon hover, autocomplete
  language-server: build ford prelude
  language-server: dynamically compute subject
  language-server: revive rune/symbol completion
  language-server: add completion JSON parsers

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-02 19:11:04 +04:00
Jared Tobin
171fcbd263
gitattributes: export-ignore additions [ci skip]
Reflexively export-ignore .gitattributes; also export-ignore Nix
derivations.
2020-02-01 17:40:27 +04:00
Jared Tobin
7fab8be0dc
meta: remove herb, urbit .gitignore files [ci skip]
These were lying around from pre-monorepoisation.
2020-02-01 17:37:13 +04:00
Jared Tobin
ead17841bc
gitattributes: export-ignore default.nix in herb [ci skip] 2020-02-01 12:32:22 +04:00
Jared Tobin
9c644c4333
sh: add release-archive script [ci skip]
Adds a simple helper script for creating release archives.
2020-02-01 12:11:33 +04:00
Jared Tobin
eb27d67cca
gitattributes: export-ignore test directories [ci skip]
Don't include pkg/arvo/tests and pkg/urbit/tests when running
git-archive(1).

Additionally, move the export-ignore declaration for
pkg/urbit/hashtable_tests into the pkg/urbit/.gitattributes files.  For
default operation, git-archive(1) requires that these declarations be
located on the tree being archived.
2020-02-01 12:07:13 +04:00
Jared Tobin
769252f4e6
gitattributes: export-ignore hashtable_tests [ci skip]
Prevents pkg/urbit/hashtable_tests from being exported with
git-archive(1).
2020-02-01 11:22:47 +04:00
Jared Tobin
b8ce433e08
meta: remove deprecated files [ci skip]
Removes miscellaneous files that had lingered from pre-monorepoisation:

* pkg/arvo Travis and .gitignore, .gitattributes files
* pkg/urbit CONTRIBUTING.md (subsumed by file in repository root)
2020-02-01 11:17:49 +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
0fc9056074
Merge branch 'jt/urbit-large-log' (#2211)
* jt/urbit-large-log:
  build: add urbit-large-log derivation
  build: use generic builder in urbit derivation

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-01-31 14:54:09 +04:00