Commit Graph

390 Commits

Author SHA1 Message Date
fang
2c5510db64
Merge branch 'jb/next-gen-term' into next/dill
Resolves a good number of conflicts. Most notably, re-propagates removal
of gall's %onto, confirms new /app/herm behavior, coerces hood/drum
state adapters back into place, and updates webterm to use the latest
api.
2022-01-24 14:50:16 +01: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
Philip Monk
06e5c59635
vere: bump version to 1.8 2021-11-19 18:41:32 -08:00
Philip Monk
1c26ef6fe9
urbit-king: bump zuse to 419 2021-11-19 18:33:58 -08:00
Philip Monk
21e3b2b2f9
vere: bump version to 1.7 2021-11-01 22:03:15 -07:00
Joe Bryan
5385889ebd Revert "Revert "Merge pull request #4463 from urbit/m/next-gen-term""
This reverts commit 3fba32185d.
2021-09-24 23:14:55 -04:00
Joe Bryan
b1bc4b54f3 Merge branches 'jb/rnv-restage' and 'jb/rnv-fixes', remote-tracking branches 'frodwith/keccak' and 'botter-nidnul/release/next-vere' into jb/rnv-merge
* jb/rnv-restage:
  build: patch windows uv_pipe impl to allow null writes
  build: update pmnsh to support cachix text/x-nix-narinfo responses
  vere: renames terminal streams for clarity, removes unused uv_tcp_t
  vere: suppress null writes in term.c
  Revert "Merge pull request #4463 from urbit/m/next-gen-term"

* jb/rnv-fixes:
  vere: bumps versions
  vere: fixes crash (null deref) in comet booting
  u3: fixes printf in c3_assert()

* frodwith/keccak:
  jets: ice keccak
  working keccak jets
  urcrypt: fixing some typos - now builds
  Squashed 'pkg/urcrypt/keccak-tiny/' content from commit 9b438dc0f7
  urcrypt,jets: initial commit of keccak material

* botter-nidnul/release/next-vere:
  urcrypt: argon2 only optimize for x86_64 on x86_64
2021-09-24 18:05:37 -04:00
Joe Bryan
af77576511 vere: bumps versions 2021-09-24 17:38:46 -04:00
Joe Bryan
3fba32185d Revert "Merge pull request #4463 from urbit/m/next-gen-term"
This reverts commit 39667fc071, reversing
changes made to 698fd6f66f.
2021-09-24 16:33:15 -04:00
Joe Bryan
148779f4d4 Merge branch 'release/next-vere' into jb/next-gen-term
* release/next-vere: (67 commits)
  pill: all
  kh: improve code style
  glob: update to 0v758lj.uf0s5.0nh3m.gunn6.942gj
  Fix feepicker issues
  Add exit buttons to invoices
  Fix issue with change provider button not triggering modal
  Fix scanning text issues
  Fix enum, was breaking signer button
  Fix imports in ExternalInvoice
  glob: update to 0v4.e52ik.udm4j.6aus5.02b25.vomaj
  btc-wallet: fix imports
  aqua: assert pill type
  Port BTC wallet to Typescript
  Match edouard's designs
  Add external (psbt) invoice
  Fix copy from non-secure context issue
  Use deSig for isPatp
  Use deSig rather than concat
  Add sig to valid patp in send component
  Just show total main/change addresses scanned
  ...
2021-09-09 11:48:43 -04:00
Fang
28df07313c
kh: improve code style
Based on PR feedback. Better naming, NOTE style, and increased purity.
2021-09-01 16:57:30 +02:00
Joe Bryan
4320e5e8ee Merge branch 'jb/urcrypt' into jb/next-gen-term
* jb/urcrypt: (187 commits)
  test: removes obsolete scrypt test comment
  u3: renames secp init/stop functions, fixes comment
  u3: fixes sample deconstruction error handling in scrypt jets
  u3: fixes u3kc_bex() refcount, updates style
  build: adds urcrypt to top-level shell.nix
  urcrypt: restores pkg-config api versioning scheme
  build: restore division between pkg-config and regular deps
  mingw: sets libh2o install dir (for accurate pkg-config info)
  pmnsh: adds support for pkg-config
  build: update mingw CI to use "ares" cachix cache
  build: fixes urbit+urcrypt mingw build
  build: remove obsolete (urcrypt-vendored) dependencies
  build: normalize our use of pkg-config, rename urcrypt config
  build: implements static builds in urbit ./configure, prunes deps
  build: hack urbit configure for static linking
  build: force static urcrypt on darwin
  urcrypt: updates libaes_siv link test, supplying -lcrypto
  urcrypt: updates shared-library build test, accounts for mangling
  build: gitignore urcrypt build results
  build: gitignore library binaries
  ...
2021-08-20 16:59:33 -04:00
fang
288c2121d1
kh: respect slog priority
When printing slogs, if priority is greater than zero, prefix with '>'
characters, and adjust the slog color.
2021-06-17 23:49:45 +02:00
fang
eadd7aad01
kh: rewrite hijack to guarantee lojacking
No longer allow lojack to be called independently, instead requiring
logic to be inserted between hi- and lojack's io.
2021-06-17 23:49:44 +02:00
fang
addcf42468
kh: improve code style
Removes superfluous parens, makes better use of pattern matching, and
respects project-wide capitalization style.
2021-06-17 23:49:44 +02:00
fang
b3964c97a6
kh: implement null check correctly 2021-06-17 23:49:43 +02:00
fang
ddf579bd75
kh: fail to parse invalid belts
Previously we would allow the tags that were added Haskell-side for
union type syntax. Now we explicitly reject those before falling back
to the auto-generated noun parsing logic.
2021-06-17 23:49:42 +02:00
fang
bdaad4cf84
kh: don't error during key validation
Instead produce an Either.
2021-06-17 17:42:44 +02:00
fang
f8d5a1644c
kh: improve naming and code style 2021-06-17 14:48:09 +02:00
fang
2d01e1851f
Merge branch 'master' into m/multipass 2021-06-09 14:34:49 +02:00
ryjm
0142fce219 king: add crud event to jael 2021-06-09 05:54:57 -04:00
ryjm
8ad9d022a1 king: fix noun derivation 2021-06-09 01:50:34 -04:00
fang
3b81e35260
dawn: better multikey format
Improves the multikeyfile format by taking a single ship and a list of
life+key pairs, instead of a list of full seeds.

Also decouples these changes from the dawn event, once again putting a
single seed into it. In the multikeyfile case, keys are injected as
%rekey events to jael near the end of the boot sequence.

Haskell-side changes may or may not be incomplete, boot presently fails
at some unknown point with what looks like a noun conversion error.
2021-06-04 01:49:15 +02:00
fang
cc362b27c9
kh: support multikeyfiles 2021-06-03 01:04:45 +02:00
fang
2e2361e522
kh: expose to/fromNoun template logic separately
Separately from deriveNoun, which gives you an entire instance. Having
access to these lets you call out to the auto-generated conversion
logic when writing custom code for it.
2021-06-03 00:59:55 +02:00
fang
0f6c3c05cd
term: best-effort compatibility with old blits
Render old %lin and %mor blits, for backwards compatibility with old
dill.
2021-05-27 20:26:12 +02:00
fang
719ff8b442
Merge branch 'master' into m/next-gen-term
Notably includes some changes to webterm's app.tsx that are required to
keep it functioning correctly. As of yet unclear why exactly this is
necessary, presumably hook shenanigans triggered by recent-ish changes.
2021-05-15 00:21:06 +02:00
fang
97540ed638
various: comments, clean-up 2021-04-28 16:45:55 +02:00
Joe Bryan
d1327db316 urbit: bumps version to 1.5 2021-04-27 13:58:44 -07:00
pilfer-pandex
b2c2aa2240
Merge pull request #4792 from urbit/lf/king-fix-hidden-files
king: do not commit files starting with a dot
2021-04-26 19:23:15 -04:00
pilfer-pandex
db87197479 urbit: bump version to 1.4 2021-04-26 19:22:21 -04:00
pilfer-pandex
94ad4ec3ac king: fix typo in UDP.hs comment 2021-04-26 18:58:14 -04:00
pilfer-pandex
dad455365d king: add requested disclamer to UDP.hs 2021-04-23 15:51:51 -04:00
pilfer-pandex
0bcc83f40c king: my god, actually reverse ip addrs 2021-04-23 15:51:51 -04:00
pilfer-pandex
17bf33d3a0 king: fix byte order of Ipv4 2021-04-23 15:51:51 -04:00
pilfer-pandex
48837a1fbe king: ames: make udp serv reuse port on err 2021-04-23 15:51:50 -04:00
Liam Fitzgerald
d357593ef1
king: address ~pilfer-pandex review 2021-04-21 16:40:22 +10:00
fang
d1fba5d740
kh: correctly (re)store styled lines
We weren't accounting for the cursor column when storing output, nor
accounting for styled contents properly.

See also a8de23ca9 for the equivalent change in Vere.
2021-04-21 00:43:12 +02:00
Liam Fitzgerald
e6857d5797
king: do not commit files starting with a dot 2021-04-20 15:32:26 +10:00
fang
8716c49b45
kh: always draw spinner on bottom line
Now always draws the spinner on the bottom line, regardless of the
cursor position.
2021-04-16 15:11:33 +02:00
fang
fab0f65d58
term: bump on-return spinner delay from 0 to 100ms
Not drawing the spinner when the command gets processed nearly instantly
makes things feel slightly better.
2021-04-15 20:54:55 +02:00
fang
c55ebf36a4
kh: don't show spinner name for user inputs 2021-04-14 20:35:17 +02:00
fang
98d48913bf
kh: improve term code style
Based on feedback during review.
2021-04-14 17:10:50 +02:00
fang
0a75ca19f3
kh: support mouse reporting for %hit belts
This comes with the caveat that this specific mouse reporting mode
(which should only report clicks of the primary button) doesn't
actually seem to be supported by most terminal emulators, even though
it precedes the more complex reporting modes.

(Enabling a more complex reporting mode instead would also capture
scroll events, which interferes with expected behavior while in tmux.)
2021-04-02 14:25:29 +02:00
fang
01b8995e33
kh: decouple trace & slog writing from drum prompt
New blit logic already stopped assuming the bottom line based on %nel
blits, instead looking at cursor position to determine if something
was getting drawn to the bottom of the screen or not.

Here, we stop overwriting the bottom line entirely (except for the
spinner), instead inserting the trace/slog directly above the bottom
line on-screen, without overwriting anything.

Side-effect of this is that trailing newlines are always there, so we
can stop including them explicitly.
2021-04-02 14:21:22 +02:00
fang
a90489830d
kh: update Term for new dill interface
Support new Belts/Blits and updated semantics.
2021-04-02 13:58:13 +02:00
fang
1abbe168fe
kh: expose to/fromNoun template logic separately
Separately from deriveNoun, which gives you an entire instance. Having
access to these lets you call out to the auto-generated conversion
logic when writing custom code for it.
2021-04-02 13:21:20 +02:00
Joe Bryan
4df706b842 urbit: bumps version to 1.3 2021-04-01 15:33:14 -07:00
pilfer-pandex
229ae81bf1
Merge pull request #4516 from ryjm/fix-king-scry
king: fix textAsTa
2021-03-23 14:54:56 -04:00
pilfer-pandex
f0f88b4145
Merge pull request #4640 from urbit/pp/lmdb
hs: remove lmdb-static; just use lmdb
2021-03-23 14:53:23 -04:00