b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: fix build with disallowed aliases (#43872)

Browse source 
fixes build with disallowed aliases
This commit is contained in:
volth 2018-07-22 02:03:24 +00:00 committed by Matthew Bauer
parent b6704130b4
commit cc55a3ebcb
48 changed files with 91 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/strings.nix
View file

@ -121,7 +121,7 @@ rec {
Example: Example:
pkgs = import <nixpkgs> { } pkgs = import <nixpkgs> { }
makePerlPath [ pkgs.perlPackages.NetSMTP ] makePerlPath [ pkgs.perlPackages.libnet ]
=> "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
*/ */
makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";

2
maintainers/scripts/nix-generate-from-cpan.nix
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 Log4Perl makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
]; ];
phases = [ "installPhase" ]; phases = [ "installPhase" ];

4
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View file

@ -68,8 +68,8 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome3.gnome-themes-standard; default = pkgs.gnome3.gnome-themes-extra;
defaultText = "pkgs.gnome3.gnome-themes-standard"; defaultText = "pkgs.gnome3.gnome-themes-extra";
description = '' description = ''
The package path that contains the theme given in the name option. The package path that contains the theme given in the name option.
''; '';

4
pkgs/applications/audio/abcde/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 { stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3
, lame, flac, glyr , lame, flac, glyr
, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , perl, MusicBrainz, MusicBrainzDiscID
, makeWrapper }: , makeWrapper }:
let version = "2.8.1"; let version = "2.8.1";
@ -35,7 +35,7 @@ in
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ]; propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ];
installFlags = [ "sysconfdir=$(out)/etc" ]; installFlags = [ "sysconfdir=$(out)/etc" ];

4
pkgs/applications/audio/lollypop/default.nix
View file

@ -2,7 +2,7 @@
, appstream-glib, desktop-file-utils, gobjectIntrospection , appstream-glib, desktop-file-utils, gobjectIntrospection
, python36Packages, gnome3, glib, gst_all_1 }: , python36Packages, gnome3, glib, gst_all_1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.521"; version = "0.9.521";
name = "lollypop-${version}"; name = "lollypop-${version}";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ glib ] ++ (with gnome3; [ 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; [ ]) ++ (with gst_all_1; [
gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly
gstreamer gstreamer

4
pkgs/applications/graphics/shutter/default.nix
View file

@ -7,9 +7,9 @@ let
[ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView
Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS 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 EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
]; ];
in in

2
pkgs/applications/misc/yarssr/default.nix
View file

@ -16,7 +16,7 @@ let
ClassSingleton ClassSingleton
URI URI
AnyEvent AnyEventHTTP AnyEvent AnyEventHTTP
CommonSense commonsense
FileSlurp FileSlurp
JSON JSON
Guard Guard

2
pkgs/applications/networking/browsers/eolie/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [ 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; [ ]) ++ (with gst_all_1; [
gst-libav gst-plugins-base gst-plugins-ugly gstreamer gst-libav gst-plugins-base gst-plugins-ugly gstreamer
]); ]);

4
pkgs/applications/networking/feedreaders/feedreader/default.nix
View file

@ -24,8 +24,8 @@ in stdenv.mkDerivation {
buildInputs = [ buildInputs = [
curl glib json-glib libnotify libsecret sqlite curl glib json-glib libnotify libsecret sqlite
] ++ (with gnome3; [ ] ++ (with gnome3; [
gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts
gsettings_desktop_schemas gsettings-desktop-schemas
]) ++ (with gst_all_1; [ ]) ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gstreamer gst-plugins-base gst-plugins-good
]); ]);

2
pkgs/applications/networking/remote/citrix-receiver/default.nix
View file

@ -247,7 +247,7 @@ let
makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
--add-flags "-icaroot $ICAInstDir" \ --add-flags "-icaroot $ICAInstDir" \
--set 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 GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set LD_LIBRARY_PATH "$libPath" \ --set LD_LIBRARY_PATH "$libPath" \

4
pkgs/applications/networking/transporter/default.nix
View file

@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
defaultIconTheme # If I omit this there's no icons in KDE defaultIconTheme # If I omit this there's no icons in KDE
glib glib
granite granite
gsettings_desktop_schemas gsettings-desktop-schemas
gtk3 gtk3
libgee libgee
magic-wormhole magic-wormhole
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
substituteInPlace ./src/WormholeInterface.vala \ substituteInPlace ./src/WormholeInterface.vala \
--replace /bin/wormhole ${magic-wormhole}/bin/wormhole --replace /bin/wormhole ${magic-wormhole}/bin/wormhole
''; '';
postPatch = '' postPatch = ''
chmod +x ./meson/post_install.py chmod +x ./meson/post_install.py
patchShebangs ./meson/post_install.py patchShebangs ./meson/post_install.py

4
pkgs/applications/office/libreoffice/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext { 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 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis , icu, boost, jdk, ant, cups, xorg, libcmis
@ -251,7 +251,7 @@ in stdenv.mkDerivation rec {
buildInputs = with xorg; buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core [ 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 freetype GConf getopt gnome_vfs gperf gtk3 gtk2
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11

4
pkgs/applications/office/libreoffice/still.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip { 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 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, carlito , icu, boost, jdk, ant, cups, xorg, libcmis, carlito
@ -248,7 +248,7 @@ in stdenv.mkDerivation rec {
buildInputs = with xorg; buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core [ 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 freetype GConf getopt gnome_vfs gperf gtk3 gtk2
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11

5
pkgs/applications/version-management/git-and-tools/default.nix
View file

@ -10,10 +10,9 @@ let
sendEmailSupport = false; # requires plenty of perl libraries sendEmailSupport = false; # requires plenty of perl libraries
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
smtpPerlLibs = [ smtpPerlLibs = [
perlPackages.NetSMTP perlPackages.NetSMTPSSL perlPackages.libnet perlPackages.NetSMTPSSL
perlPackages.IOSocketSSL perlPackages.NetSSLeay perlPackages.IOSocketSSL perlPackages.NetSSLeay
perlPackages.MIMEBase64 perlPackages.AuthenSASL perlPackages.AuthenSASL perlPackages.DigestHMAC
perlPackages.DigestHMAC
]; ];
}; };

2
pkgs/applications/window-managers/i3/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
xorgserver xvfb_run xorgserver xvfb_run
]; ];

4
pkgs/desktops/gnome-3/games/gnome-mines/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook { 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 { stdenv.mkDerivation rec {
name = "gnome-mines-${version}"; name = "gnome-mines-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# gobjectIntrospection for finding vapi files # gobjectIntrospection for finding vapi files
nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ]; 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 = '' postPatch = ''
chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file

4
pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool , librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool
, libxml2, libgee, libgames-support }: , libxml2, libgee, libgnome-games-support }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-nibbles-${version}"; name = "gnome-nibbles-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 wrapGAppsHook intltool itstool libxml2 gtk3 wrapGAppsHook intltool itstool libxml2
librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme
libgee libgames-support libgee libgnome-games-support
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/desktops/gnome-3/games/gnome-robots/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support , librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support
, libgee}: , libgee}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3
libxml2 gnome3.defaultIconTheme libgames-support libgee libxml2 gnome3.defaultIconTheme libgnome-games-support libgee
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/desktops/xfce/thunar-plugins/archive/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools { stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools
, gtk , gtk
, thunarx-2-dev , thunar-bare
, exo, libxfce4util, libxfce4ui , exo, libxfce4util, libxfce4ui
, xfconf, udev, libnotify , xfconf, udev, libnotify
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
xfce4-dev-tools xfce4-dev-tools
thunarx-2-dev thunar-bare
exo gtk libxfce4util libxfce4ui exo gtk libxfce4util libxfce4ui
xfconf udev libnotify xfconf udev libnotify
]; ];

4
pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, gtk , gtk
, thunarx-2-dev, python2 , thunar-bare, python2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gtk gtk
thunarx-2-dev python2 thunar-bare python2
]; ];
configurePhase = "python2 waf configure --prefix=$out"; configurePhase = "python2 waf configure --prefix=$out";

6
pkgs/desktops/xfce4-13/orage/default.nix
View file

@ -1,5 +1,5 @@
{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null { lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify
, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: , popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
@ -13,7 +13,7 @@ mkXfceDerivation rec {
version = "4.12.1"; version = "4.12.1";
sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m";
buildInputs = [ dbus_glib gtk2 libical libnotify popt ] buildInputs = [ dbus-glib gtk2 libical libnotify popt ]
++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
patches = [ patches = [

6
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -207831,7 +207831,7 @@ self: {
}) {}; }) {};
"udev" = callPackage "udev" = callPackage
({ mkDerivation, base, bytestring, libudev, posix-paths, unix }: ({ mkDerivation, base, bytestring, udev, posix-paths, unix }:
mkDerivation { mkDerivation {
pname = "udev"; pname = "udev";
version = "0.1.0.0"; version = "0.1.0.0";
@ -207839,12 +207839,12 @@ self: {
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ base bytestring posix-paths unix ]; libraryHaskellDepends = [ base bytestring posix-paths unix ];
libraryPkgconfigDepends = [ libudev ]; libraryPkgconfigDepends = [ udev ];
description = "libudev bindings"; description = "libudev bindings";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libudev;}; }) {inherit (pkgs) udev;};
"udp-conduit" = callPackage "udp-conduit" = callPackage
({ mkDerivation, base, chunked-data, conduit-combinators ({ mkDerivation, base, chunked-data, conduit-combinators

2
pkgs/development/libraries/flatpak/default.nix
View file

@ -5,7 +5,7 @@
let let
version = "0.99.3"; version = "0.99.3";
desktop_schemas = gnome3.gsettings_desktop_schemas; desktop_schemas = gnome3.gsettings-desktop-schemas;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "flatpak-${version}"; name = "flatpak-${version}";

4
pkgs/development/libraries/libguestfs/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex , 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 , getopt, perlPackages, ocamlPackages
, appliance ? null , appliance ? null
, javaSupport ? false, jdk ? null }: , javaSupport ? false, jdk ? null }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
makeWrapper autoreconfHook ncurses cpio gperf perl makeWrapper autoreconfHook ncurses cpio gperf perl
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig 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 SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild
] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ])
++ stdenv.lib.optional javaSupport jdk; ++ stdenv.lib.optional javaSupport jdk;

3
pkgs/development/tools/misc/hydra/default.nix
View file

@ -22,7 +22,7 @@ let
CatalystPluginSessionStateCookie CatalystPluginSessionStateCookie
CatalystPluginSessionStoreFastMmap CatalystPluginSessionStoreFastMmap
CatalystPluginStackTrace CatalystPluginStackTrace
CatalystPluginUnicodeEncoding CatalystRuntime
CatalystTraitForRequestProxyBase CatalystTraitForRequestProxyBase
CatalystViewDownload CatalystViewDownload
CatalystViewJSON CatalystViewJSON
@ -52,7 +52,6 @@ let
SetScalar SetScalar
Starman Starman
SysHostnameLong SysHostnameLong
TestMore
TextDiff TextDiff
TextTable TextTable
XMLSimple XMLSimple

2
pkgs/development/web/postman/default.nix
View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
pkgs.alsaLib pkgs.alsaLib
pkgs.cairo pkgs.cairo
pkgs.cups pkgs.cups
pkgs.dbus_daemon.lib pkgs.dbus.daemon.lib
pkgs.expat pkgs.expat
pkgs.gdk_pixbuf pkgs.gdk_pixbuf
pkgs.glib pkgs.glib

2
pkgs/games/steam/runtime-wrapped.nix
View file

@ -8,7 +8,7 @@ let
libpulseaudio libpulseaudio
alsaLib alsaLib
openalSoft openalSoft
libva1-full libva1
libvdpau libvdpau
vulkan-loader vulkan-loader
gcc.cc gcc.cc

2
pkgs/servers/foswiki/default.nix
View file

@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
buildInputs = with perlPackages; [ buildInputs = with perlPackages; [
# 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
DigestSHA EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree
IOSocketIP IOSocketSSL JSON IOSocketIP IOSocketSSL JSON
LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt
LWP URI perlPackages.version LWP URI perlPackages.version

4
pkgs/servers/mail/dkimproxy/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }: { stdenv, perl, fetchurl, Error, MailDKIM, MIMETools, NetServer }:
let let
pkg = "dkimproxy"; pkg = "dkimproxy";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ perl ]; buildInputs = [ perl ];
propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ]; propagatedBuildInputs = [ Error MailDKIM MIMETools NetServer ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "SMTP-proxy that signs and/or verifies emails"; description = "SMTP-proxy that signs and/or verifies emails";

4
pkgs/servers/mail/dspam/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper { stdenv, lib, fetchurl, makeWrapper
, gawk, gnused, gnugrep, coreutils, which , gawk, gnused, gnugrep, coreutils, which
, perl, NetSMTP , perl, libnet
, withMySQL ? false, zlib, mysql57 , withMySQL ? false, zlib, mysql57
, withPgSQL ? false, postgresql , withPgSQL ? false, postgresql
, withSQLite ? false, sqlite , withSQLite ? false, sqlite
@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
rm -rf $out/var rm -rf $out/var
wrapProgram $out/bin/dspam_notify \ wrapProgram $out/bin/dspam_notify \
--set PERL5LIB "${lib.makePerlPath [ NetSMTP ]}" --set PERL5LIB "${lib.makePerlPath [ libnet ]}"
# Install SQL scripts # Install SQL scripts
mkdir -p $out/share/dspam/sql mkdir -p $out/share/dspam/sql

2
pkgs/servers/monitoring/fusion-inventory/default.nix
View file

@ -49,7 +49,7 @@ buildPerlPackage rec {
IOSocketSSL IOSocketSSL
IPCRun IPCRun
JSON JSON
LWPProtocolhttps LWPProtocolHttps
ModuleInstall ModuleInstall
NetSNMP NetSNMP
TestCompile TestCompile

2
pkgs/servers/monitoring/longview/default.nix
View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ perl makeWrapper glibc ] buildInputs = [ perl makeWrapper glibc ]
++ (with perlPackages; [ ++ (with perlPackages; [
LWPUserAgent LWP
LWPProtocolHttps LWPProtocolHttps
MozillaCA MozillaCA
CryptSSLeay CryptSSLeay

10
pkgs/servers/monitoring/munin/default.nix
View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78"; sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78";
}; };
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
which which
coreutils coreutils
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
perlPackages.NetCIDR perlPackages.NetCIDR
perlPackages.NetSSLeay perlPackages.NetSSLeay
perlPackages.NetServer perlPackages.NetServer
perlPackages.Log4Perl perlPackages.LogLog4perl
perlPackages.IOSocketInet6 perlPackages.IOSocketInet6
perlPackages.Socket6 perlPackages.Socket6
perlPackages.URI perlPackages.URI
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
perlPackages.NetServer perlPackages.NetServer
perlPackages.ListMoreUtils perlPackages.ListMoreUtils
perlPackages.TimeHiRes perlPackages.TimeHiRes
perlPackages.LWPUserAgent perlPackages.LWP
perlPackages.DBDPg perlPackages.DBDPg
python python
ruby ruby
@ -116,9 +116,9 @@ stdenv.mkDerivation rec {
esac esac
wrapProgram "$file" \ wrapProgram "$file" \
--set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ --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 HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
ListMoreUtils TimeHiRes DBDPg LWPUserAgent rrdtool ListMoreUtils TimeHiRes DBDPg LWP rrdtool
]}" ]}"
done done
''; '';

12
pkgs/servers/openxpki/default.nix
View file

@ -14,19 +14,19 @@ buildPerlPackage {
buildInputs = [ perl openssl gettext python34Packages.sphinx ]; buildInputs = [ perl openssl gettext python34Packages.sphinx ];
propagatedBuildInputs = with perlPackages; propagatedBuildInputs = with perlPackages;
[ # dependencies from Makefile.PL [ # 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 CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10
DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt
IPCShareLite JSON Log4Perl LWPProtocolconnect LWPProtocolhttps MailRFC822Address IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address
Moose NetAddrIP NetDNS NetIP NetLDAP 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 TimeHiRes 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 Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5
DigestSHA Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser
ScalarListUtils MathBigInt Memoize MIMEBase64 NetSMTP PodUsage RTClientREST Socket ScalarListUtils MathBigInt Memoize libnet PodUsage RTClientREST Socket
Storable XSLoader ] Storable XSLoader ]
++ stdenv.lib.optionals extraDependencies2 ++ stdenv.lib.optionals extraDependencies2
[ # dependencies taken from Debian [ # dependencies taken from Debian
@ -38,7 +38,7 @@ buildPerlPackage {
AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen AttributeHandlers AttributeParamsValidate AutoLoader 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 DevelSelfStubber
DevelSymdump Digest DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall DevelSymdump DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall
ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset
HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat
MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker

4
pkgs/servers/slimserver/default.nix
View file

@ -45,8 +45,8 @@ buildPerlPackage rec {
perlPackages.IOSocketSSL perlPackages.IOSocketSSL
perlPackages.IOString perlPackages.IOString
perlPackages.JSONXSVersionOneAndTwo perlPackages.JSONXSVersionOneAndTwo
perlPackages.Log4Perl perlPackages.LogLog4perl
perlPackages.LWPUserAgent perlPackages.LWP
perlPackages.NetHTTP perlPackages.NetHTTP
perlPackages.ProcBackground perlPackages.ProcBackground
perlPackages.SubName perlPackages.SubName

2
pkgs/tools/misc/arp-scan/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
perlModules = with perlPackages; [ perlModules = with perlPackages; [
HTTPDate HTTPDate
HTTPMessage HTTPMessage
LWPUserAgent LWP
URI URI
]; ];

4
pkgs/tools/misc/lbdb/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation {
sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi"; sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi";
}; };
buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ]
++ optional (!stdenv.isDarwin) finger_bsd ++ optional (!stdenv.isDarwin) finger_bsd
++ optional (abook != null) abook ++ optional (abook != null) abook
++ optional (gnupg != null) gnupg ++ optional (gnupg != null) gnupg
@ -36,7 +36,7 @@ stdenv.mkDerivation {
postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : "
+ "${AuthenSASL}/${perl.libPrefix}" + "${AuthenSASL}/${perl.libPrefix}"
+ ":${ConvertASN1}/${perl.libPrefix}" + ":${ConvertASN1}/${perl.libPrefix}"
+ ":${NetLDAP}/${perl.libPrefix}"; + ":${perlldap}/${perl.libPrefix}";
meta = { meta = {
homepage = http://www.spinnaker.de/lbdb/; homepage = http://www.spinnaker.de/lbdb/;

5
pkgs/tools/misc/pipelight/default.nix
View file

@ -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 let
wine_custom = wineStaging; wine_custom = wine-staging;
mozillaPluginPath = "/lib/mozilla/plugins"; mozillaPluginPath = "/lib/mozilla/plugins";

4
pkgs/tools/networking/smbldaptools/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}: {stdenv, fetchurl, perl, perlldap, makeWrapper, CryptSmbHash, DigestSHA1}:
let let
version = "0.9.11"; version = "0.9.11";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1xcxmpz74r82vjp731axyac3cyksfiarz9jk5g5m2bzfdixkq9mz"; sha256 = "1xcxmpz74r82vjp731axyac3cyksfiarz9jk5g5m2bzfdixkq9mz";
}; };
buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ]; buildInputs = [ perl perlldap makeWrapper CryptSmbHash DigestSHA1 ];
preConfigure = '' preConfigure = ''
export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl" export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl"

4
pkgs/tools/networking/smokeping/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, fping, rrdtool, FCGI, CGI { stdenv, fetchurl, fping, rrdtool, FCGI, CGI
, CGIFast, ConfigGrammar, DigestHMAC, NetTelnet , CGIFast, ConfigGrammar, DigestHMAC, NetTelnet
, NetOpenSSH, NetSNMP, LWP, IOTty, perl, NetDNS , NetOpenSSH, NetSNMP, LWP, IOTty, perl, NetDNS
, NetLDAP , perlldap
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
rrdtool FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet NetOpenSSH rrdtool FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet NetOpenSSH
NetSNMP LWP IOTty fping perl NetDNS NetLDAP ]; NetSNMP LWP IOTty fping perl NetDNS perlldap ];
postInstall = '' postInstall = ''
mv $out/htdocs/smokeping.fcgi.dist $out/htdocs/smokeping.fcgi mv $out/htdocs/smokeping.fcgi.dist $out/htdocs/smokeping.fcgi
''; '';

2
pkgs/tools/package-management/appimage-run/default.nix
View file

@ -62,7 +62,7 @@ buildFHSUserEnv {
libcap libcap
SDL2 SDL2
libusb1 libusb1
libudev udev
dbus-glib dbus-glib
libav libav
atk atk

4
pkgs/tools/security/john/default.nix
View file

@ -37,8 +37,8 @@ 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 MIMEBase64 # For pass_gen.pl (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong # For pass_gen.pl
NetLDAP ]); # 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
# gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g -lpcap -fopenmp -o ../run/vncpcap2john # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g -lpcap -fopenmp -o ../run/vncpcap2john

2
pkgs/tools/security/signing-party/default.nix
View file

@ -123,7 +123,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/caff --set PERL5LIB \ wrapProgram $out/bin/caff --set PERL5LIB \
${with perlPackages; stdenv.lib.makePerlPath ([ ${with perlPackages; stdenv.lib.makePerlPath ([
TextTemplate MIMEtools MailTools TimeDate NetIDNEncode ] TextTemplate MIMETools MailTools TimeDate NetIDNEncode ]
++ GnuPGInterfaceRuntimeDependencies)} \ ++ GnuPGInterfaceRuntimeDependencies)} \
--prefix PATH ":" \ --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ nettools gnupg1 ]}" "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}"

2
pkgs/tools/text/popfile/default.nix
View file

@ -18,10 +18,8 @@ stdenv.mkDerivation rec {
perl perl
DBI DBI
DBDSQLite DBDSQLite
Digest
DigestMD5 DigestMD5
HTMLTagset HTMLTagset
MIMEBase64 # == MIMEQuotedPrint
TimeDate # == DateParse TimeDate # == DateParse
HTMLTemplate HTMLTemplate
# IO::Socket::Socks is not in nixpkgs # IO::Socket::Socks is not in nixpkgs

4
pkgs/tools/typesetting/biber/default.nix
View file

@ -2,7 +2,7 @@
, BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple
, DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian , DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian
, EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder
, FileSlurp, FileWhich, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils , FileSlurp, FileWhich, IPCRun3, LogLog4perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils
, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate , MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate
, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor
, TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey , TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey
@ -22,7 +22,7 @@ buildPerlModule rec {
autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
DateTime DateTimeFormatBuilder DateTimeCalendarJulian DateTime DateTimeFormatBuilder DateTimeCalendarJulian
ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils
ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey

2
pkgs/tools/virtualization/linode-cli/default.nix
View file

@ -14,7 +14,7 @@ buildPerlPackage rec {
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
propagatedBuildInputs = with perlPackages; [ propagatedBuildInputs = with perlPackages; [
JSON JSON
LWPUserAgent LWP
MozillaCA MozillaCA
TryTiny TryTiny
WebServiceLinode WebServiceLinode

18
pkgs/top-level/all-packages.nix
View file

@ -1567,7 +1567,7 @@ with pkgs;
autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
DateTime DateTimeFormatBuilder DateTimeCalendarJulian DateTime DateTimeFormatBuilder DateTimeCalendarJulian
ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils
ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey
@ -5103,7 +5103,7 @@ with pkgs;
}; };
smbldaptools = callPackage ../tools/networking/smbldaptools { smbldaptools = callPackage ../tools/networking/smbldaptools {
inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1; inherit (perlPackages) perlldap CryptSmbHash DigestSHA1;
}; };
smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
@ -10265,7 +10265,7 @@ with pkgs;
libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
libguestfs = callPackage ../development/libraries/libguestfs { libguestfs = callPackage ../development/libraries/libguestfs {
inherit (perlPackages) libintlperl GetoptLong SysVirt; inherit (perlPackages) libintl_perl GetoptLong SysVirt;
appliance = libguestfs-appliance; appliance = libguestfs-appliance;
}; };
@ -11308,7 +11308,7 @@ with pkgs;
pipelight = callPackage ../tools/misc/pipelight { pipelight = callPackage ../tools/misc/pipelight {
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
wineStaging = pkgsi686Linux.wineStaging; wine-staging = pkgsi686Linux.wine-staging;
}; };
pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; pkcs11helper = callPackage ../development/libraries/pkcs11helper { };
@ -12698,14 +12698,14 @@ with pkgs;
diod = callPackage ../servers/diod { lua = lua5_1; }; diod = callPackage ../servers/diod { lua = lua5_1; };
dkimproxy = callPackage ../servers/mail/dkimproxy { dkimproxy = callPackage ../servers/mail/dkimproxy {
inherit (perlPackages) Error MailDKIM MIMEtools NetServer; inherit (perlPackages) Error MailDKIM MIMETools NetServer;
}; };
dovecot = callPackage ../servers/mail/dovecot { }; dovecot = callPackage ../servers/mail/dovecot { };
dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };
dspam = callPackage ../servers/mail/dspam { dspam = callPackage ../servers/mail/dspam {
inherit (perlPackages) NetSMTP; inherit (perlPackages) libnet;
}; };
etcd = callPackage ../servers/etcd { }; etcd = callPackage ../servers/etcd { };
@ -15081,7 +15081,7 @@ with pkgs;
aacgain = callPackage ../applications/audio/aacgain { }; aacgain = callPackage ../applications/audio/aacgain { };
abcde = callPackage ../applications/audio/abcde { abcde = callPackage ../applications/audio/abcde {
inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; inherit (perlPackages) MusicBrainz MusicBrainzDiscID;
inherit (pythonPackages) eyeD3; inherit (pythonPackages) eyeD3;
}; };
@ -16999,7 +16999,7 @@ with pkgs;
libreoffice = hiPrio libreoffice-still; libreoffice = hiPrio libreoffice-still;
libreoffice-args = { libreoffice-args = {
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip IOCompress;
inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome2) GConf ORBit2 gnome_vfs;
inherit (gnome3) defaultIconTheme; inherit (gnome3) defaultIconTheme;
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
@ -21564,7 +21564,7 @@ with pkgs;
inherit fping rrdtool; inherit fping rrdtool;
inherit (perlPackages) inherit (perlPackages)
FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet 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 { }; snapraid = callPackage ../tools/filesystems/snapraid { };

1
pkgs/top-level/perl-packages.nix
View file

@ -10983,7 +10983,6 @@ let self = _self // overrides; _self = with self; {
patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL'';
doCheck = false; # The main test performs network access doCheck = false; # The main test performs network access
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
#buildInputs = [ TestMore TestPod ];
propagatedBuildInputs = [ pkgs.libdiscid ]; propagatedBuildInputs = [ pkgs.libdiscid ];
}; };