Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/git annex remote google #46554

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3234,6 +3234,11 @@
github = "polyrod";
name = "Maurizio Di Pietro";
};
poelzi = {
email = "nix@poelzi.org";
github = "poelzi";
name = "Daniel Poelzleithner";
};
pradeepchhetri = {
email = "pradeep.chhetri89@gmail.com";
github = "pradeepchhetri";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ let

git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { };

git-annex-remote-googledrive = callPackage ./git-annex-remote-googledrive { };

# support for bugzilla
git-bz = callPackage ./git-bz { };

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#{ stdenv, pythonPackages, fetchPypi, rclone, makeWrapper }:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

{ stdenv, lib, python3 }:

python3.pkgs.buildPythonApplication rec {
pname = "git-annex-remote-googledrive";
version = "0.11.1";

src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "1vaycxmxhx8g797nzrnkmz5vbmjy4x7x3b7a2xb7yz6grgcxqgld";
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By convention we also add a

# no tests
doCheck = false;

remark if a python package comes without tests.


buildInputs = [ ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

propagatedBuildInputs = [ python3.pkgs.pydrive python3.pkgs.annexremote python3.pkgs.tenacity ];

meta = with stdenv.lib; {
description = "Git annex remote for GoogleDrive";
license = licenses.lgpl3;
maintainers = with maintainers; [ poelzi ];
};

}
18 changes: 18 additions & 0 deletions pkgs/development/python-modules/annexremote/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi }:

buildPythonPackage rec {
pname = "annexremote";
version = "1.2.0";

src = fetchPypi {
inherit pname version;
sha256 = "2be77ae9b9edd0d2818ab6dff7070a05aed2fcc1e5065638aa03eba991b67f17";
};

meta = with stdenv.lib; {
homepage = https://github.com/Lykos153/AnnexRemote;
description = "Helper module to easily develop special remotes for git annex";
license = licenses.gpl3;
maintainers = with maintainers; [ poelzi ];
};
}
23 changes: 23 additions & 0 deletions pkgs/development/python-modules/pydrive/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ stdenv, buildPythonPackage, fetchPypi, oauth2client, pyyaml, google_api_python_client }:

buildPythonPackage rec {
pname = "PyDrive";
version = "1.3.1";

src = fetchPypi {
inherit pname version;
sha256 = "83890dcc2278081c6e3f6a8da1f8083e25de0bcc8eb7c91374908c5549a20787";
};

propagatedBuildInputs = [ oauth2client pyyaml google_api_python_client ];

# does not work due missing secrets file
doCheck = false;

meta = with stdenv.lib; {
homepage = https://github.com/googledrive/PyDrive;
description = "PyDrive is a wrapper library of google-api-python-client that simplifies many common Google Drive API tasks";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't repeat name of package

license = licenses.asl20;
maintainers = with maintainers; [ poelzi ];
};
}
23 changes: 23 additions & 0 deletions pkgs/development/python-modules/tenacity/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ stdenv, buildPythonPackage, fetchPypi, pbr, six }:

buildPythonPackage rec {
pname = "tenacity";
version = "5.0.2";

src = fetchPypi {
inherit pname version;
sha256 = "4c10be4f8fbeb1cae24b9315103d8aca3f2b1ef001d455cbb1671d3d79924be6";
};

propagatedBuildInputs = [ pbr six ];

# does not work due missing secrets file
doCheck = false;

meta = with stdenv.lib; {
homepage = https://github.com/jd/tenacity;
description = "Retrying library for Python";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Routines for retrying code"

license = licenses.asl20;
maintainers = with maintainers; [ poelzi ];
};
}
6 changes: 6 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ in {

aioamqp = callPackage ../development/python-modules/aioamqp { };

annexremote = callPackage ../development/python-modules/annexremote { };

ansicolor = callPackage ../development/python-modules/ansicolor { };

argon2_cffi = callPackage ../development/python-modules/argon2_cffi { };
Expand Down Expand Up @@ -418,6 +420,8 @@ in {

pydbus = callPackage ../development/python-modules/pydbus { };

pydrive = callPackage ../development/python-modules/pydrive { };

pydocstyle = callPackage ../development/python-modules/pydocstyle { };

pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {}));
Expand Down Expand Up @@ -13600,6 +13604,8 @@ in {

texttable = callPackage ../development/python-modules/texttable { };

tenacity = callPackage ../development/python-modules/tenacity { };

tiros = callPackage ../development/python-modules/tiros { };

tifffile = callPackage ../development/python-modules/tifffile { };
Expand Down