Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 338a6e3f388f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eff932e22b09
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 10, 2019

  1. syncplay: add TLS support 

    Also cleanup.
    @abbradar
    abbradar committed Jun 10, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: C4844408C0657052
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eff932e View commit details
Showing with 10 additions and 8 deletions.
  1. +9 −7 pkgs/applications/networking/syncplay/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
16 changes: 9 additions & 7 deletions pkgs/applications/networking/syncplay/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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