diff options
author | volth <volth@webmaster.ms> | 2018-07-22 02:03:24 +0000 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-21 22:03:24 -0400 |
commit | cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16 (patch) | |
tree | 5f1c203e608071455dbbda699f52730bd4fbf058 /pkgs/top-level | |
parent | b6704130b426eb30c10424ad84b0e7b8f83a1e0f (diff) | |
download | nixlib-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar nixlib-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.gz nixlib-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.bz2 nixlib-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.lz nixlib-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.xz nixlib-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.tar.zst nixlib-cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16.zip |
treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 1 |
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2912dada4e99..9853c6f9caf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1567,7 +1567,7 @@ with pkgs; autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DateTime DateTimeFormatBuilder DateTimeCalendarJulian - ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ExtUtilsLibBuilder FileSlurp 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 @@ -5103,7 +5103,7 @@ with pkgs; }; smbldaptools = callPackage ../tools/networking/smbldaptools { - inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1; + inherit (perlPackages) perlldap CryptSmbHash DigestSHA1; }; smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; @@ -10265,7 +10265,7 @@ with pkgs; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; libguestfs = callPackage ../development/libraries/libguestfs { - inherit (perlPackages) libintlperl GetoptLong SysVirt; + inherit (perlPackages) libintl_perl GetoptLong SysVirt; appliance = libguestfs-appliance; }; @@ -11308,7 +11308,7 @@ with pkgs; pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; - wineStaging = pkgsi686Linux.wineStaging; + wine-staging = pkgsi686Linux.wine-staging; }; pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; @@ -12698,14 +12698,14 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; dkimproxy = callPackage ../servers/mail/dkimproxy { - inherit (perlPackages) Error MailDKIM MIMEtools NetServer; + inherit (perlPackages) Error MailDKIM MIMETools NetServer; }; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; dspam = callPackage ../servers/mail/dspam { - inherit (perlPackages) NetSMTP; + inherit (perlPackages) libnet; }; etcd = callPackage ../servers/etcd { }; @@ -15081,7 +15081,7 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; abcde = callPackage ../applications/audio/abcde { - inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; + inherit (perlPackages) MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; }; @@ -16999,7 +16999,7 @@ with pkgs; libreoffice = hiPrio libreoffice-still; libreoffice-args = { - inherit (perlPackages) ArchiveZip CompressZlib; + inherit (perlPackages) ArchiveZip IOCompress; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; @@ -21564,7 +21564,7 @@ with pkgs; inherit fping rrdtool; inherit (perlPackages) FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet - NetOpenSSH NetSNMP LWP IOTty perl NetDNS NetLDAP; + NetOpenSSH NetSNMP LWP IOTty perl NetDNS perlldap; }; snapraid = callPackage ../tools/filesystems/snapraid { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 255ea6d4ffda..be1da88caaee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10983,7 +10983,6 @@ let self = _self // overrides; _self = with self; { patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; doCheck = false; # The main test performs network access nativeBuildInputs = [ pkgs.pkgconfig ]; - #buildInputs = [ TestMore TestPod ]; propagatedBuildInputs = [ pkgs.libdiscid ]; }; |