nandi/frqpublic Fork 0
3d7c428
Commits
Clone
git clone https://git.rickub.com/nandi/frq.git
git clone ssh://git@rickub.com/nandi/frq.git

Host key fingerprint (ed25519): SHA256:iycHnxEyq0Q7uyVpB7JlznP0G7JrTPXLYRcAU5CSLhc — verify it before your first connect.

Pin jolt-native at the merge rather than at the branch

jvui-for-frq is merged into jolt-native's main, so the pin names a rev on
main again and the note above it stops describing a branch that is no
longer where the work lives. deps.edn's sha moves with it, as always.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
nandi committed 2026-09-10T10:38:22-07:00 Browse files
3d7c428 parent: 33fc075
modified deps.edn +1 -1
@@ -17,7 +17,7 @@
1717 :deps {jolt-lang/glimmer {:git/url "https://gitlab.com/nandithebull/glimmer"
1818 :git/sha "399df371c790d690fb6e4560c3d4d7f838502857"}
1919 nandi/glimmer-jvui {:git/url "https://gitlab.com/nandithebull/jolt-native"
20- :git/sha "d6b9f3af2f4baac285b441150ec08d86a29b701d"
20+ :git/sha "ce4d910f39e70b3954a64cc88499480d0ac4bab9"
2121 :deps/root "glimmer-backends/glimmer-jvui"}}
2222
2323 ;; What the UI loads is SDL, and jvui declares it itself — SDL3, SDL3_ttf
@@ -17,7 +17,7 @@
17 :deps {jolt-lang/glimmer {:git/url "https://gitlab.com/nandithebull/glimmer"17 :deps {jolt-lang/glimmer {:git/url "https://gitlab.com/nandithebull/glimmer"
18 :git/sha "399df371c790d690fb6e4560c3d4d7f838502857"}18 :git/sha "399df371c790d690fb6e4560c3d4d7f838502857"}
19 nandi/glimmer-jvui {:git/url "https://gitlab.com/nandithebull/jolt-native"19 nandi/glimmer-jvui {:git/url "https://gitlab.com/nandithebull/jolt-native"
20- :git/sha "d6b9f3af2f4baac285b441150ec08d86a29b701d"20+ :git/sha "ce4d910f39e70b3954a64cc88499480d0ac4bab9"
21 :deps/root "glimmer-backends/glimmer-jvui"}}21 :deps/root "glimmer-backends/glimmer-jvui"}}
22 22
23 ;; What the UI loads is SDL, and jvui declares it itself — SDL3, SDL3_ttf23 ;; What the UI loads is SDL, and jvui declares it itself — SDL3, SDL3_ttf
modified flake.lock +4 -4
@@ -155,16 +155,16 @@
155155 "rust-overlay": "rust-overlay"
156156 },
157157 "locked": {
158- "lastModified": 1789061644,
158+ "lastModified": 1789061836,
159159 "narHash": "sha256-6NTLrsAbwp2A7GyS63dX/pfWH6l2BZW/4gucXBhXg18=",
160160 "ref": "refs/heads/main",
161- "rev": "d6b9f3af2f4baac285b441150ec08d86a29b701d",
162- "revCount": 89,
161+ "rev": "ce4d910f39e70b3954a64cc88499480d0ac4bab9",
162+ "revCount": 91,
163163 "type": "git",
164164 "url": "https://gitlab.com/nandithebull/jolt-native"
165165 },
166166 "original": {
167- "rev": "d6b9f3af2f4baac285b441150ec08d86a29b701d",
167+ "rev": "ce4d910f39e70b3954a64cc88499480d0ac4bab9",
168168 "type": "git",
169169 "url": "https://gitlab.com/nandithebull/jolt-native"
170170 }
@@ -155,16 +155,16 @@
155 "rust-overlay": "rust-overlay"155 "rust-overlay": "rust-overlay"
156 },156 },
157 "locked": {157 "locked": {
158- "lastModified": 1789061644,158+ "lastModified": 1789061836,
159 "narHash": "sha256-6NTLrsAbwp2A7GyS63dX/pfWH6l2BZW/4gucXBhXg18=",159 "narHash": "sha256-6NTLrsAbwp2A7GyS63dX/pfWH6l2BZW/4gucXBhXg18=",
160 "ref": "refs/heads/main",160 "ref": "refs/heads/main",
161- "rev": "d6b9f3af2f4baac285b441150ec08d86a29b701d",161+ "rev": "ce4d910f39e70b3954a64cc88499480d0ac4bab9",
162- "revCount": 89,162+ "revCount": 91,
163 "type": "git",163 "type": "git",
164 "url": "https://gitlab.com/nandithebull/jolt-native"164 "url": "https://gitlab.com/nandithebull/jolt-native"
165 },165 },
166 "original": {166 "original": {
167- "rev": "d6b9f3af2f4baac285b441150ec08d86a29b701d",167+ "rev": "ce4d910f39e70b3954a64cc88499480d0ac4bab9",
168 "type": "git",168 "type": "git",
169 "url": "https://gitlab.com/nandithebull/jolt-native"169 "url": "https://gitlab.com/nandithebull/jolt-native"
170 }170 }
modified flake.nix +7 -10
@@ -44,16 +44,13 @@
4444 # fetches those prebuilt — so this input is what `just run` builds against
4545 # and what an APK's Clojure side is read from, both at this rev.
4646 #
47- # Pinned all the same, and pinned to a rev: this input carries both halves of
48- # glimmer-vidya — libvidya, and the Jolt side that binds it — so an
49- # Pinned to `jvui-for-frq`: it
50- # carries jvui and glimmer-jvui — the toolkit the window is painted with
51- # now — and, merged in from no-moq-deps, the dependency split and the
52- # JOLT_WITHOUT_MOQ guard on the Android glue. It is
53- # branched from the rev this used to name rather than taken off main,
54- # because main has moved on to the Zig/dvui backend and a UI change is
55- # not what this pin is for.
47+ # It carries jvui and glimmer-jvui — the toolkit the window is painted
48+ # with now — and, from no-moq-deps, the dependency split and the
49+ # JOLT_WITHOUT_MOQ guard on the Android glue. Both were on the
50+ # `jvui-for-frq` branch while they were being written and are merged into
51+ # main now, which is why this names a rev on main again.
5652 #
53+ # Pinned all the same, and pinned to a rev, because an
5754 # unpinned `main` is a build whose native half is free to sit at a
5855 # different commit from the tree that talks to it. It did, and what the
5956 # drift cost was silence: the Jolt half sent a reaction pill's hover card
@@ -64,7 +61,7 @@
6461 # drift this comment warns about wearing a different hat: one input, and
6562 # the window and the terminal are the same library either way.
6663 jolt-native = {
67- url = "git+https://gitlab.com/nandithebull/jolt-native?rev=d6b9f3af2f4baac285b441150ec08d86a29b701d";
64+ url = "git+https://gitlab.com/nandithebull/jolt-native?rev=ce4d910f39e70b3954a64cc88499480d0ac4bab9";
6865 inputs.nixpkgs.follows = "nixpkgs";
6966 };
7067
@@ -44,16 +44,13 @@
44 # fetches those prebuilt — so this input is what `just run` builds against44 # fetches those prebuilt — so this input is what `just run` builds against
45 # and what an APK's Clojure side is read from, both at this rev.45 # and what an APK's Clojure side is read from, both at this rev.
46 #46 #
47- # Pinned all the same, and pinned to a rev: this input carries both halves of47+ # It carries jvui and glimmer-jvui — the toolkit the window is painted
48- # glimmer-vidya — libvidya, and the Jolt side that binds it — so an48+ # with now — and, from no-moq-deps, the dependency split and the
49- # Pinned to `jvui-for-frq`: it49+ # JOLT_WITHOUT_MOQ guard on the Android glue. Both were on the
50- # carries jvui and glimmer-jvui — the toolkit the window is painted with50+ # `jvui-for-frq` branch while they were being written and are merged into
51- # now — and, merged in from no-moq-deps, the dependency split and the51+ # main now, which is why this names a rev on main again.
52- # JOLT_WITHOUT_MOQ guard on the Android glue. It is
53- # branched from the rev this used to name rather than taken off main,
54- # because main has moved on to the Zig/dvui backend and a UI change is
55- # not what this pin is for.
56 #52 #
53+ # Pinned all the same, and pinned to a rev, because an
57 # unpinned `main` is a build whose native half is free to sit at a54 # unpinned `main` is a build whose native half is free to sit at a
58 # different commit from the tree that talks to it. It did, and what the55 # different commit from the tree that talks to it. It did, and what the
59 # drift cost was silence: the Jolt half sent a reaction pill's hover card56 # drift cost was silence: the Jolt half sent a reaction pill's hover card
@@ -64,7 +61,7 @@
64 # drift this comment warns about wearing a different hat: one input, and61 # drift this comment warns about wearing a different hat: one input, and
65 # the window and the terminal are the same library either way.62 # the window and the terminal are the same library either way.
66 jolt-native = {63 jolt-native = {
67- url = "git+https://gitlab.com/nandithebull/jolt-native?rev=d6b9f3af2f4baac285b441150ec08d86a29b701d";64+ url = "git+https://gitlab.com/nandithebull/jolt-native?rev=ce4d910f39e70b3954a64cc88499480d0ac4bab9";
68 inputs.nixpkgs.follows = "nixpkgs";65 inputs.nixpkgs.follows = "nixpkgs";
69 };66 };
70 67