diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-05-23 18:41:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-23 18:41:16 -0400 |
commit | 308169a518b395f782ab6ce34f7928fcd379d282 (patch) | |
tree | 5b92dabfcc4bdbf9adcc7f3d238b0a4e43f16b67 /pkgs/tools | |
parent | 3de98a04c06ce345288228985ee6c04f6a86f582 (diff) | |
parent | 7a22dc48156a8db600240cdfd617f1ca1667a1b6 (diff) | |
download | nixlib-308169a518b395f782ab6ce34f7928fcd379d282.tar nixlib-308169a518b395f782ab6ce34f7928fcd379d282.tar.gz nixlib-308169a518b395f782ab6ce34f7928fcd379d282.tar.bz2 nixlib-308169a518b395f782ab6ce34f7928fcd379d282.tar.lz nixlib-308169a518b395f782ab6ce34f7928fcd379d282.tar.xz nixlib-308169a518b395f782ab6ce34f7928fcd379d282.tar.zst nixlib-308169a518b395f782ab6ce34f7928fcd379d282.zip |
Merge pull request #60640 from bignaux/photon
photon: 1.0.7 -> 1.3.0
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/photon/default.nix | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index aa5a3e9f6f11..5b923748c673 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -1,32 +1,26 @@ -{ stdenv, pythonPackages, fetchurl, makeWrapper }: +{ stdenv, python3Packages, fetchFromGitHub, makeWrapper }: -with pythonPackages; -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "photon"; - version = "1.0.7"; + version = "1.3.0"; - src = fetchurl { - url = "https://github.com/s0md3v/Photon/archive/v${version}.tar.gz"; - sha256 = "0c5l1sbkkagfxmh8v7yvi6z58mhqbwjyr7fczb5qwxm7la42ah9y"; + src = fetchFromGitHub { + owner = "s0md3v"; + repo = "Photon"; + rev = "v${version}"; + sha256 = "02z1xj72bq35dilr4b6njry4kixz6j2a3ag02nla98q0fvgmgnvy"; }; - patches = [ ./destdir.patch ]; - postPatch = '' - substituteInPlace photon.py --replace DESTDIR $out/share/photon - ''; - dontBuild = true; doCheck = false; - propagatedBuildInputs = [ - requests - urllib3 - ]; + + propagatedBuildInputs = with python3Packages; [ requests urllib3 tld ]; installPhase = '' mkdir -p "$out"/{bin,share/photon} cp -R photon.py core plugins $out/share/photon - makeWrapper ${python.interpreter} $out/bin/photon \ + makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \ --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \ --add-flags "-O $out/share/photon/photon.py" ''; |