Skip to content

Commit 3b1e1d8

Browse files
author
Sukant Hajra
committed
Update dependencies and documentation
1 parent 12b1ecb commit 3b1e1d8

8 files changed

+76
-76
lines changed

Diff for: README.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ nix run github:shajra/shajra-keyboards#flash-ergodoxez
180180
Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap)
181181
=================================================================
182182

183-
FLASH SOURCE: /nix/store/ck0bgyy2sxcmrr7jaq6kh0i70wdzwwqp-qmk-builtin-shajra-src
184-
FLASH BINARY: /nix/store/sjx36zr53wmpa3vbkjpsjpca1kpwbb69-ergodoxez-builtin-shajra.hex
183+
FLASH SOURCE: /nix/store/wls8wj4r3aw3kq3cmnz5cwqm186gx7fh-qmk-builtin-shajra-src
184+
FLASH BINARY: /nix/store/hdw97ld76915s48655a54i2lxsmni087-ergodoxez-builtin-shajra.hex
185185

186186
⠋ Press the reset button of your keyboard
187187

@@ -242,11 +242,11 @@ If you want to check that everything builds before flashing your keyboard, you c
242242
tree $(nix build --no-link --print-out-paths) 2>/dev/null
243243
```
244244

245-
/nix/store/vg02qk57pwfsv5i4kp4vjcwvcman2lp2-shajra-keyboards-ci
246-
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/h1mjg5g8sdpgb30qhbn2078d4fr316gs-ergodoxez-builtin-shajra-flash
247-
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/sjx36zr53wmpa3vbkjpsjpca1kpwbb69-ergodoxez-builtin-shajra.hex
248-
├── build-ergodoxez-factory-flash -> /nix/store/km7qzwz5lw2w60afvxhn9jfcva9c0vrn-ergodoxez-factory-flash
249-
├── build-ergodoxez-factory-hex -> /nix/store/4gv794n3di2b97s8pai1zqfcfrkmvlgw-ergodoxez-factory.hex
245+
/nix/store/1vb09wl5jzlh7wskmyy29a9dn9bv2igp-shajra-keyboards-ci
246+
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/1zqvmy6hj537dwgnsv5dfrpyswfa0ipc-ergodoxez-builtin-shajra-flash
247+
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/hdw97ld76915s48655a54i2lxsmni087-ergodoxez-builtin-shajra.hex
248+
├── build-ergodoxez-factory-flash -> /nix/store/j5dh9c8q1wskq6fvhcshq36sbxqjjp9i-ergodoxez-factory-flash
249+
├── build-ergodoxez-factory-hex -> /nix/store/08pvk7g21vnxdy97zdj12z9iv2is330i-ergodoxez-factory.hex
250250
├── build-model01-builtin-shajra-flash -> /nix/store/i9sdqlzf13ax32rvml4dzk3rgjb4rr4b-model01-builtin-shajra-flash
251251
├── build-model01-builtin-shajra-hex -> /nix/store/jani7937ypra4iwfgh2qfw7cbpr05hsn-model01-builtin-shajra-hex
252252
├── build-model01-factory-flash -> /nix/store/z1p0ahl7hdxpgdb9gw5caphrvb8f7cdi-model01-factory-flash
@@ -255,15 +255,15 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null
255255
├── build-model100-builtin-shajra-hex -> /nix/store/9psl103fyis93dnyfgqjncyzjy1c5p15-model100-builtin-shajra-hex
256256
├── build-model100-factory-flash -> /nix/store/g4w2j8aqq7x983faiwb2qhqlpz15h8v6-model100-factory-flash
257257
├── build-model100-factory-hex -> /nix/store/mrrn2jh9lx705sasdr1i2w3cs8wj8ldm-model100-factory-hex
258-
├── build-moonlander-builtin-shajra-flash -> /nix/store/cshald5p88brphz71p2a1sdiz6vqflxb-moonlander-builtin-shajra-flash
259-
├── build-moonlander-builtin-shajra-hex -> /nix/store/vqbddf5n0ps7by6sidj5v1qc5q846l41-moonlander-builtin-shajra.bin
260-
├── build-moonlander-factory-flash -> /nix/store/v9zgy775r0802lzhw67yfa30pp1nzabv-moonlander-factory-flash
261-
├── build-moonlander-factory-hex -> /nix/store/bjhmdk016xclqhravzb21bpjxpbnpgbf-moonlander-factory.bin
262-
├── flash-ergodoxez -> /nix/store/c3rs3yvmbg7bz5jzb1f6rcy8myz6by4k-flash-ergodoxez
263-
├── flash-model01 -> /nix/store/ws8qm3avl7w0sgp5nn9qax7v3hcd193p-flash-model01
264-
├── flash-model100 -> /nix/store/k1k206wf20i3n0pq71dqs9dbyvs85cap-flash-model100
265-
├── flash-moonlander -> /nix/store/apcda7mwsrklgvrfz1xfniwci4lsr0pa-flash-moonlander
266-
└── licenses -> /nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses
258+
├── build-moonlander-builtin-shajra-flash -> /nix/store/3504i0jk5qwskhd2xamr547l1gbq6s2p-moonlander-builtin-shajra-flash
259+
├── build-moonlander-builtin-shajra-hex -> /nix/store/h0s81a48g22x7qszczs1kkjf2n8xr5rr-moonlander-builtin-shajra.bin
260+
├── build-moonlander-factory-flash -> /nix/store/p3b8cabpa6s0vdsdxnvvqbgz3548i0cx-moonlander-factory-flash
261+
├── build-moonlander-factory-hex -> /nix/store/jn3f2sp894srrp02n67gn88zkcinmm9q-moonlander-factory.bin
262+
├── flash-ergodoxez -> /nix/store/k8cggighr4raxbllqr33ipqrnva2vzbi-flash-ergodoxez
263+
├── flash-model01 -> /nix/store/0rpfkgsfsi2wf4dpxxi2rd8ajjd32zya-flash-model01
264+
├── flash-model100 -> /nix/store/gby850fdi37iz6j27b8rbs2rrc1scaz8-flash-model100
265+
├── flash-moonlander -> /nix/store/14hqxzzc1qqgjnadsa5f5y6jd72vnwg4-flash-moonlander
266+
└── licenses -> /nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses
267267

268268
18 directories, 4 files
269269

Diff for: README.org

+16-16
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ head -c350 < <(./flash-ergodoxez) | ansifilter
212212
: Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap)
213213
: =================================================================
214214
:
215-
: FLASH SOURCE: /nix/store/ck0bgyy2sxcmrr7jaq6kh0i70wdzwwqp-qmk-builtin-shajra-src
216-
: FLASH BINARY: /nix/store/sjx36zr53wmpa3vbkjpsjpca1kpwbb69-ergodoxez-builtin-shajra.hex
215+
: FLASH SOURCE: /nix/store/wls8wj4r3aw3kq3cmnz5cwqm186gx7fh-qmk-builtin-shajra-src
216+
: FLASH BINARY: /nix/store/hdw97ld76915s48655a54i2lxsmni087-ergodoxez-builtin-shajra.hex
217217
:
218218
: ⠋ Press the reset button of your keyboard
219219

@@ -308,11 +308,11 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null
308308

309309
#+results: nix-build
310310
#+begin_example
311-
/nix/store/vg02qk57pwfsv5i4kp4vjcwvcman2lp2-shajra-keyboards-ci
312-
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/h1mjg5g8sdpgb30qhbn2078d4fr316gs-ergodoxez-builtin-shajra-flash
313-
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/sjx36zr53wmpa3vbkjpsjpca1kpwbb69-ergodoxez-builtin-shajra.hex
314-
├── build-ergodoxez-factory-flash -> /nix/store/km7qzwz5lw2w60afvxhn9jfcva9c0vrn-ergodoxez-factory-flash
315-
├── build-ergodoxez-factory-hex -> /nix/store/4gv794n3di2b97s8pai1zqfcfrkmvlgw-ergodoxez-factory.hex
311+
/nix/store/1vb09wl5jzlh7wskmyy29a9dn9bv2igp-shajra-keyboards-ci
312+
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/1zqvmy6hj537dwgnsv5dfrpyswfa0ipc-ergodoxez-builtin-shajra-flash
313+
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/hdw97ld76915s48655a54i2lxsmni087-ergodoxez-builtin-shajra.hex
314+
├── build-ergodoxez-factory-flash -> /nix/store/j5dh9c8q1wskq6fvhcshq36sbxqjjp9i-ergodoxez-factory-flash
315+
├── build-ergodoxez-factory-hex -> /nix/store/08pvk7g21vnxdy97zdj12z9iv2is330i-ergodoxez-factory.hex
316316
├── build-model01-builtin-shajra-flash -> /nix/store/i9sdqlzf13ax32rvml4dzk3rgjb4rr4b-model01-builtin-shajra-flash
317317
├── build-model01-builtin-shajra-hex -> /nix/store/jani7937ypra4iwfgh2qfw7cbpr05hsn-model01-builtin-shajra-hex
318318
├── build-model01-factory-flash -> /nix/store/z1p0ahl7hdxpgdb9gw5caphrvb8f7cdi-model01-factory-flash
@@ -321,15 +321,15 @@ tree $(nix build --no-link --print-out-paths) 2>/dev/null
321321
├── build-model100-builtin-shajra-hex -> /nix/store/9psl103fyis93dnyfgqjncyzjy1c5p15-model100-builtin-shajra-hex
322322
├── build-model100-factory-flash -> /nix/store/g4w2j8aqq7x983faiwb2qhqlpz15h8v6-model100-factory-flash
323323
├── build-model100-factory-hex -> /nix/store/mrrn2jh9lx705sasdr1i2w3cs8wj8ldm-model100-factory-hex
324-
├── build-moonlander-builtin-shajra-flash -> /nix/store/cshald5p88brphz71p2a1sdiz6vqflxb-moonlander-builtin-shajra-flash
325-
├── build-moonlander-builtin-shajra-hex -> /nix/store/vqbddf5n0ps7by6sidj5v1qc5q846l41-moonlander-builtin-shajra.bin
326-
├── build-moonlander-factory-flash -> /nix/store/v9zgy775r0802lzhw67yfa30pp1nzabv-moonlander-factory-flash
327-
├── build-moonlander-factory-hex -> /nix/store/bjhmdk016xclqhravzb21bpjxpbnpgbf-moonlander-factory.bin
328-
├── flash-ergodoxez -> /nix/store/c3rs3yvmbg7bz5jzb1f6rcy8myz6by4k-flash-ergodoxez
329-
├── flash-model01 -> /nix/store/ws8qm3avl7w0sgp5nn9qax7v3hcd193p-flash-model01
330-
├── flash-model100 -> /nix/store/k1k206wf20i3n0pq71dqs9dbyvs85cap-flash-model100
331-
├── flash-moonlander -> /nix/store/apcda7mwsrklgvrfz1xfniwci4lsr0pa-flash-moonlander
332-
└── licenses -> /nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses
324+
├── build-moonlander-builtin-shajra-flash -> /nix/store/3504i0jk5qwskhd2xamr547l1gbq6s2p-moonlander-builtin-shajra-flash
325+
├── build-moonlander-builtin-shajra-hex -> /nix/store/h0s81a48g22x7qszczs1kkjf2n8xr5rr-moonlander-builtin-shajra.bin
326+
├── build-moonlander-factory-flash -> /nix/store/p3b8cabpa6s0vdsdxnvvqbgz3548i0cx-moonlander-factory-flash
327+
├── build-moonlander-factory-hex -> /nix/store/jn3f2sp894srrp02n67gn88zkcinmm9q-moonlander-factory.bin
328+
├── flash-ergodoxez -> /nix/store/k8cggighr4raxbllqr33ipqrnva2vzbi-flash-ergodoxez
329+
├── flash-model01 -> /nix/store/0rpfkgsfsi2wf4dpxxi2rd8ajjd32zya-flash-model01
330+
├── flash-model100 -> /nix/store/gby850fdi37iz6j27b8rbs2rrc1scaz8-flash-model100
331+
├── flash-moonlander -> /nix/store/14hqxzzc1qqgjnadsa5f5y6jd72vnwg4-flash-moonlander
332+
└── licenses -> /nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses
333333

334334
18 directories, 4 files
335335
#+end_example

Diff for: doc/internal/params.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
;; run-type must be "executable"
1111
(run-target-short . "shajra-keyboards-licenses")
1212
;; run-target-long will always prefix "bin/"
13-
(nix-latest . "2.24.9")
13+
(nix-latest . "2.24.10")
1414
(nix-stable . "2.18.8")
1515
(nixos-latest . "24.05")
1616
(platforms . "Linux on x86-64 machines"))

Diff for: doc/nix-installation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Hopefully, this alleviates any worry about installing a complex program on your
3939

4040
> **<span class="underline">NOTE:</span>** You don't need this step if you're running NixOS, which comes with Nix baked in.
4141
42-
Though the latest version of Nix is Nix 2.24.9, we'll be installing the version that the last release of NixOS (24.05) uses, specifically Nix 2.18.8. As discussed in the included [introduction to Nix](nix-introduction.md), this version is considered stable by the Nix community.
42+
Though the latest version of Nix is Nix 2.24.10, we'll be installing the version that the last release of NixOS (24.05) uses, specifically Nix 2.18.8. As discussed in the included [introduction to Nix](nix-introduction.md), this version is considered stable by the Nix community.
4343

4444
The following command calls the official installation script for the recommended version of Nix. Note, this script will require `sudo` access.
4545

Diff for: doc/nix-introduction.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ However, if industrial users move to flakes to address these problems, we have t
194194

195195
### Nix quick releases compete with stability<a id="sec-4-2-3"></a>
196196

197-
The latest major version of the Nix package manager is currently Nix 2.24.9, but NixOS 24.05, the latest stable release of NixOS, uses Nix 2.18.8. NixOS is the primary way the Nix package manager gets used in the field. Far fewer users install Nix as a package manager atop another operating system. From a community perspective it makes sense to consider Nix 2.18.8 the stable release of the package manager. This version gets the most scrutiny and critical bug fixes.
197+
The latest major version of the Nix package manager is currently Nix 2.24.10, but NixOS 24.05, the latest stable release of NixOS, uses Nix 2.18.8. NixOS is the primary way the Nix package manager gets used in the field. Far fewer users install Nix as a package manager atop another operating system. From a community perspective it makes sense to consider Nix 2.18.8 the stable release of the package manager. This version gets the most scrutiny and critical bug fixes.
198198

199199
As mentioned above, there are strong reasons to use still-experimental features, particularly flakes. However, APIs and calculated hashes change too frequently in experimental features from version-to-version. By sticking with the version used in NixOS, we get less breaking changes. For example, the [flake.lock](../flake.lock) file included with this project has calculated hashes for dependencies. These hashes were computed with Nix 2.18.8, and could change with later versions.
200200

Diff for: doc/nix-usage-flakes.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ After a successful call of `nix build`, you'll see one or more symlinks for each
265265
readlink result*
266266
```
267267

268-
/nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses
268+
/nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses
269269

270270
Following these symlinks, we can see the files the project provides:
271271

@@ -287,7 +287,7 @@ It's common to configure these “result” symlinks as ignored in source contro
287287
nix path-info .#licenses-thirdparty
288288
```
289289

290-
/nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses
290+
/nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses
291291

292292
## Running commands in a shell<a id="sec-4-6"></a>
293293

@@ -400,7 +400,7 @@ nix shell --ignore-environment \
400400
--command which shajra-keyboards-licenses
401401
```
402402

403-
/nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
403+
/nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
404404

405405
What we do with local flake references can work just as well with remote flake references.
406406

@@ -428,7 +428,7 @@ nix profile list
428428
Flake attribute: packages.x86_64-linux.licenses-thirdparty
429429
Original flake URL: git+file:///home/shajra/src/shajra-keyboards
430430
Locked flake URL: git+file:///home/shajra/src/shajra-keyboards
431-
Store paths: /nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses
431+
Store paths: /nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses
432432

433433
If we want to uninstall a program from our profile, we do so by the index from this list:
434434

Diff for: doc/nix-usage-flakes.org

+4-4
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ readlink result*
445445
#+end_src
446446

447447
#+RESULTS: nix-build-link
448-
: /nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses
448+
: /nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses
449449

450450
Following these symlinks, we can see the files the project provides:
451451

@@ -474,7 +474,7 @@ nix path-info .#<<get("package-attr-short")>>
474474
#+end_src
475475

476476
#+results: nix-build-path
477-
: /nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses
477+
: /nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses
478478

479479
** Running commands in a shell
480480

@@ -636,7 +636,7 @@ nix shell --ignore-environment \
636636
#+end_src
637637

638638
#+RESULTS: nix-shell-remote
639-
: /nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
639+
: /nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses/bin/shajra-keyboards-licenses
640640

641641
What we do with local flake references can work just as well with remote flake
642642
references.
@@ -687,7 +687,7 @@ nix profile list --profile /tmp/nix-profile | ansifilter
687687
: Flake attribute: packages.x86_64-linux.licenses-thirdparty
688688
: Original flake URL: git+file:///home/shajra/src/shajra-keyboards
689689
: Locked flake URL: git+file:///home/shajra/src/shajra-keyboards
690-
: Store paths: /nix/store/3rpjxncsgvnvhzdp83shabzn8b3bsrq2-shajra-keyboards-licenses
690+
: Store paths: /nix/store/wb4fqj7inaxrhfshj0zpdag9hr06bgy8-shajra-keyboards-licenses
691691

692692
If we want to uninstall a program from our profile, we do so by the index from
693693
this list:

0 commit comments

Comments
 (0)