From cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 22 Jul 2018 02:03:24 +0000 Subject: [PATCH] treewide: fix build with disallowed aliases (#43872) fixes build with disallowed aliases --- lib/strings.nix | 2 +- maintainers/scripts/nix-generate-from-cpan.nix | 2 +- .../display-managers/lightdm-greeters/gtk.nix | 4 ++-- pkgs/applications/audio/abcde/default.nix | 4 ++-- pkgs/applications/audio/lollypop/default.nix | 4 ++-- pkgs/applications/graphics/shutter/default.nix | 4 ++-- pkgs/applications/misc/yarssr/default.nix | 2 +- .../networking/browsers/eolie/default.nix | 2 +- .../feedreaders/feedreader/default.nix | 4 ++-- .../remote/citrix-receiver/default.nix | 2 +- .../networking/transporter/default.nix | 4 ++-- .../office/libreoffice/default.nix | 4 ++-- pkgs/applications/office/libreoffice/still.nix | 4 ++-- .../git-and-tools/default.nix | 5 ++--- .../window-managers/i3/default.nix | 2 +- .../gnome-3/games/gnome-mines/default.nix | 4 ++-- .../gnome-3/games/gnome-nibbles/default.nix | 4 ++-- .../gnome-3/games/gnome-robots/default.nix | 4 ++-- .../xfce/thunar-plugins/archive/default.nix | 4 ++-- .../xfce/thunar-plugins/dropbox/default.nix | 4 ++-- pkgs/desktops/xfce4-13/orage/default.nix | 6 +++--- .../haskell-modules/hackage-packages.nix | 6 +++--- pkgs/development/libraries/flatpak/default.nix | 2 +- .../libraries/libguestfs/default.nix | 4 ++-- pkgs/development/tools/misc/hydra/default.nix | 3 +-- pkgs/development/web/postman/default.nix | 2 +- pkgs/games/steam/runtime-wrapped.nix | 2 +- pkgs/servers/foswiki/default.nix | 2 +- pkgs/servers/mail/dkimproxy/default.nix | 4 ++-- pkgs/servers/mail/dspam/default.nix | 4 ++-- .../monitoring/fusion-inventory/default.nix | 2 +- pkgs/servers/monitoring/longview/default.nix | 2 +- pkgs/servers/monitoring/munin/default.nix | 10 +++++----- pkgs/servers/openxpki/default.nix | 12 ++++++------ pkgs/servers/slimserver/default.nix | 4 ++-- pkgs/tools/misc/arp-scan/default.nix | 2 +- pkgs/tools/misc/lbdb/default.nix | 4 ++-- pkgs/tools/misc/pipelight/default.nix | 5 ++--- pkgs/tools/networking/smbldaptools/default.nix | 4 ++-- pkgs/tools/networking/smokeping/default.nix | 4 ++-- .../appimage-run/default.nix | 2 +- pkgs/tools/security/john/default.nix | 4 ++-- pkgs/tools/security/signing-party/default.nix | 2 +- pkgs/tools/text/popfile/default.nix | 2 -- pkgs/tools/typesetting/biber/default.nix | 4 ++-- .../virtualization/linode-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 18 +++++++++--------- pkgs/top-level/perl-packages.nix | 1 - 48 files changed, 91 insertions(+), 97 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index e09ec42bfea2..7cd09a109396 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -121,7 +121,7 @@ rec { Example: pkgs = import { } - makePerlPath [ pkgs.perlPackages.NetSMTP ] + makePerlPath [ pkgs.perlPackages.libnet ] => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" */ makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 82d9ad6077a2..ec406ac1a703 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 Log4Perl + makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; phases = [ "installPhase" ]; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 385f20b7e066..cfa38f175dd3 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -68,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.gnome-themes-standard; - defaultText = "pkgs.gnome3.gnome-themes-standard"; + default = pkgs.gnome3.gnome-themes-extra; + defaultText = "pkgs.gnome3.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 04ee72edc36e..7f2080c6fd63 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 , lame, flac, glyr -, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID +, perl, MusicBrainz, MusicBrainzDiscID , makeWrapper }: let version = "2.8.1"; @@ -35,7 +35,7 @@ in buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ]; + propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ]; installFlags = [ "sysconfdir=$(out)/etc" ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 1c58f4f79cd9..dc59ba6e01ab 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -2,7 +2,7 @@ , appstream-glib, desktop-file-utils, gobjectIntrospection , python36Packages, gnome3, glib, gst_all_1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "0.9.521"; name = "lollypop-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib ] ++ (with gnome3; [ - gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser + gsettings-desktop-schemas gtk3 libsecret libsoup totem-pl-parser ]) ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 1f41253b6994..a409060afdc6 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -7,9 +7,9 @@ let [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext - ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON + ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS - CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo + commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index 2c569b7d6816..a8ff981400a9 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -16,7 +16,7 @@ let ClassSingleton URI AnyEvent AnyEventHTTP - CommonSense + commonsense FileSlurp JSON Guard diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 5de6c0d882a3..8d7f4e6cc703 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [ - glib glib-networking gsettings_desktop_schemas gtk3 webkitgtk libsecret + glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret ]) ++ (with gst_all_1; [ gst-libav gst-plugins-base gst-plugins-ugly gstreamer ]); diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 505afd25d04f..d2991c3ba1c9 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -24,8 +24,8 @@ in stdenv.mkDerivation { buildInputs = [ curl glib json-glib libnotify libsecret sqlite ] ++ (with gnome3; [ - gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts - gsettings_desktop_schemas + gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts + gsettings-desktop-schemas ]) ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 489de974aaaf..c4e73f3f2fa9 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -247,7 +247,7 @@ let makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ --add-flags "-icaroot $ICAInstDir" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix index 141c40f3b84e..d084461a9b2d 100644 --- a/pkgs/applications/networking/transporter/default.nix +++ b/pkgs/applications/networking/transporter/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { defaultIconTheme # If I omit this there's no icons in KDE glib granite - gsettings_desktop_schemas + gsettings-desktop-schemas gtk3 libgee magic-wormhole @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { substituteInPlace ./src/WormholeInterface.vala \ --replace /bin/wormhole ${magic-wormhole}/bin/wormhole ''; - + postPatch = '' chmod +x ./meson/post_install.py patchShebangs ./meson/post_install.py diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 43258282ac06..7125343dee67 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext -, CompressZlib, zlib, libjpeg, expat, freetype, libwpd +, IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis @@ -251,7 +251,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig + IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 7a2538e4bcd6..5958a5aa79e4 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip -, CompressZlib, zlib, libjpeg, expat, freetype, libwpd +, IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, carlito @@ -248,7 +248,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig + IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index ba5486dc0158..c82a8d8ecc52 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -10,10 +10,9 @@ let sendEmailSupport = false; # requires plenty of perl libraries perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; smtpPerlLibs = [ - perlPackages.NetSMTP perlPackages.NetSMTPSSL + perlPackages.libnet perlPackages.NetSMTPSSL perlPackages.IOSocketSSL perlPackages.NetSSLeay - perlPackages.MIMEBase64 perlPackages.AuthenSASL - perlPackages.DigestHMAC + perlPackages.AuthenSASL perlPackages.DigestHMAC ]; }; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 74c3c71dbf7c..513fe06df8f6 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun - perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + perlPackages.ExtUtilsPkgConfig perlPackages.InlineC xorgserver xvfb_run ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 55dad369c108..33672054a373 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, libxml2, libgames-support, libgee }: +, librsvg, gettext, itstool, libxml2, libgnome-games-support, libgee }: stdenv.mkDerivation rec { name = "gnome-mines-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gobjectIntrospection for finding vapi files nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ]; - buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ]; + buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ]; postPatch = '' chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 302d8fb21010..7390108953f7 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool -, libxml2, libgee, libgames-support }: +, libxml2, libgee, libgnome-games-support }: stdenv.mkDerivation rec { name = "gnome-nibbles-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme - libgee libgames-support + libgee libgnome-games-support ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index e07e3c141522..9a81c88206df 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support , libgee}: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 - libxml2 gnome3.defaultIconTheme libgames-support libgee + libxml2 gnome3.defaultIconTheme libgnome-games-support libgee ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 9783e6c9228f..e9c55618c60f 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools , gtk -, thunarx-2-dev +, thunar-bare , exo, libxfce4util, libxfce4ui , xfconf, udev, libnotify }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xfce4-dev-tools - thunarx-2-dev + thunar-bare exo gtk libxfce4util libxfce4ui xfconf udev libnotify ]; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index d44281d052d1..6b9aac4a8ccd 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , gtk -, thunarx-2-dev, python2 +, thunar-bare, python2 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk - thunarx-2-dev python2 + thunar-bare python2 ]; configurePhase = "python2 waf configure --prefix=$out"; diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix index 3857846ea82d..c44b32c2edda 100644 --- a/pkgs/desktops/xfce4-13/orage/default.nix +++ b/pkgs/desktops/xfce4-13/orage/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null -, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: +{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify +, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; @@ -13,7 +13,7 @@ mkXfceDerivation rec { version = "4.12.1"; sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; - buildInputs = [ dbus_glib gtk2 libical libnotify popt ] + buildInputs = [ dbus-glib gtk2 libical libnotify popt ] ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; patches = [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 853557821713..ff62e2eba3b2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -207831,7 +207831,7 @@ self: { }) {}; "udev" = callPackage - ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }: + ({ mkDerivation, base, bytestring, udev, posix-paths, unix }: mkDerivation { pname = "udev"; version = "0.1.0.0"; @@ -207839,12 +207839,12 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring posix-paths unix ]; - libraryPkgconfigDepends = [ libudev ]; + libraryPkgconfigDepends = [ udev ]; description = "libudev bindings"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libudev;}; + }) {inherit (pkgs) udev;}; "udp-conduit" = callPackage ({ mkDerivation, base, chunked-data, conduit-combinators diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index b8b55d6a8742..e769cb505134 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -5,7 +5,7 @@ let version = "0.99.3"; - desktop_schemas = gnome3.gsettings_desktop_schemas; + desktop_schemas = gnome3.gsettings-desktop-schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 7569f2613bbd..555828bfaf6a 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor +, gmp, readline, file, libintl_perl, GetoptLong, SysVirt, numactl, xen, libapparmor , getopt, perlPackages, ocamlPackages , appliance ? null , javaSupport ? false, jdk ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong + systemd fuse yajl libvirt gmp readline file hivex libintl_perl GetoptLong SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) ++ stdenv.lib.optional javaSupport jdk; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index cf516b16f4b4..f4f72491970c 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -22,7 +22,7 @@ let CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace - CatalystPluginUnicodeEncoding + CatalystRuntime CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON @@ -52,7 +52,6 @@ let SetScalar Starman SysHostnameLong - TestMore TextDiff TextTable XMLSimple diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index cbe7d3da8aa6..6c3509d632f2 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pkgs.alsaLib pkgs.cairo pkgs.cups - pkgs.dbus_daemon.lib + pkgs.dbus.daemon.lib pkgs.expat pkgs.gdk_pixbuf pkgs.glib diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index b3746a50c777..a0ed5aaf210c 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -8,7 +8,7 @@ let libpulseaudio alsaLib openalSoft - libva1-full + libva1 libvdpau vulkan-loader gcc.cc diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix index 5bfeef6f1fc1..542322d0e621 100644 --- a/pkgs/servers/foswiki/default.nix +++ b/pkgs/servers/foswiki/default.nix @@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec { buildInputs = with perlPackages; [ # minimum requirements from INSTALL.html#System_Requirements AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5 - DigestSHA EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree + EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree IOSocketIP IOSocketSSL JSON LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt LWP URI perlPackages.version diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix index 9abf95fb6d60..2912ce4cfcaa 100644 --- a/pkgs/servers/mail/dkimproxy/default.nix +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }: +{ stdenv, perl, fetchurl, Error, MailDKIM, MIMETools, NetServer }: let pkg = "dkimproxy"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ perl ]; - propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ]; + propagatedBuildInputs = [ Error MailDKIM MIMETools NetServer ]; meta = with stdenv.lib; { description = "SMTP-proxy that signs and/or verifies emails"; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index b63390bb2474..8fa7719a722b 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper , gawk, gnused, gnugrep, coreutils, which -, perl, NetSMTP +, perl, libnet , withMySQL ? false, zlib, mysql57 , withPgSQL ? false, postgresql , withSQLite ? false, sqlite @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { rm -rf $out/var wrapProgram $out/bin/dspam_notify \ - --set PERL5LIB "${lib.makePerlPath [ NetSMTP ]}" + --set PERL5LIB "${lib.makePerlPath [ libnet ]}" # Install SQL scripts mkdir -p $out/share/dspam/sql diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 96eaa5ef0cc4..d9e8ccf1454f 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -49,7 +49,7 @@ buildPerlPackage rec { IOSocketSSL IPCRun JSON - LWPProtocolhttps + LWPProtocolHttps ModuleInstall NetSNMP TestCompile diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index dcc6f6f16b7f..45e380379d2f 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl makeWrapper glibc ] ++ (with perlPackages; [ - LWPUserAgent + LWP LWPProtocolHttps MozillaCA CryptSSLeay diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 62fc3c6f8f55..8bf9da22e728 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78"; }; - buildInputs = [ + buildInputs = [ makeWrapper which coreutils @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { perlPackages.NetCIDR perlPackages.NetSSLeay perlPackages.NetServer - perlPackages.Log4Perl + perlPackages.LogLog4perl perlPackages.IOSocketInet6 perlPackages.Socket6 perlPackages.URI @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { perlPackages.NetServer perlPackages.ListMoreUtils perlPackages.TimeHiRes - perlPackages.LWPUserAgent + perlPackages.LWP perlPackages.DBDPg python ruby @@ -116,9 +116,9 @@ stdenv.mkDerivation rec { esac wrapProgram "$file" \ --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ - Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip + LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer - ListMoreUtils TimeHiRes DBDPg LWPUserAgent rrdtool + ListMoreUtils TimeHiRes DBDPg LWP rrdtool ]}" done ''; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 111c2f02b996..1a41cd97aaf0 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -14,19 +14,19 @@ buildPerlPackage { buildInputs = [ perl openssl gettext python34Packages.sphinx ]; propagatedBuildInputs = with perlPackages; [ # dependencies from Makefile.PL - libintlperl ConfigVersioned LWP TestSimple ClassAccessorChained IOSocketSSL ClassStd + libintl_perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10 DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt - IPCShareLite JSON Log4Perl LWPProtocolconnect LWPProtocolhttps MailRFC822Address - Moose NetAddrIP NetDNS NetIP NetLDAP NetHTTP NetServer NetSSLeay ParamsValidate PathClass + 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 XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ] ++ stdenv.lib.optionals extraDependencies1 [ # dependencies from parsing through core/server ClassAccessor Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5 - DigestSHA Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser - ScalarListUtils MathBigInt Memoize MIMEBase64 NetSMTP PodUsage RTClientREST Socket + Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser + ScalarListUtils MathBigInt Memoize libnet PodUsage RTClientREST Socket Storable XSLoader ] ++ stdenv.lib.optionals extraDependencies2 [ # dependencies taken from Debian @@ -38,7 +38,7 @@ buildPerlPackage { AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber - DevelSymdump Digest DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall + 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 diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index c9bf8393afc7..523292f6b0f4 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -45,8 +45,8 @@ buildPerlPackage rec { perlPackages.IOSocketSSL perlPackages.IOString perlPackages.JSONXSVersionOneAndTwo - perlPackages.Log4Perl - perlPackages.LWPUserAgent + perlPackages.LogLog4perl + perlPackages.LWP perlPackages.NetHTTP perlPackages.ProcBackground perlPackages.SubName diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index e1068c248b34..4f683beb06ff 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { perlModules = with perlPackages; [ HTTPDate HTTPMessage - LWPUserAgent + LWP URI ]; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 1f52d83f1201..d5194f42d0b7 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi"; }; - buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] + buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] ++ optional (!stdenv.isDarwin) finger_bsd ++ optional (abook != null) abook ++ optional (gnupg != null) gnupg @@ -36,7 +36,7 @@ stdenv.mkDerivation { postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " + "${AuthenSASL}/${perl.libPrefix}" + ":${ConvertASN1}/${perl.libPrefix}" - + ":${NetLDAP}/${perl.libPrefix}"; + + ":${perlldap}/${perl.libPrefix}"; meta = { homepage = http://www.spinnaker.de/lbdb/; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index c320f8ef5f6a..abbd64cb62fd 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wineStaging - }: +{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wine-staging }: let - wine_custom = wineStaging; + wine_custom = wine-staging; mozillaPluginPath = "/lib/mozilla/plugins"; diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index be7b8f5824e7..81f8361fa2a6 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}: +{stdenv, fetchurl, perl, perlldap, makeWrapper, CryptSmbHash, DigestSHA1}: let version = "0.9.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1xcxmpz74r82vjp731axyac3cyksfiarz9jk5g5m2bzfdixkq9mz"; }; - buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ]; + buildInputs = [ perl perlldap makeWrapper CryptSmbHash DigestSHA1 ]; preConfigure = '' export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl" diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index cca6d630fc13..87e0a788383c 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fping, rrdtool, FCGI, CGI , CGIFast, ConfigGrammar, DigestHMAC, NetTelnet , NetOpenSSH, NetSNMP, LWP, IOTty, perl, NetDNS -, NetLDAP +, perlldap }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ rrdtool FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet NetOpenSSH - NetSNMP LWP IOTty fping perl NetDNS NetLDAP ]; + NetSNMP LWP IOTty fping perl NetDNS perlldap ]; postInstall = '' mv $out/htdocs/smokeping.fcgi.dist $out/htdocs/smokeping.fcgi ''; diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index f673ba5f2d6b..a7fb8da99669 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -62,7 +62,7 @@ buildFHSUserEnv { libcap SDL2 libusb1 - libudev + udev dbus-glib libav atk diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 862b4a0df6e2..cb545570f51f 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -37,8 +37,8 @@ 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 MIMEBase64 # For pass_gen.pl - NetLDAP ]); # For sha-dump.pl + (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong # For pass_gen.pl + perlldap ]); # For sha-dump.pl # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g -lpcap -fopenmp -o ../run/vncpcap2john diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index fc7639b1d5a7..14848df3f3ad 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -123,7 +123,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/caff --set PERL5LIB \ ${with perlPackages; stdenv.lib.makePerlPath ([ - TextTemplate MIMEtools MailTools TimeDate NetIDNEncode ] + TextTemplate MIMETools MailTools TimeDate NetIDNEncode ] ++ GnuPGInterfaceRuntimeDependencies)} \ --prefix PATH ":" \ "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}" diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 42befa2ce26b..dbc16cf7a453 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -18,10 +18,8 @@ stdenv.mkDerivation rec { perl DBI DBDSQLite - Digest DigestMD5 HTMLTagset - MIMEBase64 # == MIMEQuotedPrint TimeDate # == DateParse HTMLTemplate # IO::Socket::Socks is not in nixpkgs diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 8fd04194124b..c9280c102b70 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -2,7 +2,7 @@ , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple , DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder -, FileSlurp, FileWhich, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils +, 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 @@ -22,7 +22,7 @@ buildPerlModule rec { 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 diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 63b79cbc8d67..12852265c406 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -14,7 +14,7 @@ buildPerlPackage rec { buildInputs = [ makeWrapper ]; propagatedBuildInputs = with perlPackages; [ JSON - LWPUserAgent + LWP MozillaCA TryTiny WebServiceLinode 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 ]; };