From 6d2edfb0b86927319de59dcd6c98f9a66cd57f65 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 15:40:36 +0000 Subject: [PATCH] treewide: remove aliases evaluated to `null` --- .../scripts/nix-generate-from-cpan.nix | 2 +- pkgs/applications/graphics/feh/default.nix | 2 +- pkgs/applications/misc/slic3r/default.nix | 6 ++-- pkgs/applications/misc/slic3r/prusa3d.nix | 1 - .../networking/sieve-connect/default.nix | 2 +- pkgs/servers/foswiki/default.nix | 4 +-- pkgs/servers/monitoring/munin/default.nix | 3 +- pkgs/servers/openxpki/default.nix | 36 +++++++++---------- pkgs/tools/backup/znapzend/default.nix | 2 +- pkgs/tools/security/john/default.nix | 2 +- pkgs/tools/security/signing-party/default.nix | 2 +- pkgs/tools/text/popfile/default.nix | 1 - pkgs/tools/text/schema2ldif/default.nix | 2 +- pkgs/tools/typesetting/biber/default.nix | 4 +-- pkgs/top-level/perl-packages.nix | 2 +- 15 files changed, 34 insertions(+), 37 deletions(-) diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index ec406ac1a703..5c4cf0f6c558 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nix-generate-from-cpan-3"; buildInputs = with perlPackages; [ - makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl + makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; phases = [ "installPhase" ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 8938df4d42de..ff59a7fe6eed 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { install -D -m 644 man/*.1 $out/share/man/man1 ''; - checkInputs = [ perlPackages.TestCommand perlPackages.TestHarness ]; + checkInputs = [ perlPackages.TestCommand ]; preCheck = '' export PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" ''; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 7b28462d5527..e012c3763b34 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi"; }; - buildInputs = - [boost] ++ + buildInputs = + [boost] ++ (with perlPackages; [ perl makeWrapper which - EncodeLocale MathClipper ExtUtilsXSpp threads + EncodeLocale MathClipper ExtUtilsXSpp MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 251ee4d918b4..680703737c2a 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { Moo NetDBus OpenGL - threads XMLSAX ]); diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index 78910d1ecf6e..472a26274f87 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -29,7 +29,7 @@ wrapProgram $out/bin/sieve-connect \ --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [ - AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage + AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS TermReadKey TermReadLineGnu ])}" ''; diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix index 542322d0e621..572d1736755b 100644 --- a/pkgs/servers/foswiki/default.nix +++ b/pkgs/servers/foswiki/default.nix @@ -15,8 +15,8 @@ perlPackages.buildPerlPackage rec { # minimum requirements from INSTALL.html#System_Requirements AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5 EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree - IOSocketIP IOSocketSSL JSON - LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt + IOSocketSSL JSON + LocaleMaketextLexicon LocaleMsgfmt LWP URI perlPackages.version /*# optional dependencies libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 72d5f124c63d..1f3ad21d0e0d 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { perlPackages.NetSNMP perlPackages.NetServer perlPackages.ListMoreUtils - perlPackages.TimeHiRes perlPackages.LWP perlPackages.DBDPg python @@ -121,7 +120,7 @@ stdenv.mkDerivation rec { --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer - ListMoreUtils TimeHiRes DBDPg LWP rrdtool + ListMoreUtils DBDPg LWP rrdtool ]}" done ''; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 2b1000d0d851..192951607bfa 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -20,34 +20,34 @@ perlPackages.buildPerlPackage { IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address Moose NetAddrIP NetDNS NetIP perlldap NetHTTP NetServer NetSSLeay ParamsValidate PathClass 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 ] ++ stdenv.lib.optionals extraDependencies1 [ # dependencies from parsing through core/server - ClassAccessor Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5 - Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser - ScalarListUtils MathBigInt Memoize libnet PodUsage RTClientREST Socket - Storable XSLoader ] + ClassAccessor PathTools DataDumper DateTime DateTimeFormatStrptime DBI + Encode ExceptionClass FilePath FileTemp Filter GetoptLong HTMLParser + ScalarListUtils MathBigInt Memoize libnet RTClientREST + Storable ] ++ stdenv.lib.optionals extraDependencies2 [ # dependencies taken from Debian - MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor NamespaceAutoclean GitPurePerl + MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor GitPurePerl ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ] ++ stdenv.lib.optionals extraDependencies3 [ # 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 - DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber - DevelSymdump DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall - ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset - HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat - MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker - PodCoverage PodEscapes PodLaTeX PodParser PodPerldoc PodPlainer PodSimple Safe SearchDict SelfLoader - SubUplevel SysSyslog TemplatePluginAutoformat TermANSIColor TermCap TermReadKey Test TestException - TestHTTPServerSimple TestHarness TestHarnessStraps TextAbbrev TextBalanced TextIconv TextSoundex - TextTabsWrap ThreadQueue ThreadSemaphore TieFile TieRefHash TimeLocal URI UnicodeCollate - UnicodeNormalize WWWMechanize Want XMLFilterBufferText XMLNamespaceSupport autodie base bignum if_ - lib libapreq2 libnet podlators threads threadsshared version ]; + DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort + DevelSymdump DigestSHA1 Env Error ExtUtilsConstant ExtUtilsInstall + ExtUtilsMakeMaker FileCheckTree GoferTransporthttp HTMLMason HTMLTagset + HTTPServerSimpleMason IO IPCSysV LocaleCodes LogDispatch MathBigRat + MathRound ModuleBuild ModuleBuildDeprecated NetPing PodChecker + PodCoverage PodLaTeX PodParser PodPerldoc PodPlainer PodSimple + SubUplevel SysSyslog TemplatePluginAutoformat TermReadKey TestException + TestHTTPServerSimple TestHarnessStraps TextBalanced TextIconv TextSoundex + ThreadQueue TieFile TieRefHash TimeLocal URI + UnicodeNormalize WWWMechanize Want XMLFilterBufferText XMLNamespaceSupport bignum + libapreq2 libnet podlators threadsshared version ]; preConfigure = '' substituteInPlace core/server/Makefile.PL \ diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index e9218fd403e5..5314eef9eb6a 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = checksum; }; - buildInputs = [ wget perl perlPackages.TestHarness MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; + buildInputs = [ wget perl MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; nativeBuildInputs = [ autoconf automake ]; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index cb545570f51f..97f6ec21b548 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ]; 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 # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 14848df3f3ad..2fe7b3e3ceff 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -10,7 +10,7 @@ let GnuPGInterfaceRuntimeDependencies = with perlPackages; [ strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate - RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader + RoleTiny SubExporterProgressive SubQuote TypeTiny ]; in stdenv.mkDerivation rec { pname = "signing-party"; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index dbc16cf7a453..5e76e3541733 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { perl DBI DBDSQLite - DigestMD5 HTMLTagset TimeDate # == DateParse HTMLTemplate diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 699d2d28b82b..b40ceadf978c 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -18,7 +18,7 @@ gzip -c man/ldap-schema-manager.1 > $out/share/man/man1/ldap-schema-manager.1.gz wrapProgram $out/bin/schema2ldif \ - --prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong perlPackages.PodUsage ]}" + --prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index ea9b68f02b9e..123147cb5f17 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -20,8 +20,8 @@ perlPackages.buildPerlModule rec { DateTime DateTimeFormatBuilder DateTimeCalendarJulian ExtUtilsLibBuilder FileSlurper FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX - UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey + UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit SortKey TestDifferences ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e0186af67458..5c006597fa9c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12049,7 +12049,7 @@ let sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y"; }; outputs = [ "out" ]; - buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey TimeHiRes ]; + buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; meta = { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; homepage = http://www.percona.com/software/percona-toolkit;