git.iko.soy/typeable/nixpkgs
on master help sign in
fdroidserver: 2016-05-31 -> 1.1, and move out of pythonPackages
commit72857e28506ffc2c0082f6aea2ab550551a118b4 authorPhilipp Middendorf <middendorf@plapadoo.de> dateMon 28 Jan 2019, 15:51 (8 years ago) parentcdc3ee3
4 files changed+60−37
pkgs/development/python-modules/fdroidserver/default.nix−35 pkgs/development/tools/fdroidserver/default.nix+58 pkgs/top-level/all-packages.nix+2 pkgs/top-level/python-packages.nix−2
pkgs/development/python-modules/fdroidserver/default.nixdeleted−35
@@ -1,35 +0,0 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchFromGitLab
4−, libcloud
5−, pyyaml
6−, paramiko
7−, pyasn1
8−, pyasn1-modules
9−, pillow
10−, mwclient
11−, GitPython
12−, isPy3k
13−}:
14−
15−buildPythonPackage rec {
16− version = "2016-05-31";
17− pname = "fdroidserver-git";
18− disabled = ! isPy3k;
19−
20− src = fetchFromGitLab {
21− owner = "fdroid";
22− repo = "fdroidserver";
23− rev = "401649e0365e6e365fc48ae8a3af94768af865f3";
24− sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d";
25− };
26−
27− propagatedBuildInputs = [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ];
28−
29− meta = with stdenv.lib; {
30− homepage = https://f-droid.org;
31− description = "Server and tools for F-Droid, the Free Software repository system for Android";
32− license = licenses.agpl3;
33− };
34−
35−}
pkgs/development/tools/fdroidserver/default.nixnew file+58
@@ -0,0 +1,58 @@
1+{ docker
2+, fetchFromGitLab
3+, python
4+, lib }:
5+
6+python.pkgs.buildPythonApplication rec {
7+ version = "1.1";
8+ pname = "fdroidserver";
9+
10+ src = fetchFromGitLab {
11+ owner = "fdroid";
12+ repo = "fdroidserver";
13+ rev = version;
14+ sha256 = "1910ali90aj3wkxy6mi88c5ya6n7zbqr69nvmpc5dydxm0gb98w5";
15+ };
16+
17+ patchPhase = ''
18+ substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
19+ substituteInPlace setup.py --replace "pyasn1-modules == 0.2.1" "pyasn1-modules"
20+ '';
21+
22+ preConfigure = ''
23+ ${python.interpreter} setup.py compile_catalog
24+ '';
25+ postInstall = ''
26+ install -m 0755 gradlew-fdroid $out/bin
27+ '';
28+
29+ buildInputs = [ python.pkgs.Babel ];
30+
31+ propagatedBuildInputs = with python.pkgs; [
32+ androguard
33+ clint
34+ defusedxml
35+ docker
36+ docker-py
37+ GitPython
38+ libcloud
39+ mwclient
40+ paramiko
41+ pillow
42+ pyasn1
43+ pyasn1-modules
44+ python-vagrant
45+ pyyaml
46+ qrcode
47+ requests
48+ ruamel_yaml
49+ ];
50+
51+ meta = with lib; {
52+ homepage = https://f-droid.org;
53+ description = "Server and tools for F-Droid, the Free Software repository system for Android";
54+ license = licenses.agpl3;
55+ maintainers = [ lib.maintainers.pmiddend ];
56+ };
57+
58+}
pkgs/top-level/all-packages.nix+2
@@ -1350,6 +1350,8 @@ in
13501350
13511351 fd = callPackage ../tools/misc/fd { };
13521352
1353+ fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { };
1354+
13531355 filebench = callPackage ../tools/misc/filebench { };
13541356
13551357 fileshelter = callPackage ../servers/web-apps/fileshelter { };
pkgs/top-level/python-packages.nix−2
@@ -2389,8 +2389,6 @@ in {
23892389
23902390 pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
23912391
2392− fdroidserver = callPackage ../development/python-modules/fdroidserver { };
2393−
23942392 filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { };
23952393
23962394 pycodestyle = callPackage ../development/python-modules/pycodestyle { };