From 8a21ce752f16856581fe8fd824b10e4957280b13 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Tue, 16 Mar 2021 16:46:48 -0700 Subject: [PATCH 1/5] maintainers: add dnr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9efca53200f..59c569c1bc9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2405,6 +2405,12 @@ githubId = 1708810; name = "Daniel Vianna"; }; + dnr = { + email = "dnr@dnr.im"; + github = "dnr"; + githubId = 466723; + name = "David Reiss"; + }; dochang = { email = "dochang@gmail.com"; github = "dochang"; From c58549c140da809c049b541706229731692949ea Mon Sep 17 00:00:00 2001 From: David Reiss Date: Mon, 22 Mar 2021 19:27:15 -0700 Subject: [PATCH 2/5] python3Packages.baseline: init at 1.2.1 --- .../python-modules/baseline/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/baseline/default.nix diff --git a/pkgs/development/python-modules/baseline/default.nix b/pkgs/development/python-modules/baseline/default.nix new file mode 100644 index 00000000000..0bee2295ed5 --- /dev/null +++ b/pkgs/development/python-modules/baseline/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pytestCheckHook }: + +buildPythonPackage rec { + pname = "baseline"; + version = "1.2.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "dmgass"; + repo = "baseline"; + rev = "95a0b71806ed16310eb0f27bc48aa5e21f731423"; + sha256 = "0qjg46ipyfjflvjqzqr5p7iylwwqn2mhhrq952d01vi8wvfds10d"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Easy String Baseline"; + longDescription = '' + This tool streamlines creation and maintenance of tests which compare + string output against a baseline. + ''; + homepage = "https://github.com/dmgass/baseline"; + license = licenses.mit; + maintainers = with maintainers; [ dnr ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f3b5e682ba..6cc22e7aeca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -906,6 +906,8 @@ in { base58 = callPackage ../development/python-modules/base58 { }; + baseline = callPackage ../development/python-modules/baseline { }; + baselines = callPackage ../development/python-modules/baselines { }; basemap = callPackage ../development/python-modules/basemap { }; From 7799d689ab66bb26aa465b5084125faa12b43941 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Tue, 16 Mar 2021 17:02:13 -0700 Subject: [PATCH 3/5] python3Packages.plum-py: init at 0.4.0 --- .../python-modules/plum-py/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/plum-py/default.nix diff --git a/pkgs/development/python-modules/plum-py/default.nix b/pkgs/development/python-modules/plum-py/default.nix new file mode 100644 index 00000000000..50a33266c8f --- /dev/null +++ b/pkgs/development/python-modules/plum-py/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchFromGitLab, isPy3k, pytest, baseline }: + +buildPythonPackage rec { + pname = "plum-py"; + version = "0.4.0"; + disabled = !isPy3k; + + src = fetchFromGitLab { + owner = "dangass"; + repo = "plum"; + rev = "6a9ff863c0e9fa21f7b2230d25402155a5522e4b"; + sha256 = "1iv62yb704c61b0dvsmyp3j6xpbmay532g9ny4pw4zbg3l69vd5j"; + }; + + postPatch = '' + substituteInPlace src/plum/int/flag/_flag.py \ + --replace 'if sys.version_info < (3, 7):' 'if True:' + ''; + + checkInputs = [ pytest baseline ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = "Classes and utilities for packing/unpacking bytes"; + homepage = "https://plum-py.readthedocs.io/en/latest/index.html"; + license = licenses.mit; + maintainers = with maintainers; [ dnr ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cc22e7aeca..077ff2ffbe2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5152,6 +5152,8 @@ in { plugwise = callPackage ../development/python-modules/plugwise { }; + plum-py = callPackage ../development/python-modules/plum-py { }; + plumbum = callPackage ../development/python-modules/plumbum { }; ply = callPackage ../development/python-modules/ply { }; From 791fc803c7a26eb3ec1fa311b7f4f7c9bd1670b5 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Tue, 16 Mar 2021 17:03:33 -0700 Subject: [PATCH 4/5] python3Packages.exif: init at 1.2.0 --- .../python-modules/exif/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/exif/default.nix diff --git a/pkgs/development/python-modules/exif/default.nix b/pkgs/development/python-modules/exif/default.nix new file mode 100644 index 00000000000..2c549030e6d --- /dev/null +++ b/pkgs/development/python-modules/exif/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitLab, isPy3k, plum-py, pytestCheckHook, baseline }: + +buildPythonPackage rec { + pname = "exif"; + version = "1.2.0"; + disabled = !isPy3k; + + src = fetchFromGitLab { + owner = "TNThieding"; + repo = "exif"; + rev = "686857c677f489759db90b1ad61fa1cc1cac5f9a"; + sha256 = "0z2if23kmi0iyxviz32mlqs997i3dqpqfz6nznlwkhkkb6rkwwnh"; + }; + + propagatedBuildInputs = [ plum-py ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "plum-py==0.3.1" "plum-py>=0.3.1" + ''; + + checkInputs = [ pytestCheckHook baseline ]; + + meta = with lib; { + description = "Read and modify image EXIF metadata using Python"; + homepage = "https://gitlab.com/TNThieding/exif"; + license = licenses.mit; + maintainers = with maintainers; [ dnr ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 077ff2ffbe2..b4432777c06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2202,6 +2202,8 @@ in { executor = callPackage ../development/python-modules/executor { }; + exif = callPackage ../development/python-modules/exif { }; + exifread = callPackage ../development/python-modules/exifread { }; exrex = callPackage ../development/python-modules/exrex { }; From fbef268c3c7d01245da537d45267c92c73a9f841 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Tue, 16 Mar 2021 17:12:17 -0700 Subject: [PATCH 5/5] gphotos-sync: init at 2.14.2 --- pkgs/tools/backup/gphotos-sync/default.nix | 44 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/backup/gphotos-sync/default.nix diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/tools/backup/gphotos-sync/default.nix new file mode 100644 index 00000000000..e7cd29e1a81 --- /dev/null +++ b/pkgs/tools/backup/gphotos-sync/default.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "gphotos-sync"; + version = "2.14.2"; + + src = fetchFromGitHub { + owner = "gilesknap"; + repo = "gphotos-sync"; + rev = version; + sha256 = "0cfmbrdy6w18hb623rjn0a4hnn3n63jw2jlmgn4a2k1sjqhpx3bf"; + }; + + propagatedBuildInputs = with python3Packages; [ + appdirs + attrs + exif + psutil + pyyaml + requests_oauthlib + ]; + checkInputs = with python3Packages; [ + pytestCheckHook + mock + ]; + checkPhase = '' + export HOME=$(mktemp -d) + + # patch to skip all tests that do network access + cat >>test/test_setup.py <