From 22157b544bf9ed468f89ab83affc3c7ae86950e6 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 15 Apr 2019 19:56:05 +0200 Subject: libuv: fix darwin sandbox build --- pkgs/development/libraries/libuv/default.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 0a75fcbeda6c..5b52f7cd0f73 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -17,11 +17,10 @@ stdenv.mkDerivation rec { "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines - ] - # 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 [ + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # Sometimes: timeout (no output), failed uv_listen. Someone + # should report these failures to libuv team. There tests should + # be much more robust. "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" @@ -34,11 +33,16 @@ stdenv.mkDerivation rec { "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "tty_pty" "condvar_5" - ] ++ stdenv.lib.optionals stdenv.isAarch32 [ - # I observe this test failing with some regularity on ARMv7: - # https://github.com/libuv/libuv/issues/1871 - "shutdown_close_pipe" - ]; + # Tests that fail when sandboxing is enabled. + "fs_event_close_in_callback" "fs_event_watch_dir" + "fs_event_watch_dir_recursive" "fs_event_watch_file" + "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" + "process_priority" "udp_create_early_bad_bind" + ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + # I observe this test failing with some regularity on ARMv7: + # https://github.com/libuv/libuv/issues/1871 + "shutdown_close_pipe" + ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' sed '/${tdRegexp}/d' -i test/test-list.h @@ -55,6 +59,9 @@ stdenv.mkDerivation rec { doCheck = true; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = https://github.com/libuv/libuv; -- cgit 1.4.1 From 2962c77b6c8f2baa6f55f19640cfa0f9cefe43af Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Apr 2019 10:32:52 -0700 Subject: xmr-stak: 2.10.1 -> 2.10.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmr-stak/versions --- pkgs/applications/misc/xmr-stak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 4b7be4b2b50e..8b6ea4c86c52 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.10.1"; + version = "2.10.4"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "0381r4nr5cx0zv3dhsvld4ibpp5gq911815h03v92688za3swhng"; + sha256 = "0f3cs0jw0yn8lbcm43m34dnvvgr4qpb8wa176vh4whk7bbjkw7lz"; }; NIX_CFLAGS_COMPILE = "-O3"; -- cgit 1.4.1 From c7ccb9f197789e424a70a878b9f967ddf38d39c6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:51:26 -0400 Subject: make-derivation: put patches in all derivations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This puts patches in all derivations even if it unspecified by the derivation. By default it will be an empty list. This simplifies overrides, as we can now assume that patches is a valid name so that this works: self: super: { mypkg = super.pkg.overrideAttrs (o: { patches = o.patches ++ [ ./my-very-own.patch ]; }); } That is, you don’t need to provide a default "or []", make-derivation provides one for you. Unfortunately, this is a mass rebuild. --- pkgs/stdenv/generic/make-derivation.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 417c10363b52..ad52503548af 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -86,6 +86,8 @@ in rec { , hardeningEnable ? [] , hardeningDisable ? [] + , patches ? [] + , ... } @ attrs: let @@ -235,6 +237,8 @@ in rec { ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; + inherit patches; + inherit doCheck doInstallCheck; inherit outputs; -- cgit 1.4.1 From 7abeda982a0d4324d06a0997deb3681c91df55ff Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 16 Apr 2019 20:38:26 -0400 Subject: gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas gnome3.pomodoro is left out because I don't want to create a conflict. --- nixos/modules/programs/dconf.nix | 2 +- .../services/x11/desktop-managers/gnome3.nix | 2 +- pkgs/applications/audio/radiotray-ng/default.nix | 4 +- pkgs/applications/audio/sonata/default.nix | 4 +- pkgs/applications/audio/sound-juicer/default.nix | 4 +- pkgs/applications/graphics/glabels/default.nix | 4 +- pkgs/applications/graphics/shotwell/default.nix | 3 +- .../misc/notify-osd-customizable/default.nix | 3 +- pkgs/applications/misc/notify-osd/default.nix | 4 +- .../networking/syncthing-gtk/default.nix | 4 +- pkgs/applications/video/pitivi/default.nix | 4 +- pkgs/desktops/gnome-3/apps/glade/default.nix | 4 +- .../gnome-3/apps/gnome-documents/default.nix | 4 +- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 4 +- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 +- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 +- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 4 +- .../desktops/gnome-3/apps/gnome-photos/default.nix | 4 +- .../gnome-3/apps/gnome-weather/default.nix | 4 +- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 +- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 4 +- pkgs/desktops/gnome-3/core/empathy/default.nix | 4 +- .../gnome-3/core/gnome-bluetooth/default.nix | 4 +- .../gnome-3/core/gnome-calculator/default.nix | 4 +- .../gnome-3/core/gnome-contacts/default.nix | 4 +- .../gnome-3/core/gnome-desktop/default.nix | 4 +- .../gnome-3/core/gnome-dictionary/default.nix | 4 +- .../gnome-3/core/gnome-disk-utility/default.nix | 4 +- .../gnome-3/core/gnome-screenshot/default.nix | 4 +- .../gnome-3/core/gnome-system-monitor/default.nix | 4 +- .../core/gsettings-desktop-schemas/default.nix | 47 ---------------------- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 +- pkgs/desktops/gnome-3/default.nix | 5 +-- pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 4 +- .../desktops/gnome-3/misc/gnome-tweaks/default.nix | 4 +- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 4 +- .../elementary-gsettings-schemas/default.nix | 6 +-- pkgs/development/libraries/flatpak/default.nix | 4 +- .../gsettings-desktop-schemas/default.nix | 47 ++++++++++++++++++++++ pkgs/development/libraries/gtk+/3.x.nix | 4 +- .../libraries/xdg-desktop-portal-gtk/default.nix | 4 +- pkgs/tools/audio/pasystray/default.nix | 4 +- pkgs/tools/security/keybase/gui.nix | 4 +- pkgs/top-level/all-packages.nix | 15 +++---- 44 files changed, 133 insertions(+), 137 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix create mode 100644 pkgs/development/libraries/gsettings-desktop-schemas/default.nix (limited to 'pkgs') diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 9c9765b06b6f..b7bfb8504b6f 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -38,7 +38,7 @@ in "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; # https://github.com/NixOS/nixpkgs/pull/31891 #environment.variables.XDG_DATA_DIRS = optional cfg.enable - # "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; + # "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3d748d4308b7..8f92d3d55c33 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -18,7 +18,7 @@ let nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -rf ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages} diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 1838268a0ea9..91d82d686d03 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -10,7 +10,7 @@ # GUI/Desktop , dbus , glibmm -, gnome3 +, gsettings-desktop-schemas , hicolor-icon-theme , libappindicator-gtk3 , libnotify @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl boost jsoncpp libbsd pcre - glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify + glibmm hicolor-icon-theme gsettings-desktop-schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release wxGTK diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 5c22e3e77510..d5985f097e9f 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook -, python3Packages, gnome3, gtk3, gobject-introspection}: +, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; @@ -20,7 +20,7 @@ in buildPythonApplication rec { buildInputs = [ intltool wrapGAppsHook gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 303532aca63d..7f22a03c1bb4 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, wrapGAppsHook }: +, gsettings-desktop-schemas, wrapGAppsHook }: let pname = "sound-juicer"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes + gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-libav diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index cf4ecf15523a..dadae22bf0c3 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook -, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book +, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc gnome3.yelp-tools - gnome3.gnome-common gnome3.gsettings-desktop-schemas + gnome3.gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool hicolor-icon-theme ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index f31b6d323995..c8ada0e85fe7 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -32,6 +32,7 @@ , itstool , libgdata , libchamplain +, gsettings-desktop-schemas , python3 }: @@ -73,7 +74,7 @@ stdenv.mkDerivation rec { libgee libgudev gexiv2 - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas libraw json-glib glib diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 828c39d5ed87..d4f3db4ca6f9 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -8,6 +8,7 @@ , libwnck3 , makeWrapper , pkgconfig +, gsettings-desktop-schemas }: let baseURI = "https://launchpad.net/~leolik/+archive/leolik"; @@ -26,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper - gnome3.gsettings-desktop-schemas gnome3.gnome-common + gsettings-desktop-schemas gnome3.gnome-common libtool ]; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index f602ce9db66a..5c60c7412c4a 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "notify-osd-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; configureFlags = [ "--libexecdir=$(out)/bin" ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 389d32d5a7cc..696ced2d2465 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 -, bcrypt, gobject-introspection }: +, bcrypt, gobject-introspection, gsettings-desktop-schemas }: buildPythonApplication rec { version = "0.9.4"; @@ -24,7 +24,7 @@ buildPythonApplication rec { gtk3 librsvg libappindicator-gtk3 libnotify gnome3.adwaita-icon-theme # Schemas with proxy configuration - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 6e0b7412558e..1c124df30238 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook , python3Packages, gst_all_1, gtk3 , gobject-introspection, librsvg, gnome3, libnotify, gsound -, meson, ninja +, meson, ninja, gsettings-desktop-schemas }: let @@ -49,7 +49,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas libnotify + gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst_all_1; [ gstreamer gst-editing-services diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 9adffc7922c2..e0078d5ae410 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, python3 , pkgconfig, gtk3, glib, gobject-introspection , wrapGAppsHook, itstool, libxml2, docbook_xsl -, gnome3, gdk_pixbuf, libxslt }: +, gnome3, gdk_pixbuf, libxslt, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "glade-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gdk_pixbuf gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index a2cba36b88d9..4491d60a5ade 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -4,7 +4,7 @@ , gnome-desktop, libzapojit, libgepub , gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42 , gobject-introspection, inkscape, poppler_utils -, desktop-file-utils, wrapGAppsHook, python3 }: +, desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-documents-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { inkscape poppler_utils # building getting started ]; buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas + gtk3 glib gsettings-desktop-schemas gdk_pixbuf gnome3.adwaita-icon-theme evince libsoup webkitgtk gjs gobject-introspection tracker tracker-miners libgdata diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 7d9fa2d528c0..d46882deb41e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3 }: +, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-logs-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index be5008a51fee..b3b9fb0dddd6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3 , gobject-introspection, gdk_pixbuf, librsvg, libgweather -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup +, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas , webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { gtk3 geoclue2 gjs libgee folks gfbgraph geocode-glib libchamplain libsoup gdk_pixbuf librsvg libgweather - gnome3.gsettings-desktop-schemas evolution-data-server + gsettings-desktop-schemas evolution-data-server gnome-online-accounts gnome3.adwaita-icon-theme webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 66680c0af58e..4e601849a35f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -2,7 +2,7 @@ , libxml2, python3, libnotify, wrapGAppsHook, libmediaart , gobject-introspection, gnome-online-accounts, grilo, grilo-plugins , pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib -, itstool, gnome3, gst_all_1, libdazzle, libsoup }: +, itstool, gnome3, gst_all_1, libdazzle, libsoup, gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 glib libmediaart gnome-online-accounts gobject-introspection gdk_pixbuf gnome3.adwaita-icon-theme python3 grilo grilo-plugins libnotify libdazzle libsoup - gnome3.gsettings-desktop-schemas tracker + gsettings-desktop-schemas tracker gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]; propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 4a3c59eb3e53..3a28b8635a11 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook, itstool, desktop-file-utils, python3 , glib, gtk3, evolution-data-server , libuuid, webkitgtk, zeitgeist -, gnome3, libxml2 }: +, gnome3, libxml2, gsettings-desktop-schemas }: let version = "3.32.1"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gtk3 libuuid webkitgtk gnome3.tracker gnome3.gnome-online-accounts zeitgeist - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 99b1cd3adf94..0a33a3bff559 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -4,7 +4,7 @@ , grilo, gnome-online-accounts , desktop-file-utils, wrapGAppsHook , gnome3, gdk_pixbuf, gexiv2, geocode-glib -, dleyna-renderer, dbus, meson, ninja, python3 }: +, dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }: let pname = "gnome-photos"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gegl babl libgdata libdazzle - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gdk_pixbuf gnome3.adwaita-icon-theme gfbgraph grilo-plugins grilo gnome-online-accounts tracker diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index fcce09e6c4f0..6ed00cd23f17 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection -, libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }: +, libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-weather-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas + libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index d48c59b093dc..a1d841646408 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,7 +1,7 @@ { stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib -, gnome3, wrapGAppsHook, telepathy-logger, gspell }: +, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let pname = "polari"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas + gtk3 glib adwaita-icon-theme gsettings-desktop-schemas telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ]; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 4b286a9a7c66..21e8019d9371 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, gobject-introspection , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, gpgme, python3, openldap, gcr -, libsecret, avahi, p11-kit, openssh }: +, libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "seahorse"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gcr - gnome3.gsettings-desktop-schemas gnupg + gsettings-desktop-schemas gnupg gnome3.adwaita-icon-theme gpgme libsecret avahi libsoup p11-kit openssh openldap libpwquality diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 19f2783be3d3..5a08454cb35e 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -6,7 +6,7 @@ , telepathy-logger, libnotify, clutter, libsoup, gnutls , evolution-data-server, yelp-xsl , libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info -, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee +, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee, gsettings-desktop-schemas , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gcr libsecret libpulseaudio gdk_pixbuf libnotify clutter libsoup gnutls libgee p11-kit libcanberra-gtk3 telepathy-farstream farstream - gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index ebea09224060..817c8324c6b2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3 }: +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: let pname = "gnome-bluetooth"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 38613bae2e9a..5d980c3c347a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,6 +1,6 @@ { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 -, gnome3, mpfr, gmp, libsoup, libmpc }: +, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 gtksourceview4 mpfr gmp gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas libsoup libmpc + gsettings-desktop-schemas libsoup libmpc ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index b287cf35194c..099bfebd9bbf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -2,7 +2,7 @@ , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts , wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib -, vala, meson, ninja, libhandy }: +, vala, meson, ninja, libhandy, gsettings-desktop-schemas }: let version = "3.32"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas + gtk3 glib evolution-data-server gsettings-desktop-schemas folks gnome-desktop telepathy-glib libhandy libxml2 gnome-online-accounts cheese gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 21c152670754..6f49afe82bf2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch -, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: +, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gtk3 glib libseccomp ]; - propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; + propagatedBuildInputs = [ gsettings-desktop-schemas ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index a15d2d7f6e62..613de6c3c164 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk3, glib }: +, gnome3, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-dictionary-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index ed3a8e2e9d5e..8e09b152e83a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify -, itstool, gnome3, libxml2 +, itstool, gnome3, libxml2, gsettings-desktop-schemas , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 udisks2 gnome3.adwaita-icon-theme - gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas + gnome3.gnome-settings-daemon gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index f5cc430472d3..1d14481e7783 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils -, gnome3 }: +, gnome3, gsettings-desktop-schemas }: let pname = "gnome-screenshot"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 7a469239fc51..83159c2ad72f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: +, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { name = "gnome-system-monitor-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg - gnome3.gsettings-desktop-schemas systemd + gsettings-desktop-schemas systemd ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index c1bdcd6956e7..000000000000 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection -, meson -, ninja -, python3 - # just for passthru -, gnome3 }: - -stdenv.mkDerivation rec { - name = "gsettings-desktop-schemas-${version}"; - version = "3.32.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; - }; - - # meson installs the schemas to share/glib-2.0/schemas - # We add the override file there too so it will be compiled and later moved by - # glib's setup hook. - preInstall = '' - mkdir -p $out/share/glib-2.0/schemas - cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF - [org.gnome.desktop.background] - picture-uri=''' - - [org.gnome.desktop.screensaver] - picture-uri=''' - EOF - ''; - - postPatch = '' - chmod +x build-aux/meson/post-install.py - patchShebangs build-aux/meson/post-install.py - ''; - - buildInputs = [ glib gobject-introspection ]; - - nativeBuildInputs = [ pkgconfig python3 meson ninja ]; - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 6dea270f6c0a..688e8cc93657 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -2,7 +2,7 @@ , desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf -, substituteAll, bubblewrap, gst_all_1 +, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base - gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; propagatedBuildInputs = [ gnome-autoar ]; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b120b693d657..8680e3ed81da 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -84,7 +84,7 @@ lib.makeScope pkgs.newScope (self: with self; { gjs = callPackage ./core/gjs { }; glib-networking = pkgs.glib-networking.override { - inherit gsettings-desktop-schemas; + inherit (pkgs) gsettings-desktop-schemas; }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; @@ -145,8 +145,6 @@ lib.makeScope pkgs.newScope (self: with self; { grilo-plugins = callPackage ./core/grilo-plugins { }; - gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; @@ -395,6 +393,7 @@ lib.makeScope pkgs.newScope (self: with self; { libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; + inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; gtkmm = gtkmm3; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index dcf0bd439420..d1e5179063f3 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - gdl, libgda, gtksourceview, + gdl, libgda, gtksourceview, gsettings-desktop-schemas, itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gdl libgda gtksourceview - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index bf0ef7d34a05..fd7f7ef609df 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -1,5 +1,5 @@ { stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libsoup +, pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas , itstool, libxml2, python3Packages , gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python ]; buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas + gtk3 glib gsettings-desktop-schemas gdk_pixbuf gnome3.adwaita-icon-theme libnotify gnome3.gnome-shell python3Packages.pygobject3 libsoup gnome3.gnome-settings-daemon gnome3.nautilus diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 67f2552b4348..543453a2bd31 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: +, gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gtkhtml-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas ]; + gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 466e7b6f22fb..2726ea2b9368 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas +{ stdenv, runCommand, mutter, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas , extraGSettingsOverrides ? "" , extraGSettingsOverridePackages ? [] }: @@ -9,7 +9,7 @@ let elementary-settings-daemon epiphany gala - gnome3.mutter + mutter gsettings-desktop-schemas gtk3 plank @@ -23,7 +23,7 @@ with stdenv.lib; runCommand "elementary-gsettings-desktop-schemas" {} '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -rf ${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages} diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index c3cac531263a..34b3d4ee99c6 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }: +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "flatpak"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp libsoup lzma ostree polkit python3 systemd xorg.libXau - gnome3.gsettings-desktop-schemas glib-networking + gsettings-desktop-schemas glib-networking ]; checkInputs = [ valgrind ]; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix new file mode 100644 index 000000000000..c1bdcd6956e7 --- /dev/null +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection +, meson +, ninja +, python3 + # just for passthru +, gnome3 }: + +stdenv.mkDerivation rec { + name = "gsettings-desktop-schemas-${version}"; + version = "3.32.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; + }; + + # meson installs the schemas to share/glib-2.0/schemas + # We add the override file there too so it will be compiled and later moved by + # glib's setup hook. + preInstall = '' + mkdir -p $out/share/glib-2.0/schemas + cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + [org.gnome.desktop.background] + picture-uri=''' + + [org.gnome.desktop.screensaver] + picture-uri=''' + EOF + ''; + + postPatch = '' + chmod +x build-aux/meson/post-install.py + patchShebangs build-aux/meson/post-install.py + ''; + + buildInputs = [ glib gobject-introspection ]; + + nativeBuildInputs = [ pkgconfig python3 meson ninja ]; + + meta = with stdenv.lib; { + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 27c638d8a87f..30b33c7aea97 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi -, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook, gsettings-desktop-schemas , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gsettings-desktop-schemas fribidi libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 28fa6a9ebd97..780b7d630cb7 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; - buildInputs = [ glib gtk3 gnome3.gsettings-desktop-schemas ]; + buildInputs = [ glib gtk3 gsettings-desktop-schemas ]; meta = with stdenv.lib; { description = "Desktop integration portals for sandboxed apps"; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index cb6853c9a443..c0f0aa1bf938 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook , gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio -, xlibsWrapper +, xlibsWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.adwaita-icon-theme avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 4207bac44732..eccf463d77cd 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme , dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook -, runtimeShell }: +, runtimeShell, gsettings-desktop-schemas }: let versionSuffix = "20190205202117.6394d03e6c"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { freetype gdk_pixbuf glib - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gtk3 libnotify nspr diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ec5911891c2..4fb9ac2cb302 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5358,9 +5358,7 @@ in remind = callPackage ../tools/misc/remind { }; - remmina = callPackage ../applications/networking/remote/remmina { - gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; - }; + remmina = callPackage ../applications/networking/remote/remmina { }; rename = callPackage ../tools/misc/rename { }; @@ -15934,7 +15932,7 @@ in gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; - inherit (gnome3) gsettings-desktop-schemas; + gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { }; go-font = callPackage ../data/fonts/go-font { }; @@ -16772,7 +16770,6 @@ in cinelerra = callPackage ../applications/video/cinelerra { }; claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { - inherit (gnome3) gsettings-desktop-schemas; inherit (xorg) libSM; }; @@ -18428,7 +18425,7 @@ in libvmi = callPackage ../development/libraries/libvmi { }; liferea = callPackage ../applications/networking/newsreaders/liferea { - inherit (gnome3) gsettings-desktop-schemas dconf; + inherit (gnome3) dconf; }; lightworks = callPackage ../applications/video/lightworks { @@ -20731,9 +20728,7 @@ in openssl = null; }; - roxterm = callPackage ../applications/misc/roxterm { - inherit (gnome3) gsettings-desktop-schemas; - }; + roxterm = callPackage ../applications/misc/roxterm { }; termonad-with-packages = callPackage ../applications/misc/termonad { inherit (haskellPackages) ghcWithPackages; @@ -21777,8 +21772,8 @@ in mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5 lib fetchurl; - inherit (gnome3) gsettings-desktop-schemas; gconf = gnome2.GConf; + inherit gsettings-desktop-schemas; }; in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); -- cgit 1.4.1 From 5c1d710a6b7c137ed920288792ed1a1e95ce418a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 14 Sep 2018 20:58:06 +0200 Subject: gtranslator: init at 3.32.0 --- pkgs/tools/text/gtranslator/default.nix | 68 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/tools/text/gtranslator/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix new file mode 100644 index 000000000000..20f1bc845cde --- /dev/null +++ b/pkgs/tools/text/gtranslator/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, itstool +, gettext +, python3 +, wrapGAppsHook +, libxml2 +, libgda +, gspell +, glib +, gtk3 +, gtksourceview4 +, gnome3 +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gtranslator"; + version = "3.32.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1dqigah7x6h3afw5jcs3lw3h9y0acj72arcgxr89l6galvknr2xa"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + itstool + gettext + python3 + wrapGAppsHook + ]; + + buildInputs = [ + libxml2 + glib + gtk3 + gtksourceview4 + libgda + gettext + gspell + gsettings-desktop-schemas + ]; + + postPatch = '' + chmod +x build-aux/meson/meson_post_install.py + patchShebangs build-aux/meson/meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "GNOME translation making program"; + homepage = https://wiki.gnome.org/Apps/Gtranslator; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fb9ac2cb302..f3e9cb8a5e8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9006,6 +9006,8 @@ in gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; + gtranslator = callPackage ../tools/text/gtranslator { }; + guff = callPackage ../tools/graphics/guff { }; guile-lint = callPackage ../development/tools/guile/guile-lint { -- cgit 1.4.1 From a7ac9613669dd8c0931e2cacfb425b7dc98c1a03 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Apr 2019 21:18:05 -0500 Subject: dhcpcd: 7.1.1 -> 7.2.0 https://roy.marples.name/blog/dhcpcd-7-2-0-released --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 04652ea868d0..47ed55f914cf 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.1.1"; + name = "dhcpcd-7.2.0"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "0h94g5nl9bg3x3qaajqaz6izl6mlvyjgp93nifnlfb7r7n3j8yd2"; + sha256 = "0hmjxix7jmbbzgjw8chxgp6kzmwf5sxdimb35i1cnsm830rmbzsz"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From b25ffa1246399c2cead7412d4cfd35d4cc31a59d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Apr 2019 22:06:48 -0500 Subject: zstd: 1.3.8 -> 1.4.0 https://github.com/facebook/zstd/releases/tag/v1.4.0 --- pkgs/tools/compression/zstd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 815236466590..ff2589031b6b 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.8"; + version = "1.4.0"; src = fetchFromGitHub { - sha256 = "03jfbjzgqy5gvpym28r2phphdn536zvwfc6cw58ffk5ssm6blnqd"; + sha256 = "1gfxi3ymgavjfxh84rhfjan7l4pymwfrn051nwc7n0s3mxp09m6v"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace programs/zstdgrep \ - --replace "=grep" "=${gnugrep}/bin/grep" \ - --replace "=zstdcat" "=$out/bin/zstdcat" + --replace ":-grep" ":-${gnugrep}/bin/grep" \ + --replace ":-zstdcat" ":-$out/bin/zstdcat" substituteInPlace programs/zstdless \ --replace "zstdcat" "$out/bin/zstdcat" -- cgit 1.4.1 From ab4b33cdbf3438464fe5e5634adf9bf55ae08fd2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Apr 2019 21:16:00 -0500 Subject: libseccomp: 2.4.0 -> 2.4.1 https://github.com/seccomp/libseccomp/releases/tag/v2.4.1 --- pkgs/development/libraries/libseccomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 0571cc5b3ac5..54ca09a7b0db 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f"; + sha256 = "1s06h2cgk0xxwmhwj72z33bllafc1xqnxzk2yyra2rmg959778qw"; }; outputs = [ "out" "lib" "dev" "man" ]; -- cgit 1.4.1 From aa2468f4a112039647a96fa5232710d1d2f6e8b4 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 17 Apr 2019 20:25:40 -0400 Subject: cracklib: fix cross build --- pkgs/development/libraries/cracklib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index d335a286c87b..ea3f5e6476bc 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,5 +1,5 @@ let version = "2.9.7"; in -{ stdenv, fetchurl, zlib, gettext +{ stdenv, lib, buildPackages, fetchurl, zlib, gettext , wordlists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; sha256 = "12fk8w06q628v754l357cf8kfjna98wj09qybpqr892az3x4a33z"; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py"; }; + nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; buildInputs = [ zlib gettext ]; postPatch = '' @@ -25,12 +26,12 @@ stdenv.mkDerivation rec { ''; postInstall = '' - make dict + make dict-local ''; doInstallCheck = true; installCheckTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/cracklib/cracklib; description = "A library for checking the strength of passwords"; license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists -- cgit 1.4.1 From 20194c1befe1ea4e27176b6fa4279a968625c208 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Apr 2019 10:29:17 -0700 Subject: xmrig-proxy: 2.14.0 -> 2.14.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmrig-proxy/versions --- pkgs/applications/misc/xmrig/proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 6040b60707a2..2e7c3f5c14dd 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "0yw9g18blrwncy1ya9iwbfx8l7bs0v6nmnkk71bxz4zj9d8dkal3"; + sha256 = "1sw00qz4yg8cwmm3s64bqr3lki6bxmlsi4ankyy2l4dx1vs9kf6r"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From e1c7c1981afb7b68af7939ff52945dd07d61bf61 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Apr 2019 21:15:06 -0500 Subject: libcap: 2.26 -> 2.27 https://sites.google.com/site/fullycapable/release-notes-for-libcap/releasenotesfor227 --- pkgs/os-specific/linux/libcap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index c6055c2e8497..87f354aa75d3 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libcap-${version}"; - version = "2.26"; + version = "2.27"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz"; - sha256 = "12s5b8fp61jcn4qld8a7fakcz1han4a6l3b8cyl3n6r7hk2bfc5n"; + sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs"; }; outputs = [ "out" "dev" "lib" "man" "doc" "pam" ]; -- cgit 1.4.1 From 55542f0cfbac710769c3618fa21d653897b6d5d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Apr 2019 11:16:12 -0700 Subject: zotero: 5.0.60 -> 5.0.66 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/zotero/versions --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9ca46e6e7cdb..025b772d73b6 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { name = "zotero-${version}"; - version = "5.0.60"; + version = "5.0.66"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "0753xk95shhxma4dvdxrj2q6y81z8lianxg7jnab9m17fb67jy2d"; + sha256 = "1dpcwpag95a4r46z03a3gqklis0q7nzqgjg34qfxxxb2lr7s1lsm"; }; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; -- cgit 1.4.1 From b249f2c2d95ee789a6776fd81808365b9cca4f38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Apr 2019 10:58:53 -0700 Subject: yubico-piv-tool: 1.6.2 -> 1.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yubico-piv-tool/versions --- pkgs/tools/misc/yubico-piv-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index c214598ce1b3..b5c5aca0883b 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.6.2"; + name = "yubico-piv-tool-1.7.0"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "06r3vxgj7qrk8si7khjy696sm45h3w9d0rrrj0hyswalqzavqqga"; + sha256 = "0zzxh8p9p097zkh9b3prbnigxsc2wy1pj1r8f5ikli9i81z54a5l"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From bd878ef0832d7eed1e148268b716ce20ac3cfaab Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Fri, 15 Mar 2019 10:10:29 +0100 Subject: pango: make x11 optional, disabled on darwin --- pkgs/development/libraries/pango/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ef60b331fc6c..b67db91ef642 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz +{ stdenv, fetchurl, pkgconfig, cairo, harfbuzz , libintl, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib +, x11Support? !stdenv.isDarwin, libXft }: with stdenv.lib; @@ -32,7 +33,8 @@ in stdenv.mkDerivation rec { CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo glib libXft libintl ]; + propagatedBuildInputs = [ cairo glib libintl ] ++ + optional x11Support libXft; patches = [ (fetchurl { -- cgit 1.4.1 From b7a41a280f6172c13e9dc3f5d6fe499c9f898c0c Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Tue, 16 Apr 2019 22:56:48 +0200 Subject: cairo: make x11 optional, disabled on darwin --- pkgs/development/libraries/cairo/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 38dfceb2e004..0151bac402cd 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,7 +1,8 @@ { config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv -, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg +, libintl, expat, zlib, libpng, pixman, fontconfig, freetype +, x11Support? !stdenv.isDarwin, libXext, libXrender , gobjectSupport ? true, glib -, xcbSupport ? true # no longer experimental since 1.12 +, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 , libGLSupported , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) , libGL ? null # libGLU_combined is no longer a big dependency @@ -52,8 +53,8 @@ in stdenv.mkDerivation rec { Carbon ]); - propagatedBuildInputs = - with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] + propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ] + ++ optionals x11Support [ libXext libXrender ] ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib ++ optional glSupport libGL -- cgit 1.4.1 From 5621a0ae359648ea9ebf6653b118c00bc48f8701 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:33 +0200 Subject: python: Cython: 0.29.5 -> 0.29.7 --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 9a2925dcaf1c..817edff9df82 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.5"; + version = "0.29.7"; src = fetchPypi { inherit pname version; - sha256 = "9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1"; + sha256 = "55d081162191b7c11c7bfcb7c68e913827dfd5de6ecdbab1b99dab190586c1e8"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 335d7bc2feb13997863f9b42c78f0b24f710bde1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:33 +0200 Subject: python: Mako: 1.0.7 -> 1.0.9 --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 83075f33c420..e611d660b843 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.0.7"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"; + sha256 = "0728c404877cd4ca72c409c0ea372dc5f3b53fa1ad2bb434e1d216c0444ff1fd"; }; checkInputs = [ markupsafe nose mock pytest_3 ]; -- cgit 1.4.1 From 90f5832c8cda50f6fb962dd3f6873e9fdeae2c9a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:33 +0200 Subject: python: absl-py: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/absl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 1e4f2f76b0bd..29cb06310432 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "8718189e4bd6013bf79910b9d1cb0a76aecad8ce664f78e1144980fabdd2cd23"; + sha256 = "b943d1c567743ed0455878fcd60bc28ac9fae38d129d1ccfad58079da00b8951"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From ff5b3300dfbacc0e465b342cbd3ba360fb0edf60 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:33 +0200 Subject: python: agate-sql: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/agate-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 9d89433f1b90..82da607b3ef0 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "877b7b85adb5f0325455bba8d50a1623fa32af33680b554feca7c756a15ad9b4"; + sha256 = "9277490ba8b8e7c747a9ae3671f52fe486784b48d4a14e78ca197fb0e36f281b"; }; propagatedBuildInputs = [ agate sqlalchemy ]; -- cgit 1.4.1 From 0a323058b32e1238c66200dd043f7910c12a2c49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:33 +0200 Subject: python: aioconsole: 0.1.13 -> 0.1.14 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index afe9c6fb29c9..aa8ed3929347 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.13"; + version = "0.1.14"; src = fetchPypi { inherit pname version; - sha256 = "8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f"; + sha256 = "f1ddd04050d9be5e93e223a4e9367433436d245f8fe70905f4124bfde2cd3cdd"; }; # hardcodes a test dependency on an old version of pytest-asyncio -- cgit 1.4.1 From 5111d50796b80124ad42ee17feff39b2219a725e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:33 +0200 Subject: python: alembic: 1.0.7 -> 1.0.9 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index ff9901765fb4..429efb8d0688 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.0.7"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2"; + sha256 = "40b9a619aa5f25ea1e1508adcda88b33704ef28e02c9cfa6471e5c772ecf0829"; }; buildInputs = [ pytest pytestcov mock coverage ]; -- cgit 1.4.1 From cfb9fd898ad5dc90bcbf6126abd8353a3aa8ff42 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:33 +0200 Subject: python: ansible-runner: 1.3.0 -> 1.3.2 --- pkgs/development/python-modules/ansible-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 2ea96b93772e..b3bb47334236 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.3.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1zys65vq0jqyzdmchaydzsvlf0ysw2y58sapjq6wzc6yw6pdyigz"; + sha256 = "6e4d8256351228c00fe68697e7f5ad2a2e0fd4085084b913eda22735023bb891"; }; checkInputs = [ pytest mock ]; -- cgit 1.4.1 From 1ec2cb1d04e46f42b01eca1ea0e128b716eecae3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:33 +0200 Subject: python: argcomplete: 1.9.4 -> 1.9.5 --- pkgs/development/python-modules/argcomplete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 37d97f42aa1f..5e45aeb09799 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.9.4"; + version = "1.9.5"; src = fetchPypi { inherit pname version; - sha256 = "06c8a54ffaa6bfc9006314498742ec8843601206a3b94212f82657673662ecf1"; + sha256 = "94423d1a56cdec2ef47699e02c9a48cf8827b9c4465b836c0cefb30afe85e59a"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". -- cgit 1.4.1 From ac5fad108876ca7e285e07c6a9ba215189f570c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: astroid: 1.6.5 -> 1.6.6 --- pkgs/development/python-modules/astroid/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix index ca26da5a3737..810a4f7ebc87 100644 --- a/pkgs/development/python-modules/astroid/1.6.nix +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "astroid"; - version = "1.6.5"; + version = "1.6.6"; src = fetchPypi { inherit pname version; - sha256 = "0fir4b67sm7shcacah9n61pvq313m523jb4q80sycrh3p8nmi6zw"; + sha256 = "d25869fc7f44f1d9fb7d24fd7ea0639656f5355fc3089cd1f3d18c6ec6b124c7"; }; # From astroid/__pkginfo__.py -- cgit 1.4.1 From 76672a4cb01a704b555daa152800cc4a73a81c7a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: astropy-helpers: 3.1 -> 3.1.1 --- pkgs/development/python-modules/astropy-helpers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix index 79d6e852c681..dc6ca8c83cef 100644 --- a/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "astropy-helpers"; - version = "3.1"; + version = "3.1.1"; disabled = !isPy3k; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "37caf1f21bfdf653f7bb9f5b070dc1bb59cd70c0e09f9c5742401f57400a6e52"; + sha256 = "214cc37cffd7a21e573c4543e47b5289b07b2b77511627802d9778a4c96a5caf"; }; meta = with lib; { -- cgit 1.4.1 From 8baeed45609c74e0ee4ce1c637d6dfea45df2b26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: atomman: 1.2.4 -> 1.2.5 --- pkgs/development/python-modules/atomman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index d2a25cf738a5..07757d5304b0 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "1.2.4"; + version = "1.2.5"; pname = "atomman"; src = fetchPypi { inherit pname version; - sha256 = "c204d52cdfb2a7cc4d7d2c4f7a89c215a9fd63b92495a83adf25ae4e820cea3e"; + sha256 = "10eca8c6fc890f2ee2e30f65178c618175529e9998be449e276f7c3d1dce0e95"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From c4d7f9478075124a1eea20ec5359ee022e9c9fd4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: autopep8: 1.4.3 -> 1.4.4 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 0106deb7eb78..d6b751034c65 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "33d2b5325b7e1afb4240814fe982eea3a92ebea712869bfd08b3c0393404248c"; + sha256 = "4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee"; }; propagatedBuildInputs = [ pycodestyle ]; -- cgit 1.4.1 From 272c9362c8fd15fba65cc2cbed5bc2b20686fcad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: awkward: 0.8.14 -> 0.8.15 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 60b21322b870..ea41b8b29909 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.8.14"; + version = "0.8.15"; src = fetchPypi { inherit pname version; - sha256 = "1mf8ddxn7bdlhic5xcd8nvskp3cmyv8vk2hz52hb7faixsgvgj18"; + sha256 = "0d1ae42babfe7fdde324eea685c71ecc638132b2015ffa22687d52d36dc1c78b"; }; nativeBuildInputs = [ pytestrunner ]; -- cgit 1.4.1 From d92ca7a7a0f9ca6bcd1253704388764620bfabfc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: cffi: 1.12.1 -> 1.12.2 --- pkgs/development/python-modules/cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 7eca740953f8..22d25fa9cffb 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.12.1"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033"; + sha256 = "e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7"; }; outputs = [ "out" "dev" ]; -- cgit 1.4.1 From 47583a01f292343614d512799390cc6548099de0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: chainmap: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/chainmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix index c2815d876e34..eb769ed46239 100644 --- a/pkgs/development/python-modules/chainmap/default.nix +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "chainmap"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0"; + sha256 = "e42aaa4b3e2f66102a11bfd563069704bfbfd84fdcb517b564effd736bf53cd9"; }; # Requires tox -- cgit 1.4.1 From a5702bf93163b27b2f5d11876a849a5bdda93b3d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: Chameleon: 3.6 -> 3.6.1 --- pkgs/development/python-modules/chameleon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 41e653354e7b..7f146537585c 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "3.6"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0141kfwx553q73wzfl624pppmbhh7fpzvaj5pbj21pqlk2rhfx75"; + sha256 = "850f74f756bcb99423dd2658b99f448b09f09ccc2c60c0a2d6dec52294d7f9ed"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 2c55c775d49842cedb58a9fd1210e153f3814cba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: cloudpickle: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 548317a9835a..33d036ad8d42 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "18d3a5dfc82f752b9f4c844cceb663213e26e130f4a2894a18ad1f11d57a30bc"; + sha256 = "3ea6fd33b7521855a97819b3d645f92d51c8763d3ab5df35197cd8e96c19ba6f"; }; buildInputs = [ pytest mock ]; -- cgit 1.4.1 From e0a44a749883031ae7678246532f142eec3ad04c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: configparser: 3.7.3 -> 3.7.4 --- pkgs/development/python-modules/configparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 93b5e58a7745..7fce23f89c11 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "3.7.3"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "27594cf4fc279f321974061ac69164aaebd2749af962ac8686b20503ac0bcf2d"; + sha256 = "da60d0014fd8c55eb48c1c5354352e363e2d30bbf7057e5e171a468390184c75"; }; # No tests available -- cgit 1.4.1 From f42094d92533d3d130b95f0bdbfea72426a06dc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: coverage: 4.5.2 -> 4.5.3 --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 1b0839fd4886..b6eb73a80386 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "4.5.2"; + version = "4.5.3"; src = fetchPypi { inherit pname version; - sha256 = "ab235d9fe64833f12d1334d29b558aacedfbca2356dfb9691f2d0d38a8a7bfb4"; + sha256 = "9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609"; }; # No tests in archive -- cgit 1.4.1 From 148f68269a1d0633428485c74fc1bfcb175e4c5a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:34 +0200 Subject: python: cx_Oracle: 7.1.1 -> 7.1.2 --- pkgs/development/python-modules/cx_oracle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 58126c7d1e68..1976b30cc17e 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.1.1"; + version = "7.1.2"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "17d760bdf89e364fc7c964c5640c1b38cbb22ab49b53830883f21fda92c59131"; + sha256 = "7d0e30d6ce62bedd41ae4885d43fff727314b67655ec8737b8af5cc0aad7f925"; }; preConfigure = '' -- cgit 1.4.1 From 8ec42d2824ae1a6cd6ab09fa5fd6bed726c3fbca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: dask: 1.1.1 -> 1.1.5 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 93351de1125a..8a2bd2187f94 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "1.1.1"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "2e70135d6856805699b52774d8e0cec41beda92bdfc9f9c776962b4bfb34822c"; + sha256 = "4b0b82a4d61714d3a49953274b1a8a689a51eacf89c4c2ff18aa7f6282ce515e"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From a511a250bb173b7930910a069dcd1b53a4d134fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: ddt: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/ddt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index f09bf96229fc..46a229a99aea 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ddt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "898364fc34b27981b925171a0011c174c94633cb678eb1fac05fe7a234c7912c"; + sha256 = "d13e6af8f36238e89d00f4ebccf2bda4f6d1878be560a6600689e42077e164e3"; }; checkInputs = [ nose six pyyaml mock ]; -- cgit 1.4.1 From e12be97fb9c86f75a4150b7d145669a7a4305b80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: dependency-injector: 3.14.4 -> 3.14.5 --- pkgs/development/python-modules/dependency-injector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 16a5088c33d9..d6315575766f 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.14.4"; + version = "3.14.5"; src = fetchPypi { inherit pname version; - sha256 = "ecac135cc4e5824b6bf8242679fc7225f44885877677701da6de7703f060f518"; + sha256 = "5e0c73fbec99d2782479f6d8c292be87ed8672eb42b451e7f7a5d52a3458c4e5"; }; propagatedBuildInputs = [ six ]; -- cgit 1.4.1 From 9f3249f4ac8fa8323488e765f6e1c9b2603386ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: devpi-common: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/devpi-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 4a070a578731..6bdda6ac5ea7 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.3.1"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "30833581d03e07d7574b2ff698d213c984777dd44dd47c45c54d31858c694c94"; + sha256 = "2c7a6471c0f5b07ac9257adec3b3c3a89193ee672fdeb0a6f29487dc9d675e0c"; }; propagatedBuildInputs = [ requests py ]; -- cgit 1.4.1 From 7d5485bce4c7692ec2ef172bba274da4c0c7f017 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: distributed: 1.26.0 -> 1.26.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index cc28b6e36065..25beee94e105 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "1.26.0"; + version = "1.26.1"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "1f5hnmkj89z3lgig6wbyrvwvd4vnhkm4rf7v2ndn79mpiv1c9zxr"; + sha256 = "768d9cbd91a7df4a2e391729ec00e387d98e8092d61d076b2272839eb12666f7"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; -- cgit 1.4.1 From 462427e3f5aae1bbe0bc86fc59d155168579dd7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: django-cors-headers: 2.5.0 -> 2.5.2 --- pkgs/development/python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 475f004342c7..dba790612ed3 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "2.5.0"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "02irmhj61mhz3kaw9md4rqpavzkcvkhfk5lhgvss39yras5sxbm8"; + sha256 = "fb44f6b9f10de847919305c3f0d38fcfbadfe0dd5cf1c866f37df66ad0dda1bb"; }; propagatedBuildInputs = [ django ]; -- cgit 1.4.1 From a4c85bfa3ff13a805d1bdcce5e80cf62d605f2f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: django-rest-auth: 0.9.3 -> 0.9.5 --- pkgs/development/python-modules/django-rest-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix index 696376b3e4bd..a6edc98b0cb8 100644 --- a/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-rest-auth"; - version = "0.9.3"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "ad155a0ed1061b32e3e46c9b25686e397644fd6acfd35d5c03bc6b9d2fc6c82a"; + sha256 = "f11e12175dafeed772f50d740d22caeab27e99a3caca24ec65e66a8d6de16571"; }; propagatedBuildInputs = [ django djangorestframework six ]; -- cgit 1.4.1 From 49c0cfacc3cddcc2e233c189e9ee84270ee1175c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: django-appconf: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/django_appconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index 35ac57062c75..9aa3c58d69d5 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "django-appconf"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba"; + sha256 = "35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3"; }; # No tests in archive -- cgit 1.4.1 From 29242cb737a42eeb2d7480c24bb47c9fcf6a3c4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: dkimpy: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/dkimpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 5ebedf67b8df..ef0a6f907412 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "0rq3543m0q7kfl02l8ji4c35qbxb99h2mzjaxbaxfrlk6dcpk76j"; + sha256 = "83d5ddc1b83304dbccba1dc7b9e0ee37bec4269bb9ad5779480991525c3811d6"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From 33458e6eddc84fc4860894b355254436583894fd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: dnslib: 0.9.9 -> 0.9.10 --- pkgs/development/python-modules/dnslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 15c771ebaf52..65f45ca86f6b 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.9"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "0w8spp4fnw63xx9zj77zvgk1qabd97ifrj6gap2j36gydnarr42c"; + sha256 = "666bf55274a630a2925411c4ea9ca724529299bbe70f91979ad99c72c5e5099e"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; -- cgit 1.4.1 From edc03bc94f75c7be4fcc12a598b146c71b4e475b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: docker: 3.7.0 -> 3.7.2 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 71e411a24f3a..fc6169f1b136 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.7.0"; + version = "3.7.2"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "2840ffb9dc3ef6d00876bde476690278ab13fa1f8ba9127ef855ac33d00c3152"; + sha256 = "c456ded5420af5860441219ff8e51cdec531d65f4a9e948ccd4133e063b72f50"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From a7664ca7485832f35951c16efc43d3f4340955f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: emoji: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 082958fcce19..c00ca778bc6c 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "a9e9c08be9907c0042212c86dfbea0f61f78e9897d4df41a1d6307017763ad3e"; + sha256 = "9ae01495fc3fcc04e9136ca1af8cae58726ec5dfaaa92f61f0732cbae9a12fa9"; }; checkInputs = [ nose ]; -- cgit 1.4.1 From 0f57e375e7c86c1bfcc3269a73bc7152615139e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: Faker: 1.0.2 -> 1.0.5 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 548c7a59bc6f..1828fb49de28 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.2"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0v1pjzn9z20ckgv3kji7c8nwcsm7670z4i43ic9skjrdbcqylwfq"; + sha256 = "3f2f4570df28df2eb8f39b00520eb610081d6552975e926c6a2cbc64fd89c4c1"; }; buildInputs = [ pytestrunner ]; -- cgit 1.4.1 From d492257a6e4f3c05a38a7e927dc1e466ba395b49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: filebytes: 0.9.18 -> 0.9.20 --- pkgs/development/python-modules/filebytes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index fdc00d000a1e..b02ff0c74579 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "filebytes"; - version = "0.9.18"; + version = "0.9.20"; src = fetchPypi { inherit pname version; - sha256 = "1y50wagcs1p5w1j4fxyfr209595m706ifdirv8vr8nc9xqd6ngjs"; + sha256 = "6c33986ca048e49cf1a5e2f167af9f02c7f866576b3b91a8a9124d32e57f935d"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 5f2734183531a723c311aa9bb1cb2132c9ae73f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:35 +0200 Subject: python: flake8: 3.7.6 -> 3.7.7 --- pkgs/development/python-modules/flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 966bf5877bda..675e5ea86f59 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.7.6"; + version = "3.7.7"; src = fetchPypi { inherit pname version; - sha256 = "6d8c66a65635d46d54de59b027a1dda40abbe2275b3164b634835ac9c13fd048"; + sha256 = "859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661"; }; checkInputs = [ pytest mock pytestrunner ]; -- cgit 1.4.1 From 3d2c401db3a66ed56d044bf15d6303f865e8edaa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: folium: 0.8.0 -> 0.8.3 --- pkgs/development/python-modules/folium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 1557cfdd52d5..4664e095d26c 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.8.0"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0f25fhwxnix8hddzf67barzjwwsvpww112zisrvz2lpl08j388rn"; + sha256 = "b7a1e907caac6ddaf0614555f58ba9af2ed65356ccc77f6ba6fc3df202d8f146"; }; checkInputs = [ pytest nbconvert pandas mock ]; -- cgit 1.4.1 From f426227072d834682dc9820f8dc38801d33d8c56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: googleapis-common-protos: 1.5.8 -> 1.5.9 --- pkgs/development/python-modules/googleapis_common_protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 33dfc6e83cfb..d17b98e2b680 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.5.8"; + version = "1.5.9"; src = fetchPypi { inherit pname version; - sha256 = "d56ca712f67fff216d3be9eeeb8360ca59066d0365ba70b137b9e1801813747e"; + sha256 = "627ec53fab43d06c1b5c950e217fa9819e169daf753111a7f244e94bf8fb3384"; }; propagatedBuildInputs = [ protobuf ]; -- cgit 1.4.1 From 5cd4a102f870c83810a3d9c301a7bef3fbeb2b9d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: grappelli_safe: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/grappelli_safe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index 7c115b58d32f..5a845f733f51 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.5.1"; + version = "0.5.2"; pname = "grappelli_safe"; src = fetchPypi { inherit pname version; - sha256 = "27660faa628186d74258781edfa03ef812555d49b4925cfe19c05bcd3da85e40"; + sha256 = "35b7ccaf9acc54684c73aeefbeaddc63b8a16143bd981bd5b3ebef253def07df"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 1107ea4d046b3482b735ec347612ae9d28a3ac59 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: gym: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/gym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index b207e7ca239e..ea920663846a 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0ggac8a8qk06wplwg5xsisn9id3lis9qslri7m9rz22khlyl7z4j"; + sha256 = "f8bee3672759aeec4271169dcbb2afc069b898c7f92882d965c59be8085f2b35"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 0384360856edfcdec26cfa4f23440a98aeb01300 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: hdbscan: 0.8.19 -> 0.8.20 --- pkgs/development/python-modules/hdbscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index cbe5afcc8edf..d20c43754fce 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.19"; + version = "0.8.20"; src = fetchPypi { inherit pname version; - sha256 = "7bd74c7bd16540d7f437cf6cb61ceb4d23506f4d040c436d7570d104c1297e31"; + sha256 = "263e9f34db63eec217d50f2ca3e65049c065775dc4095b5ee817824cd2b5b51b"; }; checkInputs = [ nose ]; -- cgit 1.4.1 From 8e5488d134dbada9f86f71d6011f56231339f44f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: holoviews: 1.11.2 -> 1.11.3 --- pkgs/development/python-modules/holoviews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index ea8885def3e4..1de465cfec09 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.11.2"; + version = "1.11.3"; src = fetchPypi { inherit pname version; - sha256 = "0902wzzz73ikkdy0jfhg1lx97y1gk7v1nr3d3jqqdfzaa7bmhqwj"; + sha256 = "cb03053bfcb96ccef181405b6d3482a5b868f0c7fbaa68b52d25e0071dafd1bc"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 57313c203afecfe5bbbddc85bf1e8d950709bfd4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: homeassistant_pyozw: 0.1.2 -> 0.1.4 --- pkgs/development/python-modules/homeassistant-pyozw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix index 3292770a661e..5851d62842b6 100644 --- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix +++ b/pkgs/development/python-modules/homeassistant-pyozw/default.nix @@ -2,12 +2,12 @@ python_openzwave.overridePythonAttrs (oldAttrs: rec { pname = "homeassistant_pyozw"; - version = "0.1.2"; + version = "0.1.4"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d64389f294b1fdee57adf78cd25ba45c9095facec3d80120182bbf8ba1fcdf05"; + sha256 = "a4ec26b95dba630df8c95c617c510e4a33db93a6a39e8a97056eec7dc9a49d1e"; }; meta.homepage = https://github.com/home-assistant/python-openzwave; -- cgit 1.4.1 From 84849eb60ee367731ea095166691bd5006f3a036 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: hug: 2.4.1 -> 2.4.8 --- pkgs/development/python-modules/hug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index 33ef7de1b422..1b9542824c07 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "hug"; - version = "2.4.1"; + version = "2.4.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7b633ebbed95f4c264a745cf91450007fe7004e1eaa5b02bf9b3ad28fdd62d08"; + sha256 = "2b33904660d07df3a6a998a52d1a36e2855e56dc9ffc4eddb2158e32d1ce7621"; }; propagatedBuildInputs = [ falcon requests ]; -- cgit 1.4.1 From 1e9cc06eede651c45b9a709cd0736132ab19359f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: isort: 4.3.16 -> 4.3.17 --- pkgs/development/python-modules/isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index bb9958a6fef1..532b743bab42 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -5,11 +5,11 @@ let testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; in buildPythonPackage rec { pname = "isort"; - version = "4.3.16"; # Note 4.x is the last version that supports Python2 + version = "4.3.17"; # Note 4.x is the last version that supports Python2 src = fetchPypi { inherit pname version; - sha256 = "1v6lapqhc33rxr9698lqjyb49fis27i42p3ymngrw95py3qf7y08"; + sha256 = "268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a"; }; propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ]; -- cgit 1.4.1 From 35395c7410742f798f71f087c40842ae0e2e82bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: jedi: 0.13.2 -> 0.13.3 --- pkgs/development/python-modules/jedi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 4f713e212f47..01afa74b3b27 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.13.2"; + version = "0.13.3"; src = fetchPypi { inherit pname version; - sha256 = "571702b5bd167911fe9036e5039ba67f820d6502832285cde8c881ab2b2149fd"; + sha256 = "2bb0603e3506f708e792c7f4ad8fc2a7a9d9c2d292a358fbbd58da531695595b"; }; postPatch = '' -- cgit 1.4.1 From 5597764175c612721c808796bcc23344256402e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: jenkinsapi: 0.3.8 -> 0.3.9 --- pkgs/development/python-modules/jenkinsapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 70bf12a8f0cf..edfeb0a59714 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jenkinsapi"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "120adfc9cea83fb890744b5049c5bb7edc77699059f0da62db66354ec27c54e2"; + sha256 = "bf35b208fe05e65508f3b8bbb0f91d164b007632e27ebe5f54041174b681b696"; }; propagatedBuildInputs = [ pytz requests ]; -- cgit 1.4.1 From 5bcf82723a2819dc1f45351136dae089d100c20a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: Jinja2: 2.10 -> 2.10.1 --- pkgs/development/python-modules/jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index b800303c20cb..52827f0a23ca 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "2.10"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; + sha256 = "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From 0eb2cdeb0c4eb38821835e45c5bb82fea6700087 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: jmespath: 0.9.3 -> 0.9.4 --- pkgs/development/python-modules/jmespath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 85a9d19db2a4..cc0a78872b2d 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jmespath"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64"; + sha256 = "bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c"; }; buildInputs = [ nose ]; -- cgit 1.4.1 From ecc1215c149934f88b534a231156d056013a1455 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:36 +0200 Subject: python: kafka-python: 1.4.5 -> 1.4.6 --- pkgs/development/python-modules/kafka-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index e68bd1615fa9..891aa3f33941 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.5"; + version = "1.4.6"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "01jlklfgvggkyq5yj0zhk46xv91jhha2cshq8kbxv9f7043c201i"; + sha256 = "08f83d8e0af2e64d25f94314d4bef6785b34e3b0df0effe9eebf76b98de66eeb"; }; checkInputs = [ pytest six mock ]; -- cgit 1.4.1 From 7bc427c9009d5768823bec8f8a4a82b11dc7890b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: keyring: 18.0.0 -> 18.0.1 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 041fafaf08cd..e54283735a86 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyring"; - version = "18.0.0"; + version = "18.0.1"; src = fetchPypi { inherit pname version; - sha256 = "12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d"; + sha256 = "67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"; }; nativeBuildInputs = [ setuptools_scm ]; -- cgit 1.4.1 From b5a1f13ba83de9a4e9c3c2685bd575f3dba578f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: ldappool: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/ldappool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 3ad0ae3b7232..81301f337e62 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "ldappool-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { pname = "ldappool"; inherit version; - sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3"; + sha256 = "23edef09cba4b1ae764f1ddada828d8e39d72cf32a457e599f5a70064310ea00"; }; postPatch = '' -- cgit 1.4.1 From e3c1be6ca030b3fdee715f997e1892be9d5c2262 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: libagent: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/libagent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 939e4f18898e..e55887a49f56 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.13.0"; + version = "0.13.1"; src = fetchPypi{ inherit pname version; - sha256 = "ecd6854ba8f04d04e39cb00ae3a179d6a1d5dc8e0b60ac5208c0a62e10e3106e"; + sha256 = "b9afa0851f668612702fcd648cee47af4dc7cfe4f86d4c4a84b1a6b4a4960b41"; }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse -- cgit 1.4.1 From 36d0a85773389b649506211c087934b5f01171c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: lxml: 4.3.1 -> 4.3.3 --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 117a9699e01d..816b3a676828 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.3.1"; + version = "4.3.3"; src = fetchPypi { inherit pname version; - sha256 = "da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d"; + sha256 = "4a03dd682f8e35a10234904e0b9508d705ff98cf962c5851ed052e9340df3d90"; }; nativeBuildInputs = [ libxml2.dev libxslt.dev ]; -- cgit 1.4.1 From a81405822644db0d836e09bd93a8dedab8c0c087 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: MarkupSafe: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/markupsafe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 7a7d7f0287b6..b7c491876855 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "MarkupSafe"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3"; + sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 8b6a45261c47ca59f3c0c2708541c013910fe474 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: marshmallow-sqlalchemy: 0.16.1 -> 0.16.2 --- pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 0d8382f9b6ff..6412e04f93d3 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.1"; + version = "0.16.2"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0dv9imc41xg0k9xv0fb8ygfip7iznsnf8g33z74zz2bf1dbhricr"; + sha256 = "755e6e930c1ffe3430f62091085f0a51e0817b240986d931014f03b3556fff34"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; -- cgit 1.4.1 From 9369000bfb2cd8611f3015c05a00b1ab15ece636 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: mechanize: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/mechanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index c6e7089cdd9b..f23c3c9e20b7 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1fl6zb36cqsdiay1mn3nmjv5jw4jys5av7hb1y9995qlycg0hm49"; + sha256 = "b680ca1b4fabe5ef52024d120f40b8e2ed7d175ed4d67225d2c477dac7c7a58b"; }; propagatedBuildInputs = [ html5lib ]; -- cgit 1.4.1 From 844ade5bc1d967930aacdad90d9f235e91c531e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: minio: 4.0.13 -> 4.0.14 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index c8595f0383e7..7eea7596f433 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "minio"; - version = "4.0.13"; + version = "4.0.14"; src = fetchPypi { inherit pname version; - sha256 = "1sbmv1lskm5cs3jmn8f2688pimgibly16g8ycc6fgnsjanyby35l"; + sha256 = "72c8ab7b1c25f875273e66762982816af8ada2ced88b6cd991e979f479c34875"; }; disabled = !isPy3k; -- cgit 1.4.1 From 5c0ac13ab9afc01a1c826ac3a70be598c13a1c76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: moretools: 0.1.8 -> 0.1.9 --- pkgs/development/python-modules/moretools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index bef182558042..bdfb9e2efcae 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "moretools"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "03ni7k0kcgrm3y605c29gqlyp779fx1xc3r8xb742lzd6ni30kdg"; + sha256 = "f531cc79b7cd0c4aab590d5d4d0291f7cf6f083398be1dd523224b3385b732f4"; }; checkPhase = '' -- cgit 1.4.1 From 4d4090f3faea1f9ad9dac262ea13737e74c89e54 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: ncclient: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/ncclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 24016ef8b104..eaf75d467cb1 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "3ab58ee0d71069cb5b0e2f29a4e605d1d8417bd10af45b73ee3e817fe389fadc"; + sha256 = "47d5af7398f16d609eebd02be2ecbd997b364032b5dc6d4927c810ea24f39080"; }; checkInputs = [ nose rednose ]; -- cgit 1.4.1 From cdc5cc61194a2bc343e7acf72a48e4cbeb3bb883 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: netCDF4: 1.5.0 -> 1.5.0.1 --- pkgs/development/python-modules/netcdf4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index a274da71ce40..d8131ffc3bdf 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.0"; + version = "1.5.0.1"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1nf0cjja94zsfbp8dw83b36c4cmz9v4b0h51yh8g3q2z9w8d2n62"; + sha256 = "db24f7ca724e791574774b2a1e323ce0dfb544957fc6fbdb5d4c368f382b2de9"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From 3a3ea2f935a960931d37f5aef81d992731ba9c4b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: nilearn: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index f697e34e9995..0d2519d4e107 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.5.0"; + version = "0.5.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "085cd4f7c19a47ed9d951c853223190b9fb0dbddeaeedf8f86dfa9c53d6492ca"; + sha256 = "dca56e8a1f0fc6dcd1c997383187efc31788294ac6bcbbaebac2b9a962a44cbb"; }; # disable some failing tests -- cgit 1.4.1 From ed7b70b102e5ff7e4e2db8524b07d1f654453f72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: nipype: 1.1.8 -> 1.1.9 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index fe08e1f0789e..35dcc51efd4f 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -44,11 +44,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.8"; + version = "1.1.9"; src = fetchPypi { inherit pname version; - sha256 = "d5eec6de7d8e7020106c42b37d17f99de92824440cc79dfa6080f7c2e6d9fecc"; + sha256 = "f80096ec6cfd7cffc05764bba1749e424877140ef1373193f076bdd843f19016"; }; postPatch = '' -- cgit 1.4.1 From f1a808424f935f3620e543be7c60fb05176b2cb7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: nixpkgs-pytools: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/nixpkgs-pytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix index 9bb4a3e41f32..4a943e32d4c5 100644 --- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "nixpkgs-pytools"; - version = "1.0.0"; + version = "1.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6aaf1e990be639a0d01afb454756606f3111dd8c596b6e848d4a0cec019168d0"; + sha256 = "0796c6e95daeb3d7e61c9c53126d95ba6a48f84b995b12b60f45619caf28a574"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 708c964228b81428fc6fc40f4bfa867e0c7beea7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:37 +0200 Subject: python: notebook: 5.7.4 -> 5.7.8 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index d4b4f14cd652..ec55f1fccfe9 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.7.4"; + version = "5.7.8"; src = fetchPypi { inherit pname version; - sha256 = "d908673a4010787625c8952e91a22adf737db031f2aa0793ad92f6558918a74a"; + sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8"; }; LC_ALL = "en_US.utf8"; -- cgit 1.4.1 From e5372ad6283496b5bd5c153588c94267f4af9135 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: numpy-stl: 2.10.0 -> 2.10.1 --- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 804c90d7d9dc..4c2af8a00814 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.10.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1r864sc7anw43s8bg5yd17bxcw1a4lj5h7mz7cbwnzpb9xmqpccj"; + sha256 = "f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c"; }; checkInputs = [ pytest pytestrunner ]; -- cgit 1.4.1 From 871caa244d09e8a982649c64cccb2586a2487170 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: oauthenticator: 0.8.0 -> 0.8.2 --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index f35562d7c422..85dc80681aad 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.8.0"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "39908f01cda98186c0fedc350b68342d6016ee325615f4c8475c1e64a55d9e4f"; + sha256 = "5195b5d66808787894590926b038381eb47495c9df4fd0d907c84d86cb35132f"; }; checkPhase = '' -- cgit 1.4.1 From 6eded98e3d1f0b848fe495311761d837a3798632 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: ofxtools: 0.5.2 -> 0.5.4 --- pkgs/development/python-modules/ofxtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index 615c1f68f294..adcb640df139 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "ofxtools"; - version = "0.5.2"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "520345d3b440447696b8f84a4e752573666ff8d1fe0300316cd07995ae05176f"; + sha256 = "83e1ca0a61463fca99d096a694466726a49979a5d2b8a36a65514c7a8617d3ea"; }; checkPhase = '' -- cgit 1.4.1 From 08d5cb20b8b70a8c5dc425e6b62340b0bdb56b48 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: openpyxl: 2.6.0 -> 2.6.2 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 211e7a366275..ea12f1cc35a3 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.6.0"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "70da6b45a5925285b6a3d93570b45f4402eb2d335740163a58eef533b139565c"; + sha256 = "1d2af392cef8c8227bd2ac3ebe3a28b25aba74fd4fa473ce106065f0b73bfe2e"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From 5ff559e5e9ec74e7a63e4aca8095bde9b93a647f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: paperspace: 0.0.15 -> 0.0.19 --- pkgs/development/python-modules/paperspace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 74a223d7f808..6f73004deeb9 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "paperspace"; - version = "0.0.15"; + version = "0.0.19"; src = fetchPypi { inherit pname version; - sha256 = "af96dae7a1d84df8781aded392764953c9cbeb43d5cc314e405d3470f7c8006c"; + sha256 = "2216fb31919595ba442077e8028cc05b0598421a74604daeae4d2baa5e8409d9"; }; propagatedBuildInputs = [ boto3 requests ]; -- cgit 1.4.1 From 08044d4891b510668108756ce75b0ee3eeea90ef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: partd: 0.3.9 -> 0.3.10 --- pkgs/development/python-modules/partd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index ef706c65c6ca..c7691df6b118 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "partd"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1fd6d9c12f14ea180e659a9e4a686ff2816dd930e8fb0b84c0d8116a29cfe66b"; + sha256 = "33722a228ebcd1fa6f44b1631bdd4cff056376f89eb826d7d880b35b637bcfba"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From 6f4bb6c636e645c0b98f53edea9a65273d25d83c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: path.py: 11.5.0 -> 11.5.2 --- pkgs/development/python-modules/path.py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index a94d495310fd..318642a393a3 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "path.py"; - version = "11.5.0"; + version = "11.5.2"; src = fetchPypi { inherit pname version; - sha256 = "b6687a532a735a2d79a13e92bdb31cb0971abe936ea0fa78bcb47faf4372b3cb"; + sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa"; }; checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; -- cgit 1.4.1 From aad3208cb5fbf6d6c24cdad2ecedb092aee95ad5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: pbr: 5.1.2 -> 5.1.3 --- pkgs/development/python-modules/pbr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 6beba7717014..c3d5ba170e3f 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.1.2"; + version = "5.1.3"; src = fetchPypi { inherit pname version; - sha256 = "d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b"; + sha256 = "8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824"; }; # circular dependencies with fixtures -- cgit 1.4.1 From bed638e219ac77ecf92d4d5c58b9a5cfb7c244e8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: pdf2image: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/pdf2image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index d8fa26abf742..6d0cafd5f803 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.4.1"; + version = "1.4.2"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "c417149cb5ca52021203943e0eeb95db53580afebe728086e69671add4daeb08"; + sha256 = "694f8014f4c3722e5913f1c378c7056b1330db070ff7cb8196a80d24b80fa61e"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 5d51573a6d0b614516f146056ba4f610bbc85144 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: pecan: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/pecan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 70d71ea51792..9f3c009f8c12 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "pecan"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "24f06cf88a488b75f433e62b33c1c97e4575d0cd91eec9eec841a81cecfd6de3"; + sha256 = "b5461add4e3f35a7ee377b3d7f72ff13e93f40f3823b3208ab978b29bde936ff"; }; propagatedBuildInputs = [ singledispatch logutils ]; -- cgit 1.4.1 From dc62cdf88cd7cc05e4eff6fa61e0549d908c3ad7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: pex: 1.6.3 -> 1.6.6 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 0aa89eb76203..9f87d8a16cb0 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.3"; + version = "1.6.6"; src = fetchPypi { inherit pname version; - sha256 = "1xb68q4rdi0is22cwvrfk1xwg6yngdxcvmjpdlkgmbdxf3y1sy33"; + sha256 = "ca887bedc9c6e0eab72fcb4c20eda8fff975d06b75993a85ee1dfc763ba38e86"; }; prePatch = '' -- cgit 1.4.1 From 450013b806c67c6cdf16eaf3c1bc0ac486b053d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: phonenumbers: 8.10.8 -> 8.10.9 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index af9232b174cd..9fe07fe329be 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.8"; + version = "8.10.9"; src = fetchPypi { inherit pname version; - sha256 = "1ka7fnlvmvmw984k89mlkdlwbnnyap186a1yfnykx833bp364yg2"; + sha256 = "d9cf2e8e4ad40552487ab47182bc9759fca1edaa7d513e95a9f20c6742416234"; }; meta = { -- cgit 1.4.1 From 848158b9876fd31f5fecd9d44e0efc5641271bca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: pika: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/pika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 40f2afcafb60..073c292c84d2 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pika"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "119lpjzw8wd7c6ikn35c0pvr3zzfy20rklpxdkcmp12wnf9i597v"; + sha256 = "5ba83d3daffccb92788d24facdab62a3db6aa03b8a6d709b03dc792d35c0dfe8"; }; # Tests require twisted which is only availalble for python-2.x -- cgit 1.4.1 From 0e0d0c1f2129d1933f03dad4812536a5b2efd545 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: plone.testing: 7.0.0 -> 7.0.1 --- pkgs/development/python-modules/plone-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 636028c957a9..ff4020a920b9 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "7.0.0"; + version = "7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "db71bde0d4d3c273dbba8c7a2ab259a42f038eca74184da36c5aab61e90e8dd7"; + sha256 = "98a6e9ce8df1fdd33876e2d8c3ca3d8291612c20bd7e0811dac83b6ce10e984b"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; -- cgit 1.4.1 From 7434f520613b17811a17700aa5d027120fe00af2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:38 +0200 Subject: python: jsonschema: 3.0.0a3 -> 3.0.1 --- pkgs/development/python-modules/poetry/jsonschema.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/poetry/jsonschema.nix b/pkgs/development/python-modules/poetry/jsonschema.nix index 9f7cf34b9416..d0adb43daf84 100644 --- a/pkgs/development/python-modules/poetry/jsonschema.nix +++ b/pkgs/development/python-modules/poetry/jsonschema.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "3.0.0a3"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0pkhsq91rhk6384p0jxjkhc9yml2ya2l0mysyq78sb4981h45n6z"; + sha256 = "0c0a81564f181de3212efa2d17de1910f8732fa1b71c42266d983cd74304e20d"; }; nativeBuildInputs = [ setuptools_scm ]; -- cgit 1.4.1 From 011dad736757df994303c825d851839fe1e8c41f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: prompt_toolkit: 1.0.15 -> 1.0.16 --- pkgs/development/python-modules/prompt_toolkit/1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt_toolkit/1.nix index e9d44c83f1db..133a1096863f 100644 --- a/pkgs/development/python-modules/prompt_toolkit/1.nix +++ b/pkgs/development/python-modules/prompt_toolkit/1.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "1.0.15"; + version = "1.0.16"; src = fetchPypi { inherit pname version; - sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + sha256 = "c1cedd626e08b8ee830ee65897de754113ff3f3035880030c08b01674d85c5b4"; }; checkPhase = '' rm prompt_toolkit/win32_types.py -- cgit 1.4.1 From dd8029e4118429af562670ae35c8f88939997708 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pyfakefs: 3.5.7 -> 3.5.8 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 4b128db82eac..27ef45399822 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "3.5.7"; + version = "3.5.8"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "8969435f8e7ca10f60c22096b02b15ad3af143de7d3bb4d73507b812bcdd8e37"; + sha256 = "8cd2270d65d3316dd4dc6bb83242df2e0990d27605209bc16e8041bcc0956961"; }; postPatch = '' -- cgit 1.4.1 From 3b20ac1afbcd9672c200af179b09d9a5505563b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pyflakes: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/pyflakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 354535d47ac5..026e5626c023 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d"; + sha256 = "d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"; }; checkInputs = [ unittest2 ]; -- cgit 1.4.1 From e754ad482d1060e71ff0bb11270c7ad62829df69 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pyftpdlib: 1.5.4 -> 1.5.5 --- pkgs/development/python-modules/pyftpdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 254edfb86937..e0f0f25c9add 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "1.5.4"; + version = "1.5.5"; pname = "pyftpdlib"; src = fetchPypi { inherit pname version; - sha256 = "e5fca613978743d41c3bfc68e25a811d646a3b8a9eee9eb07021daca89646a0f"; + sha256 = "1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752"; }; checkInputs = [ mock psutil ]; -- cgit 1.4.1 From 1196793183308521b92030a34ee375daa904e1ce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pygame: 1.9.4 -> 1.9.5 --- pkgs/development/python-modules/pygame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 199107022dfe..ffd228d9fd17 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pygame"; - version = "1.9.4"; + version = "1.9.5"; src = fetchPypi { inherit pname version; - sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6"; + sha256 = "d15e7238015095a12c19379565a66285e989fdcb3807ec360b27338cd8bdaf05"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 699a0dad2fabf8d3386887b23d5f2fc1c8d86391 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pylint: 2.2.2 -> 2.2.3 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 86730bc43306..6cfb6367307c 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.2.2"; + version = "2.2.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "689de29ae747642ab230c6d37be2b969bf75663176658851f456619aacf27492"; + sha256 = "13109caab4972cb6d7395e94ad7189e93e9454f09ededaa6b6784cc5456d41f1"; }; nativeBuildInputs = [ pytestrunner ]; -- cgit 1.4.1 From e258919667ec1557bfcf0d52b9198ea07b4e57a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pymatgen: 2019.2.4 -> 2019.2.28 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index c3f360768d02..8403ec9add7d 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2019.2.4"; + version = "2019.2.28"; src = fetchPypi { inherit pname version; - sha256 = "0932024a8703236dce861bcadd9568455baa8c70c0f7a1fc52d8ca4b52342091"; + sha256 = "fe4c9b8b16d618fa531a09073d69db6ab02c0c379e672862a41163e39ac91e85"; }; nativeBuildInputs = [ glibcLocales ]; -- cgit 1.4.1 From d9c29773791ab354c8fabc6adcc30938438865b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pyramid: 1.10.2 -> 1.10.4 --- pkgs/development/python-modules/pyramid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 51c6f28564fb..5831665376e2 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.2"; + version = "1.10.4"; src = fetchPypi { inherit pname version; - sha256 = "e70a9bac805284ebe7123fdd412e22a4c1d214603b3a074ac8f1185a0dd7c63e"; + sha256 = "d80ccb8cfa550139b50801591d4ca8a5575334adb493c402fce2312f55d07d66"; }; checkInputs = [ docutils virtualenv webtest zope_component ]; -- cgit 1.4.1 From 97f095a7f9d47ed22efe68210ee37fb6986f34f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pyroute2: 0.5.4 -> 0.5.5 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 194e76c4a912..1887020fd0f3 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "0w6z4j8l9898bj214v2mh7vx2g43j1b70ijjvc7q3316fscal469"; + sha256 = "ad679a91d453fe8426c4076d0da3a67265e5ccfe641879d75c9bc7660d075dfa"; }; # requires root priviledges -- cgit 1.4.1 From 9aa01c35c2d02eb7bac1b984125952e3c39ffa35 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pysmbc: 1.0.15.8 -> 1.0.16 --- pkgs/development/python-modules/pysmbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index 0f915d9a2523..b6068a65fbd3 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -3,13 +3,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.0.15.8"; + version = "1.0.16"; pname = "pysmbc"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "07dzxfdqaj6zjg2rxxdww363bh8m02mcvgk47jw005cik9wc2rq5"; + sha256 = "62199b5cca02c05d5f3b9edbc9a864fb8a2cbe47a465c0b9461642eb3b6f5aca"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 8906475f253eaf351f33031a636a98a9f0bb9786 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pysmi: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/pysmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 723d95b89a57..62c631ac98cc 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.3.3"; + version = "0.3.4"; pname = "pysmi"; src = fetchPypi { inherit pname version; - sha256 = "0bzhmi4691rf306n4y82js52532h3fp1sy6phvh6hnms6nww4daf"; + sha256 = "bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c"; }; propagatedBuildInputs = [ ply ]; -- cgit 1.4.1 From bdb8f9fe81434e929fb2286bc673587dcdd69a27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pyspark: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/pyspark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 0eca6c5ddf05..3687f1a33efa 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1p7z5f1a20l7xkjkh88q9cvjw2x8jbrlydkycn5lh4qvx72vgmy9"; + sha256 = "923cc4075d586074f68b722f5ed029b0d25396828441b5ed421a0e40fe14e749"; }; # pypandoc is broken with pandoc2, so we just lose docs. -- cgit 1.4.1 From 8ac10da9c0bb3c65f1cc8293cb5f29267454c76d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pytaglib: 1.4.4 -> 1.4.5 --- pkgs/development/python-modules/pytaglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 4b88a6512105..46d4135d6afb 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytaglib"; - version = "1.4.4"; + version = "1.4.5"; src = fetchPypi { inherit pname version; - sha256 = "c3458e64cea61a7d4189f26c601e7bfd82053f3c02c2247cb8c430847927ef18"; + sha256 = "8aec64bc146a9f72778a0d2d1f3448f58be6ebea68f64b0ff88ea8e0f4dc5d8f"; }; buildInputs = [ taglib cython ]; -- cgit 1.4.1 From 349bd88ba4bbf0663adbfe96c4c0e733f20bbe2d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:39 +0200 Subject: python: pytest-mock: 1.10.2 -> 1.10.3 --- pkgs/development/python-modules/pytest-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 4fd0570a50dc..f07ba9b43f7f 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.10.2"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "cbec53e7cb0f2b57275220cb4f2822093ac89e486095555105ffe1a4e2f11df4"; + sha256 = "330bfa1a71c9b6e84e2976f01d70d8a174f755e7f9dc5b22f4b7335992e1e98b"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; -- cgit 1.4.1 From 99562d6d3e7245d5ba646c6440224ba5e2faf7d7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: python-json-logger: 0.1.10 -> 0.1.11 --- pkgs/development/python-modules/python-json-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 8dfea69a2334..0141141b43c4 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.1.10"; + version = "0.1.11"; pname = "python-json-logger"; src = fetchPypi { inherit pname version; - sha256 = "cf2caaf34bd2eff394915b6242de4d0245de79971712439380ece6f149748cde"; + sha256 = "b7a31162f2a01965a5efb94453ce69230ed208468b0bbc7fdfc56e6d8df2e281"; }; checkInputs = [ nose ]; -- cgit 1.4.1 From 18a76a8762ceb29c682cf4d10985ec3cab3edb10 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: python-snappy: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/python-snappy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index fd84c587bdc0..d3ab69ac9570 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-snappy"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "8a7f803f06083d4106d55387d2daa32c12b5e376c3616b0e2da8b8a87a27d74a"; + sha256 = "d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2"; }; buildInputs = [ snappy ]; -- cgit 1.4.1 From 1d295684e5a7a0a9d9402bf8037e2270455e735e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: python_openzwave: 0.4.18 -> 0.4.19 --- pkgs/development/python-modules/python_openzwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index 981629d85c24..ae3f0ba933a7 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python_openzwave"; - version = "0.4.18"; + version = "0.4.19"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f7b6b4e34e2a64d0a0bd0556f5560ca6914ca72428c3fe5ac8c7f08b31335f3e"; + sha256 = "6b40c7711383eeb3535cf5504f1cf47cc1ac7018eb820f299642a5a2795aef84"; extension = "zip"; }; -- cgit 1.4.1 From e21291a7c67fd3392fb6eeb6a03a7504a4723415 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: pyviz_comms: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/pyviz-comms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 5bd6722939b6..422e28960822 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "045bjs8na3q0fy8zzq4pghyz05d9aid1lcv11992f62z2jrf6m2q"; + sha256 = "c1722a496b08eb20ae3f2fedcc1ebcd207567b62e6453c7198a0b8f78ae96049"; }; propagatedBuildInputs = [ param ]; -- cgit 1.4.1 From 50393c2a94320771c887d9b6653501ee6f81c2f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: PyWavelets: 1.0.1 -> 1.0.3 --- pkgs/development/python-modules/pywavelets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index b085a3db3b9f..bbd02d8daafa 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.0.1"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "3c5cece36d4e17d395be6e9ac6b80ce7b774a1f71c251756c6163e63b6d878dc"; + sha256 = "a12c7a6258c0015d2c75d88b87393ee015494551f049009e8b63eafed2d78efc"; }; checkInputs = [ nose pytest ]; -- cgit 1.4.1 From a7c8789cb77968c61472afda9413f4899b69f5b5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: reportlab: 3.5.13 -> 3.5.19 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index edb9b062f38d..1b501b060127 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.13"; + version = "3.5.19"; src = fetchPypi { inherit pname version; - sha256 = "6116e750f98018febc08dfee6df20446cf954adbcfa378d2c703d56c8864aff3"; + sha256 = "47951166d897b60e9e7ca349db82a2b689e6478ac6078e2c7c88ca8becbb0c7d"; }; checkInputs = [ glibcLocales ]; -- cgit 1.4.1 From 5a1e471aaea3a917d54284d7e35eac2bf2b9cb1d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: responses: 0.10.5 -> 0.10.6 --- pkgs/development/python-modules/responses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index e69e7d8b84da..d154499c03bf 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.5"; + version = "0.10.6"; src = fetchPypi { inherit pname version; - sha256 = "c85882d2dc608ce6b5713a4e1534120f4a0dc6ec79d1366570d2b0c909a50c87"; + sha256 = "502d9c0c8008439cfcdef7e251f507fcfdd503b56e8c0c87c3c3e3393953f790"; }; propagatedBuildInputs = [ cookies mock requests six ]; -- cgit 1.4.1 From 42db3ab992f428f06419698d953401560542c4b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: ropper: 1.11.10 -> 1.11.13 --- pkgs/development/python-modules/ropper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 527063d02f90..08c8547edbd9 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "ropper"; - version = "1.11.10"; + version = "1.11.13"; src = fetchPypi { inherit pname version; - sha256 = "b8d1439d8a6ef7b93718472b0288ee88a5953723046772f035fe989b1c1e5d6e"; + sha256 = "245c6a1c8b294209bed039cd6a389f1e298d3fe6783d48ad9c6b2df3a41f51ee"; }; # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise # workaround: sudo chmod 777 /dev/shm -- cgit 1.4.1 From a412cb34066208cde7561d31fc8f7289f50e6217 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: ruamel.yaml: 0.15.88 -> 0.15.92 --- pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 7b14d337f342..eadebc05c778 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.88"; + version = "0.15.92"; src = fetchPypi { inherit pname version; - sha256 = "ac56193c47a31c9efa151064a9e921865cdad0f7a991d229e7197e12fe8e0cd7"; + sha256 = "c6d05e38a141922eca7902135e7a40b605763d6da8ec6624517370631ce9fb6d"; }; # Tests cannot load the module to test -- cgit 1.4.1 From c4b7e25ba17157a821c1314a10d011d0d23e0dd1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: scikit-learn: 0.20.2 -> 0.20.3 --- pkgs/development/python-modules/scikitlearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 5ec207c55950..454066c1c163 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.20.2"; + version = "0.20.3"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "1ri9kx0yrn85h6ivkaja35afbyhimxn8lsairgns2wi5xv3wfnxw"; + sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41"; }; buildInputs = [ pillow gfortran glibcLocales ]; -- cgit 1.4.1 From dab56098f6233124e6ff66af7147407560685743 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: sopel: 6.6.3 -> 6.6.6 --- pkgs/development/python-modules/sopel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 5b67fcb09641..f4e699adcc88 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sopel"; - version = "6.6.3"; + version = "6.6.6"; src = fetchPypi { inherit pname version; - sha256 = "aa9a52da9cf33c1d5f6b9b8513d31a339d8cbef9a288487b251538949a4faae1"; + sha256 = "dfb6d6c349cbdd463736e4be781cc005efeb1be91dbdc60cc76fda7cad142def"; }; buildInputs = [ pytest ]; -- cgit 1.4.1 From df0fe90c1729272d11d3d268413cbfa4a3ac3966 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: sounddevice: 0.3.12 -> 0.3.13 --- pkgs/development/python-modules/sounddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index bdb003467f56..c2cf64008348 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.3.12"; + version = "0.3.13"; src = fetchPypi { inherit pname version; - sha256 = "f59ae4e2ec12cb1e5940f06f08804ecca855d959de25ca45a3938de45d0f81a2"; + sha256 = "8d0571349f9a438a97f2c69da760f195cf5ddf2351072199cc1dfede4785a207"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; -- cgit 1.4.1 From 73808b0b35515d877e15c3da8d0a064ccd4b41f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: sphinx-testing: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/sphinx-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index 4b110f3ec187..8f9539705556 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinx-testing"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "2a421b42b2dae8ecad2b4c9d3953f9970e5a9c07bb2c66626338157435e5708c"; + sha256 = "ef661775b5722d7b00f67fc229104317d35637a4fb4434bf2c005afdf1da4d09"; }; checkInputs = [ mock ]; -- cgit 1.4.1 From 572f83d9fcd8485aeab566f00c99f50f4b8108ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: sphinxcontrib-spelling: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/sphinxcontrib-spelling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a67787f69336..f528edb75ab3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "44a9445b237ade895ae1fccbe6f41422489b1ffb2a026c1b78b0c1c1c229f9bf"; + sha256 = "7bcbaabef7aa9c176b81d960b20d0f67817ccea5e098968c366d2db4ad76d476"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ]; -- cgit 1.4.1 From e565d666f2fa5461a6443b5f8d0e71431c7dd308 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:40 +0200 Subject: python: sqlmap: 1.3.2 -> 1.3.4 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 53c6ae8cdba0..d7a7d45785ee 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.3.2"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "1010623c4c31413fdfdd8b3fe194ab95dfabde1081f3c707d1b2eb56b044a7da"; + sha256 = "894584fdb8d0e25e9f9ac0da20058e23c27d5ca55904cc0326e1a84101beef32"; }; # No tests in archive -- cgit 1.4.1 From 169e435ff4e9ad0f684e428d04f0dcdb414e3652 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: sseclient: 0.0.22 -> 0.0.23 --- pkgs/development/python-modules/sseclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 484f4c7b17c8..a911cd239485 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "sseclient"; - version = "0.0.22"; + version = "0.0.23"; src = fetchPypi { inherit pname version; - sha256 = "bf1eab60b09edbaa51e42f65a18b715367d55cfdf57c1f162886bac97bb5c6fb"; + sha256 = "82a1d281b2bcb98847882069bde57a6772156f9539ddefbb78fea4f915197ec3"; }; propagatedBuildInputs = [ requests six ]; -- cgit 1.4.1 From e151d44b4574d6ce54068c03d58d551a00fe5245 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: tempora: 1.14 -> 1.14.1 --- pkgs/development/python-modules/tempora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 6ffe5a73eb4a..861054ed948f 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "1.14"; + version = "1.14.1"; src = fetchPypi { inherit pname version; - sha256 = "4951da790bd369f718dbe2287adbdc289dc2575a09278e77fad6131bcfe93097"; + sha256 = "cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6"; }; doCheck = false; -- cgit 1.4.1 From bd1e8e7b0d2c5d48681a7aefc053e8f7dd461353 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: terminado: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/terminado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 7ebd2f1c967a..bebe8c3d1f8e 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "0yh69k6579g848rmjyllb5h75pkvgcy27r1l3yzgkf33wnnzkasm"; + sha256 = "de08e141f83c3a0798b050ecb097ab6259c3f0331b2f7b7750c9075ced2c20c2"; }; propagatedBuildInputs = [ ptyprocess tornado ]; -- cgit 1.4.1 From 85c6c723f03064377a18c59591eadc23239631ba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: textacy: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/textacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 4272df1ce398..05121f2b9b28 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "textacy"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "6019f32719c0661f41fa93c2fdd9714504d443119bf4f6426ee690bdda90835b"; + sha256 = "50402545ac92b1a931c2365e341cb35c4ebe5575525f1dcc5265901ff3895a5f"; }; disabled = isPy27; # 2.7 requires backports.csv -- cgit 1.4.1 From e42fdc6aa648a2527625a7a11980eb8ec456eb39 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: thespian: 3.9.7 -> 3.9.9 --- pkgs/development/python-modules/thespian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index af3d24899c77..cd4a30f656ae 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.7"; + version = "3.9.9"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fc968325894f812098f4fde4341c1734050bb1b742d8decf62ae9704c761f577"; + sha256 = "c89e1973465feb88b694f3884d24723932a6b0e4df8d909f61e44ff371af7380"; }; # Do not run the test suite: it takes a long time and uses -- cgit 1.4.1 From f6e539022eb567e614604c97b47fc14bc035485a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: trustme: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/trustme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index d870b622b8a9..27831a0359c3 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "89b8d689013afeaa34b63e77f6d60eebad63edc4b247e744c7d6d891ed13a564"; + sha256 = "8d12837c6242afe1660dee08d44d96f40c9a5074cc58caf39f8c8fdf4b526529"; }; checkInputs = [ pytest pyopenssl service-identity ]; -- cgit 1.4.1 From 0a35872dfd2da2854258dde8980561614a82a233 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: twitter.common.collections: 0.3.10 -> 0.3.11 --- .../development/python-modules/twitter-common-collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix index ed177fc63f85..d562eac5cc7d 100644 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.collections"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "c27f11612572f614cadf181cc65bcd0275d8b08f182bcb4ea1b74cd662625f21"; + sha256 = "ede4caff74928156f7ff38dac9b0811893de41966c39cd5b2fdea53418349ca8"; }; propagatedBuildInputs = [ twitter-common-lang ]; -- cgit 1.4.1 From 2a2ab8d14e2b3951d1018a5aee3f501881459f33 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: twitter.common.confluence: 0.3.10 -> 0.3.11 --- pkgs/development/python-modules/twitter-common-confluence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix index 393bc0ac4e8b..1253b8077e75 100644 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.confluence"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "8285cab3d31e4065a13575c1920101db4df0f36a59babcc225775e4fae91c0a1"; + sha256 = "323dde2c519f85020569d7a343432f3aac16bce6ebe5e34774dbde557296697c"; }; propagatedBuildInputs = [ twitter-common-log ]; -- cgit 1.4.1 From e297484b50cc4cf1ed130934562322b4d8baddab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: twitter.common.dirutil: 0.3.10 -> 0.3.11 --- pkgs/development/python-modules/twitter-common-dirutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix index 5d8a3e76fcac..df2f614c5a04 100644 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.dirutil"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "748b471bb2dd78f14e39d796cb01407aa8b61dda95808543404d5da50385efaf"; + sha256 = "49aeecad2434ac23c16abbfc1fccffd3790c056a9eb01468ec26c83e65a10119"; }; propagatedBuildInputs = [ twitter-common-lang ]; -- cgit 1.4.1 From d374f80cc4f465a8be5ceead832d710ee782312f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: twitter.common.lang: 0.3.10 -> 0.3.11 --- pkgs/development/python-modules/twitter-common-lang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix index 53135a94d628..59f6d74ad67a 100644 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.lang"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "9cd2d05a7f45c50c76c99024b3cad180bec42b0c65dfdc1f8ddc731bdd3b3af8"; + sha256 = "6e967ca2b5bb96ea749d21052f45b18e37deb5cc160eb12c64a8f1cb9dba7a22"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From e0056cccf945af3f19b9f135ea66617026a7d2f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: twitter.common.log: 0.3.10 -> 0.3.11 --- pkgs/development/python-modules/twitter-common-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix index 0fa7b63f5256..1c3d1808f5dd 100644 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "twitter.common.log"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "81af4b0f51f3fb589f39b410d7031da6792e0ae650a45e9207a25a52a343a555"; + sha256 = "7160a864eed30044705e05b816077dd193aec0c66f50ef1c077b7f8490e0d06a"; }; propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ]; -- cgit 1.4.1 From 22642615a7f4c2ee5ee95af20078f566a92f40f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: twitter.common.options: 0.3.10 -> 0.3.11 --- pkgs/development/python-modules/twitter-common-options/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix index 62705f3b6b11..12e55a46ab8e 100644 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/pkgs/development/python-modules/twitter-common-options/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.options"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "9eeaf078462afdfa5ba237727c908a8b3b8b28d172838dbe58d3addf722da6c8"; + sha256 = "a495bcdffc410039bc4166f1a30c2caa3c92769d7a161a4a39d3651836dd27e1"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From bfce94a15453ef897eddf1a6a886e194c6ed4d65 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: u-msgpack-python: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/u-msgpack-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index aed68f3ad59d..144f9299c6eb 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702"; + sha256 = "6c02a0654a5e11f8fad532ed634109ed49cdc929f7b972848773e4e0ce52f30c"; }; LC_ALL="en_US.UTF-8"; -- cgit 1.4.1 From 213dffc962b496caaa2850edb0255d1ffb1fb085 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:41 +0200 Subject: python: uncompyle6: 3.2.5 -> 3.2.6 --- pkgs/development/python-modules/uncompyle6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index c7edfd95ae08..6996b9bcda3a 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.2.5"; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "1z4489grxc06pxmfy63b6x6h54p05fhbigvrrgr1kvdciy2nvz04"; + sha256 = "3a40f4f4b8b02a8687bd98c598980bed38a4770e3de253847eafed4b7167d07f"; }; checkInputs = [ nose pytest hypothesis six ]; -- cgit 1.4.1 From c47ded894ff111d12215685fa21b474553a6b00e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: uproot-methods: 0.4.4 -> 0.4.7 --- pkgs/development/python-modules/uproot-methods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index c6cfdacf6eeb..c61b38f5d38e 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.4.4"; + version = "0.4.7"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "004q7lywhhdvsmds88cfpjvkj89nf8n9d4gyrbvvj3x0gw7iiljq"; + sha256 = "4a00d1db828c44d2ba35801aeff7d1ea890b7dfa337895395e3b06284c14857b"; }; propagatedBuildInputs = [ numpy awkward ]; -- cgit 1.4.1 From add2a0f64a0557fe7a5d1e5b677a918d0358dcbe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: uproot: 3.4.6 -> 3.4.19 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index fdb465202beb..59fc3517bfbf 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.4.6"; + version = "3.4.19"; src = fetchPypi { inherit pname version; - sha256 = "1fafe476c26252e4dbd399456323778e76d23dc2f43cf6581a707d1647978610"; + sha256 = "1df24d1f193b044cc4d6ef98e183a853655b568b7b15173d88b0d2a79e1226da"; }; nativeBuildInputs = [ pytestrunner ]; -- cgit 1.4.1 From ac38e4fafb16c43cfc5e4a3d35a93b71ffbed856 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: virtualenv-clone: 0.5.1 -> 0.5.3 --- pkgs/development/python-modules/virtualenv-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 9e917e35ab07..b1ce764c4ac4 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.5.1"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "217bd3f0880c9f85672c0bcc9ad9e0354ab7dfa89c2f117e63aa878b4279f5bf"; + sha256 = "c88ae171a11b087ea2513f260cdac9232461d8e9369bcd1dc143fc399d220557"; }; buildInputs = [ pytest ]; -- cgit 1.4.1 From 1b72e48eee5eda649f720b054896a9f94183a652 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: virtualenv: 16.4.1 -> 16.4.3 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index d26b7b4f50aa..bad23341df72 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.4.1"; + version = "16.4.3"; src = fetchPypi { inherit pname version; - sha256 = "5a3ecdfbde67a4a3b3111301c4d64a5b71cf862c8c42958d30cf3253df1f29dd"; + sha256 = "984d7e607b0a5d1329425dd8845bd971b957424b5ba664729fab51ab8c11bc39"; }; # Doubt this is needed - FRidh 2017-07-07 -- cgit 1.4.1 From f624cbb5964d2b8d2fab903096fda9ec22b000d3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: Werkzeug: 0.15.1 -> 0.15.2 --- pkgs/development/python-modules/werkzeug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index d0397d61605f..9b5e3f9ca5f9 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.15.1"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "ca5c2dcd367d6c0df87185b9082929d255358f5391923269335782b213d52655"; + sha256 = "0a73e8bb2ff2feecfc5d56e6f458f5b99290ef34f565ffb2665801ff7de6af7a"; }; propagatedBuildInputs = [ itsdangerous ]; -- cgit 1.4.1 From b86acf8ee2b2a2590b38b7e12e8adb753cce1ada Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: xarray: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index cf5243296613..7655dc932d5e 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1wspvvp8hh9ar7pl6w1qhmakajsjsg4cm11pmi4a422jqmid0vw5"; + sha256 = "ac09a819e791be208ae33fa7ecee19d0fe7b5479906f927d358a61957ce27e10"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From f3f4cc527ab8a2fd05ea2052310f74ff35aea062 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: xdis: 3.8.9 -> 3.8.10 --- pkgs/development/python-modules/xdis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index df0ad509e291..c5837e5da539 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "xdis"; - version = "3.8.9"; + version = "3.8.10"; src = fetchPypi { inherit pname version; - sha256 = "1q2dg3hnsmmpjcc7lzjf5nd041mpbwa2bq3dgr4p6wv65vncny9v"; + sha256 = "b00f37296edf2a4fe7b67b5d861c342426d442666d241674fdfc333936bd59bf"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From acee54bbeea276b2db1c08aa83248571c5e5d5e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: xlsx2csv: 0.7.5 -> 0.7.6 --- pkgs/development/python-modules/xlsx2csv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 15be28b62fb7..5faf56b7eba7 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "1f44k1q9jhn2iwabpj663l5wmm7zh6bp5402p659pxf11m8y4c2x"; + sha256 = "ff4121d42d318f31f71b248f37acfc21455a7d897a3c117b578744c89bc34f6c"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From d0f00733ffa3605bae3be9e24bbd36dc851c1814 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: zeep: 3.3.0 -> 3.3.1 --- pkgs/development/python-modules/zeep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 0513183d484c..be0be44af555 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "zeep"; - version = "3.3.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "144dk7gw93l4amrwmp5vzxxkcjsgkx6fjqzvsawx2iap23j605j9"; + sha256 = "f58328e36264a2fda2484dd20bb1695f4102a9cc918178d60c4d7cf8339c65d0"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From d3d5fb65bf8b99f687111d2e32a852814124240c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: zetup: 0.2.45 -> 0.2.48 --- pkgs/development/python-modules/zetup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index abbc4a974f0b..89e9e9691401 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zetup"; - version = "0.2.45"; + version = "0.2.48"; src = fetchPypi { inherit pname version; - sha256 = "f1cde33d0ef3bedaf697e432201fa86da698dadd3445c0efd2a114753853c675"; + sha256 = "41af61e8e103656ee633f89ff67d6a94848b9b9a836d351bb813b87a139a7c46"; }; # Python 3.7 compatibility -- cgit 1.4.1 From cf0c369739b83604a787f34e2e9193a41448b0ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:15:42 +0200 Subject: python: zict: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/zict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index bfc5caea4d07..81e5d0fbc815 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "63377f063086fc92e5c16e4d02162c571f6470b9e796cf3411ef9e815c96b799"; + sha256 = "a7838b2f21bc06b7e3db5c64ffa6642255a5f7c01841660b3388a9840e101f99"; }; buildInputs = [ pytest ]; -- cgit 1.4.1 From 7629c4f9dccd1bf2e1176519e08f85e8279c75a2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:19:21 +0200 Subject: pythonPackages.setuptools: 40.8.0 -> 41.0.0 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 7548f96a88e4..d4573a2bc431 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "40.8.0"; + version = "41.0.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d"; + sha256 = "79d30254b6fe7a8e672e43cd85f13a9f3f2a50080bc81d851143e2219ef0dcb1"; }; nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ]; -- cgit 1.4.1 From 8ae35163f73441662b02121ce46b7319bdcc2a27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Apr 2019 19:19:35 +0200 Subject: pythonPackages.bootstrapped-pip: setuptools 40.8.0 -> 41.0.0 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 8ee8b2c9fd5a..687b7cec4cf4 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,9 +9,9 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "40.8.0"; + version = "41.0.0"; format = "wheel"; - sha256 = "e8496c0079f3ac30052ffe69b679bd876c5265686127a3159cfa415669b7f9ab"; + sha256 = "e67486071cd5cdeba783bd0b64f5f30784ff855b35071c8670551fd7fc52d4a1"; }; in stdenv.mkDerivation rec { -- cgit 1.4.1 From 0e998197cbb26c0760eff570525a795f25f5b1a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 18 Apr 2019 09:19:07 +0200 Subject: python.pkgs.xarray: disable for python 2 0.12 no longer supports Python 2. --- pkgs/development/python-modules/xarray/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 7655dc932d5e..b419e7f5cc7e 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { # There always seem to be broken tests... doCheck = false; + disabled = !isPy3k; + meta = { description = "N-D labeled arrays and datasets in Python"; homepage = https://github.com/pydata/xarray; -- cgit 1.4.1 From bd5a82aedf463470fe2e2ca6125f4be53be71cbb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 18 Apr 2019 09:20:33 +0200 Subject: python: hupper: 1.4.2 -> 1.6.1 --- pkgs/development/python-modules/hupper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index c0e4c4ec9e85..c6b0a2c64bc6 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.4.2"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "eb3778398658a011c96e620adcd73175f306f880a6d86b2ebb6d2a15a74b6b9b"; + sha256 = "fe8febd68cec7fbed174fcbb0b42c427f96c8a7471c1cd4999fc698dd8dc6c34"; }; checkPhase = '' -- cgit 1.4.1 From e493fa7b323c4f249757eee13b11e9a1a9d73e1f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 18 Apr 2019 09:24:15 +0200 Subject: python2.pkgs.astroid: disable several tests --- pkgs/development/python-modules/astroid/1.6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix index 810a4f7ebc87..b6ebea815ccc 100644 --- a/pkgs/development/python-modules/astroid/1.6.nix +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { checkPhase = '' # test_builtin_help is broken - pytest -k "not test_builtin_help" astroid + pytest -k "not test_builtin_help and not test_namespace_and_file_mismatch and not test_namespace_package_pth_support and not test_nested_namespace_import" astroid ''; meta = with lib; { -- cgit 1.4.1 From daa3a702c35f6ad2e45b9fde3501a803e848f95e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 18 Apr 2019 09:26:05 +0200 Subject: python: jenkins-job-builder: 2.9.1 -> 2.10.0 --- pkgs/development/python-modules/jenkins-job-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 1b14074fad75..29d52753d0ff 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "2.9.1"; + version = "2.10.0"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "fba5f3efe8bd06d559f06a5d3bd68da5a7395541fcd370053a8174d08519e3d0"; + sha256 = "cca981c5b97970394820bd53a3b2a408003c4993241f4f04385b423f14d8e84a"; }; postPatch = '' -- cgit 1.4.1 From 9506b67f98b33e081cb3e0eec3eec48ee2fac19b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 18 Apr 2019 21:26:09 -0400 Subject: python3.pkgs.xarray: add isPy3k --- pkgs/development/python-modules/xarray/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index b419e7f5cc7e..d547d4a15d1b 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , python +, isPy3k }: buildPythonPackage rec { @@ -20,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [numpy pandas]; checkPhase = '' - py.test $out/${python.sitePackages} + pytest $out/${python.sitePackages} ''; # There always seem to be broken tests... -- cgit 1.4.1 From 90f3a237eb51d7e3173f1502d468e99ff777d1b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Apr 2019 03:02:44 +0200 Subject: libredirect: add support for openat and dlopen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gobject-introspection uses glib’s g_module_open function, which in turn relies on dlopen. I also implemented openat, since I initially thought this function was used but turns out dlopen uses the openat signal directly. We might as well keep it, even thought I do not need it at the moment. --- pkgs/build-support/libredirect/libredirect.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'pkgs') diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index ba1e6c57e12e..dcf3a2016bc2 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -91,6 +91,20 @@ int open64(const char * path, int flags, ...) return open64_real(rewrite(path, buf), flags, mode); } +int openat(int dirfd, const char * path, int flags, ...) +{ + int (*openat_real) (int, const char *, int, mode_t) = dlsym(RTLD_NEXT, "openat"); + mode_t mode = 0; + if (flags & O_CREAT) { + va_list ap; + va_start(ap, flags); + mode = va_arg(ap, mode_t); + va_end(ap); + } + char buf[PATH_MAX]; + return openat_real(dirfd, rewrite(path, buf), flags, mode); +} + FILE * fopen(const char * path, const char * mode) { FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen"); @@ -152,3 +166,10 @@ int execv(const char *path, char *const argv[]) char buf[PATH_MAX]; return execv_real(rewrite(path, buf), argv); } + +void *dlopen(const char *filename, int flag) +{ + void * (*__dlopen_real) (const char *, int) = dlsym(RTLD_NEXT, "dlopen"); + char buf[PATH_MAX]; + return __dlopen_real(rewrite(filename, buf), flag); +} -- cgit 1.4.1 From d180cb98503d2dc1e51d8c14b4a567e1ed3e996d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 9 Apr 2019 14:21:54 -0400 Subject: cc-wrapper: make machine configuration configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is useful to make these dynamic and not bake them into gcc. This means we don’t have to rebuild gcc to change these values. Instead, we will pass cflags to gcc based on platform values. This was already done hackily for android gcc (which is multi-target), but not for our own gccs which are single target. To accomplish this, we need to add a few things: - add ‘arch’ to cpu - add NIX_CFLAGS_COMPILE_BEFORE flag (goes before args) - set -march everywhere - set mcpu, mfpu, mmode, and mtune based on targetPlatform.gcc flags cc-wrapper: only set -march when it is in the cpu type Some architectures don’t have a good mapping of -march. For instance POWER architecture doesn’t support the -march flag at all! https://gcc.gnu.org/onlinedocs/gcc/RS_002f6000-and-PowerPC-Options.html#RS_002f6000-and-PowerPC-Options --- lib/systems/parse.nix | 36 ++++++++--------- pkgs/build-support/cc-wrapper/add-flags.sh | 5 +++ pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/default.nix | 47 +++++++++++++++++----- .../androidndk-pkgs/androidndk-pkgs.nix | 21 +--------- 5 files changed, 62 insertions(+), 49 deletions(-) (limited to 'pkgs') diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 3e23a721f0d9..cd0a11c058e6 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -69,24 +69,24 @@ rec { cpuTypes = with significantBytes; setTypes types.openCpuType { arm = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; }; - armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; }; - armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; }; - armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; - armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; - armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; - armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; - armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; - armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; - armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; }; - aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; }; - - i386 = { bits = 32; significantByte = littleEndian; family = "x86"; }; - i486 = { bits = 32; significantByte = littleEndian; family = "x86"; }; - i586 = { bits = 32; significantByte = littleEndian; family = "x86"; }; - i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; - x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; + armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; arch = "armv5t"; }; + armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6-m"; }; + armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6"; }; + armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-a"; }; + armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-r"; }; + armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-m"; }; + armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7"; }; + armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; }; + armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; }; + armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-m"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; }; + aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; arch = "armv8-a"; }; + + i386 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i386"; }; + i486 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i486"; }; + i586 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i586"; }; + i686 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i686"; }; + x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; arch = "x86-64"; }; mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 9762894607ac..1358b167f6ec 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -6,6 +6,7 @@ var_templates_list=( NIX+CFLAGS_COMPILE + NIX+CFLAGS_COMPILE_BEFORE NIX+CFLAGS_LINK NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_LINK @@ -43,5 +44,9 @@ if [ -e @out@/nix-support/cc-ldflags ]; then NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi +if [ -e @out@/nix-support/cc-cflags-before ]; then + NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE="$(< @out@/nix-support/cc-cflags-before) $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE" +fi + # That way forked processes will not extend these environment variables again. export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1 diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 8003fe1d8f38..bb7890100087 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -135,7 +135,7 @@ source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE) -extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"}) +extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE) if [ "$dontLink" != 1 ]; then diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 9569c6e78c8a..4d4dbc640b28 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -279,24 +279,51 @@ stdenv.mkDerivation { export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" '' - + optionalString hostPlatform.isCygwin '' - hardening_unsupported_flags+=" pic" - '' + # Machine flags. These are necessary to support - + optionalString targetPlatform.isMinGW '' - hardening_unsupported_flags+=" stackprotector" + # TODO: We should make a way to support miscellaneous machine + # flags and other gcc flags as well. + + # Always add -march based on cpu in triple. Sometimes there is a + # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in + # that case. + + optionalString (targetPlatform ? platform.gcc.arch || targetPlatform.parsed.cpu ? arch) '' + echo "-march=${targetPlatform.platform.gcc.arch or targetPlatform.parsed.cpu.arch}" >> $out/nix-support/cc-cflags-before '' - + optionalString targetPlatform.isAvr '' - hardening_unsupported_flags+=" stackprotector pic" + # -mcpu is not very useful. You should use mtune and march + # instead. It’s provided here for backwards compatibility. + + optionalString (targetPlatform ? platform.gcc.cpu) '' + echo "-mcpu=${targetPlatform.platform.gcc.cpu}" >> $out/nix-support/cc-cflags-before '' - + optionalString targetPlatform.isNetBSD '' - hardening_unsupported_flags+=" stackprotector fortify" + # -mfloat-abi only matters on arm32 but we set it here + # unconditionally just in case. If the abi specifically sets hard + # vs. soft floats we use it here. + + optionalString (targetPlatform ? platform.gcc.float-abi || targetPlatform.parsed.abi ? float) '' + echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi or targetPlatform.parsed.abi.float}" >> $out/nix-support/cc-cflags-before + '' + + optionalString (targetPlatform ? platform.gcc.fpu) '' + echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before + '' + + optionalString (targetPlatform ? platform.gcc.mode) '' + echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before + '' + + optionalString (targetPlatform ? platform.gcc.tune) '' + echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before '' - + optionalString (targetPlatform.libc == "newlib") '' + # TODO: categorize these and figure out a better place for them + + optionalString hostPlatform.isCygwin '' + hardening_unsupported_flags+=" pic" + '' + optionalString targetPlatform.isMinGW '' + hardening_unsupported_flags+=" stackprotector" + '' + optionalString targetPlatform.isAvr '' + hardening_unsupported_flags+=" stackprotector pic" + '' + optionalString (targetPlatform.libc == "newlib") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" + '' + optionalString targetPlatform.isNetBSD '' + hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString (libc != null && targetPlatform.isAvr) '' diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index b62dc2def7f1..cca0f0d4adbc 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -90,26 +90,7 @@ rec { echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags - '' - + lib.optionalString stdenv.targetPlatform.isAarch32 (let - p = stdenv.targetPlatform.platform.gcc or {} - // stdenv.targetPlatform.parsed.abi; - flags = lib.concatLists [ - (lib.optional (p ? arch) "-march=${p.arch}") - (lib.optional (p ? cpu) "-mcpu=${p.cpu}") - (lib.optional (p ? abi) "-mabi=${p.abi}") - (lib.optional (p ? fpu) "-mfpu=${p.fpu}") - (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}") - (lib.optional (p ? mode) "-mmode=${p.mode}") - ]; - in '' - sed -E -i \ - $out/bin/${stdenv.targetPlatform.config}-cc \ - $out/bin/${stdenv.targetPlatform.config}-c++ \ - $out/bin/${stdenv.targetPlatform.config}-clang \ - $out/bin/${stdenv.targetPlatform.config}-clang++ \ - -e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|' - ''); + ''; }; # Bionic lib C and other libraries. -- cgit 1.4.1 From 5d87bc2650221763d5378bd8cdbd6b84a11b2162 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 16:13:37 +0000 Subject: fix bootstrap when platform.gcc.arch=="skylake" --- pkgs/build-support/cc-wrapper/default.nix | 25 ++++++++++++++++++++-- .../compilers/gcc/common/platform-flags.nix | 2 +- pkgs/stdenv/generic/make-derivation.nix | 3 +++ 3 files changed, 27 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 4d4dbc640b28..91948f415714 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -63,6 +63,25 @@ let then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; + # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu + isGccArchSupported = arch: + if cc.isGNU or false then + { skylake = versionAtLeast ccVersion "6.0"; + skylake-avx512 = versionAtLeast ccVersion "6.0"; + cannonlake = versionAtLeast ccVersion "8.0"; + icelake-client = versionAtLeast ccVersion "8.0"; + icelake-server = versionAtLeast ccVersion "8.0"; + knm = versionAtLeast ccVersion "8.0"; + }.${arch} or true + else if cc.isClang or false then + { cannonlake = versionAtLeast ccVersion "5.0"; + icelake-client = versionAtLeast ccVersion "7.0"; + icelake-server = versionAtLeast ccVersion "7.0"; + knm = versionAtLeast ccVersion "7.0"; + }.${arch} or true + else + false; + in # Ensure bintools matches @@ -287,7 +306,8 @@ stdenv.mkDerivation { # Always add -march based on cpu in triple. Sometimes there is a # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in # that case. - + optionalString (targetPlatform ? platform.gcc.arch || targetPlatform.parsed.cpu ? arch) '' + + optionalString ((targetPlatform ? platform.gcc.arch || targetPlatform.parsed.cpu ? arch) && + isGccArchSupported targetPlatform.platform.gcc.arch or targetPlatform.parsed.cpu.arch) '' echo "-march=${targetPlatform.platform.gcc.arch or targetPlatform.parsed.cpu.arch}" >> $out/nix-support/cc-cflags-before '' @@ -309,7 +329,8 @@ stdenv.mkDerivation { + optionalString (targetPlatform ? platform.gcc.mode) '' echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before '' - + optionalString (targetPlatform ? platform.gcc.tune) '' + + optionalString (targetPlatform ? platform.gcc.tune && + isGccArchSupported targetPlatform.platform.gcc.tune) '' echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before '' diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix index ba6d5912fe88..f3cdce411939 100644 --- a/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -4,7 +4,7 @@ let p = targetPlatform.platform.gcc or {} // targetPlatform.parsed.abi; in lib.concatLists [ - (lib.optional (p ? arch) "--with-arch=${p.arch}") + (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64 (lib.optional (p ? cpu) "--with-cpu=${p.cpu}") (lib.optional (p ? abi) "--with-abi=${p.abi}") (lib.optional (p ? fpu) "--with-fpu=${p.fpu}") diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 417c10363b52..cd239638418d 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -253,6 +253,9 @@ in rec { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; + } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.platform.gcc.arch or stdenv.hostPlatform.parsed.cpu.arch or "x86-64" != "x86-64") { + requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch or stdenv.hostPlatform.parsed.cpu.arch}" ]; + NIX_ENFORCE_NO_NATIVE = true; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive -- cgit 1.4.1 From 21feddd76a4bb0db568b70ab26b7c200c5444efd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 18 Apr 2019 11:57:57 -0500 Subject: nghttp2: 1.37.0 -> 1.38.0 https://nghttp2.org/blog/2019/04/18/nghttp2-v1-38-0/ --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 277ef7923e61..2642ee5510a1 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.37.0"; + version = "1.38.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1bi3aw096kd51abazvv6ilplz6gjbm84yr3mzxklbhysv38y6xl2"; + sha256 = "156r3myrglkmrdv4zh151g9zcr7b92zjn15wx5i9ypw0naanjc4g"; }; outputs = [ "bin" "out" "dev" "lib" ]; -- cgit 1.4.1 From b1c3581b467b3376dede1132b9d9b88a20ac7cf2 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 19:16:28 +0000 Subject: make-derivation.nix: @matthewbauer's review --- pkgs/stdenv/generic/make-derivation.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cd239638418d..cb50fdf7313e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -253,9 +253,8 @@ in rec { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; - } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.platform.gcc.arch or stdenv.hostPlatform.parsed.cpu.arch or "x86-64" != "x86-64") { - requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch or stdenv.hostPlatform.parsed.cpu.arch}" ]; - NIX_ENFORCE_NO_NATIVE = true; + } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.platform ? gcc.arch) { + requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch}" ]; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive -- cgit 1.4.1 From b0193379e5eaa2d1f9b4c4dba3552641e396d3d9 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 20:05:13 +0000 Subject: make-derivation.nix: minor it seems to change nothing (.platform is always there), just to be consisted with the style of other checks --- pkgs/stdenv/generic/make-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cb50fdf7313e..34d48e8cf336 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -253,7 +253,7 @@ in rec { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; - } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.platform ? gcc.arch) { + } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? platform.gcc.arch) { requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch}" ]; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { inherit __darwinAllowLocalNetworking; -- cgit 1.4.1 From a961a289a9b2747e43c5475505eb6e4f58fe2ecc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Apr 2019 05:26:57 +0200 Subject: networkmanager: port to Meson All hail Meson! One serious issue is that building docs does not work. We patch gobject-introspection to use absolute paths for shared libraries in GIR files. Building the NetworkManager docs relies on the produced introspection data but since the library is not yet installed at the time the docs are generated, the build will fail. It works in Autotools for some reason; they probably use the pregenerated GIRs from the tarball. Disabling the docs completely is not possible at the moment either, since nmc [depends on them][1]. I have decided to fix this by pointing the installed location to the one in the build directory using libredirect. Unfortunately, we cannot just set the environment variables directly, since the build system runs the documentation generator in a clean environment. I have also added man, doc and devdoc outputs so the generated files have somewhere to go. Secondly, since Nix store is immutable, we also cannot use the package prefix for configuration and mutable state data. At the same time, we cannot write to the appropriate global directories during build. Autotools allowed to change this in installFlags but Meson lacks similar mechanism so we need to patch the build files. Finally, I also removed the at_console patch since the permission has been removed in 0.9.10. [1]: https://bugzilla.gnome.org/show_bug.cgi?id=796755 --- pkgs/tools/networking/network-manager/default.nix | 104 +++++++++++---------- .../network-manager/fix-docs-build.patch | 11 +++ .../network-manager/fix-install-paths.patch | 25 +++++ 3 files changed, 91 insertions(+), 49 deletions(-) create mode 100644 pkgs/tools/networking/network-manager/fix-docs-build.patch create mode 100644 pkgs/tools/networking/network-manager/fix-install-paths.patch (limited to 'pkgs') diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 78aeb2a03edd..c4a34dc6a909 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus, dbus-glib -, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables -, libgcrypt, dnsmasq, bluez5, readline +, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala +, libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt -, python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }: +, ethtool, gnused, coreutils, inetutils, kmod, jansson, gtk-doc, libxslt +, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43 +, openconnect, curl, meson, ninja, libpsl, libredirect }: let pname = "NetworkManager"; + pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { name = "network-manager-${version}"; version = "1.16.0"; @@ -16,44 +18,34 @@ in stdenv.mkDerivation rec { sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf"; }; - outputs = [ "out" "dev" ]; - - postPatch = '' - patchShebangs ./tools - ''; - - preConfigure = '' - substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname - substituteInPlace configure --replace /usr/bin/file ${file}/bin/file - - # Fixes: error: po/Makefile.in.in was not created by intltoolize. - intltoolize --automake --copy --force - ''; + outputs = [ "out" "dev" "devdoc" "man" "doc" ]; # Right now we hardcode quite a few paths at build time. Probably we should # patch networkmanager to allow passing these path in config file. This will # remove unneeded build-time dependencies. - configureFlags = [ - "--with-dhclient=${dhcp}/bin/dhclient" - "--with-dnsmasq=${dnsmasq}/bin/dnsmasq" + mesonFlags = [ + "-Ddhclient=${dhcp}/bin/dhclient" + "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure - "--with-dhcpcd=no" - "--with-pppd=${ppp}/bin/pppd" - "--with-iptables=${iptables}/bin/iptables" + "-Ddhcpcd=no" + "-Dpppd=${ppp}/bin/pppd" + "-Diptables=${iptables}/bin/iptables" # to enable link-local connections - "--with-udev-dir=${placeholder "out"}/lib/udev" - "--with-resolvconf=${openresolv}/sbin/resolvconf" - "--sysconfdir=/etc" "--localstatedir=/var" - "--with-dbus-sys-dir=${placeholder "out"}/etc/dbus-1/system.d" - "--with-crypto=gnutls" "--disable-more-warnings" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-kernel-firmware-dir=/run/current-system/firmware" - "--with-session-tracking=systemd" - "--with-modem-manager-1" - "--with-nmtui" - "--disable-gtk-doc" - "--with-libnm-glib" # legacy library, TODO: remove - "--disable-tests" + "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Dresolvconf=${openresolv}/bin/resolvconf" + "-Ddbus_conf_dir=${placeholder "out"}/etc/dbus-1/system.d" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "-Dkernel_firmware_dir=/run/current-system/firmware" + "--sysconfdir=/etc" + "--localstatedir=/var" + "-Dcrypto=gnutls" + "-Dsession_tracking=systemd" + "-Dmodem_manager=true" + "-Dnmtui=true" + "-Ddocs=true" + "-Dlibnm_glib=true" # legacy library, TODO: remove + "-Dtests=no" + "-Dqt=false" ]; patches = [ @@ -63,31 +55,45 @@ in stdenv.mkDerivation rec { inherit (stdenv) shell; }) + # Meson does not support using different directories during build and + # for installation like Autotools did with flags passed to make install. + ./fix-install-paths.patch + + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When building docs, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are replacing the variables in postPatch since substituteAll does not support + # placeholders. + ./fix-docs-build.patch ]; buildInputs = [ - systemd libuuid polkit ppp libndp curl + systemd libselinux audit libpsl libuuid polkit ppp libndp curl bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson ]; - propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ]; + propagatedBuildInputs = [ dbus-glib gnutls libgcrypt ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ]; + nativeBuildInputs = [ + meson ninja intltool pkgconfig + vala gobject-introspection + dbus-glib # for dbus-binding-tool + # Docs + gtk-doc libxslt docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 pythonForDocs + ]; doCheck = false; # requires /sys, the net - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - "localstatedir=${placeholder "out"}/var" - "runstatedir=${placeholder "out"}/run" - ]; - - postInstall = '' - mkdir -p $out/lib/NetworkManager + postPatch = '' + patchShebangs ./tools + patchShebangs libnm/generate-setting-docs.py - # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy - substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' + substituteInPlace libnm/meson.build \ + --subst-var-by DOCS_LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --subst-var-by DOCS_NIX_REDIRECTS "${placeholder "out"}/lib/libnm.so.0=$PWD/build/libnm/libnm.so.0" + ''; + postInstall = '' # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service diff --git a/pkgs/tools/networking/network-manager/fix-docs-build.patch b/pkgs/tools/networking/network-manager/fix-docs-build.patch new file mode 100644 index 000000000000..45e18c42fbe1 --- /dev/null +++ b/pkgs/tools/networking/network-manager/fix-docs-build.patch @@ -0,0 +1,11 @@ +--- a/libnm/meson.build ++++ b/libnm/meson.build +@@ -262,6 +262,8 @@ + 'env', '-i', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, ++ 'LD_PRELOAD=' + '@DOCS_LD_PRELOAD@', ++ 'NIX_REDIRECTS=' + '@DOCS_NIX_REDIRECTS@', + ] + + name = 'nm-property-docs.xml' diff --git a/pkgs/tools/networking/network-manager/fix-install-paths.patch b/pkgs/tools/networking/network-manager/fix-install-paths.patch new file mode 100644 index 000000000000..068b9c8266b8 --- /dev/null +++ b/pkgs/tools/networking/network-manager/fix-install-paths.patch @@ -0,0 +1,25 @@ +--- a/meson.build ++++ b/meson.build +@@ -925,9 +925,9 @@ + join_paths('tools', 'meson-post-install.sh'), + nm_datadir, + nm_bindir, +- nm_pkgconfdir, ++ nm_prefix + nm_pkgconfdir, + nm_pkglibdir, +- nm_pkgstatedir, ++ nm_prefix + nm_pkgstatedir, + enable_docs ? 'install_docs' : '', + nm_mandir, + ) +--- a/src/settings/plugins/ifcfg-rh/meson.build ++++ b/src/settings/plugins/ifcfg-rh/meson.build +@@ -70,7 +70,7 @@ + ) + + meson.add_install_script('sh', '-c', +- 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_sysconfdir)) ++ 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_prefix + nm_sysconfdir)) + + if enable_tests + subdir('tests') -- cgit 1.4.1 From 22714ad6d05756a33219ae7a81fd8629001db3f3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 2 Mar 2019 10:31:30 +0100 Subject: python37Packages.cryptography: Improve the test vectors integration This should make the management easier. The package cryptography_vectors contains the test vectors for cryptography and should therefore always have the same version. By linking the version of cryptography_vectors to cryptography, this simply cannot be forgotten. --- .../python-modules/cryptography/default.nix | 3 +-- .../python-modules/cryptography/vectors.nix | 23 ++++++++++++++++++++++ .../cryptography_vectors/default.nix | 23 ---------------------- pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 25 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/cryptography/vectors.nix delete mode 100644 pkgs/development/python-modules/cryptography_vectors/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index dfbb14eb7e65..5e42774fdd97 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -20,9 +20,8 @@ }: buildPythonPackage rec { - # also bump cryptography_vectors pname = "cryptography"; - version = "2.5"; + version = "2.5"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix new file mode 100644 index 000000000000..86b16586f684 --- /dev/null +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage, fetchPypi, lib, cryptography }: + +buildPythonPackage rec { + pname = "cryptography_vectors"; + # The test vectors must have the same version as the cryptography package: + version = cryptography.version; + + src = fetchPypi { + inherit pname version; + sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik"; + }; + + # No tests included + doCheck = false; + + meta = with lib; { + description = "Test vectors for the cryptography package"; + homepage = https://cryptography.io/en/latest/development/test-vectors/; + # Source: https://github.com/pyca/cryptography/tree/master/vectors; + license = with licenses; [ asl20 bsd3 ]; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix deleted file mode 100644 index f02a986ec023..000000000000 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib }: - -buildPythonPackage rec { - # also bump cryptography - pname = "cryptography_vectors"; - version = "2.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik"; - }; - - # No tests included - doCheck = false; - - meta = with lib; { - description = "Test vectors for the cryptography package"; - homepage = https://cryptography.io/en/latest/development/test-vectors/; - # Source: https://github.com/pyca/cryptography/tree/master/vectors; - license = with licenses; [ asl20 bsd3 ]; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb53f2dd5e02..0b7002cfe345 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1481,7 +1481,7 @@ in { cryptography = callPackage ../development/python-modules/cryptography { }; - cryptography_vectors = callPackage ../development/python-modules/cryptography_vectors { }; + cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors.nix { }; curtsies = callPackage ../development/python-modules/curtsies { }; -- cgit 1.4.1 From 047af233cd2d8dd3606868d1cfbd3104bb28f58d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 2 Mar 2019 12:11:33 +0100 Subject: python37Packages.cryptography: 2.5 -> 2.6.1 Changelog: https://cryptography.io/en/latest/changelog/#v2-6-1 Important changes: - BACKWARDS INCOMPATIBLE: Removed cryptography.hazmat.primitives.asymmetric.utils.encode_rfc6979_signature and cryptography.hazmat.primitives.asymmetric.utils.decode_rfc6979_signature, which had been deprecated for nearly 4 years. Use encode_dss_signature() and decode_dss_signature() instead. - BACKWARDS INCOMPATIBLE: Removed cryptography.x509.Certificate.serial, which had been deprecated for nearly 3 years. Use serial_number instead. --- pkgs/development/python-modules/cryptography/default.nix | 4 ++-- pkgs/development/python-modules/cryptography/vectors.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 5e42774fdd97..93bbc28340ed 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.5"; # Also update the hash in vectors.nix + version = "2.6.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9"; + sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 86b16586f684..5679905cd143 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik"; + sha256 = "1bsqcv3h49dzqnyn29ijq8r7k1ra8ikl1y9qcpcns9nbvhaq3wq3"; }; # No tests included -- cgit 1.4.1 From 186fc20392a9c523c4b3fc85037e16f25dfd2256 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 30 Mar 2019 12:13:09 -0400 Subject: pythonPackages.cryptography: vectors are checkInputs --- pkgs/development/python-modules/cryptography/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 93bbc28340ed..69c9f7292942 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - buildInputs = [ openssl cryptography_vectors ] + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ asn1crypto @@ -41,11 +41,12 @@ buildPythonPackage rec { ++ stdenv.lib.optional (!isPyPy) cffi; checkInputs = [ - pytest - pretend + cryptography_vectors + hypothesis iso8601 + pretend + pytest pytz - hypothesis ]; checkPhase = '' -- cgit 1.4.1 From 105bfc3ad3f014b4569c25d7a23da0d6412a72a5 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 22 Apr 2019 13:53:21 +0200 Subject: libpng: 1.6.36 -> 1.6.37 If I understand the announcement right, there's nothing important beyond incorporating the patches we were applying (ARM NEON memory leak): https://sourceforge.net/p/png-mng/mailman/message/36641210/ --- pkgs/development/libraries/libpng/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 765f03d9825d..849f7d29ef6d 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,31 +3,21 @@ assert zlib != null; let - patchVersion = "1.6.36"; + patchVersion = "1.6.37"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "03ywdwaq1k3pfslvbs2b33z3pdmazz6yp8g56mzafacvfgd367wc"; + sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2"; }; whenPatched = stdenv.lib.optionalString apngSupport; in stdenv.mkDerivation rec { name = "libpng" + whenPatched "-apng" + "-${version}"; - version = "1.6.36"; + version = "1.6.37"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc"; + sha256 = "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"; }; - patches = [ - (fetchurl { # https://github.com/glennrp/libpng/issues/266 - url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch"; - sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n"; - }) - (fetchurl { # https://github.com/glennrp/libpng/issues/275 - url = "https://salsa.debian.org/debian/libpng1.6/raw/853d1977/debian/patches/CVE-2019-7317.patch"; - sha256 = "0c8qc176mqh08kcxlnx40rzdggchihkrlzqw6qg6lf0c9ygkf55k"; - }) - ]; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; outputs = [ "out" "dev" "man" ]; -- cgit 1.4.1 From 8803fb8918546859474a9fec490ee64c4fac6fd1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 22 Apr 2019 08:44:53 -0400 Subject: waf: make reproducible --- pkgs/development/tools/build-managers/waf/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 05e11ad63a7a..50269a74395c 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook }: +{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook }: stdenv.mkDerivation rec { name = "waf-${version}"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "006a4wb9i569pahs8ji86hrv58g2hm8xikgchnll3bdqgxllhnrs"; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/grahamc/waf/commit/fc1c98f1fb575fb26b867a61cbca79aa894db2ea.patch"; + sha256 = "0kzfrr6nh1ay8nyk0i69nhkkrq7hskn7yw1qyjxrda1y3wxj6jp8"; + }) + ]; + buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; configurePhase = '' -- cgit 1.4.1 From dd927553f37b4a465fcaee2eee8d94639eba9069 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 19:55:31 +0000 Subject: perl: 5.28.1 -> 5.28.2 --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index e03777b0fb35..2d5001e76358 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -193,8 +193,8 @@ in rec { # the latest Maint version perl528 = common { self = perl528; - version = "5.28.1"; - sha256 = "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry"; + version = "5.28.2"; + sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; }; # the latest Devel version -- cgit 1.4.1 From 9629c3d8aca449a9fccce99013ec42cc3f4639b3 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 21:20:16 +0000 Subject: perlPackages.DB_File: 1.842 -> 1.851 --- pkgs/development/perl-modules/DB_File/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index b3ca12421e41..d37fb1f12daf 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -1,11 +1,11 @@ {fetchurl, buildPerlPackage, db}: buildPerlPackage rec { - name = "DB_File-1.842"; + name = "DB_File-1.851"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg"; + sha256 = "1j276mng1nwxxdxnb3my427s5lb6zlnssizcnxricnvaa170kdv8"; }; preConfigure = '' -- cgit 1.4.1 From bb927b8ba0bbbb380f2b79ef5f07678c074bf32c Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 21:19:40 +0000 Subject: perlPackages.CompressRawZlib: 2.081 -> 2.086 --- pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 832cec169ba3..7c733742d2b0 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.081"; + name = "Compress-Raw-Zlib-2.086"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "06rsm9ahp20xfyvd3jc69sd0k8vqysryxc6apzdbn96jbcsdwmp1"; + sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z"; }; preConfigure = '' -- cgit 1.4.1 From 1e0e721f2afaea45dab00355a6390bdc59f33e53 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 21:19:11 +0000 Subject: perlPackages.DBD-SQLite: 1.58 -> 0.62 --- pkgs/development/perl-modules/DBD-SQLite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 98d98266db17..ff84de40b30e 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, perl, DBI, sqlite }: buildPerlPackage rec { - name = "DBD-SQLite-1.58"; + name = "DBD-SQLite-1.62"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz; - sha256 = "0fqx386jgs9mmrknr7smmzapf07izgivza7x08lfm39ks2cxs83i"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.62.tar.gz; + sha256 = "0p78ri1q6xpc1i98i6mlriv8n66iz8r5r11dlsknjm4y58rfz0mx"; }; propagatedBuildInputs = [ DBI ]; -- cgit 1.4.1 From e64b3ed4775ffd5e749ce5e804a62c09e962c189 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 21:18:52 +0000 Subject: perlPackages.BerkeleyDB: 0.55 -> 0.61 --- pkgs/development/perl-modules/BerkeleyDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index 4566c04fcb6a..db94a3b07fe2 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,11 +1,11 @@ {buildPerlPackage, fetchurl, db}: buildPerlPackage rec { - name = "BerkeleyDB-0.55"; + name = "BerkeleyDB-0.61"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0kz40wqr7qwag43qnmkpri03cjnqwzb0kj0vc9aw9yz2qx0y2a3g"; + sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz"; }; preConfigure = '' -- cgit 1.4.1 From 4bbd5b8e30be88811cfd7a3cbc048d625f7df277 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 00:03:22 +0000 Subject: perlPackages.DBD-mysql: 4.046 -> 4.050 --- pkgs/development/perl-modules/DBD-mysql/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 2191c233d455..5365e0c6b95b 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, buildPerlPackage, DBI, mysql }: +{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }: buildPerlPackage rec { - name = "DBD-mysql-4.046"; + name = "DBD-mysql-4.050"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; - sha256 = "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1"; + url = "mirror://cpan/authors/id/D/DV/DVEEDEN/${name}.tar.gz"; + sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g"; }; - buildInputs = [ mysql.connector-c ] ; + buildInputs = [ mysql.connector-c DevelChecklib ] ; propagatedBuildInputs = [ DBI ]; doCheck = false; -- cgit 1.4.1 From ce387605871c5359a08105c48876348c8ef24254 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:03 +0000 Subject: [cpan2nix] perlPackages.CGIMinimal: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 098b2652bf63..65766d771b96 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1773,7 +1773,7 @@ let propagatedBuildInputs = [ CGI ]; }; - CGIMinimal = buildPerlPackage rec { + CGIMinimal = buildPerlModule rec { name = "CGI-Minimal-1.29"; src = fetchurl { url = "mirror://cpan/authors/id/S/SN/SNOWHARE/${name}.tar.gz"; -- cgit 1.4.1 From 7b6c9949ea88f7cfb891e2125d7f841fe08c435c Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:04 +0000 Subject: [cpan2nix] perlPackages.CPANPerlReleases: 3.90 -> 3.94 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 65766d771b96..2ab7fc8b4e61 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2805,10 +2805,10 @@ let }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.90"; + name = "CPAN-Perl-Releases-3.94"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "19pjq3x9nb76m4a5g37miw1js5mmfqhv1z2gyya3kjc8wbjb1qjc"; + sha256 = "12g3mdl8lziz218a5rlflhbd295paqfqq5f9ylkdr00pnss5jfnp"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; -- cgit 1.4.1 From cc11c9b730b08c9bc3d8bcbdcff11eeca5a4cc17 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:04 +0000 Subject: [cpan2nix] perlPackages.CacheFastMmap: 1.47 -> 1.48 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ab7fc8b4e61..9471b3b22a71 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -977,10 +977,10 @@ let }; CacheFastMmap = buildPerlPackage rec { - name = "Cache-FastMmap-1.47"; + name = "Cache-FastMmap-1.48"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.47.tar.gz; - sha256 = "0fdni3iyjfnx8ldgrz3h6z6yxbklrx76klcghg6xvmzd878yqlmi"; + url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz; + sha256 = "118y5lxwa092zrii7mcwnqypff7424w1dpgfkg8zlnz7h2mmnd9c"; }; }; -- cgit 1.4.1 From 6be593ab3026ccf8959b9e775dd35d790f1ea908 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:10 +0000 Subject: [cpan2nix] perlPackages.ClassInspector: 1.32 -> 1.34 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9471b3b22a71..cd139019e6e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2043,10 +2043,10 @@ let }; ClassInspector = buildPerlPackage { - name = "Class-Inspector-1.32"; + name = "Class-Inspector-1.34"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz; - sha256 = "0d85rihxahdvhj8cysqrgg0kbmcqghz5hgy41dbkxr1qaf5xrynf"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.34.tar.gz; + sha256 = "1n7h3jzwdz5a8gmz515xfr7ic82dl5sbdrk5d2fskiycngf8d6py"; }; meta = { description = "Get information about a class and its structure"; -- cgit 1.4.1 From 6446fabb832d975bc36aa26e363bc8759b6a1464 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:15 +0000 Subject: [cpan2nix] perlPackages.CompressRawBzip2: 2.084 -> 2.086 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cd139019e6e8..daea2427d4b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2376,10 +2376,10 @@ let }; CompressRawBzip2 = buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.084"; + name = "Compress-Raw-Bzip2-2.086"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0kwjrsl519bv48b7698a9anj6l0n3z1vrd1a7im2r1pbffxxw5kx"; + sha256 = "16gkm5m5hr8129h93r0liyyqffvh820wrlvxal8cn8bdcx59bls6"; }; # Don't build a private copy of bzip2. -- cgit 1.4.1 From a27990351f2443fd598b44af0148d83b12d1c939 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:15 +0000 Subject: [cpan2nix] perlPackages.ConfigGrammar: 1.12 -> 1.13 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index daea2427d4b8..d68718fc990f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2455,10 +2455,10 @@ let }; ConfigGrammar = buildPerlPackage rec { - name = "Config-Grammar-1.12"; + name = "Config-Grammar-1.13"; src = fetchurl { url = "mirror://cpan/authors/id/D/DS/DSCHWEI/${name}.tar.gz"; - sha256 = "7a52a3657d96e6f1f529caaa09ec3bf7dd6a245b47875382c323902f6d9590b0"; + sha256 = "a8b3a3a2c9c8c43b92dc401bf2709d6514f15b467fd4f72c48d356335771d6e3"; }; meta = { homepage = https://github.com/schweikert/Config-Grammar; -- cgit 1.4.1 From a983d18c7a4d2212caf141900c72cc2aa3c5ed6e Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:16 +0000 Subject: [cpan2nix] perlPackages.CpanelJSONXS: 4.09 -> 4.11 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d68718fc990f..909f5c3c7fd7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2744,10 +2744,10 @@ let }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.09"; + name = "Cpanel-JSON-XS-4.11"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "99c0155e554222b0cb24b032ced9a4f7bdfd2b3c98d07657ac020fbe5c3495a3"; + sha256 = "08d17df7d373868a154bfa687f54fa06e0691836af8470fb29d538215d82bc78"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; -- cgit 1.4.1 From 9de9fc339a1bcf5a488529dde0ba3a2b08ba143f Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:30 +0000 Subject: [cpan2nix] perlPackages.DevelPPPort: 3.44 -> 3.45 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 909f5c3c7fd7..a3f83977089d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4026,10 +4026,10 @@ let }; DevelPPPort = buildPerlPackage rec { - name = "Devel-PPPort-3.44"; + name = "Devel-PPPort-3.45"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.44.tar.gz; - sha256 = "06561decc76f0aaba8e77f72b74624e19e2ad448a654c489c61bc786660832c5"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.45.tar.gz; + sha256 = "171dcfb3abd964081986634b79c53108f0825c47f95f915eb7cdb3309f7d04f0"; }; meta = { description = "Perl/Pollution/Portability"; -- cgit 1.4.1 From 79d8c6e68ec289aed14fd09465d96d88463000a3 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:35 +0000 Subject: [cpan2nix] perlPackages.Encode: 3.00 -> 3.01 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a3f83977089d..09372a3a7fd0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5100,10 +5100,10 @@ let }; Encode = buildPerlPackage rec { - name = "Encode-3.00"; + name = "Encode-3.01"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "4b538b47459cf5747b7395ccc8c8c9b3b661cc016c50b8a67e10fe19590fea5e"; + sha256 = "d4555f570491648dbbd602bce7966672834b4c8f45acaa6757de474fca3a4d87"; }; postInstall = "rm $out/bin/{enc2xs,encguess,piconv} $out/share/man/man1/{enc2xs,encguess,piconv}.1"; # remove the files perl-5.28 already has meta = { -- cgit 1.4.1 From 2de0611058ceb12b1a680a3393cbc0a494dde186 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:43 +0000 Subject: [cpan2nix] perlPackages.ExtUtilsDepends: 0.405 -> 0.8000 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 09372a3a7fd0..e50dfc29bdb6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5395,10 +5395,10 @@ let }; ExtUtilsDepends = buildPerlPackage { - name = "ExtUtils-Depends-0.405"; + name = "ExtUtils-Depends-0.8000"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.405.tar.gz; - sha256 = "0b4ab9qmcihsfs2ajhn5qzg7nhazr68v3r0zvb7076smswd41mla"; + url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz; + sha256 = "165y1cjirbq64w39svkz82cb5jjqkjm8f4c0wqi2lk6050hzf3vq"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; -- cgit 1.4.1 From 7a1695fe7e03ff49a890a2f3085a54c7bbcbc181 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:44 +0000 Subject: [cpan2nix] perlPackages.ExtUtilsManifest: 1.71 -> 1.72 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e50dfc29bdb6..604b42d37c57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5481,10 +5481,10 @@ let }; ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.71"; + name = "ExtUtils-Manifest-1.72"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Manifest-1.71.tar.gz; - sha256 = "1qa7jwhy78byvfzpjnn5k2jm30sb5m1z6k2m79iy6gg2xj41nrq0"; + url = mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.72.tar.gz; + sha256 = "0pml5pfdk34nj9fa8m4f0qp1rh1yv0d54xagvxzjvvwq9w3q14kr"; }; }; -- cgit 1.4.1 From dc91f82c58be0238d566e0b9d260911e836a91f1 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:06:50 +0000 Subject: [cpan2nix] perlPackages.FileSlurp: 9999.26 -> 9999.27 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 604b42d37c57..9569b8854fe6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6064,10 +6064,10 @@ let }; FileSlurp = buildPerlPackage { - name = "File-Slurp-9999.26"; + name = "File-Slurp-9999.27"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.26.tar.gz; - sha256 = "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.27.tar.gz; + sha256 = "1x233kj1qifvii7j8d4wzarwhj5z11vnpxsqvdm98dsccr7qi79s"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; -- cgit 1.4.1 From 78f07270efe31bdce4707f95fcd47c79be3d5da3 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:07:10 +0000 Subject: [cpan2nix] perlPackages.Imager: 1.010 -> 1.011 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9569b8854fe6..d10a91d72f32 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7498,10 +7498,10 @@ let }; Imager = buildPerlPackage rec { - name = "Imager-1.010"; + name = "Imager-1.011"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz"; - sha256 = "fc22e3e302f139d74a98d8068ccddfd92166141ddd4ca5c40f102070bcd7a3c7"; + sha256 = "a3aea2f0c172c2c094baeced4a3bdaa9f54e3e85c97eea2e5f8f994ba2beedfc"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; -- cgit 1.4.1 From dc14eacde891252c56c988fb62b27f0431273a6c Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:07:31 +0000 Subject: [cpan2nix] perlPackages.ModuleBuild: 0.4224 -> 0.4229 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d10a91d72f32..39e1b248bf9a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9686,10 +9686,10 @@ let }; ModuleBuild = buildPerlPackage rec { - name = "Module-Build-0.4224"; + name = "Module-Build-0.4229"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "10n7ggpmicwq1n503pg7kiwslda0bz48azzjvc7vb9s4hbbibjm6"; + sha256 = "064c03wxia7jz0i578awj4srykj0nnigm4p5r0dv0559rnk93r0z"; }; meta = { description = "Build and install Perl modules"; -- cgit 1.4.1 From 01414e8b6c32987d5f9c6c5c580d531134a3fd3c Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:07:32 +0000 Subject: [cpan2nix] perlPackages.ModuleCoreList: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39e1b248bf9a..c6da5094291f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9806,18 +9806,7 @@ let buildInputs = [ Filepushd ]; }; - ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20190220"; - src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20190220.tar.gz; - sha256 = "0v5yavg3ggal8aj00426wkjw38yrji449lkaaxs0ynwjqhnq01i7"; - }; - meta = { - homepage = http://dev.perl.org/; - description = "What modules shipped with versions of perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + ModuleCoreList = null; # part of Perl 5.28 ModuleExtractUse = buildPerlModule rec { name = "Module-ExtractUse-0.343"; -- cgit 1.4.1 From f221ddfe138c338048ca955dbeca29dd7cbbcd94 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:07:34 +0000 Subject: [cpan2nix] perlPackages.Mojolicious: 8.12 -> 8.14 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c6da5094291f..79feaa1b3786 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10071,10 +10071,10 @@ let }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-8.12"; + name = "Mojolicious-8.14"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "1sc9bdac4p9ha6xfmi3xj2dzip4bhxxzn5zvzyxqgbyvvr52k2dw"; + sha256 = "0dammdx51cyqn2b35yihk85gz1blgw85w6jv6h04cv4cdahph59q"; }; meta = { homepage = https://mojolicious.org; -- cgit 1.4.1 From a4974281cdde237b5a906737d5f75626240d5263 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:07:36 +0000 Subject: [cpan2nix] perlPackages.NetCIDR: 0.19 -> 0.20 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 79feaa1b3786..35357f8b3076 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11175,10 +11175,10 @@ let }; NetCIDR = buildPerlPackage { - name = "Net-CIDR-0.19"; + name = "Net-CIDR-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.19.tar.gz; - sha256 = "855bf4662062de1a85aba3b0e4c82665d7107873a43836f3c03e7f260dd89f3e"; + url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.20.tar.gz; + sha256 = "c75edc6818bb360d71c139169fd64ad65c35fff6d2b9fac7b9f9e6c467f187b5"; }; meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; -- cgit 1.4.1 From c9debb4ba065cc96e7d2544ada1b4f8f8c0390ed Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:07:38 +0000 Subject: [cpan2nix] perlPackages.NetPing: 2.71 -> 2.72 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35357f8b3076..133172bb5a0c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11356,10 +11356,10 @@ let }; NetPing = buildPerlPackage { - name = "Net-Ping-2.71"; + name = "Net-Ping-2.72"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.71.tar.gz; - sha256 = "0819d0aa87b173e98ecb3ccfd92272ce53c7fc9e86f962f64602a6fa477f7d4f"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz; + sha256 = "555af602f54229cd81fef7da1a81516800f3155c6dc4d07dc71be1de3253dd6a"; }; meta = { description = "Check a remote host for reachability"; -- cgit 1.4.1 From fe5f87529618c025a200f8c41a52104cc96454d6 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:07:48 +0000 Subject: [cpan2nix] perlPackages.Paranoid: 2.06 -> 2.07 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 133172bb5a0c..709feb6ad247 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11938,10 +11938,10 @@ let }; Paranoid = buildPerlPackage rec { - name = "Paranoid-2.06"; + name = "Paranoid-2.07"; src = fetchurl { url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/${name}.tar.gz"; - sha256 = "48763ec19d0a4194ecf613bd63e46325510228da9100c2e796615dc778612d3c"; + sha256 = "b55cfd8c6d5f181e218efd012f711a50cd14e4dbc8804650b95477178f43b7fc"; }; patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; preConfigure = '' -- cgit 1.4.1 From 85479b8e222b74c6758c8f5644923926976595ee Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:07:53 +0000 Subject: [cpan2nix] perlPackages.PerlTidy: 20180220 -> 20181120 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 709feb6ad247..9996813acdda 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12295,10 +12295,10 @@ let }; PerlTidy = buildPerlPackage rec { - name = "Perl-Tidy-20180220"; + name = "Perl-Tidy-20181120"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz"; - sha256 = "e9973ce28b7518108c1e68fa767c6566822480e739df275375a0dfcc9c2b3370"; + sha256 = "7db0eeb76535a62cbb4e69b6558e0705162d476a654a7a5ec472aa846b8c4569"; }; meta = { description = "Indent and reformat perl scripts"; -- cgit 1.4.1 From a9712dbece39bf51e250f91a39e015fe61ebb702 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:08:20 +0000 Subject: [cpan2nix] perlPackages.TermEncoding: 0.02 -> 0.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9996813acdda..a1a59eeee8d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14650,10 +14650,10 @@ let }; TermEncoding = buildPerlPackage { - name = "Term-Encoding-0.02"; + name = "Term-Encoding-0.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.02.tar.gz; - sha256 = "f274e72346a0c0cfacfb53030ac1e38b57425512fc5bdc5cd9ef75ab0f26cfcc"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.03.tar.gz; + sha256 = "95ba9687d735d25a3cbe64508d7894f009c7fa2a1726c3e786e9e21da2251d0b"; }; meta = { description = "Detect encoding of the current terminal"; -- cgit 1.4.1 From c56ae6ba1d4ed624617c1ee653ae140cfaf015f0 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:08:28 +0000 Subject: [cpan2nix] perlPackages.TestNeeds: 0.002005 -> 0.002006 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a1a59eeee8d7..9a59be98a4f9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15501,10 +15501,10 @@ let }; TestNeeds = buildPerlPackage rec { - name = "Test-Needs-0.002005"; + name = "Test-Needs-0.002006"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "5a4f33983586edacdbe00a3b429a9834190140190dab28d0f873c394eb7df399"; + sha256 = "77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5"; }; meta = { description = "Skip tests when modules not available"; -- cgit 1.4.1 From 18cd7ad57d9c38441dcf72373de3082ccad2284f Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:08:38 +0000 Subject: [cpan2nix] perlPackages.TextCSV_XS: 1.38 -> 1.39 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a59be98a4f9..323e93d4c6b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16209,10 +16209,10 @@ let }; TextCSV_XS = buildPerlPackage rec { - name = "Text-CSV_XS-1.38"; + name = "Text-CSV_XS-1.39"; src = fetchurl { url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz"; - sha256 = "d6317ae0ed0658e00037ecedaa3da2ff8565c86b0516ef8a93322b959de313dd"; + sha256 = "aa4e424eaf68bea0d0e8c16b961c942b64926e6183ce1dbbc6c799eafb0a9ebd"; }; meta = { description = "Comma-Separated Values manipulation routines"; -- cgit 1.4.1 From 36dcc78633b097a2e7b85debe1c9345357291979 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:08:57 +0000 Subject: [cpan2nix] perlPackages.YAMLLibYAML: 0.76 -> 0.77 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 323e93d4c6b6..55933911db11 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17815,10 +17815,10 @@ let }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.76"; + name = "YAML-LibYAML-0.77"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.76.tar.gz; - sha256 = "1m94g36sl9rasjlvlsf65xcal5hvkc3gbzd7l68h17az75269kyy"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.77.tar.gz; + sha256 = "04wfa78i3r6gznl47gj3qvsa1ixdas7l7c5c3n5mwm81wi4d9vsi"; }; }; -- cgit 1.4.1 From 8cf67fa69a3b2a442646a0c15ae110f05d730b17 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:09:01 +0000 Subject: [cpan2nix] perlPackages.librelative: 0.002 -> 1.000 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55933911db11..f4a1c85b8237 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8249,10 +8249,10 @@ let }; librelative = buildPerlPackage rec { - name = "lib-relative-0.002"; + name = "lib-relative-1.000"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-0.002.tar.gz; - sha256 = "1i51qa22lgm1gpakn1vy4sf574fsmz141dx90i6pq84w9hc9xbry"; + url = mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz; + sha256 = "1mvcdl87d3kyrdx4y6x79k3n5qdd1x5m1hp8lwjxvgfqbw0cgq6z"; }; meta = { description = "Add paths relative to the current file to @INC"; -- cgit 1.4.1 From fecc11d7bdbb55df74bf9d436ac3aceb21e89aa2 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:09:04 +0000 Subject: [cpan2nix] perlPackages.strictures: 2.000005 -> 2.000006 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f4a1c85b8237..5facc0a6313f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13946,10 +13946,10 @@ let }; strictures = buildPerlPackage rec { - name = "strictures-2.000005"; + name = "strictures-2.000006"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/strictures-2.000005.tar.gz; - sha256 = "16fxhsmn2v8a1fxd02243zl7vckmvwzwwys1pjp9rw68hagxn2wn"; + url = mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000006.tar.gz; + sha256 = "0mwd9xqz4n8qfpi5h5581lbm33qhf7agww18h063icnilrs7km89"; }; meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; -- cgit 1.4.1 From dec201ed62f438e5961aaf445ed7940f881b31ab Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:09:13 +0000 Subject: [cpan2nix] perlPackages.ConfigIniFiles: 3.000001 -> 3.000002 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5facc0a6313f..3944536a1c57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2497,10 +2497,10 @@ let }; ConfigIniFiles = buildPerlModule rec { - name = "Config-IniFiles-3.000001"; + name = "Config-IniFiles-3.000002"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "48ada0a6c6a5b6cbe1bfb261fe56e3bf8492ff9420f7321b6a972924416659ea"; + sha256 = "d92ed6ed2db98d5addf732c96d2a9c15d9f878c7e8b355bb7a5c1668e3f8ba09"; }; propagatedBuildInputs = [ IOStringy ]; meta = { -- cgit 1.4.1 From 20123212b5473dcf0289b1a013d7d9af6bdd633b Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:09:33 +0000 Subject: [cpan2nix] perlPackages.MusicBrainz: 1.0.4 -> 1.0.5 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3944536a1c57..2635236722d4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11024,10 +11024,10 @@ let }; MusicBrainz = buildPerlModule rec { - name = "WebService-MusicBrainz-1.0.4"; + name = "WebService-MusicBrainz-1.0.5"; src = fetchurl { url = "mirror://cpan/authors/id/B/BF/BFAIST/${name}.tar.gz"; - sha256 = "182z3xjajk6s7k5xm3kssjy3hqx2qbnq4f8864hma098ryy2ph3a"; + sha256 = "16chs1l58cf000d5kalkyph3p31ci73p1rlyx98mfv10d2cq6fsj"; }; propagatedBuildInputs = [ Mojolicious ]; doCheck = false; # Test performs network access. -- cgit 1.4.1 From 68dd1e9d3e293b56020de24919b1797c8a6c7900 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:09:34 +0000 Subject: [cpan2nix] perlPackages.NetDNS: 1.19 -> 1.20 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2635236722d4..5b13d7c4039e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11230,10 +11230,10 @@ let }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.19"; + name = "Net-DNS-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "206278bdd9a538bec3e45b50e80cc5a9d7dc6e70ebf0889ef78254f0f710ccd7"; + sha256 = "7fd9692b687253baa8f2eb639f1dd7ff9c77fddd67167dc59b400bd25e4ce01b"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; -- cgit 1.4.1 From 33c8f4e890ea6738625ae859ad756b7440c85a2a Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:09:46 +0000 Subject: [cpan2nix] perlPackages.ack: 2.24 -> 2.28 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5b13d7c4039e..31a839042d0a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -70,10 +70,10 @@ let ack = buildPerlPackage rec { - name = "ack-2.24"; + name = "ack-2.28"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "002gwl2h3h1j8b2xfsi279ga5l264w7rch9cxgg15rwgml4l14vj"; + sha256 = "16zgn96v1qkibpj5lic571zjl07y8x55v5xql3x7bvlsmgqcnvla"; }; outputs = ["out" "man"]; # use gnused so that the preCheck command passes -- cgit 1.4.1 From 1e1b91225d63593381e8123e982089c62171aca1 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:09:51 +0000 Subject: [cpan2nix] perlPackages.IOCompress: 2.084 -> 2.086 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 31a839042d0a..3667f536793c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7652,10 +7652,10 @@ let }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.084"; + name = "IO-Compress-2.086"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "1dbd503eda643aa58d1ef9b4d44c57889243d0ce6c54d5b45babceb860d76db5"; + sha256 = "110a229aa02b701f9820f5e0c2e9c30db342ea241b2d01c03703ea4922b1ab53"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { -- cgit 1.4.1 From c40aba01e1ccc95df9681493586d5baafde4bc0e Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:09:52 +0000 Subject: [cpan2nix] perlPackages.CryptJWT: 0.023 -> 0.024 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3667f536793c..4b976cc0d37c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2919,10 +2919,10 @@ let }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.023"; + name = "Crypt-JWT-0.024"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "540594d0051028e00e586eb7827df09b01c091c648bb6b210de3124fe118524b"; + sha256 = "4fcb81992fa61c0dbeb7c3582e887a92746aca76a42609091d986350e91892c5"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { -- cgit 1.4.1 From 5508945ce485ee5f32e2a6e416e16d7a0166fa35 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:01 +0000 Subject: [cpan2nix] perlPackages.IOSocketSSL: 2.064 -> 2.066 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b976cc0d37c..5290232265a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7773,12 +7773,12 @@ let }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.064"; + name = "IO-Socket-SSL-2.066"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "5827c6459ed2dce1da0ba6f442d198fa2c81554e045930e32b92c6d39e3ac3f5"; + sha256 = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd"; }; - propagatedBuildInputs = [ NetSSLeay ]; + propagatedBuildInputs = [ MozillaCA NetSSLeay ]; # Fix path to default certificate store. postPatch = '' substituteInPlace lib/IO/Socket/SSL.pm \ -- cgit 1.4.1 From df5cccf35a747eda0c7a0beaf6b445986e5a953b Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:01 +0000 Subject: [cpan2nix] perlPackages.Inline: 0.81 -> 0.82 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5290232265a5..01640f15a475 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7965,10 +7965,10 @@ let }; Inline = buildPerlPackage rec { - name = "Inline-0.81"; + name = "Inline-0.82"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.81.tar.gz; - sha256 = "1f973868dcca56a3a99b25d253fa18bf2d53670f8bbfa498261267647707b1e3"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.82.tar.gz; + sha256 = "1af94a8e95e4ba4545592341c47d8d1dc45b01822b877f7d3095a438566e874b"; }; buildInputs = [ TestWarn ]; meta = { -- cgit 1.4.1 From 43bfb7f973313bcf840b567d6dfed44447428a44 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:04 +0000 Subject: [cpan2nix] perlPackages.perlldap: 0.65 -> 0.66 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 01640f15a475..aca3084777ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12265,10 +12265,10 @@ let }; perlldap = buildPerlPackage rec { - name = "perl-ldap-0.65"; + name = "perl-ldap-0.66"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARSCHAP/${name}.tar.gz"; - sha256 = "5f57dd261dc16ebf942a272ddafe69526598df71151a51916edc37a4f2f23834"; + sha256 = "09263ce6166e80c98d689d41d09995b813389fd069b784601f6dc57f8e2b4102"; }; buildInputs = [ TextSoundex ]; propagatedBuildInputs = [ ConvertASN1 ]; -- cgit 1.4.1 From 7b90a9e60343f8c3fd90171d12a4b0714e6b3d21 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:20 +0000 Subject: [cpan2nix] perlPackages.ExtUtilsCppGuess: 0.12 -> 0.19 dependencies: perlPackages.ExtUtilsCBuilder: init at 0.280231 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aca3084777ec..080187d702f8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5337,6 +5337,19 @@ let }; }; + ExtUtilsCBuilder = buildPerlPackage { + name = "ExtUtils-CBuilder-0.280231"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280231.tar.gz; + sha256 = "1szfbq3vw9q3h3pff23p9pzfj21rkcmbljhdnl5w2s04r932brz6"; + }; + meta = { + description = "Compile and link C code for Perl modules"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://search.cpan.org/dist/ExtUtils-CBuilder"; + }; + }; + Expect = buildPerlPackage { name = "Expect-1.35"; src = fetchurl { @@ -5384,14 +5397,14 @@ let }; ExtUtilsCppGuess = buildPerlPackage rec { - name = "ExtUtils-CppGuess-0.12"; + name = "ExtUtils-CppGuess-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.12.tar.gz; - sha256 = "0sqq8vadch633cx7w7i47fca49pxzyh82n5kwxdgvsg32mdppi1i"; + url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.19.tar.gz; + sha256 = "1lva59kq447wbpc5nnr0zvr6gczxrmi0r7l9r2kqx132nsx33ijc"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ CaptureTiny ]; - buildInputs = [ ModuleBuild ]; + buildInputs = [ ExtUtilsCBuilder ModuleBuild ]; }; ExtUtilsDepends = buildPerlPackage { -- cgit 1.4.1 From ffe7f805e4efe3fe76cb14e2ff6ac2ca943134b5 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:23 +0000 Subject: [cpan2nix] perlPackages.JSONXS: 4.01 -> 4.02 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 080187d702f8..2a639089183d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8162,10 +8162,10 @@ let }; JSONXS = buildPerlPackage { - name = "JSON-XS-4.01"; + name = "JSON-XS-4.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.01.tar.gz; - sha256 = "0p1yjwwrq3x1f831jhwxlb76h92px01a316zv65zzmhzkbin446c"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.02.tar.gz; + sha256 = "05ngmpc0smlfzgyhyagd5gza8g93r8hik858kmr186h770higbd5"; }; propagatedBuildInputs = [ TypesSerialiser ]; buildInputs = [ CanaryStability ]; -- cgit 1.4.1 From 5724e2e5e4483bb2d2c8d55d54e53f3efca3be2a Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:29 +0000 Subject: [cpan2nix] perlPackages.TestDifferences: 0.66 -> 0.67 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2a639089183d..17046d5efacb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15129,10 +15129,10 @@ let }; TestDifferences = buildPerlPackage { - name = "Test-Differences-0.66"; + name = "Test-Differences-0.67"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.66.tar.gz; - sha256 = "83633a171e83ff03a0eb1f5a699f05b506a34190bcf8726979bbfd9dc16c223a"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.67.tar.gz; + sha256 = "c88dbbb48b934b069284874f33abbaaa438aa31204aa3fa73bfc2f4aeac878da"; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { -- cgit 1.4.1 From abbc9fde6b6de8756d578cb87ae1e0fa0aae97b9 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:29 +0000 Subject: [cpan2nix] perlPackages.TextBibTeX: 0.85 -> 0.87 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 17046d5efacb..716498f81ef5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16157,11 +16157,11 @@ let }; TextBibTeX = buildPerlModule rec { - name = "Text-BibTeX-0.85"; + name = "Text-BibTeX-0.87"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "036kxgbn1jf70pfm2lmjlzjwnhbkd888fp5lyvmkjpdd15gla18h"; + sha256 = "1qhm0fin3j6nqpzlk0xy1lx6bzcrhb7fr82rjgkcq0wgmw91mqax"; }; perlPreHook = "export LD=$CC"; perlPostHook = stdenv.lib.optionalString stdenv.isDarwin '' -- cgit 1.4.1 From 43e5cfa44934bb275e0c0631c1b13fbf73542e0d Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:36 +0000 Subject: [cpan2nix] perlPackages.FileFindObjectRule: 0.0309 -> 0.0310 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 716498f81ef5..9b424366496d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5750,10 +5750,10 @@ let }; FileFindObjectRule = buildPerlModule rec { - name = "File-Find-Object-Rule-0.0309"; + name = "File-Find-Object-Rule-0.0310"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "a184e11b271646c1b5b40ac01ca15d87750dc2b16a66dda3be0bd8976ece21e3"; + sha256 = "f1f1820ff44042f6b30e4d6be1db860b9e743b1a9836070ea656ad9829e4eca5"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; meta = { -- cgit 1.4.1 From 7d2d97ae16436097b7992a2e0a6ebc7fd6b09f3d Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:50 +0000 Subject: [cpan2nix] perlPackages.LWPMediaTypes: 6.02 -> 6.04 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b424366496d..1a66ec9223d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8968,15 +8968,16 @@ let }; LWPMediaTypes = buildPerlPackage { - name = "LWP-MediaTypes-6.02"; + name = "LWP-MediaTypes-6.04"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz; - sha256 = "0xmnblp962qy02akah30sji8bxrqcyqlff2w95l199ghql60ny8q"; + url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-6.04.tar.gz; + sha256 = "1n8rg6csv3dsvymg06cmxipimr6cb1g9r903ghm1qsmiv89cl6wg"; }; meta = { description = "Guess media type for a file or a URL"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestFatal ]; }; LWPProtocolConnect = buildPerlPackage { -- cgit 1.4.1 From 17d43c70a6a33fa374bc2529e67e2f31b027a4f9 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:53 +0000 Subject: [cpan2nix] perlPackages.SubQuote: 2.005001 -> 2.006003 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a66ec9223d7..f1a5d9b802ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14293,10 +14293,10 @@ let }; SubQuote = buildPerlPackage rec { - name = "Sub-Quote-2.005001"; + name = "Sub-Quote-2.006003"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "d6ab4f0775def015367a05e02024b403f991b2be11d774f3d235fe7e9bdbba07"; + sha256 = "be1f3a6f773f351f203cdc8f614803ac492b77d15fd68d5b1f0cd3884be18176"; }; buildInputs = [ TestFatal ]; meta = { -- cgit 1.4.1 From b72b9715ae177cddf27cbab72fd2cadb4430b8d5 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:10:56 +0000 Subject: [cpan2nix] perlPackages.CGI: 4.40 -> 4.42 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f1a5d9b802ec..0372625a7fca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1687,10 +1687,10 @@ let }; CGI = buildPerlPackage rec { - name = "CGI-4.40"; + name = "CGI-4.42"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz"; - sha256 = "10efff3061b3c31a33b3cc59f955aef9c88d57d12dbac46389758cef92f24f56"; + sha256 = "11d308e7dad2312d65747a7fdec5d0c22024c28df5e882e829ca1553482024e7"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; -- cgit 1.4.1 From 3a8c5abf463ae2bdb0011e7024dcfae7b8405585 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:04 +0000 Subject: [cpan2nix] perlPackages.LinuxFD: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0372625a7fca..69299775dadd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8499,7 +8499,7 @@ let url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; sha256 = "6bb579d47644cb0ed35626ff77e909ae69063073c6ac09aa0614fef00fa37356"; }; - buildInputs = [ ModuleBuild TestException ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; meta = { description = "Linux specific special filehandles"; -- cgit 1.4.1 From 504f17b88de047f23c3f7fdb4ece7a39c3ec74b8 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:18 +0000 Subject: [cpan2nix] perlPackages.ProtocolWebSocket: 0.24 -> 0.26 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 69299775dadd..efeb2b79ac3c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12746,10 +12746,10 @@ let }; ProtocolWebSocket = buildPerlModule rec { - name = "Protocol-WebSocket-0.24"; + name = "Protocol-WebSocket-0.26"; src = fetchurl { url = "mirror://cpan/authors/id/V/VT/VTI/${name}.tar.gz"; - sha256 = "1w0l9j1bnmw82jfhrx5yfw4hbl0bpcwmrl5laa1gz06mkzkdpa6z"; + sha256 = "08jmazvrmvp8jn15p2n3c1h3f2cbkr07xjzy197jb8x724vx0dsq"; }; buildInputs = [ ModuleBuildTiny ]; }; -- cgit 1.4.1 From f481a20cf13191269cdbde33060683e468846afe Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:19 +0000 Subject: [cpan2nix] perlPackages.Test2Suite: 0.000118 -> 0.000119 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index efeb2b79ac3c..9cd44a04add2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14888,10 +14888,10 @@ let }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000118"; + name = "Test2-Suite-0.000119"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "e9225132b585d6730d3de6b0caa2648b9c67995732c0a081efcfcad37b8af227"; + sha256 = "fd48764118acf1c30057f58f0af90696b194fbc5b637c77e08672e949c101e74"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { -- cgit 1.4.1 From 91b59ee66e2dd8959875fb67ce8f968561c76c29 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:20 +0000 Subject: [cpan2nix] perlPackages.TestInter: 1.07 -> 1.09 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9cd44a04add2..145365263925 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16288,15 +16288,16 @@ let }; TestInter = buildPerlPackage { - name = "Test-Inter-1.07"; + name = "Test-Inter-1.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.07.tar.gz; - sha256 = "c3b1e2c753b88a893e08ec2dd3d0f0b3eb513cdce7afa52780cb0e02b6c576ee"; + url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz; + sha256 = "1e9f129cc1a001fb95449d385253b38afabf5b466e3b3bd33e4e430f216e177a"; }; meta = { description = "Framework for more readable interactive test scripts"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ FileFindRule TestPod TestPodCoverage ]; }; TestManifest = buildPerlPackage { -- cgit 1.4.1 From bfe213a7875fe86c22a3f1036a6bff7a0e01e528 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:21 +0000 Subject: [cpan2nix] perlPackages.CGIFast: 2.13 -> 2.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 145365263925..59e9899597d2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1751,10 +1751,10 @@ let }; CGIFast = buildPerlPackage { - name = "CGI-Fast-2.13"; + name = "CGI-Fast-2.15"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.13.tar.gz; - sha256 = "792f21fc3b94380e37c99faa7901ecedf01d6855191000d1ffb2a7003813b1d4"; + url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.15.tar.gz; + sha256 = "e5342df3dc593edfb724c7afe850b1a0ee753f4d733f5193e037b04633dfeece"; }; propagatedBuildInputs = [ CGI FCGI ]; doCheck = false; -- cgit 1.4.1 From 085540a8d5dd11961a5b3f1125c1a960fde0d5e7 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:33 +0000 Subject: [cpan2nix] perlPackages.SerealDecoder: 4.005 -> 4.007 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59e9899597d2..87d42942c8cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13479,10 +13479,10 @@ let }; SerealDecoder = buildPerlPackage rec { - name = "Sereal-Decoder-4.005"; + name = "Sereal-Decoder-4.007"; src = fetchurl { url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz"; - sha256 = "17syqbq17qw6ajg3w88q9ljdm4c2b7zadq9pwshxxgyijg8dlfh4"; + sha256 = "0jyczxlpn2axgmx5vyjwjvr0myvi0yxnjpp8g7hj4b388j1i2205"; }; buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; preBuild = ''ls''; -- cgit 1.4.1 From 0571e5917e85bb1befdf19b42f0bb07fa2359861 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:35 +0000 Subject: [cpan2nix] perlPackages.Clipboard: 0.19 -> 0.20 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 87d42942c8cf..05b53ce8d6e9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2270,16 +2270,16 @@ let }; Clipboard = buildPerlModule { - name = "Clipboard-0.19"; + name = "Clipboard-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.19.tar.gz; - sha256 = "34b9dccac5d559b2b2769e5e315205c8292be2ff9f6e5333112a2377c69abbb3"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.20.tar.gz; + sha256 = "3f7d0a8eafec57072f9574dfd552e1cb8db26c09079c50dbef38f3c97ce25f60"; }; meta = { description = "Clipboard - Copy and Paste with any OS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ CGI URI ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard; + propagatedBuildInputs = [ CGI URI ]; # Disable test on darwin because MacPasteboard fails when not logged in interactively. # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. -- cgit 1.4.1 From ba44361a9d84993c95191bd159376a4c2b3eee5d Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:38 +0000 Subject: [cpan2nix] perlPackages.HTTPHeadersFast: 0.21 -> 0.22 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05b53ce8d6e9..fba77f850a1f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7337,10 +7337,10 @@ let }; HTTPHeadersFast = buildPerlModule rec { - name = "HTTP-Headers-Fast-0.21"; + name = "HTTP-Headers-Fast-0.22"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; - sha256 = "5e68ed8e3e67531e1d43c6a2cdfd0ee2daddf2e5b94c1a2648f3a6500a6f12d5"; + sha256 = "cc431db68496dd884db4bc0c0b7112c1f4a4f1dc68c4f5a3caa757a1e7481b48"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ HTTPDate ]; -- cgit 1.4.1 From 64adac25bea959aa4ab72c45b3bf37410d761d84 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:42 +0000 Subject: [cpan2nix] perlPackages.SerealEncoder: 4.005 -> 4.007 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fba77f850a1f..62f78704c203 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13495,10 +13495,10 @@ let }; SerealEncoder = buildPerlPackage rec { - name = "Sereal-Encoder-4.005"; + name = "Sereal-Encoder-4.007"; src = fetchurl { url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz"; - sha256 = "02hbk5dwq7fpnyb3vp7xxhb41ra48xhghl13p9pjq9lzsqlb6l19"; + sha256 = "1dpafqlsir79p9g1j85k7bbn9kckqdb1zdngmmw1r46cizfdsvxz"; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; meta = { -- cgit 1.4.1 From 3c2786029bf4b1105844eae077cae03b08ab4d95 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:11:46 +0000 Subject: [cpan2nix] perlPackages.Sereal: 4.005 -> 4.007 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62f78704c203..8a3b556f2376 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13510,10 +13510,10 @@ let }; Sereal = buildPerlPackage rec { - name = "Sereal-4.005"; + name = "Sereal-4.007"; src = fetchurl { url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz"; - sha256 = "0lnczrf311pl9b2x75r0ffsszv5aspfb8x6jdvgr3rgqp7nbm1wr"; + sha256 = "0ncsfsz9dvqay77hb0gzfx1qsg8xkz50h47q082gqnlf5q3l63j5"; }; buildInputs = [ TestLongString TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; -- cgit 1.4.1 From 9f0f510d8599642fe22f23acc049b08da6d88e75 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:02 +0000 Subject: [cpan2nix] perlPackages.GamesSolitaireVerify: 0.1900 -> 0.2000 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8a3b556f2376..f06aa297adf6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6289,12 +6289,12 @@ let }; GamesSolitaireVerify = buildPerlModule { - name = "Games-Solitaire-Verify-0.1900"; + name = "Games-Solitaire-Verify-0.2000"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1900.tar.gz; - sha256 = "6b17847bd69da05ee089562cf40f2aac15e64c113175eca4fb501d4e86b48181"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2000.tar.gz; + sha256 = "dc87a348a2cacfadfb8205ff3fdbc138f475126bef175bc806ec9454285c2165"; }; - buildInputs = [ TestDifferences ]; + buildInputs = [ PathTiny TestDifferences ]; propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils ]; meta = { description = "Verify solutions for solitaire games"; -- cgit 1.4.1 From b89fd35fb9b41be0471ec655f094caac5ccc0c5c Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:04 +0000 Subject: [cpan2nix] perlPackages.MailDKIM: 0.54 -> 0.55 dependencies: perlPackages.MailAuthenticationResults: init at 1.20180923 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f06aa297adf6..8b6000874395 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9075,6 +9075,19 @@ let buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ]; }; + MailAuthenticationResults = buildPerlPackage { + name = "Mail-AuthenticationResults-1.20180923"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20180923.tar.gz; + sha256 = "1g1wym9vcbhldwvi4w5pl0fhd4jh2icj975awf4wr5xmkli9mxbz"; + }; + buildInputs = [ TestException ]; + meta = { + description = "Object Oriented Authentication-Results Headers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MailMaildir = buildPerlPackage rec { version = "1.0.0"; name = "Mail-Maildir-${version}"; @@ -9127,12 +9140,12 @@ let }; MailDKIM = buildPerlPackage rec { - name = "Mail-DKIM-0.54"; + name = "Mail-DKIM-0.55"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.54.tar.gz; - sha256 = "1jix3jrqx9q2n684ar4igh5zma15j9gv91h9m2rbv8bs1z47hbxp"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.55.tar.gz; + sha256 = "18nsh1ff6fkns4xk3y2ixmzmadgggydj11qkzj6nlnq2hzqxsafz"; }; - propagatedBuildInputs = [ CryptOpenSSLRSA MailTools NetDNSResolverMock YAMLLibYAML ]; + propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNSResolverMock YAMLLibYAML ]; doCheck = false; # tries to access the domain name system buildInputs = [ TestRequiresInternet ]; }; -- cgit 1.4.1 From ed7d5410c22045dca8de7f23af65f5e018893824 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:10 +0000 Subject: [cpan2nix] perlPackages.HTMLForm: 6.03 -> 6.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b6000874395..985f6e7088ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6955,10 +6955,10 @@ let }; HTMLForm = buildPerlPackage { - name = "HTML-Form-6.03"; + name = "HTML-Form-6.04"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz; - sha256 = "0dpwr7yz6hjc3bcqgcbdzjjk9l58ycdjmbam9nfcmm85y2a1vh38"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.04.tar.gz; + sha256 = "100090bdsr5kapv8h0wxzwlzfbfqn57rq9gzrvg9i6hvnsl5gmcw"; }; propagatedBuildInputs = [ HTMLParser HTTPMessage ]; meta = { -- cgit 1.4.1 From 513ada431f945c22f962f0babf971af3af540061 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:16 +0000 Subject: [cpan2nix] perlPackages.AlienBuild: 1.60 -> 1.65 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 985f6e7088ce..34d4a42e4979 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -129,13 +129,13 @@ let }; AlienBuild = buildPerlPackage { - name = "Alien-Build-1.60"; + name = "Alien-Build-1.65"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.60.tar.gz; - sha256 = "0wzwi5l71sn0wrbjsikjlh2y7yn68m3hal8s9v43rc6w20q3z877"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.65.tar.gz; + sha256 = "1xvwh6r2aawilpxl8zdqb8yy3skj56nkps3h5xz6spkv4ggzzm4a"; }; - propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny ]; - buildInputs = [ DevelHide PkgConfig Test2Suite ]; + propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; + buildInputs = [ DevelHide Test2Suite ]; meta = { description = "Build external dependencies for use in CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; -- cgit 1.4.1 From 36afab203946d472bd0804558302550f082cf1ad Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:19 +0000 Subject: [cpan2nix] perlPackages.PPIxRegexp: 0.063 -> 0.064 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 34d4a42e4979..cf06c11856df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12656,10 +12656,10 @@ let }; PPIxRegexp = buildPerlModule rec { - name = "PPIx-Regexp-0.063"; + name = "PPIx-Regexp-0.064"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "23950e68df05bce869766e81dd6b01471e27fb70980737ea1c2286a7ecf948bc"; + sha256 = "8769c634294c941f83b5a7e74a14eda3671c1fa131b8d6416e7fc77f7cd57408"; }; propagatedBuildInputs = [ PPI ]; meta = { -- cgit 1.4.1 From d5fdceb65a60188a7b7b92479db1e81ebc3d8c20 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:25 +0000 Subject: [cpan2nix] perlPackages.InlineC: 0.78 -> 0.80 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cf06c11856df..13e7c1f9c752 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7998,10 +7998,10 @@ let }; InlineC = buildPerlPackage rec { - name = "Inline-C-0.78"; + name = "Inline-C-0.80"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; - sha256 = "9a7804d85c01a386073d2176582b0262b6374c5c0341049da3ef84c6f53efbc7"; + sha256 = "35f5ff188f56b9c8a5ec342e2ff3a2d248ddbc91eead80d9361697914d5adbe3"; }; buildInputs = [ FileCopyRecursive FileShareDirInstall TestWarn YAMLLibYAML ]; propagatedBuildInputs = [ Inline ParseRecDescent Pegex ]; -- cgit 1.4.1 From 6fb0e7a4e0fab0dd2f90a3c6eae8daf0ab40518d Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:29 +0000 Subject: [cpan2nix] perlPackages.HTTPDaemon: 6.01 -> 6.04 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13e7c1f9c752..b6406096975f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7276,17 +7276,18 @@ let }; }; - HTTPDaemon = buildPerlPackage { - name = "HTTP-Daemon-6.01"; + HTTPDaemon = buildPerlModule { + name = "HTTP-Daemon-6.04"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz; - sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.04.tar.gz; + sha256 = "12m8iasnmp2dh28jrgmi7z10a3gcyz85khyff2j5h7jqbs6ks1fz"; }; propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ModuleBuildTiny TestNeeds ]; }; HTTPDate = buildPerlPackage { -- cgit 1.4.1 From 494bb9293f32451a8a4d85b810593c54b7733429 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:31 +0000 Subject: [cpan2nix] perlPackages.LocaleTextDomainOOUtil: 4.001 -> 4.002 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b6406096975f..cb6af40dffad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8702,10 +8702,10 @@ let }; LocaleTextDomainOOUtil = buildPerlPackage rec { - name = "Locale-TextDomain-OO-Util-4.001"; + name = "Locale-TextDomain-OO-Util-4.002"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.001.tar.gz; - sha256 = "1bzh9bnm9lnjc63nrlcc03gz660lvgmvy4yphrv2yyr5829bpr7z"; + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.002.tar.gz; + sha256 = "1826pl11vr9p7zv7vqs7kcd8y5218086l90dw8lw0xzdcmzs0prw"; }; propagatedBuildInputs = [ namespaceautoclean ]; buildInputs = [ TestDifferences TestException TestNoWarnings ]; -- cgit 1.4.1 From d47a04a47cd19ed7d439a36cfe00316c4f820606 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:34 +0000 Subject: [cpan2nix] perlPackages.AlienGMP: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cb6af40dffad..adaea4346af9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -149,7 +149,7 @@ let sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a"; }; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ pkgs.gmp DevelChecklib Test2Suite ]; + buildInputs = [ pkgs.gmp DevelChecklib HTMLParser SortVersions Test2Suite URI ]; meta = { description = "Alien package for the GNU Multiple Precision library."; license = with stdenv.lib.licenses; [ lgpl3Plus ]; -- cgit 1.4.1 From 785dd1dd0a2d228eaaa3a4a0b4a805974fe27893 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:37 +0000 Subject: [cpan2nix] perlPackages.ArchiveTarWrapper: 0.33 -> 0.36 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index adaea4346af9..576eb49d2be2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -559,10 +559,10 @@ let }; ArchiveTarWrapper = buildPerlPackage rec { - name = "Archive-Tar-Wrapper-0.33"; + name = "Archive-Tar-Wrapper-0.36"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.33.tar.gz; - sha256 = "0z6ngvgl4w4nihvmwkg77gmi5h7a695b83dpyybxhx4j3bj1izca"; + url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.36.tar.gz; + sha256 = "1s7i93qbimwygv07x5963vv90m09g2iiacnl3986smw4rpi5apwg"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { -- cgit 1.4.1 From cbe9245996eba1f84fe7ce1f6576a272ad45f663 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:41 +0000 Subject: [cpan2nix] perlPackages.LWP: 6.36 -> 6.38 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 576eb49d2be2..288cc257c6a0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8938,10 +8938,10 @@ let }; LWP = buildPerlPackage rec { - name = "libwww-perl-6.36"; + name = "libwww-perl-6.38"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.36.tar.gz; - sha256 = "75c034ab4b37f4b9506dc644300697505582cf9545bcf2e2079e7263f675290a"; + url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.38.tar.gz; + sha256 = "a8e0849b8d2798fc45a2a5f2fe45c96cbbad5baf3bcbe64a3bf85f210e78708c"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) -- cgit 1.4.1 From e26abf0275830fe75866d20d511899555d290470 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:12:55 +0000 Subject: [cpan2nix] perlPackages.LWPProtocolHttps: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 288cc257c6a0..a1f477bd54c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9002,7 +9002,7 @@ let sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; - propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ]; + propagatedBuildInputs = [ IOSocketSSL LWP ]; doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; -- cgit 1.4.1 From 4c56298b77f3a02d474311745471a1e68ed47138 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:13:07 +0000 Subject: [cpan2nix] perlPackages.DateTimeTimeZone: 2.23 -> 2.34 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a1f477bd54c0..8c5a66853f08 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3899,10 +3899,10 @@ let }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-2.23"; + name = "DateTime-TimeZone-2.34"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "6ae40286031853a4319c5b34516f1c09e429d5caa5f782165cc27175c89fe54f"; + sha256 = "dee1111c06f2aa705f803bc4f3d93b50df566d864a1a8bf31b55dfaf2b3de809"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; -- cgit 1.4.1 From 806bfde236cdc573444afb361a97bf9fe837144d Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:13:18 +0000 Subject: [cpan2nix] perlPackages.TestPerlTidy: 20130104 -> 20190402 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c5a66853f08..24d8b18b75b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15604,16 +15604,17 @@ let propagatedBuildInputs = [ MCE PerlCritic ]; }; - TestPerlTidy = buildPerlPackage rec { - name = "Test-PerlTidy-20130104"; + TestPerlTidy = buildPerlModule rec { + name = "Test-PerlTidy-20190402"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LA/LARRYL/${name}.tar.gz"; - sha256 = "3f15d9f3f4811e348594620312258d75095237925b491ada623fa73ac9d2b9c8"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz; + sha256 = "e9cb9b23ed62e8c6a47a1e18b55328aa3bfa467e05cd93e7e12b2738dd1e025f"; }; - propagatedBuildInputs = [ FileFinder FileSlurp PerlTidy TextDiff ]; + propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestPerlCritic ]; }; TestPod = buildPerlPackage rec { -- cgit 1.4.1 From e103b367e55f9bc8bede2dc8d3e146fc9563cd3a Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:13:19 +0000 Subject: [cpan2nix] perlPackages.LogDispatchouli: 2.016 -> 2.017 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 24d8b18b75b6..47b52a737d81 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8910,10 +8910,10 @@ let }; LogDispatchouli = buildPerlPackage rec { - name = "Log-Dispatchouli-2.016"; + name = "Log-Dispatchouli-2.017"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "7f2a1a1854fd1e4ed02883bc21f5395f4244a266b661276b438d1bdd50bdacf7"; + sha256 = "99f8341c8d4f8f46a673b1ff1a6edc96165d75af96ddcb6d99fa227f9af4dfbf"; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; -- cgit 1.4.1 From 90a83819a95b9debe7f3dbdcadc5201b8b5005c1 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:13:20 +0000 Subject: [cpan2nix] perlPackages.DateTimeLocale: 1.23 -> 1.24 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 47b52a737d81..ae706308f713 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3872,10 +3872,10 @@ let }; DateTimeLocale = buildPerlPackage rec { - name = "DateTime-Locale-1.23"; + name = "DateTime-Locale-1.24"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "3a5a81e742da96d89b408e40f8bf4b21150663d8a5eb9dad7865db582193c015"; + sha256 = "d03aaa33126a13b1fe6591b9838f0a07395f1fea12b6e304566d7e39a5e5fb82"; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; -- cgit 1.4.1 From 15f210724405633caf7772686d5aad004cb95032 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:13:30 +0000 Subject: [cpan2nix] perlPackages.CPAN: 2.25 -> 2.26 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae706308f713..338e2b6ec1f2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2731,10 +2731,10 @@ let }; CPAN = buildPerlPackage rec { - name = "CPAN-2.25"; + name = "CPAN-2.26"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "b4cbef12b872f34e29c3cdcd511c5ed004c4486939001b60e493dc25956552a9"; + sha256 = "0db80ce17c374affa71534033bcac94a213912d6b35f5379e263ae3d7c98ae5c"; }; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { -- cgit 1.4.1 From dcfa96bee9e6f8c73fa2189ace3b9ee452e32b33 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:13:31 +0000 Subject: [cpan2nix] perlPackages.DateTimeFormatNatural: 1.06 -> 1.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 338e2b6ec1f2..b3fcc1e34b6b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3791,10 +3791,10 @@ let }; DateTimeFormatNatural = buildPerlModule { - name = "DateTime-Format-Natural-1.06"; + name = "DateTime-Format-Natural-1.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.06.tar.gz; - sha256 = "1n68b5hnw4n55q554v7y4ffwiypz6rk40mh0r550fxwv69bvyky0"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.07.tar.gz; + sha256 = "1df12c7bf1nchaniak1rd2x18mckp4ymc0bgkbnvphhd1p08bzvx"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; -- cgit 1.4.1 From 9aa0171fb7c563bc9c36ac1e3d8ee3376ffc94a5 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:13:32 +0000 Subject: [cpan2nix] perlPackages.LocaleTextDomainOO: 1.035 -> 1.036 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3fcc1e34b6b..67d51828efa3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8688,10 +8688,10 @@ let }; LocaleTextDomainOO = buildPerlPackage rec { - name = "Locale-TextDomain-OO-1.035"; + name = "Locale-TextDomain-OO-1.036"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.035.tar.gz; - sha256 = "1nvg0lggrd15j394fkxwsgi6w228pld5zpgb3zfd7im4r4mm50qy"; + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.036.tar.gz; + sha256 = "0f0fajq4k1sgyywsb7qypsf6xa1sxjx4agm8l8z2284nm3hq65xm"; }; propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; buildInputs = [ TestDifferences TestException TestNoWarnings ]; -- cgit 1.4.1 From fafb51e44d5dcbc78ae707bd3f25cde262dc6963 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:14:18 +0000 Subject: [cpan2nix] perlPackages.PlackMiddlewareSession: 0.32 -> 0.33 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 67d51828efa3..6cb09ed07665 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12514,12 +12514,12 @@ let }; PlackMiddlewareSession = buildPerlModule rec { - name = "Plack-Middleware-Session-0.32"; + name = "Plack-Middleware-Session-0.33"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.32.tar.gz; - sha256 = "00jnyclvggb4g7q6489x4x1sxfpxy9xyxrqkg2aqpn05fcqwfznp"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.33.tar.gz; + sha256 = "1vm4a66civdzh7xvl5hy5wn1w8j1vndppwyz8ndh9n4as74s5yag"; }; - propagatedBuildInputs = [ DigestHMAC DigestSHA1 Plack ]; + propagatedBuildInputs = [ DigestHMAC Plack ]; buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; meta = { description = "Middleware for session management"; -- cgit 1.4.1 From a896e5c3b4a3238d16965a4a33c409cce968794b Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:14:21 +0000 Subject: [cpan2nix] perlPackages.TestWWWMechanizePSGI: 0.38 -> 0.39 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6cb09ed07665..f08b0616f8e3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16092,10 +16092,10 @@ let }; TestWWWMechanizePSGI = buildPerlPackage { - name = "Test-WWW-Mechanize-PSGI-0.38"; + name = "Test-WWW-Mechanize-PSGI-0.39"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.38.tar.gz; - sha256 = "0fsh2i05kf1kfavv2r9kmnjl7qlyqrd11ikc0qcqzzxsqzzjkg9r"; + url = mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.39.tar.gz; + sha256 = "0n4rhyyags3cwqb0gb1pr6gccd2x3l190j8gd96lwlvxnjrklss7"; }; buildInputs = [ CGI TestLongString TestWWWMechanize ]; propagatedBuildInputs = [ Plack ]; -- cgit 1.4.1 From eb9c14815c0dd0bad68ca78c1ed7986f2c8a1949 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:14:29 +0000 Subject: [cpan2nix] perlPackages.NetAmazonS3: 0.85 -> 0.86 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f08b0616f8e3..6453e9520089 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11161,10 +11161,10 @@ let }; NetAmazonS3 = buildPerlPackage rec { - name = "Net-Amazon-S3-0.85"; + name = "Net-Amazon-S3-0.86"; src = fetchurl { - url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.85.tar.gz; - sha256 = "49b91233b9e994ce3536dd69c5106c968a03d199ff3968c8fc2f2b5be3d55430"; + url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.86.tar.gz; + sha256 = "6301e683a19b1302a234a1689d7c7f7e7102b3e86f4de428b8cc1cd975f0c38a"; }; buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; -- cgit 1.4.1 From 0e1271da29e3d6b5c3da552808e93b434b42eff3 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 21:43:38 +0000 Subject: perl-packages.nix: set minimum version to 5.28.2 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6453e9520089..d6477611636e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8,8 +8,8 @@ {config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides, buildPackages}: -# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.1 or above -assert stdenv.lib.versionAtLeast perl.version "5.28.1"; +# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.2 or above +assert stdenv.lib.versionAtLeast perl.version "5.28.2"; let inherit (stdenv.lib) maintainers; self = _self // (overrides pkgs); @@ -9834,8 +9834,6 @@ let buildInputs = [ Filepushd ]; }; - ModuleCoreList = null; # part of Perl 5.28 - ModuleExtractUse = buildPerlModule rec { name = "Module-ExtractUse-0.343"; src = fetchurl { @@ -11797,7 +11795,7 @@ let }; buildInputs = [ pkgs.zookeeper_mt ]; # fix "error: format not a string literal and no format arguments [-Werror=format-security]" - hardeningDisable = stdenv.lib.optional (stdenv.lib.versionAtLeast perl.version "5.28") "format"; + hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include"; NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; meta = { @@ -17917,6 +17915,7 @@ let threads = null; # part of Perl 5.28 TimeHiRes = null; # part of Perl 5.28 UnicodeCollate = null; # part of Perl 5.28 + ModuleCoreList = null; # part of Perl 5.28.2 ArchiveZip_1_53 = self.ArchiveZip; Autobox = self.autobox; -- cgit 1.4.1 From 228926a5db9ca8bf7f5b411db9379e077014b4a6 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 01:38:09 +0000 Subject: perlPackages.SysCPU: mark as broken, the packages removed from CPAN --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d6477611636e..9dae93501226 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14445,6 +14445,7 @@ let sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; + meta.broken = true; # src.url is 404 }; SysHostnameLong = buildPerlPackage rec { -- cgit 1.4.1 From 3e13cb67e4cce995c74d90e7d3703b0e3c468556 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 22 Apr 2019 11:21:13 +0000 Subject: perlPackages.SysSigAction: do not check on aarch64 --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9dae93501226..3d2b02781951 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14463,6 +14463,7 @@ let url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz; sha256 = "c4ef6c9345534031fcbbe2adc347fc7194d47afc945e7a44fac7e9563095d353"; }; + doCheck = !stdenv.isAarch64; # it hangs on Aarch64 meta = { description = "Perl extension for Consistent Signal Handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; -- cgit 1.4.1 From 4805e959aaf333648f293c76b66f1d0c9929dfc1 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 23 Apr 2019 12:50:40 +0800 Subject: http-parser: 2.9.1 -> 2.9.2 --- pkgs/development/libraries/http-parser/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index d63911ad24fc..68bf4ebec347 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: let - version = "2.9.1"; + version = "2.9.2"; in stdenv.mkDerivation { name = "http-parser-${version}"; - src = fetchurl { - url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "08fypqh3jkwvlznvmwwwir53ffg2xcxy0v8bjz6wxjlb41qhf8ik"; + src = fetchFromGitHub { + owner = "nodejs"; + repo = "http-parser"; + rev = "v${version}"; + sha256 = "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -19,7 +21,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "An HTTP message parser written in C"; - homepage = https://github.com/joyent/http-parser; + homepage = https://github.com/nodejs/http-parser; maintainers = with maintainers; [ matthewbauer ]; license = licenses.mit; platforms = platforms.unix; -- cgit 1.4.1 From 9abff4af4f07c16aecd89bf82051afbc3228d6fd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 29 Jan 2019 21:01:24 -0500 Subject: wasm: init cross target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs with a WebAssembly toolchain. stdenv/cross: use static overlay on isWasm isWasm doesn’t make sense dynamically linked. --- lib/systems/default.nix | 3 ++- lib/systems/doubles.nix | 3 +++ lib/systems/examples.nix | 14 +++++++++-- lib/systems/for-meta.nix | 1 + lib/systems/inspect.nix | 3 ++- lib/systems/parse.nix | 4 ++++ pkgs/build-support/bintools-wrapper/default.nix | 3 ++- pkgs/build-support/cc-wrapper/default.nix | 6 +++++ pkgs/development/compilers/llvm/8/compiler-rt.nix | 4 ++++ pkgs/development/compilers/llvm/8/default.nix | 2 ++ .../compilers/llvm/8/libc++/default.nix | 11 ++++++--- pkgs/development/compilers/llvm/8/libc++abi.nix | 17 +++++++++---- .../compilers/llvm/8/libcxxabi-no-threads.patch | 12 ++++++++++ pkgs/development/libraries/wasilibc/default.nix | 28 ++++++++++++++++++++++ pkgs/stdenv/cross/default.nix | 3 ++- pkgs/stdenv/generic/default.nix | 3 +++ pkgs/test/cross/default.nix | 9 ++++--- pkgs/top-level/all-packages.nix | 7 +++++- pkgs/top-level/static.nix | 12 ++++++++++ 19 files changed, 126 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch create mode 100644 pkgs/development/libraries/wasilibc/default.nix (limited to 'pkgs') diff --git a/lib/systems/default.nix b/lib/systems/default.nix index b45a5fd8d2ba..c408fe46be6f 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -30,6 +30,7 @@ rec { libc = /**/ if final.isDarwin then "libSystem" else if final.isMinGW then "msvcrt" + else if final.isWasi then "wasilibc" else if final.isMusl then "musl" else if final.isUClibc then "uclibc" else if final.isAndroid then "bionic" @@ -62,7 +63,7 @@ rec { "netbsd" = "NetBSD"; "freebsd" = "FreeBSD"; "openbsd" = "OpenBSD"; - "wasm" = "Wasm"; + "wasi" = "Wasi"; }.${final.parsed.kernel.name} or null; # uname -p diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 2cf06b6ac1c8..c6877ebef0bc 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -17,6 +17,8 @@ let "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" "x86_64-windows" "i686-windows" + + "wasm64-wasi" "wasm32-wasi" ]; allParsed = map parse.mkSystemFromString all; @@ -45,6 +47,7 @@ in rec { netbsd = filterDoubles predicates.isNetBSD; openbsd = filterDoubles predicates.isOpenBSD; unix = filterDoubles predicates.isUnix; + wasi = filterDoubles predicates.isWasi; windows = filterDoubles predicates.isWindows; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 1a5b80449bf2..94c7cfd7570f 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -116,7 +116,7 @@ rec { config = "aarch64-none-elf"; libc = "newlib"; }; - + aarch64be-embedded = { config = "aarch64_be-none-elf"; libc = "newlib"; @@ -126,7 +126,7 @@ rec { config = "powerpc-none-eabi"; libc = "newlib"; }; - + ppcle-embedded = { config = "powerpcle-none-eabi"; libc = "newlib"; @@ -211,4 +211,14 @@ rec { config = "x86_64-unknown-netbsd"; libc = "nblibc"; }; + + # + # WASM + # + + wasi32 = { + config = "wasm32-unknown-wasi"; + useLLVM = true; + }; + } diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index 51fb6ae760d1..17ae94deb7d1 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -32,6 +32,7 @@ in rec { openbsd = [ patterns.isOpenBSD ]; unix = patterns.isUnix; # Actually a list windows = [ patterns.isWindows ]; + wasi = [ patterns.isWasi ]; inherit (lib.systems.doubles) mesaPlatforms; } diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index f8d5ca84d7aa..b88af55e46be 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -43,9 +43,10 @@ rec { isWindows = { kernel = kernels.windows; }; isCygwin = { kernel = kernels.windows; abi = abis.cygnus; }; isMinGW = { kernel = kernels.windows; abi = abis.gnu; }; + isWasi = { kernel = kernels.wasi; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; - isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; + isMusl = (with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]) ++ [{ kernel = kernels.wasi; }]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isEfi = map (family: { cpu.family = family; }) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 3e23a721f0d9..522a3bf71aff 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -226,6 +226,7 @@ rec { elf = {}; macho = {}; pe = {}; + wasm = {}; unknown = {}; }; @@ -268,6 +269,7 @@ rec { none = { execFormat = unknown; families = { }; }; openbsd = { execFormat = elf; families = { inherit bsd; }; }; solaris = { execFormat = elf; families = { }; }; + wasi = { execFormat = wasm; families = { }; }; windows = { execFormat = pe; families = { }; }; } // { # aliases # 'darwin' is the kernel for all of them. We choose macOS by default. @@ -376,6 +378,8 @@ rec { then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; } else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; } + else if (elemAt l 2 == "wasi") + then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "wasi"; } else if hasPrefix "netbsd" (elemAt l 2) then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"]) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 964ff1175538..e1ec09bc95a1 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -191,7 +191,8 @@ stdenv.mkDerivation { else if targetPlatform.isAvr then "avr" else if targetPlatform.isAlpha then "alpha" else throw "unknown emulation for platform: ${targetPlatform.config}"; - in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); + in if targetPlatform.useLLVM or false then "" + else targetPlatform.platform.bfdEmulation or (fmt + sep + arch); strictDeps = true; depsTargetTargetPropagated = extraPackages; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 9569c6e78c8a..ddec3d0931ff 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -299,6 +299,12 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector fortify pie pic" '' + + optionalString targetPlatform.isWasm '' + hardening_unsupported_flags+=" stackprotector fortify pie pic" + '' + optionalString (targetPlatform.isWasm && libc != null) '' + echo "--allow-undefined-file=${libc}/share/wasm32-wasi/undefined-symbols.txt" >> $out/nix-support/cc-ldflags + '' + + optionalString (libc != null && targetPlatform.isAvr) '' for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 47c8b7bd59f5..3e225626aa6d 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -60,7 +60,11 @@ stdenv.mkDerivation rec { ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + ln -s $out/lib/*/* $out/lib ''; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.hostPlatform.isWasm "--allow-undefined --no-entry"; + enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 3503e6b83d2e..c528f8417cfa 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -97,12 +97,14 @@ let targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt + ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index d0a5c37c4148..8b4452a6de29 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version +, enableShared ? true }: stdenv.mkDerivation rec { name = "libc++-${version}"; @@ -31,7 +32,11 @@ stdenv.mkDerivation rec { "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"; + ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; enableParallelBuilding = true; @@ -46,6 +51,6 @@ stdenv.mkDerivation rec { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 0eb5ebca5159..e264a3849414 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -1,4 +1,5 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version +, enableShared ? true }: stdenv.mkDerivation { name = "libc++abi-${version}"; @@ -6,13 +7,20 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1k875f977ybdkpdnr9105wa6hccy9qvpd9xd42n75h7p56bdxmn2"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ + "-DUNIX=ON" + "-DLIBCXXABI_ENABLE_THREADS=OFF" + ] ++ stdenv.lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; + patches = [ ./libcxxabi-no-threads.patch ]; + postUnpack = '' unpackFile ${libcxx.src} unpackFile ${llvm.src} @@ -39,8 +47,9 @@ stdenv.mkDerivation { else '' install -d -m 755 $out/include $out/lib install -m 644 lib/libc++abi.a $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include + '' + stdenv.lib.optionalString enableShared '' + install -m 644 lib/libc++abi.so.1.0 $out/lib ln -s libc++abi.so.1.0 $out/lib/libc++abi.so ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 ''; @@ -50,6 +59,6 @@ stdenv.mkDerivation { description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch b/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch new file mode 100644 index 000000000000..787f3e16500e --- /dev/null +++ b/pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4138acf..41b4763 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS) + " is also set to ON.") + endif() + add_definitions(-D_LIBCXXABI_HAS_NO_THREADS) ++ add_definitions(-D_LIBCPP_HAS_NO_THREADS) + endif() + + if (LIBCXXABI_HAS_EXTERNAL_THREAD_API) diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix new file mode 100644 index 000000000000..f783540797ce --- /dev/null +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation { + name = "wasilibc-20190413"; + src = fetchFromGitHub { + owner = "CraneStation"; + repo = "wasi-sysroot"; + rev = "079d7bda78bc0ad8f69c1594444b54786545ce57"; + sha256 = "09s906bc9485wzkgibnpfh0mii7jkldzr1a6g8k7ch0si8rshi5r"; + }; + makeFlags = [ + "WASM_CC=${stdenv.cc.targetPrefix}cc" + "WASM_NM=${stdenv.cc.targetPrefix}nm" + "WASM_AR=${stdenv.cc.targetPrefix}ar" + "INSTALL_DIR=${placeholder "out"}" + ]; + + postInstall = '' + mv $out/lib/*/* $out/lib + ''; + + meta = { + description = "WASI libc implementation for WebAssembly"; + homepage = "https://wasi.dev"; + platforms = lib.platforms.wasi; + maintainers = [ lib.maintainers.matthewbauer ]; + }; +} diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index fc9a585cf4d6..479213f3a561 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -37,7 +37,8 @@ in lib.init bootStages ++ [ # Run Packages (buildPackages: { inherit config; - overlays = overlays ++ crossOverlays; + overlays = overlays ++ crossOverlays + ++ (if crossSystem.isWasm then [(import ../../top-level/static.nix)] else []); selfBuild = false; stdenv = buildPackages.stdenv.override (old: rec { buildPlatform = localSystem; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 04117de32693..ed022422c26e 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -91,6 +91,9 @@ let '' + lib.optionalString hostPlatform.isDarwin '' export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 + '' + lib.optionalString (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho) '' + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 '' # TODO this should be uncommented, but it causes stupid mass rebuilds. I # think the best solution would just be to fixup linux RPATHs so we don't diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 5d9c120c501a..6c31a16f2fd5 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -93,8 +93,7 @@ let }; -in (lib.mapAttrs (_: mapMultiPlatformTest builtins.id) tests) -// (lib.mapAttrs' (name: test: { - name = "${name}-llvm"; - value = mapMultiPlatformTest (system: system // {useLLVM = true;}) test; - }) tests) +in { + gcc = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = false;})) tests); + llvm = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = true;})) tests); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13bc8ebfaf04..c07533522a8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10311,10 +10311,15 @@ in else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode else if name == "nblibc" then targetPackages.netbsdCross.libc - else throw "Unknown libc"; + else if name == "wasilibc" then targetPackages.wasilibc + else throw "Unknown libc ${name}"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; + wasilibc = callPackages ../development/libraries/wasilibc { + stdenv = crossLibcStdenv; + }; + # Only supported on Linux, using glibc glibcLocales = if stdenv.hostPlatform.libc == "glibc" then callPackage ../development/libraries/glibc/locales.nix { } else null; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index fe9c04de04cd..dea30fe7b595 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -148,4 +148,16 @@ in { }; }; + llvmPackages_8 = super.llvmPackages_8 // { + libraries = super.llvmPackages_8.libraries // rec { + libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override { + enableShared = false; + }; + libcxx = super.llvmPackages_8.libraries.libcxx.override { + enableShared = false; + inherit libcxxabi; + }; + }; + }; + } -- cgit 1.4.1 From d591a109beee6512ea45e03e83901d269c8ec39b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 15 Apr 2019 21:10:42 -0400 Subject: wasm: don’t assume musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/systems/inspect.nix | 2 +- pkgs/development/compilers/llvm/8/libc++/default.nix | 6 ++++-- pkgs/development/compilers/llvm/8/libc++abi.nix | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index b88af55e46be..1c90af88879a 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -46,7 +46,7 @@ rec { isWasi = { kernel = kernels.wasi; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; - isMusl = (with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]) ++ [{ kernel = kernels.wasi; }]; + isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isEfi = map (family: { cpu.family = family; }) diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 8b4452a6de29..3d67c37dcdd7 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -31,11 +32,12 @@ stdenv.mkDerivation rec { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index e264a3849414..8a5e1d32c42c 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ "-DUNIX=ON" "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; -- cgit 1.4.1 From dbb94b984f8282d1d9eada83634fc6777d19bdac Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 15 Apr 2019 22:22:16 -0400 Subject: wasmtime: init and use for emulation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This isn’t really an "emulator" but it’s the closest concept we have right now. --- lib/systems/default.nix | 4 +- .../interpreters/wasmtime/cargo-lock.patch | 1481 ++++++++++++++++++++ pkgs/development/interpreters/wasmtime/default.nix | 31 + pkgs/top-level/all-packages.nix | 2 + 4 files changed, 1516 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/wasmtime/cargo-lock.patch create mode 100644 pkgs/development/interpreters/wasmtime/default.nix (limited to 'pkgs') diff --git a/lib/systems/default.nix b/lib/systems/default.nix index c408fe46be6f..5e6d277be7d5 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -115,8 +115,8 @@ rec { then "${wine}/bin/${wine-name}" else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux then "${qemu-user}/bin/qemu-${final.qemuArch}" - else if final.isWasm - then "${pkgs.v8}/bin/d8" + else if final.isWasi + then "${pkgs.wasmtime}/bin/wasmtime" else throw "Don't know how to run ${final.config} executables."; } // mapAttrs (n: v: v final.parsed) inspect.predicates diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/pkgs/development/interpreters/wasmtime/cargo-lock.patch new file mode 100644 index 000000000000..be5bd0ab3d3e --- /dev/null +++ b/pkgs/development/interpreters/wasmtime/cargo-lock.patch @@ -0,0 +1,1481 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..f702de1 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1475 @@ ++[[package]] ++name = "aho-corasick" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bindgen" ++version = "0.49.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "capstone" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "capstone-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cast" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cc" ++version = "1.0.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cexpr" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clang-sys" ++version = "0.28.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cmake" ++version = "0.1.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-bforest" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-codegen" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-bforest 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-meta 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-codegen-meta" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-entity" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cranelift-frontend" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-native" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-wasm" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "docopt" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dynasm" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dynasmrt" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "env_logger" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "errno" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "errno-dragonfly" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "faerie" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fallible-iterator" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "file-per-thread-logger" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "gcc" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "gimli" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fallible-iterator 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "glob" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "goblin" ++version = "0.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hashmap_core" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "heck" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "itertools" ++version = "0.7.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.51" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libloading" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lightbeam" ++version = "0.0.0" ++dependencies = [ ++ "capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mach" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matrixmultiply" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memmap" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memoffset" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memoffset" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "multi_mut" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ndarray" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matrixmultiply 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nom" ++version = "4.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num_cpus" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "owning_ref" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "peeking_take_while" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "plain" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pretty_env_logger" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quickcheck" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "raw-cpuid" ++version = "6.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rawpointer" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rayon" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "region" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scroll" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scroll_derive" ++version = "0.9.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.90" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.90" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "shlex" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "string-interner" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "structopt" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "take_mut" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "target-lexicon" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "traitobject" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "typemap" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unsafe-any" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wabt" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wabt-sys" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmparser" ++version = "0.29.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmtime-debug" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gimli 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-environ" ++version = "0.1.0" ++dependencies = [ ++ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lightbeam 0.0.0", ++ "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmtime-jit" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-debug 0.1.0", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-obj" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-runtime" ++version = "0.1.0" ++dependencies = [ ++ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmtime-tools" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-debug 0.1.0", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-obj 0.1.0", ++ "wasmtime-runtime 0.1.0", ++ "wasmtime-wasi 0.0.0", ++ "wasmtime-wast 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-wasi" ++version = "0.0.0" ++dependencies = [ ++ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-wast" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "which" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wincolor" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" ++"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" ++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637" ++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" ++"checksum bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33e1b67a27bca31fd12a683b2a3618e275311117f48cfcc892e18403ff889026" ++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00be9d203fa0e078b93b24603633fb081851dfe0c1086364431f52587a47157e" ++"checksum capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc8d32bc5c1e6d0fcde10af411c98b07d93498d51654f678757f08fa2acd6a6" ++"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" ++"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83" ++"checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" ++"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" ++"checksum clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4227269cec09f5f83ff160be12a1e9b0262dd1aa305302d5ba296c2ebd291055" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "96210eec534fc3fbfc0452a63769424eaa80205fda6cea98e5b61cb3d97bcec8" ++"checksum cranelift-bforest 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5a357d20666bf4a8c2d626a19f1b59dbca66cd844fb1e66c5612254fd0f7505" ++"checksum cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab00cb149a5bb0f7e6dd391357356a5d71c335a431e8eece94f32da2d5a043f7" ++"checksum cranelift-codegen-meta 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3797a2f450ac71297e083dd440d0cdd0d3bceabe4a3ca6bcb9e4077e9c0327d" ++"checksum cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b66e28877b75b3d2b31250f780bb5db8f68ae3df681cd56add803b2567ac4fd" ++"checksum cranelift-frontend 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b72d55fd732b1f7a99d043a36c54a5679b6ec8bc777c8d954fb97c4fa0fce7eb" ++"checksum cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0239f34836621a127c2132980b2f5c32a1be1c40e2d1a9a1a9bd5af33c12aee" ++"checksum cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740ebfba28c8433f06750f84819f1eb663ea9f5e4b9a81c01f4e52262d868b56" ++"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" ++"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150" ++"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9" ++"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" ++"checksum dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f36d49ab6f8ecc642d2c6ee10fda04ba68003ef0277300866745cdde160e6b40" ++"checksum dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c408a211e7f5762829f5e46bdff0c14bc3b1517a21a4bb781c716bf88b0c68" ++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" ++"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" ++"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a" ++"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" ++"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" ++"checksum faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f48412f92b56015a240e249847295b38b0a731435806c21a199403b2c317272c" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum fallible-iterator 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eb7217124812dc5672b7476d0c2d20cfe9f7c0f1ba0904b674a9762a0212f72e" ++"checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" ++"checksum gimli 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb3243218ca3773e9aa00d27602f35bd1daca3be1b7112ea5fc23b2899f1a4f3" ++"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" ++"checksum goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6a4013e9182f2345c6b7829b9ef6e670bce0dfca12c6f974457ed2160c2c7fe9" ++"checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" ++"checksum hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8e04cb7a5051270ef3fa79f8c7604d581ecfa73d520e74f554e45541c4b5881a" ++"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" ++"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" ++"checksum itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d" ++"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" ++"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" ++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" ++"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917" ++"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" ++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" ++"checksum matrixmultiply 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "dcad67dcec2d58ff56f6292582377e6921afdf3bfbd533e26fb8900ae575e002" ++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" ++"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" ++"checksum memoffset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7efacc914ca612fc1022f27b7dc51585e1a9f94c08fd5d322cfd741399260ce0" ++"checksum multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "816df386e5557ac1843a96f1ba8a7cbf4ab175d05ccc15c87a3cda27b4fbdece" ++"checksum ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cf380a8af901ad627594013a3bbac903ae0a6f94e176e47e46b5bbc1877b928" ++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" ++"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++"checksum num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "107b9be86cd2481930688277b675b0114578227f034674726605b8a482d8baf8" ++"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" ++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" ++"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" ++"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" ++"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" ++"checksum pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61" ++"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" ++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4537d3e4edf73a15dd059b75bed1c292d17d3ea7517f583cebe716794fcf816" ++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" ++"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" ++"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d" ++"checksum rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebac11a9d2e11f2af219b8b8d833b76b1ea0e054aa0e8d8e9e4cbde353bdf019" ++"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473" ++"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" ++"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" ++"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0" ++"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" ++"checksum region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ace21a7fc79cffefeb66f2cc3ef22c7687015023bf7f85bec8840f0d46cb51cc" ++"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" ++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" ++"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" ++"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4" ++"checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79" ++"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" ++"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" ++"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" ++"checksum string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "abb38a0d8fe673c40b10b6b75abcb076a958cc10fb894f14993d9737c4c87000" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum strsim 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34ac666ab1423aa93bbd4cd47b6e62db5a846df4e28b959d823776eed5b57643" ++"checksum structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3d0760c312538987d363c36c42339b55f5ee176ea8808bbe4543d484a291c8d1" ++"checksum structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "528aeb7351d042e6ffbc2a6fb76a86f9b622fdf7c25932798e7a82cb03bc94c6" ++"checksum syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b4cfac95805274c6afdb12d8f770fa2d27c045953e7b630a81801953699a9a" ++"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" ++"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" ++"checksum target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6923974ce4eb5bd28814756256d8ab71c28dd6e7483313fe7ab6614306bf633" ++"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" ++"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" ++"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" ++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" ++"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" ++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++"checksum wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "74e463a508e390cc7447e70f640fbf44ad52e1bd095314ace1fdf99516d32add" ++"checksum wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a6265b25719e82598d104b3717375e37661d41753e2c84cde3f51050c7ed7e3c" ++"checksum wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)" = "981a8797cf89762e0233ec45fae731cb79a4dfaee12d9f0fe6cee01e4ac58d00" ++"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" ++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix new file mode 100644 index 000000000000..882de562114a --- /dev/null +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -0,0 +1,31 @@ +{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }: + +rustPlatform.buildRustPackage rec { + name = "wasmtime-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "CraneStation"; + repo = "wasmtime"; + rev = "07a6ca8f4e1136ecd9f4af8d1f03a01aade60407"; + sha256 = "1cq6nz90kaf023mcyblca90bpvbzhq8xjq01laa28v7r50lagcn5"; + fetchSubmodules = true; + }; + + cargoSha256 = "17k8n5xar4pvvi4prhm6c51vlim9xqwkkhysbnss299mm3fyh36h"; + + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ python cmake clang ]; + buildInputs = [ llvmPackages.libclang ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + meta = with lib; { + description = "Standalone JIT-style runtime for WebAsssembly, using Cranelift"; + homepage = https://github.com/CraneStation/wasmtime; + license = licenses.asl20; + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c07533522a8d..dae73418e203 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23815,4 +23815,6 @@ in stdenv = crossLibcStdenv; }; + wasmtime = callPackage ../development/interpreters/wasmtime {}; + } -- cgit 1.4.1 From 556466d52feee16313138279513a08ae6d4b7e90 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 15 Apr 2019 22:23:01 -0400 Subject: wasm: set -fno-exceptions We need this to support C++ code. --- pkgs/development/compilers/llvm/8/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index c528f8417cfa..48cf9e5e589c 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -106,6 +106,8 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; -- cgit 1.4.1 From 4048acb5cf533d35f25221af200fc40d07f25a63 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 21:32:59 -0400 Subject: gnu-config: bump to latest version for wasi --- pkgs/development/libraries/gnu-config/default.nix | 8 ++++---- pkgs/stdenv/cross/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 3f0fcafa4475..7918fb7b9c4b 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl }: let - rev = "b75cdc942a6172f63b34faf642b8c797239f6776"; + rev = "a8d79c3130da83c7cacd6fee31b9acc53799c406"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv"; + sha256 = "0qbq49gr2cmf4gzrjvrmpwxxgzl3vap1xm902xa8pkcqdvriq0qw"; }; configSub = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc"; + sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; }; in stdenv.mkDerivation rec { name = "gnu-config-${version}"; - version = "2016-12-31"; + version = "2019-04-15"; buildCommand = '' mkdir -p $out diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 479213f3a561..201c93786823 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -64,7 +64,7 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ lib.optional - (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) + (let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs -- cgit 1.4.1 From 1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 16 Apr 2019 23:55:31 -0400 Subject: stdenv, compiler-rt: Compress WASI conditionals --- pkgs/development/compilers/llvm/8/compiler-rt.nix | 4 +--- pkgs/stdenv/generic/default.nix | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 3e225626aa6d..33eef4358256 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -53,15 +53,13 @@ stdenv.mkDerivation rec { ''; # Hack around weird upsream RPATH bug - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' ln -s "$out/lib"/*/* "$out/lib" '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o - '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' - ln -s $out/lib/*/* $out/lib ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.hostPlatform.isWasm "--allow-undefined --no-entry"; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index ed022422c26e..1ef2ab52029b 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -88,10 +88,7 @@ let # there (yet?) so it goes here until then. preHook = preHook+ lib.optionalString buildPlatform.isDarwin '' export NIX_BUILD_DONT_SET_RPATH=1 - '' + lib.optionalString hostPlatform.isDarwin '' - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - '' + lib.optionalString (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho) '' + '' + lib.optionalString (hostPlatform.isDarwin || (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho)) '' export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 '' -- cgit 1.4.1 From 9044f57d183dcf2443df52ccc58911970171584d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 17 Apr 2019 00:16:36 -0400 Subject: compiler-rt: Don't try to build a test executable Got this trick from stack overflow to avoid needing compiler-rt to link the test exe before building compiler-rt. a static lib isn't linked at all, and so breaks the cycle. --- pkgs/development/compilers/llvm/8/compiler-rt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 33eef4358256..2b591cc94aff 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" @@ -62,7 +64,5 @@ stdenv.mkDerivation rec { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.hostPlatform.isWasm "--allow-undefined --no-entry"; - enableParallelBuilding = true; } -- cgit 1.4.1 From 721832f97ec96a4fd34549eada8c58314a457f9c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Apr 2019 00:24:37 -0400 Subject: libiconv: get just headers from wasilibc --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dae73418e203..fe39c4ec3306 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10311,7 +10311,7 @@ in else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode else if name == "nblibc" then targetPackages.netbsdCross.libc - else if name == "wasilibc" then targetPackages.wasilibc + else if name == "wasilibc" then targetPackages.wasilibc or wasilibc else throw "Unknown libc ${name}"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; @@ -11402,7 +11402,7 @@ in # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") + if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"] then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc) -- cgit 1.4.1 From a4cfd500044617059d0cfbe804c6814151f7c7e4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Apr 2019 01:04:30 -0400 Subject: libcxxabi: apply libcxxabi-wasm patch --- pkgs/development/compilers/llvm/8/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch (limited to 'pkgs') diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 8a5e1d32c42c..bb5b368267f2 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ - "-DUNIX=ON" "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optionals (!enableShared) [ @@ -30,6 +29,8 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch new file mode 100644 index 000000000000..4ebfe46aa813 --- /dev/null +++ b/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + -- cgit 1.4.1 From 6948ffd398086f2da02397e1391c8f555c46f66f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Apr 2019 19:49:12 -0400 Subject: wasilibc: use .imports file for lld instead of passing in the --allow-undefined-file, we can just let lld find the file. --- pkgs/build-support/cc-wrapper/default.nix | 2 -- pkgs/development/libraries/wasilibc/default.nix | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ddec3d0931ff..5f478c823e7a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -301,8 +301,6 @@ stdenv.mkDerivation { + optionalString targetPlatform.isWasm '' hardening_unsupported_flags+=" stackprotector fortify pie pic" - '' + optionalString (targetPlatform.isWasm && libc != null) '' - echo "--allow-undefined-file=${libc}/share/wasm32-wasi/undefined-symbols.txt" >> $out/nix-support/cc-ldflags '' + optionalString (libc != null && targetPlatform.isAvr) '' diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index f783540797ce..229d67b81edd 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { postInstall = '' mv $out/lib/*/* $out/lib + ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports ''; meta = { -- cgit 1.4.1 From e2a1dc6a44ec3801c4fe3059eabbd7d0ac8983df Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Apr 2019 19:52:25 -0400 Subject: libgmp: don’t compile with cpp on wasm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t have full C++ support for things like threads or exceptions. --- pkgs/development/libraries/gmp/6.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index ce78f3230882..f320c303123e 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, m4, cxx ? !stdenv.hostPlatform.useAndroidPrebuilt +{ stdenv, fetchurl, m4 +, cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm , buildPackages , withStatic ? false }: -- cgit 1.4.1 From 008c9a70a57f0448b275179bfbc10c8750f29069 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 23 Apr 2019 21:51:30 -0400 Subject: release-cross: add wasi targets Add a few working cross targets to make sure things keep working. --- pkgs/top-level/release-cross.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index af400aee8717..86864bb17a75 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -54,6 +54,13 @@ let windows.mingw_w64_pthreads = nativePlatforms; }; + wasiCommon = { + gmp = nativePlatforms; + boehmgc = nativePlatforms; + hello = nativePlatforms; + zlib = nativePlatforms; + }; + darwinCommon = { buildPackages.binutils = darwin; }; @@ -140,6 +147,8 @@ in android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // { }); + wasi32 = mapTestOnCross lib.systems.examples.wasi32 wasiCommon; + msp430 = mapTestOnCross lib.systems.examples.msp430 embedded; avr = mapTestOnCross lib.systems.examples.avr embedded; arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded; -- cgit 1.4.1