public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
There's been some large rebuild on master.
I don't really have time ATM to find what it was.
This commit is contained in:
Vladimír Čunát
2018-08-06 12:07:37 +02:00
parent 11ceef4769 6820e2f0dd
commit f504af072b
112 changed files with 2429 additions and 2492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/svtplay-dl/default.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip
{ stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip
, rtmpdump }:
let
inherit (pythonPackages) python nose pycrypto requests mock;
inherit (python3Packages) python nose pycrypto requests mock;
in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}";
version = "1.9.11";