From 817f0fd741612a906fa833bceb063569e8b7e853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 16 Mar 2021 20:03:12 +0100 Subject: [PATCH] perlPackages: NetLDAP -> perlldap Fix building with `config.allowAliases = false;`. --- pkgs/servers/mail/sympa/default.nix | 2 +- pkgs/tools/misc/shelldap/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix index 4bc969a851c..c08278c26c6 100644 --- a/pkgs/servers/mail/sympa/default.nix +++ b/pkgs/servers/mail/sympa/default.nix @@ -56,7 +56,7 @@ let IOSocketSSL MailDKIM NetDNS - NetLDAP + perlldap NetSMTP SOAPLite ]); diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index 18c5aea3dfd..c782b129200 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -6,7 +6,7 @@ perlPackages.buildPerlPackage rec { url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz"; sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i"; }; - buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ]; + buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ]; prePatch = '' touch Makefile.PL ''; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30d335b8588..d3b2b99d29a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1843,7 +1843,7 @@ let url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz"; sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8"; }; - propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ]; + propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessorFast ]; buildInputs = [ TestMockObject TestException NetLDAPServerTest ]; meta = { description= "Authentication from an LDAP Directory"; @@ -15365,7 +15365,7 @@ let url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz"; sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x"; }; - propagatedBuildInputs = [ NetLDAP ConvertASN1 ]; + propagatedBuildInputs = [ perlldap ConvertASN1 ]; meta = { description = "LDAP server side protocol handling"; license = with lib.licenses; [ artistic1 ]; @@ -15392,7 +15392,7 @@ let url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz"; sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i"; }; - propagatedBuildInputs = [ NetLDAP NetLDAPServer DataDump NetLDAPSID ]; + propagatedBuildInputs = [ perlldap NetLDAPServer DataDump NetLDAPSID ]; meta = { description= "test Net::LDAP code"; license = with lib.licenses; [ artistic1 ];