diff options
| author | fleaz <mail@felixbreidenstein.de> | 2023-05-12 16:17:03 +0200 |
|---|---|---|
| committer | fleaz <mail@felixbreidenstein.de> | 2023-05-14 16:45:29 +0200 |
| commit | 7ecb6dffd2895009bbf4556455c31c4d4f30db10 (patch) | |
| tree | b7fdca9e33ab349038a038dc8f6ded1becda5848 | |
| parent | 29639f61d81940041b4310f96e2e6265e3a57927 (diff) | |
gphotos-sync: 3.04 -> 3.1.2
| -rw-r--r-- | pkgs/tools/backup/gphotos-sync/default.nix | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/tools/backup/gphotos-sync/default.nix index c4464d3b76db..3ab3aaa03e6d 100644 --- a/pkgs/tools/backup/gphotos-sync/default.nix +++ b/pkgs/tools/backup/gphotos-sync/default.nix @@ -1,27 +1,13 @@ { lib +, pkgs , fetchFromGitHub , fetchpatch , python3 , ffmpeg }: -let - py = python3.override { - packageOverrides = self: super: { - google-auth-oauthlib = super.google-auth-oauthlib.overridePythonAttrs (oldAttrs: rec { - version = "0.5.2b1"; - src = fetchFromGitHub { - owner = "gilesknap"; - repo = "google-auth-library-python-oauthlib"; - rev = "v${version}"; - hash = "sha256-o4Jakm/JgLszumrSoTTnU+nc79Ei70abjpmn614qGyc="; - }; - }); - }; - }; -in -py.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "gphotos-sync"; - version = "3.04"; + version = "3.1.2"; format = "pyproject"; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -30,36 +16,37 @@ py.pkgs.buildPythonApplication rec { owner = "gilesknap"; repo = "gphotos-sync"; rev = version; - sha256 = "0mnlnqmlh3n1b6fjwpx2byl1z41vgghjb95598kz5gvdi95iirrs"; + hash = "sha256-lLw450Rk7tIENFTZWHoinkhv3VtctDv18NKxhox+NgI="; }; patches = [ ./skip-network-tests.patch ]; - propagatedBuildInputs = with py.pkgs; [ + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "psutil" + "exif" + ]; + + propagatedBuildInputs = with python3.pkgs; [ appdirs attrs exif google-auth-oauthlib psutil pyyaml + psutil requests-oauthlib types-pyyaml types-requests ]; - postPatch = '' - # this is a patched release that we include via packageOverrides above - substituteInPlace setup.cfg \ - --replace " @ https://github.com/gilesknap/google-auth-library-python-oauthlib/archive/refs/tags/v0.5.2b1.zip" "" - ''; - buildInputs = [ ffmpeg ]; - nativeCheckInputs = with py.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock pytestCheckHook setuptools-scm |