From 8d4b0e9bc6aae33b9db7f69396e32e739a861085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 15 Oct 2024 14:10:12 -0700
Subject: [PATCH] immich: 1.117.0 -> 1.118.1

https://github.com/immich-app/immich/releases/tag/v1.118.0
https://github.com/immich-app/immich/releases/tag/v1.118.1
---
 .../im/immich-machine-learning/package.nix    | 29 ++++---------------
 pkgs/by-name/im/immich/sources.json           | 20 ++++++-------
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix
index 94cc69f50ed1..1029055a3b0f 100644
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@@ -8,27 +8,6 @@
 let
   python = python3.override {
     self = python;
-
-    packageOverrides = self: super: {
-      pydantic = super.pydantic_1;
-
-      versioningit = super.versioningit.overridePythonAttrs (_: {
-        doCheck = false;
-      });
-
-      albumentations = super.albumentations.overridePythonAttrs (old: rec {
-        version = "1.4.3";
-        src = fetchFromGitHub {
-          owner = "albumentations-team";
-          repo = "albumentations";
-          rev = version;
-          hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA=";
-        };
-        dependencies = old.dependencies ++ [
-          self.scikit-learn
-        ];
-      });
-    };
   };
 in
 python.pkgs.buildPythonApplication rec {
@@ -44,7 +23,10 @@ python.pkgs.buildPythonApplication rec {
     substituteInPlace app/test_main.py --replace-fail ": cv2.Mat" ""
   '';
 
-  pythonRelaxDeps = [ "setuptools" ];
+  pythonRelaxDeps = [
+    "pydantic-settings"
+    "setuptools"
+  ];
   pythonRemoveDeps = [ "opencv-python-headless" ];
 
   build-system = with python.pkgs; [
@@ -60,6 +42,8 @@ python.pkgs.buildPythonApplication rec {
       pillow
       fastapi
       uvicorn
+      pydantic
+      pydantic-settings
       aiocache
       rich
       ftfy
@@ -69,7 +53,6 @@ python.pkgs.buildPythonApplication rec {
       gunicorn
       huggingface-hub
       tokenizers
-      pydantic
     ]
     ++ uvicorn.optional-dependencies.standard;
 
diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index 28fa298d1a66..fb2e715428b3 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "1.117.0",
-  "hash": "sha256-v4TxKL+NaaAFxlJx/AG/5JxWnPK9uO6GjM4aoW53nzQ=",
+  "version": "1.118.1",
+  "hash": "sha256-rWBW0EwehuWnKk6qEte+dPd9l7FbLzwdkCSKMm22Orw=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-ARjrBHx4aOiNy2PbHWS7kP9Z8QiNyTeyImSxIsXwPnU=",
-      "version": "2.2.23"
+      "npmDepsHash": "sha256-0je82BtDH6cUzoMrmeIS0jLmWPbmkdIQJ/SnmbAMtbw=",
+      "version": "2.2.25"
     },
     "server": {
-      "npmDepsHash": "sha256-RjaTRqfZpDhI8lMVvsgICUn8g4NFnqcPptem/AwRr38=",
-      "version": "1.117.0"
+      "npmDepsHash": "sha256-Jxb47Y4x9A6s4zGODIp6rze7iQ/w8Gvt31NHSATLYCM=",
+      "version": "1.118.1"
     },
     "web": {
-      "npmDepsHash": "sha256-TZnpbLJbTNFwI2Kvng88z0T1jFf4Tj2xwR0X0wCLaD0=",
-      "version": "1.117.0"
+      "npmDepsHash": "sha256-BUgkdsC6raURkyy6eN31uCMKmBbL+fCbGabfHJgJn8g=",
+      "version": "1.118.1"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-G+iivJ0jibRCw/RChv5heVwY7c7oY/EG4bL+kpjoADQ=",
-      "version": "1.117.0"
+      "npmDepsHash": "sha256-Ga/aU5hojd3SgtoiM5QLsmzS5k7CRvh13a4lkC0BZA8=",
+      "version": "1.118.1"
     }
   }
 }