From 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Jul 2018 16:11:16 -0400 Subject: [PATCH] treewide: remove aliases in nixpkgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the command ‘nix-env -qa -f. --arg config '{skipAliases = true;}'’ work in Nixpkgs. Misc... - qtikz: use libsForQt5.callPackage This ensures we get the right poppler. - rewrites: docbook5_xsl -> docbook_xsl_ns docbook_xml_xslt -> docbook_xsl diffpdf: fixup --- doc/default.nix | 2 +- nixos/doc/manual/default.nix | 14 ++-- nixos/modules/services/hardware/usbmuxd.nix | 2 +- nixos/tests/installer.nix | 2 +- pkgs/applications/audio/flacon/default.nix | 4 +- .../audio/pulseaudio-ctl/default.nix | 4 +- .../crashplan/crashplan-small-business.nix | 20 +++--- .../display-managers/lightdm/default.nix | 4 +- .../display-managers/slim/default.nix | 4 +- pkgs/applications/editors/jucipp/default.nix | 4 +- .../editors/texstudio/default.nix | 4 +- .../graphics/draftsight/default.nix | 4 +- .../graphics/exrdisplay/default.nix | 4 +- pkgs/applications/graphics/ktikz/default.nix | 5 +- .../kde/grantleetheme/default.nix | 6 +- pkgs/applications/kde/kcalutils.nix | 4 +- pkgs/applications/kde/kdepim-addons.nix | 4 +- pkgs/applications/kde/kpimtextedit.nix | 4 +- pkgs/applications/kde/messagelib.nix | 4 +- .../misc/cpp-ethereum/default.nix | 4 +- pkgs/applications/misc/diffpdf/default.nix | 6 +- .../misc/digitalbitbox/default.nix | 6 +- pkgs/applications/misc/hyper/default.nix | 4 +- pkgs/applications/misc/lxterminal/default.nix | 4 +- pkgs/applications/misc/memo/default.nix | 4 +- .../misc/moonlight-embedded/default.nix | 4 +- pkgs/applications/misc/nixnote2/default.nix | 7 +- pkgs/applications/misc/onboard/default.nix | 4 +- pkgs/applications/misc/oneko/default.nix | 7 +- pkgs/applications/misc/qpdfview/default.nix | 4 +- pkgs/applications/misc/roxterm/default.nix | 8 +-- pkgs/applications/misc/terminus/default.nix | 4 +- pkgs/applications/misc/truecrypt/default.nix | 4 +- pkgs/applications/misc/veracrypt/default.nix | 4 +- .../browsers/firefox-bin/default.nix | 4 +- .../networking/browsers/firefox/wrapper.nix | 4 +- .../browsers/google-chrome/default.nix | 4 +- .../networking/browsers/vivaldi/default.nix | 4 +- .../feedreaders/newsboat/default.nix | 4 +- .../instant-messengers/jitsi/default.nix | 6 +- .../pidgin-plugins/purple-discord/default.nix | 4 +- .../telepathy/gabble/default.nix | 7 +- .../telepathy/logger/default.nix | 4 +- .../networking/linssid/default.nix | 4 +- .../mailreaders/inboxer/default.nix | 10 +-- .../mailreaders/thunderbird-bin/default.nix | 4 +- .../networking/sync/lsyncd/default.nix | 4 +- .../science/electronics/kicad/unstable.nix | 6 +- .../science/robotics/gazebo/default.nix | 5 +- .../cvs-fast-export/default.nix | 6 +- .../git-and-tools/cgit/default.nix | 4 +- .../reposurgeon/default.nix | 10 +-- pkgs/applications/video/dvdstyler/default.nix | 6 +- pkgs/applications/video/kodi/default.nix | 6 +- pkgs/applications/video/screenkey/default.nix | 4 +- pkgs/applications/video/vlc/default.nix | 4 +- .../virtualization/docker/default.nix | 6 +- pkgs/applications/virtualization/xen/4.5.nix | 4 +- .../window-managers/afterstep/default.nix | 4 +- .../window-managers/compton/git.nix | 4 +- .../window-managers/i3/easyfocus.nix | 4 +- .../window-managers/orbment/default.nix | 4 +- .../window-managers/sway/default.nix | 4 +- .../rust/default-crate-overrides.nix | 6 +- pkgs/desktops/enlightenment/efl.nix | 6 +- .../gnome-2/platform/GConf/default.nix | 4 +- .../gnome-2/platform/gnome-vfs/default.nix | 4 +- .../desktops/gnome-3/core/empathy/default.nix | 2 +- pkgs/desktops/gnome-3/core/folks/default.nix | 6 +- .../core/gnome-online-accounts/default.nix | 2 +- .../gnome-3/core/libgnome-keyring/default.nix | 4 +- .../extensions/system-monitor/default.nix | 6 +- .../gnome-3/misc/gnome-packagekit/default.nix | 6 +- pkgs/desktops/gnustep/back/default.nix | 4 +- pkgs/desktops/lumina/default.nix | 4 +- .../default.nix | 4 +- pkgs/desktops/xfce4-13/exo/default.nix | 4 +- pkgs/desktops/xfce4-13/thunar/default.nix | 4 +- pkgs/desktops/xfce4-13/xfburn/default.nix | 4 +- .../xfce4-13/xfce4-dev-tools/default.nix | 5 +- .../desktops/xfce4-13/xfce4-mixer/default.nix | 4 +- .../haskell-modules/configuration-nix.nix | 2 +- .../interpreters/racket/default.nix | 6 +- .../development/libraries/flatpak/default.nix | 14 ++-- pkgs/development/libraries/geis/default.nix | 4 +- pkgs/development/libraries/glew/1.10.nix | 5 +- pkgs/development/libraries/glib/default.nix | 5 +- pkgs/development/libraries/gtkd/default.nix | 2 +- .../libraries/gupnp-dlna/default.nix | 4 +- .../kde-frameworks/kdoctools/default.nix | 4 +- .../libraries/libblockdev/default.nix | 6 +- .../libraries/libgnome-keyring/default.nix | 4 +- .../libraries/libindicate/default.nix | 4 +- .../libraries/libstroke/default.nix | 4 +- .../development/libraries/libvirt/default.nix | 4 +- .../libraries/mailcore2/default.nix | 6 +- .../libraries/pipewire/default.nix | 4 +- pkgs/development/libraries/strigi/default.nix | 4 +- .../libraries/telepathy/qt/default.nix | 4 +- .../libraries/vulkan-loader/default.nix | 4 +- pkgs/development/libraries/wlc/default.nix | 4 +- .../libraries/zeitgeist/default.nix | 4 +- .../python-modules/dbus/default.nix | 4 +- .../python-modules/mysqlclient/default.nix | 4 +- pkgs/development/python-modules/pyqt/4.x.nix | 4 +- pkgs/development/python-modules/pyqt/5.x.nix | 6 +- pkgs/development/tools/buildah/default.nix | 4 +- .../tools/flatpak-builder/default.nix | 4 +- .../tools/react-native-debugger/default.nix | 4 +- pkgs/development/tools/skopeo/default.nix | 8 +-- .../vulkan-validation-layers/default.nix | 4 +- pkgs/development/web/insomnia/default.nix | 6 +- pkgs/games/mar1d/default.nix | 4 +- pkgs/games/openrw/default.nix | 4 +- pkgs/misc/drivers/moltengamepad/default.nix | 4 +- pkgs/misc/emulators/dolphin-emu/master.nix | 6 +- pkgs/misc/emulators/retroarch/cores.nix | 4 +- pkgs/os-specific/linux/amdgpu-pro/default.nix | 4 +- pkgs/os-specific/linux/cryptsetup/default.nix | 5 +- pkgs/os-specific/linux/dmraid/default.nix | 4 +- pkgs/os-specific/linux/iputils/default.nix | 4 +- pkgs/os-specific/linux/kernel/perf.nix | 4 +- .../os-specific/linux/libsemanage/default.nix | 4 +- pkgs/os-specific/linux/lvm2/default.nix | 4 +- pkgs/os-specific/linux/pm-utils/default.nix | 4 +- pkgs/os-specific/linux/rdma-core/default.nix | 5 +- pkgs/os-specific/linux/sssd/default.nix | 8 +-- .../linux/wpa_supplicant/default.nix | 6 +- pkgs/servers/openafs/1.6/module.nix | 4 +- pkgs/tools/X11/xidlehook/default.nix | 5 +- pkgs/tools/X11/xpra/default.nix | 4 +- pkgs/tools/X11/xwinwrap/default.nix | 4 +- .../bluetooth/obex-data-server/default.nix | 10 +-- pkgs/tools/compression/pixz/default.nix | 6 +- pkgs/tools/filesystems/ceph/generic.nix | 30 ++++---- pkgs/tools/filesystems/convoy/default.nix | 4 +- .../filesystems/nixpart/0.4/cryptsetup.nix | 4 +- .../tools/filesystems/nixpart/0.4/default.nix | 9 +-- pkgs/tools/filesystems/nixpart/0.4/dmraid.nix | 4 +- pkgs/tools/filesystems/nixpart/0.4/parted.nix | 6 +- pkgs/tools/filesystems/vmfs-tools/default.nix | 4 +- pkgs/tools/graphics/glmark2/default.nix | 4 +- pkgs/tools/graphics/gromit-mpx/default.nix | 4 +- pkgs/tools/graphics/luxcorerender/default.nix | 4 +- pkgs/tools/graphics/povray/default.nix | 6 +- pkgs/tools/graphics/vulkan-tools/default.nix | 4 +- .../interception-tools/default.nix | 4 +- pkgs/tools/inputmethods/libkkc/default.nix | 4 +- pkgs/tools/misc/ckb/default.nix | 5 +- pkgs/tools/misc/fileschanged/default.nix | 4 +- pkgs/tools/misc/grub/2.0x.nix | 4 +- pkgs/tools/misc/grub/trusted.nix | 4 +- pkgs/tools/misc/os-prober/default.nix | 4 +- pkgs/tools/misc/parted/default.nix | 8 +-- pkgs/tools/misc/snapper/default.nix | 4 +- pkgs/tools/networking/dnsmasq/default.nix | 5 +- pkgs/tools/networking/offlineimap/default.nix | 4 +- pkgs/tools/package-management/nix/default.nix | 4 +- .../package-management/nixops/generic.nix | 4 +- pkgs/tools/security/pcsclite/default.nix | 4 +- pkgs/tools/security/pcsctools/default.nix | 4 +- pkgs/tools/system/thermald/default.nix | 7 +- pkgs/tools/text/zimwriterfs/default.nix | 4 +- pkgs/tools/typesetting/asciidoc/default.nix | 6 +- pkgs/top-level/aliases.nix | 16 ----- pkgs/top-level/all-packages.nix | 72 +++++++++++++------ pkgs/top-level/perl-packages.nix | 2 +- 167 files changed, 460 insertions(+), 445 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index f99aaff5f8a6..fa2e4a88738d 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation { # $ nix-shell --run "make clean all" # otherwise they won't reapply :) HIGHLIGHTJS = pkgs.documentation-highlighter; - XSL = "${pkgs.docbook5_xsl}/xml/xsl"; + XSL = "${pkgs.docbook_xsl_ns}/xml/xsl"; RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; xsltFlags = lib.concatStringsSep " " [ diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index fef6b2f86c85..be28c2c17afd 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -209,13 +209,13 @@ let --stringparam collect.xref.targets only \ --stringparam targets.filename "$out/manual.db" \ --nonet \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml cat > "$out/olinkdb.xml" < ]> @@ -264,11 +264,11 @@ in rec { ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --output $dst/ \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml mkdir -p $dst/images/callouts - cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ + cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ cp ${../../../doc/style.css} $dst/style.css cp ${../../../doc/overrides.css} $dst/overrides.css @@ -292,11 +292,11 @@ in rec { ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --xinclude --output $dst/epub/ \ - ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ ${manual-combined}/manual-combined.xml mkdir -p $dst/epub/OEBPS/images/callouts - cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */ + cp -r ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */ echo "application/epub+zip" > mimetype manual="$dst/nixos-manual.epub" zip -0Xq "$manual" mimetype @@ -324,7 +324,7 @@ in rec { --param man.endnotes.are.numbered 0 \ --param man.break.after.slash 1 \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ - ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ ${manual-combined}/man-pages-combined.xml ''; diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 6a3f7cfd210d..93ced0b9f04d 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -65,7 +65,7 @@ in serviceConfig = { # Trigger the udev rule manually. This doesn't require replugging the # device when first enabling the option to get it to work - ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; + ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f"; }; }; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 8ce9bc21ff77..875b6c486582 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -237,7 +237,7 @@ let libxml2.bin libxslt.bin docbook5 - docbook5_xsl + docbook_xsl_ns unionfs-fuse ntp nixos-artwork.wallpapers.gnome-dark diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index a16593d4d1b0..8f3facec09b1 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper -, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain +, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain , gtk3 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/flacon \ --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ - --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools + --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools mp3gain lame wavpack vorbisgain ]}" ''; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 6e1e576043d1..1ad57efda7a0 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, makeWrapper -, bc, dbus, gawk, gnused, libnotify, pulseaudioLight }: +, bc, dbus, gawk, gnused, libnotify, pulseaudio }: let - path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ]; + path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ]; pname = "pulseaudio-ctl"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix index 9bed504103a1..529b0dbd42b6 100644 --- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix +++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, - procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, - fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev, - libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, +{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, + procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, + fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev, + libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages, maxRam ? "1024m" }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = "1512021600670_4503"; pname = "CrashPlanSmb"; name = "${pname}_${version}_${rev}"; - + src = fetchurl { url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz"; sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vardir = "/var/lib/crashplan"; manifestdir = "${vardir}/manifest"; - + postPatch = '' # patch scripts/CrashPlanEngine substituteInPlace scripts/CrashPlanEngine \ @@ -85,10 +85,10 @@ stdenv.mkDerivation rec { postFixup = '' patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan - wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ - stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype - fontconfig dbus gconf nss nspr alsaLib cups expat libudev - libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite + wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype + fontconfig dbus gconf nss nspr alsaLib cups expat udev + libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libXtst libXScrnSaver]}" ''; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 6765c5f9dfd0..6ba053499f90 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils +, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils , qt4 ? null , withQt5 ? false, qtbase }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt - qt4 libaudit + qt4 audit ] ++ optional withQt5 qtbase; configureFlags = [ diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 5160e02963f2..12e3dad9c79c 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng -, fontconfig, freetype, pam, dbus_libs, makeWrapper }: +, fontconfig, freetype, pam, dbus, makeWrapper }: stdenv.mkDerivation rec { name = "slim-1.3.6"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig libjpeg libpng fontconfig freetype - pam dbus_libs + pam dbus xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper ]; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index c24866671f9b..6f5f416f4f5f 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, - coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: + coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: with stdenv.lib; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ - dbus_libs + dbus openssl libxml2 gnome3.gtksourceview diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 790c4ea45c02..7ba37bd14ff1 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}: +{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}: stdenv.mkDerivation rec { pname = "texstudio"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qt5.qmake pkgconfig ]; - buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ]; + buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index d817424c4525..30101bb94770 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, - dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, + dbus, alsaLib, cups, fontconfig, glib, icu, libpng12, xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: @@ -71,7 +71,7 @@ stdenv.mkDerivation { }; libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils - dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 + dbus alsaLib cups.lib fontconfig glib icu libpng12 xkeyboard_config zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcomposite ]; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 34e7b1f23088..562fb8c11dc3 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; + buildInputs = [ openexr fltk libGLU_combined ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 8817071e9843..4b3a423a8ce2 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }: +{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }: # Warning: You will also need a working pdflatex installation containing # at least auctex and pgf. @@ -64,8 +64,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext qt5.full poppler_qt5 ]; + buildInputs = [ gettext qt5.full poppler ]; enableParallelBuilding = true; } - diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 5035685c64fb..bb8a97e8341e 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -1,7 +1,7 @@ { mkDerivation, copyPathsToStore, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, + grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase + grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase ]; - propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ]; + propagatedBuildInputs = [ grantlee kiconthemes knewstuff ]; } diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix index 3f6821e08eae..1628af7e2202 100644 --- a/pkgs/applications/kde/kcalutils.nix +++ b/pkgs/applications/kde/kcalutils.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, + grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, kidentitymanagement, kpimtextedit, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support + grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support kidentitymanagement kpimtextedit ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index fd3fe2d6c098..5be3d881b0c5 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -4,7 +4,7 @@ akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, - libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison + libksieve, mailcommon, mailimporter, messagelib, poppler, prison }: mkDerivation { @@ -18,6 +18,6 @@ mkDerivation { akonadi-import-wizard akonadi-notes calendarsupport eventviews incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar - libksieve mailcommon mailimporter messagelib poppler_qt5 prison + libksieve mailcommon mailimporter messagelib poppler prison ]; } diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 17c960d17626..05d174b05541 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, + grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin + grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin sonnet syntax-highlighting qttools ]; propagatedBuildInputs = [ ktextwidgets ]; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index f12158a1f71e..23920a081c06 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5, + akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee, grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, @@ -16,7 +16,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs + akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit syntax-highlighting diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 33b16e3242c6..4d9975192461 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , jsoncpp -, libjson_rpc_cpp +, libjson-rpc-cpp , curl , boost , leveldb @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake jsoncpp - libjson_rpc_cpp + libjson-rpc-cpp curl boost leveldb diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 144e1fa566ca..daea20835c8a 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }: +{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: stdenv.mkDerivation rec { version = "2.1.3"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase poppler_qt5 ]; + buildInputs = [ qtbase poppler ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 09b6db3abf9a..3e6a6ab53f77 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -7,7 +7,7 @@ , libevent , libtool , libqrencode -, libudev +, udev , libusb , makeWrapper , pkgconfig @@ -67,12 +67,12 @@ in stdenv.mkDerivation rec { qttools ]; - buildInputs = with stdenv.lib; [ + buildInputs = [ # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio. libcap libevent libtool - libudev + udev libusb libqrencode diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 65b85868bc59..a70506f7aaaa 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 0a2a051223ac..b16507c8b7bd 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte -, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs +, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: let version = "0.3.1"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf intltool pkgconfig - libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs + libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; buildInputs = [ gtk3 vte ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 56cbb338a403..7d48b61793ca 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, ag, tree, man, stdenv, +{ fetchFromGitHub, silver-searcher, tree, man, stdenv, pandocSupport ? true, pandoc ? null , ... }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} substituteInPlace memo \ - --replace "ack_cmd=ack" "ack_cmd=${ag}/bin/ag" \ + --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ --replace "pandoc_cmd=pandoc" "${pandocReplacement}" diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 42f1b58061ef..5aaaa7a0e37b 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, perl -, alsaLib, libevdev, libopus, libudev, SDL2 +, alsaLib, libevdev, libopus, udev, SDL2 , ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - alsaLib libevdev libopus libudev SDL2 + alsaLib libevdev libopus udev SDL2 ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid ]; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index 4ac152c26694..12f8c12b5864 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: +{ stdenv, mkDerivation, fetchFromGitHub, boost +, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { name = "nixnote2-${version}"; @@ -11,7 +12,7 @@ mkDerivation rec { sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; }; - buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + buildInputs = [ boost qtbase qtwebkit poppler hunspell ]; enableParallelBuilding = true; @@ -28,7 +29,7 @@ mkDerivation rec { substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' ''; - + postInstal = '' cp images/windowIcon.png $out/share/pixmaps/nixnote2.png ''; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index de64705d832b..78105ea535d6 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -16,7 +16,7 @@ , intltool , isocodes , libcanberra-gtk3 -, libudev +, udev , libxkbcommon , pkgconfig , procps @@ -79,7 +79,7 @@ in python3.pkgs.buildPythonApplication rec { hunspell isocodes libcanberra-gtk3 - libudev + udev libxkbcommon wrapGAppsHook xorg.libXtst diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 58e80e7f7264..e1cc70e42779 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, x11 }: +{ stdenv, fetchurl, xorg, xlibsWrapper }: stdenv.mkDerivation rec { version = "1.2.sakura.5"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"; sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; }; - buildInputs = [ xorg.imake xorg.gccmakedep x11 ]; - + buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ]; + configurePhase = "xmkmf"; installPhase = '' @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index f836ce5b8085..dfaa90d43adf 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups +{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups , file, ghostscript }: let @@ -12,7 +12,7 @@ let }; nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript + qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 1d0c7d28de6e..3ef5a6c4e345 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext +{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext , gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , pkgconfig, python, pythonPackages, vte @@ -22,13 +22,13 @@ in stdenv.mkDerivation rec { buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib + makeWrapper python pythonPackages.lockfile dbus dbus-glib gdk_pixbuf gsettings-desktop-schemas gtk3 hicolor-icon-theme vte ]; NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/include/dbus-1.0" - "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; + "-I${dbus.dev}/include/dbus-1.0" + "-I${dbus.lib}/lib/dbus-1.0/include" ]; # Fix up python path so the lockfile library is on it. PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [ diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index d2a2936680f9..6df81aa11729 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -2,13 +2,13 @@ , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs -, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat udev libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 9df2a2dde765..48e0d19e20b9 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -40,7 +40,7 @@ library, use the 'NOGUI' parameter: $ make NOGUI=1 */ -{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper, +{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2, wxGUI ? true }: @@ -86,7 +86,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse devicemapper wxGTK nasm ]; + buildInputs = [ fuse lvm2 wxGTK nasm ]; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 1c5c4d1dcaac..bc5b19e77370 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself, +{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself, wxGUI ? true }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeself yasm pkgconfig ]; - buildInputs = [ fuse devicemapper ] + buildInputs = [ fuse lvm2 ] ++ optional wxGUI wxGTK30; makeFlags = optionalString (!wxGUI) "NOGUI=1"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6a5c9d67470c..570180d4c4df 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -5,7 +5,7 @@ , curl , cups , dbus-glib -, dbus_libs +, dbus , fontconfig , freetype , gconf @@ -93,7 +93,7 @@ stdenv.mkDerivation { curl cups dbus-glib - dbus_libs + dbus fontconfig freetype gconf diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 62fd4f533ea0..584dca63297c 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration -, libudev +, udev , kerberos }: @@ -66,7 +66,7 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); - libs = [ libudev ] + libs = lib.optional stdenv.isLinux udev ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index d2d26190ce05..2df2043517ae 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk +, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk , kerberos # command line arguments which are always set e.g "--disable-gpu" @@ -52,7 +52,7 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gdk_pixbuf gcc-unwrapped.lib + dbus gdk_pixbuf gcc-unwrapped.lib systemd libexif liberation_ttf curl utillinux xdg_utils wget diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8eae85099fb7..7aba25dc339a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd +, alsaLib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index f10a88ec9614..bee4c3bea20b 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses -, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }: +, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }: stdenv.mkDerivation rec { name = "newsboat-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace "ncurses5.4" "ncurses" ''; - nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] + nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 681a8119ac03..820a742245ed 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg +, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg }: stdenv.mkDerivation rec { @@ -25,13 +25,11 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath ([ stdenv.cc.cc # For libstdc++. - ] ++ lib.filter (x: x != null) [ alsaLib - dbus_libs + dbus gtk2 libpulseaudio openssl - ] ++ lib.optionals (xorg != null) [ xorg.libX11 xorg.libXext xorg.libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index e41aea497a85..af58aaa0a769 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { name = "purple-discord-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib ]; + buildInputs = [ pidgin json-glib ]; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 1ff67d02ff67..525a8a313f44 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] - ++ stdenv.lib.optional doCheck dbus_daemon; + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; + + checkInputs = [ dbus.daemon ]; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 3f22aa28f36f..82ad57ae9272 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig -, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: +, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }: stdenv.mkDerivation rec { project = "telepathy-logger"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib - dbus_libs telepathy-glib.python + dbus telepathy-glib.python ]; configureFlags = "--enable-call"; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 4bd0f2e73e6f..0139a3f3a93d 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }: +{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig qmake ]; - buildInputs = [ qtbase qtsvg boost qwt6 ]; + buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index c0f015944b0a..390f68bd105f 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }: +{ stdenv, fetchurl, binutils, patchelf, makeWrapper +, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype +, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }: stdenv.mkDerivation rec { name = "inboxer-${version}"; @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { expat stdenv.cc.cc.lib libpulseaudio - libudev + udev ]; in '' patchelf \ @@ -62,7 +64,7 @@ stdenv.mkDerivation rec { patchelf \ --set-rpath "$out/opt/Inboxer:${lpath}" \ $out/opt/Inboxer/libffmpeg.so - + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/Inboxer:${lpath}" \ @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}" ''; - + installPhase = '' mkdir -p $out/bin cp -R usr/share opt $out/ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index bea713c9e6bd..b9b553f94472 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -7,7 +7,7 @@ , cups , curl , dbus-glib -, dbus_libs +, dbus , fontconfig , freetype , gdk_pixbuf @@ -86,7 +86,7 @@ stdenv.mkDerivation { cups curl dbus-glib - dbus_libs + dbus fontconfig freetype gdk_pixbuf diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index e4bdec668a02..74ffb14f4ade 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync, - asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }: + asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { name = "lsyncd-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ rsync cmake lua pkgconfig - asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt + asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index eca3ddd32e8b..e43fd59e0431 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -2,7 +2,7 @@ , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp -, oceSupport ? true, opencascade_oce +, oceSupport ? true, opencascade , ngspiceSupport ? true, libngspice , scriptingSupport ? true, swig, python, wxPython }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = - optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ] + optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ] ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" ++ optionals (scriptingSupport) [ "-DKICAD_SCRIPTING=ON" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost - ] ++ optional (oceSupport) opencascade_oce + ] ++ optional (oceSupport) opencascade ++ optional (ngspiceSupport) libngspice ++ optionals (scriptingSupport) [ swig python wxPython ]; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index 1d933d569486..babd87eb2b1d 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -5,7 +5,8 @@ , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them - , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11 + , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4 + , xlibsWrapper , withIgnitionTransport ? true , libav, withLibAvSupport ? true , openal, withAudioSupport ? false @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { # TODO: add these hidden deps to cmake configuration & submit upstream curl tinyxml - x11 + xlibsWrapper qt4 ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h ++ optional withDocs doxygen diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index ed207a1e7d96..1a5ce6e369ef 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, makeWrapper, flex, bison, - asciidoc, docbook_xml_dtd_45, docbook_xml_xslt, + asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt, python27, rcs, cvs, git, coreutils, rsync}: @@ -21,7 +21,7 @@ mkDerivation rec { }; buildInputs = [ - flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt + flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt python27 rcs cvs git makeWrapper ]; @@ -29,7 +29,7 @@ mkDerivation rec { preBuild = '' makeFlagsArray=( - XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml" LIBS="" prefix="$out" ) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index a6efb8d339e9..284a1cc649a8 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xml_xslt, pkgconfig, luajit +, docbook_xsl, pkgconfig, luajit , gzip, bzip2, xz , python, wrapPython, pygments, markdown }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ - openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit + openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; pythonPath = [ pygments markdown ]; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 238d527ce38e..84b6633b8835 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git -, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto +, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto , bazaar ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null, src ? null , subversion ? null, cvs_fast_export ? null }: @@ -24,16 +24,16 @@ in mkDerivation rec { }; # See https://gitlab.com/esr/reposurgeon/issues/17 - patches = [ ./fix-preserve-type.patch ]; + patches = [ ./fix-preserve-type.patch ]; buildInputs = - [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++ + [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++ optional (cython != null) cython ; preBuild = '' makeFlagsArray=( - XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml" prefix="$out" pyinclude="-I${python}/include/python2.7" pylib="-L${python}/lib -lpython2.7" @@ -64,5 +64,5 @@ in mkDerivation rec { --prefix PYTHONPATH : "${pythonpath}" done '' - ; + ; } diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index f89aa04e0146..f73c5277d054 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -6,7 +6,7 @@ , cdrtools, dvdauthor, dvdplusrwtools , dvdisasterSupport ? true, dvdisaster ? null , thumbnailSupport ? true, libgnomeui ? null -, udevSupport ? true, libudev ? null +, udevSupport ? true, udev ? null , dbusSupport ? true, dbus ? null , makeWrapper }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"; }; - nativeBuildInputs = + nativeBuildInputs = [ pkgconfig ]; packagesToBinPath = @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { docbook5 zip makeWrapper ] ++ packagesToBinPath ++ optionals dvdisasterSupport [ dvdisaster ] - ++ optionals udevSupport [ libudev ] + ++ optionals udevSupport [ udev ] ++ optionals dbusSupport [ dbus ] ++ optionals thumbnailSupport [ libgnomeui ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 64119d2dfc55..776d2732327f 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -19,7 +19,7 @@ , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp , libplist, p11-kit, zlib -, dbusSupport ? true, dbus_libs ? null +, dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null , pulseSupport ? true, libpulseaudio ? null @@ -30,7 +30,7 @@ , vdpauSupport ? true, libvdpau ? null }: -assert dbusSupport -> dbus_libs != null; +assert dbusSupport -> dbus != null; assert nfsSupport -> libnfs != null; assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; @@ -139,7 +139,7 @@ in stdenv.mkDerivation rec { ffmpeg # libdvdcss libdvdnav libdvdread ] - ++ lib.optional dbusSupport dbus_libs + ++ lib.optional dbusSupport dbus ++ lib.optionals joystickSupport [ cwiid ] ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 5638fad39e5d..6042f490dfa0 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -10,7 +10,7 @@ , libXtst , wrapGAppsHook , defaultIconTheme -, hicolor_icon_theme +, hicolor-icon-theme }: buildPythonApplication rec { pname = "screenkey"; @@ -40,7 +40,7 @@ buildPythonApplication rec { buildInputs = [ defaultIconTheme - hicolor_icon_theme + hicolor-icon-theme ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index d9bc2ed18b1a..6fedc227e447 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -6,7 +6,7 @@ , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz -, libass, libva-full, libdvbpsi, libdc1394, libraw1394, libopus +, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols , onlyLibVLC ? false , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive - libkate libtiger libv4l samba liboggz libass libdvbpsi libva-full + libkate libtiger libv4l samba liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 fluidsynth wayland wayland-protocols diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1a2c850f1569..7e9a89d48887 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, bridge-utils, devicemapper, systemd +, sqlite, iproute, bridge-utils, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps, libseccomp }: @@ -66,7 +66,7 @@ rec { DOCKER_BUILDTAGS = [] ++ optional (systemd != null) [ "journald" ] ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper" + ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; }) // rec { @@ -88,7 +88,7 @@ rec { buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool ] ++ optionals (stdenv.isLinux) [ - sqlite devicemapper btrfs-progs systemd libseccomp + sqlite lvm2 btrfs-progs systemd libseccomp ]; dontStrip = true; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index bb6209ce47fb..64704f73e7b1 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -1,5 +1,5 @@ { stdenv, callPackage, fetchurl, fetchpatch, fetchgit -, ocamlPackages_4_02 +, ocaml-ng , withInternalQemu ? true , withInternalTraditionalQemu ? true , withInternalSeabios ? true @@ -258,4 +258,4 @@ callPackage (import ./generic.nix (rec { else throw "this xen has no qemu builtin"; }; -})) ({ ocamlPackages = ocamlPackages_4_02; } // args) +})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_02; } // args) diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 20deb2c24048..a48d031ad335 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -2,7 +2,7 @@ , libjpeg, libtiff, libpng, freetype , fltk, gtk , libX11, libXext, libICE -, dbus, dbus_libs +, dbus }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ]; + buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus ]; # A strange type of bug: dbus is not immediately found by pkgconfig preConfigure = '' diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index dd2559d2b15c..90ae043fba32 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, - docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, + docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, libXrandr, libXrender, xwininfo }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 - docbook_xml_xslt + docbook_xsl pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 337ecdd651ff..f72ef13173ca 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms -, xlibs , i3ipc-glib , glib +, xorg , i3ipc-glib , glib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxcb xcbutilkeysyms xproto xlibs.libX11.dev i3ipc-glib glib.dev ]; + buildInputs = [ libxcb xcbutilkeysyms xproto xorg.libX11.dev i3ipc-glib glib.dev ]; # Makefile has no rule for 'install' installPhase = '' diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix index 46130680af42..6bf6f44d4234 100644 --- a/pkgs/applications/window-managers/orbment/default.nix +++ b/pkgs/applications/window-managers/orbment/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage -, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng +, wlc, dbus, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng , libdrm, libX11 , westonLite }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ - wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 + wlc dbus wayland libxkbcommon pixman libinput udev zlib libpng libX11 libdrm ]; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 89e7b9dd0880..50614534f8e7 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , cmake, pkgconfig, asciidoc, libxslt, docbook_xsl -, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs +, wayland, wlc, libxkbcommon, pcre, json_c, dbus , pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs , libXdmcp , buildDocs ? true @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmake pkgconfig ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ]; buildInputs = [ - wayland wlc libxkbcommon pcre json_c dbus_libs + wayland wlc libxkbcommon pcre json_c dbus pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs libXdmcp ]; diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d82a92042307..9d22fcf8be17 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, - openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3, + openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3, libsodium, postgresql, ... }: let @@ -41,10 +41,10 @@ in }; dbus = attrs: { - buildInputs = [ pkgconfig dbus_libs ]; + buildInputs = [ pkgconfig dbus ]; }; libdbus-sys = attrs: { - buildInputs = [ pkgconfig dbus_libs ]; + buildInputs = [ pkgconfig dbus ]; }; gobject-sys = attrs: { buildInputs = [ dbus-glib ]; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 9660bc3e4c78..f4d29643dd7a 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig , fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio -, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit +, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg -, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp +, dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp , curl, libinput, systemd, mesa_noglu, writeText }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit - harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm + harfbuzz jbig2dec librsvg alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm libinput utillinux fribidi SDL2 ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 778a1cc920f1..3eabca2d24df 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: +, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }: assert withGtk -> (gtk2 != null); @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ] + buildInputs = [ ORBit2 dbus dbus-glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 9d71b999d11c..c15f43b542aa 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib -, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: +, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { name = "gnome-vfs-${minVer}.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ libxml2 bzip2 openssl dbus-glib fam cdparanoia + [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia gnome_mime_data avahi acl ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 4da4c4802665..98cfc686e978 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream +, dbus-glib, telepathy-glib, telepathy-farstream , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control , telepathy-logger, libnotify, clutter, libsoup, gnutls diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index beb40209bc8c..bea40431a24e 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs +, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus , telepathy-glib, evolution-data-server, libsecret, db }: # TODO: enable more folks backends @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests - buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs + buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; + "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index d3d14f555cfa..4bd2dcbe13e8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook , webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc -, telepathy-glib, gettext, dbus_libs, icu, glib-networking +, telepathy-glib, gettext, icu, glib-networking , libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos }: diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index d46cf489620a..8f77944577ee 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: let pname = "libgnome-keyring"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib gobjectIntrospection dbus libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; passthru = { diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index eed34ae523d4..47a0238a7fd5 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }: +{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }: stdenv.mkDerivation rec { name = "gnome-shell-system-monitor-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - glib_networking + glib-networking libgtop ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./paths_and_nonexisting_dirs.patch; gtop_path = "${libgtop}/lib/girepository-1.0"; - glib_net_path = "${glib_networking}/lib/girepository-1.0"; + glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index e3ff784b16fa..7bc0ee371752 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit -, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }: +, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; }; }; - NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit - libcanberra-gtk3 libnotify dbus-glib dbus_libs ]; + libcanberra-gtk3 libnotify dbus-glib dbus ]; prePatch = "patchShebangs meson_post_install.sh"; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 7920c8e1f458..ed162229d9af 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -2,7 +2,7 @@ , cairo , fetchurl , base, gui -, x11 +, xlibsWrapper , freetype , pkgconfig , libXmu @@ -17,7 +17,7 @@ gsmakeDerivation { sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo base gui freetype x11 libXmu ]; + buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; meta = { description = "A generic backend for GNUstep"; }; diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 7563e3447504..00ebfd8a7253 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, - qttools, poppler_qt5, wrapGAppsHook + qttools, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qtx11extras - poppler_qt5 + poppler fluxbox xscreensaver desktop-file-utils diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index e1825d21ca7e..21705b0fb5e2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, - xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }: + xfce, libwnck3, libdbusmenu, gobjectIntrospection }: stdenv.mkDerivation rec { name = "xfce4-vala-panel-appmenu-plugin-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf - libwnck3 libdbusmenu-glib gobjectIntrospection ]; + libwnck3 libdbusmenu gobjectIntrospection ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix index 1ff1153d727f..1096996ee6d5 100644 --- a/pkgs/desktops/xfce4-13/exo/default.nix +++ b/pkgs/desktops/xfce4-13/exo/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3 +{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation rec { @@ -14,7 +14,7 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace docs/reference/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; meta = { diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix index 31e1101c5e2d..dbeb80ac9bd2 100644 --- a/pkgs/desktops/xfce4-13/thunar/default.nix +++ b/pkgs/desktops/xfce4-13/thunar/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null +{ mkXfceDerivation, docbook_xsl, exo, gdk_pixbuf, gtk3, libgudev ? null , libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }: mkXfceDerivation rec { @@ -11,7 +11,7 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace docs/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; nativeBuildInputs = [ libxslt ]; diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix index 266722c9b053..e5898687098a 100644 --- a/pkgs/desktops/xfce4-13/xfburn/default.nix +++ b/pkgs/desktops/xfce4-13/xfburn/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: +{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: mkXfceDerivation rec { category = "apps"; @@ -8,7 +8,7 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace docs/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp"; diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix index ab64acee0504..9dedb8674dc2 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }: +{ mkXfceDerivation, autoreconfHook, autoconf, automake +, glib, gtk-doc, intltool, libtool }: mkXfceDerivation rec { category = "xfce"; @@ -13,7 +14,7 @@ mkXfceDerivation rec { autoconf automake glib - gtk_doc + gtk-doc intltool libtool ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix index 96deb96e7f7d..76cb22b5b5f5 100644 --- a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2 +{ mkXfceDerivation, automakeAddFlags, dbus-glib, gst-plugins-base, gtk2 , libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation rec { @@ -16,7 +16,7 @@ mkXfceDerivation rec { ''; buildInputs = [ - dbus_glib + dbus-glib gst-plugins-base gtk2 libICE diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 86494e9323b4..fe4321474ec1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -442,7 +442,7 @@ self: super: builtins.intersectAttrs super { then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa else dontCheck super.fsnotify; - hidapi = addExtraLibrary super.hidapi pkgs.libudev; + hidapi = addExtraLibrary super.hidapi pkgs.udev; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 36d1a8326e70..d002f6eb31c1 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -5,7 +5,7 @@ , readline, sqlite , disableDocs ? false , CoreFoundation -, gsettings_desktop_schemas +, gsettings-desktop-schemas }: let @@ -20,7 +20,7 @@ let glib gmp gtk3 - gsettings_desktop_schemas + gsettings-desktop-schemas libedit libjpeg libpng @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ] + buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; preConfigure = '' diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index a229beb5ccb8..b8b55d6a8742 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 -, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc -, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: +, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }: let version = "0.99.3"; @@ -28,12 +28,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection - gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper + gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ - bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xlibs.libXau + bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp + libsoup lzma ostree polkit python3 systemd xorg.libXau ]; checkInputs = [ valgrind ]; @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/flatpak \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}" ''; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 5796425e4385..56d8cd21f844 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -3,7 +3,7 @@ , python3Packages , wrapGAppsHook , atk -, dbus_libs +, dbus , evemu , frame , gdk_pixbuf @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { [ pygobject3 ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; - buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail + buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index fafcf82258ab..af0830ab7042 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, x11, libXmu, libXi +{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , buildPlatform, hostPlatform , AGL ? null }: @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; + buildInputs = [ xlibsWrapper libXmu libXi ] + ++ optionals stdenv.isDarwin [ AGL ]; propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ff870f525f23..fd6e0a65abce 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -4,7 +4,8 @@ , utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false +, coreutils, dbus, libxml2, tzdata, desktop-file-utils +, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index f206a169b93d..656afef22f90 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, substituteAll, which }: +, pango, pkgconfig, substituteAll, which, gst_plugins_base }: stdenv.mkDerivation rec { name = "gtkd-${version}"; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 642e10ea541d..75818f756921 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst_plugins_base }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }: stdenv.mkDerivation rec { name = "gupnp-dlna-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - buildInputs = [ gupnp gst_plugins_base ]; + buildInputs = [ gupnp gst-plugins-base ]; meta = { homepage = https://wiki.gnome.org/Projects/GUPnP/; diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 0a600fe8d057..68b5c08aa090 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl, + extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, karchive, ki18n, qtbase, perl, perlPackages }: @@ -24,7 +24,7 @@ mkDerivation { patches = [ ./kdoctools-no-find-docbook-xml.patch ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook" ]; postFixup = '' moveToOutput "share/doc" "$dev" diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index e84df0c1aedf..b5402984d16f 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml -, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key +, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml +, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml + glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index b2a0021d53b5..e7157afbaee5 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; meta = { diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 1bde9336c66d..1f5ee90337aa 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus-glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu , gtkVersion ? "3", gtk2 ? null, gtk3 ? null , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus-glib libdbusmenu-glib + glib dbus-glib libdbusmenu python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index bd54b3aa343a..400a107c5186 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, x11}: +{stdenv, fetchurl, automake, autoconf, xlibsWrapper}: stdenv.mkDerivation { name = "libstroke-0.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; - buildInputs = [ automake autoconf x11 ]; + buildInputs = [ automake autoconf xlibsWrapper ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file. diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index b12ed9613510..57eb5b42f37a 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, libtool, autoconf, automake -, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr +, coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 3828ebcb7a70..367c4e963842 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate -, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl +, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl }: stdenv.mkDerivation rec { @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libetpan cmake icu cyrus_sasl libctemplate libuchardet glib - libtidy libxml2 libuuid openssl + html-tidy libxml2 libuuid openssl ]; postPatch = '' substituteInPlace CMakeLists.txt \ --replace " icule iculx" "" \ --replace "tidy/tidy.h" "tidy.h" \ - --replace "/usr/include/tidy" "${libtidy}/include" \ + --replace "/usr/include/tidy" "${html-tidy}/include" \ --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ --replace buffio.h tidybuffio.h diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7e7314c936dd..c50fc9fb35c8 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg +, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf, freefont_ttf }: @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils - alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 63060bf55533..e2b8279b3caf 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus_tools, pkgconfig +, clucene_core, fam, zlib, dbus, pkgconfig }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus ]; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 24dc3667d172..d14010c857e4 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; - checkInputs = [ dbus_daemon dbus-python ]; + checkInputs = [ dbus.daemon dbus-python ]; patches = [ # https://github.com/TelepathyIM/telepathy-qt/issues/25 diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4b84f696eec6..e44a678194ae 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, - x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: + xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: let version = "1.1.77.0"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; + buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index a672bbf52a90..2b9244ff1b18 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu +, libX11, dbus, wayland-protocols, libdrm, mesa_noglu , libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL - libX11 libXfixes dbus_libs wayland-protocols + libX11 libXfixes dbus wayland-protocols libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 33cf5dd4af84..7acbaa260a0c 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 -, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, autoconf, automake, libtool, gettext, dbus, telepathy-glib , gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; buildInputs = [ - glib sqlite dbus_libs telepathy-glib dbus-glib + glib sqlite dbus telepathy-glib dbus-glib gtk3 json-glib librdf_raptor2 python2Packages.rdflib ]; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index f207683d2b0b..5e42331d1838 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy , ncurses, pygobject3 }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] - ++ lib.optionals doCheck [ dbus_tools pygobject3 ] + ++ lib.optionals doCheck [ pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. ++ lib.optional (! python ? modules) ncurses; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 0be0f892d731..9aabd6d94e2c 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, libmysql }: +{ stdenv, buildPythonPackage, fetchPypi, mysql }: buildPythonPackage rec { pname = "mysqlclient"; version = "1.3.12"; buildInputs = [ - libmysql + mysql.connector-c ]; # Tests need a MySQL database diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 0efb77d27b3e..a747d42e418a 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: +{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }: let pname = "PyQt-x11-gpl"; @@ -42,7 +42,7 @@ in buildPythonPackage { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper qt4 lndir dbus_libs ]; + buildInputs = [ makeWrapper qt4 lndir dbus ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b669c1456416..ebad81f809b5 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,5 +1,5 @@ { lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper -, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs +, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity }: @@ -32,7 +32,7 @@ in buildPythonPackage { nativeBuildInputs = [ pkgconfig qmake lndir ]; - buildInputs = [ dbus_libs ]; + buildInputs = [ dbus ]; propagatedBuildInputs = [ sip qtbase qtsvg qtwebkit qtwebengine @@ -53,7 +53,7 @@ in buildPythonPackage { ${python.executable} configure.py -w \ --confirm-license \ - --dbus=${dbus_libs.dev}/include/dbus-1.0 \ + --dbus=${dbus.dev}/include/dbus-1.0 \ --no-qml-plugin \ --bindir=$out/bin \ --destdir=$out/${python.sitePackages} \ diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index b820dc997e44..2dca2b6cd423 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp +, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , go-md2man }: let @@ -26,7 +26,7 @@ in buildGoPackage rec { hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man.bin ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux libseccomp ]; + buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; # Copied from the skopeo package, doesn’t seem to make a difference? # If something related to these libs failed, uncomment these lines. diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 377791007a36..b4a35b3a21c0 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -25,7 +25,7 @@ , gitMinimal , glib , gnutar -, json_glib +, json-glib , libcap , libdwarf , libsoup @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { elfutils flatpak glib - json_glib + json-glib libcap libdwarf libsoup diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 5e88384c58db..775b744f8398 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib -, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem +, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let @@ -19,7 +19,7 @@ let alsaLib cups expat - libudev + udev gnome2.GConf diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 0535a11e0ceb..dc157b672530 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux +, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux , go-md2man }: with stdenv.lib; @@ -28,7 +28,7 @@ buildGoPackage rec { excludedPackages = "integration"; nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; + buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ]; buildFlagsArray = '' -ldflags= @@ -37,8 +37,8 @@ buildGoPackage rec { ''; preBuild = '' - export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" - export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" + export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include" + export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib" ''; postBuild = '' diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 8951f16e43c4..da2612415ba5 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader, - glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { name = "vulkan-validation-layers-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ]; + buildInputs = [ cmake python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index fbf76842c20e..1487ed4e1ddc 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype +, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 @@ -8,8 +8,8 @@ let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango - gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango + gtk2-x11 nspr nss stdenv.cc.cc libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libxcb ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index dce52d4c2957..da711f59af02 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , libGLU -, x11 +, xlibsWrapper , xorg , xinput_calibrator , doxygen @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libao libpthreadstubs libGLU - x11 + xlibsWrapper xinput_calibrator xorg.libXrandr xorg.libXi diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 5a8a8d244bf6..63fb24dc4d7d 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, x11, openal +{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal , SDL2, boost, ffmpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake sfml libGLU_combined bullet glm libmad x11 openal SDL2 boost ffmpeg + cmake sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index 590441bb6ddb..31b13baf7964 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libudev }: +{ stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { name = "moltengamepad-git-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ libudev ]; + buildInputs = [ udev ]; buildPhase = '' make diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 6959177b3c9d..bc872bb5faa7 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 , bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo , libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline -, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl +, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls , soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin @@ -36,10 +36,10 @@ in stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo - portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml + portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml qt5.qtbase ] ++ stdenv.lib.optionals stdenv.isLinux [ - bluez libudev libevdev alsaLib vulkan-loader + bluez udev libevdev alsaLib vulkan-loader ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreBluetooth cf-private OpenGL ForceFeedback IOKit ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 8c965e471e5a..8f6e66c18c39 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL -, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis +, ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis , miniupnpc, sfml, xorg, zlib }: let @@ -149,7 +149,7 @@ in with stdenv.lib.licenses; extraBuildInputs = [ cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc gettext glib gtk2 hidapi - libevdev libudev + libevdev udev ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]); }).override { cmakeFlags = [ diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 6828fbf6b1c9..df0ef80ff4d4 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, elfutils -, xorg, patchelf, openssl, libdrm, libudev +, xorg, patchelf, openssl, libdrm, udev , libxcb, libxshmfence, epoxy, perl, zlib , fetchFromGitHub, ncurses , libsOnly ? false, kernel ? null @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { depLibPath = makeLibraryPath [ stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib - xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev ncurses5 + xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils udev ncurses5 ]; installPhase = '' diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index e1da0a449c5b..a09fa93cb782 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt +{ stdenv, fetchurl, fetchpatch, lvm2, json_c +, openssl, libuuid, pkgconfig, popt , enablePython ? false, python2 ? null }: assert enablePython -> python2 != null; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper json_c openssl libuuid popt ] + buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; meta = { diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index e71d36c5e485..a6f6365ae631 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, devicemapper }: +{ stdenv, fetchurl, fetchpatch, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc16"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { preConfigure = "cd */"; - buildInputs = [ devicemapper ]; + buildInputs = [ lvm2 ]; meta = { description = "Old-style RAID configuration utility"; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index d2eab02f6753..d0a8950a5087 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, libsysfs, gnutls, openssl +, sysfsutils, gnutls, openssl , libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ]; buildInputs = [ - libsysfs openssl libcap libgcrypt nettle + sysfsutils openssl libcap libgcrypt nettle ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn; # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure... diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index c58851bb03ec..840d4cc9cf7b 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,6 +1,6 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils -, libiberty, libaudit, libbfd, openssl, systemtap, numactl +, libiberty, audit, libbfd, openssl, systemtap, numactl , zlib, withGtk ? false, gtk2 ? null }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { # perf refers both to newt and slang nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit makeWrapper pkgconfig python perl + flex bison libiberty audit makeWrapper pkgconfig python perl ]; buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 45222bee6b00..1664a2afac5e 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, libaudit +{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit , enablePython ? true, swig ? null, python ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex pkgconfig ]; - buildInputs = [ libsepol libselinux bzip2 libaudit ] + buildInputs = [ libsepol libselinux bzip2 audit ] ++ optionals enablePython [ swig python ]; preBuild = '' diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 8cda636e987d..0f542b9e3824 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, coreutils, libuuid , thin-provisioning-tools, enable_dmeventd ? false }: let @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libudev libuuid thin-provisioning-tools ]; + buildInputs = [ udev libuuid thin-provisioning-tools ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 326ba444957e..a5577b97b870 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod -, procps, kbd, dbus_tools }: +, procps, kbd, dbus }: let binPath = stdenv.lib.makeBinPath - [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ]; + [ coreutils gnugrep utillinux kmod procps kbd dbus ]; sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin" [ procps ]; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 0cfc266d8715..de7164b2af03 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc -, ethtool, nettools, libnl, libudev, python, perl +, ethtool, nettools, libnl, udev, python, perl } : let @@ -16,7 +16,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; - buildInputs = [ libnl ethtool nettools libudev python perl ]; + buildInputs = [ libnl ethtool nettools udev python perl ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" @@ -37,4 +37,3 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ markuskowa ]; }; } - diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index bbc4bc7da464..99e4b09f46d8 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, - pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, - libuuid, docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper, + pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, + libuuid, docbook_xsl, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson , withSudo ? false }: let - docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; + docbookFiles = "${pkgs.docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; in stdenv.mkDerivation rec { name = "sssd-${version}"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba libnfsidmap doxygen python python3 popt talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos - cifs_utils glib keyutils dbus fakeroot libxslt libxml2 + cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 3dce750d255e..7b421aaff3d7 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl -, dbus_libs ? null, readline ? null, pcsclite ? null +, dbus, readline ? null, pcsclite ? null }: with stdenv.lib; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { CONFIG_EAP_AKA=y CONFIG_EAP_AKA_PRIME=y CONFIG_PCSC=y - '' + optionalString (dbus_libs != null) '' + '' + optionalString (dbus != null) '' CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { -I${stdenv.lib.getDev pcsclite}/include/PCSC/" ''; - buildInputs = [ openssl libnl dbus_libs readline pcsclite ]; + buildInputs = [ openssl libnl dbus readline pcsclite ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index 8cd9287a7772..bf4f36bb250b 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, bison , kernel, glibc, perl }: with (import ./srcs.nix { inherit fetchurl; }); @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; inherit version src; - nativeBuildInputs = [ autoconf automake flex perl yacc which ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 2faa8ead0716..b96235341401 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }: +{ lib, stdenv, rustPlatform, fetchFromGitHub +, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8"; - buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ]; + buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 7523bab2e8c3..8bff5a2e714a 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -3,7 +3,7 @@ , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama -, gst_all_1, pulseaudioLight, gobjectIntrospection +, gst_all_1, pulseaudio, gobjectIntrospection , pam }: with lib; @@ -61,7 +61,7 @@ in buildPythonApplication rec { --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]} ''; preCheck = "exit 0"; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index 6ea24ad2c6aa..cc2eb50ce1fd 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchbzr, x11 }: +{ stdenv, fetchbzr, xlibsWrapper }: let version = "4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ - x11 + xlibsWrapper ]; buildPhase = if stdenv.system == "x86_64-linux" then '' diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index ffc7ee192c90..5c272e3dbafc 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }: - +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }: + stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; - + src = fetchurl { url = "http://tadas.dailyda.com/software/${name}.tar.gz"; sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ]; + buildInputs = [ libusb glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; preConfigure = '' addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig - export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ''; meta = { diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 2a5250a95aca..7eca80f8400c 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,6 +1,6 @@ -{ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xml_xslt + , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl , libarchive, lzma }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xml_xslt + docbook_xml_dtd_45 docbook_xsl libarchive lzma ]; preBuild = '' diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 4325a9355366..672b289b5bbd 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -2,7 +2,7 @@ , which, git , boost, python2Packages , libxml2, zlib -, openldap, lttngUst +, openldap, lttng-ust , babeltrace, gperf , cunit, snappy , rocksdb, makeWrapper @@ -84,11 +84,11 @@ let none = [ ]; }; - ceph-python-env = python2Packages.python.withPackages (ps: [ + ceph-python-env = python2Packages.python.withPackages (ps: [ ps.sphinx ps.flask ps.argparse - ps.cython + ps.cython ps.setuptools ps.pip # Libraries needed by the python tools @@ -105,9 +105,9 @@ stdenv.mkDerivation { inherit src; - patches = [ + patches = [ # ./ceph-patch-cmake-path.patch - ./0001-kv-RocksDBStore-API-break-additional.patch + ./0001-kv-RocksDBStore-API-break-additional.patch ] ++ optionals stdenv.isLinux [ ./0002-fix-absolute-include-path.patch ]; @@ -117,10 +117,10 @@ stdenv.mkDerivation { pkgconfig which git python2Packages.wrapPython makeWrapper (ensureNewerSourcesHook { year = "1980"; }) ]; - + buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ - boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 - malloc zlib openldap lttngUst babeltrace gperf cunit + boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 + malloc zlib openldap lttng-ust babeltrace gperf cunit snappy rocksdb ] ++ optionals stdenv.isLinux [ linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs @@ -130,28 +130,28 @@ stdenv.mkDerivation { optKinetic-cpp-client ]; - + preConfigure ='' # rip off submodule that interfer with system libs rm -rf src/boost rm -rf src/rocksdb - + # require LD_LIBRARY_PATH for cython to find internal dep export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" - + # requires setuptools due to embedded in-cmake setup.py usage export PYTHONPATH="${python2Packages.setuptools}/lib/python2.7/site-packages/:$PYTHONPATH" ''; - cmakeFlags = [ + cmakeFlags = [ "-DENABLE_GIT_VERSION=OFF" "-DWITH_SYSTEM_BOOST=ON" "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_LEVELDB=OFF" - + # enforce shared lib "-DBUILD_SHARED_LIBS=ON" - + # disable cephfs, cmake build broken for now "-DWITH_CEPHFS=OFF" "-DWITH_LIBCEPHFS=OFF" @@ -163,7 +163,7 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; - + outputs = [ "dev" "lib" "out" "doc" ]; meta = { diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index fe713556577d..8af745ed436e 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, devicemapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { name = "convoy-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; }; - buildInputs = [devicemapper]; + buildInputs = [lvm2]; meta = with stdenv.lib; { homepage = https://github.com/rancher/convoy; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 24eec2f0dc46..b0c33212edb3 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt , enablePython ? true, python ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper libgcrypt libuuid popt ] + buildInputs = [ lvm2 libgcrypt libuuid popt ] ++ stdenv.lib.optional enablePython python; meta = { diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 5ae32093e7f7..217056117ea7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -18,13 +18,11 @@ let cryptsetup = import ./cryptsetup.nix { inherit stdenv fetchurl python; - inherit (pkgs) pkgconfig libgcrypt libuuid popt; - devicemapper = lvm2; + inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2; }; dmraid = import ./dmraid.nix { - inherit stdenv fetchurl; - devicemapper = lvm2; + inherit stdenv fetchurl lvm2; }; lvm2 = import ./lvm2.nix { @@ -39,8 +37,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) utillinux readline libuuid gettext check; - devicemapper = lvm2; + inherit (pkgs) utillinux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index defdf6702ea7..a4dcb408e058 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper }: +{ stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc15"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "cd */"; - buildInputs = [ devicemapper ]; + buildInputs = [ lvm2 ]; meta = { description = "Old-style RAID configuration utility"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 04859020e36e..3f43fdc0c395 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +{ stdenv, fetchurl, lvm2, libuuid, gettext, readline , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (lvm2 != null) lvm2 ++ stdenv.lib.optional (hurd != null) hurd ++ stdenv.lib.optional doCheck check; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; doCheck = true; diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index d563f4380209..b22f7e07a464 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig -, asciidoc, docbook_xml_xslt, fuse, libuuid, libxslt }: +, asciidoc, docbook_xsl, fuse, libuuid, libxslt }: stdenv.mkDerivation rec { name = "vmfs-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; }; - nativeBuildInputs = [ asciidoc docbook_xml_xslt fuse libuuid libxslt pkgconfig ]; + nativeBuildInputs = [ asciidoc docbook_xsl fuse libuuid libxslt pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 43da52634e68..14972fc5e56f 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, - python27, wayland, libudev, mesa_noglu }: + python27, wayland, udev, mesa_noglu }: stdenv.mkDerivation rec { name = "glmark2-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland libudev mesa_noglu + libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu ]; buildPhase = '' diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index dc703cf02f75..48d40ac49652 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib +, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core - dbus libdbusmenu-glib + dbus libdbusmenu ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 0492164dfa36..85713a300ec6 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -3,7 +3,7 @@ , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre , bison, flex, libpthreadstubs, libX11 -, embree2, makeWrapper, gsettings_desktop_schemas, glib +, embree2, makeWrapper, gsettings-desktop-schemas, glib , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gnome3.gtk + gsettings-desktop-schemas glib gnome3.gtk # needed for XDG_ICON_DIRS gnome3.defaultIconTheme makeWrapper diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 217a85f266ab..76829b6b7271 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, boost -, zlib, libpng, libjpeg, libtiff, x11, SDL +, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ]; + buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff xlibsWrapper SDL ]; # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ]; enableParallelBuilding = true; - + preInstall = '' mkdir "$TMP/bin" for i in chown chgrp; do diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 778a12341540..e44021bad5d1 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, - glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { name = "vulkan-tools-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ]; + buildInputs = [ cmake python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 33fea9705acd..33c66fb7ff20 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp, - libevdev, libudev }: + libevdev, udev }: let version = "0.1.1"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libevdev libudev libyamlcpp ]; + buildInputs = [ libevdev udev libyamlcpp ]; prePatch = '' substituteInPlace CMakeLists.txt --replace \ diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index 0051be14ee7c..7311b09008b9 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , vala, gobjectIntrospection, intltool, python2Packages, glib , pkgconfig -, libgee, json_glib, marisa, libkkc-data +, libgee, json-glib, marisa, libkkc-data }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ marisa libkkc-data ]; enableParallelBuilding = true; - propagatedBuildInputs = [ libgee json_glib ]; + propagatedBuildInputs = [ libgee json-glib ]; postInstall = '' ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix index 0af90ae2bf22..57be1b89e469 100644 --- a/pkgs/tools/misc/ckb/default.nix +++ b/pkgs/tools/misc/ckb/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, substituteAll, libudev, pkgconfig, qtbase, qmake, zlib, kmod }: +{ stdenv, fetchFromGitHub, substituteAll, udev +, pkgconfig, qtbase, qmake, zlib, kmod }: stdenv.mkDerivation rec { version = "0.2.9"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libudev + udev qtbase zlib ]; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 260151f5bd29..f761c1ec4c53 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fam }: +{ stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { name = "fileschanged-0.6.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc"; }; - buildInputs = [ fam ]; + buildInputs = [ gamin ]; patches = [./unused-variables.debian.patch]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 84c06a49f843..58c9f18ec5aa 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig +, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex python pkgconfig ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ] + buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 2bf7e3dcf43b..63a73658e0ac 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper +, gettext, ncurses, libusb, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper ] + buildInputs = [ ncurses libusb freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index c4a304e0d284..6211c863bd49 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -4,7 +4,7 @@ coreutils, # mktemp grub2, # grub-mount and grub-probe cryptsetup, # cryptsetup libuuid, # blkid and blockdev -libudev, # udevadm udevinfo +udev, # udevadm udevinfo ntfs3g # ntfs3g }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 libudev coreutils cryptsetup libuuid ntfs3g ]} \ + --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 3395e0286343..6649db4c48da 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2 +{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline, perl, python2 , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b"; sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q"; }) - ++ stdenv.lib.optional (devicemapper == null) + ++ stdenv.lib.optional (lvm2 == null) (fetchpatch { url = https://git.savannah.gnu.org/cgit/parted.git/patch/?id=7e87ca3c531228d35e13e802d2622006138b104c; sha256 = "0i29lfg8cwj342q5s7qwqhncz2bkifj5rjc7cx6jd4zqb6ykkndj"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (lvm2 != null) lvm2 ++ stdenv.lib.optional (hurd != null) hurd ++ stdenv.lib.optionals doCheck [ check perl python2 ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; # Tests were previously failing due to Hydra running builds as uid 0. diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 52a57629cd10..563232dbe53d 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 -, acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2 +, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, utillinux }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt docbook_xml_dtd_45 ]; buildInputs = [ - acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2 + acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 lvm2 pam python utillinux ]; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index ebbe5a11b523..be14db79880f 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack, fetchpatch }: +{ stdenv, fetchurl, pkgconfig, dbus, nettle +, libidn, libnetfilter_conntrack, fetchpatch }: with stdenv.lib; let @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettle libidn ] - ++ optionals stdenv.isLinux [ dbus_libs libnetfilter_conntrack ]; + ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ]; meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c7d153186986..647b7ed26da9 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages, - asciidoc, libxml2, libxslt, docbook_xml_xslt }: + asciidoc, libxml2, libxslt, docbook_xsl }: pythonPackages.buildPythonApplication rec { version = "7.2.1"; @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xml_xslt ]; + nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; propagatedBuildInputs = [ pythonPackages.six pythonPackages.kerberos ]; postInstall = '' diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c3f1e4d8d459..07c130f1cb38 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost -, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl +, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , busybox-sandbox-shell , hostPlatform, buildPlatform , storeDir ? "/nix/store" @@ -26,7 +26,7 @@ let nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index f392e0f50ed1..da62eba63fd3 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,4 +1,4 @@ -{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh +{ lib, python2Packages, fetchurl, libxslt, docbook_xsl_ns, openssh # version args , src, version }: @@ -31,7 +31,7 @@ python2Packages.buildPythonApplication { doCheck = false; postInstall = '' - make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ + make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ docdir=$out/share/doc/nixops mandir=$out/share/man mkdir -p $out/share/nix/nixops diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index f46e3f22ecd1..84072fd2840e 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 +{ stdenv, fetchurl, pkgconfig, udev, dbus, perl, python2 , IOKit ? null }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig perl python2 ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ] + buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 585e089b8af4..d9e68c77d25c 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite +{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus, pcsclite , wget, coreutils , perl, pcscperl, Glib, Gtk2, Pango, Cairo }: @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9"; }; - buildInputs = [ udev dbus_libs perl pcsclite ]; + buildInputs = [ udev dbus perl pcsclite ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 27458174dc2a..a8670203775a 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus-glib, libxml2 }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool +, pkgconfig, dbus, dbus-glib, libxml2 }: stdenv.mkDerivation rec { name = "thermald-${version}"; @@ -12,12 +13,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus_libs dbus-glib libxml2 ]; + buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; preConfigure = '' - export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ./autogen.sh ''; diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 5a5757bf2f2d..085331ce0d5c 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -8,7 +8,7 @@ , file , icu -, libgumbo +, gumbo , lzma , xapian , zimlib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ]; + buildInputs = [ file icu gumbo lzma zimlib zlib xapian ]; setSourceRoot = '' sourceRoot=$(echo */zimwriterfs) ''; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index d5da10b5cd43..efa1471f068b 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -14,7 +14,7 @@ , lilypond ? null , libxml2 ? null , docbook_xml_dtd_45 ? null -, docbook5_xsl ? null +, docbook_xsl_ns ? null , docbook_xsl ? null , fop ? null # TODO: Package this: @@ -56,7 +56,7 @@ assert enableStandardFeatures -> lilypond != null && libxml2 != null && docbook_xml_dtd_45 != null && - docbook5_xsl != null && + docbook_xsl_ns != null && docbook_xsl != null && (fop != null || !enableJava) && # TODO: Package this: @@ -238,7 +238,7 @@ stdenv.mkDerivation rec { # use it to work around an impurity in the tetex package; tetex tools # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # We can remove PATH= when those impurities are fixed. - sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \ + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85fb2e4639a8..b6476ca7ece0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,7 +85,6 @@ mapAliases ({ evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 exfat-utils = exfat; # 2015-09-11 - fam = gamin; # added 2018-04-25 ffadoFull = ffado; # added 2018-05-01 firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 @@ -98,10 +97,8 @@ mapAliases ({ gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gettextWithExpat = gettext; # 2016-02-19 - gflags = google-gflags; # added 2018-04-25 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 - gmock = gtest; # added 2018-04-25 gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 @@ -132,7 +129,6 @@ mapAliases ({ iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 inotifyTools = inotify-tools; - jack2Full = jack2; # added 2018-04-25 joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdiff3-qt5 = kdiff3; # added 2017-02-18 @@ -140,7 +136,6 @@ mapAliases ({ keepassx-community = keepassxc; # added 2017-11 keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 - kerberos = libkrb5; # added 2018-04-25 keybase-go = keybase; # added 2016-08-24 krename-qt5 = krename; # added 2017-02-18 kvm = qemu_kvm; # added 2018-04-25 @@ -158,7 +153,6 @@ mapAliases ({ libgumbo = gumbo; # added 2018-01-21 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 - liblrdf = librdf; # added 2018-04-25 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 @@ -170,7 +164,6 @@ mapAliases ({ lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_sec = luaPackages.luasec; # added 2017-05-02 - lzma = xz; # added 2018-04-25 m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 @@ -182,7 +175,6 @@ mapAliases ({ mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 - mysql = mariadb; # added 2018-04-25 mysqlWorkbench = mysql-workbench; # added 2017-01-19 nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 @@ -198,7 +190,6 @@ mapAliases ({ nilfs_utils = nilfs-utils; # added 2018-04-25 nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 - openal = openalSoft; # added 2018-04-25 opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 @@ -217,9 +208,7 @@ mapAliases ({ pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 piwik = matomo; # added 2018-01-16 pltScheme = racket; # just to be sure - polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 @@ -229,7 +218,6 @@ mapAliases ({ qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 - redland = librdf_redland; # added 2018-04-25 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -261,7 +249,6 @@ mapAliases ({ spice_protocol = spice-protocol; # added 2018-02-25 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 - sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 @@ -289,7 +276,6 @@ mapAliases ({ transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 tshark = wireshark-cli; # added 2018-04-25 ucsFonts = ucs-fonts; # added 2016-07-15 - udev = systemd; # added 2018-04-25 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 vimbWrapper = vimb; # added 2015-01 @@ -306,7 +292,6 @@ mapAliases ({ xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 - yacc = bison; # added 2018-04-25 youtubeDL = youtube-dl; # added 2014-10-26 # added 2017-05-27 @@ -352,5 +337,4 @@ mapAliases ({ ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; - ocaml = ocamlPackages.ocaml; })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 013573a1a618..bfe9d8e726db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2863,6 +2863,8 @@ with pkgs; gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest {}; + gmock = gtest; # TODO: move to aliases.nix + gbenchmark = callPackage ../development/libraries/gbenchmark {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; @@ -2871,7 +2873,9 @@ with pkgs; gtdialog = callPackage ../development/libraries/gtdialog {}; - gtkd = callPackage ../development/libraries/gtkd { }; + gtkd = callPackage ../development/libraries/gtkd { + gst_plugins_base = gst-plugins-base; + }; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; @@ -3393,7 +3397,7 @@ with pkgs; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg_2; - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -3728,6 +3732,7 @@ with pkgs; luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; + lzma = xz; # TODO: move to aliases.nix lz4 = callPackage ../tools/compression/lz4 { }; @@ -4034,7 +4039,7 @@ with pkgs; netboot = callPackage ../tools/networking/netboot {}; - netcat = netcat-openbsd; + netcat = libressl.nc; netcat-gnu = callPackage ../tools/networking/netcat { }; @@ -4717,7 +4722,7 @@ with pkgs; qshowdiff = callPackage ../tools/text/qshowdiff { }; - qtikz = callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; quicktun = callPackage ../tools/networking/quicktun { }; @@ -5069,7 +5074,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; }; + sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; }; skydns = callPackage ../servers/skydns { }; @@ -5173,6 +5178,7 @@ with pkgs; srcml = callPackage ../applications/version-management/srcml { }; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; + sshfs = sshfs-fuse; # added 2017-08-14 sshlatex = callPackage ../tools/typesetting/sshlatex { }; @@ -5343,7 +5349,7 @@ with pkgs; texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; - texstudio = callPackage ../applications/editors/texstudio { }; + texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; textadept = callPackage ../applications/editors/textadept { }; @@ -6977,6 +6983,7 @@ with pkgs; obliv-c = callPackage ../development/compilers/obliv-c {}; ocaml-ng = callPackage ./ocaml-packages.nix { }; + ocaml = ocamlPackages.ocaml; ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; @@ -6993,7 +7000,7 @@ with pkgs; ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; opaline = callPackage ../development/tools/ocaml/opaline { }; @@ -7117,7 +7124,7 @@ with pkgs; }; teyjus = callPackage ../development/compilers/teyjus { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; omake = omake_rc1; }; @@ -7839,6 +7846,7 @@ with pkgs; bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + yacc = bison; # TODO: move to aliases.nix blackmagic = callPackage ../development/tools/misc/blackmagic { stdenv = overrideCC stdenv gcc6; @@ -9223,6 +9231,7 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; gamin = callPackage ../development/libraries/gamin { }; + fam = gamin; # added 2018-04-25 ganv = callPackage ../development/libraries/ganv { }; @@ -9418,6 +9427,7 @@ with pkgs; goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; google-gflags = callPackage ../development/libraries/google-gflags { }; + gflags = google-gflags; # TODO: move to aliases.nix gperftools = callPackage ../development/libraries/gperftools { }; @@ -9833,6 +9843,7 @@ with pkgs; fetchurl = fetchurlBoot; type = "lib"; }; + kerberos = libkrb5; # TODO: move to aliases.nix languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); @@ -10902,6 +10913,7 @@ with pkgs; mbedtls = callPackage ../development/libraries/mbedtls { }; mbedtls_1_3 = callPackage ../development/libraries/mbedtls/1.3.nix { }; + polarssl = mbedtls; # TODO: add to aliases.nix mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds_0_12_1 = callPackage ../development/libraries/mdds/0.12.1.nix { }; @@ -11132,6 +11144,7 @@ with pkgs; openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; + openal = openalSoft; openbabel = callPackage ../development/libraries/openbabel { }; @@ -11654,8 +11667,10 @@ with pkgs; librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { }; librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; + redland = librdf_redland; # added 2018-04-25 librdf = callPackage ../development/libraries/librdf { }; + liblrdf = librdf; # added 2018-04-25 libsmf = callPackage ../development/libraries/audio/libsmf { }; @@ -12968,6 +12983,7 @@ with pkgs; inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; + mysql = mariadb; # TODO: move to aliases.nix mongodb = callPackage ../servers/nosql/mongodb { sasl = cyrus_sasl; @@ -13471,7 +13487,7 @@ with pkgs; directvnc = callPackage ../os-specific/linux/directvnc { }; dmraid = callPackage ../os-specific/linux/dmraid { - devicemapper = devicemapper.override {enable_dmeventd = true;}; + lvm2 = lvm2.override {enable_dmeventd = true;}; }; drbd = callPackage ../os-specific/linux/drbd { }; @@ -14284,8 +14300,9 @@ with pkgs; prayer = callPackage ../servers/prayer { }; - procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } - else unixtools.procps; + procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } + else unixtools.procps; + procps-ng = procps; # TODO: move to aliases.nix watch = callPackage ../os-specific/linux/procps/watch.nix { }; @@ -14383,6 +14400,7 @@ with pkgs; systemd = callPackage ../os-specific/linux/systemd { utillinux = utillinuxMinimal; # break the cyclic dependency }; + udev = systemd; # TODO: move to aliases.nix # standalone cryptsetup generator for systemd systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; @@ -15626,9 +15644,9 @@ with pkgs; }; # go 1.9 pin until https://github.com/moby/moby/pull/35739 - inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) - docker_18_03 - docker_18_05; + inherit (callPackage ../applications/virtualization/docker { + go = go_1_9; + }) docker_18_03 docker_18_05; docker = docker_18_03; docker-edge = docker_18_05; @@ -16426,7 +16444,7 @@ with pkgs; praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { - lua5_sockets = lua5_1_sockets; + lua5_sockets = lua51Packages.luasocket; lua5 = lua5_1; }; @@ -16935,6 +16953,7 @@ with pkgs; krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; + poppler_qt5 = libsForQt5.poppler; }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -17488,6 +17507,7 @@ with pkgs; synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; inherit (gnome3) defaultIconTheme; + mlt-qt5 = libsForQt5.mlt; }; typora = callPackage ../applications/editors/typora { }; @@ -17657,7 +17677,10 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; ocamlPackages = ocamlPackages_4_02; }; + orpie = callPackage ../applications/misc/orpie { + gsl = gsl_1; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; + }; osmo = callPackage ../applications/office/osmo { }; @@ -20567,8 +20590,10 @@ with pkgs; boogie = dotnetPackages.Boogie; - inherit (callPackage ./coq-packages.nix {}) - mkCoqPackages + inherit (callPackage ./coq-packages.nix { + inherit (ocaml-ng) ocamlPackages_3_12_1 + ocamlPackages_4_02; + }) mkCoqPackages coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq @@ -20592,7 +20617,7 @@ with pkgs; drat-trim = callPackage ../applications/science/logic/drat-trim {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; }; eprover = callPackage ../applications/science/logic/eprover { }; @@ -20625,7 +20650,7 @@ with pkgs; }; iprover = callPackage ../applications/science/logic/iprover { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; }; jonprl = callPackage ../applications/science/logic/jonprl { @@ -20640,7 +20665,7 @@ with pkgs; elan = callPackage ../applications/science/logic/elan {}; leo2 = callPackage ../applications/science/logic/leo2 { - ocaml = ocamlPackages_4_01_0.ocaml;}; + ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; logisim = callPackage ../applications/science/logic/logisim {}; @@ -20669,7 +20694,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = (with ocamlPackages_4_01_0; + prooftree = (with ocaml-ng.ocamlPackages_4_01_0; callPackage ../applications/science/logic/prooftree { camlp5 = camlp5_transitional; }); @@ -20681,7 +20706,7 @@ with pkgs; sapic = callPackage ../applications/science/logic/sapic { }; satallax = callPackage ../applications/science/logic/satallax { - ocaml = ocamlPackages_4_01_0.ocaml; + ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; saw-tools = callPackage ../applications/science/logic/saw-tools {}; @@ -21210,6 +21235,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation; }; libjack2 = jack2.override { prefix = "lib"; }; + jack2Full = jack2; # TODO: move to aliases.nix keynav = callPackage ../tools/X11/keynav { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b98b5b508cf0..420a257c6071 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12428,7 +12428,7 @@ let self = _self // overrides; _self = with self; { url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz"; sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507"; }; - nativeBuildInputs = [ pkgs.docbook_xml_xslt pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; + nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ]; buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ]; LC_ALL="en_US.UTF-8";