nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #142108 from Ma27/pi-ldap-proxy-py3

Browse Source
This commit is contained in:
Sandro 2021-10-18 22:06:22 +02:00 committed by GitHub
commit b775c1f58d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/security/privacyidea.nix
View File

@ -272,7 +272,7 @@ in
(mkIf cfg.ldap-proxy.enable {
systemd.services.privacyidea-ldap-proxy = let
ldap-proxy-env = pkgs.python2.withPackages (ps: [ ps.privacyidea-ldap-proxy ]);
ldap-proxy-env = pkgs.python3.withPackages (ps: [ ps.privacyidea-ldap-proxy ]);
in {
description = "privacyIDEA LDAP proxy";
wantedBy = [ "multi-user.target" ];

14
pkgs/development/python-modules/privacyidea/ldap-proxy.nix → pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix
View File

@ -1,30 +1,24 @@
{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }:
{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }:
buildPythonPackage rec {
pname = "privacyidea-ldap-proxy";
version = "0.6.1";
# https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50
disabled = isPy3k;
version = "0.6.2";
src = fetchFromGitHub {
owner = "privacyidea";
repo = pname;
rev = "v${version}";
sha256 = "1kc1n9wr1a66xd5zvl6dq78xnkqkn5574jpzashc99pvm62dr24j";
sha256 = "sha256-U2lg4zDQKn9FQ7O0zSLaijIkXKVjg8wi2ItueF4ACDU=";
};
propagatedBuildInputs = [ twisted ldaptor configobj ];
# python 2 zope.interface test import path issues
doCheck = false;
pythonImportsCheck = [ "pi_ldapproxy" ];
meta = with lib; {
description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA";
homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy";
license = licenses.agpl3;
license = licenses.agpl3Only;
maintainers = [ maintainers.globin ];
};
}

2
pkgs/top-level/python-packages.nix
View File

@ -5872,6 +5872,8 @@ in {
prison = callPackage ../development/python-modules/prison { };
privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea-ldap-proxy { };
pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { };
proboscis = callPackage ../development/python-modules/proboscis { };

2
pkgs/top-level/python2-packages.nix
View File

@ -407,8 +407,6 @@ with self; with super; {
prettytable = callPackage ../development/python-modules/prettytable/1.nix { };
privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };
ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { };
progressbar231 = callPackage ../development/python-modules/progressbar231 { };