git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #60640 from bignaux/photon

photon: 1.0.7 -> 1.3.0

commit308169a518b395f782ab6ce34f7928fcd379d282 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateThu 23 May 2019, 18:41 (8 years ago) parent3de98a07a22dc4
3 files changed+47−17
pkgs/development/python-modules/tld/default.nix+34 pkgs/tools/networking/photon/default.nix+11−17 pkgs/top-level/python-packages.nix+2
pkgs/development/python-modules/tld/default.nixnew file+34
@@ -0,0 +1,34 @@
1+{ stdenv, fetchPypi, python }:
2+
3+python.pkgs.buildPythonPackage rec {
4+ pname = "tld";
5+ version = "0.9.3";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp";
10+ };
11+
12+ propagatedBuildInputs = with python.pkgs; [ six ];
13+ checkInputs = with python.pkgs; [ factory_boy faker pytest pytestcov tox ];
14+
15+ # https://github.com/barseghyanartur/tld/issues/54
16+ disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
17+ "test_1_update_tld_names"
18+ "test_1_update_tld_names_command"
19+ "test_2_update_tld_names_module"
20+ ]);
21+
22+ checkPhase = ''
23+ export PATH="$PATH:$out/bin"
24+ py.test -k '${disabledTests}'
25+ '';
26+
27+ meta = with stdenv.lib; {
28+ homepage = https://github.com/barseghyanartur/tld;
29+ description = "Extracts the top level domain (TLD) from the URL given";
30+ license = licenses.lgpl21;
31+ maintainers = with maintainers; [ genesis ];
32+ };
33+
34+}
pkgs/tools/networking/photon/default.nix+11−17
@@ -1,32 +1,26 @@
1−{ stdenv, pythonPackages, fetchurl, makeWrapper }:
1+{ stdenv, python3Packages, fetchFromGitHub, makeWrapper }:
22
3−with pythonPackages;
4−buildPythonApplication rec {
3+python3Packages.buildPythonApplication rec {
54 pname = "photon";
6− version = "1.0.7";
5+ version = "1.3.0";
76
8− src = fetchurl {
9− url = "https://github.com/s0md3v/Photon/archive/v${version}.tar.gz";
10− sha256 = "0c5l1sbkkagfxmh8v7yvi6z58mhqbwjyr7fczb5qwxm7la42ah9y";
7+ src = fetchFromGitHub {
8+ owner = "s0md3v";
9+ repo = "Photon";
10+ rev = "v${version}";
11+ sha256 = "02z1xj72bq35dilr4b6njry4kixz6j2a3ag02nla98q0fvgmgnvy";
1112 };
1213
13− patches = [ ./destdir.patch ];
14− postPatch = ''
15− substituteInPlace photon.py --replace DESTDIR $out/share/photon
16− '';
17−
1814 dontBuild = true;
1915 doCheck = false;
20− propagatedBuildInputs = [
21− requests
22− urllib3
23− ];
16+
17+ propagatedBuildInputs = with python3Packages; [ requests urllib3 tld ];
2418
2519 installPhase = ''
2620 mkdir -p "$out"/{bin,share/photon}
2721 cp -R photon.py core plugins $out/share/photon
2822
29− makeWrapper ${python.interpreter} $out/bin/photon \
23+ makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \
3024 --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \
3125 --add-flags "-O $out/share/photon/photon.py"
3226 '';
pkgs/top-level/python-packages.nix+2
@@ -5508,6 +5508,8 @@ in {
55085508
55095509 textacy = callPackage ../development/python-modules/textacy { };
55105510
5511+ tld = callPackage ../development/python-modules/tld { };
5512+
55115513 tldextract = callPackage ../development/python-modules/tldextract { };
55125514
55135515 pyemd = callPackage ../development/python-modules/pyemd { };