Merge pull request #231480 from fleaz/update_gphotos-sync

gphotos-sync: 3.04 -> 3.1.2

authored by

Nick Cao and committed by
GitHub
44a082f3 d8bddc31

+13 -26
+13 -26
pkgs/tools/backup/gphotos-sync/default.nix
··· 1 1 { lib 2 + , pkgs 2 3 , fetchFromGitHub 3 4 , fetchpatch 4 5 , python3 5 6 , ffmpeg 6 7 }: 7 - let 8 - py = python3.override { 9 - packageOverrides = self: super: { 10 - google-auth-oauthlib = super.google-auth-oauthlib.overridePythonAttrs (oldAttrs: rec { 11 - version = "0.5.2b1"; 12 - src = fetchFromGitHub { 13 - owner = "gilesknap"; 14 - repo = "google-auth-library-python-oauthlib"; 15 - rev = "v${version}"; 16 - hash = "sha256-o4Jakm/JgLszumrSoTTnU+nc79Ei70abjpmn614qGyc="; 17 - }; 18 - }); 19 - }; 20 - }; 21 - in 22 - py.pkgs.buildPythonApplication rec { 8 + python3.pkgs.buildPythonApplication rec { 23 9 pname = "gphotos-sync"; 24 - version = "3.04"; 10 + version = "3.1.2"; 25 11 format = "pyproject"; 26 12 27 13 SETUPTOOLS_SCM_PRETEND_VERSION = version; ··· 30 16 owner = "gilesknap"; 31 17 repo = "gphotos-sync"; 32 18 rev = version; 33 - sha256 = "0mnlnqmlh3n1b6fjwpx2byl1z41vgghjb95598kz5gvdi95iirrs"; 19 + hash = "sha256-lLw450Rk7tIENFTZWHoinkhv3VtctDv18NKxhox+NgI="; 34 20 }; 35 21 36 22 patches = [ 37 23 ./skip-network-tests.patch 38 24 ]; 39 25 40 - propagatedBuildInputs = with py.pkgs; [ 26 + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; 27 + pythonRelaxDeps = [ 28 + "psutil" 29 + "exif" 30 + ]; 31 + 32 + propagatedBuildInputs = with python3.pkgs; [ 41 33 appdirs 42 34 attrs 43 35 exif 44 36 google-auth-oauthlib 45 37 psutil 46 38 pyyaml 39 + psutil 47 40 requests-oauthlib 48 41 types-pyyaml 49 42 types-requests 50 43 ]; 51 44 52 - postPatch = '' 53 - # this is a patched release that we include via packageOverrides above 54 - substituteInPlace setup.cfg \ 55 - --replace " @ https://github.com/gilesknap/google-auth-library-python-oauthlib/archive/refs/tags/v0.5.2b1.zip" "" 56 - ''; 57 - 58 45 buildInputs = [ 59 46 ffmpeg 60 47 ]; 61 48 62 - nativeCheckInputs = with py.pkgs; [ 49 + nativeCheckInputs = with python3.pkgs; [ 63 50 mock 64 51 pytestCheckHook 65 52 setuptools-scm