b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pythonPackages.python-pam: remove duplicate package, fixes #97355

Browse source
This commit is contained in:
Frederik Rietdijk 2020-09-07 20:23:26 +02:00 committed by Frederik Rietdijk
parent d8e5c6072a
commit 945fdbe1b9
3 changed files with 23 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkgs/development/python-modules/pam/default.nix
View file

@ -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 ];
};
}

27
pkgs/development/python-modules/python-pam/default.nix
View file

@ -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 ];
};
}

7
pkgs/top-level/python-packages.nix
View file

@ -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 { };