treewide: remove aliases evaluated to null

This commit is contained in:
volth 2018-12-14 15:40:36 +00:00
parent 707c059eb2
commit 6d2edfb0b8
15 changed files with 34 additions and 37 deletions

View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "nix-generate-from-cpan-3"; name = "nix-generate-from-cpan-3";
buildInputs = with perlPackages; [ buildInputs = with perlPackages; [
makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
]; ];
phases = [ "installPhase" ]; phases = [ "installPhase" ];

View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
install -D -m 644 man/*.1 $out/share/man/man1 install -D -m 644 man/*.1 $out/share/man/man1
''; '';
checkInputs = [ perlPackages.TestCommand perlPackages.TestHarness ]; checkInputs = [ perlPackages.TestCommand ];
preCheck = '' preCheck = ''
export PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" export PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl"
''; '';

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[boost] ++ [boost] ++
(with perlPackages; [ perl makeWrapper which (with perlPackages; [ perl makeWrapper which
EncodeLocale MathClipper ExtUtilsXSpp threads EncodeLocale MathClipper ExtUtilsXSpp
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX
ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP

View File

@ -74,7 +74,6 @@ stdenv.mkDerivation rec {
Moo Moo
NetDBus NetDBus
OpenGL OpenGL
threads
XMLSAX XMLSAX
]); ]);

View File

@ -29,7 +29,7 @@
wrapProgram $out/bin/sieve-connect \ wrapProgram $out/bin/sieve-connect \
--prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [ --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [
AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS
TermReadKey TermReadLineGnu ])}" TermReadKey TermReadLineGnu ])}"
''; '';

View File

@ -15,8 +15,8 @@ perlPackages.buildPerlPackage rec {
# minimum requirements from INSTALL.html#System_Requirements # minimum requirements from INSTALL.html#System_Requirements
AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5 AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5
EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree
IOSocketIP IOSocketSSL JSON IOSocketSSL JSON
LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt LocaleMaketextLexicon LocaleMsgfmt
LWP URI perlPackages.version LWP URI perlPackages.version
/*# optional dependencies /*# optional dependencies
libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager

View File

@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
perlPackages.NetSNMP perlPackages.NetSNMP
perlPackages.NetServer perlPackages.NetServer
perlPackages.ListMoreUtils perlPackages.ListMoreUtils
perlPackages.TimeHiRes
perlPackages.LWP perlPackages.LWP
perlPackages.DBDPg perlPackages.DBDPg
python python
@ -121,7 +120,7 @@ stdenv.mkDerivation rec {
--set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [
LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip
HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
ListMoreUtils TimeHiRes DBDPg LWP rrdtool ListMoreUtils DBDPg LWP rrdtool
]}" ]}"
done done
''; '';

View File

@ -20,34 +20,34 @@ perlPackages.buildPerlPackage {
IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address
Moose NetAddrIP NetDNS NetIP perlldap NetHTTP NetServer NetSSLeay ParamsValidate PathClass Moose NetAddrIP NetDNS NetIP perlldap NetHTTP NetServer NetSSLeay ParamsValidate PathClass
ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit
TestPod TestPodCoverage TextCSV_XS TimeHiRes Workflow XMLFilterXInclude XMLParser TestPod TestPodCoverage TextCSV_XS Workflow XMLFilterXInclude XMLParser
XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ] XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ]
++ stdenv.lib.optionals extraDependencies1 ++ stdenv.lib.optionals extraDependencies1
[ # dependencies from parsing through core/server [ # dependencies from parsing through core/server
ClassAccessor Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5 ClassAccessor PathTools DataDumper DateTime DateTimeFormatStrptime DBI
Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser Encode ExceptionClass FilePath FileTemp Filter GetoptLong HTMLParser
ScalarListUtils MathBigInt Memoize libnet PodUsage RTClientREST Socket ScalarListUtils MathBigInt Memoize libnet RTClientREST
Storable XSLoader ] Storable ]
++ stdenv.lib.optionals extraDependencies2 ++ stdenv.lib.optionals extraDependencies2
[ # dependencies taken from Debian [ # dependencies taken from Debian
MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor NamespaceAutoclean GitPurePerl MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor GitPurePerl
ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny
CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ] CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ]
++ stdenv.lib.optionals extraDependencies3 ++ stdenv.lib.optionals extraDependencies3
[ # dependencies taken from https://metacpan.org/pod/release/ALECH/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm [ # dependencies taken from https://metacpan.org/pod/release/ALECH/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm
AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen AttributeParamsValidate BC CGI CPAN CacheCache ClassClassgenclassgen
ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST
DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort
DevelSymdump DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall DevelSymdump DigestSHA1 Env Error ExtUtilsConstant ExtUtilsInstall
ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset ExtUtilsMakeMaker FileCheckTree GoferTransporthttp HTMLMason HTMLTagset
HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat HTTPServerSimpleMason IO IPCSysV LocaleCodes LogDispatch MathBigRat
MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker MathRound ModuleBuild ModuleBuildDeprecated NetPing PodChecker
PodCoverage PodEscapes PodLaTeX PodParser PodPerldoc PodPlainer PodSimple Safe SearchDict SelfLoader PodCoverage PodLaTeX PodParser PodPerldoc PodPlainer PodSimple
SubUplevel SysSyslog TemplatePluginAutoformat TermANSIColor TermCap TermReadKey Test TestException SubUplevel SysSyslog TemplatePluginAutoformat TermReadKey TestException
TestHTTPServerSimple TestHarness TestHarnessStraps TextAbbrev TextBalanced TextIconv TextSoundex TestHTTPServerSimple TestHarnessStraps TextBalanced TextIconv TextSoundex
TextTabsWrap ThreadQueue ThreadSemaphore TieFile TieRefHash TimeLocal URI UnicodeCollate ThreadQueue TieFile TieRefHash TimeLocal URI
UnicodeNormalize WWWMechanize Want XMLFilterBufferText XMLNamespaceSupport autodie base bignum if_ UnicodeNormalize WWWMechanize Want XMLFilterBufferText XMLNamespaceSupport bignum
lib libapreq2 libnet podlators threads threadsshared version ]; libapreq2 libnet podlators threadsshared version ];
preConfigure = '' preConfigure = ''
substituteInPlace core/server/Makefile.PL \ substituteInPlace core/server/Makefile.PL \

View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
sha256 = checksum; sha256 = checksum;
}; };
buildInputs = [ wget perl perlPackages.TestHarness MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; buildInputs = [ wget perl MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ];
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake ];

View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ]; buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ];
propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py
(with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong # For pass_gen.pl (with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl
perlldap ]); # For sha-dump.pl perlldap ]); # For sha-dump.pl
# TODO: Get dependencies for radius2john.pl and lion2john-alt.pl # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl

View File

@ -10,7 +10,7 @@ let
GnuPGInterfaceRuntimeDependencies = with perlPackages; [ GnuPGInterfaceRuntimeDependencies = with perlPackages; [
strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny
GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate
RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader RoleTiny SubExporterProgressive SubQuote TypeTiny
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signing-party"; pname = "signing-party";

View File

@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
perl perl
DBI DBI
DBDSQLite DBDSQLite
DigestMD5
HTMLTagset HTMLTagset
TimeDate # == DateParse TimeDate # == DateParse
HTMLTemplate HTMLTemplate

View File

@ -18,7 +18,7 @@
gzip -c man/ldap-schema-manager.1 > $out/share/man/man1/ldap-schema-manager.1.gz gzip -c man/ldap-schema-manager.1 > $out/share/man/man1/ldap-schema-manager.1.gz
wrapProgram $out/bin/schema2ldif \ wrapProgram $out/bin/schema2ldif \
--prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong perlPackages.PodUsage ]}" --prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong ]}"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -20,8 +20,8 @@ perlPackages.buildPerlModule rec {
DateTime DateTimeFormatBuilder DateTimeCalendarJulian DateTime DateTimeFormatBuilder DateTimeCalendarJulian
ExtUtilsLibBuilder FileSlurper FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils ExtUtilsLibBuilder FileSlurper FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils
ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit SortKey
TestDifferences TestDifferences
]; ];

View File

@ -12049,7 +12049,7 @@ let
sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y"; sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y";
}; };
outputs = [ "out" ]; outputs = [ "out" ];
buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey TimeHiRes ]; buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ];
meta = { meta = {
description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.'';
homepage = http://www.percona.com/software/percona-toolkit; homepage = http://www.percona.com/software/percona-toolkit;