rickub
Sign in Get started
nandi/frqpublic⑂ Fork 0
⑂ aaa560d
Branches
claude/add-remote-repository-47d12e main View all branches → View all tags →
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.

Take jolt and jolt-native as flakes, off my own fork

jolt-native moves to the tip of main (c41903b..4956d1e); its git-dep
hashes did not move with it, so cargoLock is untouched.

jolt-src leaves jolt-lang/jolt for the fork jolt-android-src already
pins. A desktop runtime built from a different tree than the APK's is
the drift the jolt-native comment warns about, so the two now name one
repo: the desktop follows its main, the APK stays on its rev, because
an APK is a release artefact and moves when `just bump` says so.

All three jolt inputs drop `flake = false`. Their outputs are still not
what we take — joltFrom builds the runtime here — but locking them as
flakes pins their own inputs with ours rather than leaving them to
float inside theirs, which is most of the lock's growth. nixpkgs
follows ours so the closure keeps one. `?submodules=1` is still what
carries `vendor/`, and still why the URL is git+https and not github:.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
nandi committed 2026-09-06T01:20:50-07:00 Browse files
aaa560d parent: 0b81161
modified flake.lock +244 -16
@@ -19,6 +19,21 @@
1919 "url": "https://github.com/cisco/ChezScheme"
2020 }
2121 },
22+ "crane": {
23+ "locked": {
24+ "lastModified": 1788465171,
25+ "narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=",
26+ "owner": "ipetkov",
27+ "repo": "crane",
28+ "rev": "eb35abda9f232cc6610b1d1e3200d15c49b7ac54",
29+ "type": "github"
30+ },
31+ "original": {
32+ "owner": "ipetkov",
33+ "repo": "crane",
34+ "type": "github"
35+ }
36+ },
2237 "flake-compat": {
2338 "flake": false,
2439 "locked": {
@@ -71,6 +86,24 @@
7186 "type": "github"
7287 }
7388 },
89+ "flake-utils_3": {
90+ "inputs": {
91+ "systems": "systems_3"
92+ },
93+ "locked": {
94+ "lastModified": 1731533236,
95+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
96+ "owner": "numtide",
97+ "repo": "flake-utils",
98+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
99+ "type": "github"
100+ },
101+ "original": {
102+ "owner": "numtide",
103+ "repo": "flake-utils",
104+ "type": "github"
105+ }
106+ },
74107 "glimmer": {
75108 "flake": false,
76109 "locked": {
@@ -89,7 +122,12 @@
89122 }
90123 },
91124 "jolt-android-src": {
92- "flake": false,
125+ "inputs": {
126+ "makes": "makes",
127+ "nixpkgs": [
128+ "nixpkgs"
129+ ]
130+ },
93131 "locked": {
94132 "lastModified": 1788137223,
95133 "narHash": "sha256-VeHi864PEtZoHRNA7ms9uaJb6+7nHvDyRXqLLPQ1tao=",
@@ -108,44 +146,96 @@
108146 }
109147 },
110148 "jolt-native": {
111- "flake": false,
149+ "inputs": {
150+ "crane": "crane",
151+ "flake-utils": "flake-utils",
152+ "nixpkgs": [
153+ "nixpkgs"
154+ ],
155+ "rust-overlay": "rust-overlay"
156+ },
112157 "locked": {
113- "lastModified": 1788471157,
114- "narHash": "sha256-uHU8c4naFpJmwvmriVR2CEn6xhfwUFhqmMQzEjSyWt0=",
158+ "lastModified": 1788676506,
159+ "narHash": "sha256-lMPf1JhK50a0MkyB0+bEbj6pfmW5VDP/lM6DQ+ri7d0=",
115160 "ref": "refs/heads/main",
116- "rev": "c41903b106d04e5cf80828c49e2d7d456a54739d",
117- "revCount": 43,
161+ "rev": "4956d1e2f73eae7b1f8ef16fab875c56c69dea84",
162+ "revCount": 47,
118163 "type": "git",
119164 "url": "https://gitlab.com/nandithebull/jolt-native"
120165 },
121166 "original": {
122- "rev": "c41903b106d04e5cf80828c49e2d7d456a54739d",
167+ "rev": "4956d1e2f73eae7b1f8ef16fab875c56c69dea84",
123168 "type": "git",
124169 "url": "https://gitlab.com/nandithebull/jolt-native"
125170 }
126171 },
127172 "jolt-src": {
128- "flake": false,
173+ "inputs": {
174+ "makes": "makes_2",
175+ "nixpkgs": [
176+ "nixpkgs"
177+ ],
178+ "vendor-clojure-test-suite": "vendor-clojure-test-suite",
179+ "vendor-fs": "vendor-fs",
180+ "vendor-grenadine": "vendor-grenadine",
181+ "vendor-irregex": "vendor-irregex",
182+ "vendor-process": "vendor-process",
183+ "vendor-sci": "vendor-sci"
184+ },
129185 "locked": {
130- "lastModified": 1788135812,
131- "narHash": "sha256-DvVmjNN09mfxp67Y9zOyXNbAIYR9h2gpuyTbdj777a8=",
186+ "lastModified": 1788673555,
187+ "narHash": "sha256-QMHvZyLFzKCQsEqsBljLksrdxMc4g5ncBExJCVUoxzA=",
132188 "ref": "refs/heads/main",
133- "rev": "6f1d436f6e4cb1e2f878c5fc90c39a48a8bf4310",
134- "revCount": 2803,
189+ "rev": "b7b738b37b16532be2f539c22367bdfc3f4d708d",
190+ "revCount": 3026,
135191 "submodules": true,
136192 "type": "git",
137- "url": "https://github.com/jolt-lang/jolt"
193+ "url": "https://gitlab.com/nandithebull/jolt"
138194 },
139195 "original": {
140196 "submodules": true,
141197 "type": "git",
142- "url": "https://github.com/jolt-lang/jolt"
198+ "url": "https://gitlab.com/nandithebull/jolt"
199+ }
200+ },
201+ "makes": {
202+ "flake": false,
203+ "locked": {
204+ "lastModified": 1785480273,
205+ "narHash": "sha256-/g8O4PW0v3NNChKyrWw/EqpEAUCKiI9/KFE2EiXoUlA=",
206+ "owner": "makeplus",
207+ "repo": "makes",
208+ "rev": "d14cb578c2f04e6f9d00e01c7c4e416a9baf94e9",
209+ "type": "github"
210+ },
211+ "original": {
212+ "owner": "makeplus",
213+ "repo": "makes",
214+ "rev": "d14cb578c2f04e6f9d00e01c7c4e416a9baf94e9",
215+ "type": "github"
216+ }
217+ },
218+ "makes_2": {
219+ "flake": false,
220+ "locked": {
221+ "lastModified": 1785480273,
222+ "narHash": "sha256-/g8O4PW0v3NNChKyrWw/EqpEAUCKiI9/KFE2EiXoUlA=",
223+ "owner": "makeplus",
224+ "repo": "makes",
225+ "rev": "d14cb578c2f04e6f9d00e01c7c4e416a9baf94e9",
226+ "type": "github"
227+ },
228+ "original": {
229+ "owner": "makeplus",
230+ "repo": "makes",
231+ "rev": "d14cb578c2f04e6f9d00e01c7c4e416a9baf94e9",
232+ "type": "github"
143233 }
144234 },
145235 "nix-appimage": {
146236 "inputs": {
147237 "flake-compat": "flake-compat",
148- "flake-utils": "flake-utils",
238+ "flake-utils": "flake-utils_2",
149239 "nixpkgs": [
150240 "nixpkgs"
151241 ]
@@ -166,7 +256,7 @@
166256 },
167257 "nixgl": {
168258 "inputs": {
169- "flake-utils": "flake-utils_2",
259+ "flake-utils": "flake-utils_3",
170260 "nixpkgs": [
171261 "nixpkgs"
172262 ]
@@ -213,6 +303,27 @@
213303 "nixpkgs": "nixpkgs"
214304 }
215305 },
306+ "rust-overlay": {
307+ "inputs": {
308+ "nixpkgs": [
309+ "jolt-native",
310+ "nixpkgs"
311+ ]
312+ },
313+ "locked": {
314+ "lastModified": 1788591095,
315+ "narHash": "sha256-Vh+BeLWfbTT9AecazIsQ/Tkg/RzJeX3lEduANf256WA=",
316+ "owner": "oxalica",
317+ "repo": "rust-overlay",
318+ "rev": "c361047d3a538f547f1617bb6b410411929ac9cc",
319+ "type": "github"
320+ },
321+ "original": {
322+ "owner": "oxalica",
323+ "repo": "rust-overlay",
324+ "type": "github"
325+ }
326+ },
216327 "systems": {
217328 "locked": {
218329 "lastModified": 1681028828,
@@ -242,6 +353,123 @@
242353 "repo": "default",
243354 "type": "github"
244355 }
356+ },
357+ "systems_3": {
358+ "locked": {
359+ "lastModified": 1681028828,
360+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
361+ "owner": "nix-systems",
362+ "repo": "default",
363+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
364+ "type": "github"
365+ },
366+ "original": {
367+ "owner": "nix-systems",
368+ "repo": "default",
369+ "type": "github"
370+ }
371+ },
372+ "vendor-clojure-test-suite": {
373+ "flake": false,
374+ "locked": {
375+ "lastModified": 1782670040,
376+ "narHash": "sha256-NzNoVBdImoxriFTD+qr42YjDfnBtUG1SG/K5VeyviXQ=",
377+ "owner": "jank-lang",
378+ "repo": "clojure-test-suite",
379+ "rev": "489b6743e8421687ef96cec557830acf258d1886",
380+ "type": "github"
381+ },
382+ "original": {
383+ "owner": "jank-lang",
384+ "repo": "clojure-test-suite",
385+ "rev": "489b6743e8421687ef96cec557830acf258d1886",
386+ "type": "github"
387+ }
388+ },
389+ "vendor-fs": {
390+ "flake": false,
391+ "locked": {
392+ "lastModified": 1783722973,
393+ "narHash": "sha256-cMUQmVOR6zxd96ndnQ9UXkit9Nt39eZzfI9HmQRsLtE=",
394+ "owner": "babashka",
395+ "repo": "fs",
396+ "rev": "5b273b8a943a622593fbc85fca6761c5a39d6d66",
397+ "type": "github"
398+ },
399+ "original": {
400+ "owner": "babashka",
401+ "repo": "fs",
402+ "rev": "5b273b8a943a622593fbc85fca6761c5a39d6d66",
403+ "type": "github"
404+ }
405+ },
406+ "vendor-grenadine": {
407+ "flake": false,
408+ "locked": {
409+ "lastModified": 1787000287,
410+ "narHash": "sha256-l1eO8B3F8GkgJP+OOzz2hFV0aCDox8dQI0jtiGdGEFo=",
411+ "owner": "clojurestar",
412+ "repo": "grenadine",
413+ "rev": "77992327c0b220c186ece61d74f7eb570978a6f5",
414+ "type": "github"
415+ },
416+ "original": {
417+ "owner": "clojurestar",
418+ "repo": "grenadine",
419+ "rev": "77992327c0b220c186ece61d74f7eb570978a6f5",
420+ "type": "github"
421+ }
422+ },
423+ "vendor-irregex": {
424+ "flake": false,
425+ "locked": {
426+ "lastModified": 1770512408,
427+ "narHash": "sha256-eii7VP3sJuirqxz3SbUorN/Xe+USan6AEjBI1qXt36c=",
428+ "owner": "ashinn",
429+ "repo": "irregex",
430+ "rev": "c948a704fc732914a243c1643bfe359913d11c7b",
431+ "type": "github"
432+ },
433+ "original": {
434+ "owner": "ashinn",
435+ "repo": "irregex",
436+ "rev": "c948a704fc732914a243c1643bfe359913d11c7b",
437+ "type": "github"
438+ }
439+ },
440+ "vendor-process": {
441+ "flake": false,
442+ "locked": {
443+ "lastModified": 1786767494,
444+ "narHash": "sha256-d9ei6RCU9cUoq9+108jKIsaL04/ODRzVdrMueDMnRPo=",
445+ "owner": "jolt-lang",
446+ "repo": "process",
447+ "rev": "7d881f3a3ec6d273cf014c8172dea037abb31da3",
448+ "type": "github"
449+ },
450+ "original": {
451+ "owner": "jolt-lang",
452+ "repo": "process",
453+ "rev": "7d881f3a3ec6d273cf014c8172dea037abb31da3",
454+ "type": "github"
455+ }
456+ },
457+ "vendor-sci": {
458+ "flake": false,
459+ "locked": {
460+ "lastModified": 1781990664,
461+ "narHash": "sha256-nBpQg7IkxmnfkOGpXEdloPbvLpEs0sdE79O/vhygzDo=",
462+ "owner": "borkdude",
463+ "repo": "sci",
464+ "rev": "32d62a5136ad3dc148588752f5bcc4cc30b14752",
465+ "type": "github"
466+ },
467+ "original": {
468+ "owner": "borkdude",
469+ "repo": "sci",
470+ "rev": "32d62a5136ad3dc148588752f5bcc4cc30b14752",
471+ "type": "github"
472+ }
245473 }
246474 },
247475 "root": "root",
@@ -19,6 +19,21 @@
19 "url": "https://github.com/cisco/ChezScheme"19 "url": "https://github.com/cisco/ChezScheme"
20 }20 }
21 },21 },
22+ "crane": {
23+ "locked": {
24+ "lastModified": 1788465171,
25+ "narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=",
26+ "owner": "ipetkov",
27+ "repo": "crane",
28+ "rev": "eb35abda9f232cc6610b1d1e3200d15c49b7ac54",
29+ "type": "github"
30+ },
31+ "original": {
32+ "owner": "ipetkov",
33+ "repo": "crane",
34+ "type": "github"
35+ }
36+ },
22 "flake-compat": {37 "flake-compat": {
23 "flake": false,38 "flake": false,
24 "locked": {39 "locked": {
@@ -71,6 +86,24 @@
71 "type": "github"86 "type": "github"
72 }87 }
73 },88 },
89+ "flake-utils_3": {
90+ "inputs": {
91+ "systems": "systems_3"
92+ },
93+ "locked": {
94+ "lastModified": 1731533236,
95+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
96+ "owner": "numtide",
97+ "repo": "flake-utils",
98+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
99+ "type": "github"
100+ },
101+ "original": {
102+ "owner": "numtide",
103+ "repo": "flake-utils",
104+ "type": "github"
105+ }
106+ },
74 "glimmer": {107 "glimmer": {
75 "flake": false,108 "flake": false,
76 "locked": {109 "locked": {
@@ -89,7 +122,12 @@
89 }122 }
90 },123 },
91 "jolt-android-src": {124 "jolt-android-src": {
92- "flake": false,125+ "inputs": {
126+ "makes": "makes",
127+ "nixpkgs": [
128+ "nixpkgs"
129+ ]
130+ },
93 "locked": {131 "locked": {
94 "lastModified": 1788137223,132 "lastModified": 1788137223,
95 "narHash": "sha256-VeHi864PEtZoHRNA7ms9uaJb6+7nHvDyRXqLLPQ1tao=",133 "narHash": "sha256-VeHi864PEtZoHRNA7ms9uaJb6+7nHvDyRXqLLPQ1tao=",
@@ -108,44 +146,96 @@
108 }146 }
109 },147 },
110 "jolt-native": {148 "jolt-native": {
111- "flake": false,149+ "inputs": {
150+ "crane": "crane",
151+ "flake-utils": "flake-utils",
152+ "nixpkgs": [
153+ "nixpkgs"
154+ ],
155+ "rust-overlay": "rust-overlay"
156+ },
112 "locked": {157 "locked": {
113- "lastModified": 1788471157,158+ "lastModified": 1788676506,
114- "narHash": "sha256-uHU8c4naFpJmwvmriVR2CEn6xhfwUFhqmMQzEjSyWt0=",159+ "narHash": "sha256-lMPf1JhK50a0MkyB0+bEbj6pfmW5VDP/lM6DQ+ri7d0=",
115 "ref": "refs/heads/main",160 "ref": "refs/heads/main",
116- "rev": "c41903b106d04e5cf80828c49e2d7d456a54739d",161+ "rev": "4956d1e2f73eae7b1f8ef16fab875c56c69dea84",
117- "revCount": 43,162+ "revCount": 47,
118 "type": "git",163 "type": "git",
119 "url": "https://gitlab.com/nandithebull/jolt-native"164 "url": "https://gitlab.com/nandithebull/jolt-native"
120 },165 },
121 "original": {166 "original": {
122- "rev": "c41903b106d04e5cf80828c49e2d7d456a54739d",167+ "rev": "4956d1e2f73eae7b1f8ef16fab875c56c69dea84",
123 "type": "git",168 "type": "git",
124 "url": "https://gitlab.com/nandithebull/jolt-native"169 "url": "https://gitlab.com/nandithebull/jolt-native"
125 }170 }
126 },171 },
127 "jolt-src": {172 "jolt-src": {
128- "flake": false,173+ "inputs": {
174+ "makes": "makes_2",
175+ "nixpkgs": [
176+ "nixpkgs"
177+ ],
178+ "vendor-clojure-test-suite": "vendor-clojure-test-suite",
179+ "vendor-fs": "vendor-fs",
180+ "vendor-grenadine": "vendor-grenadine",
181+ "vendor-irregex": "vendor-irregex",
182+ "vendor-process": "vendor-process",
183+ "vendor-sci": "vendor-sci"
184+ },
129 "locked": {185 "locked": {
130- "lastModified": 1788135812,186+ "lastModified": 1788673555,
131- "narHash": "sha256-DvVmjNN09mfxp67Y9zOyXNbAIYR9h2gpuyTbdj777a8=",187+ "narHash": "sha256-QMHvZyLFzKCQsEqsBljLksrdxMc4g5ncBExJCVUoxzA=",
132 "ref": "refs/heads/main",188 "ref": "refs/heads/main",
133- "rev": "6f1d436f6e4cb1e2f878c5fc90c39a48a8bf4310",189+ "rev": "b7b738b37b16532be2f539c22367bdfc3f4d708d",
134- "revCount": 2803,190+ "revCount": 3026,
135 "submodules": true,191 "submodules": true,
136 "type": "git",192 "type": "git",
137- "url": "https://github.com/jolt-lang/jolt"193+ "url": "https://gitlab.com/nandithebull/jolt"
138 },194 },
139 "original": {195 "original": {
140 "submodules": true,196 "submodules": true,
141 "type": "git",197 "type": "git",
142- "url": "https://github.com/jolt-lang/jolt"198+ "url": "https://gitlab.com/nandithebull/jolt"
199+ }
200+ },
201+ "makes": {
202+ "flake": false,
203+ "locked": {
204+ "lastModified": 1785480273,
205+ "narHash": "sha256-/g8O4PW0v3NNChKyrWw/EqpEAUCKiI9/KFE2EiXoUlA=",
206+ "owner": "makeplus",
207+ "repo": "makes",
208+ "rev": "d14cb578c2f04e6f9d00e01c7c4e416a9baf94e9",
209+ "type": "github"
210+ },
211+ "original": {
212+ "owner": "makeplus",
213+ "repo": "makes",
214+ "rev": "d14cb578c2f04e6f9d00e01c7c4e416a9baf94e9",
215+ "type": "github"
216+ }
217+ },
218+ "makes_2": {
219+ "flake": false,
220+ "locked": {
221+ "lastModified": 1785480273,
222+ "narHash": "sha256-/g8O4PW0v3NNChKyrWw/EqpEAUCKiI9/KFE2EiXoUlA=",
223+ "owner": "makeplus",
224+ "repo": "makes",
225+ "rev": "d14cb578c2f04e6f9d00e01c7c4e416a9baf94e9",
226+ "type": "github"
227+ },
228+ "original": {
229+ "owner": "makeplus",
230+ "repo": "makes",
231+ "rev": "d14cb578c2f04e6f9d00e01c7c4e416a9baf94e9",
232+ "type": "github"
143 }233 }
144 },234 },
145 "nix-appimage": {235 "nix-appimage": {
146 "inputs": {236 "inputs": {
147 "flake-compat": "flake-compat",237 "flake-compat": "flake-compat",
148- "flake-utils": "flake-utils",238+ "flake-utils": "flake-utils_2",
149 "nixpkgs": [239 "nixpkgs": [
150 "nixpkgs"240 "nixpkgs"
151 ]241 ]
@@ -166,7 +256,7 @@
166 },256 },
167 "nixgl": {257 "nixgl": {
168 "inputs": {258 "inputs": {
169- "flake-utils": "flake-utils_2",259+ "flake-utils": "flake-utils_3",
170 "nixpkgs": [260 "nixpkgs": [
171 "nixpkgs"261 "nixpkgs"
172 ]262 ]
@@ -213,6 +303,27 @@
213 "nixpkgs": "nixpkgs"303 "nixpkgs": "nixpkgs"
214 }304 }
215 },305 },
306+ "rust-overlay": {
307+ "inputs": {
308+ "nixpkgs": [
309+ "jolt-native",
310+ "nixpkgs"
311+ ]
312+ },
313+ "locked": {
314+ "lastModified": 1788591095,
315+ "narHash": "sha256-Vh+BeLWfbTT9AecazIsQ/Tkg/RzJeX3lEduANf256WA=",
316+ "owner": "oxalica",
317+ "repo": "rust-overlay",
318+ "rev": "c361047d3a538f547f1617bb6b410411929ac9cc",
319+ "type": "github"
320+ },
321+ "original": {
322+ "owner": "oxalica",
323+ "repo": "rust-overlay",
324+ "type": "github"
325+ }
326+ },
216 "systems": {327 "systems": {
217 "locked": {328 "locked": {
218 "lastModified": 1681028828,329 "lastModified": 1681028828,
@@ -242,6 +353,123 @@
242 "repo": "default",353 "repo": "default",
243 "type": "github"354 "type": "github"
244 }355 }
356+ },
357+ "systems_3": {
358+ "locked": {
359+ "lastModified": 1681028828,
360+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
361+ "owner": "nix-systems",
362+ "repo": "default",
363+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
364+ "type": "github"
365+ },
366+ "original": {
367+ "owner": "nix-systems",
368+ "repo": "default",
369+ "type": "github"
370+ }
371+ },
372+ "vendor-clojure-test-suite": {
373+ "flake": false,
374+ "locked": {
375+ "lastModified": 1782670040,
376+ "narHash": "sha256-NzNoVBdImoxriFTD+qr42YjDfnBtUG1SG/K5VeyviXQ=",
377+ "owner": "jank-lang",
378+ "repo": "clojure-test-suite",
379+ "rev": "489b6743e8421687ef96cec557830acf258d1886",
380+ "type": "github"
381+ },
382+ "original": {
383+ "owner": "jank-lang",
384+ "repo": "clojure-test-suite",
385+ "rev": "489b6743e8421687ef96cec557830acf258d1886",
386+ "type": "github"
387+ }
388+ },
389+ "vendor-fs": {
390+ "flake": false,
391+ "locked": {
392+ "lastModified": 1783722973,
393+ "narHash": "sha256-cMUQmVOR6zxd96ndnQ9UXkit9Nt39eZzfI9HmQRsLtE=",
394+ "owner": "babashka",
395+ "repo": "fs",
396+ "rev": "5b273b8a943a622593fbc85fca6761c5a39d6d66",
397+ "type": "github"
398+ },
399+ "original": {
400+ "owner": "babashka",
401+ "repo": "fs",
402+ "rev": "5b273b8a943a622593fbc85fca6761c5a39d6d66",
403+ "type": "github"
404+ }
405+ },
406+ "vendor-grenadine": {
407+ "flake": false,
408+ "locked": {
409+ "lastModified": 1787000287,
410+ "narHash": "sha256-l1eO8B3F8GkgJP+OOzz2hFV0aCDox8dQI0jtiGdGEFo=",
411+ "owner": "clojurestar",
412+ "repo": "grenadine",
413+ "rev": "77992327c0b220c186ece61d74f7eb570978a6f5",
414+ "type": "github"
415+ },
416+ "original": {
417+ "owner": "clojurestar",
418+ "repo": "grenadine",
419+ "rev": "77992327c0b220c186ece61d74f7eb570978a6f5",
420+ "type": "github"
421+ }
422+ },
423+ "vendor-irregex": {
424+ "flake": false,
425+ "locked": {
426+ "lastModified": 1770512408,
427+ "narHash": "sha256-eii7VP3sJuirqxz3SbUorN/Xe+USan6AEjBI1qXt36c=",
428+ "owner": "ashinn",
429+ "repo": "irregex",
430+ "rev": "c948a704fc732914a243c1643bfe359913d11c7b",
431+ "type": "github"
432+ },
433+ "original": {
434+ "owner": "ashinn",
435+ "repo": "irregex",
436+ "rev": "c948a704fc732914a243c1643bfe359913d11c7b",
437+ "type": "github"
438+ }
439+ },
440+ "vendor-process": {
441+ "flake": false,
442+ "locked": {
443+ "lastModified": 1786767494,
444+ "narHash": "sha256-d9ei6RCU9cUoq9+108jKIsaL04/ODRzVdrMueDMnRPo=",
445+ "owner": "jolt-lang",
446+ "repo": "process",
447+ "rev": "7d881f3a3ec6d273cf014c8172dea037abb31da3",
448+ "type": "github"
449+ },
450+ "original": {
451+ "owner": "jolt-lang",
452+ "repo": "process",
453+ "rev": "7d881f3a3ec6d273cf014c8172dea037abb31da3",
454+ "type": "github"
455+ }
456+ },
457+ "vendor-sci": {
458+ "flake": false,
459+ "locked": {
460+ "lastModified": 1781990664,
461+ "narHash": "sha256-nBpQg7IkxmnfkOGpXEdloPbvLpEs0sdE79O/vhygzDo=",
462+ "owner": "borkdude",
463+ "repo": "sci",
464+ "rev": "32d62a5136ad3dc148588752f5bcc4cc30b14752",
465+ "type": "github"
466+ },
467+ "original": {
468+ "owner": "borkdude",
469+ "repo": "sci",
470+ "rev": "32d62a5136ad3dc148588752f5bcc4cc30b14752",
471+ "type": "github"
472+ }
245 }473 }
246 },474 },
247 "root": "root",475 "root": "root",
modified flake.nix +22 -12
@@ -21,12 +21,21 @@
2121
2222 inputs = {
2323 nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
24- # Jolt's own flake declares `self.submodules`, which this Nix rejects when
25- # the flake is fetched through the github scheme — so take the source and
26- # build it here. `vendor/` is a submodule and the build needs it.
24+ # `git+https` with `?submodules=1` rather than the github scheme: Jolt's
25+ # own flake declares `self.submodules`, which this Nix rejects when the
26+ # flake is fetched as `github:`. Its outputs are not what we take — the
27+ # runtime is built here, by joltFrom — but it is a flake all the same, so
28+ # its own inputs are locked with ours rather than left to float, and
29+ # `vendor/` comes along as the submodule the build needs.
30+ #
31+ # The fork rather than jolt-lang/jolt: it is what jolt-android-src already
32+ # pins for the boot image, and a desktop runtime built from a different
33+ # tree than the APK's is the same drift the jolt-native comment warns
34+ # about. Unpinned here — the desktop follows the fork's main, while the
35+ # APK stays on the rev below.
2736 jolt-src = {
28- url = "git+https://github.com/jolt-lang/jolt?submodules=1";
29- flake = false;
37+ url = "git+https://gitlab.com/nandithebull/jolt?submodules=1";
38+ inputs.nixpkgs.follows = "nixpkgs";
3039 };
3140
3241 # Ahead of v0.1.3, which is what nix/android.nix pins the APK to — and
@@ -46,8 +55,8 @@
4655 # drift this comment warns about wearing a different hat: one input, and
4756 # the window and the terminal are the same library either way.
4857 jolt-native = {
49- url = "git+https://gitlab.com/nandithebull/jolt-native?rev=c41903b106d04e5cf80828c49e2d7d456a54739d";
50- flake = false;
58+ url = "git+https://gitlab.com/nandithebull/jolt-native?rev=4956d1e2f73eae7b1f8ef16fab875c56c69dea84";
59+ inputs.nixpkgs.follows = "nixpkgs";
5160 };
5261
5362 # Chez itself, because the APK needs a cross target nixpkgs does not
@@ -55,14 +64,15 @@
5564 # Chez's own `tarm64le` workarea — boot files, xpatch and libkernel.a.
5665 # The version is the one the hand-built tree under ~/.cache used, and the
5766 # submodules are not optional (zuo builds it, lz4 and zlib link into it).
58- # The fork jolt's own Android pin names, built here rather than fetched as
59- # a release binary: upstream reads the socket address out of `struct
67+ # The same fork jolt-src takes, built here rather than fetched as a
68+ # release binary: upstream reads the socket address out of `struct
6069 # addrinfo` at glibc's offset, which on Bionic is `ai_canonname`, so an APK
61- # built with upstream cannot open a TLS connection at all. Only the boot
62- # image uses it; the desktop package still builds jolt-src.
70+ # built with upstream cannot open a TLS connection at all. Pinned to a rev
71+ # where jolt-src is not: the APK is a release artefact, so its runtime
72+ # moves when `just bump` says so rather than when the fork does.
6373 jolt-android-src = {
6474 url = "git+https://gitlab.com/nandithebull/jolt?rev=2b80d68d1f7a31ba92b208b3957e5fb555617ada&submodules=1";
65- flake = false;
75+ inputs.nixpkgs.follows = "nixpkgs";
6676 };
6777
6878 chez-src = {
@@ -21,12 +21,21 @@
21 21
22 inputs = {22 inputs = {
23 nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";23 nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
24- # Jolt's own flake declares `self.submodules`, which this Nix rejects when24+ # `git+https` with `?submodules=1` rather than the github scheme: Jolt's
25- # the flake is fetched through the github scheme — so take the source and25+ # own flake declares `self.submodules`, which this Nix rejects when the
26- # build it here. `vendor/` is a submodule and the build needs it.26+ # flake is fetched as `github:`. Its outputs are not what we take — the
27+ # runtime is built here, by joltFrom — but it is a flake all the same, so
28+ # its own inputs are locked with ours rather than left to float, and
29+ # `vendor/` comes along as the submodule the build needs.
30+ #
31+ # The fork rather than jolt-lang/jolt: it is what jolt-android-src already
32+ # pins for the boot image, and a desktop runtime built from a different
33+ # tree than the APK's is the same drift the jolt-native comment warns
34+ # about. Unpinned here — the desktop follows the fork's main, while the
35+ # APK stays on the rev below.
27 jolt-src = {36 jolt-src = {
28- url = "git+https://github.com/jolt-lang/jolt?submodules=1";37+ url = "git+https://gitlab.com/nandithebull/jolt?submodules=1";
29- flake = false;38+ inputs.nixpkgs.follows = "nixpkgs";
30 };39 };
31 40
32 # Ahead of v0.1.3, which is what nix/android.nix pins the APK to — and41 # Ahead of v0.1.3, which is what nix/android.nix pins the APK to — and
@@ -46,8 +55,8 @@
46 # drift this comment warns about wearing a different hat: one input, and55 # drift this comment warns about wearing a different hat: one input, and
47 # the window and the terminal are the same library either way.56 # the window and the terminal are the same library either way.
48 jolt-native = {57 jolt-native = {
49- url = "git+https://gitlab.com/nandithebull/jolt-native?rev=c41903b106d04e5cf80828c49e2d7d456a54739d";58+ url = "git+https://gitlab.com/nandithebull/jolt-native?rev=4956d1e2f73eae7b1f8ef16fab875c56c69dea84";
50- flake = false;59+ inputs.nixpkgs.follows = "nixpkgs";
51 };60 };
52 61
53 # Chez itself, because the APK needs a cross target nixpkgs does not62 # Chez itself, because the APK needs a cross target nixpkgs does not
@@ -55,14 +64,15 @@
55 # Chez's own `tarm64le` workarea — boot files, xpatch and libkernel.a.64 # Chez's own `tarm64le` workarea — boot files, xpatch and libkernel.a.
56 # The version is the one the hand-built tree under ~/.cache used, and the65 # The version is the one the hand-built tree under ~/.cache used, and the
57 # submodules are not optional (zuo builds it, lz4 and zlib link into it).66 # submodules are not optional (zuo builds it, lz4 and zlib link into it).
58- # The fork jolt's own Android pin names, built here rather than fetched as67+ # The same fork jolt-src takes, built here rather than fetched as a
59- # a release binary: upstream reads the socket address out of `struct68+ # release binary: upstream reads the socket address out of `struct
60 # addrinfo` at glibc's offset, which on Bionic is `ai_canonname`, so an APK69 # addrinfo` at glibc's offset, which on Bionic is `ai_canonname`, so an APK
61- # built with upstream cannot open a TLS connection at all. Only the boot70+ # built with upstream cannot open a TLS connection at all. Pinned to a rev
62- # image uses it; the desktop package still builds jolt-src.71+ # where jolt-src is not: the APK is a release artefact, so its runtime
72+ # moves when `just bump` says so rather than when the fork does.
63 jolt-android-src = {73 jolt-android-src = {
64 url = "git+https://gitlab.com/nandithebull/jolt?rev=2b80d68d1f7a31ba92b208b3957e5fb555617ada&submodules=1";74 url = "git+https://gitlab.com/nandithebull/jolt?rev=2b80d68d1f7a31ba92b208b3957e5fb555617ada&submodules=1";
65- flake = false;75+ inputs.nixpkgs.follows = "nixpkgs";
66 };76 };
67 77
68 chez-src = {78 chez-src = {