From eff932e22b090860613dc68fef6fffeeae041757 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 10 Jun 2019 11:49:36 +0300 Subject: [PATCH] syncplay: add TLS support Also cleanup. --- .../applications/networking/syncplay/default.nix | 16 +++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4f4eaf302455..c8610d80ca78 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, python3Packages }: +{ lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { name = "syncplay-${version}"; version = "1.6.3"; format = "other"; - src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.6.3.tar.gz; - sha256 = "151p1njlp3dp3pfr3l3m6ia5829zvjyjh4p45j6rgnicbh8sqrgs"; + src = fetchFromGitHub { + owner = "Syncplay"; + repo = "syncplay"; + rev = "v${version}"; + sha256 = "03xw44lxdk1h9kbvfviqzpmxxld6zvp07i0hvdm1chchyp0a109h"; }; - propagatedBuildInputs = with python3Packages; [ pyside twisted ]; + propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://syncplay.pl/; description = "Free software that synchronises media players"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6963debd91e8..35db3e55f93a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20281,7 +20281,7 @@ in symlinks = callPackage ../tools/system/symlinks { }; - syncplay = callPackage ../applications/networking/syncplay { }; + syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; inherit (callPackages ../applications/networking/syncthing { }) syncthing