summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-08-06 12:07:37 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-08-06 12:07:37 +0200
commitf504af072bc5cf49da008e6970c214255d5f46ed (patch)
treef2849cd5d239a32d7a2fbdff1dc5b3a0ed369b96 /pkgs/tools/misc
parent11ceef47699fb0911bea790e4b8059d97e95ad14 (diff)
parent6820e2f0dd16104961d6fc7e8e38846807159c4e (diff)
downloadnixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.gz
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.bz2
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.lz
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.xz
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.zst
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.zip
Merge branch 'master' into staging-next
There's been some large rebuild on master.
I don't really have time ATM to find what it was.
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/svtplay-dl/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 9ba61221684a..e29e799898c3 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -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";