diff options
116 files changed, 757 insertions, 707 deletions
diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index fa97e8bf746b..f3fc4c3cc79e 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -61,8 +61,8 @@ in { description = "PCSC-Lite daemon"; environment.PCSCLITE_HP_DROPDIR = pluginEnv; serviceConfig = { - ExecStart = "${pkgs.pcsclite}/sbin/pcscd -f -x -c ${cfgFile}"; - ExecReload = "${pkgs.pcsclite}/sbin/pcscd -H"; + ExecStart = "${getBin pkgs.pcsclite}/sbin/pcscd -f -x -c ${cfgFile}"; + ExecReload = "${getBin pkgs.pcsclite}/sbin/pcscd -H"; }; }; }; diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix index a273bf33d100..4068d4fb9300 100644 --- a/pkgs/applications/altcoins/parity-ui/env.nix +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -1,6 +1,6 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: let packages = [ @@ -9,7 +9,7 @@ let xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret gnome3.gconf + xorg.libxcb libsecret gnome2.GConf ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 571f0a925adb..1ada45e62925 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -6,7 +6,6 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; version = "3.10.3"; - format = "other"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index c5f8278f649d..dfd6543c5985 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify +, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss - fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr xorg.libXcursor diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 082bc2a2536c..93ee70e4148b 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango +{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo, pango , gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rpath = stdenv.lib.makeLibraryPath [ alsaLib - gnome3.gconf + gnome2.GConf gdk_pixbuf pango gnome3.defaultIconTheme diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index d4f2a056a9f6..6adc805b7284 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, +{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring + gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 65b85868bc59..4903997611bc 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo +{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk2 gnome2.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 ]; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 47be9dc8200e..2c0d642863ed 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena -, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook +, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --add-flags "$out/lib/pdfmod/PdfMod.exe" \ --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} ''; dontStrip = true; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 513c5facc6b2..436d3ee4233e 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: +, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf + xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf xorg.libxcb ]; diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index d2a2936680f9..f76f7035662b 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs @@ -8,7 +8,7 @@ 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 gnome2.GConf nss nspr alsaLib cups expat libudev libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 300281761a4d..06fa8d2bd0dd 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -18,7 +18,7 @@ python27Packages.buildPythonApplication rec { # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary # support that the yubicommon library uses to load libykpers - makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; + makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; postInstall = '' mkdir -p $out/share/applications diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 37ea44bb28d6..efbfee487c6d 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -11,7 +11,7 @@ , freetype , gdk_pixbuf , glib -, gnome3 +, gnome2 , gtk3 , libX11 , libxcb @@ -55,7 +55,7 @@ let freetype.out gdk_pixbuf.out glib.out - gnome3.gconf + gnome2.GConf gtk3.out libX11.out libXScrnSaver.out diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8eae85099fb7..14a8bfd048b4 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 -, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2 , nss, nspr , patchelf, makeWrapper , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr - gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf + gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ae0951ba99a1..09ead9b3de65 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf -, glib, gnome3, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage +, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath [ libcxx systemd libpulseaudio stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype - gdk_pixbuf glib gnome3.gconf gtk2 libnotify libX11 libXcomposite + gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index db3cafb355f6..b253e41ae7d8 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook , xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 -, gnome3, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { libXrender libX11 libXtst libXScrnSaver ]) ++ [ gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - gnome3.gconf nss nspr alsaLib cups expat stdenv.cc.cc + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc ]; runtimeDependencies = [ udev.lib libnotify ]; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 60e883e8b9d1..a9ce8a96f970 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gnome3, gtk2, pango, atk, cairo, gdk_pixbuf, glib, +{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: @@ -14,7 +14,7 @@ let freetype gdk_pixbuf glib - gnome3.gconf + gnome2.GConf gtk2 pango libX11 diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 39043b43936c..80eba81fb47f 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, wrapGAppsHook -, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig +, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, udev @@ -17,7 +17,7 @@ let freetype gdk_pixbuf glib - gnome3.gconf + gnome2.GConf gtk3 pango libX11 diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9ac3d870312d..5899ca92eb0c 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3 +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3 , gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }: let @@ -22,7 +22,7 @@ let glibc libsecret - gnome3.gconf + gnome2.GConf gdk_pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 32648ee34c90..7fedde2ad3ec 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango +, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango , systemd, wget, xorg }: let @@ -18,7 +18,7 @@ let fontconfig freetype glib - gnome3.gconf + gnome2.GConf gdk_pixbuf gtk3 pango diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4e26d7683e69..0745836271ae 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib +{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib , freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage , libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver , nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell @@ -15,7 +15,7 @@ let freetype gdk_pixbuf glib - gnome3.gconf + gnome2.GConf gtk2 pango hunspell @@ -93,7 +93,7 @@ in mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; - + meta = { description = "A modern, secure messenger"; homepage = https://wire.com/; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 872d9b018ff7..ad4a8849fac3 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" '' + lib.optionalString (pcsclite != null) '' substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ - --replace "libpcsclite.so" "${pcsclite}/lib/libpcsclite.so" + --replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" ''; buildInputs = with lib; [ diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 7c613a8a45a9..80210d898b39 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango +, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango , systemd, wget, xorg, xprintidle-ng }: let @@ -18,7 +18,7 @@ let fontconfig freetype glib - gnome3.gconf + gnome2.GConf gdk_pixbuf gtk3 pango diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 4530305ee12e..31de4db76f1a 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -62,14 +62,14 @@ stdenv.mkDerivation rec { if [ ! -d "\$MDIR/pcsc" ]; then ${coreutils}/bin/mkdir -p \$MDIR/pcsc fi - if [ ! -e "\$MDIR/pcsc/libpcsclite.so.1" ] || [ ! \`${coreutils}/bin/readlink -f "\$MDIR/pcsc/libpcsclite.so.1"\` -ef "${pcsclite}/lib/libpcsclite.so.1" ]; then - ${coreutils}/bin/ln -sf "${pcsclite}/lib/libpcsclite.so.1" "\$MDIR/pcsc/libpcsclite.so.1" + if [ ! -e "\$MDIR/pcsc/libpcsclite.so.1" ] || [ ! \`${coreutils}/bin/readlink -f "\$MDIR/pcsc/libpcsclite.so.1"\` -ef "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1" ]; then + ${coreutils}/bin/ln -sf "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1" "\$MDIR/pcsc/libpcsclite.so.1" fi if [ -e "\$MDIR/rup/rupremote.lst" ]; then for i in \`${coreutils}/bin/cat "\$MDIR/rup/rupremote.lst"\`; do - ${coreutils}/bin/mv "\$MDIR/rup/"\`${coreutils}/bin/basename \$i\` "\$MDIR/\$i" + ${coreutils}/bin/mv "\$MDIR/rup/"\`${coreutils}/bin/basename \$i\` "\$MDIR/\$i" done rm -r "\$MDIR/rup/rupremote.lst" fi diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 4e9b7d2428de..522a6fcd6a12 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.17.1"; + version = "2.18.0"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr"; + sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; @@ -40,7 +40,6 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch - ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch ./git-send-email-honor-PATH.patch @@ -277,10 +276,21 @@ EOF # XXX: I failed to understand why this one fails. # Could someone try to re-enable it on the next release ? + # Tested to fail: 2.18.0 disable_test t1700-split-index "null sha1" + + # Tested to fail: 2.18.0 + disable_test t7005-editor "editor with a space" + disable_test t7005-editor "core.editor with a space" + + # Tested to fail: 2.18.0 + disable_test t9902-completion "sourcing the completion script clears cached --options" '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit + # Fails largely due to assumptions about BOM + # Tested to fail: 2.18.0 + disable_test t0028-working-tree-encoding ''; diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch deleted file mode 100644 index 0a581a61d46d..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -2609,8 +2609,7 @@ - { test "$$bindir/" = "$$execdir/" || \ - for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ - $(RM) "$$execdir/$$p" && \ -- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ -- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ -+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ - cp "$$bindir/$$p" "$$execdir/$$p" || exit; \ - done; \ - } && \ diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3cf4ecc280fe..34dfe67df4bd 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -185,7 +185,7 @@ init_submodules(){ # checkout each submodule hash=$(echo "$l" | awk '{print $1}' | tr -d '-') - dir=$(echo "$l" | sed -n 's/^ \{0,1\}[^ ]* \(.*\) ([^ ]*)$/\1/p') + dir=$(echo "$l" | sed -n 's/^.[0-9a-f]\+ \(.*[^)]*\)\( (.*)\)\?$/\1/p') name=$( git config -f .gitmodules --get-regexp submodule\..*\.path | sed -n "s,^\(.*\)\.path $dir\$,\\1,p") diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 64b0fd0c38a4..f1df81f2db41 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool , libxml2, glib}: -let version = "1.9"; in +let version = "1.10"; in stdenv.mkDerivation rec { name = "shared-mime-info-${version}"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw"; + sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 778a1cc920f1..afba6e15ebdd 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,29 +1,33 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: +, polkit, intltool }: -assert withGtk -> (gtk2 != null); - -stdenv.mkDerivation { - name = "gconf-2.32.4"; +stdenv.mkDerivation rec { + name = "gconf-${version}"; + version = "3.2.6"; src = fetchurl { - url = mirror://gnome/sources/GConf/2.32/GConf-2.32.4.tar.xz; - sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; + url = "mirror://gnome/sources/GConf/${stdenv.lib.versions.majorMinor version}/GConf-${version}.tar.xz"; + sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ] + buildInputs = [ ORBit2 libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) polkit - ++ stdenv.lib.optional withGtk gtk2; + ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; - propagatedBuildInputs = [ glib ]; + propagatedBuildInputs = [ glib dbus-glib ]; nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = stdenv.lib.optional withGtk "--with-gtk=2.0" + configureFlags = # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin - ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ]; + stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ]; + + meta = with stdenv.lib; { + homepage = https://projects.gnome.org/gconf/; + description = "Deprecated system for storing application preferences"; + platforms = platforms.linux; + }; } diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix deleted file mode 100644 index 3e7ba45b03ae..000000000000 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, python, withGtk ? false }: - -assert withGtk -> (gnome3 != null); - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "6"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; - }; - - buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus-glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - outputs = [ "out" "dev" ]; - - meta = with stdenv.lib; { - homepage = https://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 6605d15a697e..9d62bead40d4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,10 +45,8 @@ lib.makeScope pkgs.newScope (self: with self; { easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; - inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; gtk = gtk3; gtkmm = gtkmm3; @@ -80,8 +78,6 @@ lib.makeScope pkgs.newScope (self: with self; { evolution-data-server = callPackage ./core/evolution-data-server { }; - gconf = callPackage ./core/gconf { }; - geocode-glib = callPackage ./core/geocode-glib { }; gcr = callPackage ./core/gcr { }; # ToDo: tests fail diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index 4cd5cce272da..e626d293f83a 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, - boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview, + boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas, gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -11,23 +11,34 @@ stdenv.mkDerivation rec { sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "nemiver"; attrPath = "gnome3.nemiver"; }; - }; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ libxml2 intltool itstool pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop - glibmm gtkmm vte gtksourceview gtksourceviewmm ]; + buildInputs = [ + gtk3 gdb boost sqlite libgtop + glibmm gtkmm vte gtksourceview gtksourceviewmm + gsettings-desktop-schemas + ]; patches = [ - ./bool_slot.patch ./safe_ptr.patch + ./bool_slot.patch + ./safe_ptr.patch (fetchpatch { url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch; sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; }) ]; + configureFlags = [ + "--enable-gsettings" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "nemiver"; + attrPath = "gnome3.nemiver"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Nemiver; description = "Easy to use standalone C/C++ debugger"; @@ -36,4 +47,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 77220124fcc1..a54c336326ab 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils +, wrapGAppsHook, librsvg, libxml2, desktop-file-utils , guile_2_0, libcanberra-gtk3 }: stdenv.mkDerivation rec { @@ -11,15 +11,20 @@ stdenv.mkDerivation rec { sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "aisleriot"; attrPath = "gnome3.aisleriot"; }; - }; + configureFlags = [ + "--with-card-theme-formats=svg" + "--with-platform=gtk-only" # until they remove GConf + ]; - configureFlags = [ "--with-card-theme-formats=svg" ]; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ]; + buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "aisleriot"; + attrPath = "gnome3.aisleriot"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Aisleriot; diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index c81238d24986..91aeb7ca00a8 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -23,6 +23,11 @@ in stdenv.mkDerivation rec { url = https://src.fedoraproject.org/rpms/california/raw/c00bf9924d8fa8cb0a9ec06564d1a1b00c9055af/f/0002-Build-with-evolution-data-server-3.13.90.patch; sha256 = "0g9923n329p32gzr1q52ad30f8vyz8vrri4rih0w8klmf02ga4pm"; }) + # Apply Fedora patch to build with libical > 3.0 + (fetchurl { + url = https://src.fedoraproject.org/rpms/california/raw/2af9a6a1b67b53f3fca1472c5350dc11a1acf28f/f/california-0.4.0-libical-3.0.patch; + sha256 = "0cxycfaql0bsiz9hzanns33pwdqpb5n44znfcfa66i1bin34r4n6"; + }) ]; passthru = { diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index 812630e17d06..9b347715c45e 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib +{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib , libnotify, popt, xfce }: @@ -13,8 +13,17 @@ stdenv.mkDerivation rec { sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; }; + patches = [ + # Fix build with libical 3.0 + (fetchpatch { + name = "fix-libical3.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f; + sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool bison flex ]; - + buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4-panel ]; diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix index 6a2f37cbef67..3857846ea82d 100644 --- a/pkgs/desktops/xfce4-13/orage/default.nix +++ b/pkgs/desktops/xfce4-13/orage/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null +{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null , popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; @@ -15,4 +15,13 @@ mkXfceDerivation rec { sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; buildInputs = [ dbus_glib gtk2 libical libnotify popt ] ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; + + patches = [ + # Fix build with libical 3.0 + (fetchpatch { + name = "fix-libical3.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f; + sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; + }) + ]; } diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 0fe9c8d3765f..7aedf191abee 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, +{stdenv, fetchFromGitHub, fetchpatch, bash, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: @@ -32,6 +32,13 @@ stdenv.mkDerivation rec { llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; + patches = [ + (fetchpatch { + url = https://github.com/ispc/ispc/commit/d504641f5af9d5992e7c8f0ed42c1063a39ede5b.patch; + sha256 = "192q3gyvam79469bmlwf0jpfi2y4f8hl2vgcvjngsqhvscwira0s"; + }) + ]; + postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix deleted file mode 100644 index 5caef5b3b66f..000000000000 --- a/pkgs/development/compilers/lessc/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchgit, nodejs }: - -stdenv.mkDerivation rec { - name = "lessc-${version}"; - version = "1.7.5"; # Upgrade to > 2.x breaks twitter-bootstrap - - src = fetchgit { - url = https://github.com/less/less.js.git; - rev = "refs/tags/v${version}"; - sha256 = "1af1xbh1pjpfsx0jp69syji6w9750nigk652yk46jrja3z1scb4s"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/bin $out/lib - cp -r $src/bin/* $out/bin/ - cp -r $src/lib/* $out/lib/ - substituteInPlace $out/bin/lessc --replace "/usr/bin/env node" ${nodejs}/bin/node - ''; - - meta = with stdenv.lib; { - description = "LESS to CSS compiler"; - homepage = http://lesscss.org/; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 8809859b5905..31750e2d0da8 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -80,6 +80,10 @@ in stdenv.mkDerivation (rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -95,11 +99,6 @@ in stdenv.mkDerivation (rec { ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index d7842bdea992..882144184064 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -9,7 +9,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0"} + unpackFile ${fetch "cfe" "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 88bccca36476..be18a315f12a 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "compiler-rt-${version}"; inherit version; - src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"; + src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 40d602e222ed..66f0facc952c 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -6,7 +6,7 @@ }: let - release_version = "6.0.0"; + release_version = "6.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,7 +14,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1ll9v6r29xfdiywbn9iss49ad39ah3fk91wiv0sr6k6k9i544fq5"; + clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd"; # Add man output without introducing extra dependencies. overrideManOutput = drv: diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 27d8cd18b666..c1f0b9f61294 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1n8d0iadkk9fdpplvxkdgrgh2szc6msrx1mpdjpmilz9pn3im4vh"; + src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index 05fab16c25cd..425b00c689ef 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "06v4dnqh6q0r3p5h2jznlgb69lg79126lzb2s0lcw1k38b2xkili"; + src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 4997f0a7c94e..818ad47a335a 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "02qfkjkjq0snmf8dw9c255xkh8dg06ndny1x470300pk7j1lm33b"; + src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index eb565a93ef60..9571e7ab5a63 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0m6l2ks4banfmdh7xy7l77ri85kmzavgfy81gkc4gl6wg8flrxa6"; + src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 9cae65ef1030..6fc448574f43 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -19,7 +19,7 @@ }: let - src = fetch "llvm" "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"; + src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -76,6 +76,12 @@ in stdenv.mkDerivation (rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + + "-DLLVM_ENABLE_DUMP=ON" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -92,11 +98,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" - ] ++ stdenv.lib.optional enableWasm + ++ stdenv.lib.optional enableWasm "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" ; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 091e378af2a1..16093758e826 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "1z1qghx6drdvnlp406q1cp3mgikxxmwymcwzaxbv18vxbw6ha3kw"; + src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch index 39a9bbbd207a..6266eb1958d1 100644 --- a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch +++ b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch @@ -1,6 +1,6 @@ -From 8c74f8274369f527f2ada3772f4a0b406cb481ec Mon Sep 17 00:00:00 2001 -From: "Jory A. Pratt" <anarchy@gentoo.org> -Date: Sat, 9 Sep 2017 08:31:15 -0500 +From 7b4b3333a2718628b1d510ec1d8438ad67308299 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Fri, 29 Jun 2018 09:48:59 -0500 Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project. ------ @@ -11,18 +11,20 @@ Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> Taken from gentoo-musl project, with a few additional minor fixes. --- - lib/asan/asan_linux.cc | 4 +-- - lib/interception/interception_linux.cc | 2 +- - lib/interception/interception_linux.h | 3 +- - lib/msan/msan_linux.cc | 2 +- - .../sanitizer_common_interceptors_ioctl.inc | 4 +-- - lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- - lib/sanitizer_common/sanitizer_linux_libcdep.cc | 10 +++--- - lib/sanitizer_common/sanitizer_platform.h | 6 ++++ - .../sanitizer_platform_interceptors.h | 4 +-- - .../sanitizer_platform_limits_posix.cc | 40 +++++++++++++--------- - lib/tsan/rtl/tsan_platform_linux.cc | 2 +- - 11 files changed, 46 insertions(+), 33 deletions(-) + lib/asan/asan_linux.cc | 4 +- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 3 +- + lib/msan/msan_linux.cc | 2 +- + lib/sanitizer_common/sanitizer_allocator.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +- + .../sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux.cc | 8 +++- + .../sanitizer_linux_libcdep.cc | 10 ++--- + lib/sanitizer_common/sanitizer_platform.h | 6 +++ + .../sanitizer_platform_interceptors.h | 4 +- + .../sanitizer_platform_limits_posix.cc | 37 +++++++++++-------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 13 files changed, 51 insertions(+), 35 deletions(-) diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc index 625f32d40..73cf77aca 100644 @@ -86,6 +88,19 @@ index 4e6321fcb..4d50feb82 100644 #include "msan.h" #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc +index fc4f7a75a..76cf4f769 100644 +--- a/lib/sanitizer_common/sanitizer_allocator.cc ++++ b/lib/sanitizer_common/sanitizer_allocator.cc +@@ -23,7 +23,7 @@ namespace __sanitizer { + + // ThreadSanitizer for Go uses libc malloc/free. + #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC) +-# if SANITIZER_LINUX && !SANITIZER_ANDROID ++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + extern "C" void *__libc_malloc(uptr size); + # if !SANITIZER_GO + extern "C" void *__libc_memalign(uptr alignment, uptr size); diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc index 24e7548a5..20259b1d6 100644 --- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc @@ -121,6 +136,37 @@ index 469c8eb7e..24f87867d 100644 PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, void *old_rlim) { if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc +index 6c83e8db4..542c4fe64 100644 +--- a/lib/sanitizer_common/sanitizer_linux.cc ++++ b/lib/sanitizer_common/sanitizer_linux.cc +@@ -522,13 +522,13 @@ const char *GetEnv(const char *name) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD ++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_NONGNU + extern "C" { + SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end; + } + #endif + +-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD ++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD + static void ReadNullSepFileToArray(const char *path, char ***arr, + int arr_size) { + char *buff; +@@ -569,6 +569,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) { + #elif SANITIZER_NETBSD + *argv = __ps_strings->ps_argvstr; + *argv = __ps_strings->ps_envstr; ++#elif SANITIZER_NONGNU ++ static const int kMaxArgv = 2000, kMaxEnvp = 2000; ++ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv); ++ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp); + #else + #if !SANITIZER_GO + if (&__libc_stack_end) { diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc index 56fdfc870..a932d5db1 100644 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -210,7 +256,7 @@ index b99ac4480..628d226a1 100644 #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index f12e8206a..8880197b0 100644 +index feb7bad6f..4e89ab2a6 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -14,6 +14,9 @@ @@ -243,26 +289,16 @@ index f12e8206a..8880197b0 100644 #if HAVE_RPC_XDR_H # include <rpc/xdr.h> #elif HAVE_TIRPC_RPC_XDR_H -@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <sys/ustat.h> -+// #include <sys/ustat.h> -+#include <sys/statfs.h> - #include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> -@@ -252,7 +258,7 @@ namespace __sanitizer { +@@ -251,7 +256,7 @@ namespace __sanitizer { unsigned struct_itimerspec_sz = sizeof(struct itimerspec); #endif // SANITIZER_LINUX || SANITIZER_FREEBSD -#if SANITIZER_LINUX && !SANITIZER_ANDROID +#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - unsigned struct_ustat_sz = sizeof(struct ustat); - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); -@@ -311,7 +317,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which + // has been removed from glibc 2.28. + #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ +@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); #endif @@ -271,7 +307,7 @@ index f12e8206a..8880197b0 100644 int glob_nomatch = GLOB_NOMATCH; int glob_altdirfunc = GLOB_ALTDIRFUNC; #endif -@@ -405,7 +411,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned struct_termios_sz = sizeof(struct termios); unsigned struct_winsize_sz = sizeof(struct winsize); @@ -280,7 +316,7 @@ index f12e8206a..8880197b0 100644 unsigned struct_arpreq_sz = sizeof(struct arpreq); unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); -@@ -455,7 +461,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned struct_vt_mode_sz = sizeof(struct vt_mode); #endif // SANITIZER_LINUX || SANITIZER_FREEBSD @@ -289,7 +325,7 @@ index f12e8206a..8880197b0 100644 unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); #if EV_VERSION > (0x010000) -@@ -823,7 +829,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; #endif // SANITIZER_LINUX || SANITIZER_FREEBSD @@ -298,7 +334,7 @@ index f12e8206a..8880197b0 100644 unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; unsigned IOCTL_CYGETMON = CYGETMON; -@@ -978,7 +984,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); +@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); #endif // SANITIZER_LINUX || SANITIZER_FREEBSD @@ -307,7 +343,7 @@ index f12e8206a..8880197b0 100644 CHECK_TYPE_SIZE(glob_t); CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); -@@ -1012,6 +1018,7 @@ CHECK_TYPE_SIZE(iovec); +@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec); CHECK_SIZE_AND_OFFSET(iovec, iov_base); CHECK_SIZE_AND_OFFSET(iovec, iov_len); @@ -315,7 +351,7 @@ index f12e8206a..8880197b0 100644 CHECK_TYPE_SIZE(msghdr); CHECK_SIZE_AND_OFFSET(msghdr, msg_name); CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); -@@ -1025,6 +1032,7 @@ CHECK_TYPE_SIZE(cmsghdr); +@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr); CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); @@ -323,7 +359,7 @@ index f12e8206a..8880197b0 100644 COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); CHECK_SIZE_AND_OFFSET(dirent, d_ino); -@@ -1127,7 +1135,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); +@@ -1138,7 +1145,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); CHECK_TYPE_SIZE(ether_addr); @@ -332,7 +368,7 @@ index f12e8206a..8880197b0 100644 CHECK_TYPE_SIZE(ipc_perm); # if SANITIZER_FREEBSD CHECK_SIZE_AND_OFFSET(ipc_perm, key); -@@ -1188,7 +1196,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); +@@ -1199,7 +1206,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); #endif @@ -341,7 +377,7 @@ index f12e8206a..8880197b0 100644 COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); #endif -@@ -1238,7 +1246,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); +@@ -1249,7 +1256,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); #endif @@ -350,7 +386,7 @@ index f12e8206a..8880197b0 100644 COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); CHECK_SIZE_AND_OFFSET(FILE, _flags); CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); -@@ -1257,7 +1265,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); +@@ -1268,7 +1275,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); CHECK_SIZE_AND_OFFSET(FILE, _fileno); #endif @@ -373,5 +409,5 @@ index e14d5f575..389a3bc88 100644 struct __res_state *statp = (struct __res_state*)state; for (int i = 0; i < MAXNS && cnt < nfd; i++) { -- -2.16.2 +2.18.0 diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 08612ad28494..4deadefcc4bc 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -23,6 +23,8 @@ let libcLib = lib.getLib libc; crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; common = { version, sha256 }: stdenv.mkDerivation (rec { + inherit version; + name = "perl-${version}"; src = fetchurlBoot { @@ -179,8 +181,6 @@ let configurePlatforms = [ "build" "host" "target" ]; - inherit version; - # TODO merge setup hooks setupHook = ./setup-hook-cross.sh; }); @@ -191,13 +191,13 @@ in rec { }; perl524 = common { - version = "5.24.3"; - sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b"; + version = "5.24.4"; + sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz"; }; perl526 = common { - version = "5.26.1"; - sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7"; + version = "5.26.2"; + sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"; }; perl528 = common { diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index fc68aae1c045..9ea0876b1ce6 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "5"; + minorVersion = "6"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -53,7 +53,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l"; + sha256 = "0vz1wqg50zq6g15givdx1s2rq5752y5g2f1978bs6wvf8mfw36yp"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -85,9 +85,8 @@ in stdenv.mkDerivation { # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. (fetchpatch { - url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch"; - sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8"; - extraPrefix = ""; + url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; + sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; }) ]; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index 4c84727d3cbc..ad88895fa67d 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -39,6 +39,8 @@ let ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; + hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); + in stdenv.mkDerivation { name = "python3-${version}"; pythonVersion = majorVersion; @@ -63,12 +65,20 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch - # Fix darwin build https://bugs.python.org/issue34027 (fetchpatch { url = https://bugs.python.org/file47666/darwin-libutil.patch; sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa"; }) + ] ++ optionals hasDistutilsCxxPatch [ + # Fix for http://bugs.python.org/issue1222585 + # Upstream distutils is calling C compiler to compile C++ code, which + # only works for GCC and Apple Clang. This makes distutils to call C++ + # compiler when needed. + (fetchpatch { + url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; + sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; + }) ]; postPatch = '' @@ -153,7 +163,7 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support; + inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index ddff61dbed09..36d7912d0f8a 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.49"; + version = "0.6.50"; src = fetchurl { url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "032ndvs18gla49dvc9vg35cwczg0wpv2wscp1m3yjfdqdpams7i5"; + sha256 = "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 3fd0bb082440..a1980d62490a 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.14.1"; + name = "gdbm-1.15"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd"; + sha256 = "03nwsbixdp3nx3fzn3gjy0n7rcppmkkxb2nxbmd8mvb7gwhf7zgr"; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index fd9c8dc9a5e3..1efc16b2bf5c 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,29 +1,53 @@ -{ stdenv, fetchFromGitHub, perl, cmake }: +{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobjectIntrospection +, python3, tzdata, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glib, libxml2, icu }: stdenv.mkDerivation rec { name = "libical-${version}"; - version = "2.0.0"; + version = "3.0.3"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb"; + sha256 = "0dhlfn6n136di4fbqd74gdaibyh5zz1vac5x8ii3bjc2d5h7hw8h"; }; - nativeBuildInputs = [ perl cmake ]; + nativeBuildInputs = [ + perl pkgconfig cmake ninja vala gobjectIntrospection + (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests + gtk-doc docbook_xsl docbook_xml_dtd_43 # docs + ]; + buildInputs = [ glib libxml2 icu ]; + + cmakeFlags = [ + "-DGOBJECT_INTROSPECTION=True" + "-DICAL_GLIB_VAPI=True" + ]; patches = [ # TODO: upstream this patch + # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch ]; - doCheck = false; # fails all the tests (ctest) + # Using install check so we do not have to manually set + # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export TZDIR=${tzdata}/share/zoneinfo + ctest --output-on-failure + + runHook postInstallCheck + ''; meta = with stdenv.lib; { homepage = https://github.com/libical/libical; description = "An Open Source implementation of the iCalendar protocols"; - license = licenses.mpl10; + license = licenses.mpl20; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 715ba1fa8426..59d23e490e5a 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,9 +1,9 @@ --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c -@@ -96,9 +96,9 @@ typedef struct - static char *zdir = NULL; +@@ -94,9 +94,9 @@ + static const char *zdir = NULL; - static char *search_paths[] = { + static const char *search_paths[] = { + "/etc/zoneinfo", "/usr/share/zoneinfo", "/usr/lib/zoneinfo", @@ -11,13 +11,13 @@ "/usr/share/lib/zoneinfo" }; -@@ -179,6 +179,15 @@ static void set_zonedir(void) +@@ -178,6 +178,15 @@ const char *fname = ZONES_TAB_SYSTEM_FILENAME; size_t i, num_search_paths; + const char *env_tzdir = getenv ("TZDIR"); + if (env_tzdir) { -+ snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname); ++ sprintf (file_path, "%s/%s", env_tzdir, fname); + if (!access (file_path, F_OK|R_OK)) { + zdir = env_tzdir; + return; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 0e900ca9db64..24dd4f2465c6 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { sed -i -e '/preload/d' Makefile.in ''; - configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" - ++ lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4dc601745a42..c902a8b216a8 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,17 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig -, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - version = "1.20.3"; + version = "1.21.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1a8a679wni560z7x6w5i431vh2g0f34cznflcn52klx1vwcggrg7"; + sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b"; }; + patches = [ + (fetchpatch { + url = "https://github.com/libuv/libuv/pull/1909.patch"; + sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj"; + }) + ]; + postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent @@ -19,15 +25,28 @@ stdenv.mkDerivation rec { "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines ] - # sometimes: timeout (no output), failed uv_listen - ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ]; + # Sometimes: timeout (no output), failed uv_listen. Someone + # should report these failures to libuv team. There tests should + # be much more robust. + ++ stdenv.lib.optionals stdenv.isDarwin [ + "process_title" "emfile" "poll_duplex" "poll_unidirectional" + "ipc_listen_before_write" "ipc_listen_after_write" "ipc_tcp_connection" + "tcp_alloc_cb_fail" "tcp_ping_pong" "tcp_ref3" "tcp_ref4" + "tcp_bind6_error_inval" "tcp_bind6_error_addrinuse" "tcp_read_stop" + "tcp_unexpected_read" "tcp_write_to_half_open_connection" + "tcp_oob" "tcp_close_accept" "tcp_create_early_accept" + "tcp_create_early" "tcp_close" "tcp_bind_error_inval" + "tcp_bind_error_addrinuse" "tcp_shutdown_after_write" + "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" + "multiple_listen" "delayed_accept" + "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" + ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' sed '/${tdRegexp}/d' -i test/test-list.h ''; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh @@ -35,10 +54,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # These should be turned back on, but see https://github.com/NixOS/nixpkgs/issues/23651 - # For now the tests are just breaking large swaths of the nixpkgs binary cache for Darwin, - # and I'd rather have everything else work at all than have stronger assurance here. - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f8152bea2cc1..563b37cac364 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "18.0.3"; + version = "18.1.2"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0c4yskqwmh5k0wavjrkfcldafvnpcx8gjcx584bscxks69krd789"; + sha256 = "1ydivzm4c2k53b65lvm11d62z140xlmd7viw63bl5cm5idjg02q7"; }; prePatch = "patchShebangs ."; @@ -154,7 +154,7 @@ let self = stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light python2 + valgrind-light python2 python2.pkgs.Mako ]; enableParallelBuilding = true; @@ -205,6 +205,11 @@ let self = stdenv.mkDerivation { for js in $drivers/share/glvnd/egl_vendor.d/*.json; do substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" done + + # Update search path used by pkg-config + for pc in $dev/lib/pkgconfig/*.pc; do + substituteInPlace "$pc" --replace $out $drivers + done '' + optionalString (vulkanDrivers != []) '' # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 973798b849bc..e8bfb51cf9ee 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - version = "8.41"; + version = "8.42"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76"; + sha256 = "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c"; }; outputs = [ "bin" "dev" "out" "doc" "man" ]; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 2e1ed060acac..73e7fd42cdba 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pcre2-${version}"; - version = "10.23"; + version = "10.31"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz"; + sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0"; }; configureFlags = [ @@ -14,34 +14,8 @@ stdenv.mkDerivation rec { "--enable-jit" ]; - patches = [ - (fetchpatch { - name = "CVE-2017-7186-part1.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date"; - sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr"; - stripLen = 2; - extraPrefix = ""; - }) - (fetchpatch { - name = "CVE-2017-7186-part2.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date"; - sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn"; - stripLen = 2; - extraPrefix = ""; - }) - (fetchpatch { - name = "CVE-2017-8786.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch"; - sha256 = "1c629nzrk4il2rfclwyc1a373q58m4q9ys9wr91zhl4skfk7x19b"; - stripLen = 2; - extraPrefix = ""; - }) - ]; - outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; - doCheck = false; # fails 1 of 3 tests - postFixup = '' moveToOutput bin/pcre2-config "$dev" ''; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index fc8f11f2f11e..e00a5ca9f8d9 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gfortran, perl, which, config, coreutils +{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config, coreutils # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -80,10 +80,11 @@ in stdenv.mkDerivation rec { name = "openblas-${version}"; version = "0.3.1"; - src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; - sha256 = "0czbs2afmcxxij1ivqrm04p0qcksg5fravjifhydvb7k6mpraphz"; - name = "openblas-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "xianyi"; + repo = "OpenBLAS"; + rev = "v${version}"; + sha256 = "1dkwp4gz1hzpmhzks9y9ipb4c5h0r6c7yff62x3s8x9z6f8knaqc"; }; inherit blas64; @@ -117,7 +118,20 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" ++ mapAttrsToList (var: val: var + "=" + val) config; - patches = []; # TODO: Remove on next mass-rebuild + patches = [ + # Backport of https://github.com/xianyi/OpenBLAS/pull/1667, which + # is causing problems and was already accepted upstream. + (fetchpatch { + url = "https://github.com/xianyi/OpenBLAS/commit/5f2a3c05cd0e3872be3c5686b9da6b627658eeb7.patch"; + sha256 = "1qvxhk92likrshw6z6hjqxvkblwzgsbzis2b2f71bsvx9174qfk1"; + }) + # Double "MAX_ALLOCATING_THREADS", fix with Go and Octave + # https://github.com/xianyi/OpenBLAS/pull/1663 (see also linked issue) + (fetchpatch { + url = "https://github.com/xianyi/OpenBLAS/commit/a49203b48c4a3d6f86413fc8c4b1fbfaa1946463.patch"; + sha256 = "0v6kjkbgbw7hli6xkism48wqpkypxmcqvxpx564snll049l2xzq2"; + }) + ]; doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 53faf07623e9..4dd01f664d19 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva"; }; - outputs = [ "out" "man" "dev" ]; + outputs = [ "out" "man" "dev" "py" ]; nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ]; @@ -28,6 +28,11 @@ in stdenv.mkDerivation rec { }) ]; + makeFlags = [ + "pyexecdir=$(py)/${python2.sitePackages}" + "pythondir=$(py)/${python2.sitePackages}" + ]; + meta = with stdenv.lib; { description = "A library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool"; homepage = https://pagure.io/volume_key/; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 33bce4d6216f..7b619ebb35e4 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "wayland-protocols-${version}"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n"; + sha256 = "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 50e70d87f9f5..204f7bfc0dfb 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, isPy33, isPy26, isPy27, isPyPy, python, pycares, asyncio, trollius }: +, isPy33, isPy27, isPyPy, python, pycares, asyncio, trollius }: buildPythonPackage rec { pname = "aiodns"; @@ -10,9 +10,9 @@ buildPythonPackage rec { sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea"; }; - propagatedBuildInputs = with stdenv.lib; [ pycares ] - ++ optional isPy33 asyncio - ++ optional (isPy26 || isPy27 || isPyPy) trollius; + propagatedBuildInputs = with stdenv.lib; [ pycares ] + ++ optional isPy33 asyncio + ++ optional (isPy27 || isPyPy) trollius; checkPhase = '' ${python.interpreter} tests.py diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index ba84d80dd0be..535fe05b4388 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -1,9 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy26 -, importlib -, argparse }: buildPythonPackage rec { @@ -15,7 +12,6 @@ buildPythonPackage rec { sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; }; - propagatedBuildInputs = lib.optionals isPy26 [ importlib argparse ]; doCheck = false; meta = { diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index e53989bcbcfd..1846c7bcd896 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, lib -, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }: +, six, protobuf, enum34, futures, isPy27, isPy34 }: buildPythonPackage rec { pname = "grpcio"; @@ -11,8 +11,8 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six protobuf ] - ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ] - ++ lib.optionals (isPy26 || isPy27) [ futures ]; + ++ lib.optionals (isPy27 || isPy34) [ enum34 ] + ++ lib.optionals (isPy27) [ futures ]; meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 3b15e7a30279..2d1f707a8ebd 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy26 +{ stdenv, buildPythonPackage, fetchFromGitHub , glibcLocales, pandoc, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pelican"; version = "3.7.1"; - disabled = isPy26; src = fetchFromGitHub { owner = "getpelican"; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 3290fb74fa18..4784e46ffb21 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { }; postPatch = '' - sed -e 's!"libpcsclite\.so\.1"!"${pcsclite}/lib/libpcsclite.so.1"!' \ + sed -e 's!"libpcsclite\.so\.1"!"${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1"!' \ -i smartcard/scard/winscarddll.c ''; - NIX_CFLAGS_COMPILE = "-isystem ${pcsclite}/include/PCSC/"; + NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/"; propagatedBuildInputs = [ pcsclite ]; buildInputs = [ swig ] ++ stdenv.lib.optional stdenv.isDarwin PCSC; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index d8d22ced974e..b5a8cc252b97 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py +{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock }: @@ -19,8 +19,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] - ++ (stdenv.lib.optional (!isPy3k) funcsigs) - ++ (stdenv.lib.optional isPy26 argparse); + ++ (stdenv.lib.optional (!isPy3k) funcsigs); checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 7b61633a7fc7..6d43aa8da869 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -1,17 +1,14 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, isPy26, isPyPy, mock, futures }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, isPyPy, mock, futures }: buildPythonPackage rec { pname = "trollius"; version = "1.0.4"; - name = "${pname}-${version}"; - - disabled = isPy26; src = fetchPypi { inherit pname version; sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148"; }; - buildInputs = [ mock ]; + checkInputs = [ mock ]; propagatedBuildInputs = lib.optionals (isPy27 || isPyPy) [ futures ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 438aa81a9d0a..ed0928febe29 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , majorVersion ? "3.11" # darwin attributes @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { # Don't search in non-Nix locations such as /usr, but do search in our libc. patches = [ ./search-path-3.9.patch ] + ++ optional (versionOlder version "3.12") (fetchpatch { + name = "cmake-3.11-libuv-1.21.patch"; + url = https://gitlab.kitware.com/cmake/cmake/commit/889033b5c6847cf1f7bd789384405d59dc333bf6.patch; + sha256 = "0683zbyb3bicaxqzrj4wgdan6x08k30m20kkmpjvw30nr6a8r6xq"; + }) # Don't depend on frameworks. ++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch # TODO: remove conditional ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index f14f6adf5fef..c0af01929785 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -2,12 +2,12 @@ targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { - version = "0.46.1"; + version = "0.47.0"; pname = "meson"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc"; + sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6"; }; postFixup = '' diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 36a7fe23ef5b..b98225c1305f 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -17,6 +17,7 @@ mesonConfigurePhase() { --includedir=${!outputInclude}/include \ --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ --localedir=${!outputLib}/share/locale \ + -Dauto_features=disabled \ $mesonFlags" mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index 7078e2a37271..6511bdd20102 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile \ - --replace '-I/usr/local/include/PCSC/' '-I${pcsclite}/include/PCSC/' \ + --replace '-I/usr/local/include/PCSC/' '-I${stdenv.lib.getDev pcsclite}/include/PCSC/' \ --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' ''; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 9b4864e92fe5..0a3316005236 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5"; }; - patches = [ ./fix-test-autoconf-2.69.patch ]; + patches = [ ./fix-test-autoconf-2.69.patch ./fix-perl-5.26.patch ]; buildInputs = [perl autoconf makeWrapper]; diff --git a/pkgs/development/tools/misc/automake/fix-perl-5.26.patch b/pkgs/development/tools/misc/automake/fix-perl-5.26.patch new file mode 100644 index 000000000000..fb2d08de6d81 --- /dev/null +++ b/pkgs/development/tools/misc/automake/fix-perl-5.26.patch @@ -0,0 +1,10 @@ +--- automake-1.11.2/automake.in ++++ automake-1.11.2/automake.in +@@ -4156,7 +4156,7 @@ sub substitute_ac_subst_variables_worker($) + sub substitute_ac_subst_variables ($) + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index d760cec62a04..071ad9332914 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, m4, perl }: +{ stdenv, lib, fetchurl, m4, perl }: stdenv.mkDerivation rec { - name = "bison-2.7"; + name = "bison-2.7.1"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0cd8s2g7zjshya7kwjc9rh3drsssl4hiq4sccnkgf0nn9wvygfqr"; + sha256 = "0c9li3iaslzzr3zig6m3zlmb4r8i0wfvkcrvdyiqxasb09mjkqh8"; }; nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; propagatedBuildInputs = [ m4 ]; + patches = lib.optional stdenv.isDarwin ./darwin-vasnprintf.patch; + doCheck = true; # M4 = "${m4}/bin/m4"; diff --git a/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch b/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch new file mode 100644 index 000000000000..84b0e6d39d87 --- /dev/null +++ b/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch @@ -0,0 +1,12 @@ +diff -ur bison-2.7-pristine/lib/vasnprintf.c bison-2.7/lib/vasnprintf.c +--- bison-2.7-pristine/lib/vasnprintf.c 2012-11-30 20:48:23.000000000 +0900 ++++ bison-2.7/lib/vasnprintf.c 2018-06-28 16:55:31.000000000 +0900 +@@ -4870,7 +4870,7 @@ + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || (defined __APPLE__ && defined __MACH__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 8997dbda7284..979b64ae23b2 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.5.0"; - sha256 = "1g1kdcrhahdsrkazfl9wj25abgjvkncgwwcm2ppgj3avfi1wam3v"; + version = "10.6.0"; + sha256 = "13vyzh53j2c4mv3q3yb0hkdpl1mag5705k7kmb8nmcvdhcm78q0r"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 451d4b71296a..95674822aa36 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,5 +1,5 @@ { stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk -, nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: +, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out assert ((config.planetary_annihilation or null).url or null) != null; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index c0b86336163d..8aeabebbefea 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -9,7 +9,7 @@ , enableOpenGL ? false, libGLU_combined ? null # GUI toolkits -, enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null +, enableGTK ? true, gtk2 ? null, gnome2 ? null , enableSDL ? false , enableQt ? false, qt4 ? null @@ -27,7 +27,7 @@ with stdenv.lib; -let +let available = x: x != null; sound = @@ -52,7 +52,7 @@ assert enableCairo -> available cairo; assert enableOpenGL -> available libGLU_combined; # GUI toolkits -assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ]; +assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ]; assert enableSDL -> available SDL; assert enableQt -> available qt4; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ++ optional enableJemalloc jemalloc ++ optional enableHwAccel libGLU_combined ++ optionals enablePlugins [ xulrunner npapi_sdk ] - ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome3.gconf ] + ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ] ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; configureFlags = with stdenv.lib; [ diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index a62182f1d347..c23a2148143a 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -71,6 +71,8 @@ let # because we copy files from the system preferLocalBuild = true; + disallowedRequisites = [ sdk ]; + installPhase = '' linkFramework() { local path="$1" @@ -160,8 +162,8 @@ in rec { installPhase = '' mkdir -p $out/include pushd $out/include >/dev/null - ln -s "${lib.getDev sdk}/include/xpc" - ln -s "${lib.getDev sdk}/include/launch.h" + cp -r "${lib.getDev sdk}/include/xpc" $out/include/xpc + cp "${lib.getDev sdk}/include/launch.h" $out/include/launch.h popd >/dev/null ''; }; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index f8c424089f09..9e47b8d02fdf 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -86,7 +86,6 @@ with frameworks; with libs; { QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; QuickLook = [ ApplicationServices CF ]; QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; - Ruby = []; SceneKit = []; ScreenSaver = []; Scripting = []; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 369556fd5a1c..d325e38b272e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -10,8 +10,10 @@ appleDerivation { sed -i 's/darwin\*/ios\*/g' configure libcharset/configure ''; - configureFlags = lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + ]; postInstall = lib.optionalString (!enableStatic) '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 6730e2424be4..7986706cb647 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -26,8 +26,9 @@ name: version: sha256: args: let ''; preBuild = '' ln -s lib ${n} - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; + outputs = [ "out" "dev" ]; buildInputs = [ pkgs.gnustep.make pkgs.darwin.apple_sdk.frameworks.AppKit @@ -51,6 +52,7 @@ name: version: sha256: args: let "-iframework ${pkgs.darwin.Security}/Library/Frameworks" "-I." "-Wno-deprecated-declarations" + "-DNDEBUG" ]; NIX_LDFLAGS = with pkgs.darwin; with apple_sdk.frameworks; [ "-L${libobjc}/lib" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix index 48bb80eb7511..fb3441f70507 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix @@ -9,7 +9,7 @@ appleDerivation { unpackFile ${libsecurity_cdsa_client.src} mv libsecurity_cdsa_client*/lib security_cdsa_client ln -s lib securityd_client - + patch -p1 < ${./xdr-arity.patch} ''; preBuild = '' @@ -17,7 +17,7 @@ appleDerivation { cp derived_src/* lib rm lib/ucspClientC.c ''; - postInstall = '' - ln -s ''$out/include/securityd ''$out/include/securityd_client + postFixup = '' + ln -s $dev/include/securityd $dev/include/securityd_client ''; } diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index e6846aef7507..4566d82835f7 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0apcz4vy2z5645jhrs60wj3w27mncjjqv42h5lln36g6qs2n9113"; }; + disallowedRequisites = [ apple_sdk.sdk ]; + patchPhase = '' # copied from libsecurity_generic cp -R ${osx_private_sdk}/include/SecurityPrivateHeaders Security @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { ''; preBuild = '' - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; NIX_LDFLAGS = "-no_dtrace_dof"; @@ -97,4 +99,3 @@ stdenv.mkDerivation rec { license = licenses.apsl20; }; } - diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index b7928e38fc98..ad21a6a4dcd6 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.3"; + name = "audit-2.8.4"; src = fetchurl { url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl"; + sha256 = "0f4ci6ffznnmgblwgv7ich9mjfk3p6y5l6m6h3chhmzw156nj454"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 1a8f7f768626..06a2d4301596 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.28.4"; + name = "busybox-1.29.0"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0smfn8hlds6nx8war62kyaykg3n7mxbjjfcpsgz84znwk4v4mhg3"; + sha256 = "10hccqprhr1mwkqc9i3kny44mb6sdmv9hl63wx20cr5yy095c4f8"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 6ea73c9ac6c3..ac4bc83c51de 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex ]; buildInputs = [ libsepol ]; - preBuild = '' - makeFlagsArray+=("LIBDIR=${libsepol}/lib") - makeFlagsArray+=("PREFIX=$out") - ''; + makeFlags = [ + "PREFIX=$(out)" + "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + ]; meta = libsepol.meta // { description = "SELinux policy compiler"; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index a172e45e7faa..a464e7cbf715 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { version = "2.7"; inherit (libsepol) se_release se_url; + outputs = [ "bin" "out" "dev" "man" "py" ]; + src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh"; @@ -27,19 +29,19 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; - postPatch = optionalString enablePython '' - sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile - ''; - - # fix install locations - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("MAN3DIR=$out/share/man/man3") - makeFlagsArray+=("MAN5DIR=$out/share/man/man5") - makeFlagsArray+=("MAN8DIR=$out/share/man/man8") - makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages") - ''; + makeFlags = [ + "PREFIX=$(out)" + "INCDIR=$(dev)/include/selinux" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN5DIR=$(man)/share/man/man5" + "MAN8DIR=$(man)/share/man/man8" + "PYSITEDIR=$(py)/${python.sitePackages}" + "SBINDIR=$(bin)/sbin" + "SHLIBDIR=$(out)/lib" + + "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + ]; installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 40872f7c1ac8..f16c241a0a1f 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; + outputs = [ "bin" "out" "dev" "man" ]; + src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn"; @@ -13,18 +15,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("MAN8DIR=$out/share/man/man8") - makeFlagsArray+=("MAN3DIR=$out/share/man/man3") - ''; + makeFlags = [ + "PREFIX=$(out)" + "BINDIR=$(bin)/bin" + "INCDIR=$(dev)/include/sepol" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN8DIR=$(man)/share/man/man8" + "SHLIBDIR=$(out)/lib" + ]; NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; passthru = { inherit se_release se_url; }; meta = with stdenv.lib; { + description = "SELinux binary policy manipulation library"; homepage = http://userspace.selinuxproject.org; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index bd69145521c1..7f1e93c072da 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, ncurses, pkgconfig }: +{ lib, stdenv, fetchurl, ncurses, pkgconfig + +# procps is mostly Linux-only. Most commands require a running Linux +# system (or very similar like that found in Cygwin). The one +# exception is ‘watch’ which is portable enough to run on pretty much +# any UNIX-compatible system. +, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) }: stdenv.mkDerivation rec { name = "procps-${version}"; @@ -13,7 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; nativeBuildInputs = [ pkgconfig ]; - makeFlags = "usrbin_execdir=$(out)/bin"; + makeFlags = [ "usrbin_execdir=$(out)/bin" ] + ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="]; enableParallelBuilding = true; @@ -23,12 +30,17 @@ stdenv.mkDerivation rec { [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; + installPhase = if watchOnly then '' + install -m 0755 -D watch $out/bin/watch + install -m 0644 -D watch.1 $out/share/man/man1/watch.1 + '' else null; + meta = { homepage = https://gitlab.com/procps-ng/procps; description = "Utilities that give information about processes using the /proc filesystem"; priority = 10; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ lib.platforms.cygwin; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.typetetris ]; }; } diff --git a/pkgs/os-specific/linux/procps/watch.nix b/pkgs/os-specific/linux/procps/watch.nix deleted file mode 100644 index 4511b9cf843e..000000000000 --- a/pkgs/os-specific/linux/procps/watch.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation { - name = "watch-0.2.0"; - - src = fetchurl { - url = http://procps.sourceforge.net/procps-3.2.8.tar.gz; - sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i"; - }; - - buildInputs = [ ncurses ]; - - makeFlags = "watch usrbin_execdir=$(out)/bin" + - (if stdenv.isDarwin then " PKG_LDFLAGS=" else ""); - - enableParallelBuilding = true; - - installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin"; - - meta = { - homepage = https://sourceforge.net/projects/procps/; - description = "Utility for watch the output of a given command at intervals"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 8ac207d64214..527c94de46b3 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("PREFIX=$out") makeFlagsArray+=("DESTDIR=$out") makeFlagsArray+=("LOCALEDIR=$out/share/locale") - makeFlagsArray+=("LIBSEPOLA=${libsepol}/lib/libsepol.a") + makeFlagsArray+=("LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a") makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions") makeFlagsArray+=("PYTHON=${python3}/bin/python") makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages") diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 9cb5785ca98f..89375563ae67 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { setupPyBuildFlags = [ "-i" ]; preBuild = '' - export SEPOL="${libsepol}/lib/libsepol.a" + export SEPOL="${stdenv.lib.getLib libsepol}/lib/libsepol.a" ''; meta = { diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index c2c05a6b99ed..3dce750d255e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { cat -n .config substituteInPlace Makefile --replace /usr/local $out export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${libnl.dev}"/include/libnl*/) \ - -I${pcsclite}/include/PCSC/" + -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/) \ + -I${stdenv.lib.getDev pcsclite}/include/PCSC/" ''; buildInputs = [ openssl libnl dbus_libs readline pcsclite ]; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 87465df1482a..26d28609d877 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -220,7 +220,6 @@ isScript() { local fn="$1" local fd local magic - if ! [ -x /bin/sh ]; then return 0; fi exec {fd}< "$fn" read -r -n 2 -u "$fd" magic exec {fd}<&- diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 1a42ba03d464..a63721466dbc 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "0n5snycxgwqj2v8sgxiqxq4zqh5ydx70dr7qa4ygizs02ms69n1i"; + sha256 = "0ssj7mnhpdpk7qnwr49qfd4gxhkmvbli5mhs274pz55cx1xp7xja"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 08d5ff851407..0492164dfa36 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -10,6 +10,7 @@ let boost_static = boost165.override { python = python35; enableStatic = true; + enablePython = true; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 0a0cece4fce6..3395e0286343 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b"; sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q"; + }) + ++ stdenv.lib.optional (devicemapper == null) + (fetchpatch { + url = https://git.savannah.gnu.org/cgit/parted.git/patch/?id=7e87ca3c531228d35e13e802d2622006138b104c; + sha256 = "0i29lfg8cwj342q5s7qwqhncz2bkifj5rjc7cx6jd4zqb6ykkndj"; }); postPatch = stdenv.lib.optionalString doCheck '' diff --git a/pkgs/tools/misc/xxd/default.nix b/pkgs/tools/misc/xxd/default.nix deleted file mode 100644 index a4cfd4321ba0..000000000000 --- a/pkgs/tools/misc/xxd/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, vim }: - -stdenv.mkDerivation rec { - name = "xxd-${version}"; - inherit (vim) version; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - install -m755 ${stdenv.lib.getBin vim}/bin/xxd $out/bin/xxd - install -m644 ${stdenv.lib.getBin vim}/share/man/man1/xxd.1.gz $out/share/man/man1/xxd.1.gz - ''; - meta = with stdenv.lib; { - description = "Make a hexdump or do the reverse."; - inherit (vim.meta) homepage license maintainers platforms; - }; -} diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index ab293a869d05..2ebae0b0c17f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -63,6 +63,10 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback + # to nss-cacert from the default profile. + "--without-ca-bundle" + "--without-ca-path" "--with-ca-fallback" "--disable-manual" ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index 73aaea06c917..f7bb82e90dd9 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ automake autoconf intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 27fd4c4adc30..ad15723dd331 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ openconnect networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index fdef447193d8..9404cb1d0655 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { prePatch = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i '' + stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' '' + '' diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index f28d57fa62bd..b0381b32bcfe 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ./fix-libusb-include-path.patch ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index a0af51186edf..98f2e56e7497 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/${appName} \ --add-flags "-cp $out/share/java/cifs-${version}.jar" \ --add-flags "-jar $out/share/java/richclient-${version}.jar" \ - --suffix LD_LIBRARY_PATH ':' ${pcsclite}/lib + --suffix LD_LIBRARY_PATH ':' ${stdenv.lib.getLib pcsclite}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 819c01a0893f..7624e6cfa39e 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" - "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so" + "--with-pcsc-provider=${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" ]; installFlags = [ diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index bf5856aec357..f46e3f22ecd1 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; version = "1.8.23"; + outputs = [ "bin" "out" "dev" "doc" "man" ]; + src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; @@ -28,6 +30,11 @@ stdenv.mkDerivation rec { }' config.h ''; + postInstall = '' + # pcsc-spy is a debugging utility and it drags python into the closure + moveToOutput bin/pcsc-spy "$dev" + ''; + nativeBuildInputs = [ pkgconfig perl python2 ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 0ee17ffcc38b..9acf41c62ef8 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation rec { installTargets = "install install-lib"; + # Use standardized and equivalent realpath(path, NULL) instead of canonicalize_file_name(path). + # This is documented to be equivalent, see `man 3 canonicalize_file_name`. + # Fixes w/musl. + # Upstream PR: https://github.com/pciutils/pciutils/pull/6 + postPatch = '' + substituteInPlace lib/sysfs.c \ + --replace "canonicalize_file_name(path)" \ + "realpath(path, NULL)" + ''; + # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b653dfc7db69..1a5bf546a204 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -219,7 +219,7 @@ mapAliases ({ 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 + procps-ng = procps; # added 2018-06-08 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8c41b9975da..38f48a9e4591 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1769,7 +1769,8 @@ with pkgs; }; ibus = callPackage ../tools/inputmethods/ibus { - inherit (gnome3) dconf gconf glib; + gconf = gnome2.GConf; + inherit (gnome3) dconf glib; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -6796,7 +6797,7 @@ with pkgs; fpc = fpc; }; - lessc = callPackage ../development/compilers/lessc { }; + lessc = nodePackages.less; liquibase = callPackage ../development/tools/database/liquibase { }; @@ -9760,8 +9761,8 @@ with pkgs; isocodes = callPackage ../development/libraries/iso-codes { }; ispc = callPackage ../development/compilers/ispc { - llvmPackages = llvmPackages_4; - stdenv = llvmPackages_4.stdenv; + llvmPackages = llvmPackages_6; + stdenv = llvmPackages_6.stdenv; }; isso = callPackage ../servers/isso { }; @@ -10738,9 +10739,7 @@ with pkgs; then darwin.libunwind else callPackage ../development/libraries/libunwind { }; - libuv = callPackage ../development/libraries/libuv { - inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; + libuv = callPackage ../development/libraries/libuv { }; libv4l = lowPrio (v4l_utils.override { withUtils = false; @@ -12920,7 +12919,7 @@ with pkgs; }; pulseaudioFull = pulseaudio.override { - gconf = gnome3.gconf; + gconf = gnome2.GConf; x11Support = true; jackaudioSupport = true; airtunesSupport = true; @@ -14278,10 +14277,8 @@ with pkgs; prayer = callPackage ../servers/prayer { }; - procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } - else unixtools.procps; - - watch = callPackage ../os-specific/linux/procps/watch.nix { }; + procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } + else unixtools.procps; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); @@ -15351,7 +15348,7 @@ with pkgs; bonzomatic = callPackage ../applications/editors/bonzomatic { }; - brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; + brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; }; notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; @@ -18682,8 +18679,6 @@ with pkgs; flags = [ "python" "X11" ]; # only flag "X11" by now }); - xxd = callPackage ../tools/misc/xxd { }; - vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; lua = pkgs.lua5_1; # vimNox source is from 2012, requires older lua @@ -20215,7 +20210,8 @@ with pkgs; mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5 lib fetchurl; - inherit (gnome3) gconf gsettings-desktop-schemas; + inherit (gnome3) gsettings-desktop-schemas; + gconf = gnome2.GConf; }; in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); @@ -21020,7 +21016,7 @@ with pkgs; cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; crashplan = callPackage ../applications/backup/crashplan { }; - crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { inherit (gnome3) gconf; }; + crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; }; colort = callPackage ../applications/misc/colort { }; @@ -21940,7 +21936,7 @@ with pkgs; unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl getconf - getent locale killall; + getent locale killall xxd watch; fts = if hostPlatform.isMusl then netbsd.fts else null; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c489ff2fb20d..f86086173d04 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5,11 +5,13 @@ for each package in a separate file: the call to the function would be almost as much code as the function itself. */ -{pkgs, overrides}: +{config, pkgs, fetchurl, fetchFromGitHub, stdenv, fetchsvn, gnused, perl, overrides}: let self = _self // overrides; _self = with self; { - inherit (pkgs) buildPerlPackage fetchurl fetchFromGitHub stdenv perl fetchsvn gnused; + inherit perl; + + inherit (pkgs) buildPerlPackage; inherit (stdenv.lib) maintainers; @@ -25,10 +27,10 @@ let self = _self // overrides; _self = with self; { ack = buildPerlPackage rec { - name = "ack-2.22"; + name = "ack-2.24"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "0v0gdv1ja12ks4yp1nb93z1lh14s869dr4mfjb3nkgw6pkdl3i02"; + sha256 = "002gwl2h3h1j8b2xfsi279ga5l264w7rch9cxgg15rwgml4l14vj"; }; outputs = ["out" "man"]; # use gnused so that the preCheck command passes @@ -248,10 +250,10 @@ let self = _self // overrides; _self = with self; { }; AppCLI = buildPerlPackage { - name = "App-CLI-0.49"; + name = "App-CLI-0.50"; src = fetchurl { - url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.49.tar.gz; - sha256 = "0gv4dcscxiacdrb9aqxc9mdl1w8wszicmg2q86zlz31ya5spjvv3"; + url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz; + sha256 = "0ick5agl02rx2pjfxl97d0f9qksy8pjn0asmwm3gn6dm7a1zblsi"; }; propagatedBuildInputs = [ CaptureTiny ClassLoad ]; buildInputs = [ TestKwalitee TestPod ]; @@ -313,10 +315,10 @@ let self = _self // overrides; _self = with self; { }; Appperlbrew = buildPerlModule rec { - name = "App-perlbrew-0.83"; + name = "App-perlbrew-0.84"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0sdz0y90pk49cw4njfm1jq7zppha6kdx7i1d6nk41672nqrphdhb"; + sha256 = "0j21pcd82q9raz2hnh1qmsk7hsfzz9pzadvql6skdmhwshs9a5la"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ]; @@ -477,10 +479,10 @@ let self = _self // overrides; _self = with self; { }; ArchiveTar = buildPerlPackage rec { - name = "Archive-Tar-2.28"; + name = "Archive-Tar-2.30"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "2e9144f6c96f6d3d76cd14f4e871e8defc4542cdd39245a16fca29090648a70d"; + sha256 = "4a5a172cfefe08cb2d32f99ed388a3b55967588bbf254e950bc8a48a8bf1d2e5"; }; meta = { description = "Manipulates TAR archives"; @@ -489,10 +491,10 @@ let self = _self // overrides; _self = with self; { }; ArchiveTarWrapper = buildPerlPackage rec { - name = "Archive-Tar-Wrapper-0.27"; + name = "Archive-Tar-Wrapper-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.27.tar.gz; - sha256 = "0ll0p8yh54yb9y9ykaf60icj3frs0lndwz3k4k4ql9fywx40mcck"; + url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.31.tar.gz; + sha256 = "18rvqzy7m900ikq7r4hxpja21wcsh3z6rz7qhs4ksgc0dpdqb9qd"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { @@ -637,8 +639,6 @@ let self = _self // overrides; _self = with self; { buildInputs = [ IPCSystemSimple TestFatal ]; }; - Autobox = self.autobox; - Autodia = buildPerlPackage rec { name = "Autodia-2.14"; src = fetchurl { @@ -670,10 +670,6 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DBI ]; }; - autodie = null; # part of Perl - - AutoLoader = null; # part of Perl 5.22 - autovivification = buildPerlPackage rec { name = "autovivification-0.18"; src = fetchurl { @@ -696,10 +692,10 @@ let self = _self // overrides; _self = with self; { }; BC = buildPerlPackage rec { - name = "B-C-1.54"; + name = "B-C-1.55"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "d07e5af5fb798fcd3f4eda5e40744a14c1b3ef9e585a7dca55b5db31cb1d28d3"; + sha256 = "001bc3mxv1zkg1ynqpv3fbn1v3h3bqihg0pp19z4gfvrsrkns8q9"; }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; meta = { @@ -1458,8 +1454,6 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginUnicodeEncoding = CatalystRuntime; - CatalystPluginHTMLWidget = buildPerlPackage rec { name = "Catalyst-Plugin-HTML-Widget-1.1"; src = fetchurl { @@ -1867,6 +1861,10 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JS/JSWARTZ/${name}.tar.gz"; sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851"; }; + preConfigure = stdenv.lib.optionalString (stdenv.lib.versionAtLeast perl.version "5.26") '' + # fix error 'Unescaped left brace in regex is illegal here in regex' + substituteInPlace lib/CHI/t/Driver/Subcache/l1_cache.pm --replace 'qr/CHI stats: {' 'qr/CHI stats: \{' + ''; buildInputs = [ TestClass TestDeep TestException TestWarn TimeDate ]; propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse ]; meta = { @@ -1909,13 +1907,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ]; }; - ClassAccessorFast = ClassAccessor; - ClassAccessorGrouped = buildPerlPackage { - name = "Class-Accessor-Grouped-0.10012"; + name = "Class-Accessor-Grouped-0.10014"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz; - sha256 = "c4613ee3307939f47a9afd40e8b173f3a22f501c3b139799aa030f01b627e7fe"; + url = mirror://cpan/authors/id/H/HA/HAARG/Class-Accessor-Grouped-0.10014.tar.gz; + sha256 = "35d5b03efc09f67f3a3155c9624126c3e162c8e3ca98ff826db358533a44c4bb"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ModuleRuntime ]; @@ -2105,6 +2101,10 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/EV/EVO/${name}.tar.gz"; sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c"; }; + preConfigure = stdenv.lib.optionalString (stdenv.lib.versionAtLeast perl.version "5.26") '' + # fix error 'Unescaped left brace in regex is illegal here in regex' + substituteInPlace tests/xemulator/class_methodmaker/Test.pm --replace 's/(TEST\s{)/$1/g' 's/(TEST\s\{)/$1/g' + ''; }; ClassMethodMaker = buildPerlPackage rec { @@ -2148,8 +2148,6 @@ let self = _self // overrides; _self = with self; { }; }; - ClassMOP = Moose; - ClassReturnValue = buildPerlPackage rec { name = "Class-ReturnValue-0.55"; src = fetchurl { @@ -2363,9 +2361,6 @@ let self = _self // overrides; _self = with self; { }; }; - # For backwards compatibility. - CommonSense = self.commonsense; - commonsense = buildPerlPackage rec { name = "common-sense-3.74"; src = fetchurl { @@ -2415,8 +2410,6 @@ let self = _self // overrides; _self = with self; { inherit (pkgs) zlib; }; - CompressZlib = IOCompress; - CompressUnLZMA = buildPerlPackage rec { name = "Compress-unLZMA-0.05"; src = fetchurl { @@ -2665,8 +2658,6 @@ let self = _self // overrides; _self = with self; { }; }; - constant = null; # part of Perl 5.22 - constantboolean = buildPerlModule { name = "constant-boolean-0.02"; src = fetchurl { @@ -2692,8 +2683,6 @@ let self = _self // overrides; _self = with self; { }; }; - constantdefer = pkgs.perlPackages.constant-defer; - constant-defer = buildPerlPackage rec { name = "constant-defer-6"; src = fetchurl { @@ -2776,10 +2765,10 @@ let self = _self // overrides; _self = with self; { }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.02"; + name = "Cpanel-JSON-XS-4.04"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "e9fe45a0b5bf553076bd395ed04766d58683557f818af559cd82d33409846d20"; + sha256 = "e128702a266b9a690bd3d380f726c229f9d6d795e8e206b9d32309d06825b2cd"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -2866,10 +2855,10 @@ let self = _self // overrides; _self = with self; { }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.62"; + name = "CPAN-Perl-Releases-3.68"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1w4xxb2fypsxrrmdhnznmskm0y9i10hkwgi60lwizlyhb9ck8bzb"; + sha256 = "00d97zlg0npa8sr9d8lzj2zqwx7vkq6cypccdm2g669ls5h82shs"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -2960,10 +2949,10 @@ let self = _self // overrides; _self = with self; { }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.021"; + name = "Crypt-JWT-0.022"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "7227a10d185d6550fea855ef44bb8fb927d8c8644cfb16e0b674959bf103df5f"; + sha256 = "eb0a591f91c431929d8788dc26cc8cd98d1dc37af2a45b5754ca5039c8282476"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { @@ -4003,10 +3992,10 @@ let self = _self // overrides; _self = with self; { }; DevelPatchPerl = buildPerlPackage rec { - name = "Devel-PatchPerl-1.48"; + name = "Devel-PatchPerl-1.52"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1zlh1pmlihzcabj2zyfdnrqj6kfl3n9769yfrs296wxgaa7bra96"; + sha256 = "0iynq3sgxyidr8d6x0gb1yk5nvzr7xmyslk2bs8hkp9sbxpznsaf"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { @@ -4028,8 +4017,6 @@ let self = _self // overrides; _self = with self; { }; }; - DevelSelfStubber = null; # part of Perl 5.22 - DevelSizeMe = buildPerlPackage { name = "Devel-SizeMe-0.19"; src = fetchurl { @@ -4473,8 +4460,6 @@ let self = _self // overrides; _self = with self; { }; }; - Digest = null; # part of Perl 5.22 - DigestCRC = buildPerlPackage rec { name = "Digest-CRC-0.22.2"; src = fetchurl { @@ -4500,7 +4485,6 @@ let self = _self // overrides; _self = with self; { }; DigestHMAC_SHA1 = DigestHMAC; - DigestJHash = buildPerlPackage rec { name = "Digest-JHash-0.10"; src = fetchurl { @@ -4560,8 +4544,6 @@ let self = _self // overrides; _self = with self; { }; }; - DigestSHA = null; - DigestSHA1 = buildPerlPackage { name = "Digest-SHA1-2.13"; src = fetchurl { @@ -4650,8 +4632,6 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestMojibake ]; }; - DistZillaPluginNoTabsTests = DistZillaPluginTestNoTabs; - DistZillaPluginPodWeaver = buildPerlPackage { name = "Dist-Zilla-Plugin-PodWeaver-4.008"; src = fetchurl { @@ -5078,8 +5058,6 @@ let self = _self // overrides; _self = with self; { }; }; - EmailMIMEModifier = EmailMIME; - EmailSend = buildPerlPackage rec { name = "Email-Send-2.201"; src = fetchurl { @@ -5422,8 +5400,6 @@ let self = _self // overrides; _self = with self; { }; }; - ExtUtilsCommand = ExtUtilsMakeMaker; - Expect = buildPerlPackage { name = "Expect-1.35"; src = fetchurl { @@ -5437,8 +5413,6 @@ let self = _self // overrides; _self = with self; { }; }; - Exporter = null; # part of Perl 5.22 - ExtUtilsCBuilder = buildPerlPackage rec { name = "ExtUtils-CBuilder-0.280230"; src = fetchurl { @@ -5840,10 +5814,10 @@ let self = _self // overrides; _self = with self; { }; FileFindObjectRule = buildPerlModule rec { - name = "File-Find-Object-Rule-0.0307"; + name = "File-Find-Object-Rule-0.0309"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "571d92c1bbd749b03a5e063b65cdef081b8063fe190fca7ed2e37af7ccb5a99a"; + sha256 = "a184e11b271646c1b5b40ac01ca15d87750dc2b16a66dda3be0bd8976ece21e3"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; meta = { @@ -5901,12 +5875,12 @@ let self = _self // overrides; _self = with self; { }; FileHandleUnget = buildPerlPackage rec { - name = "FileHandle-Unget-0.1628"; + name = "FileHandle-Unget-0.1629"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "9ef4eb765ddfdc35b350905d8dd0a1e12139eabc586652811bfab41972100fdf"; + sha256 = "65925ec334d239c79f4a446716fb0816acb010de495ffd6b23d677f5bcc54362"; }; - buildInputs = [ FileSlurp URI ]; + buildInputs = [ FileSlurp TestCompile UNIVERSALrequire URI ]; meta = { homepage = https://github.com/coppit/filehandle-unget/; description = "FileHandle which supports multi-byte unget"; @@ -6115,16 +6089,17 @@ let self = _self // overrides; _self = with self; { }; FileShareDir = buildPerlPackage { - name = "File-ShareDir-1.112"; + name = "File-ShareDir-1.116"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.112.tar.gz; - sha256 = "196vf98l6pasrpdcpd840321fknknhyidhsm1y5ifx74lrk5ac7q"; + url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz; + sha256 = "0a43rfb0a1fpxh4d2dayarkdxw4cx9a2krkk87zmcilcz7yhpnar"; }; propagatedBuildInputs = [ ClassInspector ]; meta = { description = "Locate per-dist and per-module shared files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ FileShareDirInstall ]; }; FileShareDirInstall = buildPerlPackage { @@ -6207,8 +6182,6 @@ let self = _self // overrides; _self = with self; { }; }; - FileTemp = null; - FileTouch = buildPerlPackage rec { name = "File-Touch-0.11"; src = fetchurl { @@ -6628,7 +6601,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/T/TI/TIMB/GoferTransport-http-1.017.tar.gz; sha256 = "f73effe3ea7afa1907ce8977c87387abb0d4404f85a724ae2637b29a73154a9b"; }; - propagatedBuildInputs = [ mod_perl2 DBI HTTPMessage LWP URI ]; + propagatedBuildInputs = [ DBI LWP mod_perl2 ]; doCheck = false; # no make target 'test' meta = { description = "HTTP transport for DBI stateless proxy driver DBD::Gofer"; @@ -6690,12 +6663,12 @@ let self = _self // overrides; _self = with self; { }; grepmail = buildPerlPackage rec { - name = "grepmail-5.3104"; + name = "grepmail-5.3105"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "7969e569ec54b2f569a5af56ac4d884c630ad850974658219b0b6953e97b5d3d"; + sha256 = "c74fb7a0cd4549d98c78395c2485b00788ca655109358ca0ec550ea71588a5d4"; }; - buildInputs = [ FileSlurp URI ]; + buildInputs = [ FileSlurp TestCompile URI ]; propagatedBuildInputs = [ MailMboxMessageParser TimeDate ]; outputs = [ "out" ]; meta = { @@ -7533,8 +7506,6 @@ let self = _self // overrides; _self = with self; { }; }; - I18NCollate = null; # part of Perl 5.22 - iCalParser = buildPerlPackage rec { name = "iCal-Parser-1.21"; src = fetchurl { @@ -7547,11 +7518,6 @@ let self = _self // overrides; _self = with self; { }; }; - "if" = null; - - # For backwards compatibility. - if_ = self."if"; - ImageInfo = buildPerlPackage rec { name = "Image-Info-1.41"; src = fetchurl { @@ -7846,8 +7812,6 @@ let self = _self // overrides; _self = with self; { }; }; - IOstringy = pkgs.perlPackages.IOStringy; - IOStringy = buildPerlPackage rec { name = "IO-stringy-2.111"; src = fetchurl { @@ -8223,8 +8187,6 @@ let self = _self // overrides; _self = with self; { }; }; - lib_ = null; # part of Perl 5.22 - libapreq2 = buildPerlPackage { name = "libapreq2-2.13"; src = fetchurl { @@ -8255,8 +8217,6 @@ let self = _self // overrides; _self = with self; { }; }; - libintlperl = pkgs.perlPackages.libintl_perl; - libintl_perl = buildPerlPackage rec { name = "libintl-perl-1.29"; src = fetchurl { @@ -8677,8 +8637,6 @@ let self = _self // overrides; _self = with self; { }; }; - LocaleMaketextSimple = null; # part of Perl 5.22 - LocaleMsgfmt = buildPerlPackage { name = "Locale-Msgfmt-0.15"; src = fetchurl { @@ -8892,10 +8850,10 @@ let self = _self // overrides; _self = with self; { }; MCE = buildPerlPackage rec { - name = "MCE-1.835"; + name = "MCE-1.836"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.835.tar.gz; - sha256 = "1dxs7gvj97vr1ns74k3inix1i80d8b2j942crnapdx9j90j6cqvi"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.836.tar.gz; + sha256 = "04nkcbs27plwq31w541phfci3391s10p2xv5lmry5wq7fbdw5iwy"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; @@ -8918,9 +8876,6 @@ let self = _self // overrides; _self = with self; { }; }; - # For backwards compatibility. - Log4Perl = self.LogLog4perl; - LogDispatchArray = buildPerlPackage { name = "Log-Dispatch-Array-1.003"; src = fetchurl { @@ -9004,8 +8959,6 @@ let self = _self // overrides; _self = with self; { }; }; - LWPProtocolconnect = pkgs.perlPackages.LWPProtocolConnect; - LWPProtocolConnect = buildPerlPackage { name = "LWP-Protocol-connect-6.09"; src = fetchurl { @@ -9020,8 +8973,6 @@ let self = _self // overrides; _self = with self; { }; }; - LWPProtocolhttps = pkgs.perlPackages.LWPProtocolHttps; - LWPProtocolHttps = buildPerlPackage rec { name = "LWP-Protocol-https-6.07"; src = fetchurl { @@ -9052,8 +9003,6 @@ let self = _self // overrides; _self = with self; { }; }; - LWPUserAgent = LWP; - LWPUserAgentDetermined = buildPerlPackage { name = "LWP-UserAgent-Determined-1.07"; src = fetchurl { @@ -9136,12 +9085,12 @@ let self = _self // overrides; _self = with self; { }; MailMboxMessageParser = buildPerlPackage rec { - name = "Mail-Mbox-MessageParser-1.5105"; + name = "Mail-Mbox-MessageParser-1.5106"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "641edd8b7ab74de671ab4931311413c1bd037a1c3eaa0a0c97451cd7b104f2d8"; + sha256 = "d65fc8e8ce84273abbc14220d15813d93ddf6c7a256cdc24de156cb6c08923be"; }; - buildInputs = [ FileSlurp TextDiff URI ]; + buildInputs = [ FileSlurp TestCompile TextDiff URI ]; propagatedBuildInputs = [ FileHandleUnget ]; meta = { homepage = https://github.com/coppit/mail-mbox-messageparser; @@ -9353,8 +9302,6 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp TestDeep ]; }; - MathComplex = null; # part of Perl 5.22 - MathConvexHullMonotoneChain = buildPerlPackage rec { name = "Math-ConvexHull-MonotoneChain-0.01"; src = fetchurl { @@ -9516,8 +9463,6 @@ let self = _self // overrides; _self = with self; { }; }; - MIMEBase64 = null; # part of Perl 5.22 - MIMECharset = buildPerlPackage { name = "MIME-Charset-1.012.2"; src = fetchurl { @@ -9554,8 +9499,6 @@ let self = _self // overrides; _self = with self; { }; }; - MIMEtools = MIMETools; - MIMETools = buildPerlPackage rec { name = "MIME-tools-5.509"; src = fetchurl { @@ -9625,11 +9568,11 @@ let self = _self // overrides; _self = with self; { }; ModernPerl = buildPerlModule { - name = "Modern-Perl-1.20170117"; + name = "Modern-Perl-1.20180701"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20170117.tar.gz; - sha256 = "5df2a83461163212db22b9c3353606a1a123616820fe50675041c34f004b3628"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20180701.tar.gz; + sha256 = "cfdf390bc565599ef90ef086a81233dc1dfc7867676dc28e1deedcd7e5543da6"; }; meta = { homepage = https://github.com/chromatic/Modern-Perl; @@ -9759,10 +9702,10 @@ let self = _self // overrides; _self = with self; { }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20180420"; + name = "Module-CoreList-5.20180626"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180420.tar.gz; - sha256 = "1bp22m50rjv8qjvygciy60j7kblksvhglsdgaabhmrqcmx5ysj5p"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180626.tar.gz; + sha256 = "1x9r0s4rlqziccb05p4k3aljx242ssx1abw5yl5ixn2c0g9ykll1"; }; meta = { homepage = http://dev.perl.org/; @@ -10063,10 +10006,10 @@ let self = _self // overrides; _self = with self; { }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.84"; + name = "Mojolicious-7.87"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "7461a27e8e8665b436a60c708cf6ce4164b84dfb1b2435480a65597085d26ebc"; + sha256 = "898a24a4344eaafe97cf0b8da2fbc89e0e21cc328f5e5a39a44774f8144989b1"; }; meta = { homepage = https://mojolicious.org/; @@ -10432,8 +10375,6 @@ let self = _self // overrides; _self = with self; { }; }; - MouseXGetOpt = self.MouseXGetopt; - MouseXGetopt = buildPerlModule rec { name = "MouseX-Getopt-0.37"; src = fetchurl { @@ -10522,10 +10463,10 @@ let self = _self // overrides; _self = with self; { }; MooseXEmulateClassAccessorFast = buildPerlPackage { - name = "MooseX-Emulate-Class-Accessor-Fast-0.00903"; + name = "MooseX-Emulate-Class-Accessor-Fast-0.009032"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/MooseX-Emulate-Class-Accessor-Fast-0.00903.tar.gz; - sha256 = "1lkn1h4sxr1483jicsgsgzclbfw63g2i2c3m4v4j9ar75yrb0kh8"; + url = mirror://cpan/authors/id/H/HA/HAARG/MooseX-Emulate-Class-Accessor-Fast-0.009032.tar.gz; + sha256 = "153r30nggcyyx7ai15dbnba2h5145f8jdsh6wj54298d3zpvgvl2"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Moose namespaceclean ]; @@ -11086,12 +11027,6 @@ let self = _self // overrides; _self = with self; { }; }; - # Deprecated. - NamespaceAutoclean = self.namespaceautoclean; - - # Deprecated. - NamespaceClean = self.namespaceclean; - NetIdent = buildPerlPackage rec { name = "Net-Ident-1.24"; src = fetchurl { @@ -11375,8 +11310,6 @@ let self = _self // overrides; _self = with self; { }; }; - NetLDAP = perlldap; - NetOAuth = buildPerlModule { name = "Net-OAuth-0.28"; src = fetchurl { @@ -11404,10 +11337,10 @@ let self = _self // overrides; _self = with self; { }; NetPing = buildPerlPackage { - name = "Net-Ping-2.66"; + name = "Net-Ping-2.68"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.66.tar.gz; - sha256 = "a477b29e543695343513e65f3aff885a353ecebb612741e79f0bad5622e4b9e4"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.68.tar.gz; + sha256 = "d01ac2fcdf684c4a23a07104fbb147cfbdbda47fd5b660912124258f29afd7e3"; }; meta = { description = "Check a remote host for reachability"; @@ -11453,8 +11386,6 @@ let self = _self // overrides; _self = with self; { }; }; - NetSMTP = libnet; - NetSMTPSSL = buildPerlPackage { name = "Net-SMTP-SSL-1.04"; src = fetchurl { @@ -11636,9 +11567,6 @@ let self = _self // overrides; _self = with self; { }; }; - # For backwards compatibility. Please use OLEStorage_Lite instead. - OLEStorageLight = OLEStorage_Lite; - OLEStorage_Lite = buildPerlPackage rec { name = "OLE-Storage_Lite-0.19"; src = fetchurl { @@ -11952,8 +11880,6 @@ let self = _self // overrides; _self = with self; { }; }; - ParseCPANMeta = CPANMeta; - ParseDebControl = buildPerlPackage rec { name = "Parse-DebControl-2.005"; src = fetchurl { @@ -12082,7 +12008,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.pcsclite ]; nativeBuildInputs = [ pkgs.pkgconfig ]; - NIX_CFLAGS_LINK = "-L${pkgs.pcsclite}/lib -lpcsclite"; + NIX_CFLAGS_LINK = "-L${stdenv.lib.getLib pkgs.pcsclite}/lib -lpcsclite"; # tests fail; look unfinished doCheck = false; meta = { @@ -12187,8 +12113,6 @@ let self = _self // overrides; _self = with self; { }; }; - PerlIOviaQuotedPrint = null; # part of Perl 5.22 - PerlIOviasymlink = buildPerlPackage { name = "PerlIO-via-symlink-0.05"; src = fetchurl { @@ -12843,8 +12767,6 @@ let self = _self // overrides; _self = with self; { }; }; - PodEscapes = null; # part of Perl 5.22 - PodEventual = buildPerlPackage { name = "Pod-Eventual-0.094001"; src = fetchurl { @@ -13344,8 +13266,6 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTimeFormatDateParse Error LWP ParamsValidate ]; }; - Safe = null; # part of Perl 5.22 - SafeIsa = buildPerlPackage { name = "Safe-Isa-1.000010"; src = fetchurl { @@ -13413,8 +13333,6 @@ let self = _self // overrides; _self = with self; { }; }; - SearchDict = null; # part of Perl 5.22 - SelfLoader = buildPerlPackage { name = "SelfLoader-1.24"; src = fetchurl { @@ -13909,10 +13827,10 @@ let self = _self // overrides; _self = with self; { }; StringCRC32 = buildPerlPackage rec { - name = "String-CRC32-1.6"; + name = "String-CRC32-1.7"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.6.tar.gz; - sha256 = "0mf545w014f9rwp2020h17dn8kfp7q1zgwrsfv0rpn89c61in8bh"; + url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.7.tar.gz; + sha256 = "1j1bwbxcgxfbgw708rfrni3spwnnmnf717vq9s64nd63jmc4w5lg"; }; meta = { maintainers = with maintainers; [ ]; @@ -14109,7 +14027,7 @@ let self = _self // overrides; _self = with self; { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; - meta.broken = true; + broken = true; }; }; @@ -14171,7 +14089,6 @@ let self = _self // overrides; _self = with self; { }; SubExporterUtil = SubExporter; - SubIdentify = buildPerlPackage rec { name = "Sub-Identify-0.14"; src = fetchurl { @@ -14846,8 +14763,6 @@ let self = _self // overrides; _self = with self; { }; }; - Test = null; # part of Perl 5.22 - Test2PluginNoWarnings = buildPerlPackage rec { name = "Test2-Plugin-NoWarnings-0.06"; src = fetchurl { @@ -14981,10 +14896,10 @@ let self = _self // overrides; _self = with self; { }; TestCleanNamespaces = buildPerlPackage { - name = "Test-CleanNamespaces-0.22"; + name = "Test-CleanNamespaces-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.22.tar.gz; - sha256 = "862a221994dd413b2f350450f22c96f57cac78784b1aca1a8fc763fc5449aaca"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.23.tar.gz; + sha256 = "c7bf97f3c786b75f84341135904b492a1a36646aa65db3e0fd15a3cbe0864872"; }; buildInputs = [ Filepushd Moo Mouse RoleTiny SubExporter TestDeep TestNeeds TestWarnings namespaceclean ]; propagatedBuildInputs = [ PackageStash SubIdentify ]; @@ -15431,8 +15346,6 @@ let self = _self // overrides; _self = with self; { }; }; - TestMoose = Moose; - TestMockTime = buildPerlPackage rec { name = "Test-MockTime-0.17"; src = fetchurl { @@ -15480,8 +15393,6 @@ let self = _self // overrides; _self = with self; { }; }; - TestMore = TestSimple; - TestMost = buildPerlPackage { name = "Test-Most-0.35"; src = fetchurl { @@ -15852,8 +15763,6 @@ let self = _self // overrides; _self = with self; { }; }; - TestSimple = null; - TestSimple13 = buildPerlPackage rec { name = "Test-Simple-1.302136"; src = fetchurl { @@ -15942,8 +15851,6 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestSharedFork ]; }; - TestTester = TestSimple; - TestTime = buildPerlPackage rec { name = "Test-Time-0.05"; src = fetchurl { @@ -15995,13 +15902,11 @@ let self = _self // overrides; _self = with self; { }; }; - Testuseok = TestSimple; - TestWarn = buildPerlPackage { - name = "Test-Warn-0.35"; + name = "Test-Warn-0.36"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.35.tar.gz; - sha256 = "1ialnc0q5277p7v01mvk7nljw8qx5qr5wiqzhmvbz8y87jb11r14"; + url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz; + sha256 = "1nkc7jzxff0w4x9axbpsgxrksqdjnf70rb74q39zikkrsd3a7g7c"; }; propagatedBuildInputs = [ SubUplevel ]; meta = { @@ -16120,8 +16025,6 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestBase ]; }; - TextAbbrev = null; # part of Perl 5.22 - TextAligner = buildPerlModule rec { name = "Text-Aligner-0.13"; src = fetchurl { @@ -16240,10 +16143,10 @@ let self = _self // overrides; _self = with self; { }; TextCSV_XS = buildPerlPackage rec { - name = "Text-CSV_XS-1.35"; + name = "Text-CSV_XS-1.36"; src = fetchurl { url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz"; - sha256 = "2b4f111e9486b230b02bfabbbf50c453f959d18ec17351a930e41f0959b358b7"; + sha256 = "c321b09ad98a332138f25f55afb83befd7c045134085c7cb280fc325e688942c"; }; meta = { homepage = https://metacpan.org/pod/Text::CSV_XS; @@ -16515,8 +16418,6 @@ let self = _self // overrides; _self = with self; { }; }; - TextTabsWrap = null; # part of Perl 5.22 - TextTabularDisplay = buildPerlPackage rec { name = "Text-TabularDisplay-1.38"; src = fetchurl { @@ -16884,10 +16785,10 @@ let self = _self // overrides; _self = with self; { }; TimeDurationParse = buildPerlPackage rec { - name = "Time-Duration-Parse-0.13"; + name = "Time-Duration-Parse-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; - sha256 = "0affdzhsiy7dr6dzj2p6m9lynmjh53k31bprfsfa21pz8551hjj1"; + sha256 = "17nh73r50mqqpgxdf3zpgdiqrizmjy0vdk0zd6xi9zcsdijrdhnc"; }; buildInputs = [ TimeDuration ]; propagatedBuildInputs = [ ExporterLite ]; @@ -17990,4 +17891,61 @@ let self = _self // overrides; _self = with self; { }; }; +} // stdenv.lib.optionalAttrs (config.skipAliases or false == false) { + autodie = null; # part of Perl + AutoLoader = null; # part of Perl 5.22 + constant = null; # part of Perl 5.22 + DevelSelfStubber = null; # part of Perl 5.22 + Digest = null; # part of Perl 5.22 + Exporter = null; # part of Perl 5.22 + I18NCollate = null; # part of Perl 5.22 + lib_ = null; # part of Perl 5.22 + LocaleMaketextSimple = null; # part of Perl 5.22 + MathComplex = null; # part of Perl 5.22 + MIMEBase64 = null; # part of Perl 5.22 + PerlIOviaQuotedPrint = null; # part of Perl 5.22 + PodEscapes = null; # part of Perl 5.22 + Safe = null; # part of Perl 5.22 + SearchDict = null; # part of Perl 5.22 + Test = null; # part of Perl 5.22 + TextAbbrev = null; # part of Perl 5.22 + TextTabsWrap = null; # part of Perl 5.22 + DigestSHA = null; + FileTemp = null; + "if" = null; + TestSimple = null; + + ArchiveZip_1_53 = self.ArchiveZip; + Autobox = self.autobox; + CommonSense = self.commonsense; # For backwards compatibility. + if_ = self."if"; # For backwards compatibility. + Log4Perl = self.LogLog4perl; # For backwards compatibility. + MouseXGetOpt = self.MouseXGetopt; + NamespaceAutoclean = self.namespaceautoclean; # Deprecated. + NamespaceClean = self.namespaceclean; # Deprecated. + CatalystPluginUnicodeEncoding = self.CatalystRuntime; + ClassAccessorFast = self.ClassAccessor; + ClassMOP = self.Moose; + CompressZlib = self.IOCompress; + constantdefer = self.constant-defer; + DigestHMAC_SHA1 = self.DigestHMAC; + DistZillaPluginNoTabsTests = self.DistZillaPluginTestNoTabs; + EmailMIMEModifier = self.EmailMIME; + ExtUtilsCommand = self.ExtUtilsMakeMaker; + IOstringy = self.IOStringy; + libintlperl = self.libintl_perl; + LWPProtocolconnect = self.LWPProtocolConnect; + LWPProtocolhttps = self.LWPProtocolHttps; + LWPUserAgent = self.LWP; + MIMEtools = self.MIMETools; + NetLDAP = self.perlldap; + NetSMTP = self.libnet; + OLEStorageLight = self.OLEStorage_Lite; # For backwards compatibility. Please use OLEStorage_Lite instead. + ParseCPANMeta = self.CPANMeta; + TestMoose = self.Moose; + TestMore = self.TestSimple; + TestTester = self.TestSimple; + Testuseok = self.TestSimple; + SubExporterUtil = self.SubExporter; + }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2b1b295896d..b292bef4f163 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20,7 +20,6 @@ let let pythonAtLeast = versionAtLeast python.pythonVersion; pythonOlder = versionOlder python.pythonVersion; - isPy26 = python.pythonVersion == "2.6"; isPy27 = python.pythonVersion == "2.7"; isPy33 = python.pythonVersion == "3.3"; isPy34 = python.pythonVersion == "3.4"; @@ -133,7 +132,7 @@ let in { - inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPyPy isPy3k buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPyPy isPy3k buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; @@ -983,7 +982,7 @@ in { name = "${pname}-${version}"; version = "0.2.2"; pname = "basiciw"; - disabled = isPy26 || isPy27 || isPyPy; + disabled = isPy27 || isPyPy; src = pkgs.fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; @@ -1029,7 +1028,7 @@ in { propagatedBuildInputs = [ self.sqlalchemy self.pycrypto - ] ++ optionals (isPy26 || isPy27) [ + ] ++ optionals (isPy27) [ self.funcsigs self.pycryptopp ]; @@ -1956,7 +1955,7 @@ in { }; # Needed for celery - pytest_32 = self.pytest_36.overrideAttrs( oldAttrs: rec { + pytest_32 = self.pytest_36.overridePythonAttrs( oldAttrs: rec { version = "3.2.5"; src = oldAttrs.src.override { inherit version; @@ -2942,8 +2941,6 @@ in { name = "gtimelog-${version}"; version = "0.9.1"; - disabled = isPy26; - src = pkgs.fetchurl { url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj"; @@ -3182,7 +3179,7 @@ in { ipfsapi = buildPythonPackage rec { name = "ipfsapi-${version}"; version = "0.4.2.post1"; - disabled = isPy26 || isPy27; + disabled = isPy27; src = pkgs.fetchFromGitHub { owner = "ipfs"; @@ -4110,7 +4107,7 @@ in { virtualenv webtest zope_component - ] ++ optional isPy26 unittest2; + ]; propagatedBuildInputs = with self; [ hupper @@ -4643,11 +4640,8 @@ in { sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb"; } ; - buildInputs = with self; [] ++ optionals isPy26 [ ordereddict unittest2 ]; - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; + maintainers = with maintainers; [ garbas domenkozar ]; }; }; @@ -5252,7 +5246,6 @@ in { sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"; }; - buildInputs = optional isPy26 self.ordereddict; checkPhase = '' ${python.interpreter} -m unittest discover ''; @@ -5605,7 +5598,7 @@ in { # This is fixed in master I believe but not yet in 2.1; doCheck = false; - propagatedBuildInputs = with self; ([ Babel ] ++ (optionals isPy26 [ ordereddict ])); + propagatedBuildInputs = with self; [ Babel ]; meta = { homepage = https://github.com/wtforms/wtforms; @@ -6051,7 +6044,7 @@ in { sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42"; }; - buildInputs = with self; [ setuptools ] ++ (optional isPy26 argparse); + buildInputs = with self; [ setuptools ]; meta = { description = "Automatically generated zsh completion function for Python's option parser modules"; @@ -6066,7 +6059,7 @@ in { gipc = buildPythonPackage rec { name = "gipc-0.5.0"; - disabled = !isPy26 && !isPy27; + disabled = !isPy27; src = pkgs.fetchurl { url = "mirror://pypi/g/gipc/${name}.zip"; @@ -6585,7 +6578,7 @@ in { importlib = buildPythonPackage rec { name = "importlib-1.0.2"; - disabled = (!isPy26) || isPyPy; + disabled = isPyPy; src = pkgs.fetchurl { url = "mirror://pypi/i/importlib/importlib-1.0.2.tar.gz"; @@ -6800,7 +6793,7 @@ in { sha256 = "0y3w1x9935qzx8w6m2r6g4ghyjmxn33wryiif6xb56q7cj9w1433"; }; - disabled = ! (isPy26 || isPy27); + disabled = !isPy27; buildInputs = [ self.nose ]; @@ -7416,8 +7409,6 @@ in { sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c"; }; - disabled = isPy26; - buildInputs = with self; [ pexpect ]; prePatch = '' @@ -8589,7 +8580,7 @@ in { nose-exclude = callPackage ../development/python-modules/nose-exclude { }; - nose2 = if isPy26 then null else (buildPythonPackage rec { + nose2 = buildPythonPackage rec { name = "nose2-0.5.0"; src = pkgs.fetchurl { url = "mirror://pypi/n/nose2/${name}.tar.gz"; @@ -8601,7 +8592,7 @@ in { propagatedBuildInputs = with self; [ six ]; # AttributeError: 'module' object has no attribute 'collector' doCheck = false; - }); + }; nose-cover3 = buildPythonPackage rec { name = "nose-cover3-${version}"; @@ -8877,7 +8868,6 @@ in { buildInputs = [ pkgs.makeWrapper ]; propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests ] - ++ optionals isPy26 [ singledispatch futures argparse ] ++ optionals isPy27 [ singledispatch futures ] ++ optionals isPy33 [ singledispatch ]; @@ -9445,7 +9435,7 @@ in { name = "paho-mqtt-${version}"; version = "1.1"; - disabled = isPyPy || isPy26; + disabled = isPyPy; src = pkgs.fetchurl { url = "mirror://pypi/p/paho-mqtt/${name}.tar.gz"; @@ -11718,7 +11708,7 @@ in { python-wifi = buildPythonPackage rec { name = "python-wifi-${version}"; version = "0.6.1"; - disabled = ! (isPy26 || isPy27 ); + disabled = !isPy27; src = pkgs.fetchurl { url = "mirror://pypi/p/python-wifi/${name}.tar.bz2"; @@ -12054,7 +12044,6 @@ in { repocheck = buildPythonPackage rec { name = "repocheck-2015-08-05"; - disabled = isPy26 || isPy27; src = pkgs.fetchFromGitHub { sha256 = "1jc4v5zy7z7xlfmbfzvyzkyz893f5x2k6kvb3ni3rn2df7jqhc81"; @@ -12644,8 +12633,6 @@ in { name = "shortuuid-${version}"; version = "0.4.3"; - disabled = isPy26; - src = pkgs.fetchurl { url = "mirror://pypi/s/shortuuid/${name}.tar.gz"; sha256 = "4606dbb19124d98109c00e2cafae2df8117aec02115623e18fb2abe3f766d293"; @@ -12880,7 +12867,7 @@ in { buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ praw xmltodict pytz pyenchant pygeoip ]; - disabled = isPyPy || isPy26 || isPy27; + disabled = isPyPy || isPy27; checkPhase = '' ${python.interpreter} test/*.py #*/ @@ -14070,7 +14057,7 @@ in { src = py; format = "other"; - disabled = isPy26 || isPyPy; + disabled = isPyPy; installPhase = '' # Move the tkinter module @@ -14874,11 +14861,6 @@ EOF substituteInPlace setup.py --replace "nose<1.3.0" "nose" ''; - # XXX: skipping two tests fails in python2.6 - doCheck = ! isPy26; - - buildInputs = with self; optionals isPy26 [ ordereddict unittest2 ]; - propagatedBuildInputs = with self; [ nose webob @@ -15320,7 +15302,7 @@ EOF sha256 = "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank"; }; - propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; + propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ]; # ImportError: No module named 'zope.event' # even though zope_event has been included. @@ -16924,7 +16906,7 @@ EOF jenkins-job-builder = buildPythonPackage rec { name = "jenkins-job-builder-2.0.0.0b2"; - disabled = ! (isPy26 || isPy27); + disabled = !isPy27; src = pkgs.fetchurl { url = "mirror://pypi/j/jenkins-job-builder/${name}.tar.gz"; @@ -16946,10 +16928,6 @@ EOF pyyaml six stevedore - ] ++ optionals isPy26 [ - ordereddict - argparse - ordereddict ]; meta = { diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index a46d2897f4ed..52c3de3166ff 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,5 +1,4 @@ -{ pkgs, buildEnv, runCommand, hostPlatform, lib -, stdenv }: +{ pkgs, buildEnv, runCommand, hostPlatform, lib, stdenv }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -11,30 +10,42 @@ # instance, if your program needs to use "ps", just list it as a build # input, not "procps" which requires Linux. +with lib; + let version = "1003.1-2008"; singleBinary = cmd: providers: let - provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; + provider = providers.${hostPlatform.parsed.kernel.name}; + bin = "${getBin provider}/bin/${cmd}"; + manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz"; in runCommand "${cmd}-${version}" { - meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); + meta.platforms = map (n: { kernel.name = n; }) (attrNames providers); + passthru = { inherit provider; }; + preferLocalBuild = true; } '' - if ! [ -x "${provider}" ]; then - echo "Cannot find command ${cmd}" + if ! [ -x ${bin} ]; then + echo Cannot find command ${cmd} exit 1 fi - install -D "${provider}" "$out/bin/${cmd}" + mkdir -p $out/bin + ln -s ${bin} $out/bin/${cmd} + + if [ -f ${manpage} ]; then + mkdir -p $out/share/man/man1 + ln -s ${manpage} $out/share/man/man1/${cmd}.1.gz + fi ''; # more is unavailable in darwin - # just use less + # so we just use less more_compat = runCommand "more-${version}" {} '' mkdir -p $out/bin ln -s ${pkgs.less}/bin/less $out/bin/more ''; - bins = lib.mapAttrs singleBinary { + bins = mapAttrs singleBinary { # singular binaries arp = { linux = pkgs.nettools; @@ -48,12 +59,12 @@ let linux = pkgs.utillinux; }; getconf = { - linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc + linux = if hostPlatform.libc == "glibc" then pkgs.glibc else pkgs.netbsd.getconf; darwin = pkgs.darwin.system_cmds; }; getent = { - linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc + linux = if hostPlatform.libc == "glibc" then pkgs.glibc else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; }; @@ -143,21 +154,33 @@ let wall = { linux = pkgs.utillinux; }; + watch = { + linux = pkgs.procps; + + # watch is the only command from procps that builds currently on + # Darwin. Unfortunately no other implementations exist currently! + darwin = pkgs.callPackage ../os-specific/linux/procps-ng {}; + }; write = { linux = pkgs.utillinux; darwin = pkgs.darwin.basic_cmds; }; + xxd = { + linux = pkgs.vim; + darwin = pkgs.vim; + }; }; - makeCompat = name': value: buildEnv { - name = name' + "-compat-${version}"; - paths = value; - }; + makeCompat = pname: paths: + buildEnv { + name = "${pname}-${version}"; + inherit paths; + }; # Compatibility derivations # Provided for old usage of these commands. compat = with bins; lib.mapAttrs makeCompat { - procps = [ ps sysctl top ]; + procps = [ ps sysctl top watch ]; utillinux = [ fsck fdisk getopt hexdump mount script umount whereis write col ]; nettools = [ arp hostname ifconfig netstat route ]; |