From 5ab80867e1e7afa4299b75c2754bb1e032cf7177 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 15 Oct 2024 18:04:06 -0400 Subject: [PATCH] chore: update astal and some docker images --- .../docker/homepage/images/homepage.nix | 4 ++-- .../docker/immich/images/machine-learning.nix | 4 ++-- .../modules/docker/immich/images/server.nix | 4 ++-- .../docker/media/seerr/images/jellyseerr.nix | 4 ++-- flake.lock | Bin 56618 -> 56618 bytes lib/pkgs.nix | 4 ++-- nixosModules/ags/v2/default.nix | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/devices/nos/modules/docker/homepage/images/homepage.nix b/devices/nos/modules/docker/homepage/images/homepage.nix index 439b2340..dfe6ea7e 100644 --- a/devices/nos/modules/docker/homepage/images/homepage.nix +++ b/devices/nos/modules/docker/homepage/images/homepage.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/gethomepage/homepage"; - imageDigest = "sha256:671c2ed1a61b5dfbb9a1998c8738c3aeb1acf11adbc12563f81fcf4fd9802198"; - sha256 = "14pfbr0h19qwydvs3hscmsylg0z4hzg3m86hdpk6z4mi663mjra2"; + imageDigest = "sha256:d41dca72f3a68d2c675eb232a448104af200096f05e2610ffbfdb16bc7f71410"; + sha256 = "0x97p3d22qb43p653qrf29aknxwla1nnss3sk32wn6gapg1v05iy"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/immich/images/machine-learning.nix b/devices/nos/modules/docker/immich/images/machine-learning.nix index 70f493a1..04a3ce26 100644 --- a/devices/nos/modules/docker/immich/images/machine-learning.nix +++ b/devices/nos/modules/docker/immich/images/machine-learning.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/immich-app/immich-machine-learning"; - imageDigest = "sha256:1221bc54568a0779227baeaa4282bb0e0db50831b66f9ac9afa9d78513df36ad"; - sha256 = "003xbnmbqr6arv1cx3q64sbsk8galxf5889lqzwjyclwln35mxlp"; + imageDigest = "sha256:1eb7b45d222d49d33acfeae0ca612e64e838bde1bd142830b6160e358edef815"; + sha256 = "1a64bywipy5znsjwfkshs00fck7v07pzpnfqgri261x740pdck7p"; finalImageName = imageName; finalImageTag = "release"; } diff --git a/devices/nos/modules/docker/immich/images/server.nix b/devices/nos/modules/docker/immich/images/server.nix index 25ce7663..63866e69 100644 --- a/devices/nos/modules/docker/immich/images/server.nix +++ b/devices/nos/modules/docker/immich/images/server.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/immich-app/immich-server"; - imageDigest = "sha256:ac9fb82f2be3cc60d4e0c7f1ceb371d401d52573e387834d7a82776116458242"; - sha256 = "08my8d66fq8pmg5kwjj9v85dnwv53sslsa6hbcvbpwg5pxbnmm52"; + imageDigest = "sha256:3c4250f80ef0c38b70fb947c2c6688e07c737d2409c1d715a2f03fb7d75ba036"; + sha256 = "1bfywvvcr8a07z8zxwjdlxfjnaxyzzwnd74cxpfk0dnwlmrw0pv3"; finalImageName = imageName; finalImageTag = "release"; } diff --git a/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix b/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix index 92e56cd4..ee9ffaf3 100644 --- a/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix +++ b/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "docker.io/fallenbagel/jellyseerr"; - imageDigest = "sha256:8f708df0ce3f202056bde5d7bff625eb59efe38f4ee47bdddc7560b6e4a5a214"; - sha256 = "19bppycfly5mjpj0vmj63fgkck3x4qldmqmfph05bqs1fp5n546w"; + imageDigest = "sha256:319b09a7db75d697bedc41f6784efd47b8f213a26819d636dec2050efe816567"; + sha256 = "1c1g70kycqk97ia6nqws44d6paw6k70xh5dxmmqh0hmizzdhlbvi"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index a65e76b8d86c1fba47b49fe2796dcdfa02edff1f..5f7a8c9c26d4b90d8172de750522f4b7909623ea 100644 GIT binary patch delta 618 zcmXw$y-$--7{vz)65^o2XhI@7kW^^Qd%r&x5=zTQX@TNfO1s^A-+S!~m6k%ya<-Q)3bUhJ|m>PS53zVYacf zmR;9mwFAST95)ZbD3(V{thl^a3GEgQNw?MsI{sbw#Q#bKFND-WLcyTMOc3O-qY6r; zB48s+k#T}62o3e+@wLP-={Ml$;Bxfa$Y{bP!aqNKmRSw?ZcuC-w%b9w)h)1QZto-{ zg{$dIJ}Y)AwZ)>1Tm5`(@vyN_&ArlKhlt)v&}?HS`x~f)%KarVWS*YR_#Yoq{_gCN zzquMuOU{9caHKV`0AdCdl~f^S6|-DujFr)Vkm2P2yo0;5`h1EdI{)zHbSBdYO1t~@ z5JqvXu^GR?x^kqmH6~Uzv*ozg!uG)AyNA3Gy&hh0aVyhCs^rs{QwW7N8exryv=Tb! b7#EU22?4P7Z)1OPi~Q%gnZc*;Z}0yBDL%;+ delta 618 zcmXYvO=}ZT6o$bjZ7D7kzo1}1D7JPMnS1Zdz2_nnVrrXqk~AMpGRbc4y)(73Hc9hg zG8?lOq2+G+7g`aNY@~ZvBGrFj_g(l0M8{gr=D^`SFVB0<>Dkoj+0@6kv1wp7BS_zV zmoT`>NCB0yTWtG{;-Hfs=AhJYt1UNYRQoQY>uIN4O6LpdoW982*S})PB^wA(i&CW& z3#1g-v^l{(H(3A@3o4_IP%L$E)`Wn!u_=VapQp=)mHSM>dc~V1(sq!u#|QL3|w#$?UX1m6-BmB0MWqm z^{1!V$*5++G(>aE^-(Ngc%+ydQk-{kC1LM`qiogi70OmJ`GXDSyk1v53-Vz*Gid#f zc|2awKaXPi^6>7_@0mrgg+iXiDObvm;Dm>i3IgT}p{Q*!+Y%8t*QuqfzLrid4;w2n zWSRIMv(f2xNx9O4RJV?cvKdweMla~rHj_!(uBAs_X*k?(wg<0zt8kU}$vIyVNJd4a nA`*ZC5?I<2*`@>)D3g1hsiNQE`0CCl=U9JOUYNZ9{^sUi1HH{W diff --git a/lib/pkgs.nix b/lib/pkgs.nix index ea585e73..c347bcf2 100644 --- a/lib/pkgs.nix +++ b/lib/pkgs.nix @@ -32,7 +32,7 @@ packages, pname, }: let - inherit (pkgs.lib) concatMapStrings elemAt length map optionalString splitString toLower; + inherit (pkgs.lib) concatMapStrings elemAt filter hasAttr length map optionalString splitString toLower; withGirNames = map (package: { @@ -42,7 +42,7 @@ then "AstalWp-0.1" else (concatMapStrings capitalise (splitString "-" package.pname)) + "-0.1"; }) - packages; + (filter (hasAttr "pname") packages); in { "${configPath}${optionalString (length packages == 1) "/${toLower (elemAt withGirNames 0).girName}"}".source = pkgs.callPackage diff --git a/nixosModules/ags/v2/default.nix b/nixosModules/ags/v2/default.nix index 7199e422..5e2b7671 100644 --- a/nixosModules/ags/v2/default.nix +++ b/nixosModules/ags/v2/default.nix @@ -52,10 +52,10 @@ self: { "allowJs" = true; "experimentalDecorators" = true; "jsx" = "react-jsx"; - "jsxImportSource" = "${agsV2Packages.astal}/share/astal/gjs/src/jsx"; + "jsxImportSource" = "${agsV2Packages.astal3}/share/astal/gjs/src/jsx"; "paths" = { - "astal" = ["${agsV2Packages.astal}/share/astal/gjs"]; - "astal/*" = ["${agsV2Packages.astal}/share/astal/gjs/src/*"]; + "astal" = ["${agsV2Packages.astal3}/share/astal/gjs"]; + "astal/*" = ["${agsV2Packages.astal3}/share/astal/gjs/src/*"]; }; }; };