Use better Python packaging practices

Previously unstable was failing to build with some diagnostic errors.

Author: dehnert

modules/pyhesiodfs.nix

@@ -1,5 +1,5 @@
 { lib, pkgs, config, options,
-  specialArgs, modulesPath,
+  specialArgs, modulesPath, ...
 }:
 let
   cfg = config.services.pyhesiodfs;

pkgs/default.nix

@@ -10,7 +10,10 @@ in rec
   python-afs = ps: ps.callPackage ./python-afs.nix { };
   hesiod = pkgs.callPackage ./hesiod.nix { };
   python-hesiod = ps: ps.callPackage ./python-hesiod.nix { inherit hesiod; };
-  locker-support = ps: ps.callPackage ./locker-support.nix { inherit python-afs python-hesiod; };
+  locker-support = ps: ps.callPackage ./locker-support.nix {
+    python-afs = (python-afs ps);
+    python-hesiod = (python-hesiod ps);
+  };
   pyhesiodfs = pkgs.callPackage ./pyhesiodfs.nix { inherit python-hesiod locker-support; };
   remctl = pkgs.callPackage ./remctl.nix { };
   moira = pkgs.callPackage ./moira.nix { inherit hesiod; };

pkgs/locker-support.nix

@@ -23,8 +23,8 @@ in buildPythonPackage {
   ];
 
   dependencies = [
-    (python-afs python3Packages)
-    (python-hesiod python3Packages)
+    python-afs
+    python-hesiod
   ];
 
   buildInputs = [

pkgs/python-afs.nix

@@ -1,5 +1,7 @@
-{ stdenv, pkgs, lib, fetchFromGitHub, buildPythonPackage, setuptools, python3,
-  openafs, libkrb5, }:
+{ stdenv, pkgs, lib, fetchFromGitHub,
+  cython, buildPythonPackage, setuptools,
+  openafs, libkrb5,
+}:
 
 let
   fs = lib.fileset;
@@ -24,7 +26,7 @@ in buildPythonPackage {
   ];
 
   nativeBuildInputs = [
-    python3.pkgs.cython
+    cython
   ];
 
   pythonImportsCheck = [

pkgs/python-hesiod.nix

@@ -1,5 +1,5 @@
 { stdenv, pkgs, lib, fetchFromGitHub,
-  python3Packages, buildPythonPackage, setuptools,
+  cython, buildPythonPackage, setuptools,
   hesiod,
 }:
 
@@ -27,7 +27,7 @@ in buildPythonPackage {
   ];
 
   nativeBuildInputs = [
-    python3Packages.cython
+    cython
   ];
 
   pythonImportsCheck = [