From eebf361edd82d14af4bb4eb92cbdefb57c8582cf Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Wed, 7 Aug 2024 13:43:08 -0400 Subject: [PATCH] python3Packages.pykerberos: disambiguate krb5 PyPI also has a package called krb5 and this package wants the system krb5, not the PyPI one. --- pkgs/development/python-modules/pykerberos/default.nix | 7 ++++--- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index b7b8953a72b3..653d978922ba 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -2,7 +2,7 @@ lib, fetchPypi, buildPythonPackage, - krb5, + pkgs, }: buildPythonPackage rec { @@ -15,12 +15,13 @@ buildPythonPackage rec { hash = "sha256-nXAevY/FlsmdMVXVukWBO9WQjSbvg7oK3SUO22IqvtQ="; }; - nativeBuildInputs = [ krb5 ]; # for krb5-config + nativeBuildInputs = [ pkgs.krb5 ]; # for krb5-config - buildInputs = [ krb5 ]; + buildInputs = [ pkgs.krb5 ]; # there are no tests doCheck = false; + pythonImportsCheck = [ "kerberos" ]; meta = with lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac6b04ff3897..e4e924cfbd3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11603,7 +11603,9 @@ self: super: with self; { pykeepass = callPackage ../development/python-modules/pykeepass { }; - pykerberos = callPackage ../development/python-modules/pykerberos { }; + pykerberos = callPackage ../development/python-modules/pykerberos { + krb5-c = pkgs.krb5; + }; pykeyatome = callPackage ../development/python-modules/pykeyatome { };