From 7f2fbdb09ea88806ae8364d18437ae02cb63b077 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Sat, 26 Oct 2024 17:58:16 +0100
Subject: [PATCH 1/3] icloudpd: 1.19.1 -> 1.24.0

---
 pkgs/by-name/ic/icloudpd/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index b67ef56b803b..4a877b1f6d9c 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icloudpd";
-  version = "1.19.1";
+  version = "1.24.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "icloud-photos-downloader";
     repo = "icloud_photos_downloader";
     rev = "v${version}";
-    hash = "sha256-0DbYbBs/8irj/55+WHyNj+iLWh7KqxReVWfmsWz43Xo=";
+    hash = "sha256-IP5bjRmHlVKYmcsR1g9B/p4KzVpCyBomwznPwjay4wA=";
   };
 
   pythonRelaxDeps = true;
@@ -37,6 +37,9 @@ python3Packages.buildPythonApplication rec {
     keyring
     keyrings-alt
     typing-extensions
+    flask
+    waitress
+    srp
   ];
 
   nativeCheckInputs = with python3Packages; [
@@ -57,6 +60,7 @@ python3Packages.buildPythonApplication rec {
     "test_autodelete_photos_dry_run"
     "test_retry_fail_delete_after_download_internal_error"
     "test_autodelete_invalid_creation_date"
+    "test_folder_structure_de_posix"
   ];
 
   passthru = {

From 1fad6e48dcad32e6791d547838c4556b20d4305f Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Sat, 26 Oct 2024 17:58:42 +0100
Subject: [PATCH 2/3] icloudpd: format with nixfmt-rfc-style

---
 pkgs/by-name/ic/icloudpd/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index 4a877b1f6d9c..0da758fc0fd3 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -1,9 +1,10 @@
-{ lib
-, python3Packages
-, fetchFromGitHub
-, nix-update-script
-, testers
-, icloudpd
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  nix-update-script,
+  testers,
+  icloudpd,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -79,6 +80,9 @@ python3Packages.buildPythonApplication rec {
     description = "iCloud Photos Downloader";
     license = licenses.mit;
     mainProgram = "icloudpd";
-    maintainers = with maintainers; [ anpin jnsgruk ];
+    maintainers = with maintainers; [
+      anpin
+      jnsgruk
+    ];
   };
 }

From 8cb288ce0481ee13b969d60d86754fccb1fa2929 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Sat, 26 Oct 2024 18:00:35 +0100
Subject: [PATCH 3/3] icloudpd: use `dependencies` and `build-system`

---
 pkgs/by-name/ic/icloudpd/package.nix | 39 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index 0da758fc0fd3..868355dea3be 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -21,34 +21,35 @@ python3Packages.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  propagatedBuildInputs = with python3Packages; [
-    wheel
-    setuptools
-    requests
-    schema
-    click
-    python-dateutil
-    tqdm
-    piexif
-    urllib3
-    six
-    tzlocal
-    pytz
+  dependencies = with python3Packages; [
     certifi
+    click
+    flask
     keyring
     keyrings-alt
-    typing-extensions
-    flask
-    waitress
+    piexif
+    python-dateutil
+    pytz
+    requests
+    schema
+    six
     srp
+    tqdm
+    typing-extensions
+    tzlocal
+    urllib3
+    waitress
+    wheel
   ];
 
+  build-system = with python3Packages; [ setuptools ];
+
   nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-    mock
     freezegun
-    vcrpy
+    mock
     pytest-timeout
+    pytestCheckHook
+    vcrpy
   ];
 
   disabledTests = [