diff --git a/pkgs/development/python-modules/pam/default.nix b/pkgs/development/python-modules/pam/default.nix deleted file mode 100644 index 6b585537978..00000000000 --- a/pkgs/development/python-modules/pam/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pam -}: - -buildPythonPackage rec { - pname = "python-pam"; - version = "1.8.4"; - - src = fetchFromGitHub { - owner = "FirefighterBlu3"; - repo = pname; - rev = "v${version}"; - sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; - }; - - buildInputs = [ - pam - ]; - - postPatch = '' - sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py - ''; - - meta = with lib; { - description = "Python pam module supporting py3 (and py2)"; - homepage = "https://github.com/FirefighterBlu3/python-pam"; - license = licenses.mit; - maintainers = with maintainers; [ mkg20001 ]; - }; -} diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix index 4065cd7c014..f152c1f264e 100644 --- a/pkgs/development/python-modules/python-pam/default.nix +++ b/pkgs/development/python-modules/python-pam/default.nix @@ -1,23 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi, pam }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pam +}: buildPythonPackage rec { pname = "python-pam"; version = "1.8.4"; - src = fetchPypi { - inherit pname version; - sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8"; + src = fetchFromGitHub { + owner = "FirefighterBlu3"; + repo = pname; + rev = "v${version}"; + sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; }; + buildInputs = [ + pam + ]; + postPatch = '' - substituteInPlace pam.py --replace 'find_library("pam")' \ - '"${pam}/lib/libpam${stdenv.hostPlatform.extensions.sharedLibrary}"' + sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py ''; - meta = with stdenv.lib; { - description = "Python PAM module using ctypes"; + meta = with lib; { + description = "Python pam module supporting py3 (and py2)"; homepage = "https://github.com/FirefighterBlu3/python-pam"; - maintainers = with maintainers; [ abbradar ]; license = licenses.mit; + maintainers = with maintainers; [ abbradar mkg20001 ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8135c08374..f5c3f6c5103 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4193,7 +4193,8 @@ in { palettable = callPackage ../development/python-modules/palettable { }; - pam = callPackage ../development/python-modules/pam { inherit (pkgs) pam; }; + # Alias. Added 2020-09-07. + pam = self.python-pam; pamela = callPackage ../development/python-modules/pamela { }; @@ -5713,7 +5714,9 @@ in { python-packer = callPackage ../development/python-modules/python-packer { }; - python-pam = callPackage ../development/python-modules/python-pam { }; + python-pam = callPackage ../development/python-modules/python-pam { + inherit (pkgs) pam; + }; python-periphery = callPackage ../development/python-modules/python-periphery { };