NixOS · Nov 11, 2020 · Nov 11, 2020 · Nov 11, 2020 · Nov 11, 2020 · Nov 11, 2020
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit
 , pkgconfig, makeWrapper, autoreconfHook, fetchpatch
-, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
+, coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
       };
 
   nativeBuildInputs = [
-    makeWrapper pkgconfig docutils
+    makeWrapper pkgconfig docutils python3
   ] ++ optionals (!buildFromTarball) [
     autoreconfHook
   ] ++ optional (!stdenv.isDarwin) [
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
+    libxml2 gnutls perl readline gettext libtasn1 libgcrypt yajl
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus
   ] ++ optionals stdenv.isLinux [
     libpciaccess lvm2 utillinux systemd libnl numad zfs

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
@@ -36,8 +36,11 @@ buildPythonPackage rec {
     gst-plugins-base
   ];
 
-  requiredPythonModules = [
+  buildInputs = [
     gst-plugins-base
+  ];
+
+  requiredPythonModules = [
     pygobject3
   ];
 

diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
@@ -2,9 +2,11 @@
 , fetchFromGitHub
 , buildPythonPackage
 , isPyPy
-, pkgs
+, parted
 , python
 , six
+, e2fsprogs
+, pkg-config
 }:
 
 buildPythonPackage rec {
@@ -20,7 +22,7 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    sed -i -e 's|mke2fs|${pkgs.e2fsprogs}/bin/mke2fs|' tests/baseclass.py
+    sed -i -e 's|mke2fs|${e2fsprogs}/bin/mke2fs|' tests/baseclass.py
     sed -i -e '
       s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
     ' tests/test__ped_ped.py
@@ -35,12 +37,12 @@ buildPythonPackage rec {
   ];
 
   preConfigure = ''
-    PATH="${pkgs.parted}/sbin:$PATH"
+    PATH="${parted}/sbin:$PATH"
   '';
 
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   checkInputs = [ six ];
-  requiredPythonModules = [ pkgs.parted ];
+  buildInputs = [ parted ];
 
   checkPhase = ''
     patchShebangs Makefile

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
@@ -45,7 +45,10 @@ buildPythonPackage rec {
     })
   ];
 
-  requiredPythonModules = if withApplePCSC then [ PCSC ] else [ pcsclite ];
+  makeWrapperArgs = [
+    "--prefix PATH : ${stdenv.lib.makeBinPath (if withApplePCSC then [ PCSC ] else [ pcsclite ])}"
+  ];
+
   nativeBuildInputs = [ swig ];
 
   meta = {

diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
@@ -35,6 +35,10 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
+  buildInputs = lib.optionals stdenv.isLinux [
+    trezor-udev-rules
+  ];
+
   requiredPythonModules = [
     attrs
     click
@@ -50,8 +54,6 @@ buildPythonPackage rec {
     rlp
     shamir-mnemonic
     typing-extensions
-  ] ++ lib.optionals stdenv.isLinux [
-    trezor-udev-rules
   ];
 
   checkInputs = [

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -17,7 +17,6 @@ with pkgs.lib;
 let
   python_ = python;
   packages = ( self:
-
 let
   python = toPythonModule python_;
 
@@ -5290,7 +5289,9 @@ in {
 
   pyparsing = callPackage ../development/python-modules/pyparsing { };
 
-  pyparted = callPackage ../development/python-modules/pyparted { };
+  pyparted = callPackage ../development/python-modules/pyparted {
+    inherit (pkgs) parted;
+  };
 
   pypblib = callPackage ../development/python-modules/pypblib { };