diff options
| author | Martin Fischer <martin@push-f.com> | 2026-05-16 12:21:55 +0200 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2026-05-16 19:20:24 +0200 |
| commit | 3193a5712894eea96a15c44c6867fdca0da0d168 (patch) | |
| tree | ee6b30132f324fd2ed6e7991670671c97633be7f | |
| parent | 24c971ff89fa4152ce776efbc0267b629ea79d32 (diff) | |
deps: update nixos nixos-small nixos-unstable
For all:
go: 1.25.8 -> 1.25.9
nix: 2.31.4 -> 2.31.5
vim: 9.1.2148 -> 9.2.0340
linux: 6.12.80 -> 6.12.87
systemd: 258.5 -> 258.7
openssh: 10.2p1 -> 10.3p1
For hamac:
anki: 25.09.2 -> 25.09.3
chromium: 146.0.7680.177 -> 148.0.7778.167
firefox: 149.0 -> 150.0.3
jujutsu: 0.40.0 -> 0.41.0
thunderbird: 148.0.1 -> 150.0.2
wireshark-qt: 4.6.4 -> 4.6.5
wl-clipboard: 2.2.1 -> 2.3.0
mupdf: 1.26.10 -> 1.27.2
For ev:
actual-server: 26.3.0 -> 26.4.0
anki-sync-server: 25.09.2 -> 25.09.4
navidrome: 0.60.3 -> 0.61.1
postgresql: 16.13, 17.9 -> 16.14, 17.10
For tente:
grafana: 12.3.6 -> 12.3.6+security-01
postgresql: 16.13 -> 16.14
| -rw-r--r-- | nixos/npins/sources.json | 12 | ||||
| -rw-r--r-- | user/vim/syntax/jjdescription.vim | 31 |
2 files changed, 37 insertions, 6 deletions
diff --git a/nixos/npins/sources.json b/nixos/npins/sources.json index 1051c2c..23c918f 100644 --- a/nixos/npins/sources.json +++ b/nixos/npins/sources.json @@ -135,20 +135,20 @@ "nixos": { "type": "Channel", "name": "nixos-25.11", - "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.8972.4e92bbcdb030/nixexprs.tar.xz", - "hash": "1lcfhmnw6x6pm823s39fra8cy51q16inl6izh510pdd2yyaabf5g" + "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.10830.d7a713c0b7e4/nixexprs.tar.xz", + "hash": "046szh6p14ffkayjcwa5ixm8kx71s9p4giq03i6v102y91ws1b69" }, "nixos-small": { "type": "Channel", "name": "nixos-25.11-small", - "url": "https://releases.nixos.org/nixos/25.11-small/nixos-25.11.9065.863c462d78dd/nixexprs.tar.xz", - "hash": "13j005fy7z93wj2ab7ib4sh7vkdhaj0aip73wj62cs4ia58imil1" + "url": "https://releases.nixos.org/nixos/25.11-small/nixos-25.11.10941.30f30521f3fc/nixexprs.tar.xz", + "hash": "0m21l2rwbhc2hdnna2lih0zjav629mipw7a28hrsz1ym5caamvyg" }, "nixos-unstable": { "type": "Channel", "name": "nixos-unstable", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre977467.4c1018dae018/nixexprs.tar.xz", - "hash": "1wv1rfq879hk4lg0136z4lgwa3fm985zhq10wwh6gzpgymzc2s2q" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre995699.da5ad661ba4e/nixexprs.tar.xz", + "hash": "1xj1yx3nj4p8gpcdylqqhp51v0v51b4dabrwa595wkc9bp6wkl5c" }, "prometheus-sql-exporter": { "type": "GitRelease", diff --git a/user/vim/syntax/jjdescription.vim b/user/vim/syntax/jjdescription.vim new file mode 100644 index 0000000..ddbdfd5 --- /dev/null +++ b/user/vim/syntax/jjdescription.vim @@ -0,0 +1,31 @@ +" workaround for https://github.com/vim/vim/commit/86dcb1878cdbd0a8af61664b14f034398e319026 +" FUTURE: delete this file when updating to vim >=v9.2.0341 +" Vim syntax file +" Language: jj description +" Maintainer: Gregory Anders <greg@gpanders.com> +" Last Change: 2024 May 8 +" 2025 Apr 17 by Vim Project (don't require space to start comments, #17130) +" 2026 Apr 09 by Vim Project (anchor status regex to beginning of line, #19879) +" 2026 Apr 09 by Vim Project (detect renames of files, #19879) + +if exists('b:current_syntax') + finish +endif + +syn match jjAdded "^JJ:\s\+\zsA\s.*" contained +syn match jjRemoved "^JJ:\s\+\zsD\s.*" contained +syn match jjChanged "^JJ:\s\+\zsM\s.*" contained +syn match jjRenamed "^JJ:\s\+\zsR\s.*" contained + +syn region jjComment start="^JJ:" end="$" contains=jjAdded,jjRemoved,jjChanged,jjRenamed + +syn include @jjCommitDiff syntax/diff.vim +syn region jjCommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|@@\@!\|[^[:alnum:]\ +-]\S\@!\)\@=/ fold contains=@jjCommitDiff + +hi def link jjComment Comment +hi def link jjAdded Added +hi def link jjRemoved Removed +hi def link jjChanged Changed +hi def link jjRenamed Changed + +let b:current_syntax = 'jjdescription' |
