From 19505f5cd1c2d38e322fb7b59540982a1a192d27 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 6 Nov 2025 19:46:04 -0300 Subject: [PATCH] gphotos-sync: drop --- pkgs/by-name/gp/gphotos-sync/package.nix | 63 ------------------- .../gp/gphotos-sync/skip-network-tests.patch | 21 ------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 pkgs/by-name/gp/gphotos-sync/package.nix delete mode 100644 pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch diff --git a/pkgs/by-name/gp/gphotos-sync/package.nix b/pkgs/by-name/gp/gphotos-sync/package.nix deleted file mode 100644 index 9b89e9c53b5e..000000000000 --- a/pkgs/by-name/gp/gphotos-sync/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, - ffmpeg, -}: -python3.pkgs.buildPythonApplication rec { - pname = "gphotos-sync"; - version = "3.2.1"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "gilesknap"; - repo = "gphotos-sync"; - rev = version; - hash = "sha256-iTqD/oUQqC7Fju8SEPkSZX7FC9tE4eRCewiJR8STmEw="; - }; - - patches = [ - ./skip-network-tests.patch - ]; - - nativeBuildInputs = with python3.pkgs; [ - setuptools - setuptools-scm - wheel - ]; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - attrs - exif - google-auth-oauthlib - psutil - pyyaml - psutil - requests-oauthlib - types-pyyaml - types-requests - ]; - - buildInputs = [ - ffmpeg - ]; - - nativeCheckInputs = with python3.pkgs; [ - mock - pytestCheckHook - ]; - - preCheck = '' - export PY_IGNORE_IMPORTMISMATCH=1 - export HOME=$(mktemp -d) - ''; - - meta = with lib; { - description = "Google Photos and Albums backup with Google Photos Library API"; - mainProgram = "gphotos-sync"; - homepage = "https://github.com/gilesknap/gphotos-sync"; - license = licenses.asl20; - maintainers = with maintainers; [ dnr ]; - }; -} diff --git a/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch b/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch deleted file mode 100644 index 6f78ed7db3f2..000000000000 --- a/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tests/test_setup.py b/tests/test_setup.py -index 085b110..ea4a7d2 100644 ---- a/tests/test_setup.py -+++ b/tests/test_setup.py -@@ -45,7 +45,8 @@ class SetupDbAndCredentials: - return self - - def __exit__(self, exc_type=None, exc_value=None, traceback=None): -- self.gp.google_photos_down.close() -+ if hasattr(self.gp, 'google_photos_down'): -+ self.gp.google_photos_down.close() - - def test_setup(self, test_name, args=None, trash_db=False, trash_files=False): - self.root = Path("/tmp/gpTests/{}".format(test_name)) -@@ -76,3 +77,6 @@ class SetupDbAndCredentials: - - def test_done(self): - self.gp.data_store.store() -+ -+import pytest, requests -+requests.Session.__init__ = lambda *args, **kwargs: pytest.skip("no network access") diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7f758a78104..3bbd458106dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -669,6 +669,7 @@ mapAliases { godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27 godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27 goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16 + gphotos-sync = throw "'gphotos-sync' has been removed, as it was archived upstream due to API changes that ceased its functions"; # Added 2025-11-06 gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27 gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09 gpxsee-qt6 = gpxsee; # added 2025-09-09