diff options
-rw-r--r-- | _sources/generated.json | 22 | ||||
-rw-r--r-- | _sources/generated.nix | 22 | ||||
-rw-r--r-- | hosts/sif/default.nix | 6 | ||||
-rw-r--r-- | overlays/etesync-dav.nix | 60 |
4 files changed, 83 insertions, 27 deletions
diff --git a/_sources/generated.json b/_sources/generated.json index 670ba5c6..62c68113 100644 --- a/_sources/generated.json +++ b/_sources/generated.json | |||
@@ -22,7 +22,7 @@ | |||
22 | }, | 22 | }, |
23 | "bpf-examples": { | 23 | "bpf-examples": { |
24 | "cargoLocks": null, | 24 | "cargoLocks": null, |
25 | "date": "2025-07-04", | 25 | "date": "2025-08-18", |
26 | "extract": null, | 26 | "extract": null, |
27 | "name": "bpf-examples", | 27 | "name": "bpf-examples", |
28 | "passthru": null, | 28 | "passthru": null, |
@@ -34,12 +34,12 @@ | |||
34 | "name": null, | 34 | "name": null, |
35 | "owner": "xdp-project", | 35 | "owner": "xdp-project", |
36 | "repo": "bpf-examples", | 36 | "repo": "bpf-examples", |
37 | "rev": "588d0064f575e58878f27bfa7eb52e460150dc6a", | 37 | "rev": "f19bc1a9402b6fb014e3b7114f06ffba5abdf5cc", |
38 | "sha256": "sha256-8wp2lfp7RQYmMJmHp0hzpCYQXj6hQXDIIKhpiCBYTt0=", | 38 | "sha256": "sha256-syYoC3XOJTUaL/Db0T10mSUak83qAl6Tx2fE6k4XLpI=", |
39 | "sparseCheckout": [], | 39 | "sparseCheckout": [], |
40 | "type": "github" | 40 | "type": "github" |
41 | }, | 41 | }, |
42 | "version": "588d0064f575e58878f27bfa7eb52e460150dc6a" | 42 | "version": "f19bc1a9402b6fb014e3b7114f06ffba5abdf5cc" |
43 | }, | 43 | }, |
44 | "emacs-scratch_el": { | 44 | "emacs-scratch_el": { |
45 | "cargoLocks": null, | 45 | "cargoLocks": null, |
@@ -437,7 +437,7 @@ | |||
437 | }, | 437 | }, |
438 | "v4l2loopback": { | 438 | "v4l2loopback": { |
439 | "cargoLocks": null, | 439 | "cargoLocks": null, |
440 | "date": "2025-07-16", | 440 | "date": "2025-08-18", |
441 | "extract": null, | 441 | "extract": null, |
442 | "name": "v4l2loopback", | 442 | "name": "v4l2loopback", |
443 | "passthru": null, | 443 | "passthru": null, |
@@ -449,12 +449,12 @@ | |||
449 | "name": null, | 449 | "name": null, |
450 | "owner": "umlaeute", | 450 | "owner": "umlaeute", |
451 | "repo": "v4l2loopback", | 451 | "repo": "v4l2loopback", |
452 | "rev": "7546a42a66d856933a75c2b0896cb735e3ca00c0", | 452 | "rev": "5eaa59e7c41d0e6f35a6c14c3b756d94d25f58ed", |
453 | "sha256": "sha256-jlTmdww0yXb4JXDxbjmPj1M1i+x00oknctVRHhixcwM=", | 453 | "sha256": "sha256-YcSpNfItvUdPVirlDyGdYuCnVvxHhh780x+OI5VNZmE=", |
454 | "sparseCheckout": [], | 454 | "sparseCheckout": [], |
455 | "type": "github" | 455 | "type": "github" |
456 | }, | 456 | }, |
457 | "version": "7546a42a66d856933a75c2b0896cb735e3ca00c0" | 457 | "version": "5eaa59e7c41d0e6f35a6c14c3b756d94d25f58ed" |
458 | }, | 458 | }, |
459 | "xcompose": { | 459 | "xcompose": { |
460 | "cargoLocks": null, | 460 | "cargoLocks": null, |
@@ -486,10 +486,10 @@ | |||
486 | "pinned": false, | 486 | "pinned": false, |
487 | "src": { | 487 | "src": { |
488 | "name": null, | 488 | "name": null, |
489 | "sha256": "sha256-Rvu1Pqsa++GExFtMF+mm66YUvmgOTAneWLeCYp0Nf0M=", | 489 | "sha256": "sha256-2oc7z0JBd6tcO3AfqU6kzawXvzrsXvN7kfUwyQ3ve88=", |
490 | "type": "url", | 490 | "type": "url", |
491 | "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.7.21.tar.gz" | 491 | "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.8.20.tar.gz" |
492 | }, | 492 | }, |
493 | "version": "2025.7.21" | 493 | "version": "2025.8.20" |
494 | } | 494 | } |
495 | } \ No newline at end of file | 495 | } \ No newline at end of file |
diff --git a/_sources/generated.nix b/_sources/generated.nix index b856af2c..4368c98a 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix | |||
@@ -18,15 +18,15 @@ | |||
18 | }; | 18 | }; |
19 | bpf-examples = { | 19 | bpf-examples = { |
20 | pname = "bpf-examples"; | 20 | pname = "bpf-examples"; |
21 | version = "588d0064f575e58878f27bfa7eb52e460150dc6a"; | 21 | version = "f19bc1a9402b6fb014e3b7114f06ffba5abdf5cc"; |
22 | src = fetchFromGitHub { | 22 | src = fetchFromGitHub { |
23 | owner = "xdp-project"; | 23 | owner = "xdp-project"; |
24 | repo = "bpf-examples"; | 24 | repo = "bpf-examples"; |
25 | rev = "588d0064f575e58878f27bfa7eb52e460150dc6a"; | 25 | rev = "f19bc1a9402b6fb014e3b7114f06ffba5abdf5cc"; |
26 | fetchSubmodules = true; | 26 | fetchSubmodules = true; |
27 | sha256 = "sha256-8wp2lfp7RQYmMJmHp0hzpCYQXj6hQXDIIKhpiCBYTt0="; | 27 | sha256 = "sha256-syYoC3XOJTUaL/Db0T10mSUak83qAl6Tx2fE6k4XLpI="; |
28 | }; | 28 | }; |
29 | date = "2025-07-04"; | 29 | date = "2025-08-18"; |
30 | }; | 30 | }; |
31 | emacs-scratch_el = { | 31 | emacs-scratch_el = { |
32 | pname = "emacs-scratch_el"; | 32 | pname = "emacs-scratch_el"; |
@@ -270,15 +270,15 @@ | |||
270 | }; | 270 | }; |
271 | v4l2loopback = { | 271 | v4l2loopback = { |
272 | pname = "v4l2loopback"; | 272 | pname = "v4l2loopback"; |
273 | version = "7546a42a66d856933a75c2b0896cb735e3ca00c0"; | 273 | version = "5eaa59e7c41d0e6f35a6c14c3b756d94d25f58ed"; |
274 | src = fetchFromGitHub { | 274 | src = fetchFromGitHub { |
275 | owner = "umlaeute"; | 275 | owner = "umlaeute"; |
276 | repo = "v4l2loopback"; | 276 | repo = "v4l2loopback"; |
277 | rev = "7546a42a66d856933a75c2b0896cb735e3ca00c0"; | 277 | rev = "5eaa59e7c41d0e6f35a6c14c3b756d94d25f58ed"; |
278 | fetchSubmodules = true; | 278 | fetchSubmodules = true; |
279 | sha256 = "sha256-jlTmdww0yXb4JXDxbjmPj1M1i+x00oknctVRHhixcwM="; | 279 | sha256 = "sha256-YcSpNfItvUdPVirlDyGdYuCnVvxHhh780x+OI5VNZmE="; |
280 | }; | 280 | }; |
281 | date = "2025-07-16"; | 281 | date = "2025-08-18"; |
282 | }; | 282 | }; |
283 | xcompose = { | 283 | xcompose = { |
284 | pname = "xcompose"; | 284 | pname = "xcompose"; |
@@ -294,10 +294,10 @@ | |||
294 | }; | 294 | }; |
295 | yt-dlp = { | 295 | yt-dlp = { |
296 | pname = "yt-dlp"; | 296 | pname = "yt-dlp"; |
297 | version = "2025.7.21"; | 297 | version = "2025.8.20"; |
298 | src = fetchurl { | 298 | src = fetchurl { |
299 | url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.7.21.tar.gz"; | 299 | url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.8.20.tar.gz"; |
300 | sha256 = "sha256-Rvu1Pqsa++GExFtMF+mm66YUvmgOTAneWLeCYp0Nf0M="; | 300 | sha256 = "sha256-2oc7z0JBd6tcO3AfqU6kzawXvzrsXvN7kfUwyQ3ve88="; |
301 | }; | 301 | }; |
302 | }; | 302 | }; |
303 | } | 303 | } |
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index 570c5df1..b436542f 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix | |||
@@ -448,11 +448,6 @@ in { | |||
448 | 448 | ||
449 | systemd.tmpfiles.settings = { | 449 | systemd.tmpfiles.settings = { |
450 | "10-localtime"."/etc/localtime".L.argument = "/.bcachefs/etc/localtime"; | 450 | "10-localtime"."/etc/localtime".L.argument = "/.bcachefs/etc/localtime"; |
451 | |||
452 | # "10-regreet"."/var/cache/regreet/cache.toml".C.argument = toString ((pkgs.formats.toml {}).generate "cache.toml" { | ||
453 | # last_user = "gkleen"; | ||
454 | # user_to_last_sess.gkleen = "Niri"; | ||
455 | # }); | ||
456 | }; | 451 | }; |
457 | 452 | ||
458 | users = { | 453 | users = { |
@@ -681,6 +676,7 @@ in { | |||
681 | "/var/lib/bluetooth" | 676 | "/var/lib/bluetooth" |
682 | "/var/lib/upower" | 677 | "/var/lib/upower" |
683 | "/var/lib/postfix" | 678 | "/var/lib/postfix" |
679 | "/var/lib/regreet" | ||
684 | "/etc/NetworkManager/system-connections" | 680 | "/etc/NetworkManager/system-connections" |
685 | config.boot.lanzaboote.pkiBundle | 681 | config.boot.lanzaboote.pkiBundle |
686 | ]; | 682 | ]; |
diff --git a/overlays/etesync-dav.nix b/overlays/etesync-dav.nix new file mode 100644 index 00000000..e0ced1e3 --- /dev/null +++ b/overlays/etesync-dav.nix | |||
@@ -0,0 +1,60 @@ | |||
1 | { final, prev, ... }: { | ||
2 | etesync-dav = final.python3Packages.buildPythonApplication rec { | ||
3 | pname = "etesync-dav"; | ||
4 | version = "0.35.1"; | ||
5 | pyproject = true; | ||
6 | |||
7 | src = prev.fetchFromGitHub { | ||
8 | owner = "etesync"; | ||
9 | repo = "etesync-dav"; | ||
10 | tag = "v${version}"; | ||
11 | hash = "sha256-y4BhU2kSn+RWqc5+pJQFhbwfat9cMWD0ED0EXJp25cY="; | ||
12 | }; | ||
13 | |||
14 | build-system = with final.python3Packages; [ setuptools ]; | ||
15 | |||
16 | dependencies = with final.python3Packages; [ | ||
17 | appdirs | ||
18 | etebase | ||
19 | etesync | ||
20 | flask | ||
21 | flask-wtf | ||
22 | msgpack | ||
23 | requests | ||
24 | requests.optional-dependencies.socks | ||
25 | (buildPythonApplication rec { | ||
26 | pname = "radicale"; | ||
27 | version = "3.2.0"; | ||
28 | pyproject = true; | ||
29 | |||
30 | src = prev.fetchFromGitHub { | ||
31 | owner = "Kozea"; | ||
32 | repo = "Radicale"; | ||
33 | rev = "refs/tags/v${version}"; | ||
34 | hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ="; | ||
35 | }; | ||
36 | |||
37 | postPatch = '' | ||
38 | sed -i '/addopts/d' setup.cfg | ||
39 | ''; | ||
40 | |||
41 | build-system = [ | ||
42 | setuptools | ||
43 | ]; | ||
44 | |||
45 | dependencies = [ | ||
46 | defusedxml | ||
47 | passlib | ||
48 | vobject | ||
49 | pika | ||
50 | python-dateutil | ||
51 | pytz # https://github.com/Kozea/Radicale/issues/816 | ||
52 | ] ++ passlib.optional-dependencies.bcrypt; | ||
53 | |||
54 | doCheck = false; | ||
55 | }) | ||
56 | ]; | ||
57 | |||
58 | doCheck = false; | ||
59 | }; | ||
60 | } | ||