Skip to content

Commit 32d3934

Browse files
author
Sukant Hajra
committed
Update dependencies (Nix 2.18.4)
1 parent 0caa21a commit 32d3934

12 files changed

+334
-216
lines changed

Diff for: .github/workflows/ci.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ jobs:
99
- uses: actions/checkout@v4
1010
- uses: cachix/install-nix-action@v27
1111
with:
12-
# REVISIT: Pinning because Nix hashes in flake.lock are inconsistent
13-
# between 2.18.1 (current version in the latest stable release of NixOS)
14-
# and 2.21.
15-
install_url: https://releases.nixos.org/nix/nix-2.18.1/install
12+
# DESIGN: matching current in NixOS 24.05
13+
install_url: https://releases.nixos.org/nix/nix-2.18.4/install
1614
- uses: cachix/cachix-action@v15
1715
with:
1816
name: shajra
1917
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
2018
- uses: DeterminateSystems/magic-nix-cache-action@main
2119
- run: cat /etc/nix/nix.conf
2220
- run: cat ~/.config/nix/nix.conf
23-
- run: nix --version
2421
- run: nix --print-build-logs build --print-out-paths .#ci

Diff for: README.md

+27-25
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
- [License](#sec-7)
2020
- [Contribution](#sec-8)
2121

22-
[![img](https://github.com/shajra/shajra-keyboards/workflows/CI/badge.svg)](https://github.com/shajra/shajra-keyboards/actions)
22+
[![img](https://github.com/shajra/shajra-keyboards/workflows/CI/badge.svg)](https://github.com/shajra/nix-project/actions)
23+
24+
[![img](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fgarnix.io%2Fapi%2Fbadges%2Fshajra%2Fshajra-keyboards%3Fbranch%3Dmain)](https://garnix.io)
2325

2426
# About the project<a id="sec-1"></a>
2527

@@ -178,8 +180,8 @@ nix run github:shajra/shajra-keyboards#flash-ergodoxez
178180
Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap)
179181
=================================================================
180182

181-
FLASH SOURCE: /nix/store/yy539wjj04l36ndwsi0jndz6crp5bjy0-qmk-builtin-shajra-src
182-
FLASH BINARY: /nix/store/7ncnbjsz1bpq9kpdm0imbcfsawrv7l9l-ergodoxez-builtin-shajra.hex
183+
FLASH SOURCE: /nix/store/zljg2b6ihlcmcnhaka21czny2yzcsrxn-qmk-builtin-shajra-src
184+
FLASH BINARY: /nix/store/v0qndybci8qb4a5nrasxrbjxpgzwbwc5-ergodoxez-builtin-shajra.hex
183185

184186
⠋ Press the reset button of your keyboard
185187

@@ -240,28 +242,28 @@ If you want to check that everything builds before flashing your keyboard, you c
240242
tree $(nix build --no-link --print-out-paths) 2>/dev/null
241243
```
242244

243-
/nix/store/hpp7xh114mcbq52hwp79gdiddnlqp571-shajra-keyboards-ci
244-
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/ifqgfjnwl1kylcv32w0zlx12fq8c7vp7-ergodoxez-builtin-shajra-flash
245-
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/7ncnbjsz1bpq9kpdm0imbcfsawrv7l9l-ergodoxez-builtin-shajra.hex
246-
├── build-ergodoxez-factory-flash -> /nix/store/ad8hy4ak3bkcilg397rrc0gxcpmrx7gk-ergodoxez-factory-flash
247-
├── build-ergodoxez-factory-hex -> /nix/store/i9lrl4w1xi1nzydc7a195i9zgkrp8ddc-ergodoxez-factory.hex
248-
├── build-model01-builtin-shajra-flash -> /nix/store/vzhbbclgb921h0762hb9r2yjfim3virn-model01-builtin-shajra-flash
249-
├── build-model01-builtin-shajra-hex -> /nix/store/pldkl177jmkb7qm05s11ynjdhyi2n8wl-model01-builtin-shajra-hex
250-
├── build-model01-factory-flash -> /nix/store/x3931w0iqj55583y40q43j3rqhbd2r9k-model01-factory-flash
251-
├── build-model01-factory-hex -> /nix/store/v4xmaz2ik12piyiwvlisi866biyyyxsw-model01-factory-hex
252-
├── build-model100-builtin-shajra-flash -> /nix/store/5ybi2xi3kg2yd625kwybc4k79rbrnr7z-model100-builtin-shajra-flash
253-
├── build-model100-builtin-shajra-hex -> /nix/store/yvm9hpks835xmf1xl654v13w8na7axa8-model100-builtin-shajra-hex
254-
├── build-model100-factory-flash -> /nix/store/5j5sj4i6c2by1qm8aalrhm6shzqnnldi-model100-factory-flash
255-
├── build-model100-factory-hex -> /nix/store/i6vq0qiszwvlzcr05kg8frqxzdgskf9q-model100-factory-hex
256-
├── build-moonlander-builtin-shajra-flash -> /nix/store/c2x781cb9yz06hai6i75rkj8lsq8440y-moonlander-builtin-shajra-flash
257-
├── build-moonlander-builtin-shajra-hex -> /nix/store/f1kw1wa6lmb3sfjwhmj9w6dpag5ikdb3-moonlander-builtin-shajra.bin
258-
├── build-moonlander-factory-flash -> /nix/store/najipnfhp8bfi72sgcy7lbbgpy2p2830-moonlander-factory-flash
259-
├── build-moonlander-factory-hex -> /nix/store/qaq133zqkzydfryrbmnznaz1p1ry2652-moonlander-factory.bin
260-
├── flash-ergodoxez -> /nix/store/z31ba1rqrlnckzv9s1cfg6iayk43d16w-flash-ergodoxez
261-
├── flash-model01 -> /nix/store/1562g9i9k53l8vfizj7rc2xj6lqbi3gd-flash-model01
262-
├── flash-model100 -> /nix/store/9734qn6pja315g52892j2jsy885mjkwd-flash-model100
263-
├── flash-moonlander -> /nix/store/vd6xham5s55jkxazr2qml96i7ikc5663-flash-moonlander
264-
└── licenses -> /nix/store/43ax4fl6g7si85jx1v3z6j1jixjsjd7f-shajra-keyboards-licenses
245+
/nix/store/4w6cilaml9ql1s29p86cfa4n3imqcy66-shajra-keyboards-ci
246+
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/zzrwr5ww40sj5rpg55s5f0ff16zfq6zl-ergodoxez-builtin-shajra-flash
247+
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/v0qndybci8qb4a5nrasxrbjxpgzwbwc5-ergodoxez-builtin-shajra.hex
248+
├── build-ergodoxez-factory-flash -> /nix/store/gpdmlqcxjy23jfq2r5x33k5kqg1lbwzs-ergodoxez-factory-flash
249+
├── build-ergodoxez-factory-hex -> /nix/store/adbgphd0zmz0298m4vcj0vlfgz46z14q-ergodoxez-factory.hex
250+
├── build-model01-builtin-shajra-flash -> /nix/store/mwbksqhbm8ms2z77505v59m348gh4iz2-model01-builtin-shajra-flash
251+
├── build-model01-builtin-shajra-hex -> /nix/store/dn0r0dfmdk69qi41hi7yj6qc2jnkdpj5-model01-builtin-shajra-hex
252+
├── build-model01-factory-flash -> /nix/store/562lgm0hg9as3kgc7afryqphsf8zr3lc-model01-factory-flash
253+
├── build-model01-factory-hex -> /nix/store/yysvcxa0bkahg3aaxa3wf39w47kkxg6k-model01-factory-hex
254+
├── build-model100-builtin-shajra-flash -> /nix/store/9vyr53zsksi4hsqkbmz96llph4f7p9xx-model100-builtin-shajra-flash
255+
├── build-model100-builtin-shajra-hex -> /nix/store/xjx8w717hkci7jx03r4qr91flb1dfipx-model100-builtin-shajra-hex
256+
├── build-model100-factory-flash -> /nix/store/yqyx3fa2aaiib9r16czybyk0ffvq7f9m-model100-factory-flash
257+
├── build-model100-factory-hex -> /nix/store/mkf9q6c2na4r6cyn62yirqrda7ynpdkp-model100-factory-hex
258+
├── build-moonlander-builtin-shajra-flash -> /nix/store/2a0wgif7zy3jcgsq89y9kyl3abnb0565-moonlander-builtin-shajra-flash
259+
├── build-moonlander-builtin-shajra-hex -> /nix/store/94zbvf3xxh90k50aqdzj9vcyfifd9kr3-moonlander-builtin-shajra.bin
260+
├── build-moonlander-factory-flash -> /nix/store/ry172fqrg6a25dzh53gfj51bsnklx90c-moonlander-factory-flash
261+
├── build-moonlander-factory-hex -> /nix/store/47ldsifclc34hgdsag0gnls17j39zylf-moonlander-factory.bin
262+
├── flash-ergodoxez -> /nix/store/grsy6hv9qy36n43lrgnvlasxvg498f1l-flash-ergodoxez
263+
├── flash-model01 -> /nix/store/sd89khgn1vjxpci89q9rd9i47whhd72n-flash-model01
264+
├── flash-model100 -> /nix/store/4ifkf94b7mcm11crjyfz0wzanscfzb54-flash-model100
265+
├── flash-moonlander -> /nix/store/2cnss7wgwm2pbhmzmlnp9ca8khn86imj-flash-moonlander
266+
└── licenses -> /nix/store/c6qjx6pgyj8adbzh6vfk8v0spdp79q9g-shajra-keyboards-licenses
265267

266268
18 directories, 4 files
267269

Diff for: README.org

+28-25
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
#+setupfile: doc/internal/links.org
33
#+options: ^:nil
44

5-
[[https://github.com/shajra/shajra-keyboards/actions][https://github.com/shajra/shajra-keyboards/workflows/CI/badge.svg]]
5+
#+ATTR_HTML: :alt built with GitHub Actions
6+
[[https://github.com/shajra/nix-project/actions][https://github.com/shajra/shajra-keyboards/workflows/CI/badge.svg]]
7+
#+ATTR_HTML: :alt built with Garnix
8+
[[https://garnix.io][https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fgarnix.io%2Fapi%2Fbadges%2Fshajra%2Fshajra-keyboards%3Fbranch%3Dmain]]
69

710
* About the project
811

@@ -209,8 +212,8 @@ head -c350 < <(./flash-ergodoxez) | ansifilter
209212
: Flashing ZSA Technology Lab's Ergodox EZ (custom "shajra" keymap)
210213
: =================================================================
211214
:
212-
: FLASH SOURCE: /nix/store/yy539wjj04l36ndwsi0jndz6crp5bjy0-qmk-builtin-shajra-src
213-
: FLASH BINARY: /nix/store/7ncnbjsz1bpq9kpdm0imbcfsawrv7l9l-ergodoxez-builtin-shajra.hex
215+
: FLASH SOURCE: /nix/store/zljg2b6ihlcmcnhaka21czny2yzcsrxn-qmk-builtin-shajra-src
216+
: FLASH BINARY: /nix/store/v0qndybci8qb4a5nrasxrbjxpgzwbwc5-ergodoxez-builtin-shajra.hex
214217
:
215218
: ⠋ Press the reset button of your keyboard
216219

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

306309
#+results: nix-build
307310
#+begin_example
308-
/nix/store/hpp7xh114mcbq52hwp79gdiddnlqp571-shajra-keyboards-ci
309-
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/ifqgfjnwl1kylcv32w0zlx12fq8c7vp7-ergodoxez-builtin-shajra-flash
310-
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/7ncnbjsz1bpq9kpdm0imbcfsawrv7l9l-ergodoxez-builtin-shajra.hex
311-
├── build-ergodoxez-factory-flash -> /nix/store/ad8hy4ak3bkcilg397rrc0gxcpmrx7gk-ergodoxez-factory-flash
312-
├── build-ergodoxez-factory-hex -> /nix/store/i9lrl4w1xi1nzydc7a195i9zgkrp8ddc-ergodoxez-factory.hex
313-
├── build-model01-builtin-shajra-flash -> /nix/store/vzhbbclgb921h0762hb9r2yjfim3virn-model01-builtin-shajra-flash
314-
├── build-model01-builtin-shajra-hex -> /nix/store/pldkl177jmkb7qm05s11ynjdhyi2n8wl-model01-builtin-shajra-hex
315-
├── build-model01-factory-flash -> /nix/store/x3931w0iqj55583y40q43j3rqhbd2r9k-model01-factory-flash
316-
├── build-model01-factory-hex -> /nix/store/v4xmaz2ik12piyiwvlisi866biyyyxsw-model01-factory-hex
317-
├── build-model100-builtin-shajra-flash -> /nix/store/5ybi2xi3kg2yd625kwybc4k79rbrnr7z-model100-builtin-shajra-flash
318-
├── build-model100-builtin-shajra-hex -> /nix/store/yvm9hpks835xmf1xl654v13w8na7axa8-model100-builtin-shajra-hex
319-
├── build-model100-factory-flash -> /nix/store/5j5sj4i6c2by1qm8aalrhm6shzqnnldi-model100-factory-flash
320-
├── build-model100-factory-hex -> /nix/store/i6vq0qiszwvlzcr05kg8frqxzdgskf9q-model100-factory-hex
321-
├── build-moonlander-builtin-shajra-flash -> /nix/store/c2x781cb9yz06hai6i75rkj8lsq8440y-moonlander-builtin-shajra-flash
322-
├── build-moonlander-builtin-shajra-hex -> /nix/store/f1kw1wa6lmb3sfjwhmj9w6dpag5ikdb3-moonlander-builtin-shajra.bin
323-
├── build-moonlander-factory-flash -> /nix/store/najipnfhp8bfi72sgcy7lbbgpy2p2830-moonlander-factory-flash
324-
├── build-moonlander-factory-hex -> /nix/store/qaq133zqkzydfryrbmnznaz1p1ry2652-moonlander-factory.bin
325-
├── flash-ergodoxez -> /nix/store/z31ba1rqrlnckzv9s1cfg6iayk43d16w-flash-ergodoxez
326-
├── flash-model01 -> /nix/store/1562g9i9k53l8vfizj7rc2xj6lqbi3gd-flash-model01
327-
├── flash-model100 -> /nix/store/9734qn6pja315g52892j2jsy885mjkwd-flash-model100
328-
├── flash-moonlander -> /nix/store/vd6xham5s55jkxazr2qml96i7ikc5663-flash-moonlander
329-
└── licenses -> /nix/store/43ax4fl6g7si85jx1v3z6j1jixjsjd7f-shajra-keyboards-licenses
311+
/nix/store/4w6cilaml9ql1s29p86cfa4n3imqcy66-shajra-keyboards-ci
312+
├── build-ergodoxez-builtin-shajra-flash -> /nix/store/zzrwr5ww40sj5rpg55s5f0ff16zfq6zl-ergodoxez-builtin-shajra-flash
313+
├── build-ergodoxez-builtin-shajra-hex -> /nix/store/v0qndybci8qb4a5nrasxrbjxpgzwbwc5-ergodoxez-builtin-shajra.hex
314+
├── build-ergodoxez-factory-flash -> /nix/store/gpdmlqcxjy23jfq2r5x33k5kqg1lbwzs-ergodoxez-factory-flash
315+
├── build-ergodoxez-factory-hex -> /nix/store/adbgphd0zmz0298m4vcj0vlfgz46z14q-ergodoxez-factory.hex
316+
├── build-model01-builtin-shajra-flash -> /nix/store/mwbksqhbm8ms2z77505v59m348gh4iz2-model01-builtin-shajra-flash
317+
├── build-model01-builtin-shajra-hex -> /nix/store/dn0r0dfmdk69qi41hi7yj6qc2jnkdpj5-model01-builtin-shajra-hex
318+
├── build-model01-factory-flash -> /nix/store/562lgm0hg9as3kgc7afryqphsf8zr3lc-model01-factory-flash
319+
├── build-model01-factory-hex -> /nix/store/yysvcxa0bkahg3aaxa3wf39w47kkxg6k-model01-factory-hex
320+
├── build-model100-builtin-shajra-flash -> /nix/store/9vyr53zsksi4hsqkbmz96llph4f7p9xx-model100-builtin-shajra-flash
321+
├── build-model100-builtin-shajra-hex -> /nix/store/xjx8w717hkci7jx03r4qr91flb1dfipx-model100-builtin-shajra-hex
322+
├── build-model100-factory-flash -> /nix/store/yqyx3fa2aaiib9r16czybyk0ffvq7f9m-model100-factory-flash
323+
├── build-model100-factory-hex -> /nix/store/mkf9q6c2na4r6cyn62yirqrda7ynpdkp-model100-factory-hex
324+
├── build-moonlander-builtin-shajra-flash -> /nix/store/2a0wgif7zy3jcgsq89y9kyl3abnb0565-moonlander-builtin-shajra-flash
325+
├── build-moonlander-builtin-shajra-hex -> /nix/store/94zbvf3xxh90k50aqdzj9vcyfifd9kr3-moonlander-builtin-shajra.bin
326+
├── build-moonlander-factory-flash -> /nix/store/ry172fqrg6a25dzh53gfj51bsnklx90c-moonlander-factory-flash
327+
├── build-moonlander-factory-hex -> /nix/store/47ldsifclc34hgdsag0gnls17j39zylf-moonlander-factory.bin
328+
├── flash-ergodoxez -> /nix/store/grsy6hv9qy36n43lrgnvlasxvg498f1l-flash-ergodoxez
329+
├── flash-model01 -> /nix/store/sd89khgn1vjxpci89q9rd9i47whhd72n-flash-model01
330+
├── flash-model100 -> /nix/store/4ifkf94b7mcm11crjyfz0wzanscfzb54-flash-model100
331+
├── flash-moonlander -> /nix/store/2cnss7wgwm2pbhmzmlnp9ca8khn86imj-flash-moonlander
332+
└── licenses -> /nix/store/c6qjx6pgyj8adbzh6vfk8v0spdp79q9g-shajra-keyboards-licenses
330333

331334
18 directories, 4 files
332335
#+end_example

Diff for: doc/internal/links.org

+6-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#+link: docstring https://en.wikipedia.org/wiki/Docstring
33
#+link: ergodox-ez https://ergodox-ez.com
44
#+link: fhs https://www.pathname.com/fhs/
5-
#+link: github-actions https://github.com/shajra/nix-project/actions
5+
#+link: garnix https://garnix.io
66
#+link: kaleidoscope https://github.com/keyboardio/Kaleidoscope
77
#+link: kaleidoscope-oneshot https://kaleidoscope.readthedocs.io/en/latest/plugins/OneShot.html
88
#+link: kaleidoscope-qukey https://kaleidoscope.readthedocs.io/en/latest/plugins/Qukeys.html
@@ -11,15 +11,17 @@
1111
#+link: keyboardio https://shop.keyboard.io
1212
#+link: key-compose https://en.wikipedia.org/wiki/Compose_key
1313
#+link: moonlander https://www.zsa.io/moonlander/
14+
#+link: mousemedia-ergodoxez https://github.com/shajra/shajra-keyboards/blob/main/keymaps/ergodox_ez/shajra/keymap.c#L102-L142
15+
#+link: mousemedia-model01 https://github.com/shajra/shajra-keyboards/blob/main/keymaps/model_01/shajra/Model01.ino#L113-L144
16+
#+link: mousemedia-model100 https://github.com/shajra/shajra-keyboards/blob/main/keymaps/model_100/shajra/Model100.ino#L113-L144
17+
#+link: mousemedia-moonlander https://github.com/shajra/shajra-keyboards/blob/main/keymaps/moonlander/shajra/keymap.c#L55-L70
1418
#+link: nix https://nixos.org/nix
15-
#+link: nix-flake-compat https://github.com/edolstra/flake-compat
1619
#+link: nix-install-manual https://nixos.org/manual/nix/stable/installation/installation.html
17-
#+link: nix-install-quick https://nixos.org/download.html#download-nix
1820
#+link: nix-language-manual https://nixos.org/manual/nix/stable/language/index.html
1921
#+link: nix-language-tutorial https://nixos.org/guides/nix-language.html
2022
#+link: nix-learn https://nixos.org/learn.html
2123
#+link: nixos https://nixos.org
22-
#+link: nixos-search https://search.nixos.org/packages
24+
#+link: nixos-releases https://nixos.org/manual/nixos/stable/release-notes.html
2325
#+link: nixpkgs https://github.com/NixOS/nixpkgs
2426
#+link: nixpkgs-manual https://nixos.org/nixpkgs/manual
2527
#+link: nix-uninstall https://nixos.org/manual/nix/stable/installation/installing-binary.html#uninstalling
@@ -33,7 +35,3 @@
3335
#+link: vim https://www.vim.org
3436
#+link: wally-udev https://github.com/zsa/wally/blob/master/dist/linux64/50-wally.rules
3537
#+link: zilent https://zealpc.net/products/zilents
36-
#+link: mousemedia-ergodoxez https://github.com/shajra/shajra-keyboards/blob/main/keymaps/ergodox_ez/shajra/keymap.c#L102-L142
37-
#+link: mousemedia-moonlander https://github.com/shajra/shajra-keyboards/blob/main/keymaps/moonlander/shajra/keymap.c#L55-L70
38-
#+link: mousemedia-model01 https://github.com/shajra/shajra-keyboards/blob/main/keymaps/model_01/shajra/Model01.ino#L113-L144
39-
#+link: mousemedia-model100 https://github.com/shajra/shajra-keyboards/blob/main/keymaps/model_100/shajra/Model100.ino#L113-L144

Diff for: doc/internal/params.el

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +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.23")
13+
(nix-latest . "2.23.2")
14+
(nix-stable . "2.18.4")
1415
(nixos-latest . "24.05")
1516
(platforms . "Linux on x86-64 machines"))

0 commit comments

Comments
 (0)