diff options
| author | Chris Ostrouchov <chris.ostrouchov@gmail.com> | 2018-10-16 14:51:20 -0400 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 07:46:59 +0200 |
| commit | 7aa1a742c4a9c979b354091015cfaa76f050c8b6 (patch) | |
| tree | bc4528cd18023c4a26e1075480d6f6619f51a754 /pkgs | |
| parent | 5e90be5fd763cb55aa34be61fd7cc5a02ca9a242 (diff) | |
| download | nixlib-7aa1a742c4a9c979b354091015cfaa76f050c8b6.tar nixlib-7aa1a742c4a9c979b354091015cfaa76f050c8b6.tar.gz nixlib-7aa1a742c4a9c979b354091015cfaa76f050c8b6.tar.bz2 nixlib-7aa1a742c4a9c979b354091015cfaa76f050c8b6.tar.lz nixlib-7aa1a742c4a9c979b354091015cfaa76f050c8b6.tar.xz nixlib-7aa1a742c4a9c979b354091015cfaa76f050c8b6.tar.zst nixlib-7aa1a742c4a9c979b354091015cfaa76f050c8b6.zip | |
pythonPackages.fdroidserver: refactor move to python-modules
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/fdroidserver/default.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 23 |
2 files changed, 36 insertions, 22 deletions
diff --git a/pkgs/development/python-modules/fdroidserver/default.nix b/pkgs/development/python-modules/fdroidserver/default.nix new file mode 100644 index 000000000000..b9b936ae83e8 --- /dev/null +++ b/pkgs/development/python-modules/fdroidserver/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitLab +, libcloud +, pyyaml +, paramiko +, pyasn1 +, pyasn1-modules +, pillow +, mwclient +, GitPython +, isPy3k +}: + +buildPythonPackage rec { + version = "2016-05-31"; + pname = "fdroidserver-git"; + disabled = ! isPy3k; + + src = fetchFromGitLab { + owner = "fdroid"; + repo = "fdroidserver"; + rev = "401649e0365e6e365fc48ae8a3af94768af865f3"; + sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d"; + }; + + propagatedBuildInputs = [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ]; + + meta = with stdenv.lib; { + homepage = https://f-droid.org; + description = "Server and tools for F-Droid, the Free Software repository system for Android"; + license = licenses.agpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca197f0f05fa..1512c986358e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2378,28 +2378,7 @@ in { docker_compose = callPackage ../development/python-modules/docker_compose {}; - fdroidserver = buildPythonPackage rec { - version = "2016-05-31"; - name = "fdroidserver-git-${version}"; - - disabled = ! isPy3k; - - src = pkgs.fetchFromGitLab { - owner = "fdroid"; - repo = "fdroidserver"; - rev = "401649e0365e6e365fc48ae8a3af94768af865f3"; - sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d"; - }; - - propagatedBuildInputs = with self; [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ]; - - meta = { - homepage = https://f-droid.org; - description = "Server and tools for F-Droid, the Free Software repository system for Android"; - maintainers = with maintainers; [ ]; - license = licenses.agpl3; - }; - }; + fdroidserver = callPackage ../development/python-modules/fdroidserver { }; filebrowser_safe = buildPythonPackage rec { version = "0.3.6"; |