diff options
492 files changed, 3628 insertions, 1958 deletions
diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index 159216ca981f..f555cacbd2c4 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -28,6 +28,22 @@ </para> </section> + <section xml:id="ssec-gnome-gdk-pixbuf-loaders"> + <title>GdkPixbuf loaders</title> + + <para> + GTK applications typically use <link xlink:href="https://developer.gnome.org/gdk-pixbuf/stable/">GdkPixbuf</link> to load images. But <package>gdk-pixbuf</package> package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by <package>librsvg</package>. + </para> + + <para> + Unlike other libraries mentioned in this section, GdkPixbuf only supports a single value in its controlling environment variable <envar>GDK_PIXBUF_MODULE_FILE</envar>. It is supposed to point to a cache file containing information about the available loaders. Each loader package will contain a <filename>lib/gdk-pixbuf-2.0/2.10.0/loaders.cache</filename> file describing the default loaders in <package>gdk-pixbuf</package> package plus the loader contained in the package itself. If you want to use multiple third-party loaders, you will need to create your own cache file manually. Fortunately, this is pretty rare as <link xlink:href="https://gitlab.gnome.org/federico/gdk-pixbuf-survey/blob/master/src/modules.md">not many loaders exist</link>. + </para> + + <para> + <package>gdk-pixbuf</package> contains <link linkend="ssec-gnome-hooks-gdk-pixbuf">a setup hook</link> that sets <envar>GDK_PIXBUF_MODULE_FILE</envar> from dependencies but as mentioned in further section, it is pretty limited. Loaders should propagate this setup hook. + </para> + </section> + <section xml:id="ssec-gnome-icons"> <title>Icons</title> @@ -100,9 +116,16 @@ preFixup = '' done ''; </programlisting> - Fortunately, there is <package>wrapGAppsHook</package>, that does the wrapping for us. In particular, it works in conjunction with other setup hooks that will populate the variable: + </para> + <para> + Fortunately, there is <package xml:id="ssec-gnome-hooks-wrapgappshook">wrapGAppsHook</package>. It works in conjunction with other setup hooks that populate environment variables, and it will then wrap all executables in <filename>bin</filename> and <filename>libexec</filename> directories using said variables. + </para> + <para> + For convenience, it also adds <package>dconf.lib</package> for a GIO module implementing a GSettings backend using <package>dconf</package>, <package>gtk3</package> for GSettings schemas, and <package>librsvg</package> for GdkPixbuf loader to the closure. In case you are packaging a program without a graphical interface, you might want to use <package xml:id="ssec-gnome-hooks-wrapgappsnoguihook">wrapGAppsNoGuiHook</package>, which runs the same script as <package>wrapGAppsHook</package> but does not bring <package>gtk3</package> and <package>librsvg</package> into the closure. + </para> + <para> <itemizedlist> - <listitem xml:id="ssec-gnome-hooks-wrapgappshook"> + <listitem> <para> <package>wrapGAppsHook</package> itself will add the package’s <filename>share</filename> directory to <envar>XDG_DATA_DIRS</envar>. </para> @@ -112,6 +135,11 @@ preFixup = '' <package>glib</package> setup hook will populate <envar>GSETTINGS_SCHEMAS_PATH</envar> and then <package>wrapGAppsHook</package> will prepend it to <envar>XDG_DATA_DIRS</envar>. </para> </listitem> + <listitem xml:id="ssec-gnome-hooks-gdk-pixbuf"> + <para> + <package>gdk-pixbuf</package> setup hook will populate <envar>GDK_PIXBUF_MODULE_FILE</envar> with the path to biggest <filename>loaders.cache</filename> file from the dependencies containing <link xlink:href="ssec-gnome-gdk-pixbuf-loaders">GdkPixbuf loaders</link>. This works fine when there are only two packages containing loaders (<package>gdk-pixbuf</package> and e.g. <package>librsvg</package>) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like <filename>services/x11/gdk-pixbuf.nix</filename> NixOS module does. <package>wrapGAppsHook</package> copies the <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable into the produced wrapper. + </para> + </listitem> <listitem xml:id="ssec-gnome-hooks-gtk-drop-icon-theme-cache"> <para> One of <package>gtk3</package>’s setup hooks will remove <filename>icon-theme.cache</filename> files from package’s icon theme directories to avoid conflicts. Icon theme packages should prevent this with <code>dontDropIconThemeCache = true;</code>. @@ -178,7 +206,7 @@ preFixup = '' </term> <listitem> <para> - There are no schemas avalable in <envar>XDG_DATA_DIRS</envar>. Temporarily add a random package containing schemas like <package>gsettings-desktop-schemas</package> to <literal>buildInputs</literal>. <link linkend="ssec-gnome-hooks-glib"><package>glib</package></link> and <link linkend="ssec-gnome-hooks-wrapgappshook"><package>wrapGAppsHook</package></link> setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the <link linkend="ssec-gnome-common-issues-missing-schema">next error</link>. Or you can try looking through the source code for the actual schemas used. + There are no schemas available in <envar>XDG_DATA_DIRS</envar>. Temporarily add a random package containing schemas like <package>gsettings-desktop-schemas</package> to <literal>buildInputs</literal>. <link linkend="ssec-gnome-hooks-glib"><package>glib</package></link> and <link linkend="ssec-gnome-hooks-wrapgappshook"><package>wrapGAppsHook</package></link> setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the <link linkend="ssec-gnome-common-issues-missing-schema">next error</link>. Or you can try looking through the source code for the actual schemas used. </para> </listitem> </varlistentry> diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 46ee97927eac..282893b0ca2b 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -1989,7 +1989,7 @@ addEnvHooks "$hostOffset" myBashFunction </term> <listitem> <para> - Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable to the builder. Add librsvg package to <varname>buildInputs</varname> to get svg support. + Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable to the builder. Add librsvg package to <varname>buildInputs</varname> to get svg support. See also <xref linkend="ssec-gnome-hooks-gdk-pixbuf" />. </para> </listitem> </varlistentry> diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 87a99f9ac8e7..ffb00aa0362e 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -32,7 +32,7 @@ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finnally</link> packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. - Additionally, the attribute <code>gnuradio<code> and <code>gnuradio3_7<code> + Additionally, the attribute <code>gnuradio</code> and <code>gnuradio3_7</code> now point to an externally wrapped by default derivations, that allow you to also add `extraPythonPackages` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added diff --git a/nixos/modules/services/misc/zigbee2mqtt.nix b/nixos/modules/services/misc/zigbee2mqtt.nix index 0957920f1a09..cd987eb76c76 100644 --- a/nixos/modules/services/misc/zigbee2mqtt.nix +++ b/nixos/modules/services/misc/zigbee2mqtt.nix @@ -70,6 +70,7 @@ in description = "Zigbee2mqtt Service"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + environment.ZIGBEE2MQTT_DATA = cfg.dataDir; serviceConfig = { ExecStart = "${cfg.package}/bin/zigbee2mqtt"; User = "zigbee2mqtt"; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index ea8a52696254..7230bf63287d 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -32,6 +32,11 @@ mkDerivation rec { url = "https://github.com/falkTX/Cadence/commit/1fd3275e7daf4b75f59ef1f85a9e2e93bd5c0731.patch"; sha256 = "0q791jsh8vmjg678dzhbp1ykq8xrrlxl1mbgs3g8if1ccj210vd8"; }) + # Fix build with Qt 5.15 + (fetchpatch { + url = "https://github.com/falkTX/Cadence/commit/c167f35fbb76c4246c730b29262a59da73010412.patch"; + sha256 = "1gm9q6gx03sla5vcnisznc95pjdi2703f8b3mj2kby9rfx2pylyh"; + }) ]; postPatch = '' @@ -96,7 +101,5 @@ mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ worldofpeace ]; platforms = [ "x86_64-linux" ]; - # Needs QT 5.14 - broken = true; }; } diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index dcb5737afa6a..c4e1695f0835 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +{ stdenv, fetchFromGitHub, rustPackages_1_45, pkgconfig, openssl , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -7,7 +7,10 @@ , dbus ? null }: -rustPlatform.buildRustPackage rec { +# rust >= 1.48 causes a panic within spotifyd on music playback. as long as +# there is no upstream fix for the issue we use an older version of rust. +# Upstream issue: https://github.com/Spotifyd/spotifyd/issues/719 +rustPackages_1_45.rustPlatform.buildRustPackage rec { pname = "spotifyd"; version = "0.2.24"; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 2e6e2e592b12..4c64c595fefb 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.17.1"; + version = "2.18.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1r0cl4jfgg0b3zr46bh9dhhg2qgsh3xj99w3ryyjdxydfvychvz8"; + sha256 = "19sx9n5mij68v07vy65h1c16rgbpll3kagr437cjb7r95k3nk2zn"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 6275a26118f6..16f4aefe349e 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,6 +1,5 @@ { stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub -, fetchpatch , cmake, qttools, pkgconfig , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns @@ -28,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.4"; + version = "0.17.1.5"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng"; + sha256 = "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0"; }; nativeBuildInputs = [ @@ -59,14 +58,7 @@ stdenv.mkDerivation rec { chmod -R +w source/monero ''; - patches = [ - ./move-log-file.patch - # fix build failure due to invalid use of CMAKE_PREFIX_PATH - (fetchpatch { - url = "https://github.com/monero-project/monero-gui/commit/ef2be82c21b0934522ad8e110805b66f5948da1f.patch"; - sha256 = "1rhazk2xwa5dv1cmkrkq8yr08qxslg4k929cvlliabrx20kbr5z5"; - }) - ]; + patches = [ ./move-log-file.patch ]; postPatch = '' # set monero-gui version diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 1010da81da34..2978d65e2ef0 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.3"; + version = "0.17.1.5"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1ddkdfd8i5q509qziwcx1f6nm8axs4a1ppzv2y5lgsqpq375if6j"; + sha256 = "0yy9n2qng02j314h8fh5n0mcy6vpdks0yk4d8ifn8hj03f3g2c8b"; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index a54ce7345d04..d941c85e2c6f 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; license = licenses.mit; - maintainers = with maintainers; [ ehmry Br1ght0ne penguwin ]; + maintainers = with maintainers; [ Br1ght0ne penguwin ]; }; } diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix new file mode 100644 index 000000000000..8205d52b43a1 --- /dev/null +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, makeWrapper, jdk }: + +stdenv.mkDerivation rec { + pname = "greenfoot"; + version = "3.6.1"; + src = fetchurl { + # We use the deb here. First instinct might be to go for the "generic" JAR + # download, but that is actually a graphical installer that is much harder + # to unpack than the deb. + url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; + sha256 = "112h6plpclj8kbv093m4pcczljhpd8d47d7a2am1yfgbyckx6hf0"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + + installPhase = '' + mkdir -p $out + cp -r usr/* $out + rm -r $out/share/greenfoot/jdk + rm -r $out/share/greenfoot/javafx + + makeWrapper ${jdk}/bin/java $out/bin/greenfoot \ + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/greenfoot/bluej.jar\" bluej.Boot -greenfoot=true -bluej.compiler.showunchecked=false -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API" + ''; + + meta = with stdenv.lib; { + description = "A simple integrated development environment for Java"; + homepage = "https://www.greenfoot.org/"; + license = licenses.gpl2ClasspathPlus; + maintainers = [ maintainers.charvp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index c0aa0a481bdc..46143747f6d9 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,26 +1,27 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, + qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: mkDerivation rec { pname = "cura"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "19an168iad3cb5w8i71c0wbr79qnz5qnpxqx1j6dgh64qz6ffn2r"; + sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "1w6i0dlff8b30q987x3y0zv8847fc8ppfcr9vi982msmv284c89z"; + sha256 = "0hi9w1fsnazlr0vvxdr3alsdb8m1vjjfp5zhmlz4kyyxhsy3bc33"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ - libsavitar numpy-stl pyserial requests uranium zeroconf + libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d sentry-sdk trimesh ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 5cc5db3115fb..8993c01a6bd2 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "177fk6j4gn3ssi8j1qxj8p4486f7jkz328vc75agxnh7vhd4mwsm"; + sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix index dc3f1922c214..9ac701014906 100644 --- a/pkgs/applications/misc/foxtrotgps/default.nix +++ b/pkgs/applications/misc/foxtrotgps/default.nix @@ -1,16 +1,32 @@ -{ fetchurl, stdenv, pkg-config, wrapGAppsHook, curl, gnome2, gpsd, gtk2 +{ stdenv, fetchbzr, autoreconfHook, texinfo, help2man, imagemagick, pkg-config +, curl, gnome2, gpsd, gtk2, wrapGAppsHook , intltool, libexif, python3Packages, sqlite }: -stdenv.mkDerivation rec { +let + srcs = { + foxtrot = fetchbzr { + url = "lp:foxtrotgps"; + rev = "326"; + sha256 = "191pgcy5rng8djy22a5z9s8gssc73f9p5hm4ig52ra189cb48d8k"; + }; + screenshots = fetchbzr { + url = "lp:foxtrotgps/screenshots"; + rev = "2"; + sha256 = "1sgysn3dhfhrv7rj7wf8f2119vmhc1s1zzsp4r3nlrr45d20wmsv"; + }; + }; +in stdenv.mkDerivation rec { pname = "foxtrotgps"; - version = "1.2.2"; + version = "1.2.2+326"; - src = fetchurl { - url = "https://www.foxtrotgps.org/releases/foxtrotgps-${version}.tar.xz"; - sha256 = "0grn35j5kwc286dxx18fv32qa330xmalqliwy6zirxmj6dffvrkg"; - }; + # Pull directly from bzr because gpsd API version 9 is not supported on latest release + src = srcs.foxtrot; + + patches = [ + ./gps-status-fix.patch + ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man imagemagick wrapGAppsHook ]; buildInputs = [ curl.dev @@ -22,7 +38,16 @@ stdenv.mkDerivation rec { sqlite.dev (python3Packages.python.withPackages (pythonPackages: with python3Packages; [ beautifulsoup4 feedparser sqlalchemy ])) - ]; + ]; + + postUnpack = '' + cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots + chmod -R u+w $sourceRoot/doc/screenshots + ''; + + preConfigure = '' + intltoolize --automake --copy --force + ''; meta = with stdenv.lib; { description = "GPS/GIS application optimized for small screens"; diff --git a/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch b/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch new file mode 100644 index 000000000000..e9b3624a174b --- /dev/null +++ b/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch @@ -0,0 +1,14 @@ +--- foxtrot/src/gps_functions.c.orig 2020-12-04 15:02:22.290163204 -0600 ++++ foxtrot/src/gps_functions.c 2020-12-04 15:04:54.470648534 -0600 +@@ -762,7 +762,11 @@ + { + gpsdata->fix.time = (time_t) 0; + } ++#if GPSD_API_MAJOR_VERSION >= 9 ++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX); ++#else + gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); ++#endif + if (gpsdata->valid) + { + gpsdata->seen_valid = TRUE; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index cdfbe3f6dc1f..7bda292a4cba 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -1,17 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt, gettext -, libjpeg, readline, libtool +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, gettext +, libexif +, libgphoto2 +, libjpeg +, libtool +, popt +, readline }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.26"; + pname = "gphoto2"; + version = "2.5.26"; - src = fetchurl { - url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn"; + src = fetchFromGitHub { + owner = "gphoto"; + repo = "gphoto2"; + rev = "v${version}"; + sha256 = "1w01j3qvjl2nlfs38rnsmjvn3r0r2xf7prxz1i6yarbpj3fzwqqc"; }; - nativeBuildInputs = [ pkgconfig gettext libtool ]; - buildInputs = [ libgphoto2 libexif popt libjpeg readline ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + gettext + libtool + ]; + + buildInputs = [ + libexif + libgphoto2 + libjpeg + popt + readline + ]; meta = with stdenv.lib; { description = "A ready to use set of digital camera software applications"; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index b8f7c4641d20..8c8413b2ce60 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { - owner = "jeromerobert"; + owner = pname; repo = pname; rev = version; - sha256 = "03siz4ar6flyvrrgh7hr7sslc6n9x5d9i13lc5rm2qnssd0qdich"; + sha256 = "wJ6ImWpszfgErfLh7YgHirVKFIt0ij8A/CdYJmkNBP0="; }; nativeBuildInputs = [ @@ -33,6 +33,10 @@ python3Packages.buildPythonApplication rec { # incompatible with wrapGAppsHook strictDeps = false; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; doCheck = false; # no tests diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix index d780125fbbfa..9ae65a962ddc 100644 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -33,6 +33,10 @@ mkDerivation rec { sha256 = "16hql8ignzw4n1hlp4icbvaddqcadh2rjns0bvis720535112sc8"; }) (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-timespec.patch?h=qlandkartegt"; + sha256 = "1yzdwfsgjn7q04r9f7s5qk50y25hdl384dxrmpfmkm97fmpgyr7w"; + }) + (fetchpatch { url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-ver_str.patch?h=qlandkartegt"; sha256 = "13fg05gqrjfa9j00lrqz1b06xf6r5j01kl6l06vkn0hz1jzxss5m"; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f167ab105d34..0c16d0c9ec60 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -18,20 +18,14 @@ , ffmpeg, libxslt, libxml2, at-spi2-core , jre8 , pipewire_0_2 +, libva # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libva ? null # useVaapi , libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization -, useOzone ? false -, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper -# VA-API TODOs: -# - Ozone: M81 fails to build due to "ozone_platform_gbm = false" -# - Possible solutions: Write a patch to fix the build (wrong gn dependencies) -# or build with minigbm -# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879) +, useOzone ? true , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -141,8 +135,8 @@ let pciutils protobuf speechd libXdamage at-spi2-core jre pipewire_0_2 - ] ++ optional useVaapi libva - ++ optional gnomeKeyringSupport libgnome-keyring3 + libva + ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio @@ -220,9 +214,8 @@ let custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; is_official_build = true; - is_debug = false; - proprietary_codecs = false; + use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; use_gio = gnomeSupport; @@ -238,7 +231,6 @@ let rtc_use_pipewire = true; treat_warnings_as_errors = false; - is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; blink_symbol_level = 0; symbol_level = 0; @@ -256,14 +248,11 @@ let proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; - } // optionalAttrs useVaapi { - use_vaapi = true; } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; } // optionalAttrs useOzone { use_ozone = true; - ozone_platform_gbm = false; use_xkbcommon = true; use_glib = true; use_gtk = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 845a4ac3b61b..e35e4d945dde 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -15,7 +15,6 @@ , enablePepperFlash ? false , enableWideVine ? false , enableVaapi ? false # Disabled by default due to unofficial support -, useOzone ? true , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" @@ -34,15 +33,13 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs - cupsSupport pulseSupport useOzone; + cupsSupport pulseSupport; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; src = fetchgit { inherit (upstream-info.deps.gn) url rev sha256; }; }); - # TODO: Cleanup useOzone and useVaapi in common.nix: - useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine) }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d31a1a0e54c4..7f1d9763e424 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -27,7 +27,7 @@ rec { meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco andir ]; + maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". @@ -51,7 +51,7 @@ rec { meta = { description = "A web browser built from Firefox Extended Support Release source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco andir ]; + maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 84a6f7b92fa5..4b1efe9dba2f 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.14.0"; + version = "1.14.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0jip413yvyhdaywz0iadc32aaanjnhbx1d1vwzx3z1xbgc4i9svn"; + sha256 = "15l7jphy1qjsh6y6kd5mgkxsl6ymm9564g1yypa946jbyrgi8k2m"; }; # Needs tox diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 9e188c0f7e2d..d45cbb19e71b 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "1b67a417b0914ccl7drdfd7bq1qsfkw9haqz4m5j96qb0l5p71w2"; + sha256 = "0cr7ap9yfd9flcph98rxap2f46fc3v689v31mc8n7vxi9jr07irh"; }; buildFlagsArray = '' diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index a0f35f3779d1..3d22dca36d95 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.16"; + stableVersion = "2.2.17"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1kz5gr5rwqp1hn9fw17v6sy2467506zks574nqcd2vgxzhr6cy6x"; - serverSrcHash = "1r6qj1l8jgyjm67agn83zp9c2n7pgfzwyh8a5q314zxi18nm6rqp"; + guiSrcHash = "0dfyxr983w6lmbcvaf32bnm9cz7y7fp9jfaz8zxp1dvr6dr06cmv"; + serverSrcHash = "0m5ajd2zkafx89hvp202m351h1dygfc3jssl3m7nd7r42csyi2vj"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 0a6f3d1a1381..0596cd350dfb 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1j0i2jmlk5sc78af9flj3ynj0iiwa8biw7jgf12qm5lppsx1h4j7"; + sha256 = "1vf1ab3mnx7p4s4n4pssajj211s3zr4730bwgsjx9gxcnyppqclw"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index aab76574968b..321b103c7f7a 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,50 +1,41 @@ -{ stdenv, fetchFromGitHub -, alsaLib, espeak, glibc, gpsd +{ stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd , hamlib, perl, python, udev }: with stdenv.lib; stdenv.mkDerivation rec { pname = "direwolf"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; rev = version; - sha256 = "1w55dv9xqgc9mpincsj017838vmvdy972fhis3ddskyfvhhzgcsk"; + sha256 = "0xmz64m02knbrpasfij4rrq53ksxna5idxwgabcw4n2b1ig7pyx5"; }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ espeak gpsd hamlib perl python ] ++ (optionals stdenv.isLinux [alsaLib udev]); - makeFlags = [ "DESTDIR=$(out)" ]; + patches = [ + ./udev-fix.patch + ]; postPatch = '' - substituteInPlace symbols.c \ + substituteInPlace src/symbols.c \ --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \ --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt - substituteInPlace decode_aprs.c \ + substituteInPlace src/decode_aprs.c \ --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \ --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt - substituteInPlace dwespeak.sh \ + substituteInPlace scripts/dwespeak.sh \ --replace espeak ${espeak}/bin/espeak - '' + (optionalString stdenv.isLinux '' - substituteInPlace Makefile.linux \ - --replace /usr/include/pthread.h ${stdenv.glibc.dev}/include/pthread.h \ - --replace /usr/include/alsa ${alsaLib.dev}/include/alsa \ - --replace /usr/include/gps.h ${gpsd}/include/gps.h \ - --replace /usr/include/hamlib ${hamlib}/include/hamlib \ - --replace /usr/include/libudev.h ${udev.dev}/include/libudev.h \ - --replace /etc/udev $out/etc/udev \ - --replace 'Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"' "Exec=$out/bin/direwolf" \ - --replace '#Terminal=true' 'Terminal=true' \ - --replace 'Path=$(HOME)' '#Path=' - ''); - - preInstall = '' - mkdir -p $out/bin + substituteInPlace cmake/cpack/direwolf.desktop.in \ + --replace 'Terminal=false' 'Terminal=true' \ + --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' \ ''; meta = { diff --git a/pkgs/applications/radio/direwolf/udev-fix.patch b/pkgs/applications/radio/direwolf/udev-fix.patch new file mode 100644 index 000000000000..cff17fb88621 --- /dev/null +++ b/pkgs/applications/radio/direwolf/udev-fix.patch @@ -0,0 +1,11 @@ +--- direwolf/conf/CMakeLists.txt.orig 2020-12-04 11:12:59.739390894 -0600 ++++ direwolf/conf/CMakeLists.txt 2020-12-04 11:23:09.146594795 -0600 +@@ -26,7 +26,7 @@ + + # install udev rules for CM108 + if(LINUX) +- install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /etc/udev/rules.d/) ++ install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d/") + endif() + + install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_CONF_DIR}) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 7aab2b8fd64d..b2402aad33eb 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.14"; + version = "2.14.2"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "1iz4lgk99v5bwzk35wi4jg8nn3gbp0vm1p6svs42mxxxf9f99j7i"; + sha256 = "15xlzfgmffq43wn74xjqc5p2m21i3lh28qqskd2jf2hhvanpcwcp"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index f55c78ea26b5..cf4ddd5b6e86 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "inspectrum"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "miek"; repo = "inspectrum"; rev = "v${version}"; - sha256 = "1a517y7s1xi66y5kjrpjay450pad9nc228pa8801mxq1c7m1lamm"; + sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b7e4f3e6c483..57f6703762d1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,5 @@ { fetchurl, stdenv, buildPackages +, fetchpatch , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 @@ -51,6 +52,12 @@ stdenv.mkDerivation { ./ssh-path.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch + (fetchpatch { + # https://github.com/git/git/pull/925 + name = "make-manual-reproducible.patch"; + url = "https://github.com/git/git/commit/7a68e9e0b8eda91eb576bbbc5ed66298f3ab761c.patch"; + sha256 = "02naws82pd3vvwrrgqn91kid8qkjihyjaz1ahgjz8qlmnn2avf5n"; + }) ]; postPatch = '' @@ -229,8 +236,8 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email '') - + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \ + + stdenv.lib.optionalString withManual ''# Install man pages + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' + (if guiSupport then '' diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index bb720df3f27a..0f7e2bc9486c 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -2,8 +2,6 @@ , fetchCrate , rustPlatform , pkg-config -, clang -, libclang , libsodium , openssl , xxHash @@ -15,21 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.11"; + version = "1.0.0-alpha.17"; src = fetchCrate { inherit version pname; - sha256 = "1y2xgbzclmk0i98iydmqgvf6acx0v326dmj9j2hiwrld193fc4dx"; + sha256 = "03r383fkqx17sb2c0kz71lbn0rdas7nd9yw7ni5fbmrq8rlk9brv"; }; - cargoSha256 = "0i1rr8jg34g4b8i2lvh9gy2rpfa01ma9jpcpyp5zklrzk5f1ksvf"; + cargoSha256 = "0dfmldklklax8nb3pry0h80kih1k1idfjgaxinxkk1iflcm3cwqn"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; - LIBCLANG_PATH = "${libclang}/lib"; doCheck = false; - nativeBuildInputs = [ pkg-config clang ]; - buildInputs = [ openssl libclang libsodium xxHash zstd ] + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl libsodium xxHash zstd ] ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ]) ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 2c58e15c443d..0384f9723d56 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,7 +1,8 @@ -{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: -python2Packages.buildPythonApplication rec { +{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg_utils, gtk3 }: + +python3Packages.buildPythonApplication rec { pname = "rabbitvcs"; - version = "0.17.1"; + version = "0.18"; namePrefix = ""; src = fetchFromGitHub { @@ -11,7 +12,8 @@ python2Packages.buildPythonApplication rec { sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy"; }; - pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + buildInputs = [ gtk3 ]; + pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg_utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index c91b1d31b950..2d75aebc8228 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { pname = "i3-layout-manager"; - version = "unstable-2019-12-06"; + version = "unstable-2020-05-04"; src = fetchFromGitHub { owner = "klaxalk"; repo = pname; - rev = "064e13959413ba2d706185478a394e5852c0dc53"; - sha256 = "1qm35sp1cfi3xj5j7xwa05dkb3353gwq4xh69ryc6382xx3wszg6"; + rev = "df54826bba351d8bcd7ebeaf26c07c713af7912c"; + sha256 = "0ccvr43yp26fnh5d82cw7jcfq2sbxzzmdx2cp15bmxr8ixr8knc3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index 583a9ea396cf..42ad7603a8f7 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -17,6 +17,8 @@ args@ artifactId , # Example: "4.3.6" version +, # Example: "jdk11" + classifier ? null , # List of maven repositories from where to fetch the artifact. # Example: [ http://oss.sonatype.org/content/repositories/public ]. repos ? defaultRepos @@ -48,7 +50,7 @@ let (replaceChars ["."] ["/"] groupId) artifactId version - "${artifactId}-${version}.jar" + "${artifactId}-${version}-${optionalString (!isNull classifier) "-${classifier}"}.jar" ]; urls_ = if url != "" then [url] @@ -56,7 +58,7 @@ let else map mkJarUrl repos; jar = fetchurl ( - builtins.removeAttrs args ["groupId" "artifactId" "version" "repos" "url" ] + builtins.removeAttrs args ["groupId" "artifactId" "version" "classifier" "repos" "url" ] // { urls = urls_; name = "${name_}.jar"; } ); in diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index 5a87893d9726..d0ea088bf71e 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -3,6 +3,7 @@ , makeSetupHook , makeWrapper , gobject-introspection +, isGraphical ? true , gtk3 , librsvg , dconf @@ -21,7 +22,7 @@ makeSetupHook { # Unfortunately, it also requires the user to have dconf # D-Bus service enabled globally (e.g. through a NixOS module). dconf.lib - ] ++ [ + ] ++ lib.optionals isGraphical [ # TODO: remove this, packages should depend on GTK explicitly. gtk3 @@ -30,6 +31,7 @@ makeSetupHook { # graphics in GTK (e.g. cross for closing window in window title bar) # so it is pretty much required for applications using GTK. librsvg + ] ++ [ # We use the wrapProgram function. makeWrapper diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index d12eec8d8e32..ced7483ae4ed 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200804"; + version = "20201015"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1gx8yky41kz2f03r7gvxgq8naysnrf8apsss61xqaxmmyd080z0v"; + sha256 = "1i20lribrb03vsn57q722mbmjhxqswq2y2dpii95ic5zxvnaj1qa"; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index a397ffe86d2c..d7ce6c370c38 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.38.1"; + version = "3.38.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q1vri9vsrdwhhl26dk1f79a3dhwfn9dhbaiczli826nzq9kb40p"; + sha256 = "1m7iww1zk845szs9s3zc8a1s1wpd6kizndhq7gqy3575c0xgr2w9"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 4b4901cab66f..2d07f90a16c8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "150c0jgjhbb59wf7lzcnp1f22lvrigw95mg5ad3jh15qzwqqd8wx"; + sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p"; }; passthru = { diff --git a/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch b/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch new file mode 100644 index 000000000000..17a4e0a2447b --- /dev/null +++ b/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch @@ -0,0 +1,261 @@ +From 6001db79c477b03eacc7e7049560921fb54b7845 Mon Sep 17 00:00:00 2001 +From: Richard Sandiford <richard.sandiford@arm.com> +Date: Mon, 7 Sep 2020 20:15:36 +0100 +Subject: [PATCH] lra: Avoid cycling on certain subreg reloads [PR96796] + +This PR is about LRA cycling for a reload of the form: + +---------------------------------------------------------------------------- +Changing pseudo 196 in operand 1 of insn 103 on equiv [r105:DI*0x8+r140:DI] + Creating newreg=287, assigning class ALL_REGS to slow/invalid mem r287 + Creating newreg=288, assigning class ALL_REGS to slow/invalid mem r288 + 103: r203:SI=r288:SI<<0x1+r196:DI#0 + REG_DEAD r196:DI + Inserting slow/invalid mem reload before: + 316: r287:DI=[r105:DI*0x8+r140:DI] + 317: r288:SI=r287:DI#0 +---------------------------------------------------------------------------- + +The problem is with r287. We rightly give it a broad starting class of +POINTER_AND_FP_REGS (reduced from ALL_REGS by preferred_reload_class). +However, we never make forward progress towards narrowing it down to +a specific choice of class (POINTER_REGS or FP_REGS). + +I think in practice we rely on two things to narrow a reload pseudo's +class down to a specific choice: + +(1) a restricted class is specified when the pseudo is created + + This happens for input address reloads, where the class is taken + from the target's chosen base register class. It also happens + for simple REG reloads, where the class is taken from the chosen + alternative's constraints. + +(2) uses of the reload pseudo as a direct input operand + + In this case get_reload_reg tries to reuse the existing register + and narrow its class, instead of creating a new reload pseudo. + +However, neither occurs here. As described above, r287 rightly +starts out with a wide choice of class, ultimately derived from +ALL_REGS, so we don't get (1). And as the comments in the PR +explain, r287 is never used as an input reload, only the subreg is, +so we don't get (2): + +---------------------------------------------------------------------------- + Choosing alt 13 in insn 317: (0) r (1) w {*movsi_aarch64} + Creating newreg=291, assigning class FP_REGS to r291 + 317: r288:SI=r291:SI + Inserting insn reload before: + 320: r291:SI=r287:DI#0 +---------------------------------------------------------------------------- + +IMO, in this case we should rely on the reload of r316 to narrow +down the class of r278. Currently we do: + +---------------------------------------------------------------------------- + Choosing alt 7 in insn 316: (0) r (1) m {*movdi_aarch64} + Creating newreg=289 from oldreg=287, assigning class GENERAL_REGS to r289 + 316: r289:DI=[r105:DI*0x8+r140:DI] + Inserting insn reload after: + 318: r287:DI=r289:DI +--------------------------------------------------- + +i.e. we create a new pseudo register r289 and give *that* pseudo +GENERAL_REGS instead. This is because get_reload_reg only narrows +down the existing class for OP_IN and OP_INOUT, not OP_OUT. + +But if we have a reload pseudo in a reload instruction and have chosen +a specific class for the reload pseudo, I think we should simply install +it for OP_OUT reloads too, if the class is a subset of the existing class. +We will need to pick such a register whatever happens (for r289 in the +example above). And as explained in the PR, doing this actually avoids +an unnecessary move via the FP registers too. + +The patch is quite aggressive in that it does this for all reload +pseudos in all reload instructions. I wondered about reusing the +condition for a reload move in in_class_p: + + INSN_UID (curr_insn) >= new_insn_uid_start + && curr_insn_set != NULL + && ((OBJECT_P (SET_SRC (curr_insn_set)) + && ! CONSTANT_P (SET_SRC (curr_insn_set))) + || (GET_CODE (SET_SRC (curr_insn_set)) == SUBREG + && OBJECT_P (SUBREG_REG (SET_SRC (curr_insn_set))) + && ! CONSTANT_P (SUBREG_REG (SET_SRC (curr_insn_set))))))) + +but I can't really justify that on first principles. I think we +should apply the rule consistently until we have a specific reason +for doing otherwise. + +gcc/ + PR rtl-optimization/96796 + * lra-constraints.c (in_class_p): Add a default-false + allow_all_reload_class_changes_p parameter. Do not treat + reload moves specially when the parameter is true. + (get_reload_reg): Try to narrow the class of an existing OP_OUT + reload if we're reloading a reload pseudo in a reload instruction. + +gcc/testsuite/ + PR rtl-optimization/96796 + * gcc.c-torture/compile/pr96796.c: New test. +--- + gcc/lra-constraints.c | 54 ++++++++++++++---- + gcc/testsuite/gcc.c-torture/compile/pr96796.c | 55 +++++++++++++++++++ + 2 files changed, 99 insertions(+), 10 deletions(-) + create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr96796.c + +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c +index 580da9c3ed6..161b721efb1 100644 +--- a/gcc/lra-constraints.c ++++ b/gcc/lra-constraints.c +@@ -236,12 +236,17 @@ get_reg_class (int regno) + CL. Use elimination first if REG is a hard register. If REG is a + reload pseudo created by this constraints pass, assume that it will + be allocated a hard register from its allocno class, but allow that +- class to be narrowed to CL if it is currently a superset of CL. ++ class to be narrowed to CL if it is currently a superset of CL and ++ if either: ++ ++ - ALLOW_ALL_RELOAD_CLASS_CHANGES_P is true or ++ - the instruction we're processing is not a reload move. + + If NEW_CLASS is nonnull, set *NEW_CLASS to the new allocno class of + REGNO (reg), or NO_REGS if no change in its class was needed. */ + static bool +-in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) ++in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class, ++ bool allow_all_reload_class_changes_p = false) + { + enum reg_class rclass, common_class; + machine_mode reg_mode; +@@ -266,7 +271,8 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) + typically moves that have many alternatives, and restricting + reload pseudos for one alternative may lead to situations + where other reload pseudos are no longer allocatable. */ +- || (INSN_UID (curr_insn) >= new_insn_uid_start ++ || (!allow_all_reload_class_changes_p ++ && INSN_UID (curr_insn) >= new_insn_uid_start + && curr_insn_set != NULL + && ((OBJECT_P (SET_SRC (curr_insn_set)) + && ! CONSTANT_P (SET_SRC (curr_insn_set))) +@@ -598,13 +604,12 @@ canonicalize_reload_addr (rtx addr) + return addr; + } + +-/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse already +- created input reload pseudo (only if TYPE is not OP_OUT). Don't +- reuse pseudo if IN_SUBREG_P is true and the reused pseudo should be +- wrapped up in SUBREG. The result pseudo is returned through +- RESULT_REG. Return TRUE if we created a new pseudo, FALSE if we +- reused the already created input reload pseudo. Use TITLE to +- describe new registers for debug purposes. */ ++/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse an existing ++ reload pseudo. Don't reuse an existing reload pseudo if IN_SUBREG_P ++ is true and the reused pseudo should be wrapped up in a SUBREG. ++ The result pseudo is returned through RESULT_REG. Return TRUE if we ++ created a new pseudo, FALSE if we reused an existing reload pseudo. ++ Use TITLE to describe new registers for debug purposes. */ + static bool + get_reload_reg (enum op_type type, machine_mode mode, rtx original, + enum reg_class rclass, bool in_subreg_p, +@@ -616,6 +621,35 @@ get_reload_reg (enum op_type type, machine_mode mode, rtx original, + + if (type == OP_OUT) + { ++ /* Output reload registers tend to start out with a conservative ++ choice of register class. Usually this is ALL_REGS, although ++ a target might narrow it (for performance reasons) through ++ targetm.preferred_reload_class. It's therefore quite common ++ for a reload instruction to require a more restrictive class ++ than the class that was originally assigned to the reload register. ++ ++ In these situations, it's more efficient to refine the choice ++ of register class rather than create a second reload register. ++ This also helps to avoid cycling for registers that are only ++ used by reload instructions. */ ++ if (REG_P (original) ++ && (int) REGNO (original) >= new_regno_start ++ && INSN_UID (curr_insn) >= new_insn_uid_start ++ && in_class_p (original, rclass, &new_class, true)) ++ { ++ unsigned int regno = REGNO (original); ++ if (lra_dump_file != NULL) ++ { ++ fprintf (lra_dump_file, " Reuse r%d for output ", regno); ++ dump_value_slim (lra_dump_file, original, 1); ++ } ++ if (new_class != lra_get_allocno_class (regno)) ++ lra_change_class (regno, new_class, ", change to", false); ++ if (lra_dump_file != NULL) ++ fprintf (lra_dump_file, "\n"); ++ *result_reg = original; ++ return false; ++ } + *result_reg + = lra_create_new_reg_with_unique_value (mode, original, rclass, title); + return true; +diff --git a/gcc/testsuite/gcc.c-torture/compile/pr96796.c b/gcc/testsuite/gcc.c-torture/compile/pr96796.c +new file mode 100644 +index 00000000000..8808e62fe77 +--- /dev/null ++++ b/gcc/testsuite/gcc.c-torture/compile/pr96796.c +@@ -0,0 +1,55 @@ ++/* { dg-additional-options "-fcommon" } */ ++ ++struct S0 { ++ signed f0 : 8; ++ unsigned f1; ++ unsigned f4; ++}; ++struct S1 { ++ long f3; ++ char f4; ++} g_3_4; ++ ++int g_5, func_1_l_32, func_50___trans_tmp_31; ++static struct S0 g_144, g_834, g_1255, g_1261; ++ ++int g_273[120] = {}; ++int *g_555; ++char **g_979; ++static int g_1092_0; ++static int g_1193; ++int safe_mul_func_int16_t_s_s(int si1, int si2) { return si1 * si2; } ++static struct S0 *func_50(); ++int func_1() { func_50(g_3_4, g_5, func_1_l_32, 8, 3); } ++void safe_div_func_int64_t_s_s(int *); ++void safe_mod_func_uint32_t_u_u(struct S0); ++struct S0 *func_50(int p_51, struct S0 p_52, struct S1 p_53, int p_54, ++ int p_55) { ++ int __trans_tmp_30; ++ char __trans_tmp_22; ++ short __trans_tmp_19; ++ long l_985_1; ++ long l_1191[8]; ++ safe_div_func_int64_t_s_s(g_273); ++ __builtin_printf((char*)g_1261.f4); ++ safe_mod_func_uint32_t_u_u(g_834); ++ g_144.f0 += 1; ++ for (;;) { ++ struct S1 l_1350 = {&l_1350}; ++ for (; p_53.f3; p_53.f3 -= 1) ++ for (; g_1193 <= 2; g_1193 += 1) { ++ __trans_tmp_19 = safe_mul_func_int16_t_s_s(l_1191[l_985_1 + p_53.f3], ++ p_55 % (**g_979 = 10)); ++ __trans_tmp_22 = g_1255.f1 * p_53.f4; ++ __trans_tmp_30 = __trans_tmp_19 + __trans_tmp_22; ++ if (__trans_tmp_30) ++ g_1261.f0 = p_51; ++ else { ++ g_1255.f0 = p_53.f3; ++ int *l_1422 = g_834.f0 = g_144.f4 != (*l_1422)++ > 0 < 0 ^ 51; ++ g_555 = ~0; ++ g_1092_0 |= func_50___trans_tmp_31; ++ } ++ } ++ } ++} +-- +2.18.4 + diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 305ed56df78c..c64a9dcc3f57 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -58,7 +58,13 @@ let majorVersion = "9"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + # Fix ICE: Max. number of generated reload insns per insn is achieved (90) + # + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96796 + # + # This patch can most likely be removed by a post 9.3.0-release. + [ ./avoid-cycling-subreg-reloads.patch ] + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 41af279e83ff..9234e3b14571 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl, perl, gcc -, ncurses5, gmp, glibc, libiconv +, ncurses5, ncurses6, gmp, glibc, libiconv , llvmPackages }: @@ -10,8 +10,12 @@ assert stdenv.targetPlatform == stdenv.hostPlatform; let useLLVM = !stdenv.targetPlatform.isx86; + useNcurses6 = stdenv.hostPlatform.system == "x86_64-linux"; + + ourNcurses = if useNcurses6 then ncurses6 else ncurses5; + libPath = stdenv.lib.makeLibraryPath ([ - ncurses5 gmp + ourNcurses gmp ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" @@ -34,12 +38,16 @@ stdenv.mkDerivation rec { # https://downloads.haskell.org/~ghc/8.6.5/ src = fetchurl ({ i686-linux = { + # Don't use the Fedora27 build (as below) because there isn't one! url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w"; }; x86_64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb9-linux.tar.xz"; - sha256 = "1pqlx6rdjs2110g0y1i9f8x18lmdizibjqd15f5xahcz39hgaxdw"; + # This is the Fedora build because it links against ncurses6 where the + # deb9 one links against ncurses5, see here + # https://github.com/NixOS/nixpkgs/issues/85924 for a discussion + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; + sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g"; }; aarch64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; @@ -88,9 +96,12 @@ stdenv.mkDerivation rec { '' + # Rename needed libraries and binaries, fix interpreter stdenv.lib.optionalString stdenv.isLinux '' - find . -type f -perm -0100 -exec patchelf \ + find . -type f -perm -0100 \ + -exec patchelf \ --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ - --replace-needed libtinfo.so libtinfo.so.5 \ + ${ # This isn't required for x86_64-linux where we use ncurses6 + stdenv.lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" + } \ --interpreter ${glibcDynLinker} {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index d075eb4e3f1c..dd9cac84ddd8 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1wimpcg4nyxykbkh407d7h0b828vmrf7sv412mgmif57p3aw433f"; + sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index c15b99adef6d..a4f08b8b14cb 100644 --- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -11,7 +11,7 @@ pipInstallPhase() { export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" pushd dist || return 1 - @pythonInterpreter@ -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags --build tmpbuild + @pythonInterpreter@ -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags popd || return 1 runHook postInstall diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch index a6b10ddb7edf..69dde41c7e2f 100644 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,7 +1,7 @@ -diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in ---- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300 -+++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300 -@@ -6,5 +6,6 @@ +diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in +--- SDL2-2.0.12/sdl2-config.cmake.in 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12-new/sdl2-config.cmake.in 2020-11-11 11:59:05.178703826 +0100 +@@ -6,7 +6,8 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") set(SDL2_LIBDIR "@libdir@") @@ -9,9 +9,29 @@ diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in +set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) +separate_arguments(SDL2_INCLUDE_DIRS) set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") -diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in ---- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300 -+++ SDL2-2.0.4-new/sdl2-config.in 2016-08-22 05:32:02.256397839 +0300 + string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) + +@@ -20,14 +21,14 @@ + + add_library(SDL2::SDL2 SHARED IMPORTED) + set_target_properties(SDL2::SDL2 PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" ++ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "@libdir@/libSDL2.so" + INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") + + add_library(SDL2::SDL2-static STATIC IMPORTED) + set_target_properties(SDL2::SDL2-static PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" ++ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "@libdir@/libSDL2.a" + INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") +Només a SDL2-2.0.12-new/: sdl2-config.cmake.in.orig +diff -ru3 SDL2-2.0.12/sdl2-config.in SDL2-2.0.12-new/sdl2-config.in +--- SDL2-2.0.12/sdl2-config.in 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12-new/sdl2-config.in 2020-11-11 11:56:26.432955479 +0100 @@ -42,7 +42,11 @@ echo @SDL_VERSION@ ;; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index b028813558f5..6470566d5c71 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "aws-c-common"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # can be removed once https://github.com/awslabs/aws-c-common/pull/735 gets merged, and version bumped + patches = [ + (fetchpatch { + name = "fix-re-export-of-target.patch"; + url = "https://github.com/awslabs/aws-c-common/pull/735/commits/3fca5c629ce0c4d66f50f7152685f3fe73941cb4.patch"; + sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a"; + }) + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-nullability-extension -Wno-typedef-redefinition"; diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index d4ba15e52db4..ea3633d2e4d9 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "aws-checksums"; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # can be removed once https://github.com/awslabs/aws-checksums/pull/40 gets merged, and version bumped + patches = [ + (fetchpatch { + url = "https://github.com/awslabs/aws-checksums/pull/40/commits/fb5a57b3c072bd88e45de76fbb76bdc89c67b193.patch"; + sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a"; + }) + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ]; meta = with lib; { diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 0889fdd0d8f4..a56184e9a179 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -9,14 +9,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "1yawrbaazj6a2rvvb58k6kh492fjxdwlm94bl6ipry0fqmz0rlnl"; + sha256 = "0mjn87xjdqv0q1gj4s4f6fdmsj504mhk4qmqiyrhq2rs7yqj4csv"; }; nativeBuildInputs = [ meson ninja nasm pkgconfig ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index df7043cd44ed..a2f5e366e008 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -164,9 +164,8 @@ * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: - * frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh - * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab - * wavpack x265 xavs + * gsm libjack2 libmodplug libmfx(intel-media-sdk) nvenc pulseaudio samba + * vid-stab * * Need fixes to support AArch64: * libmfx(intel-media-sdk) nvenc diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 0022cbde7c55..f10af240720d 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,4 +1,5 @@ { stdenv +, buildPackages , fetchurl , meson , ninja @@ -26,6 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + doCheck = true; checkInputs = [ python3 ]; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 3f0279950338..96b67c7ccca8 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, python3 +{ stdenv, fetchFromGitHub, cmake, pkg-config, python3 , zlib, libssh2, openssl, pcre, http-parser , libiconv, Security }: stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.0.0"; + version = "1.1.0"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; + sha256 = "1vj7q7b8j3smiyi1acbc5x86lqk00igdm2adjnqs9n011i13rykl"; }; cmakeFlags = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DUSE_HTTP_PARSER=system" ]; - nativeBuildInputs = [ cmake python3 pkgconfig ]; + nativeBuildInputs = [ cmake python3 pkg-config ]; buildInputs = [ zlib libssh2 openssl pcre http-parser ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 104823b27956..7528925088e5 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ ]; broken = true; # Broken on Hydra since 2020-05-19 }; } diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 2cae9546b74c..aee846ccfcd0 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -30,6 +30,8 @@ , gnome3 , gsettings-desktop-schemas , sassc +, trackerSupport ? stdenv.isLinux +, tracker , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux , mesa @@ -91,6 +93,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${boolToString withGtkDoc}" "-Dtests=false" + "-Dtracker3=${boolToString trackerSupport}" ]; # These are the defines that'd you'd get with --enable-debug=minimum (default). @@ -137,6 +140,7 @@ stdenv.mkDerivation rec { isocodes ] ++ optional stdenv.isDarwin AppKit + ++ optional trackerSupport tracker ; propagatedBuildInputs = with xorg; [ diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index df8212cd5a65..c42a35282233 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "1n3xn1zvxgyzb84cjpw3i5alw0gkbrps11r4ijxzyqxqym0khagr"; + sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 95bb24ecb583..93c98bb1f121 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext +, libusb1 +, libtool +, libexif +, libjpeg +}: stdenv.mkDerivation rec { - name = "libgphoto2-${meta.version}"; + pname = "libgphoto2"; + version = "2.5.23"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; - rev = meta.tag; + rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2"; }; patches = []; - nativeBuildInputs = [ pkgconfig gettext autoreconfHook ]; - buildInputs = [ libtool libjpeg libusb1 ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + gettext + libtool + ]; + + buildInputs = [ + libjpeg + libusb1 + ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. propagatedBuildInputs = [ libexif ]; @@ -33,8 +48,6 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.23"; - tag = "libgphoto2-2_5_23-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index e49fad551daf..a3178e548048 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "0p3vjf4zj137miix1gbi8rv6g4wvi8kmyhwwxyirw00ankxbxp1n"; + sha256 = "1k8mxkzvd6y9aawxghddrjkldzskhb6607qhbwjfl9f945ns87qa"; }; patches = [ diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 2bfc9ec96cac..2bca09be45f4 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "12alfvq761nhdl927aj93yv3r6rzxlf7csdr28xgga7cz53fmrrp"; + sha256 = "1543h1i59k2hbj2g8shcl8fvhz2silipacynwjgw412r38hkr33j"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 2a25a565a8fc..6aa4e049e4c3 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; rev = version; - sha256 = "0p32yivybxdicm01qa9h1vj91apygzxpvnklrjmbx8z9z2l3qxc9"; + sha256 = "0njdxfmyk8smj8bbd6fs3lxjaq3lybivwgg16gpnbiyl984dpi9b"; }; patches = diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index dc5410d65fd8..e9cfd0f9856a 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,18 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }: +{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkgconfig +, libusb1 +, libiconv +}: stdenv.mkDerivation rec { - name = "libmtp-1.1.18"; + pname = "libmtp"; + version = "1.1.18"; - src = fetchurl { - url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "1w41l93yi0dmw218daiw36rylkc8rammxx37csh1ij24q18gx03j"; + src = fetchFromGitHub { + owner = "libmtp"; + repo = "libmtp"; + rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}"; + sha256 = "0rya6dsb67a7ny2i1jzdicnday42qb8njqw6r902k712k5p7d1r9"; }; outputs = [ "bin" "dev" "out" ]; - buildInputs = [ libiconv ]; - propagatedBuildInputs = [ libusb1 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + autoconf + automake + gettext + libtool + pkgconfig + ]; + + buildInputs = [ + libiconv + ]; + + propagatedBuildInputs = [ + libusb1 + ]; + + preConfigure = '' + ./autogen.sh + ''; # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix new file mode 100644 index 000000000000..ee61ef8a7232 --- /dev/null +++ b/pkgs/development/libraries/libnest2d/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: + +stdenv.mkDerivation rec { + version = "2020-10-09-unstable"; + pname = "libnest2d"; + + # This revision is waiting to be merged upstream + # Once it has been merged, this should be switched to it + # Upstream PR: https://github.com/tamasmeszaros/libnest2d/pull/18 + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "libnest2d"; + rev = "31391fd173249ad9b906390058e13b09238fadc8"; + sha256 = "1hzqi4z55x76rss3xk7hfqhy9hcaq2jaav5jqxa1aqmbvarr2gla"; + }; + + propagatedBuildInputs = [ clipper nlopt boost ]; + nativeBuildInputs = [ cmake ]; + + CLIPPER_PATH = "${clipper.out}"; + cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ]; + + meta = with stdenv.lib; { + description = + "2D irregular bin packaging and nesting library written in modern C++"; + homepage = "https://github.com/Ultimaker/libnest2d"; + license = licenses.lgpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 84f89dec29b6..ab1df8d2bc12 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz"; + sha256 = "0m8dlg1v7kflcxvajs4p76p275qwsm2abbf5mfapkakp7hw7wc7f"; }; outputs = [ "out" "lib" "dev" "man" "pythonsrc" ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 5e290b25832d..594928876888 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -28,14 +28,26 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch (fetchpatch { + name = "CVE-2019-20388.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch"; + sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl"; + }) + (fetchpatch { name = "CVE-2020-7595.patch"; url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch"; sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l"; }) (fetchpatch { - name = "CVE-2019-20388.patch"; - url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch"; - sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl"; + name = "CVE-2020-24977.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch"; + sha256 = "093f1ic5qfiq8nk9mc6b8p1qcs8m9hir3ardr6r5il4zi2dnjrj4"; + }) + # Fix compatibility with Python 3.9. + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/149 + (fetchpatch { + name = "python39.patch"; + url = "https://gitlab.gnome.org/nwellnhof/libxml2/-/commit/e4fb36841800038c289997432ca547c9bfef9db1.patch"; + sha256 = "0h3vpy9fg3339b14qa64640ypp65z3hrrrmpjl8qm72srkp24ci5"; }) ]; diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/development/libraries/marl/default.nix new file mode 100644 index 000000000000..2bf23962d53e --- /dev/null +++ b/pkgs/development/libraries/marl/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "marl"; + version = "1.0.0"; # Based on marl's CHANGES.md + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + sha256 = "0pnbarbyv82h05ckays2m3vgxzdhpcpg59bnzsddlb5v7rqhw51w"; + rev = "40209e952f5c1f3bc883d2b7f53b274bd454ca53"; + }; + + nativeBuildInputs = [ cmake ]; + + # Turn on the flag to install after building the library. + cmakeFlags = ["-DMARL_INSTALL=ON"]; + + meta = with stdenv.lib; { + homepage = "https://github.com/google/marl"; + description = "A hybrid thread / fiber task scheduler written in C++ 11"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8e8a625b50f8..891e11dbadf9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.2.2"; + version = "20.2.3"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0qdqi767vshclnfg9drlsmp2pa17hi7y0172s064jwfgj08fp4qz"; + sha256 = "0axqrqg1fas91fx30qjwhcp4yasdvk919hjds4lga7ak247286xf"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 627f003a7516..db7940536f1b 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1h9yc3krhjlyapsjaf6y76546rkqk7ygcjfgm0a9bc0cfvmlb5az"; + sha256 = "1wpq1vyjqra877vwc3n4i0c1dyhmabyn993cslf1k142ikyc0a8w"; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 2079ace021b6..b4ac119ce6cf 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "2.5.3"; +let version = "2.5.4"; in stdenv.mkDerivation { pname = "magma"; inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; - sha256 = "1xjy3irdx0w1zyhvn4x47zni5fwsh6z97xd4yqldz8zrm5lx40n6"; + sha256 = "0rrvd21hczxlm8awc9z54fj7iqpjmsb518fy32s6ghz0g90znd3p"; name = "magma-${version}.tar.gz"; }; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index e1b4d375282e..2e1fd527e9a7 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -7,9 +7,8 @@ , gfortran , suitesparse , lapackSupport ? true -, kluSupport ? true }: - -assert (!blas.isILP64) && (!lapack.isILP64); +, kluSupport ? true +}: stdenv.mkDerivation rec { pname = "sundials"; @@ -17,11 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ python - ] ++ stdenv.lib.optionals (lapackSupport) [ - gfortran - blas - lapack ] + ++ stdenv.lib.optionals (lapackSupport) + # Check that the same index size is used for both libraries + (assert (blas.isILP64 == lapack.isILP64); [ + gfortran + blas + lapack + ]) # KLU support is based on Suitesparse. # It is tested upstream according to the section 1.1.4 of # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) @@ -47,17 +49,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" ] ++ stdenv.lib.optionals (lapackSupport) [ - "-DSUNDIALS_INDEX_TYPE=int32_t" "-DLAPACK_ENABLE=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ stdenv.lib.optionals (kluSupport) [ "-DKLU_ENABLE=ON" "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" "-DKLU_LIBRARY_DIR=${suitesparse}/lib" - ]; + ] ++ stdenv.lib.optionals (lapackSupport && !lapack.isILP64) [ + # Use the correct index type according to lapack which is supposed to be + # the same index type compatible with blas, thanks to the assertion of + # buildInputs + "-DSUNDIALS_INDEX_TYPE=int32_t" + ] + ; doCheck = true; - checkPhase = "make test"; + checkTarget = "test"; meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 40ab73405ae4..ee50d6547957 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -12,7 +12,7 @@ , docbook_xml_dtd_45 , libxml2 , glib -, wrapGAppsHook +, wrapGAppsNoGuiHook , vala , sqlite , libxslt @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { asciidoc gettext libxslt - wrapGAppsHook + wrapGAppsNoGuiHook gobject-introspection gtk-doc docbook-xsl-nons diff --git a/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch b/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch new file mode 100644 index 000000000000..f6745e6f9433 --- /dev/null +++ b/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch @@ -0,0 +1,25 @@ +From 378623b0e39b12bb04d3a3a1e08e64b31bd7d99d Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Fri, 27 Nov 2020 10:22:20 +0100 +Subject: [PATCH] add placeholder for @nm@ + +--- + egl/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/egl/meson.build b/egl/meson.build +index dee9b1d..e477546 100644 +--- a/egl/meson.build ++++ b/egl/meson.build +@@ -11,7 +11,7 @@ wayland_egl = library( + + executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c') + +-nm_path = find_program('nm').path() ++nm_path = find_program('@nm@').path() + + test( + 'wayland-egl symbols check', +-- +2.29.2 + diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index cd84495d870a..2b18bc31a452 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,17 +1,32 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, pkgconfig, ninja -, libffi, libxml2, wayland +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, pkgconfig +, substituteAll +, ninja +, libffi +, libxml2 +, wayland , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) , withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform -, graphviz-nox, doxygen, libxslt, xmlto, python3 -, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42 +, graphviz-nox +, doxygen +, libxslt +, xmlto +, python3 +, docbook_xsl +, docbook_xml_dtd_45 +, docbook_xml_dtd_42 }: # Require the optional to be enabled until upstream fixes or removes the configure flag assert expat != null; - let isCross = stdenv.buildPlatform != stdenv.hostPlatform; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "wayland"; version = "1.18.0"; @@ -26,6 +41,10 @@ in stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/e53e0edf0f892670f3e8c5dd527b3bb22335d32d.patch"; sha256 = "15sbhi86m9k72lsj56p7zr20ph2b0y4svl639snsbafn2ir1zdb2"; }) + (substituteAll { + src = ./0001-add-placeholder-for-nm.patch; + nm = "${stdenv.cc.targetPrefix}nm"; + }) ]; outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; @@ -35,9 +54,6 @@ in stdenv.mkDerivation rec { postPatch = lib.optionalString withDocumentation '' patchShebangs doc/doxygen/gen-doxygen.py - substituteInPlace egl/meson.build --replace \ - "find_program('nm').path()" \ - "find_program('${stdenv.cc.targetPrefix}nm').path()" ''; depsBuildBuild = [ @@ -45,17 +61,28 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson pkgconfig ninja + meson + pkgconfig + ninja ] ++ lib.optionals isCross [ wayland # For wayland-scanner during the build ] ++ lib.optionals withDocumentation [ (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion - doxygen libxslt xmlto python3 docbook_xml_dtd_45 + doxygen + libxslt + xmlto + python3 + docbook_xml_dtd_45 ]; - buildInputs = [ libffi expat libxml2 + buildInputs = [ + libffi + expat + libxml2 ] ++ lib.optionals withDocumentation [ - docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 + docbook_xsl + docbook_xml_dtd_45 + docbook_xml_dtd_42 ]; meta = { @@ -68,9 +95,9 @@ in stdenv.mkDerivation rec { and other interactions that must go through the compositor (but not rendering). ''; - homepage = "https://wayland.freedesktop.org/"; - license = lib.licenses.mit; # Expat version - platforms = lib.platforms.linux; + homepage = "https://wayland.freedesktop.org/"; + license = lib.licenses.mit; # Expat version + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ primeos codyopel ]; }; diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix index 80b5858031d2..7489569d5071 100644 --- a/pkgs/development/mobile/androidenv/tools/25.nix +++ b/pkgs/development/mobile/androidenv/tools/25.nix @@ -3,7 +3,7 @@ deployAndroidPackage { name = "androidsdk"; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libxcb pkgs.xlibs.libXfixes pkgs.xlibs.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; inherit package os; patchInstructions = '' @@ -41,7 +41,7 @@ deployAndroidPackage { do wrapProgram $PWD/$i \ --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} done ${lib.optionalString (os == "linux") '' diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index f535ee78fef9..de5fbf63b383 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchFromGitHub, buildDunePackage, markup }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, markup, ounit2 }: buildDunePackage rec { pname = "lambdasoup"; - version = "0.7.1"; + version = "0.7.2"; + + minimumOCamlVersion = "4.02"; + + useDune2 = true; src = fetchFromGitHub { owner = "aantron"; repo = pname; rev = version; - sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks"; + sha256 = "0php51lyz3ll0psazjd59yw02xb9w84150gkyiwmn3fa0iq8nf7m"; }; propagatedBuildInputs = [ markup ]; + doCheck = lib.versionAtLeast ocaml.version "4.04"; + checkInputs = [ ounit2 ]; + meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; homepage = "https://aantron.github.io/lambdasoup/"; diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index 8b3525d26345..a8246e1cc7e8 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -1,23 +1,26 @@ -{ lib, buildDunePackage, fetchzip, uutf }: +{ lib, buildDunePackage, fetchzip, ocaml, uchar, uutf, ounit2 }: buildDunePackage rec { pname = "markup"; - version = "0.8.2"; + version = "1.0.0"; + + useDune2 = true; src = fetchzip { url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz"; - sha256 = "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn"; - }; + sha256 = "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9"; + }; + + propagatedBuildInputs = [ uchar uutf ]; - propagatedBuildInputs = [ uutf ]; + checkInputs = [ ounit2 ]; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = with lib; { homepage = "https://github.com/aantron/markup.ml/"; description = "A pair of best-effort parsers implementing the HTML5 and XML specifications"; license = licenses.mit; - maintainers = with maintainers; [ - gal_bolle - ]; + maintainers = with maintainers; [ gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix new file mode 100644 index 000000000000..aed5e92765f8 --- /dev/null +++ b/pkgs/development/ocaml-modules/odate/default.nix @@ -0,0 +1,29 @@ +{ lib, buildDunePackage, fetchFromGitHub +, menhir +}: + +buildDunePackage rec { + pname = "odate"; + version = "0.6"; + + useDune2 = true; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "hhugo"; + repo = pname; + rev = version; + sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; + }; + + buildInputs = [ menhir ]; + + meta = { + description = "Date and duration in OCaml"; + inherit (src.meta) homepage; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/php-packages/composer/2.0.nix b/pkgs/development/php-packages/composer/2.0.nix index c3bd63de7faa..4ff982bf8d2d 100644 --- a/pkgs/development/php-packages/composer/2.0.nix +++ b/pkgs/development/php-packages/composer/2.0.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "composer"; - version = "2.0.7"; + version = "2.0.8"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1sgbawai2jwriyfdlc7xp0qz535hd61xcbsnqiaxwp0xmy60w1ha"; + sha256 = "0f0msrqrszhwj7ki9y5wrlwglwanmdcc132l7kz0wvj45gaz0890"; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 56bc4209c6e8..3145f88b7016 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -2,8 +2,8 @@ buildPecl { pname = "event"; - version = "3.0.0"; - sha256 = "1k35qwcf4qz8617b4riy7bp0vna1j3ds0k9j52hlm7qrhww2yxqn"; + version = "3.0.1"; + sha256 = "12629hi2ddyavzgl5ala53fi8m55l0xsmqsywy040f0grzp9r6rc"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 272ed24f51af..473b035d23aa 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "psalm"; - version = "4.2.1"; + version = "4.3.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "0g6s3bn8aaggpqjgr0bqchgkgb4my5ksfycyyqy7nrly2bgn1kbz"; + sha256 = "1hv9r5m1mdywm7qi9rs9054jp77cpip3jyw048iq3l7s0vpslkc5"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 53b0fe5e1ccd..b4052250aabd 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.0.0"; - sha256 = "0qnaqgn2rdjxc70lyrm3nmy7cfma69c7zn6if23hhkhx5kl0fl44"; + version = "3.0.1"; + sha256 = "1da983crnk7ci3hfvqrb4gn9w364zzyi147wl4yly9d2adqk358b"; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 68afbb525c95..11ac2b7599b2 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -2,19 +2,25 @@ , buildPythonPackage , fetchPypi , isPy27 +, pythonOlder +, typing-extensions , pytest }: buildPythonPackage rec { pname = "JPype1"; - version = "1.0.2"; + version = "1.1.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c751436350c105f403e382574d34a6ad73e4a677cb0ff5bc9a87581cc07094e1"; + sha256 = "c6e36de9f7ef826ff27f6d5260acc710ebc585a534c12cbac905db088ab1d992"; }; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 06a85a22033d..eeab02fcb75e 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.1.1"; + version = "8.1.2"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "cee35b011667a965eca01b7d36b54649c9434ab004d8556d6563b7d899df61ed"; + sha256 = "26f4fb1a2b0105cf0f71187c6c1eb54283767a883d1c8f4ca8c8039033217d27"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index e0c5539299dd..02f39b3014d4 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.6.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44"; + sha256 = "381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0"; }; propagatedBuildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index e7a2f120c1b3..e70d830b7be0 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.9.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "75e737d6ce7723d9ff9b7aa1ba3233c34be62ef18d5859e706b8fdc828989830"; + sha256 = "673cccb88d810e5627d0c1c818158485d106f65a583880e2f730c997399bcfa7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 7db56622759f..fd77a5587885 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af"; + sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 84195d5545e0..4bc41cf32f38 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.2.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79"; + sha256 = "9c22a0e48e3b277fc145c67dd8c3b8f609dab36bce9eb337f70dfe716663c9a0"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 90a7b41f7c10..514d1d308e12 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -21,26 +21,36 @@ , brotlipy , freezegun , isPy38 +, re-assert }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.6.3"; + version = "3.7.3"; # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "698cd7bc3c7d1b82bb728bae835724a486a8c376647aec336aa21a60113c3645"; + sha256 = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4"; }; checkInputs = [ pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist pytest-mock pytestcov trustme brotlipy freezegun + re-assert ]; - propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] - ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; + propagatedBuildInputs = [ + attrs + chardet + multidict + async-timeout + typing-extensions + yarl + ] ++ lib.optionals (pythonOlder "3.7") [ + idna-ssl + ]; disabledTests = [ # disable tests which attempt to do loopback connections @@ -54,6 +64,7 @@ buildPythonPackage rec { "proxy_https_bad_response" "partially_applied_handler" "middleware" + "test_mark_formdata_as_processed" # no longer compatible with pytest>=6 "aiohttp_plugin_async_fixture" ] ++ lib.optionals stdenv.is32bit [ diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index acaeb0ba783e..4de8eaba3d8f 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiomysql"; - version = "0.0.20"; + version = "0.0.21"; disabled = isPy27; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1mxih81zc2k64briirpp5wz4f72l8v05avfyfibaq9fr6lcbih9b"; + sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index 47a62cd2afce..bfce45ae206c 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "amazon_kclpy"; - version = "1.5.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "v${version}"; - sha256 = "0jjqh9hq0hx2wr7wlqjr6cixpygragwlk4pz7rkqg2gkbhazmnq3"; + sha256 = "13iq217fg0bxafp2rl684pg1rz4jbwid8cc8ip4rim07kzn65lbg"; }; # argparse is just required for python2.6 diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 5fa41412a7ca..12dc1eca2a31 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.6.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21"; + sha256 = "fcd5b3baeeb7fc19b3486ff6d10543099d40ae1f5c9196eae695d1cde1b2f784"; }; propagatedBuildInputs = [ vine ]; diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index bddae5155d7b..a508e7b27111 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "annexremote"; - version = "1.3.1"; + version = "1.4.5"; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball @@ -17,7 +17,7 @@ buildPythonPackage rec { rev = "v${version}"; owner = "Lykos153"; repo = "AnnexRemote"; - sha256 = "13ny7h41430pi9393dw3qgwxvzcxacapjsw0d3vjm7lc4h566alq"; + sha256 = "0r5chdk2aiqcz7z8r8m1j657cz79f6bbv96xdmhj4m5fiqn672if"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 51fd57582f2f..138c70a38483 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "1.16.3"; + version = "1.17.0"; pname = "annoy"; src = fetchPypi { inherit pname version; - sha256 = "fe2779664bd8846f2d67191a7e6010b8df890ac4586336748fd0697f31654379"; + sha256 = "9891e264041d1dcf3af42f67fbb16cb273c5404bc8c869d0915a3087f71d58dd"; }; nativeBuildInputs = [ h5py ]; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index eda67e260454..76775acb1632 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -1,17 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, nose, setuptools }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools_scm, toml }: buildPythonPackage rec { pname = "ansi2html"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1a9vihsvd03hb0a4dbiklyy686adp9q2ipl79mkxmdr6gfp8bbln"; + sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; }; + nativeBuildInputs = [ setuptools_scm toml ]; propagatedBuildInputs = [ six setuptools ]; - checkInputs = [ mock nose ]; + preCheck = "export PATH=$PATH:$out/bin"; + checkInputs = [ mock pytestCheckHook ]; + + pythonImportsCheck = [ "ansi2html" ]; meta = with lib; { description = "Convert text with ANSI color codes to HTML"; diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 9941cf7ae60a..0dea059f76af 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "3.3.2"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad"; + sha256 = "360e28e5e84a4d7023b16de2b897327fe3da63ddc8e01f9165b9113b7fe1c48a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 3ab390d822b5..f2a9db40f60f 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.12.1"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "849c2444c35bb2175aea74100ca5f644c29bf716429399c0f2203bb5d9a8e4e6"; + sha256 = "de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04"; }; doCheck = false; # meant to be ran with interactive interpreter diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 927e6a6d5a64..49f04bcb9116 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy +{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy, pythonAtLeast , lazy-object-proxy, six, wrapt, typing, typed-ast , pytestrunner, pytest }: @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astroid"; version = "2.4.2"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.4" || pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 2658ba99b1f9..2fe59e53d9c1 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "4.0.3"; + version = "4.2"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "cf69d1a3f140ca8fe1664202072201395495a73c334a69fc965fab6a6e1d281a"; + sha256 = "2c194f8a429b8399de64a413a06881ea49f0525cabaa2d78fc132b9e970adc6a"; }; nativeBuildInputs = [ astropy-helpers cython jinja2 ]; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index a91c3ee8a52b..b1f0df0b3bc0 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -4,6 +4,7 @@ , isPy3k , certifi , chardet +, deprecated , idna , oauthlib , requests @@ -16,16 +17,16 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.17.7"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "456e9873fa5ab5cc91c6ae76a70b662f0993d32e4dff6d8febd866a53d86041e"; + sha256 = "f852bfd293fdcb0ab2d7a9ea907f8303cf14fe6f55e90c103d4de00393ea9555"; }; checkInputs = [ pytestrunner pytest ]; - propagatedBuildInputs = [ oauthlib requests requests_oauthlib six ]; + propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ]; meta = with lib; { description = "Python Atlassian REST API Wrapper"; diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 021d8e8b3077..41353598f895 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "atpublic"; - version = "2.0"; + version = "2.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ebeb62b71a5c683a84c1b16bbf415708af5a46841b142b85ac3a22ec2d7613b0"; + sha256 = "fa1d48bcb85bbed90f6ffee6936578f65ff0e93aa607397bd88eaeb408bd96d8"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest --pyargs public + pytest ''; meta = with lib; { diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index 3bc221d7adc9..8369a49b7db8 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -1,21 +1,36 @@ { stdenv , buildPythonPackage , fetchPypi +, configparser +, pyparsing , pytest , future +, openpyxl +, wrapt }: buildPythonPackage rec { - version = "0.2.1"; + version = "0.3.0"; pname = "atsim.potentials"; src = fetchPypi { inherit pname version; - sha256 = "2abdec2fb4e8198f4e0e41634ad86625d5356a4a3f1ba1f41568d0697df8f36f"; + sha256 = "70082fc40b0ab7565a671c2d764fe3db08bc6ce45da44e1c1e8b77a65d1f7a23"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ future ]; + propagatedBuildInputs = [ + configparser + future + openpyxl + pyparsing + wrapt + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "wrapt==1.11.2" "wrapt~=1.11" + ''; # tests are not included with release doCheck = false; @@ -25,9 +40,10 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "https://bitbucket.org/mjdr/atsim_potentials"; + homepage = "https://github.com/mjdrushton/atsim-potentials"; description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; + broken = true; # missing cexprtk package }; } diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 0e0606a3ead5..7513aa04f300 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "attrs"; - version = "19.3.0"; + version = "20.3.0"; src = fetchPypi { inherit pname version; - sha256 = "f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"; + sha256 = "832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"; }; # macOS needs clang for testing diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 0f2243645e0d..dae8a235d80f 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.4.4"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "72b63e25c1c0d85ee4b36b094c7103ef0e40678265eb1e240322ee19fe334368"; + sha256 = "8c786d1641343e9887c21794f9a3bf51716b00ed3b182491f1acbc9e389b31bb"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 9073df2600dd..52298faa0cc8 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.27.0"; + version = "1.31.0"; src = fetchPypi { inherit pname version; - sha256 = "0m24cdiry8p74s5ysyriy6wks4ic8782sf21q4yvlwfn9hpi4n1j"; + sha256 = "3a1d73d098161e60966b0d53bb310c98e4f66101688cce3d1697903643782d79"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 9b27ae254903..1bdedde1cb4e 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "bleach"; - version = "3.1.5"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "3c4c520fdb9db59ef139915a5db79f8b51bc2a7257ea0389f30c846883430a4b"; + sha256 = "52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 07d6cffe56c4..24ddd429cd93 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { preConfigure = '' substituteInPlace setup.py \ - --replace "ecdsa==0.13" "ecdsa>=0.13" \ + --replace "ecdsa==0.15" "ecdsa>=0.15" \ --replace "base58==1.0.3" "base58>=1.0.3" ''; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 04bac36cf5af..9679edd95127 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -25,10 +25,6 @@ stdenv.mkDerivation rec { postPatch = '' mkdir -p $out/bin - '' + stdenv.lib.optionalString isPy27 '' - pushd "${pip.src.name}" - patch -p1 < ${builtins.elemAt pip.patches 0} - popd ''; nativeBuildInputs = [ makeWrapper unzip ]; @@ -49,17 +45,17 @@ stdenv.mkDerivation rec { echo "Building setuptools wheel..." pushd setuptools - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild . + ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd echo "Building wheel wheel..." pushd wheel - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild . + ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd echo "Building pip wheel..." pushd pip - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild . + ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd ''; diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 85ebae5b612f..042a9a296ff7 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -1,6 +1,7 @@ { pkgs , buildPythonPackage , fetchPypi +, pythonAtLeast , isPy38 , python , nose @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "boto"; version = "2.49.0"; + disabled = pythonAtLeast "3.9"; # no longer compatible with hmac std lib package src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 5fda85dc972b..52d97582ef31 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.18"; + version = "0.12.19"; src = fetchPypi { inherit pname version; - sha256 = "0819b74b145a7def225c0e83b16a4d5711fde751cd92bae467a69efce720f69e"; + sha256 = "a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 79a80451d028..55fb8deb5fc3 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "50f16bc7faf299f98fe58573da55b0664078f94b1a0e7f0ce9e1e6a0d47e68e0"; + sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be"; }; propagatedBuildInputs = [ configobj six fastimport dulwich launchpadlib ]; diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index c064fd62fd93..e6f09645379c 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "canopen"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0fqa4p3qg7800fykib1x264gizhhmb6dz2hajgwr0hxf5xa19wdl"; + sha256 = "15d49f1f71e9989dde6e3b75fb8445c76bd223064dfc0ac629fe9ecb0e21fba9"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 3fd1b51a4660..11dfd294f542 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "celery"; - version = "4.4.7"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f"; + sha256 = "012c814967fe89e3f5d2cf49df2dba3de5f29253a7f4f2270e8fce6b901b4ebf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index e5733e2e51a3..e86ad90caeb0 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2020.6.20"; + version = "2020.11.8"; src = fetchPypi { inherit pname version; - sha256 = "5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"; + sha256 = "f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4"; }; pythonImportsCheck = [ "certifi" ]; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index cee7a7fe8a18..07492240ffe9 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.14.3"; + version = "1.14.4"; src = fetchPypi { inherit pname version; - sha256 = "f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591"; + sha256 = "1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 94d1705637d2..63b1699101d4 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "channels"; - version = "2.4.0"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "08e756406d7165cb32f6fc3090c0643f41ca9f7e0f7fada0b31194662f20f414"; + sha256 = "f50a6e79757a64c1e45e95e144a2ac5f1e99ee44a0718ab182c501f5e5abd268"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 5a3296d71c83..6368ebf4b737 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.42"; + version = "0.45"; src = fetchPypi { inherit pname version; - sha256 = "0d8e1b0944a667dd4a75274f6763e558f0d268fde2c725e894dfd152aae23300"; + sha256 = "636b65a3b685374ad429ff22fe213966765b145f08bc560c8d033b604c7bee4c"; }; # Test requires filesystem access diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 5795b55d91b7..6c99b7bbf662 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -6,7 +6,6 @@ , pytestCheckHook , pytestcov , pytest-mock -, pytest-testmon , requests , requests-toolbelt , requests-unixsocket @@ -18,13 +17,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.4.5"; + version = "8.4.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b6c18caf5f79cdae668c35fc8309fc88ea4a964cce9e2ca8504fab13bcf57301"; + sha256 = "1089c28a9c320d19fdf9a4b0ed6ace23a0948db1c171a36ac985f3741bc62865"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; @@ -38,7 +37,6 @@ buildPythonPackage rec { pytestCheckHook pytestcov pytest-mock - pytest-testmon requests requests-toolbelt requests-unixsocket @@ -54,6 +52,7 @@ buildPythonPackage rec { # Deselect test_bind_addr_unix on darwin because times out # Deselect test_http_over_https_error on darwin because builtin cert fails # Disable warnings-as-errors because of deprecation warnings from socks on python 3.7 + # Disable pytest-testmon because it doesn't work # adds many other pytest utilities which aren't necessary like linting preCheck = '' rm pytest.ini diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix new file mode 100644 index 000000000000..4e632cb34038 --- /dev/null +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "clickhouse-cityhash"; + version = "1.0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z8nl0ly2p1h6nygwxs6y40q8y424w40fkjv3jyf8vvcg4h7sdrg"; + }; + + propagatedBuildInputs = [ setuptools ]; + + doCheck = false; + pythonImportsCheck = [ "clickhouse_cityhash" ]; + + meta = with lib; { + description = "Python-bindings for CityHash, a fast non-cryptographic hash algorithm"; + homepage = "https://github.com/xzkostyan/python-cityhash"; + license = licenses.upl; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix new file mode 100644 index 000000000000..9cb88b5cbc9b --- /dev/null +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytz +, tzlocal +, clickhouse-cityhash +, zstd +, lz4 +, freezegun +, mock +, nose +}: + +buildPythonPackage rec { + pname = "clickhouse-driver"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1827cm5z2zd6mxn9alq54bbzw6vhz4a30a54vacqn7nz691qs1gd"; + }; + + propagatedBuildInputs = [ + setuptools + pytz + tzlocal + clickhouse-cityhash + zstd + lz4 + ]; + + checkInputs = [ + freezegun + mock + nose + ]; + + doCheck = true; + pythonImportsCheck = [ "clickhouse_driver" ]; + + meta = with lib; { + description = "Python driver with native interface for ClickHouse"; + homepage = "https://github.com/mymarilyn/clickhouse-driver"; + license = licenses.mit; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 220ff790e7cc..f25170cc6ae7 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "49be854582ec4a74240cb72f287846f823cd8cbd2e25f924541d12f27104bda3"; + sha256 = "5bfb684b5fcdff0afaaccd1298a376c0e62e644c46b7e9abc034595b41fe1759"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 092a0f7c0b11..cd21e125ccef 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "1.5.0"; + version = "1.6.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "820c9245cebdec7257211cbe88745101d5d6a042bca11336d78ebd4897ddbc82"; + sha256 = "9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index 2337964017a2..3c6342f6596f 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "f20900f16377f2109783ae9348d34bc80530808439591c3d3df73d5c7ef1a00c"; + sha256 = "7a5131a78836e55dcdb1f2c5f17bbaa40e5f83c86a205de1b71a298928e1391f"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix index 70c634737635..7efb08c2c67b 100644 --- a/pkgs/development/python-modules/codespell/default.nix +++ b/pkgs/development/python-modules/codespell/default.nix @@ -1,13 +1,16 @@ { lib, buildPythonApplication, fetchPypi, pytest, chardet }: + buildPythonApplication rec { pname = "codespell"; - version = "1.17.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "08ydpw8pim7rhg1x2n711hxf2y6553nx0c0aqhfi3p4wdgcfr8i5"; + sha256 = "dd9983e096b9f7ba89dd2d2466d1fc37231d060f19066331b9571341363c77b8"; }; + # no tests in pypi tarball + doCheck = false; checkInputs = [ pytest chardet ]; checkPhase = '' # We don't want to be affected by the presence of these @@ -16,6 +19,8 @@ buildPythonApplication rec { pytest --pyargs codespell_lib.tests -k "not test_command" ''; + pythonImportsCheck = [ "codespell_lib" ]; + meta = { description = "Fix common misspellings in source code"; homepage = "https://github.com/codespell-project/codespell"; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index a29894fcf427..0b40284fd5eb 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -2,19 +2,23 @@ buildPythonPackage rec { pname = "colorlog"; - version = "4.4.0"; + version = "4.6.2"; src = fetchPypi { inherit pname version; - sha256 = "0272c537469ab1e63b9915535874d15b671963c9325db0c4891a2aeff97ce3d1"; + sha256 = "54e5f153419c22afc283c130c4201db19a3dbd83221a0f4657d5ee66234a2ea4"; }; checkInputs = [ pytest ]; + # tests are no longer packaged in pypi + doCheck = false; checkPhase = '' py.test -p no:logging ''; + pythonImportsCheck = [ "colorlog" ]; + meta = with stdenv.lib; { description = "Log formatting with colors"; homepage = "https://github.com/borntyping/python-colorlog"; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index fa5f4bca8cd0..8823435e2f8b 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 = "5.2.1"; + version = "5.3"; src = fetchPypi { inherit pname version; - sha256 = "a34cb28e0747ea15e82d13e14de606747e9e484fb28d63c999483f5d5188e89b"; + sha256 = "280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0"; }; # No tests in archive diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 64078693ac19..68cf993a5a81 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "coveralls"; - version = "2.1.2"; + version = "2.2.0"; disabled = isPy27; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "4430b862baabb3cf090d36d84d331966615e4288d8a8c5957e0fd456d0dd8bd6"; + sha256 = "b990ba1f7bc4288e63340be0433698c1efe8217f78c689d254c2540af3d38617"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 42236b4d7c22..84e1b9048e2c 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "crate"; - version = "0.24.0"; + version = "0.26.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "028q9r1qyqkq185awkazhplfy7y1081963fnjzi3kf3lxvz6yhay"; + sha256 = "6f650c2efe250b89bf35f8fe3211eb37ebc8d76f7a9c09bd73db3076708fa2fc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index 4cd9e90606b6..f262d289af71 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "crayons"; - version = "0.3.1"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "dcb85b87aa03bb65bd3a073d012796b024cabeb086033e616759e2abb769440b"; + sha256 = "bd33b7547800f2cfbd26b38431f9e64b487a7de74a947b0fafc89b45a601813f"; }; propagatedBuildInputs = [ colorama ]; diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 0ffd66d6d012..31875abd1e83 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "curio"; - version = "1.2"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "90f320fafb3f5b791f25ffafa7b561cc980376de173afd575a2114380de7939b"; + sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index dd8b1dccc1c3..e4350bada331 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses }: +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.2"; + version = "6.4.1"; src = fetchPypi { inherit pname version; - sha256 = "44bbbcea3196b79da77cc22637cb28a825b51182d32209e8a3f6cd4042edc247"; + sha256 = "043513b85e33038e38cc0571cea1f3ee8044ec083891c9a5dad1d436894424ea"; }; disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ ncurses ]; + propagatedBuildInputs = [ + importlib-metadata # upstream has this for 3.8 as well + ncurses + ]; # timestamp need to come after 1980 for zipfiles and nix store is set to epoch prePatch = '' diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 1cef3514e90a..4b0d46918097 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db"; + sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a"; }; # This differs slightly from the default python installPhase in that it pip-installs diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix index 8a4fe9e263a5..81aa8de8bcfc 100644 --- a/pkgs/development/python-modules/dask-gateway/default.nix +++ b/pkgs/development/python-modules/dask-gateway/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "dask-gateway"; # update dask-gateway lock step with dask-gateway-server - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "519818f3598ddd726882c5a6bf7053941613d8517b80e8a2c28467e30d57da9b"; + sha256 = "743f3b88dabe7d1503ac08aadf399eb9205df786b12c5175ea2e10c6ded7df22"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index f119cf2b0b8b..453cb715b12b 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "dask-image"; src = fetchPypi { inherit pname version; - sha256 = "15svy8y57i30878pijyd0pxn10bnk7ffmmgwva5rpip4b7grsgv0"; + sha256 = "a6873a39af21b856a4eb7efee6838e6897b1399f21ab9e65403e69eb62f96c2d"; }; nativeBuildInputs = [ pytest-flake8 ]; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index d4a6663e7a50..441c698c2ad0 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.7.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "ce686b7fd49b3f876d651c87e8468ad71bcd2707399140d6baf198184c45d970"; + sha256 = "5f93e8560217ebbc5a2254eaf705e9cad8e1c82012567c658e26464a74fbab76"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 59ea588851ec..19c6962c5759 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -11,7 +11,6 @@ , dill , pandas , partd -, pytest_xdist }: buildPythonPackage rec { @@ -29,7 +28,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest_xdist # takes >10mins to run single-threaded ]; dontUseSetuptoolsCheck = true; @@ -54,12 +52,7 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - # dask test suite with consistently fail when using high core counts - preCheck = '' - NIX_BUILD_CORES=$((NIX_BUILD_CORES > 8 ? 8 : NIX_BUILD_CORES)) - ''; - - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + #pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; disabledTests = [ "test_argwhere_str" diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 8672f0776242..2184a7e41940 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "68e5cdcf4ca26d3c628bca26e44563d58e64d3b2805b9adb94b4006976d9c7e1"; + sha256 = "bf94dc5187fa3500a31d52d7225fbc1a4699aa6e3c321223e7088eb5b5c94b62"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index df3d08c3fab4..74eca940fb78 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "7.1.1"; + version = "7.1.10"; src = fetchPypi { inherit pname version; - sha256 = "c7f508c84edc7f80a131650b892889624e4457c10f44318465dd3f7b8cf5be6d"; + sha256 = "bae28fab1e08b709553c8efbeefc5b0ee4f5540a13a04e61fb3d348814823e16"; }; sourceRoot = "."; @@ -16,8 +16,13 @@ buildPythonPackage rec { # requires network access doCheck = false; + prePatch = '' + substituteInPlace setup.py \ + --replace "py4j==0.10.9" "py4j" + ''; + preFixup = '' - substituteInPlace "$out/bin/find-spark-home" \ + substituteInPlace "$out/bin/find-spark-home" \ --replace find_spark_home.py .find_spark_home.py-wrapped ''; diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix index a1159d49b812..5cfaf237059d 100644 --- a/pkgs/development/python-modules/dataclasses/default.nix +++ b/pkgs/development/python-modules/dataclasses/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "dataclasses"; - version = "0.7"; + version = "0.8"; # backport only works on Python 3.6, and is in the standard library in Python 3.7 disabled = !isPy36; src = fetchPypi { inherit pname version; - sha256 = "494a6dcae3b8bcf80848eea2ef64c0cc5cd307ffc263e17cdf42f3e5420808e6"; + sha256 = "8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 729827317c18..2a80523a6560 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "dateparser"; - version = "0.7.6"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e875efd8c57c85c2d02b238239878db59ff1971f5a823457fcc69e493bf6ebfa"; + sha256 = "159cc4e01a593706a15cd4e269a0b3345edf3aef8bf9278a57dac8adf5bf1e4a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 3614114a3d4b..6dc4ad3402bc 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 = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "f5218f2f0bb1210563ff87687afbf10786e080d8494a248e705507ebd92d7153"; + sha256 = "db82b2840f667d47872ae3e4a4e0a0d72fbecb42779b8aa233fa8bb965f7836a"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 381624e5719e..7342aa3300c4 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-haystack"; - version = "2.8.1"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "8b54bcc926596765d0a3383d693bcdd76109c7abb6b2323b3984a39e3576028c"; + sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be"; }; checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 940bd1f1cb83..6145b1266291 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "3.0.1"; + version = "3.0.2"; meta = { description = "A Django application to retrieve user's IP address"; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "73a640a5bff00aa7503a35e92e462001cfabb07d73d649c262f117423beee953"; + sha256 = "c7df8e1410a8e5d6b1fbae58728402ea59950f043c3582e033e866f0f0cf5e94"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 97a9608cff73..13b5354e17ee 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.6.0"; + version = "2.7.0"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7459985c25ddb6584c6bab345761c8c5557713448e6fbb322af1b6dd7f5512bd"; + sha256 = "d56ecddaa6d3caf508509aae5a979ebd8a3427477c34fcbcac14bf8389a21a12"; }; buildInputs = [ django pytz tox ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index cae83135a6fa..c0467bbba705 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.9.1"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "148y2hyx1l4pfbqpq8hgq95fw8bhfbblwd3m5xwnhw6frcirk7m5"; + sha256 = "652275ab7844538c462b62810276c0244866f345878256a9e0e86f5b1283ae18"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix index eac119ef01ea..e3b7be798775 100644 --- a/pkgs/development/python-modules/django_evolution/default.nix +++ b/pkgs/development/python-modules/django_evolution/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "django_evolution"; - version = "2.0"; + version = "2.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a0bc983657de1b0bc5c8d29ddcbf7b6fb113685bf306ccc266cf22b8a77bd862"; + sha256 = "997efdc7f27248fd3c5e9eeccae1cfee046dfead037b171d30cbe6e91c9ca3d7"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index f4c50a711494..9fb7f882567a 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "djangorestframework_simplejwt"; - version = "4.4.0"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c"; + sha256 = "7adc913ba0d2ed7f46e0b9bf6e86f9bd9248f1c4201722b732b8213e0ea66f9f"; }; propagatedBuildInputs = [ django djangorestframework pyjwt ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index d46fbe991aea..7a23d17aca2a 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.3.1"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2"; + sha256 = "cffc771d4ea1389fc66bc95cb72d304aa41d1a1563482a9a000fba3a84ed5071"; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 362f2b11b1c5..9b32bab7d6be 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.16.196"; + version = "2.18.200"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "8fd96e3586444e577b356c0ac62511414e76027ff159ebe0d0b3e44b881406d1"; + sha256 = "340848e67e1389b32b44d16a100aed1ebb0a6f0519b0f3cbce7cd0de6478fd6c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index bc01b46eadaf..561ec9a7a98e 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "drms"; - version = "0.5.7"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "ab3ec6d072b1980f77dadf3b2cb0fe56c648eaf927ea381f606b4db66d4cbff2"; + sha256 = "74efb903f42647ea536de0c5aea4f9a81efe027c95055ec4e72ef62479a04c89"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index cd2001493206..f2be7b1903da 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.7"; + version = "2.7.1"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e4e7a0dd4001f56bfd4058428f2c91eafe27d33ef3b8b33ac4e013b159b9ff91"; + sha256 = "f862949208d9066cd3d84ffcf9c2dbe9c7344ea6152b741e440f861eca46855c"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 0f224bd8ab0b..1d2a780bbbbd 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "ecdsa"; - version = "0.15"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277"; + sha256 = "cfc046a2ddd425adbd1a78b3c46f0d1325c657811c0f45ecc3a0a6236c1e50ff"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 215584aa8cdb..5d9f0ca88fa6 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: buildPythonPackage rec { - pname = "email_validator"; - version = "1.1.1"; + pname = "email-validator"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "63094045c3e802c3d3d575b18b004a531c36243ca8d1cec785ff6bfcb04185bb"; + sha256 = "1a13bd6050d1db4475f13e444e169b6fe872434922d38968c67cea9568cce2f0"; }; doCheck = false; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index a712b1491380..5eb3efe6009a 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.28.1"; + version = "0.29.1"; src = fetchPypi { inherit pname version; - sha256 = "55eef68e39473d6a58d28c4cf388cb8b7d29bab76568e7124d7df98d9365ab35"; + sha256 = "9faff63631b01277c463ae91cd4ab3f25a2f0f5abe3219d43a386ef1daa6159a"; }; propagatedBuildInputs = [ dnspython greenlet monotonic six ] diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix index 21c459d62b95..6fe355d9c4d8 100644 --- a/pkgs/development/python-modules/events/default.nix +++ b/pkgs/development/python-modules/events/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Events"; - version = "0.3"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "f4d9c41a5c160ce504278f219fe56f44242ca63794a0ad638b52d1e087ac2a41"; + sha256 = "01d9dd2a061f908d74a89fa5c8f07baa694f02a2a5974983663faaf7a97180f5"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 052551a4727c..a953632f9fd7 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "factory_boy"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "2ce2f665045d9f15145a6310565fcb8255d52fc6fd867f3b783b3ac3de6cf10e"; + sha256 = "ded73e49135c24bd4d3f45bf1eb168f8d290090f5cf4566b8df3698317dc9c08"; }; propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 4cc3c86aab68..abdb0f583941 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,41 +1,44 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, - # Build inputs - dateutil, six, text-unidecode, ipaddress ? null - # Test inputs - , email_validator - , freezegun - , mock - , more-itertools - , pytest - , pytestrunner - , random2 - , ukpostcodeparser - , validators +# Build inputs +dateutil, six, text-unidecode, ipaddress ? null +# Test inputs +, email_validator +, freezegun +, mock +, more-itertools +, pytestCheckHook +, pytestrunner +, ukpostcodeparser +, validators }: assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "4.1.8"; + version = "4.18.0"; src = fetchPypi { inherit pname version; - sha256 = "179418909da04b04000eab5463c403895faed2849d36ef8d9cbda72cc44797a0"; + sha256 = "0raxw6mgvf9523v7917zqw76vqnpp0d6v3i310qnjnhpxmm78yb2"; }; nativeBuildInputs = [ pytestrunner ]; checkInputs = [ email_validator freezegun - pytest - random2 + pytestCheckHook ukpostcodeparser validators ] ++ lib.optionals (pythonOlder "3.3") [ mock ] ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; + # avoid tests which import random2, an abandoned library + pytestFlagsArray = [ + "--ignore=tests/providers/test_ssn.py" + ]; + propagatedBuildInputs = [ dateutil six diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index c36fd2b19437..55ed8d7f6e7c 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "feedparser"; - version = "5.2.1"; + version = "6.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx"; + sha256 = "1b00a105425f492f3954fd346e5b524ca9cef3a4bbf95b8809470e9857aa1074"; }; # lots of networking failures diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index a88db7b80f56..0e90bb10f956 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.17"; + version = "1.8.18"; src = fetchPypi { inherit pname version; - sha256 = "716201c21246587f374785bec6d6a20a984fe1f6c2b0e83bf15127eb8f724d0c"; + sha256 = "b732ece0ff8886a29c439723a3e1fc382718804bb057519d537a81308854967a"; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index d052a7c51c1f..0eb9f61d697f 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"; + sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index bc1e2778e193..4d45343c2658 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "3.24.1"; + version = "3.25.0"; src = fetchPypi { inherit pname version; - sha256 = "1p8rwcsscyjw2m7dbybiaflqk4z1r2d1kp9r9qqyjfzblxpyxa0a"; + sha256 = "b2e4dba91661e4697b30269106386c2b29e416a00d9ff66b26c462edddc10078"; }; propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index c3db5094aef9..1f24919b73c0 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Limiter"; - version = "1.3.1"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "08d6d7534a847c532fd36d0df978f93908d8616813085941c862bbcfcf6811aa"; + sha256 = "021279c905a1e24f181377ab3be711be7541734b494f4e6db2b8edeba7601e48"; }; propagatedBuildInputs = [ flask limits ]; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 5d783f6c7c45..710c35bc8b4e 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.13.0"; + version = "0.14.0"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "aefc1f1d96256c430a409f08241bab75ffe97e5d14ac5d1f000764e39bf4873a"; + sha256 = "bd01a6372cbe50e36f205cfff0fc5dab0b7b662c4c8b2c4fc06a3151b2950950"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix index f2908f43b00a..cc4b4e06bfcc 100644 --- a/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-swagger-ui"; - version = "3.25.0"; + version = "3.36.0"; src = fetchPypi { inherit pname version; - sha256 = "42d098997e06b04f992609c4945cc990738b269c153d8388fc59a91a5dfcee9e"; + sha256 = "f329752a65b2940ada8eeb57bce613f7c0a12856a9c31063bb9e33798554c9ed"; }; doCheck = false; # there are no tests diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index db0a4377947e..2956e2036c9d 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"; + sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; }; propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ]; diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 441084da97fa..53a1e0651f36 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -1,26 +1,24 @@ { lib , buildPythonPackage -, fetchPypi , flit , isPy3k -, pytoml +, toml }: buildPythonPackage rec { pname = "flit-core"; version = "2.3.0"; disabled = !isPy3k; - format = "pyproject"; - src = fetchPypi { - inherit version; - pname = "flit_core"; - sha256 = "a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80"; - }; + inherit (flit) src patches; + + preConfigure = '' + cd flit_core + ''; propagatedBuildInputs = [ - pytoml + toml ]; passthru.tests = { diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index c0944f4ff17b..c63fd1edeaf9 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , isPy3k , docutils , requests @@ -10,7 +11,6 @@ , pytest , testpath , responses -, pytoml , flit-core }: @@ -21,19 +21,34 @@ buildPythonPackage rec { pname = "flit"; - version = "2.3.0"; + version = "3.0.0"; disabled = !isPy3k; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "017012b809ec489918afd68af7a70bd7c8c770c87b60159d875c126866e97a4b"; + src = fetchFromGitHub { + owner = "takluyver"; + repo = "flit"; + rev = version; + sha256 = "zk6mozS3Q9U43PQe/DxgwwsBRJ6Qwb+rSUVGXHijD+g="; }; + nativeBuildInputs = [ + flit-core + ]; + + # Use toml instead of pytoml + # Resolves infinite recursion since packaging started using flit. + patches = [ + (fetchpatch { + url = "https://github.com/takluyver/flit/commit/b81b1da55ef0f2768413669725d2874fcb0c29fb.patch"; + sha256 = "11oNaYsm00/j2046V9C0idpSeG7TpY3JtLuxX3ZL/OI="; + }) + ]; + propagatedBuildInputs = [ docutils requests requests_download - pytoml flit-core ] ++ lib.optionals (pythonOlder "3.6") [ zipfile36 diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix new file mode 100644 index 000000000000..219fc180b225 --- /dev/null +++ b/pkgs/development/python-modules/freezegun/0.3.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, dateutil +, six +, mock +, nose +, pytest +}: + +buildPythonPackage rec { + pname = "freezegun"; + version = "0.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf"; + }; + + propagatedBuildInputs = [ dateutil six ]; + checkInputs = [ mock nose pytest ]; + # contains python3 specific code + doCheck = !isPy27; + + meta = with stdenv.lib; { + description = "FreezeGun: Let your Python tests travel through time"; + homepage = "https://github.com/spulec/freezegun"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 92254b94dee9..743b041775f0 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonOlder , fetchPypi , isPy27 , dateutil @@ -11,11 +12,12 @@ buildPythonPackage rec { pname = "freezegun"; - version = "0.3.15"; + version = "1.0.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; + sha256 = "1cf08e441f913ff5e59b19cc065a8faa9dd1ddc442eaf0375294f344581a0643"; }; propagatedBuildInputs = [ dateutil six ]; diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index a0033eb658b1..9e6bab6e1690 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Genshi"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "d92ef3bb34474a38566f7e44e570ff3067c7f7c126670c79f660661badf8eddb"; + sha256 = "c12d6c2abf7df0ec661d9ff2e197522eae846e43dc58abd5a36443d05bc41135"; }; # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 3b9abbbad015..efe74d478848 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.22.4"; + version = "1.23.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "4a9d7ac2527a9e298eebb580a5e24e7e41d6afd97010848dd0f306cae198ec1a"; + sha256 = "1bb3c485c38eacded8d685b1759968f6cf47dd9432922d34edb90359eaa391e2"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index b1366c0d35cf..87b1fdf8fc9d 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "14r77bcxy7bmqhmz2hzcf3km2y4vivf5sfzgqjwlyynaydhn4f6j"; + sha256 = "1cf1b8a102eea8cec65eb07bef51dc15c1136cfc8564ea7fc5a39465b8f20017"; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 356850876a7a..cea0608c3f77 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.1.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0x5g6n151rcdgq4s80f71zpsl7bsvyyrs07l58psdpyd3kwf4sbk"; + sha256 = "2d53d6fed1c25c9c0ce361dad1c64203c96b2344f7156357a501630d1cb08445"; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix index 0647c1f91730..8c71ac92c994 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "1.1.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "8536e8656658d349db3bd5a763ce795fe79a5bfdbd1544f406957cc42e34690b"; + sha256 = "0cca79f6ee312159ec3f3b7fea218c3dd51408d39c429ecbea037982e91cc827"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index 68b04508e605..b0067d4316da 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "2.0.2"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1ab0128be96a01c6ba3d10db21b8018583b15995ad9a088cb3e4c3df90a62e46"; + sha256 = "81c44ac114c94df8f5b21245e5e7fc4eabce66b25fc432c3696b62b5de143b1f"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix index 652eca773a36..07c6cd87237f 100644 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "1.15.3"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "3da44b4c8230a83e69dd9429324cca9d3000ee8a8bb11f3b005c7837fcd844b3"; + sha256 = "0ebf3b0bcb483e066dfe73679e019e2d7b8c1652e26984702cf5e3f020592f6a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index 8273f40565fe..a5a602dbeadb 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2ccf04209f96b4759d8ed76da2c916a456386836caacd47ce01b6344f5b8f212"; + sha256 = "112c8a46979eebd60c3651037e62572fed413977ff2811901aa925c7b7ab9a5a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index a5d349456fd6..4f819bbf9bfa 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.9.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "d8a56919a3a32c7271d1253542ec24cb13f384a726fed354fdeb2a2269f25d1c"; + sha256 = "ae1f58d9174a6fb2c9fd2758c6d4fd237fb4f0decc632b80c217bfbceda38eb6"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix index 8f14f7eeb87f..96364cfd7029 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google_cloud_iot/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "1.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "bfd1511a7bcc7d23c2ea30253dd86b2b2247576d1345d895d7153dc0b262f06e"; + sha256 = "8af2be9c74697a350d5cc8ead00ae6cb4e85943564f1d782e8060d0d5eb15723"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google_cloud_language/default.nix index 4479231aba4d..4f3defb4e4b9 100644 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ b/pkgs/development/python-modules/google_cloud_language/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "1.3.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2772badf8fe8ac57cd7e7840a60764603b3e19e6dbd843460a5ae8915798b32f"; + sha256 = "abe7abcd64d25ffdf6d063385869ef8f34a7de421d5676541cd6df63b3c37b88"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix index ef155a18a1d1..96473edd583b 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "1.15.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "cb0d4af9d684eb8a416f14c39d9fa6314be3adf41db2dd8ee8e30db9e8853d90"; + sha256 = "c8e4869ec22aa7958ff937c1acbd34d7a2a8a446af9a09ce442f24128eee063c"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index 8815d8246d16..99557565e63a 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2feee2cc56b60ed1316175af0974668041c6480803542d3711e4365882dc79cd"; + sha256 = "1debfa046ab9518d46b68712c03d86d0ddb11d1aad428aed62c6465752f2201f"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix index 92f2027bf4e9..3337d9f3c55b 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google_cloud_redis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "73057750d6afcfc90c224ee4ffa3262b5e85e866b4db676f74a07b49713f2c3a"; + sha256 = "c783118462d9272fb9f519ef43b6ce383e99ad631e922a1f06fbef7148aec7b8"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix index 5bc568f879de..df3ec14c4dce 100644 --- a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1w2q602ww8s3n714l2gnaklqzbczshrspxvmvjr6wfwwalxwkc62"; + sha256 = "c2b0c93b559c3b6eb2dc75f7ab33d49fad8fe954f6094ac2b14323ce053058f0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index a3992825d2e9..cad4b0799c28 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "14ebad262cd01c9a3998561684617be2e97ad5d27dab1918c14b964f97e1f8f7"; + sha256 = "45d47a4389f2f19958a9db8e5c2f169c9b9385e74338fef0a4e49160153df7f7"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index 4e86908b4260..38bd65aa091d 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.19.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0b9ifh9i4hkcs19b4l6v8j8v93yd8p3j19qrrjvvf5a44bc7bhsh"; + sha256 = "edac9d86ea2d8e87c048423f610cd3e5dbb6f9db7f1f9353ff133014689e97c6"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 5ffaafdbd6f7..57b2efb9ebbc 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "1.3.2"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "2e5adbc0e88f296b1bc8667f1dcf26ca4ea2db6596f07cb0a39e7b1b8ef14656"; + sha256 = "a7428190f4c10440148a273eb4c91480470b34180eec422b7325acdc0b2c0832"; }; propagatedBuildInputs = [ google_api_core ]; diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index b7f827dd4802..ca252b2c5edb 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "1.5.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d751b97c1e84980a1646702d3fc1b45bab3284bc3388181f1dc9ba3d204b5a39"; + sha256 = "a9dd004057fc441eee8c18bb2dc3bb20ba7b85f353d66894c61e42aeb8764e76"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google_cloud_trace/default.nix index 5b19243709f0..b0efb65d0d2f 100644 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "0.24.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0c342dbd9daf5375b3f8bb94302b7ea9a9946f76684e457a38ff0d420b3b6556"; + sha256 = "1bd1ee5c274a584929913d9118134e01afe106644cb749ccc3111e1a38a96cd3"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index d097132a347a..b823e105b843 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "1.16.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "de6fe53bdaf66aa8e2c1f34b26af24c479a876619b5c667d009fbd9700dd89f7"; + sha256 = "02a91a25b3890a743bde21e03abddf11dcaf7966cc44f09bc8d507f2e28f15fa"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index 585abc8cc48e..fd738a522661 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "18e78b190c81d200ae4f6a46d4af57422d68b3b05b0540d5cd1806e3874142bf"; + sha256 = "6a067d9a661df2e9b356b2772051decfea1971f8d659c246412a165baf827c61"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 6d432fed0e4e..7597abbe0f9e 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -1,17 +1,19 @@ { stdenv, buildPythonPackage, fetchPypi -, enum34, hpack, hyperframe }: +, enum34, hpack, hyperframe, pytestCheckHook, hypothesis }: buildPythonPackage rec { pname = "h2"; - version = "3.2.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "051gg30aca26rdxsmr9svwqm06pdz9bv21ch4n0lgi7jsvml2pw7"; + sha256 = "bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"; }; propagatedBuildInputs = [ enum34 hpack hyperframe ]; + checkInputs = [ pytestCheckHook hypothesis ]; + meta = with stdenv.lib; { description = "HTTP/2 State-Machine based protocol implementation"; homepage = "http://hyper.rtfd.org/"; diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index a9a0944459a1..e0d6ffce6531 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "h3"; - version = "3.6.4"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "416e35d736ef6ec9c1f73b9d4a9d5c696cc2a7561811f8bcfa08c8c4912f2289"; + sha256 = "cd27fc8ecd9183f93934079b7c986401f499030ff2e2171eace9de462fab561d"; }; patches = [ diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 8cb6b8c22f53..a9ebdc5dfe88 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, isPy27, python, buildPythonPackage +{ stdenv, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder , numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch -, mpi4py ? null, openssh, pytest }: +, mpi4py ? null, openssh, pytestCheckHook, cached-property }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -10,20 +10,25 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "2.10.0"; + version = "3.1.0"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d"; + sha256 = "1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2"; }; - configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; + # avoid strict pinning of numpy + postPatch = '' + substituteInPlace setup.py \ + --replace "numpy ==" "numpy >=" + ''; - postConfigure = '' - ${python.executable} setup.py configure ${configure_flags} + HDF5_DIR = "${hdf5}"; + HDF5_MPI = if mpiSupport then "ON" else "OFF"; + postConfigure = '' # Needed to run the tests reliably. See: # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 ${optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} @@ -31,12 +36,17 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - checkInputs = optional isPy27 unittest2 ++ [ pytest openssh ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ hdf5 cython ] + # tests now require pytest-mpi, which isn't available and difficult to package + doCheck = false; + checkInputs = optional isPy27 unittest2 ++ [ pytestCheckHook openssh ]; + nativeBuildInputs = [ pkgconfig cython ]; + buildInputs = [ hdf5 ] ++ optional mpiSupport mpi; propagatedBuildInputs = [ numpy six] - ++ optionals mpiSupport [ mpi4py openssh ]; + ++ optionals mpiSupport [ mpi4py openssh ] + ++ optionals (pythonOlder "3.8") [ cached-property ]; + + pythonImportsCheck = [ "h5py" ]; meta = { description = diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 05557b096df7..856a36f77916 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.10.0.post1"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "27c04d42a7187becf7a8309d4846aa4f235ac8b7dafd758335b109f5cbd3b962"; + sha256 = "a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index a10882417fc0..36578856286f 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "hpack"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2"; + sha256 = "fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 895a28356ee5..0d061df86bf7 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "httpretty"; - version = "1.0.2"; + version = "1.0.3"; # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "24a6fd2fe1c76e94801b74db8f52c0fb42718dc4a199a861b305b1a492b9d868"; + sha256 = "9335cbd8f38745e0e2dc4755d8932a77d378d93e15804969504b1e6b568d613c"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 4676c300471d..70ac0297b739 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.6.0"; + version = "3.1.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "8ee358ea6c23de896b9d1925ebe6a8504bb2ba7e98d5ccf4d07ab7f3b28f3819"; + sha256 = "fd3eb915310335c63a54d4507289ecc7b3a7454cd2c22ac5086d061a3cbfd592"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index d787b6113355..aaad8f2b1dec 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8fcf2f251bd9d4b0390d9c272c992aa75e11174829e416a22de8fba38acc1ce9"; + sha256 = "1c709bebb737ebd71a0433f2333ed15f03dd3c431d4646c41c2b9fcbae4a29b7"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index de9c7995bde9..6431791d65e6 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "hwi"; - version = "1.1.2"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "eec460a51eb556500c1eca92015be246d5714cd53171407a76da71e4346048ae"; + sha256 = "d0d220a4967d7f106b828b12a98b78c220d609d7cc6c811898e24fcf1a6f04f3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index a8f847c53bb1..2c6796ca6d0c 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -1,13 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: + buildPythonPackage rec { pname = "hyperframe"; - version = "5.2.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f"; + sha256 = "742d2a4bc3152a340a49d59f32e33ec420aa8e7054c1444ef5c7efff255842f1"; }; + checkInputs = [ pytestCheckHook ]; + meta = with stdenv.lib; { description = "HTTP/2 framing layer for Python"; homepage = "http://hyper.rtfd.org/"; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 785ec5814918..307c25e724ee 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest +, pytestCheckHook +, pytest_xdist +, pythonOlder , matplotlib , mock , pytorch @@ -12,23 +14,45 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.3.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "0i863kxi1r1hspj19lhn6r8256vdazjcyvis0s33fgzrf7kxi08x"; + sha256 = "00vcmhnp14s54g386izgaxzrdr2nqv3pz9nvpyiwrn33zawr308z"; }; - checkInputs = [ pytest matplotlib mock ]; + checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. + doCheck = pythonOlder "3.9"; + # Some packages are not in NixPkgs; other tests try to build distributed # models, which doesn't work in the sandbox. - checkPhase = '' - pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon and not conftest and not engines and not distrib_' tests/ - ''; + # avoid tests which need special packages + pytestFlagsArray = [ + "--ignore=tests/ignite/contrib/handlers/test_trains_logger.py" + "--ignore=tests/ignite/metrics/test_dill.py" + "--ignore=tests/ignite/metrics/test_ssim.py" + "tests/" + ]; + + # disable tests which need specific packages + disabledTests = [ + "idist" + "tensorboard" + "mlflow" + "trains" + "visdom" + "test_setup_neptune" + "test_output_handler" # needs mlflow + "test_integration" + "test_pbar" # slight output differences + "test_write_results" + "test_setup_plx" + ]; meta = with lib; { description = "High-level training library for PyTorch"; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 3ebd22ffeb25..f652ac60ce1b 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "imagecorruptions"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "14j8x6axnyrn6y7bsjyh4yqm7af68mqpxy7gg2xh3d577d852zgm"; + sha256 = "011e7c84a01f3e41465e5ad1ee48291cd6fd8032f45c836c5ddaad6e09fe0ae2"; }; postPatch = '' diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index e973175b26a0..dee40a6dbba2 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.9.21"; + version = "0.9.22"; src = fetchPypi { inherit pname version; - sha256 = "912f812564e87c31a162cfe0626f3a6cbc5b6864deedbfefc31f6d321859ade3"; + sha256 = "4bf7e7b595356585599b4b2773b8a463d7b9765c97012dcd5a44eb6d547f6a1d"; }; disabled = isPy3k; diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 0e1d4654c590..22c05e3319c6 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "importlib_resources"; - version = "3.0.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3"; + sha256 = "7b51f0106c8ec564b1bef3d9c588bc694ce2b92125bbb6278f4f2f5b54ec3592"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 158f1161cb4d..7646d25ee425 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -3,6 +3,7 @@ , six , hypothesis , pytest +, pytestrunner , pytestCheckHook }: @@ -17,10 +18,14 @@ buildPythonPackage rec { sha256 = "02zlprvidkz51aypss4knhv7dbr0sbpz3caqjzf9am2n1jx2viyy"; }; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ arrow six ]; checkInputs = [ pytest hypothesis ]; - checkPhase = "./test.doctests.py && ./test.inform.py && pytest"; + checkPhase = '' + patchShebangs test.doctests.py test.inform.py + ./test.doctests.py && ./test.inform.py && pytest + ''; meta = with lib; { description = "Print and logging utilities"; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 1f1a50363f9d..dd9004aa0cb3 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.17.0"; + version = "7.19.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b70974aaa2674b05eb86a910c02ed09956a33f2dd6c71afc60f0b128a77e7f28"; + sha256 = "cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 2c454fd9ce0c..8398117041be 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.3"; + version = "3.10.4"; src = fetchPypi { inherit pname version; - sha256 = "2295c01465fe19776b1f9432fd99fd24e61230d146ded2752e0d980ef6f4101f"; + sha256 = "f5bfbc362e2a73dfc82449ac459b59a7f6b20bcebf82f6bd87d773dc45073646"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/isort/4.nix b/pkgs/development/python-modules/isort/4.nix new file mode 100644 index 000000000000..b2ef4e66f361 --- /dev/null +++ b/pkgs/development/python-modules/isort/4.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchPypi, setuptools, isPy27, futures +, backports_functools_lru_cache, mock, pytest +}: + +let + skipTests = [ "test_requirements_finder" "test_pipfile_finder" ] ++ lib.optional isPy27 "test_standard_library_deprecates_user_issue_778"; + testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; +in buildPythonPackage rec { + pname = "isort"; + version = "4.3.21"; # Note 4.x is the last version that supports Python2 + + src = fetchPypi { + inherit pname version; + sha256 = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"; + }; + + propagatedBuildInputs = [ + setuptools + ] ++ lib.optionals isPy27 [ futures backports_functools_lru_cache ]; + + checkInputs = [ mock pytest ]; + + checkPhase = '' + # isort excludes paths that contain /build/, so test fixtures don't work + # with TMPDIR=/build/ + PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts} + + # Confirm that the produced executable script is wrapped correctly and runs + # OK, by launching it in a subshell without PYTHONPATH + ( + unset PYTHONPATH + echo "Testing that `isort --version-number` returns OK..." + $out/bin/isort --version-number + ) + ''; + + meta = with lib; { + description = "A Python utility / library to sort Python imports"; + homepage = "https://github.com/timothycrosley/isort"; + license = licenses.mit; + maintainers = with maintainers; [ couchemar nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index b2ef4e66f361..bc11697339e8 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -1,30 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools, isPy27, futures -, backports_functools_lru_cache, mock, pytest +{ lib, buildPythonPackage, fetchFromGitHub +, colorama +, hypothesis +, poetry-core +, pylama +, pytestCheckHook }: let - skipTests = [ "test_requirements_finder" "test_pipfile_finder" ] ++ lib.optional isPy27 "test_standard_library_deprecates_user_issue_778"; - testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; in buildPythonPackage rec { pname = "isort"; - version = "4.3.21"; # Note 4.x is the last version that supports Python2 + version = "5.6.4"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = "isort"; + rev = version; + sha256 = "1m7jpqssnbsn1ydrw1dn7nrcrggqcvj9v6mk5ampxmvk94xd2r2q"; }; - propagatedBuildInputs = [ - setuptools - ] ++ lib.optionals isPy27 [ futures backports_functools_lru_cache ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ mock pytest ]; - - checkPhase = '' - # isort excludes paths that contain /build/, so test fixtures don't work - # with TMPDIR=/build/ - PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts} + checkInputs = [ + colorama + hypothesis + pylama + pytestCheckHook + ]; + postCheck = '' # Confirm that the produced executable script is wrapped correctly and runs # OK, by launching it in a subshell without PYTHONPATH ( @@ -34,9 +40,37 @@ in buildPythonPackage rec { ) ''; + preCheck = '' + HOME=$TMPDIR + export PATH=$PATH:$out/bin + ''; + + pytestFlagsArray = [ + "--ignore=tests/integration/" # pulls in 10 other packages + "--ignore=tests/unit/profiles/test_black.py" # causes infinite recursion to include black + ]; + + disabledTests = [ + "test_run" # doesn't like paths in /build + "test_pyi_formatting_issue_942" + "test_requirements_finder" + "test_pipfile_finder" + "test_main" # relies on git + "test_command_line" # not thread safe + "test_encoding_not_in_comment" # not python 3.9 compatible + "test_encoding_not_in_first_two_lines" # not python 3.9 compatible + "test_requirements_dir" # requires network + # plugin not available + "test_isort_literals_issue_1358" + "test_isort_supports_formatting_plugins_issue_1353" + "test_value_assignment_list" + # profiles not available + "test_isort_supports_shared_profiles_issue_970" + ]; + meta = with lib; { description = "A Python utility / library to sort Python imports"; - homepage = "https://github.com/timothycrosley/isort"; + homepage = "https://github.com/PyCQA/isort"; license = licenses.mit; maintainers = with maintainers; [ couchemar nand0p ]; }; diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 12a1fd92cbe9..a62d5068f776 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.16"; + version = "1.18"; src = fetchPypi { inherit pname version; - sha256 = "8dead057b09ed4ac03c6caae7890489da1d823215ec5166789739ece941bdcbc"; + sha256 = "88ca7dd76242205dc82761bf98932a42e6c1ba338cb065f1cc775413ef4e0dc2"; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index 1999a625e4b8..14d54ef5a422 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "janus"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0700f5537d076521851d19b7625545c5e76f6d5792ab17984f28230adcc3b34c"; + sha256 = "4712e0ef75711fe5947c2db855bc96221a9a03641b52e5ae8e25c2b705dd1d0c"; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 1813ce8cac17..84096c6db4f9 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -5,17 +5,18 @@ , pytest , testpath , tornado +, trio }: buildPythonPackage rec { pname = "jeepney"; - version = "0.4.3"; + version = "0.6.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"; + sha256 = "7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"; }; propagatedBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytest testpath + trio ]; checkPhase = '' diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index e185cf8b6bdd..3cc2bb69e0e9 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.5.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "20efe98718e61ea7bd69b2178d93c5435bbf2e1ba78a47366632c84970e026c9"; + sha256 = "bca1f458206fc8be82d790685b603d4158e2034a651f2e148e31526984b9d551"; }; postPatch = '' diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index fa4fc450f1a8..16edf3c04e14 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -4,7 +4,7 @@ , fetchPypi , stdenv , numpydoc -, pytest +, pytestCheckHook , python-lz4 , setuptools , sphinx @@ -13,27 +13,29 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.16.0"; + version = "0.17.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f52bf24c64b608bf0b2563e0e47d6fcf516abc8cfafe10cfd98ad66d94f92d6"; + sha256 = "9e284edd6be6b71883a63c9b7f124738a3c16195513ad940eae7e3438de885d5"; }; - checkInputs = [ sphinx numpydoc pytest ]; + checkInputs = [ sphinx numpydoc pytestCheckHook ]; propagatedBuildInputs = [ python-lz4 setuptools ]; - # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 - # test_dispatch_multiprocessing is broken only on Darwin. - checkPhase = '' - py.test -k 'not test_disk_used${lib.optionalString (stdenv.isDarwin) " and not test_dispatch_multiprocessing"}' joblib/test - ''; + pytestFlagsArray = [ "joblib/test" ]; + disabledTests = [ + "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 + "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests + ] ++ lib.optionals stdenv.isDarwin [ + "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. + ]; - meta = { + meta = with lib; { description = "Lightweight pipelining: using Python functions as pipeline jobs"; homepage = "https://joblib.readthedocs.io/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 73bdb31da9d8..8c1fe0a7d366 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "c37ff4b93606e6a452b72cdb992da5e0544be12912fac01b31ddbdd61f6d5bd0"; + sha256 = "502a36f86efe2a6d09bf7018bca9fd8f8f24d8090a966aa037dbc844459ff9c8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index a4a66aab44ce..8971bac4b497 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.26"; + version = "1.27"; src = fetchPypi { inherit pname version; - sha256 = "e45df18b0ab7df1925f20671bbc3f6bd0b4b556fb4b9c5d97684b0a7eac01744"; + sha256 = "4d08af10d71723b5b2924da6ba90f273a4d1a5c6accfb605eb970cb2f9b29cf9"; }; # test files are missing diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index df5216bdd1a6..4fe136f69b7b 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -1,19 +1,25 @@ { stdenv, buildPythonPackage, fetchPypi -, aiohttp, jsonrpc-base, pep8 }: +, aiohttp, jsonrpc-base, pep8 +, pytestCheckHook +, pytest-asyncio +}: buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "029gxp6f06gmba7glxfdz5xfhs5kkqph7x78k38qqvdrmca4z450"; + sha256 = "c343d057b572791ed3107b771c17358bc710772a9a6156047a3cfafb409ed895"; }; nativeBuildInputs = [ pep8 ]; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + checkInputs = [ pytestCheckHook pytest-asyncio ]; + pytestFlagsArray = [ "tests.py" ]; + meta = with stdenv.lib; { description = "A JSON-RPC websocket client library for asyncio"; homepage = "https://github.com/armills/jsonrpc-websocket"; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index a53c7abee72f..570fb0a1d1a1 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "006yvxw6xv6qzcqpxm8jcf21gmdn0z4vp8njdbvk023mmq05k3h4"; + sha256 = "340915c17ebef7451948341542bf4789fc8d8c9fe604e86f00b722b6074a89f0"; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index fe40a3f09c48..54ea49c34004 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.6.3"; + version = "4.7.0"; src = fetchPypi { inherit pname version; - sha256 = "394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e"; + sha256 = "aa1f9496ab3abe72da4efe0daab0cb2233997914581f9a071e07498c6add8ed3"; }; checkInputs = [ pytest mock glibcLocales nose ]; diff --git a/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/pkgs/development/python-modules/jupyterlab-pygments/default.nix new file mode 100644 index 000000000000..f3ea20842aa5 --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab-pygments/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pygments }: + +buildPythonPackage rec { + pname = "jupyterlab_pygments"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = pname; + rev = version; + sha256 = "02lv63qalw4x6xs70n2w2p3c2cnhk91sr961wlbi77xs0g8fcman"; + }; + + # no tests exist on upstream repo + doCheck = false; + + propagatedBuildInputs = [ pygments ]; + + pythonImportsCheck = [ "jupyterlab_pygments" ]; + + meta = with lib; { + description = "Jupyterlab syntax coloring theme for pygments"; + homepage = "https://github.com/jupyterlab/jupyterlab-pygments/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 542e177e47fd..6f4c188c2f75 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.5.2"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1cebc9f5975b4c08db3de6d7d61b35f8c33a24cf2c8c04eee7b8a7aab8ddc39b"; + sha256 = "23123b90c267c67716fe6a022dfae49b84fd3809370d83211f2920eb3106bf40"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 560986f9c3d2..3e26079f1235 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "21.3.1"; + version = "21.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "182f94fc0381546489e3e4d90384a8c1d43cc09ffe2eb4a826e7312df6e1be7c"; + sha256 = "207bd66f2a9881c835dad653da04e196c678bf104f8252141d2d3c4f31051579"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index dcc16ded122d..506081659f65 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,15 +1,15 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six -, pytest, backports_unittest-mock, keyring, setuptools_scm +, pytest, backports_unittest-mock, keyring, setuptools_scm, toml }: buildPythonPackage rec { pname = "keyrings.alt"; - version = "3.4.0"; + version = "4.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "91328ac4229e70b1d0061d21bf61d36b031a6b4828f2682e38c741812f6eb23d"; + sha256 = "cd23d4c6930b5271134ac815d868164cb6d0d2252ee6dcb07fadfca26caaa230"; }; postPatch = '' @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm toml ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 393e2d134cc6..a24e7300538a 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "247800260cd38160c362d211dcaf4ed0f7816afb5efe56544748b21d6ad6d17f"; + sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index f985a7e69652..548896b47286 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "kmapper"; - version = "1.2.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0879294680c5d01a928847b818a3c4e07eded3f602f96e510858e68e74fa3783"; + sha256 = "3bb09d016ae0dc3308c2901f0775139a26e7f689afacea564a74e5627de35cd7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 560cd4383b1e..1aa22a62e19f 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.6.11"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74"; + sha256 = "f4965fba0a4718d47d470beeb5d6446e3357a62402b16c510b6a2f251e05ac3c"; }; postPatch = '' diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index d5ed1b4cc7c8..2679c81de0f0 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "11.0.0"; + version = "12.0.1"; prePatch = '' sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1a2472f8b01bc6aa87e3a34781f859bded5a5c8ff791a53d889a8bd6cc550430"; + sha256 = "ec52ea01d52e2ec3da255992f7e859f3a76f2bdb51cf65ba8cd71dfc309d8daa"; }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 063a223cbd5a..0556411ee47e 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4.6"; + version = "2.4.9"; src = fetchPypi { inherit pname version; - sha256 = "2be6c03dafce0a786cfab5d120196efccaf300cab5aee4d2fdad644b7bee1aef"; + sha256 = "488fb0b2233738c3bba3d3bf67b941f105553b7286cca3099ac0120dd247bd84"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index fe6a02c3cd7d..dc2eecb002d4 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.5.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "9723364577b79ad9958a68851fe2acb94da6fd25170c595516a8289e6a129043"; + sha256 = "5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 817fe79c3c97..2a4550d6b423 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ldaptor"; - version = "19.1.0"; + version = "20.1.1"; src = fetchPypi { inherit pname version; - sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755"; + sha256 = "778f45d68a0b5d63a892c804c05e57b464413a41d8ae52f92ae569321473ab67"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 5b68695f832e..e69e51ccf555 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.7.1"; + version = "4.8.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "0wmrcvw7k34ib93shhmjzh6kpndgqr37kyr377sril5clmac0z1f"; + sha256 = "1dvz1rkvm4309yzvj7vy49v1vskr5yfq4nzqdiydp1jb7zpvhqqm"; }; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 27144ccf1ad3..9b6aa7bc3a8d 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.7.1"; + version = "4.8.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "0mzr3ynfap51bcn6kshyi2h6iny2gpavn6g3b1xcsgzzlxqgfixf"; + sha256 = "1mxkvnhn8k1a86jlnjnlpf0b8dvrcg3n7pslf60s13cgb7w3sfzh"; }; postPatch = '' diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 396f8c5b5c53..c12888b3a8cf 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.8"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "240f65ac70ba3fab77749ec84a412e4e89624804cb80d6c9d394eef5af8878d6"; + sha256 = "sha256:0l7vj04xm0i5ikxjdqrr5939q7amh0hfp0fqifkcvyjv9fvhyz65"; }; postPatch = '' diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 4275732881cd..b99e60b8199e 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "line_profiler"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141"; + sha256 = "e73ff429236d59d48ce7028484becfa01449b3d52abdcf7337e0ff2acdc5093c"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 328e5a428fca..76cd2acd7435 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.99"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f9eb844aaaacc8a4bc175e1c1f8a8fb538c330e378fd9eb40e8708d4dca7dc89"; + sha256 = "4136ffdf0aad61da86d1402808029d002a771b2a9ccc9b39c6bcafa7847c21b6"; }; checkInputs = [ pytest cffi ]; diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix index c1320eef04ce..cdf1d46af73e 100644 --- a/pkgs/development/python-modules/lml/default.nix +++ b/pkgs/development/python-modules/lml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lml"; - version = "0.0.9"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8="; + sha256 = "57a085a29bb7991d70d41c6c3144c560a8e35b4c1030ffb36d85fa058773bcc5"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix index d5c7685832cf..015d387f27d8 100644 --- a/pkgs/development/python-modules/logzero/default.nix +++ b/pkgs/development/python-modules/logzero/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logzero"; - version = "1.5.0"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "0hli2wgwxxackrk1ybmlpdd0rzms6blm11zzwlvrzykd8cp1xyil"; + sha256 = "1435284574e409b8ec8b680f276bca04cab41f93d6eff4dc8348b7630cddf560"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index c97f74a2f2ae..22b0d5c27f89 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Markdown"; - version = "3.2.2"; + version = "3.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"; + sha256 = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 5bbf47278ce7..6c2e6ab1b634 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -26,5 +26,6 @@ buildPythonPackage rec { description = "An extension to the Python Markdown package enabling superscript text"; homepage = "https://github.com/jambonrose/markdown_superscript_extension"; license = stdenv.lib.licenses.bsd2; + broken = true; # unmaintained in nixpkgs, barely maintained in pypi, added 2020-11-29 }; } diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 60a2704894b9..4bf670082b61 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.23.1"; + version = "0.24.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0ef59c8da8da2e18e808e3880158049e9d72f3031c84cc804b6c533a0eb668a9"; + sha256 = "d051cf013c075c43e1ee5c4b01f8fab6dd6b140dab6825be45875f674a0d289c"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index cf54e38385df..afc378d4aaa8 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.7.1"; + version = "3.9.1"; disabled = isPy27; meta = { @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a2a5eefb4b75a3b43f05be1cca0b6686adf56af7465c3ca629e5ad8d1e1fe13d"; + sha256 = "73facc37462dfc0b27f571bdaffbef7709e19f7a616beb3802ea425b07843f4e"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix index f9c1cf6839f0..969a91870b0f 100644 --- a/pkgs/development/python-modules/mathlibtools/default.nix +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "mathlibtools"; - version = "0.0.10"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0d708bgsxjhhchqc56afi1h7k87vbfn7v40f4y1zlv7hsjc69s36"; + sha256 = "da41c65e206f55b1faea303581fc11215e52d6e6990b827336b2e1eb82aad96c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index f8adc0d0986b..5ad3c92393d8 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -20,14 +20,14 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt5 != null; buildPythonPackage rec { - version = "3.3.2"; + version = "3.3.3"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3d2edbf59367f03cd9daf42939ca06383a7d7803e3993eb5ff1bee8e8a3fbb6b"; + sha256 = "b1b60c6476c4cfe9e5cf8ab0d3127476fd3d5f05de0f343a452badaad0e4bdec"; }; XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index edcf887b095d..e3abdaa70916 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "eefdff160ba231acb21afab5c775bc2e024b3164c637a23b599b270d45feb32d"; + sha256 = "62abe28a1155398325372291483608427bc82681fef80e7d132904415f9fd42e"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix new file mode 100644 index 000000000000..adee40650bce --- /dev/null +++ b/pkgs/development/python-modules/milc/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, appdirs +, argcomplete +, colorama +, gnugrep +}: + +buildPythonPackage rec { + pname = "milc"; + version = "1.0.10"; + + src = fetchFromGitHub { + owner = "clueboard"; + repo = "milc"; + rev = version; + sha256 = "04mk057b6jh0k4maqkg80kpilxak9r7vlr9xqwzczh2gs3g2x573"; + }; + + checkInputs = [ gnugrep ]; + propagatedBuildInputs = [ appdirs argcomplete colorama ]; + + # Upstream has a nose2 test suite that runs this hello script in a handful of + # ways, but it's not in setup.py and makes assumptions about relative paths in + # the src repo, so just sanity-check basic functionality. + checkPhase = '' + patchShebangs ./hello + ./hello | grep "Hello, World" + ''; + + meta = with stdenv.lib; { + description = "An Opinionated Batteries-Included Python 3 CLI Framework"; + homepage = "https://milc.clueboard.co"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 7799a7a9ef6d..00ea5b06c646 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "minio"; - version = "6.0.0"; + version = "6.0.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "97d275ff01ddae45101eced0d9d5258f2869308c949b17d86a77b77a2a50b7b3"; + sha256 = "acae9bfae0aec1b92025bd63e18135ebb4994c84600716c5323e14cb0c9a0b03"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 1acd8bf56907..e86a27e1657f 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.10.0"; + version = "1.12.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "11fe050373f3dbd422aa476c42cb0ed15467268bc1ad07e221e550bc54f94b75"; + sha256 = "9b8af18d6e779fbbb094edfeb963691e485bba62eeec39fd62dfbe34bc12afeb"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index ec6ce4ed3b26..74c214d9231d 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.4.0"; + version = "8.6.0"; src = fetchPypi { inherit pname version; - sha256 = "68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5"; + sha256 = "b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index d818a63cd5d0..43cbbbc6b777 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multidict"; - version = "4.7.6"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430"; + sha256 = "e5bf89fe57f702a046c7ec718fe330ed50efd4bcf74722940db2eb0919cddb1c"; }; checkInputs = [ pytest pytestrunner pytestcov ]; diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index 0df36385c0cd..3df0e2b01f3b 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k , pytestCheckHook }: @@ -16,6 +17,15 @@ buildPythonPackage rec { sha256 = "fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03"; }; + patches = [ + # Fixes test on 32-bit systems. + # Remove if https://github.com/bmc/munkres/pull/41 is merged. + (fetchpatch { + url = "https://github.com/bmc/munkres/commit/380a0d593a0569a761c4a035edaa4414c3b4b31d.patch"; + sha256 = "0ga63k68r2080blzi04ajdl1m6xd87mmlqa8hxn9hyixrg1682vb"; + }) + ]; + checkInputs = [ pytestCheckHook ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index bfe486e1a54a..e4c42496597e 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "7.0.1"; + version = "7.1.0"; checkInputs = [ pytest @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a633464dc3a22b305df0f27abcb3e83515898aa1fd0ed2f9726c3571a27258cf"; + sha256 = "33f3f1003e2af4b4df20908fe62aa029999d136b966463746942efbfc821add3"; }; # Does not support Python 2 diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 168818caf666..f37cb3bc58f9 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, async_generator, traitlets, nbformat, nest-asyncio, jupyter_client, pytest, xmltodict, nbconvert, ipywidgets +, doCheck ? true }: buildPythonPackage rec { @@ -13,6 +14,7 @@ buildPythonPackage rec { sha256 = "01e2d726d16eaf2cde6db74a87e2451453547e8832d142f73f72fddcd4fe0250"; }; + inherit doCheck; checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ]; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 49e4862999c7..582a6132c259 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage , fetchPypi -, pytest -, nose +, pytestCheckHook , glibcLocales , entrypoints , bleach , mistune +, nbclient , jinja2 , pygments , traitlets , testpath , jupyter_core +, jupyterlab-pygments , nbformat , ipykernel , pandocfilters @@ -22,28 +23,46 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "5.6.1"; + version = "6.0.7"; src = fetchPypi { inherit pname version; - sha256 = "21fb48e700b43e82ba0e3142421a659d7739b65568cc832a13976a77be16b523"; + sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"; }; - checkInputs = [ nose pytest glibcLocales ]; + checkInputs = [ pytestCheckHook glibcLocales ]; propagatedBuildInputs = [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client defusedxml + (nbclient.override { doCheck = false; }) # avoid infinite recursion + jupyterlab-pygments ]; # disable preprocessor tests for ipython 7 # see issue https://github.com/jupyter/nbconvert/issues/898 - checkPhase = '' + preCheck = '' export LC_ALL=en_US.UTF-8 - HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py" + HOME=$(mktemp -d) ''; + pytestFlagsArray = [ + "--ignore=nbconvert/preprocessors/tests/test_execute.py" + # can't resolve template paths within sandbox + "--ignore=nbconvert/tests/base.py" + "--ignore=nbconvert/tests/test_nbconvertapp.py" + ]; + + + disabledTests = [ + "test_export" + "test_webpdf_without_chromium" + #"test_cell_tag_output" + #"test_convert_from_stdin" + #"test_convert_full_qualified_name" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 7e774eed2962..1de21f3511a4 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "2.0.0"; + version = "2.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0pbi22mc5al29pvsw7bhai2d58i8n77gv09r7avr1wap6ni7jvw9"; + sha256 = "4e3efdcfda31c3074cb565cd8e76e2e5421b1c4560c3a00c56f8679dd15590e5"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 631beabea8a2..e5db8450e788 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "neo"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0n74miad4dadavnzi1hqlyzyk795x7qq2adp71i011534ixs70ik"; + sha256 = "6e31c88d7c52174fa2512df589b2b5003e9471fde27fca9f315f4770ba3bd3cb"; }; propagatedBuildInputs = [ numpy quantities ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 533977aa6d98..56c6044ba746 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.4.3"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "c614fcfaca72b1f04778bc0e73f49c84500b3d045c49d149fc46f1566643c175"; + sha256 = "eaa09ef1353ebefae19162ad423eef7a12166bcc63866f8bff8f3635353cd9fa"; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 6075daf58467..27f6082ac568 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.4"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "0r2wr7aqay9fwjrgk35fkjzk8lvvb4i4df7ndaqzkr4ndw5zzx7q"; + sha256 = "7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602"; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 04fe19377f8e..116fa153cdad 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.1.4"; + version = "6.1.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0cnyi4zd3byh7zixdj2q71axm31xgjiyfklh1c63c87acgwh2zb8"; + sha256 = "3db37ae834c5f3b6378381229d0e5dfcbfb558d08c8ce646b1ad355147f5e91d"; }; LC_ALL = "en_US.utf8"; @@ -67,6 +67,7 @@ buildPythonPackage rec { "TestInstallServerExtension" "launch_socket" "sock_server" + "test_list_formats" # tries to find python MIME type ] ++ lib.optional stdenv.isDarwin [ "test_delete" "test_checkpoints_follow_file" diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 4772fc295349..46c72fb69794 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "notify_py"; - version = "0.2.4"; + version = "0.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2a19273a476c8b003baa96650d00a81c5981c3a17ada748bc0a73aefad46d977"; + sha256 = "5ba696d18ffe1d7070f3d0a5b4923fee4d6c863de6843af105bec0ce9915ebad"; }; postPatch = '' diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 208178f5e11b..f628daf833b4 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.24"; + version = "1.25"; pname = "numericalunits"; src = fetchPypi { inherit pname version; - sha256 = "0wn7kqp0rxqr6gnqhdn8pc0wy359krzan0kbika6hfvb0c1rw1hs"; + sha256 = "c32a482adae818a1a8d6c799bf9fb153326461d490c0de9deab9c694a6537eec"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 2207d4244edc..cb43084556e8 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.12.0"; + version = "2.13.0"; src = fetchPypi { inherit pname version; - sha256 = "10912d7749ab02b0ee2ee61fc04c38fa211fc9d00a9b73a7d1c2465c53c1abf5"; + sha256 = "648386e6cdad3218adc4e3e6a349bee41c55a61980dace616c05d6a31e8c652d"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 622f784fb8ba..51eeab3177e2 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -4,13 +4,14 @@ , buildPythonPackage , gfortran , hypothesis -, pytest +, pytest_5 , blas , lapack , writeTextFile , isPyPy , cython , setuptoolsBuildHook +, fetchpatch }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -48,10 +49,16 @@ in buildPythonPackage rec { sha256 = "141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512"; }; - nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; + nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ]; buildInputs = [ blas lapack ]; - patches = lib.optionals python.hasDistutilsCxxPatch [ + patches = [ + # For compatibility with newer pytest + (fetchpatch { + url = "https://github.com/numpy/numpy/commit/ba315034759fbf91c61bb55390edc86e7b2627f3.patch"; + sha256 = "F2P5q61CyhqsZfwkLmxb7A9YdE+43FXLbQkSjop2rVY="; + }) + ] ++ lib.optionals python.hasDistutilsCxxPatch [ # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 # Patching of numpy.distutils is needed to prevent it from undoing the # patch to distutils. @@ -75,7 +82,10 @@ in buildPythonPackage rec { doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) - checkInputs = [ hypothesis ]; + checkInputs = [ + pytest_5 # pytest 6 will error: "module is already imported: hypothesis" + hypothesis + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 1c25d6acd55b..8b2943ba363a 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "0.3.9"; + version = "0.6.2"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "1f2f42f058afd30456e47b6b92a6b7b15100f6bca0a29108ace95bd5147a8e86"; + sha256 = "48b6802722d78542ca5d7bbc0d6aa9b0a31e1be0070c47b41527f227eb6a1443"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index f499470e25c7..8e4ece43fd7b 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "opentracing"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0rcpmhy7hm6ljlm1w455il53s1amq2vii2x1wfkrcx3sj4s0dc9k"; + sha256 = "a173117e6ef580d55874734d1fa7ecb6f3655160b8b8974a2a1e98e5ec9c840d"; }; propagatedBuildInputs = lib.optional isPy27 futures; diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index 6e7593cec1c3..f03307ead147 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "outcome"; - version = "1.0.1"; + version = "1.1.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "fc7822068ba7dd0fc2532743611e8a73246708d3564e29a39f93d6ab3701b66f"; + sha256 = "e862f01d4e626e63e8f92c38d1f8d5546d3f9cce989263c521b2e7990d186967"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/packaging/2.nix b/pkgs/development/python-modules/packaging/2.nix new file mode 100644 index 000000000000..36764e64b860 --- /dev/null +++ b/pkgs/development/python-modules/packaging/2.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyparsing +, six +, pytestCheckHook +, pretend +, flit-core +}: + +# We keep 20.4 because it uses setuptools instead of flit-core +# which requires Python 3 to build a universal wheel. + +buildPythonPackage rec { + pname = "packaging"; + version = "20.4"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"; + }; + + propagatedBuildInputs = [ pyparsing six ]; + + checkInputs = [ + pytestCheckHook + pretend + ]; + + # Prevent circular dependency + doCheck = false; + + meta = with stdenv.lib; { + description = "Core utilities for Python packages"; + homepage = "https://github.com/pypa/packaging"; + license = [ licenses.bsd2 licenses.asl20 ]; + maintainers = with maintainers; [ bennofs ]; + }; +} diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index abe58d03ef37..061e8edaac6f 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -1,18 +1,33 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pyparsing, six, pytest, pretend }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pyparsing +, six +, pytestCheckHook +, pretend +, flit-core +}: buildPythonPackage rec { pname = "packaging"; - version = "20.4"; + version = "20.7"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"; + sha256 = "Ba87uF0yA3fbKBzyVKsFDhp+vL9UEGhamkB+GKH4EjY="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ pyparsing six ]; - checkInputs = [ pytest pretend ]; + checkInputs = [ + pytestCheckHook + pretend + ]; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 09cda2797300..8353e8d7895f 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.3.0"; + version = "3.0.1"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "1s4lwbsiikz3czqad7jarb7k303q0wamla0rirghvwl9bslgbl2w"; + sha256 = "0a9b49bde3f554ec49b47ebdb789133979985f24d5f4698935ed589a2d4392a4"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 0fc7bf7ee291..10dafc0072a3 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -13,6 +13,8 @@ buildPythonPackage rec { pname = "panel"; version = "0.9.7"; + # Version 10 attempts to download models from the web during build-time + # https://github.com/holoviz/panel/issues/1819 src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 0e5c62277af2..56536de8446b 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.1.3"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "ecd4cafa9179693b0eedc3b6f4560f9ee47826a6e366e42bfa3cc20f7931b3f8"; + sha256 = "1c452b1c5a9ab52b94c99d8b7705ae7173f6aa88a3d28a5d30cffba48a46f5b6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index a6dacf0402ee..45f4a66f2605 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "parfive"; - version = "1.1.1"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5793fdf9859a9a9fc93f033db9dc067a89626910355a14bbe425feb3956df6db"; + sha256 = "118a0994bbb9536fd4574995a8485b6c4b97db247c55bc86ae4f4ae8fd9b0add"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index 46601c167553..81d9e50b28ff 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "patator"; - version = "0.7"; + version = "0.9"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1"; + sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index bb52cd51a141..cd51747d5678 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "da45173eb3a6f2a5a487efba21f050af2b41948be6ab52b6a1e3ff22bb8b7061"; + sha256 = "86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd"; }; meta = { diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 5e0be5fb62b0..bc7c6399473b 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.4.5"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "07f558fece33b05caf857474a366dfcc00562bca13dd8b47b2b3e22d9f9bf55c"; + sha256 = "5fad80b613c402d5b7df7bd84812548b2a61e9977387a80a5fc5c396492b13c9"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 64430ca7e1f0..e85df06b5002 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder -, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build }: +, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }: buildPythonPackage rec { pname = "pc-ble-driver-py"; version = "0.14.2"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "NordicSemiconductor"; diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index e1f68109c055..d544f27b988b 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pdoc3"; - version = "0.9.1"; + version = "0.9.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "15482rvpg5r70gippj3nbl58x9plgmgvp0rg4xi4dpdqhma8v171"; + sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1"; }; nativeBuildInputs = [ setuptools-git setuptools_scm ]; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 78bb61d03cfb..0bbbf551f280 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.20"; + version = "2.1.21"; src = fetchPypi { inherit pname version; - sha256 = "2f1cf9721aa5fce93b034d2a18922d34d6f5fb81236ab3a955706226b15658fd"; + sha256 = "d580a26da1b342ab2ebbf675ba2bab04e98c4d1aaf2a6fea09f41d68dfc466ba"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 032524fc5df3..767140e6bf8f 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.12"; + version = "1.14"; src = fetchPypi { inherit pname version; - sha256 = "b5d6a105928d2285e43afb87d638ada844ed8933cc306c23a3c095684f3d3af4"; + sha256 = "72652b9edc7bdbfc9c3192235fb2fa1b2fb73a681613368fcaec747d7f5e479f"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 5f961b8e18ea..62149a788665 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.12.12"; + version = "8.12.13"; src = fetchPypi { inherit pname version; - sha256 = "70aa98a50ba7bc7f6bf17851f806c927107e7c44e7d21eb46bdbec07b99d23ae"; + sha256 = "96d02120a3481e22d8a8eb5e4595ceec1930855749f6e4a06ef931881f59f562"; }; meta = { diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 3db9a2642c7c..a5f512fae97f 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -7,11 +7,12 @@ , lxml , pillow , pybind11 -, pytest +, pytestCheckHook , pytest-helpers-namespace , pytest-timeout , pytest_xdist , pytestrunner +, python-dateutil , python-xmp-toolkit , python3 , qpdf @@ -22,12 +23,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.18.0"; + version = "2.2.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4d0840a5c16b535f9b6e56fb4421a43f88760e6cabcf7fd44bdd0436107b61dc"; + sha256 = "74300a32c41b3d578772f6933f23a88b19f74484185e71e5225ce2f7ea5aea78"; }; buildInputs = [ @@ -44,11 +45,12 @@ buildPythonPackage rec { attrs hypothesis pillow - pytest + pytestCheckHook pytest-helpers-namespace pytest-timeout pytest_xdist pytestrunner + python-dateutil python-xmp-toolkit ]; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index ab971e4201b5..199bdae8fc25 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "Pillow"; - version = "7.2.0"; + version = "8.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626"; + sha256 = "11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e"; }; # Disable imagefont tests, because they don't work well with infinality: diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 4eded1a6210a..0952c7056c31 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "084z41f8mh9g7pnmbqd2cn5dq3v05qjcrnj1ifpn2nfny86rklx4"; + sha256 = "a4d3990df2d65961af8b41dacc242e600fdc8a65a2e155ed3d2fc18a5c209f20"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index d451ca4a9b25..f35ed6b3d116 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,32 +10,23 @@ , pytest , setuptools , wheel -, isPy27 -, fetchpatch }: buildPythonPackage rec { pname = "pip"; - version = "20.2.4"; + version = "20.3"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do="; + sha256 = "e/2/0MrGY3myELmvuTAbNfXCBuT8kmvz9qTwITdDtQU="; name = "${pname}-${version}-source"; }; nativeBuildInputs = [ bootstrapped-pip ]; - patches = lib.optionals isPy27 [ - (fetchpatch { - url = "https://github.com/pypa/pip/commit/94fbb6cf78c267bf7cdf83eeeb2536ad56cfe639.patch"; - sha256 = "Z6x5yxBp8QkU/GOfb1ltI0dVt//MaI09XK3cdY42kFs="; - }) - ]; - # pip detects that we already have bootstrapped_pip "installed", so we need # to force it a little. pipInstallFlags = [ "--ignore-installed" ]; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 55c954c20f94..7a0fc2080702 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.5.0.1"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"; + sha256 = "a6a4ac943b496745cec21f14f021bbd869d5e9b4f6ec06918cffea5a2f4b9193"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 6d9756d11fba..aa329953a391 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.1.0"; + version = "7.2.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "04mm1iqpmd6qwxmkm85k263avd42xvsmjsa24r8ggfjcw0w4lq6j"; + sha256 = "bd599b384f94d8883344925f0ef223e1ab50f218872434aa40ba8c645937699c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index cc33babd64ba..f11cf1c0984c 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.9.0"; + version = "4.13.0"; src = fetchPypi { inherit pname version; - sha256 = "257f530ffd73754bd008454826905657b329053364597479bb9774437a396837"; + sha256 = "20df14f7883807f57d96ac245841e086a1799f2c2778462a7f3bca704e369c66"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index 9b9b453e56a1..c768c606ca8a 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1xkgj58i66w4h6gwp6fn6xj5nkrad6kxz3byhy9q1j94jml1ns1x"; + sha256 = "a7a09033a0fd33ca47094e8bbe01714abfcf644f4b7a337d3970e91a2599e2c4"; }; buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 6f96a611168c..d5d4e36d3a37 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -35,7 +35,6 @@ buildPythonPackage rec { ]; checkInputs = [ - isort pep517 pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index c69e4fc4867c..1ed0a7cafffb 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.13"; + version = "0.7.14"; src = fetchPypi { inherit pname version; - sha256 = "1fqc45m106xfy4hhzzwb8p7s2fh5x2x7s143dib84lbszqwp77la"; + sha256 = "2f01e84e79ea7a14040225cb6c079bb266e7ba147346356c266490b18c77ce82"; }; doCheck = true; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 378035bb7a51..6530cbd4a5d1 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -10,17 +10,19 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.0.0"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1k2vinlhkzl7lzhvbz20x3a2r2zqqila0yxg3a3fax2r6qxbxxzi"; + sha256 = "30d448e825904e2d763bbbe418831a788813c32f636b21c8d60ee5f474532898"; }; propagatedBuildInputs = [ packaging appdirs requests ]; + preCheck = "HOME=$TMPDIR"; checkInputs = [ pytestCheckHook ]; + # tries to touch network disabledTests = [ "pooch_custom_url" "pooch_download" @@ -29,6 +31,8 @@ buildPythonPackage rec { "pooch_corrupted" "check_availability" "downloader" + "test_retrieve" + "test_stream_download" "test_fetch" "decompress" "extractprocessor_fails" diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index b5650f7dda01..280cadf4db4e 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -3,14 +3,13 @@ buildPythonPackage rec { pname = "portend"; - version = "2.6"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "600dd54175e17e9347e5f3d4217aa8bcf4bf4fa5ffbc4df034e5ec1ba7cdaff5"; + sha256 = "ac0e57ae557f75dc47467579980af152e8f60bc2139547eff8469777d9110379"; }; - patches = [ ./black-19.10b0.patch ]; postPatch = '' substituteInPlace pytest.ini --replace "--flake8" "" ''; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index c408782a423b..a544d6fab910 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -9,11 +9,11 @@ }: buildPythonPackage rec { pname = "preshed"; - version = "3.0.3"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "8ad47d5d2688fabc66850f32c7b6d3b4a97e6b653726309fe09603edd6fceb23"; + sha256 = "13a779205d55ce323976ac06df597f9ec2d6f0563ebcf5652176cf4520c7d540"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index bf1035316a69..bc8bd3f835d6 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -2,23 +2,32 @@ , buildPythonPackage , fetchPypi , glibcLocales +, setuptools_scm +, wcwidth }: buildPythonPackage rec { pname = "prettytable"; - version = "0.7.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1ndckiniasacfqcdafzs04plskrcigk7vxprr2y34jmpkpf60m1d"; + sha256 = "e37acd91976fe6119172771520e58d1742c8479703489321dc1d9c85e7259922"; }; + nativeBuildInputs = [ setuptools_scm ]; buildInputs = [ glibcLocales ]; + propagatedBuildInputs = [ wcwidth ]; + preCheck = '' export LANG="en_US.UTF-8" ''; + # no test no longer available in pypi package + doCheck = false; + pythonImportsCheck = [ "prettytable" ]; + meta = with stdenv.lib; { description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; homepage = "http://code.google.com/p/prettytable/"; diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index 8f608666d720..e4cf4e85af0f 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "c6e6b706833a6bd1fd51711299edee907857be10ece535126a158f911ee80915"; + sha256 = "9da7b32f02439d8c04f7777021c304ed51d9ec180604700c1ba72a4d44dceb03"; }; doCheck = false; diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 1dfc671c532b..3844a0fade9e 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "prov"; - version = "1.5.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1a9h406laclxalmdny37m0yyw7y17n359akclbahimdggq853jd0"; + sha256 = "b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee"; }; prePatch = '' diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix new file mode 100644 index 000000000000..99a0df654fca --- /dev/null +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, fetchPypi, flask, isPy27, lib, prometheus_client +, py-air-control, pytestCheckHook, pytestcov, pytestrunner, setuptools_scm }: + +buildPythonPackage rec { + pname = "py-air-control-exporter"; + version = "0.1.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1f13d3mlj6c3xvkclimahx7gpqqn8z56lh4kwy1d3gkjm7zs9zw9"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytestCheckHook pytestcov pytestrunner ]; + propagatedBuildInputs = [ flask prometheus_client py-air-control ]; + + meta = with lib; { + description = "Exports Air Quality Metrics to Prometheus."; + homepage = "https://github.com/urbas/py-air-control-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index a99dacf6204b..03f142a8aba6 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.28"; + version = "3.31"; src = fetchPypi { inherit pname version; - sha256 = "103c63f43ddfd86e5a3f0bebb34b0f2eaaf6dbd58281d25c8a16937eb8e7f194"; + sha256 = "426cff33c1d3a5ee6ae388089fd41dc47c4221800f43bd51779f823c781fb83b"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 2ecdfb17aa2d..ea5c93dbeaa1 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.7.3"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "ce42d84442ff2ce4918de6550cf377253f61e28e4fac2634495683d12df66d00"; + sha256 = "9b95f441c390fd30a4452a984406310f60a7f4803df57860ccb6a79881506c46"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index d6d66e754952..9cca6cf57efc 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { - version = "0.12.3"; + version = "0.12.4"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "a084172ae5b26a5f26b17186ade98400cda52d9244d9f0b329041741ea82b5db"; + sha256 = "830f3f518ab0d2e058e9ba6d6ff9a942792909c874433b3ad58a3339a23f46bf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index dd258f427188..a62e7e27f9cf 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: buildPythonPackage rec { - version = "0.22.2"; + version = "0.23.0"; pname = "pybtex"; doCheck = false; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "00816e5f8570609d8ce3360cd23916bd3e50428a3508127578fdb4dc2b731c1c"; + sha256 = "b92be18ccd5e9a37895949dcf359a1f6890246b73646dddf1129178ee12e4bef"; }; meta = { diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 629fdd0114d8..1997021ce010 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pycapnp"; - version = "0.6.4"; + version = "1.0.0"; disabled = isPyPy || isPy3k; src = fetchPypi { inherit pname version; - sha256 = "44e14a5ace399cf1753acb8bbce558b8c895c48fd2102d266c34eaff286824cf"; + sha256 = "9f6fcca349ebf2ec04ca7eacb076aea3e4fcdc010ac33c98b54f0a19d4e5d3e0"; }; buildInputs = [ capnproto cython ]; diff --git a/pkgs/development/python-modules/pycxx/default.nix b/pkgs/development/python-modules/pycxx/default.nix new file mode 100644 index 000000000000..c0cf0ac0dc13 --- /dev/null +++ b/pkgs/development/python-modules/pycxx/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchurl, python }: + +buildPythonPackage rec { + pname = "pycxx"; + version = "7.1.4"; + + src = fetchurl { + url = "mirror://sourceforge/cxx/CXX/PyCXX%20V${version}/pycxx-${version}.tar.gz"; + sha256 = "MUMU+/qsm92WENYFxfjQsSuR8/nE/asYG8HgIbaAaz0="; + }; + + outputs = [ "out" "dev" ]; + + postInstall = '' + mkdir -p $dev/include + mv $out/include/${python.libPrefix}*/CXX/ $dev/include/CXX/ + mv $out/CXX $dev/src + sed -i "s|Src|$dev/src|" $dev/src/cxxextensions.c $dev/src/cxxsupport.cxx + ''; + + meta = with lib; { + description = "set of classes to help create extensions of Python in the C++ language"; + homepage = "https://sourceforge.net/projects/cxx/"; + maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index e6602ba9da2c..24186c09dcd5 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -10,13 +10,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.1"; pname = "pydicom"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "594c91f715c415ef439f498351ae68fb770c776fc5aa72f3c87eb500dc2a7470"; + sha256 = "72a11086f6a277c1529a552583fde73e03256a912173f15e9bc256e5b28f28f1"; }; propagatedBuildInputs = [ numpy pillow ]; diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 0b2f4560d354..3c92dee783ad 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyee"; - version = "7.0.4"; + version = "8.1.0"; src = fetchPypi { inherit pname version; - sha256 = "105n8jzw8vy6cm8mm5sm86mwyaqqr8zjh8w9xvcb7hp29p0vrihm"; + sha256 = "92dacc5bd2bdb8f95aa8dd2585d47ca1c4840e2adb95ccf90034d64f725bfd31"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 7c1dc4fbb0d9..6f44b7fb2796 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "4.1.0"; + version = "4.3.2"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "bbbaa8b622fa50751a5839350fff3c1f8b1bbd364cd40fd0c7442e18fe5edc8e"; + sha256 = "dfeed4715e2056e3e56b9c5f51a679ce2934897eef926f3d14e5364e43f19070"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 8f9a9e5e59c3..81c4d4a4b9c1 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.6"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957"; + sha256 = "63b038da116a643046181b02173fd894d87d2f85ecfd6aa7d5ece73c6ef501e9"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index c2c5ca826bcf..5326a1963aa8 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0be93f6a8d7cbf0cc79ae2f0afb1993fc055fc0018c27e2bd01ba143e51d4452"; + sha256 = "cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix new file mode 100644 index 000000000000..7e31e788f31e --- /dev/null +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: + +buildPythonPackage rec { + pname = "pygobject"; + version = "3.36.1"; + + format = "other"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8="; + }; + + outputs = [ "out" "dev" ]; + + mesonFlags = [ + "-Dpython=python${if isPy3k then "3" else "2" }" + ]; + + nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; + buildInputs = [ glib gobject-introspection ] + ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; + propagatedBuildInputs = [ pycairo cairo ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "python3.pkgs.${pname}3"; + }; + }; + + meta = with stdenv.lib; { + homepage = "https://pygobject.readthedocs.io/"; + description = "Python bindings for Glib"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pygtrie/default.nix b/pkgs/development/python-modules/pygtrie/default.nix index 5bfd991b4841..e22af4b52068 100644 --- a/pkgs/development/python-modules/pygtrie/default.nix +++ b/pkgs/development/python-modules/pygtrie/default.nix @@ -1,10 +1,10 @@ { lib, fetchPypi, buildPythonPackage, ... }: buildPythonPackage rec { pname = "pygtrie"; - version = "2.3"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "00x7q4p9r75zdnw3a8vd0d0w0i5l28w408g5bsfl787yv6b1h9i8"; + sha256 = "4367b87d92eaf475107421dce0295a9d4d72156702908c96c430a426b654aee7"; }; meta = { homepage = "https://github.com/mina86/pygtrie"; diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index b6ef4bc4a8ba..1a32851e6f38 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "pyhaversion"; - version = "3.3.0"; + version = "3.4.2"; # needs aiohttp which is py3k-only disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "376a1b232a26035bc82d64affa1c4f312d782234fe5453e8d0f9e1350a97be5b"; + sha256 = "b4e49dfa0f9dae10edd072e630d902e5497daa312baad58b7df7618efe863377"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykdl/default.nix b/pkgs/development/python-modules/pykdl/default.nix index 5fc38cd5dd4d..674a43f5f3e0 100644 --- a/pkgs/development/python-modules/pykdl/default.nix +++ b/pkgs/development/python-modules/pykdl/default.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, toPythonModule, cmake, orocos-kdl, python, sip }: +{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip }: toPythonModule (stdenv.mkDerivation { pname = "pykdl"; inherit (orocos-kdl) version src; + patches = [ + # Fix build with SIP 4.19.23+. Can be removed with version 1.5. + # https://github.com/orocos/orocos_kinematics_dynamics/pull/270 + (fetchpatch { + url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/d8d087ad0e1c41f3489d1a255ebfa27b5695196b.patch"; + sha256 = "0qyskqxv4a982kidzzyh34xj2iiw791ipbbl29jg4qb4l21xwqlg"; + stripLen = 1; + }) + ]; + sourceRoot = "source/python_orocos_kdl"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index f266d17bb460..9f355743ead2 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.1"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "0d49d3bbfa0366dbe29176754ec86df75114a25525b530dcbbb75d3ac4c263e9"; + sha256 = "bebe5c608129f2997e88510c00010b9a78581b394924c0e3ecd131d52415165d"; }; buildInputs = [ openmp ]; diff --git a/pkgs/development/python-modules/pylibacl/0.5.nix b/pkgs/development/python-modules/pylibacl/0.5.nix new file mode 100644 index 000000000000..284a795b4c22 --- /dev/null +++ b/pkgs/development/python-modules/pylibacl/0.5.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkgs +}: + +buildPythonPackage rec { + pname = "pylibacl"; + version = "0.5.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0drvxb21y7p0aikcv3jx90vdcjk96kibf9x8qgxic2prxxd3f3q6"; + }; + + # ERROR: testExtended (tests.test_acls.AclExtensions) + # IOError: [Errno 0] Error + doCheck = false; + + buildInputs = with pkgs; [ acl ]; + + meta = { + description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index 08d598c72db6..6bc0d74b5bae 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pylibacl"; - version = "0.5.4"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "060f375aeff90a16fbc3a827b7e234694ad636485d8ecd6654e01e1fc4ea3b37"; + sha256 = "88a0a4322e3a62d797d61f96ec7f38d1c471c48a3cc3cedb32ab5c20aa98d9ff"; }; # ERROR: testExtended (tests.test_acls.AclExtensions) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 635d951f56eb..6a059eae5bf6 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,17 +1,35 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, plotly, networkx }: +{ stdenv, buildPythonPackage, fetchPypi +, enum34 +, glibcLocales +, matplotlib +, monty +, networkx +, numpy +, palettable +, pandas +, plotly +, pydispatcher +, requests +, ruamel_yaml +, scipy +, six +, spglib +, sympy +, tabulate +, uncertainties +}: buildPythonPackage rec { pname = "pymatgen"; - version = "2020.8.13"; + version = "2020.11.11"; src = fetchPypi { inherit pname version; - sha256 = "23e5885e15195b37ce4c16ef93f474f741cb98451fa8dd4c319ec121f4887256"; + sha256 = "2c51c2c8862ea0d59346114f43be9e65ea134ed5b2bbd8dae766c4f6b02f5e3c"; }; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ enum34 matplotlib @@ -29,6 +47,7 @@ buildPythonPackage rec { spglib sympy tabulate + uncertainties ]; # No tests in pypi tarball. diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index a0575bbfede7..8438df73c1c4 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "4.2.1"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0vg2icmsc44k1ra898rjfp912xijsn96s0zplax6w13lpzb9jb9r"; + sha256 = "ea61a3b0e0ed6de42ebb2233cf1a9312c57dce95101c025f9f081c10ecec48fb"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 2838362f1dba..18c697fec445 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.11.0"; + version = "3.11.1"; src = fetchPypi { inherit pname version; - sha256 = "076a7f2f7c251635cf6116ac8e45eefac77758ee5a77ab7bd2f63999e957613b"; + sha256 = "a9c1a2538cd120283e7137ac97ce27ebdfcb675730c5055d6332b0043f4e5a55"; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 5ce85acc194e..dfce6652d03a 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -5,7 +5,7 @@ , libsodium , cffi , six -, hypothesis_4 +, hypothesis }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal"; }; - checkInputs = [ pytest hypothesis_4 ]; + checkInputs = [ pytest hypothesis ]; buildInputs = [ libsodium ]; propagatedBuildInputs = [ cffi six ]; diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix new file mode 100644 index 000000000000..3a7c6b43392b --- /dev/null +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake +, pythonOlder, libnest2d, sip, clipper }: + +buildPythonPackage rec { + version = "4.8.0"; + pname = "pynest2d"; + format = "other"; + + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "pynest2d"; + rev = version; + sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; + }; + + propagatedBuildInputs = [ libnest2d sip clipper ]; + nativeBuildInputs = [ cmake ]; + + CLIPPER_PATH = "${clipper.out}"; + + postPatch = '' + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' cmake/SIPMacros.cmake + ''; + + meta = with stdenv.lib; { + description = "Python bindings for libnest2d"; + homepage = "https://github.com/Ultimaker/pynest2d"; + license = licenses.lgpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 27e41f300c72..e2ead68d11b9 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynisher"; - version = "0.5.0"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "1b1079315ad1009de108c9ad701f6ae5274264e64503fc22c2de366d99953f34"; + sha256 = "e4e1d9366fc4ca60b4b2354b6d12e65600600a8c7bf4392c84f2f4ff4abc85ff"; }; propagatedBuildInputs = [ psutil docutils ]; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 2b83f4c1223b..b525f22b2d34 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }: +{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }: buildPythonPackage rec { pname = "pynput"; - version = "1.6.8"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8"; + sha256 = "5a5598bfb14322eff980ac6ca820635fce9028faa4f64a8e1581243aaf6785ee"; }; nativeBuildInputs = [ sphinx ]; - propagatedBuildInputs = [ setuptools-lint xlib ]; + propagatedBuildInputs = [ setuptools-lint xlib ] + ++ stdenv.lib.optionals stdenv.isLinux [ + evdev + ]; doCheck = false; diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index a9acf1e5586a..9799cbaf0e8f 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "6.2.2"; + version = "7.0"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d5b87e9fa4cc9b51bf37f9a461887e2d8b9ae7e6bb45675f8edbe35ea6770455"; + sha256 = "2b6c3e98f1408564ace1df36927154d7827c8e2f382386ab5d2db95c891e35a0"; }; meta = { diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 4552fab5b856..297757687688 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2020.2.2"; + version = "2020.3.1"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "31fcc79fb6862998e98d91a624c0bd4f0ab4c5d418d199912d4d312c64e437ec"; + sha256 = "abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index b23cb010f017..c000283e6de8 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, isPy27, substituteAll , aenum , cython -, pytest +, pytestCheckHook , mock , numpy , shapely @@ -34,20 +34,23 @@ buildPythonPackage rec { numpy shapely ] ++ lib.optional (pythonOlder "3.6") aenum; - checkInputs = [ pytest mock ]; - - # ignore rounding errors, and impure docgen - # datadir is ignored because it does the proj look up logic, which isn't relevant - checkPhase = '' - pytest . -k 'not alternative_grid_name \ - and not transform_wgs84_to_alaska \ - and not transformer_group__unavailable \ - and not transform_group__missing_best \ - and not datum \ - and not repr' \ - --ignore=test/test_doctest_wrapper.py \ - --ignore=test/test_datadir.py - ''; + checkInputs = [ pytestCheckHook mock ]; + + # prevent importing local directory + preCheck = "cd test"; + pytestFlagsArray = [ + "--ignore=test_doctest_wrapper.py" + "--ignore=test_datadir.py" + ]; + + disabledTests = [ + "alternative_grid_name" + "transform_wgs84_to_alaska" + "transformer_group__unavailable" + "transform_group__missing_best" + "datum" + "repr" + ]; meta = { description = "Python interface to PROJ.4 library"; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 3de55f628c44..a7ba7728a355 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.4"; + version = "1.10.5"; src = fetchPypi { inherit pname version; - sha256 = "d80ccb8cfa550139b50801591d4ca8a5575334adb493c402fce2312f55d07d66"; + sha256 = "fe1bd1140e6b79fe07f0053981d49be2dc66656cc8b481dd7ffcaa872fc25467"; }; checkInputs = [ webtest zope_component ]; diff --git a/pkgs/development/python-modules/pyro-api/default.nix b/pkgs/development/python-modules/pyro-api/default.nix index 78804941532a..aaf4571900b7 100644 --- a/pkgs/development/python-modules/pyro-api/default.nix +++ b/pkgs/development/python-modules/pyro-api/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - version = "0.1.1"; + version = "0.1.2"; pname = "pyro-api"; src = fetchPypi { inherit version pname; - sha256 = "0rhd7p61pf2vvflbdixp7sygblvvl9qbqavxj27910lr79vl4fdz"; + sha256 = "a1b900d9580aa1c2fab3b123ab7ff33413744da7c5f440bd4aadc4d40d14d920"; }; pythonImportsCheck = [ "pyroapi" ]; diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 3cf9d3f31437..713b257a195b 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -9,7 +9,7 @@ , msgpack , isPy27 , selectors34 -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -31,16 +31,16 @@ buildPythonPackage rec { msgpack ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; # add testsupport.py to PATH + preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH"; # ignore network related tests, which fail in sandbox - checkPhase = '' - PYTHONPATH=tests/PyroTests:$PYTHONPATH - pytest -k 'not StartNSfunc \ - and not Broadcast \ - and not GetIP' \ - --ignore=tests/PyroTests/test_naming.py - ''; + pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ]; + disabledTests = [ + "StartNSfunc" + "Broadcast" + "GetIP" + ]; meta = with stdenv.lib; { description = "Distributed object middleware for Python (RPC)"; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index ae22dad1223d..a343db4f5540 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.16.1"; + version = "0.17.3"; src = fetchPypi { inherit pname version; - sha256 = "aa2ae1c2e496f4d6777f869ea5de7166a8ccb9c2e06ebcf6c7ff1b670c98c5ef"; + sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix index cf90275cd19c..5e721504eda5 100644 --- a/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pyserial-asyncio"; - version = "0.4"; + version = "0.5"; disabled = !isPy3k; # Doesn't support python older than 3.4 src = fetchPypi { inherit pname version; - sha256 = "1vlsb0d03krxlj7vpvyhpinnyxyy8s3lk5rs8ba2932dhyl7f1n4"; + sha256 = "1641e5433a866eeaf6464b3ab88b741e7a89dd8cd0f851b3343b15f425138d33"; }; propagatedBuildInputs = [ pyserial ]; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index c51849d171c1..4a0fb1413bbe 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.35"; + version = "0.0.37"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3a0f8f6eb6ba0623b93a6995c1978cf72c4eedc5fbedac194e6d89e1b6b985e4"; + sha256 = "43a046c1c6086500fb0f4be1094ca963f5b0f555a04b692832b2b88ab741824e"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index cf62af03002d..2e7f458253ea 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyspread"; - version = "1.99.4"; + version = "1.99.5"; src = fetchPypi { inherit pname version; - sha256 = "69edad3e4a3bcfb728beb3ad32e308096c29234cc0f7398ecd26a51e10b75978"; + sha256 = "d396c2f94bf1ef6140877ab19205e6f2375bfe01d1bf50ff33bb63384744dd78"; }; propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 33149e99e92f..11c9d9c40d06 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.4.0"; + version = "0.5.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "02d73e98314a63a38c314d40942a0b098fb59d2f08ac39b2627cfa73f785cf0d"; + sha256 = "93e6a3824b560d4ea2b2e5f0a67fdf3b309b6194fbf9927e44fc0d12c7fdc6c0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index d46d3cfc5006..d56c10a9591e 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -1,43 +1,69 @@ { stdenv +, lib , buildPythonPackage , fetchurl -, pkgs , isPy3k , python +, apr +, aprutil +, bash +, e2fsprogs +, expat +, gcc +, glibcLocales +, neon +, openssl +, pycxx +, subversion }: buildPythonPackage rec { pname = "pysvn"; - version = "1.8.0"; - disabled = isPy3k; + version = "1.9.12"; format = "other"; src = fetchurl { url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; - sha256 = "0srjr2qgxfs69p65d9vvdib2lc142x10w8afbbdrqs7dhi46yn9r"; + sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q="; }; - buildInputs = [ pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] - ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []); + buildInputs = [ bash subversion apr aprutil expat neon openssl ] + ++ lib.optionals stdenv.isLinux [ e2fsprogs ] + ++ lib.optionals stdenv.isDarwin [ gcc ]; - # There seems to be no way to pass that path to configure. - NIX_CFLAGS_COMPILE="-I${pkgs.aprutil.dev}/include/apr-1"; + postPatch = '' + sed -i "117s|append(|insert(0, |" Tests/benchmark_diff.py + ''; preConfigure = '' cd Source ${python.interpreter} setup.py backport ${python.interpreter} setup.py configure \ - --apr-inc-dir=${pkgs.apr.dev}/include \ - --apu-inc-dir=${pkgs.aprutil.dev}/include \ - --apr-lib-dir=${pkgs.apr.out}/lib \ - --svn-lib-dir=${pkgs.subversion.out}/lib \ - --svn-bin-dir=${pkgs.subversion.out}/bin \ - --svn-root-dir=${pkgs.subversion.dev} - '' + (if !stdenv.isDarwin then "" else '' + --apr-inc-dir=${apr.dev}/include \ + --apu-inc-dir=${aprutil.dev}/include \ + --pycxx-dir=${pycxx.dev}/include \ + --svn-inc-dir=${subversion.dev}/include/subversion-1 \ + --pycxx-src-dir=${pycxx.dev}/src \ + --apr-lib-dir=${apr.out}/lib \ + --svn-lib-dir=${subversion.out}/lib \ + --svn-bin-dir=${subversion.out}/bin + '' + (lib.optionalString (stdenv.isDarwin && !isPy3k) '' sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile ''); - checkPhase = "make -C ../Tests"; + checkInputs = [ glibcLocales ]; + checkPhase = '' + runHook preCheck + + # It is not only shebangs, some tests also write scripts dynamically + # so it is easier to simply search and replace + sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh + make -C ../Tests + + runHook postCheck + ''; + + pythonImportCheck = [ "pysvn" ]; installPhase = '' dest=$(toPythonPath $out)/pysvn @@ -45,15 +71,14 @@ buildPythonPackage rec { cp pysvn/__init__.py $dest/ cp pysvn/_pysvn*.so $dest/ mkdir -p $out/share/doc - mv -v ../Docs $out/share/doc/pysvn-1.7.2 - rm -v $out/share/doc/pysvn-1.7.2/generate_cpp_docs_from_html_docs.py + mv -v ../Docs $out/share/doc/pysvn-${version} + rm -v $out/share/doc/pysvn-${version}/generate_cpp_docs_from_html_docs.py ''; meta = with stdenv.lib; { description = "Python bindings for Subversion"; homepage = "http://pysvn.tigris.org/"; license = licenses.asl20; - broken = true; }; } diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 9763e074cee9..4b257b0a3d13 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.9.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "664e5f42242e5e182519388f01b9f25d824a9feb7cd17d8f863c8d776f38baf9"; + sha256 = "26f02c16d36fd4c8672390deebe3413678d89f30720c16efb8b2a6bf63b9041f"; }; nativeBuildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index 8c38544d8120..38156cc0ccf5 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { # upstream has abandoned project in favor of pytest-flake8 # retaining package to not break other packages pname = "pytest-flakes"; - version = "4.0.2"; + version = "4.0.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6733db47937d9689032876359e5ee0ee6926e3638546c09220e2f86b3581d4c1"; + sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754"; }; checkInputs = [ pytestpep8 pytest ]; diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 61c9d37267ef..1e6c34aee3c0 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pytest-flask"; - version = "1.0.0"; + version = "1.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4d5678a045c07317618d80223ea124e21e8acc89dae109542dd1fdf6783d96c2"; + sha256 = "9c136afd6d0fb045b0b8fd2363421b6670bfebd21d9141f79669d9051c9d2d05"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 869466c65001..fb65f8aceadb 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "01j0sx8yxd7sbmvwky68mvnwrxxs5bjkvi61043jzff1ga92kg9h"; + sha256 = "f0fcf9674f3a627b36e07466d335e82b0f7c4f9e0f7ec39f2a1750b0189d5371"; }; propagatedBuildInputs = [ isort ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c21175bf3381..ad82b389bee8 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.2.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "7122d55505d5ed5a6f3df940ad174b3f606ecae5e9bc379569cdcbd4cd9d2b83"; + sha256 = "a4d6d37329e4a893e77d9ffa89e838dd2b45d5dc099984cf03c703ac8411bb82"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index a239c1dbe634..d238d7565f20 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.11"; + version = "0.12"; src = fetchPypi { inherit pname version; - sha256 = "26c5a47a8fdbc04652f18b65c587da642c6cc0354680ee44b16c161d9800a2ce"; + sha256 = "4a223909e5148c99bd18891848c7871457729322c752c9c470bd8dd6bdf9f940"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 368d13a91394..2d2a3264e741 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.6.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "2560a9b27d59bb17810d12ec3402dfc7c8e100e40539a70d2814bcbb27240f27"; + sha256 = "63d418a4fea7d598ac40b659723c00804d16a251d90a5cfbca213eeba5aaf01c"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index f3a62a79db93..8db28159d9dc 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; - version = "0.8.5"; + version = "0.8.6"; src = fetchPypi { inherit pname version; - sha256 = "2427808b54ccdec26a40cdba934a6c042fab9ebadb60d563a01f367bef87fe58"; + sha256 = "3ef9bde7ba1fe6470c5b61631440186d1254e276c67a527242d91451ab7994e5"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index c4523ac728c6..be8d675fc1ea 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.4.1"; + version = "3.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0s9cx692cdchfrjqx7fgf9wnm3fdac211a4hjq1cx9qqnbpdpl2z"; + sha256 = "440cec143fd9b0adeb072006c71e0294402a2bc2ccd08079c2341087ba4cf2d1"; }; propagatedBuildInputs = [ numpy factory_boy faker ]; diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index 768ad5967342..b90e8ebef385 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-repeat"; - version = "0.8.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1nbdmklpi0ra1jnfm032wz96y9nxdlcr4m9sjlnffwm7n4x43g2j"; + sha256 = "5cd3289745ab3156d43eb9c8e7f7d00a926f3ae5c9cf425bec649b2fe15bad5b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 93b60ecbe415..761fe1d5d54e 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -5,19 +5,26 @@ , requests , psutil , pytest +, setuptools_scm , subprocess32 +, toml , zc_lockfile }: buildPythonPackage rec { pname = "pytest-services"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0037101eaa17e050542808ecb2e799e9b2b148f1867f62b2296329fdd2034cf5"; + sha256 = "2da740487d08ea63dfdf718f5d4ba11e590c99ddf5481549edebf7a3a42ca536"; }; + nativeBuildInputs = [ + setuptools_scm + toml + ]; + propagatedBuildInputs = [ requests psutil @@ -28,6 +35,8 @@ buildPythonPackage rec { # no tests in PyPI tarball doCheck = false; + pythonImportsCheck = [ "pytest_services" ]; + meta = with lib; { description = "Services plugin for pytest testing framework"; homepage = "https://github.com/pytest-dev/pytest-services"; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 9d9add167829..b86947f5f758 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "fdb016d953036051d1ef0e36569b7168cefa4914014789a65a4ffefc87f85ac5"; + sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169"; }; propagatedBuildInputs = [ coverage ]; diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix new file mode 100644 index 000000000000..6dc4b666db54 --- /dev/null +++ b/pkgs/development/python-modules/pytest-xdist/1.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest +, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: + +buildPythonPackage rec { + pname = "pytest-xdist"; + version = "1.34.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; + }; + + nativeBuildInputs = [ setuptools_scm pytest ]; + checkInputs = [ pytest filelock ]; + propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + + # Encountered a memory leak + # https://github.com/pytest-dev/pytest-xdist/issues/462 + doCheck = !isPy3k; + + checkPhase = '' + # Excluded tests access file system + py.test testing -k "not test_distribution_rsyncdirs_example \ + and not test_rsync_popen_with_path \ + and not test_popen_rsync_subdir \ + and not test_init_rsync_roots \ + and not test_rsyncignore" + ''; + + meta = with stdenv.lib; { + description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; + homepage = "https://github.com/pytest-dev/pytest-xdist"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-xdist/2.nix b/pkgs/development/python-modules/pytest-xdist/2.nix deleted file mode 100644 index cc58c5ab6bde..000000000000 --- a/pkgs/development/python-modules/pytest-xdist/2.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 -, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: - -buildPythonPackage rec { - pname = "pytest-xdist"; - version = "2.1.0"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"; - }; - - nativeBuildInputs = [ setuptools_scm pytest_6 ]; - checkInputs = [ pytest_6 filelock ]; - propagatedBuildInputs = [ execnet pytest-forked psutil six ]; - - # pytest6 doesn't allow for new lines - # capture_deprecated not compatible with latest pytest6 - checkPhase = '' - # Excluded tests access file system - export HOME=$TMPDIR - pytest -n $NIX_BUILD_CORES \ - -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" - ''; - - meta = with stdenv.lib; { - description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; - homepage = "https://github.com/pytest-dev/pytest-xdist"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 6dc4b666db54..cc58c5ab6bde 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,30 +1,27 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.34.0"; + version = "2.1.0"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; + sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"; }; - nativeBuildInputs = [ setuptools_scm pytest ]; - checkInputs = [ pytest filelock ]; + nativeBuildInputs = [ setuptools_scm pytest_6 ]; + checkInputs = [ pytest_6 filelock ]; propagatedBuildInputs = [ execnet pytest-forked psutil six ]; - # Encountered a memory leak - # https://github.com/pytest-dev/pytest-xdist/issues/462 - doCheck = !isPy3k; - + # pytest6 doesn't allow for new lines + # capture_deprecated not compatible with latest pytest6 checkPhase = '' # Excluded tests access file system - py.test testing -k "not test_distribution_rsyncdirs_example \ - and not test_rsync_popen_with_path \ - and not test_popen_rsync_subdir \ - and not test_init_rsync_roots \ - and not test_rsyncignore" + export HOME=$TMPDIR + pytest -n $NIX_BUILD_CORES \ + -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 1dd11133a629..124adb8b2a53 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.14.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "06g1j5079ddl2sd3pxh2jg6g83b2z3l5hzbadiry2xg673dcncmb"; + sha256 = "2506d637c4f54c65dd195c1d094abdeedacc9bf0689131d847a324ad0fc951c0"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index dd9191835a44..e654826e0bc2 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "0gf3r4xvqk9ai1k3ka8c4dlblqhs7286zbd1b20adn953fdcj44c"; + sha256 = "587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"; }; propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix index 6f18a47e13c7..0b6d01746b97 100644 --- a/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "python-markdown-math"; - version = "0.7"; + version = "0.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "17a12175e8b2052a1c3402fca410841c551c678046293b1f7c280ccfe7b302a0"; + sha256 = "8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635"; }; checkInputs = [ markdown ]; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 6bd140ae5b4c..136483761cf8 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "3be5275b569844dfa267c80a1e23dc0957411dd501cae0ed3cccf43467031ceb"; + sha256 = "5a6fd3bb2cc2f75cdfe5673f36a5a418144d08add6e53b384cb146e99f27bd39"; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index 298fbaed0f86..e0461dd1efe6 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "57baa82e6bc59b67747317d16ad0cf9626826e8d43233af13bce924660500bd6"; + sha256 = "ed07adc27c8b4df9cd40b2d935f86400a7b495b311df5bfaf9ecaeafc5413fd5"; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix index 4da75195025d..2fd88858de75 100644 --- a/pkgs/development/python-modules/python-prctl/default.nix +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-prctl"; - version = "1.7"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1njgixnavmwq45r3gpkhn1y760sax204clagg4gzwvvdc5bdbssp"; + sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce"; }; patches = [ ./skip_bad_tests.patch ]; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index defd5430f2ee..b128e767d872 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.9.3"; + version = "0.9.4"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "4e339edfbba9e5feed0cf44043b6befba0c780b34cdf446888dbce44de362a8a"; + sha256 = "d79a412d7df30f01d3cb12e0e8863a48cfecd2fd7612719e16bc76eb1b65b332"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 2ee21137141a..32189495cdd4 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "6c79b87f2fefcf47bbcebea56056d324e9d7971c9b98123b79590e08cbb0a8f7"; + sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374"; }; checkInputs = [ pytest process-tests pkgs.redis ]; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cbddc023a152..cfa260205715 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "4.6.0"; + version = "4.6.1"; src = fetchPypi { inherit pname version; - sha256 = "358d8fbbc029c4538ea25bcaa283e47f375be0017fcba829de8a3a731c9df25a"; + sha256 = "cd1f5aa492c1eb2be77838e837a495f117e17f686029ebc03d62c09e33f4fa10"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 0552b18f8002..f16f581ade3d 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "12.8"; + version = "13.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1hzdnjxqgqv868agaipga4padq2q5s4hd1yzvh3n48b9ck2qcw9j"; + sha256 = "ca78a41626d728a8f51affa792270e210fa503ed298d395bed2bd1281842dca3"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 8c9cac757615..2224c94ac6f7 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-fedora"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "efb675929ebf588c2deffa2058ff407e65d1889bca1b545a58f525135367c9e4"; + sha256 = "56b9d841a39b4030e388e90c7b77dacd479f1ce5e2ff9b18c3954d97d5709a19"; }; propagatedBuildInputs = [ kitchen requests bunch paver lockfile six munch urllib3 beautifulsoup4 openidc-client ]; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 8680a4f8e1d4..0351840b3e0b 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2020.1"; + version = "2020.4"; src = fetchPypi { inherit pname version; - sha256 = "c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048"; + sha256 = "3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 624090e98aa0..7e5fc90453ff 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage, libusb1 }: +{ stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }: buildPythonPackage rec { pname = "pyusb"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0qkk2jn270jwwl1x26hmdhb14m9kkbrzzwzizdjcl1a29b6756sf"; + sha256 = "d69ed64bff0e2102da11b3f49567256867853b861178689671a163d30865c298"; }; + nativeBuildInputs = [ + setuptools_scm + ]; + # Fix the USB backend library lookup postPatch = '' @@ -20,6 +24,8 @@ buildPythonPackage rec { # No tests included doCheck = false; + pythonImportsCheck = [ "usb" ]; + meta = with stdenv.lib; { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends homepage = "https://pyusb.github.io/pyusb/"; diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 2c2557537228..700188f15dd1 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyxnat"; - version = "1.3"; + version = "1.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "113d13cs5ab7wy4vmyqyh8isjhlgfvan7y2g8n25vcpn3j4j00h0"; + sha256 = "22524120d744b50d25ef6bfc7052637e4ead9e2afac92563231ec89848f5adf5"; }; propagatedBuildInputs = [ lxml requests ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 2d17e6a76e08..c80dfe93aee0 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "19.0.2"; + version = "20.0.0"; src = fetchPypi { inherit pname version; - sha256 = "296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438"; + sha256 = "824ad5888331aadeac772bce27e1c2fbcab82fade92edbd234542c4e12f0dca9"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 4d1123aaa78a..f29d33d25ae3 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.7"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "f236ead8711dba0702507dd8fad473c7216a86eefa6098eff8ec4b54f57d7804"; + sha256 = "4d7dd4eae8a90d0b2b19b31794b30f137238463998989734a3acb8a53b506bab"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 998fa9296982..341d3f9660c5 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.4.2"; + version = "1.5.3"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4020754e3263ef28d3e74288537847bd8ae5fc1ddd74f34fb262ef1282c4d23c"; + sha256 = "8f3708195c8a6e91c5753940fd348cd821df1389d23b889b01b3e88acf407485"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/re-assert/default.nix b/pkgs/development/python-modules/re-assert/default.nix new file mode 100644 index 000000000000..9cf32d79802e --- /dev/null +++ b/pkgs/development/python-modules/re-assert/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, regex +}: + +buildPythonPackage rec { + pname = "re_assert"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5172dfbd2047a15dff2347735dea7e495479cc7e58841199a4a4973256b20464"; + }; + + # No tests in archive + doCheck = false; + + propagatedBuildInputs = [ + regex + ]; + + meta = { + description = "Show where your regex match assertion failed"; + license = lib.licenses.mit; + homepage = "https://github.com/asottile/re-assert"; + }; +} diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 9ffb986b9f5a..57a84e69d205 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "readme_renderer"; - version = "26.0"; + version = "28.0"; src = fetchPypi { inherit pname version; - sha256 = "cbe9db71defedd2428a1589cdc545f9bd98e59297449f69d721ef8f1cfced68d"; + sha256 = "6b7e5aa59210a40de72eb79931491eaf46fefca2952b9181268bd7c7c65c260a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 19cb7bd232bf..e4d6baeb425b 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2020.7.14"; + version = "2020.11.13"; src = fetchPypi { inherit pname version; - sha256 = "3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb"; + sha256 = "83d6b356e116ca119db8e7c6fc2983289d87b27b3fac238cfe5dca529d884562"; }; postCheck = '' diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index a244b9ba30c4..5229dd96b75a 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestpep8 waitress ]; checkPhase = '' + rm pytest.ini py.test ''; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 78daa0e24f31..624094e581e9 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.16"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "fa125311607ab3e57d8fcc4da20587f041b4485bdfb06dd6bdf19d8b66f870c1"; + sha256 = "2e5764325c6b624e42b428688f2111fea166af46623cb0127c05f6afb14d3457"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 09b713dc87cb..d7005e154504 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "RestrictedPython"; - version = "5.0"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "1g0sffn6ifkl1w8gq15rpaqm8c7l68bsnm77wcd3flyzzydmd050"; + sha256 = "9ae16e500782b41bd1abefd8554ccb26330817bba9ce090d385aa226f1ca83e8"; }; #propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 17bf5fbf2974..01c7a5e78c62 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "470e53b64817211a42805c3a104d2216f6f5834b22fe7adb637d1de4d6501fb8"; + sha256 = "d3b10a1fe2ecac537e51ae6d151b223b78de9fafdd50e5eb6b08c243df173c80"; }; checkInputs = [ nose testtools ]; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 9e2e76464d80..acd017a7a2e8 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.5.4"; + version = "0.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7a54750427e3f1bbb26c625075c831314760a9e5b5bcd3b797df668f020c9eb6"; + sha256 = "5c47deffbf9e163186b0997f2d59486d96a7c65766e76500f754fadfbc89f5d9"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index 303a8bc6d7fd..eca38c08f014 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "1.2.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "27273fc2dbc3513c1e05ea6b8af28aac8745fb09c164e39e2ed2807bf7e1b342"; + sha256 = "665e8312750b3fc5f7002e656d05b9dcb6e93b6063df40d95c49ad90c19d1f0e"; }; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 72f7aabb70ce..0a22dc1eec6c 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.1"; + version = "0.7.2"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "501a1c7415f839d6837eedd57f2b6ed20576aab318bf14e3878a77c9b106aa45"; + sha256 = "662e0ce5036a55bcb4cb46ff9741f40c78c670f4fb64cd37714cf83d5fd31774"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index e9565cff1593..e5e2d022dc8a 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.4.0"; + version = "3.5.1"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "21fa0183776e6061366f517765db479aaa634b707f3dd9d90ef6972adae6a755"; + sha256 = "843af44722d1d4e39f616e5441d6f49e82202cd1a8cc9d16637a6475a8ecb023"; }; # unit tests are impure diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index 985f6244cc65..95eebe8ab69d 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -3,6 +3,7 @@ , fetchPypi , repoze_lru , six +, soupsieve , webob , coverage , webtest @@ -10,15 +11,19 @@ buildPythonPackage rec { pname = "Routes"; - version = "2.4.1"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6"; + sha256 = "b6346459a15f0cbab01a45a90c3d25caf980d4733d628b4cc1952b865125d053"; }; - propagatedBuildInputs = [ repoze_lru six webob ]; - checkInputs = [ coverage webtest ]; + propagatedBuildInputs = [ repoze_lru six soupsieve webob ]; + # incompatible with latest soupsieve + doCheck = false; + checkInputs = [ coverage soupsieve webtest ]; + + pythonImportsCheck = [ "routes" ]; meta = with stdenv.lib; { description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions"; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 535f8efec916..9c900610e031 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "0.4.2"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "2ca5de8dc18ad7ad350c0bd01aef0406aa5d0fff78a561f0f710f9d9858abdd0"; + sha256 = "7396943cbc1cf92eb6f7aa93be5f64a3bfa59d76908262e89bae06e3c87fa59d"; }; buildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 3d2e07226612..b38d095a845f 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scour"; - version = "0.38.1.post1"; + version = "0.38.2"; src = fetchPypi { inherit pname version; - sha256 = "81b93dcfc57338f1260db4fb62697b653770a8a8bd756dcba3640c9b558a7145"; + sha256 = "6881ec26660c130c5ecd996ac6f6b03939dd574198f50773f2508b81a68e0daf"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index d10ea9c8be2b..157876476761 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "secretstorage"; - version = "3.1.1"; + version = "3.3.0"; disabled = pythonOlder "3.5"; src = fetchPypi { pname = "SecretStorage"; inherit version; - sha256 = "14lznnn916ddn6yrd3w2nr2zq49zc8hw53yjz1k9yhd492p9gir0"; + sha256 = "1aj669d5s8pmr6y2d286fxd13apnxzw0ivd1dr6xdni9i3rdxkrh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 8aa61748af86..9db28aef2e92 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.16.5"; + version = "0.19.4"; src = fetchPypi { inherit pname version; - sha256 = "e12eb1c2c01cd9e9cfe70608dbda4ef451f37ef0b7cbb92e5d43f87c341d6334"; + sha256 = "1052f0ed084e532f66cb3e4ba617960d820152aee8b93fc6c05bd53861768c1c"; }; checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index 5b678ee1d508..473ef25e162e 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -1,17 +1,23 @@ { stdenv , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { pname = "setproctitle"; - version = "1.1.10"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398"; + sha256 = "9b4e48722dd96cbd66d5bf2eab930fff8546cd551dd8d774c8a319448bd381a6"; }; + checkInputs = [ pytestCheckHook ]; + + # tries to compile programs with dependencies that aren't available + pytestFlagsArray = [ "--ignore=tests/setproctitle_test.py" ]; + meta = with stdenv.lib; { description = "Allows a process to change its title (as displayed by system tools such as ps and top)"; homepage = "https://github.com/dvarrazzo/py-setproctitle"; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 54eacea892ef..f30e8dd5cdb3 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ let pname = "setuptools"; - version = "47.3.1"; + version = "50.3.1"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "0sy3p4ibgqx67hzn1f254jh8070a8kl9g2la62p3c74k2x7p0r7f"; + sha256 = "Z4KHB3Pv4wZPou/Vbp1DFDgDp47OTDfVChGP55GtIJE="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 8e3fcc12f552..bb41f61517fc 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "skorch"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1l576dws9drjakfsn0pfpbr48b21vpxv3vd3dz8lkbn8q71zs22r"; + sha256 = "bdce9370153fd80c5c4ec499a639f55eef0620e45d4b15fbf7d7ff2a225a3d40"; }; propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index 827894771778..8711055766c6 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "slicer"; - version = "0.0.4"; + version = "0.0.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "21d53aac4e78c93fd83c0fd2f8f9d8a2195ac079dffdc0da81cd749da0f2f355"; + sha256 = "8c0fe9845056207d7344d5850e93551f9be20656178d443332aa02da9c71ba44"; }; checkInputs = [ pytestCheckHook pandas pytorch ]; diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 1c300bee3947..19677a71eca3 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.6.13"; + version = "0.6.14"; disabled = pythonOlder "3.6"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2b0fe48f07971f4104e2b66d70a7924a550b477405b8feed9c0d4db14bb2c87c"; + sha256 = "79f5098d27c149ca9cce2b8008ed29e2e0c8cee8fa3414c7e5455cb73c90a9a8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 82275762ce3d..5b91bade0098 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "sniffio"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8e3810100f69fe0edd463d02ad407112542a11ffdc29f67db2bf3771afb87a21"; + sha256 = "c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index b56e43e13219..e5fe491939fb 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "soco"; - version = "0.19"; + version = "0.20"; src = fetchPypi { inherit pname version; - sha256 = "0dgca286vhrabm4r4jj545k895z6w2c70ars06vrjhf9cpgg7qck"; + sha256 = "929d4fae20b32efc08bb9985798c592aa7268162885541513eddbff0a757418f"; }; propagatedBuildInputs = [ xmltodict requests toml ]; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 0c4c3f9b7b22..706175dfaad3 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.0.6"; + version = "7.0.7"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "5e394d9797e221f90a95e5eb9987e8c1faf4f2488964f521e8ca1628798f0a38"; + sha256 = "84d42708d176aecfb7b95299af0e484896f5f80df61f43c92d8e7a53de0b2099"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index f62af59c4edc..03fbc638f160 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sorl-thumbnail"; - version = "12.6.3"; + version = "12.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "66771521f3c0ed771e1ce8e1aaf1639ebff18f7f5a40cfd3083da8f0fe6c7c99"; + sha256 = "fbe6dfd66a1aceb7e0203895ff5622775e50266f8d8cfd841fe1500bd3e19018"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index 9df3d809f2cb..3f4a68406726 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sortedcontainers"; - version = "2.2.2"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "4e73a757831fc3ca4de2859c422564239a31d8213d09a2a666e375807034d2ba"; + sha256 = "59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1"; }; # pypi tarball does not come with tests diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index b5dd9e11db03..ce65822e3b1f 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.18.1"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "c69662d39e4ae214943d8c141dbfb1cf0a5f125d3b45d2c90849c5f37d0c5fb7"; + sha256 = "98b9f02282907b0c5b7a93a446c4649909aaf5785d2da0dd263c8ad68e00e288"; }; # No tests included. diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 868ce80558a6..8655d9cbbd5d 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.9.4"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "ca9d997c475b714b54d2fd67aa140837ec3630e91cbbc2e0cd190f1b0bd9fe9d"; + sha256 = "588602b9f44961f4011a9ec83fe85f5d621126eee64835e407a7d41c54dccc74"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 2b0276afc9d8..f0c4ea50e72e 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.1.5"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d467f020b694193873a237ce6744ae36bd5a59f4d2b7ffbeb15dda68b03f5aa1"; + sha256 = "44f51473b81c1bfde76097bfb957ec14f580a262b229ae8e90d18f5b82104c95"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 9fc4c328b2c9..6e17fc4f38e2 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "2.22"; + version = "3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0g8zzp4qw6miijirykjcd78ib027k7dmg6lb9m4xysvah5jh8vfv"; + sha256 = "a158265fde85a6757b7f09b568b1f7d6eaf75eaae208be27336f09dc048e5bcf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index b6aee633e0ea..635111b95d9e 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548"; + sha256 = "0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 29fd116c0d59..cba55e5aca28 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "0.3.5"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "fbd61cca1dad44b6891d1a1d72b11ae100e21b3909802e3ff1861ab55bf16603"; + sha256 = "597837899008409359680ee9cd04779639b9c0eb3380b6545025d26a702ba36c"; }; propagatedBuildInputs = [ jinja2 docopt easywatch ]; diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 44345a9aa505..ee18a6ca6b22 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.1.1"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6b07dbd4f77ab023ed4167c43ffc1b9f9354fb6075cc6ff3b91fefcbb80342ca"; + sha256 = "ea2bb97aacc12fff7df11bd4cb4ae64b1418a0311fbd1611445cc59dc650bdd3"; }; propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 5070d7d1947e..b205f48cb6f9 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.54.0"; + version = "2.55.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a622bce0d6d0ac99a53b6e6a6475c39250207d644f28ad0ed276af7b96d12617"; + sha256 = "2eebf023595e8aa9d65d8b46ccc3c716185bb9625d0e39d3956282fd7525848d"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index a6f604dea037..3bf6ed95ced1 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.4.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fc46117619f2f704d1d1b02634fa3285f40479a3008172763b9998fe964f4d11"; + sha256 = "3e098ae96c4d3668cd5fb04c160334a4bc3ade9d29177e0206846b75f5ff3e91"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 51e9b98db5bb..400751529ab6 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.3"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "4804a774f802306a7d9af7322193c5390f1da0abb429e082a10ef1d46e6fb2c2"; + sha256 = "3da72a155b807b01c9e8a5babd214e052a0a45a975751da3521a1c3381ce6d76"; }; propagatedBuildInputs = [ ptyprocess tornado ]; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 7a52c4c41926..b9803b115083 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.14.2"; + version = "6.15.0"; src = fetchPypi { inherit pname version; - sha256 = "14d9907390f5f9c7189b3d511b64f34f1072d07cc13b604a57e1bb79029376e3"; + sha256 = "409f77cfbdad822d12a8ce5c4aa8fb4d0bb38073f4a5444fede3702716a2cec2"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix index 03185ae4d9fe..91a92d6b8de4 100644 --- a/pkgs/development/python-modules/tflearn/default.nix +++ b/pkgs/development/python-modules/tflearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "tflearn"; - version = "0.3.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "034lvbslcivyj64r4w6xmr90ckmyxmrnkka9kal50x4175h02n1z"; + sha256 = "818aa57667693810415dc203ba3f75f1541e931a8dc30b6e8b21563541a70388"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 77187f42b5e4..9383cf947c20 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2020.8.25"; + version = "2020.11.26"; src = fetchPypi { inherit pname version; - sha256 = "b51e496bd9ee9c6875170a018bdb7b6f67e3946c4ab57afdb95b18b2c6937783"; + sha256 = "c712df6f201385fbd3500e26e45dc20fabcbb0c6c1fbfb4c1e44538a9d0269a8"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index ca07b50ceff8..0ba9c4c53d8f 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "4.4.1"; + version = "4.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c84e0f4b501419349e67972d25c535d9b5fd6c100c319747049b67812a4c6b97"; + sha256 = "99b0cea5abf304e8738ecf5cceae0c0e5182534843f19638a26a220fa212fbad"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 6300111e4ce2..43a2e46dcfb9 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonPackage rec { pname = "tld"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "cf8410a7ed7b9477f563fa158dabef5117d8374cba55f65142ba0af6dcd15d4d"; + sha256 = "1959d0db03b7644f5528748f348d5eecdcd27120a8bb4ef00d932b1b1acdf13d"; }; propagatedBuildInputs = with python.pkgs; [ six ]; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index b7df857533a0..02359ce67a59 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tldextract"; - version = "2.2.3"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ab0e38977a129c72729476d5f8c85a8e1f8e49e9202e1db8dca76e95da7be9a8"; + sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea"; }; propagatedBuildInputs = [ requests requests-file idna ]; diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 8d9cadeb3e54..893943cbc720 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "tornado"; - version = "6.0.4"; + version = "6.1"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc"; + sha256 = "33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791"; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 40883928f565..9dad7d77ff90 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.19.0"; + version = "3.20.1"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "17e61a93afe5c49281fb969ab71f7a3f22d7586d1c56f9a74219910f356fe7d3"; + sha256 = "4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index c83f6159fde8..5df20826dc76 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -5,30 +5,30 @@ , coverage , glibcLocales , flake8 +, setuptools_scm +, pytestCheckHook }: buildPythonPackage rec { pname = "tqdm"; - version = "4.48.2"; + version = "4.54.0"; src = fetchPypi { inherit pname version; - sha256 = "564d632ea2b9cb52979f7956e093e831c28d441c11751682f84c86fc46e4fd21"; + sha256 = "5c0d04e06ccc0da1bd3fa5ae4550effcce42fcad947b4a6cafa77bdc9b09ff22"; }; - checkInputs = [ nose coverage glibcLocales flake8 ]; + nativeBuildInputs = [ + setuptools_scm + ]; - postPatch = '' - # Remove performance testing. - # Too sensitive for on Hydra. - rm tqdm/tests/tests_perf.py - ''; + checkInputs = [ nose coverage glibcLocales flake8 pytestCheckHook ]; - LC_ALL="en_US.UTF-8"; + # Remove performance testing. + # Too sensitive for on Hydra. + PYTEST_ADDOPTS = "-k \"not perf\""; -# doCheck = !stdenv.isDarwin; - # Test suite is too big and slow. - doCheck = false; + LC_ALL="en_US.UTF-8"; meta = { description = "A Fast, Extensible Progress Meter"; diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 001106328085..bfbb297cdc08 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "traitlets"; - version = "4.3.3"; + version = "5.0.5"; src = fetchPypi { inherit pname version; - sha256 = "d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7"; + sha256 = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396"; }; checkInputs = [ glibcLocales pytest mock ]; diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 01788f63d4f4..e76a36bcf4f9 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.0.1"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "74fb4db848ac1343241fa4dc5d9bf3fab561f309826c602e8a3568309df91fe3"; + sha256 = "b699aeea588b55723860ddc6b2bd9b5013c4a72e18d1bbf51c6689cc7c6a562a"; }; propagatedBuildInputs = [ traits pyface six ]; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index a372e492f9f6..2691890a5ee1 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.8.4"; + version = "0.8.5"; src = fetchPypi { inherit pname version; - sha256 = "9a2841b24789dfd345267cb92e26b79da75fd03f6021d1a5222c71b5c9ae3c16"; + sha256 = "e441c66a0c753d56c01c3e5e547f21dbe4a5569c939f12477475c5e81d79769b"; }; postPatch = '' diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index 2dc819ac63e0..81fa2e61b02a 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tvnamer"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "5512cebb1e49103a1e4ea9629398092b4bbabef35a91007ae0dbed961ebe17dd"; + sha256 = "a5ff916e104b2c0b567c2c7f2d8ae15a66a7ac57d67390e7c67207a33b79022f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 2f0617731e10..ee36a6dab810 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.9.1"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "123jnq7igm26a5347jf2j60bww9g84l80f208dzlbk49h7cg77jj"; + sha256 = "d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index 1fbed4ad1aa5..770407736a06 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm }: buildPythonPackage rec { pname = "ufonormalizer"; - version = "0.4.2"; + version = "0.5.0"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1rn64a0i151qk6h5f9pijcmja195i2d6f8jbi5h4xkgkinm9wwzj"; + sha256 = "1qc3389i2y16n1hjg4dzk821klzjipbh9c9yci70z51pp21mwwh5"; extension = "zip"; }; + nativeBuildInputs = [ setuptools_scm ]; + meta = with lib; { description = "Script to normalize the XML and other data inside of a UFO"; homepage = "https://github.com/unified-font-object/ufoNormalizer"; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 9df71ee49c3e..e7a9ee8f35a7 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "3.1.0"; + version = "4.0.1"; disabled = isPyPy || (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "00bda1de275ed6fe81817902189c75dfd156b4fa29b44dc1f4620775d2f50cf7"; + sha256 = "26cf6241b36ff5ce4539ae687b6b02673109c5e3efc96148806a7873eaa229d3"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 8cf066245593..84705be59bc1 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.4"; + version = "3.1.5"; src = fetchPypi { inherit pname version; - sha256 = "0s69kdhl8vhqazhxqdvb06l83x0iqdm0yr4vp3p52alzi6a8lm33"; + sha256 = "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 5d1a32a29655..425b2e31ca61 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonAtLeast , spark_parser , xdis , nose @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "uncompyle6"; version = "3.7.4"; + disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331 src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 1e382629e899..3c268ed7ed4f 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.8.0"; + version = "0.9.1"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "57da3d67e1a42b548020debdd23285b5710e3bb2aac20eb7b2d2a686822aa1ab"; + sha256 = "accb4392c59a1485ce3ee6d78a6fd163731ade8b9b5208e7bde8fa1767aef097"; }; propagatedBuildInputs = [ numpy awkward ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 81b6f276289c..eadd6c36de1a 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.12.0"; + version = "3.13.1"; src = fetchPypi { inherit pname version; - sha256 = "1603140896b9d3495cedeee2b872e97759085777c1299317072ad3f415211abc"; + sha256 = "099b0b274dc000faf724df835579c76306e60200a5ba7b600a0c4b76dabbf344"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 96bb2a0e5325..aafa11720a22 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.25.11"; + version = "1.26.2"; src = fetchPypi { inherit pname version; - sha256 = "8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"; + sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"; }; NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ diff --git a/pkgs/development/python-modules/urwid-readline/default.nix b/pkgs/development/python-modules/urwid-readline/default.nix index 1ded152cba91..1c5f1c8307ef 100644 --- a/pkgs/development/python-modules/urwid-readline/default.nix +++ b/pkgs/development/python-modules/urwid-readline/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "urwid_readline"; - version = "0.11"; + version = "0.12"; src = fetchPypi { inherit pname version; - sha256 = "24e376d4b75940d19e8bc81c264be5d383f8d4da560f68f648dd16c85f6afdb5"; + sha256 = "f7384e03017c3fb07bfba0d829d70287793326d9f6dac145dd09e0d693d7bf9c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index dbfdcec142dd..55511be4926c 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -45,7 +45,8 @@ buildPythonPackage rec { # watchgod required the watchgod package, which isn't available in nixpkgs checkPhase = '' - pytest --ignore=tests/supervisors/test_watchgodreload.py + pytest --ignore=tests/supervisors/test_watchgodreload.py \ + -k 'not test_supported_upgrade_request and not test_invalid_upgrade[WSProtocol]' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index b06f41ce5a31..a37e6a3675ba 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -72,5 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; + broken = pythonAtLeast "3.9"; # see: https://github.com/MagicStack/uvloop/issues/365 }; } diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 6ec8db340681..1bc9b1777ff6 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "validators"; - version = "0.17.1"; + version = "0.18.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "401cb441dd61bb1a03b10c8a3a884642409e22a2a19e03bbfc4891e0ddbc7268"; + sha256 = "1a653b33c0ab091790f65f42b61aa191e354ed5fdedfeb17d24a86d0789966d7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index 5845557c54c1..70235aa95bd7 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vega_datasets"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "db8883dab72b6f414e1fafdbf1e8db7543bba6ed77912a4e0c197d74fcfa1c20"; + sha256 = "9dbe9834208e8ec32ab44970df315de9102861e4cda13d8e143aab7a80d93fc0"; }; propagatedBuildInputs = [ pandas ]; diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index ce5756656bcb..1f4933d7dd8a 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "vine"; - version = "1.3.0"; + version = "5.0.0"; disable = pythonOlder "2.7"; src = fetchPypi { inherit pname version; - sha256 = "133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87"; + sha256 = "7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e"; }; buildInputs = [ case pytest ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 4642a44762aa..233101728f85 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.0.35"; + version = "20.2.1"; src = fetchPypi { inherit pname version; - sha256 = "2a72c80fa2ad8f4e2985c06e6fc12c3d60d060e410572f553c90619b0f6efaf3"; + sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 17f7b540c605..ffec68785260 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04"; + sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index bf21d7ed5c36..769ac6d2e5fa 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.61"; + version = "0.62"; pname = "web.py"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c7a9081aeb086cd3e703c7553a47ee75188d1d325f25eec7654d9bb00b5eccbb"; + sha256 = "5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 686ba1196b1f..8958f37b0f85 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.7.3"; + version = "0.8.0"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "86a36049ae3c8b1ce12d3183911b3082b38b2998e858285309581e37dc22d8fa"; + sha256 = "672053c3392248846694e5619a7fe6ab4c40f010a8f5be6350821b39f6132a26"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index fd93cbdcea37..4f51fb486ebc 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.34.2"; + version = "0.35.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "1mwh35ycv07ajnpcjc4rjdmndh6nyg03gdgag5m8c2af7z1xlcmj"; + sha256 = "uS+9a47ZopI0yGlEnJi421WyzS//8BxUvH25hX4BBL8="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 95ed95cb860b..d4dd7d089997 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "wsproto"; - version = "0.15.0"; + version = "1.0.0"; disabled = pythonOlder "3.6"; # python versions <3.6 src = fetchPypi { inherit pname version; - sha256 = "17gsxlli4w8am1wwwl3k90hpdfa213ax40ycbbvb7hjx1v1rhiv1"; + sha256 = "868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38"; }; propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 8f949f20e92a..b75179bdc2a4 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.10.1"; + version = "0.11.0"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "cab1630a51076b11819c97e6da461ddd4cb21bdf65c071d1c57a846c9b129c12"; + sha256 = "a751081d816a63d02a4c63f91fd9c0112c1e0061af7ccf79c4e7c18517a75406"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 6a4d7f01cc11..e8b95e5d09cc 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "xdot"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "0cr4rh7dz4dfzyxrk5pzhm0d15gkrgkfp3i5lw178xy81pc56p71"; + sha256 = "3df91e6c671869bd2a6b2a8883fa3476dbe2ba763bd2a7646cf848a9eba71b70"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index d02b7e2e066a..9f32a6de2d89 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.47.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "7f621ed0e5a30c2b67c0e50778627b7a35e1ccfea9db19ea89b4c72a8faf42c0"; + sha256 = "3ec836a9545f549707a8c8176038160185b9d08c1dd80304a906527da21bff68"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index 83b33dc3edf4..0d9962e5faf5 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Bootstrap"; - version = "4.1.3.1"; + version = "4.5.3.1"; src = fetchPypi { inherit version pname; - sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f"; + sha256 = "cf67d205437b32508a88b69a7e7c5bbe2ca5a8ae71097391a6a6f510ebfd2820"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix index 3eac03299109..0316a8493762 100644 --- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "XStatic-jQuery-File-Upload"; - version = "9.23.0.1"; + version = "10.31.0.1"; src = fetchPypi { inherit version pname; - sha256 = "649a500870b5f5d9cc71d1c1dc4c4d2242f459b02d811a771336217e4e91bfda"; + sha256 = "7d716f26aca14732c35c54f0ba6d38187600ab472fc98a91d972d12c5a70db27"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix index c71fce169d9d..8542747d2dd6 100644 --- a/pkgs/development/python-modules/xstatic-pygments/default.nix +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Pygments"; - version = "2.2.0.1"; + version = "2.7.2.1"; src = fetchPypi { inherit version pname; - sha256 = "1rm073ag1hgwlazl52mng62wvnayz7ckr5ki341shvp9db1x2n51"; + sha256 = "b22b0a59ce17bf06e26508fdd264fff74409ebd9968af87a0a63402fce838dc2"; }; # no tests implemented diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 3ab7fb49c43a..7a15907e59be 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.5.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6"; + sha256 = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index 353400120f3c..42bde9909b8c 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "yt"; - version = "3.6.0"; + version = "3.6.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "effb00536f19fd2bdc18f67dacd5550b82066a6adce5b928f27a01d7505109ec"; + sha256 = "be454f9d05dcbe0623328b4df43a1bfd1f0925e516be97399710452931a19bb0"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index dbcd8303ef2f..b365438a1c97 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zfec"; - version = "1.5.4"; + version = "1.5.5"; src = fetchPypi { inherit pname version; - sha256 = "222a2d84898db792b28f993cb663e940668bfbd844992a82351fd40dc1680883"; + sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; }; buildInputs = [ setuptoolsDarcs ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 4554ffa58e2f..0c6ac7dbf499 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.46"; + version = "0.0.47"; propagatedBuildInputs = [ aiohttp zigpy ]; checkInputs = [ pytestCheckHook conftest asynctest ]; src = fetchPypi { inherit pname version; - sha256 = "OpkOMvxiPBCVagSv8Jxvth3gwVv4idFSlKoBaOO5JVg="; + sha256 = "bf7dbd5d1c1a3849b059e62afcef248b6955f5ceef78f87201ae2fc8420738de"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index af52e9425307..12964652752f 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.9.2"; + version = "0.11.0"; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { inherit pname version; - sha256 = "f4256136d714c00d22f6d2abf975438e2bc080cc43b8afef0decb80ed8066ef6"; + sha256 = "a2263f8bc5807ebac55bb665eca553b514384ce270b66f83df02c39184193020"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 5d4bc589d361..1dafe8cbb0c5 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zipp"; - version = "3.1.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"; + sha256 = "ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index 3ce071156936..65f5ec1fa7af 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zm-py"; - version = "0.4.0"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "f9693ca046de4ea12c1afb5c67709ec0c2a48744566c0a1a9327348e1a1617b0"; + sha256 = "b391cca0e52f2a887aa7a46c314b73335b7e3341c428b425fcf314983e5ebb36"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index 4f9e14ba20d3..b5481ae2e2b7 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "zope.event"; - version = "4.4"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf"; + sha256 = "5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 1d86d6a8f14e..919c3ade3c28 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "5.1.2"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c9c8e53a5472b77f6a391b515c771105011f4b40740ce53af8428d1c8ca20004"; + sha256 = "8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24"; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 01c97305807f..ef8a5324487d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.18.4"; + version = "3.19.1"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0xsg5lw3i4bw610q987cwz3iz06x3lrbbaa2mnzyr4kaiqsn2z2r"; + sha256 = "1fisi9rlijw9wd0yjzk1c6j7ljnb2yiq5iqnrz6m1xkflyinw9hx"; }; patches = [ diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index bc5ad7744d68..8fc81a1a979d 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "ninja"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3"; + sha256 = "0mspq4mvx41qri2v2zlg2y3znx5gfw6d8s3czbcfpr2218qbpz55"; }; nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index b4cc2843c335..13a6d596599a 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.249.3"; + version = "2.263.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "00lpqkkz7k0m2czz1sg54gb90sljc14i5a2kpikrkiw8aqfz3s4d"; + sha256 = "1wfn5r356fqy8ypqnw44ir0cy8qr5ck6xckxnnn2c9x324mypv8f"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index b70c2a80e4a3..bdb2f8cbd757 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0xj2gg1z9l1f4aqrsbz5hww8hvrhiyz8fdrpr9861jmbxyzl03y7"; + sha256 = "1fv92f71p7pk3r4aj88kgaiblfii3z4fjbchyj1c9k6br0gwbw8b"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index b6d7f65896e8..36a85e6361cb 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchPypi, isPy3k +{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch , cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2 , pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock }: @@ -19,6 +19,15 @@ buildPythonApplication rec { pygments sqlparse pgspecial setproctitle keyring ]; + patches = [ + (fetchpatch { + name = "enable-sqlparse-4.patch"; + url = "https://github.com/dbcli/pgcli/pull/1224/commits/55d534d41051887c637b6300e08a9f70e6656020.patch"; + sha256 = "01r8qc7qzb6mz0xq2xnrgyackbapf43ng6l88qpzd9lw2pwksc8w"; + includes = [ "pgcli/packages/parseutils/ctes.py" "tests/test_sqlcompletion.py" "setup.py" ]; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index b26c328dba85..7e71c08ec4b1 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.39.0"; + version = "0.40.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0lvi4d731ypdjcskj0hdfd37wa3ldspibs2dgaahg7d7zhp1l76g"; + sha256 = "17n1xdalz38h9p4ylcpkbbqp22b1np5l8y5l3r58kaf9k8p6cfa7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index d6353fc0b9cf..58c559fcc566 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { - name = "automake-1.16.2"; + name = "automake-1.16.3"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c"; + sha256 = "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz"; }; nativeBuildInputs = [ autoconf perl ]; diff --git a/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch b/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch new file mode 100644 index 000000000000..874809863523 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch @@ -0,0 +1,29 @@ +@@ -, +, @@ +--- + bfd/elf32-arm.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +--- a/bfd/elf32-arm.c ++++ a/bfd/elf32-arm.c +@@ -15398,7 +15398,11 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, + linker to copy the initial value out of the dynamic object and into + the runtime process image. We need to remember the offset into the + .rel(a).bss section we are going to use. */ +- if ((h->root.u.def.section->flags & SEC_READONLY) != 0) ++ if (info->nocopyreloc == 0 ++ && (h->root.u.def.section->flags & SEC_ALLOC) != 0 ++ /* PR 16177: A copy is only needed if the input section is readonly. */ ++ && (h->root.u.def.section->flags & SEC_READONLY) != 0 ++ && h->size != 0) + { + s = globals->root.sdynrelro; + srel = globals->root.sreldynrelro; +@@ -15410,6 +15414,8 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, + } + if (info->nocopyreloc == 0 + && (h->root.u.def.section->flags & SEC_ALLOC) != 0 ++ /* PR 16177: A copy is only needed if the input section is readonly. */ ++ && (h->root.u.def.section->flags & SEC_READONLY) != 0 + && h->size != 0) + { + elf32_arm_allocate_dynrelocs (info, srel, 1); + diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index c0846fce45cc..978ec3f2f99f 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -101,6 +101,14 @@ stdenv.mkDerivation { ./patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch + ++ # This patch was suggested by Nick Clifton to fix + # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + # It can be removed when that 7-year-old bug is closed. + # This binutils bug causes GHC to emit broken binaries on armv7, and + # indeed GHC will refuse to compile with a binutils suffering from it. See + # this comment for more information: + # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 + lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch ; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 2fe17a23fc2b..aa8d8df2c1d1 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ixk4wglpign8glpil9qziph96ki7flqiy4xlpjb8ai1y89fjkqh"; + sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index dc04f4cb1123..0b557af42585 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { description = "A project for generating C bindings from Rust code"; homepage = "https://github.com/eqrion/cbindgen"; license = licenses.mpl20; - maintainers = with maintainers; [ jtojnar andir ]; + maintainers = with maintainers; [ jtojnar ]; }; } diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index ce6f469c4445..870e6b0474e9 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2020.4.2"; + version = "2020.5.1"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "0pxf6nphb6k2szgapqkhjavdzq1blg34v1zj47l76r0iqxrpm3va"; + sha256 = "18wbyf5qq2x0dzaf6bprs4nhv0ckrgq679l3w61p1yf4y3j7xwn4"; }; nativeBuildInputs = diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 596f5e90e349..6ef92e170eb4 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform ? null , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.3" + , version ? "2.4" , ... } @ args: stdenv.mkDerivation ({ @@ -17,7 +17,7 @@ let owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "v${version}"; - sha256 = "113mcf1hwwl0i90cqh08lywxs1bfbg0nwqibay9wlkmx1a5v0bnj"; + sha256 = "12k0n79j156bdzqws18kpbli04kn00nh6dy42pjv6gakqrkx9px3"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 23c5e3f9dc8c..ff5fb6e5ee76 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -55,7 +55,6 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/kozec/sc-controller"; # donations: https://www.patreon.com/kozec - broken = true; description = "User-mode driver and GUI for Steam Controller and other controllers"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix new file mode 100644 index 000000000000..dd2979b58712 --- /dev/null +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, kernel +, kmod +}: + +let + kerneldir = "lib/modules/${kernel.modDirVersion}"; +in stdenv.mkDerivation rec { + pname = "gcadapter-oc-kmod"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "HannesMann"; + repo = pname; + rev = "v${version}"; + sha256 = "1nqhj3vqq9rnj37cnm2c4867mnxkr8di3i036shcz44h9qmy9d40"; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build" + "INSTALL_MOD_PATH=$(out)" + ]; + + installPhase = '' + install -D {,$out/${kerneldir}/extra/}gcadapter_oc.ko + ''; + + meta = with stdenv.lib; { + description = "Kernel module for overclocking the Nintendo Wii U/Mayflash GameCube adapter"; + homepage = "https://github.com/HannesMann/gcadapter-oc-kmod"; + license = licenses.gpl2; + maintainers = with maintainers; [ r-burns ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index ac000976a680..b9aa6b5de56c 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - version = "0.3.111"; + version = "0.3.112"; pname = "libaio"; src = fetchurl { url = "https://pagure.io/libaio/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.gz"; - sha256 = "1fih2y2js0dl9qshpyb14m0nnxlms2527shgcxg0hnbflv5igg76"; + sha256 = "0wi2myh191sja13qj3claxhpfkngvy10x30f78hm9cxzkfr97kxp"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 13f48405cd1d..042a54ff1575 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "31.1"; + version = "31.2"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1xkmdix6mgv6kjjj6wi844bfddhl0ybalrp5g8pf5izasc43brg7"; + sha256 = "0njfn8ziip57a2s435d4s0p3yylb85y7hdgbq660vwpsia9fb4sq"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 8bb7aafc3c5a..da73bc3c6012 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja +{ stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl , poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "20.5.2.7"; + version = "20.11.4.13"; src = fetchFromGitHub { owner = "ClickHouse"; repo = "ClickHouse"; rev = "v${version}-stable"; fetchSubmodules = true; - sha256 = "15b499czsv727wwdb1i1ja5wfsk6ii3pqpk6dlqic9cdmkh8c8ic"; + sha256 = "0c87k0xqwj9sc3xy2f3ngfszgjiz4rzd787bdg6fxp94w1adjhny"; }; nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; @@ -25,6 +25,15 @@ stdenv.mkDerivation rec { xxHash zstd ]; + patches = [ + # This patch is only required for 20.11.4.13 - it should be included in the + # next stable release from upstream by default + (fetchpatch { + url = "https://github.com/ClickHouse/ClickHouse/commit/e31753b4db7aa0a72a85757dc11fc403962e30db.patch"; + sha256 = "12ax02dh9y9k8smkj6v50yfr46iprscbrvd4bb9vfbx8xqgw7grb"; + }) + ]; + postPatch = '' patchShebangs src/ @@ -46,7 +55,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TESTS=OFF" - "-DUSE_INTERNAL_LLVM_LIBRARY=OFF" + "-DENABLE_EMBEDDED_COMPILER=ON" + "-USE_INTERNAL_LLVM_LIBRARY=OFF" ]; postInstall = '' diff --git a/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch b/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch deleted file mode 100644 index a8721a3e7029..000000000000 --- a/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e08583ddb8445241c38c88d828271be908d52f9f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> -Date: Mon, 17 Feb 2014 20:52:50 +0000 -Subject: [PATCH 1/2] Import LD_LIBRARY_PATH to allow running 'scons check' - without 'chrpath' - ---- - SConstruct | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SConstruct b/SConstruct -index fe444a2..f73c87e 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -220,6 +220,7 @@ import_env = ( - 'STAGING_DIR', # Required by the OpenWRT and CeroWrt builds. - 'STAGING_PREFIX', # Required by the OpenWRT and CeroWrt builds. - 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. -+ 'LD_LIBRARY_PATH', # Allows running 'scons check' without 'chrpath' - ) - envs = {} - for var in import_env: --- -2.9.0 - diff --git a/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch b/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch deleted file mode 100644 index 58ae754ecfb5..000000000000 --- a/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b4ed6e9e89e3b7d57e5de9f2c1987a489bb5628c Mon Sep 17 00:00:00 2001 -From: Alexey Shmalko <rasen.dubi@gmail.com> -Date: Sat, 9 Jul 2016 20:54:05 +0300 -Subject: [PATCH] Use pkgconfig for dbus library - -Without this, gcc can't find library path for the dbus. - -This is already fixed upstream, so the patch shouldn't be necessary with -the next version of gpsd. ---- - SConstruct | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 0d4b29d..d8624b0 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -586,8 +586,8 @@ else: - - if env['dbus_export'] and config.CheckPKG('dbus-1'): - confdefs.append("#define HAVE_DBUS 1\n") -- dbusflags = ["-ldbus-1"] -- env.MergeFlags(pkg_config("dbus-1")) -+ dbusflags = pkg_config("dbus-1") -+ env.MergeFlags(dbusflags) - else: - confdefs.append("/* #undef HAVE_DBUS */\n") - dbusflags = [] --- -2.9.0 - diff --git a/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch b/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch deleted file mode 100644 index 3e387167d6fb..000000000000 --- a/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 21e5295a633c8c450629106c4603b78b2de7d786 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> -Date: Sat, 15 Mar 2014 15:08:01 +0100 -Subject: [PATCH 2/2] Import XML_CATALOG_FILES to be able to validate the - manual - -In nixos/nixpkgs, 'xmlto' depends on $XML_CATALOG_FILES to be able to -validate XML documents. Because without it, it'll try to go online to -download DTD's and builders don't have network access... ---- - SConstruct | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SConstruct b/SConstruct -index f73c87e..0d4b29d 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -221,6 +221,7 @@ import_env = ( - 'STAGING_PREFIX', # Required by the OpenWRT and CeroWrt builds. - 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. - 'LD_LIBRARY_PATH', # Allows running 'scons check' without 'chrpath' -+ 'XML_CATALOG_FILES', # Enables validating the manual with 'xmlto' using nix build system - ) - envs = {} - for var in import_env: --- -2.9.0 - diff --git a/pkgs/servers/gpsd/0002-scons-envs-patch.patch b/pkgs/servers/gpsd/0002-scons-envs-patch.patch deleted file mode 100644 index fbb06db6aa39..000000000000 --- a/pkgs/servers/gpsd/0002-scons-envs-patch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- b/SConstruct 2018-07-03 23:13:51.986746857 +0200 -+++ a/SConstruct 2018-07-03 23:14:50.495252914 +0200 -@@ -221,7 +221,7 @@ - 'STAGING_PREFIX', # Required by the OpenWRT and CeroWrt builds. - 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. - ) --envs = {} -+envs = os.environ - for var in import_env: - if var in os.environ: - envs[var] = os.environ[var] diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 5f9beb4b8348..7f197254878d 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -1,45 +1,49 @@ -{ fetchurl, stdenv, sconsPackages, pkgconfig, dbus, dbus-glib -, ncurses, libX11, libXt, libXpm, libXaw, libXext +{ stdenv, lib ,fetchurl, scons, pkg-config, dbus, ncurses , libusb1, docbook_xml_dtd_412, docbook_xsl, bc + +# optional deps for GUI packages +, guiSupport ? true +, dbus-glib ? null, libX11 ? null, libXt ? null, libXpm ? null, libXaw ? null, libXext ? null +, gobject-introspection ? null, pango ? null, gdk-pixbuf ? null, atk ? null, wrapGAppsHook ? null + , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" , pps-tools -, python2Packages +, python3Packages }: -# TODO: put the X11 deps behind a guiSupport parameter for headless support stdenv.mkDerivation rec { - name = "gpsd-3.16"; + pname = "gpsd"; + version = "3.21"; src = fetchurl { - url = "https://download-mirror.savannah.gnu.org/releases/gpsd/${name}.tar.gz"; - sha256 = "0a90ph4qrlz5kkcz2mwkfk3cmwy9fmglp94znz2y0gsd7bqrlmq3"; + url = "https://download-mirror.savannah.gnu.org/releases/${pname}/${pname}-${version}.tar.gz"; + sha256 = "14gyqrbrq6jz4y6x59rdpv9d4c3pbn0vh1blq3iwrc6kz0x4ql35"; }; nativeBuildInputs = [ - sconsPackages.scons_3_1_2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc - python2Packages.python - python2Packages.wrapPython - ]; + scons pkg-config docbook_xml_dtd_412 docbook_xsl xmlto bc + python3Packages.python + python3Packages.wrapPython + ] + ++ lib.optionals guiSupport [ wrapGAppsHook gobject-introspection ]; buildInputs = [ - python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext + python3Packages.python dbus ncurses libxslt libusb1 pps-tools + ] + ++ lib.optionals guiSupport [ + dbus-glib libX11 libXt libXpm libXaw libXext + gobject-introspection pango gdk-pixbuf atk ]; - pythonPath = [ - python2Packages.pygobject2 - python2Packages.pygtk + pythonPath = lib.optionals guiSupport [ + python3Packages.pygobject3 + python3Packages.pycairo ]; patches = [ - ./0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch - ./0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch - - # TODO: remove the patch with the next release - ./0001-Use-pkgconfig-for-dbus-library.patch - # to be able to find pps-tools - ./0002-scons-envs-patch.patch + ./sconstruct-env-fixes.patch ]; postPatch = '' @@ -53,7 +57,7 @@ stdenv.mkDerivation rec { sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct sconsFlags+=" udevdir=$out/lib/udev" - sconsFlags+=" python_libdir=$out/lib/${python2Packages.python.libPrefix}/site-packages" + sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages" ''; sconsFlags = [ @@ -61,6 +65,7 @@ stdenv.mkDerivation rec { "gpsd_user=${gpsdUser}" "gpsd_group=${gpsdGroup}" "systemd=yes" + "xgps=${if guiSupport then "True" else "False"}" ]; preCheck = '' @@ -73,7 +78,9 @@ stdenv.mkDerivation rec { ''; installTargets = [ "install" "udev-install" ]; + # remove binaries for x-less install because xgps sconsflag is partially broken postFixup = '' + ${if guiSupport then "" else "rm $out/bin/xgps*"} wrapPythonProgramsIn $out/bin "$out $pythonPath" ''; diff --git a/pkgs/servers/gpsd/sconstruct-env-fixes.patch b/pkgs/servers/gpsd/sconstruct-env-fixes.patch new file mode 100644 index 000000000000..e90bd04b6342 --- /dev/null +++ b/pkgs/servers/gpsd/sconstruct-env-fixes.patch @@ -0,0 +1,15 @@ +--- SConstruct.orig 2020-12-03 12:39:40.759793977 -0600 ++++ gpsd-3.21/SConstruct 2020-12-03 12:44:30.858761753 -0600 +@@ -516,9 +516,11 @@ + 'CWRAPPERS_CONFIG_DIR', # pkgsrc + # Variables used in testing + 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. ++ 'LD_LIBRARY_PATH', # Allows running 'scons check' without 'chrpath' ++ 'XML_CATALOG_FILES', # Enables validating the manual with 'xmlto' using nix build system + ) + +-envs = {} ++envs = os.environ + for var in import_env: + if var in os.environ: + envs[var] = os.environ[var] diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 2a937e27d2fb..501533bda54f 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.8"; + version = "10.0.9"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "0ppjxgq7bwhzzlrl2jn7ybc132c8rg95yhwshxqgccbhbs8s6c29"; + sha256 = "191saqanv8k6ijl96mw4jdhh9pkpdn651f1bg4kfb34p7vy8ld9k"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 020ceb65e9f6..27a2b47387ff 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; { }) {}; libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.6.12"; + name = "libX11-1.7.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2"; - sha256 = "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i"; + url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2"; + sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2731,11 +2731,11 @@ lib.makeScope newScope (self: with self; { }) {}; xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xprop-1.2.4"; + name = "xprop-1.2.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xprop-1.2.4.tar.bz2"; - sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc"; + url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2"; + sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 7d01af8307e4..d4773075a251 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -60,7 +60,7 @@ mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 -mirror://xorg/individual/app/xprop-1.2.4.tar.bz2 +mirror://xorg/individual/app/xprop-1.2.5.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 @@ -175,7 +175,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2 +mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 2998bf630c41..9e0b75133bb5 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,24 +3,14 @@ let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { - version = "1.16.1"; + version = "1.16.2"; reconstructLock = true; - postInstall = '' - sed -i '1s;^;#!/usr/bin/env node\n;' $out/lib/node_modules/zigbee2mqtt/index.js - chmod +x $out/lib/node_modules/zigbee2mqtt/index.js - mkdir $out/bin - ln -s $out/lib/node_modules/zigbee2mqtt/index.js $out/bin/zigbee2mqtt - - rm -rf $out/lib/node_modules/zigbee2mqtt/data - ln -s ${dataDir} $out/lib/node_modules/zigbee2mqtt/data - ''; - src = pkgs.fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "16pizkiic7m8w9q56lgzdpy3hpvnw7fwrkkmldg57wpmqmq1r3dj"; + sha256 = "0rpmm4pwm8s4i9fl26ql0czg5kijv42k9wwik7jb3ppi5jzxrakd"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index 14aa9ccf5683..374b97bb509a 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -22,13 +22,13 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.12.1" = { + "@babel/compat-data-7.12.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz"; - sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz"; + sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg=="; }; }; "@babel/core-7.12.3" = { @@ -40,13 +40,22 @@ let sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g=="; }; }; - "@babel/generator-7.12.1" = { + "@babel/core-7.12.9" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.12.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz"; + sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ=="; + }; + }; + "@babel/generator-7.12.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"; - sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; + sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -67,13 +76,13 @@ let sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; }; }; - "@babel/helper-compilation-targets-7.12.1" = { + "@babel/helper-compilation-targets-7.12.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz"; - sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; + sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; }; }; "@babel/helper-create-class-features-plugin-7.12.1" = { @@ -148,13 +157,22 @@ let sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; }; }; - "@babel/helper-module-imports-7.12.1" = { + "@babel/helper-member-expression-to-functions-7.12.7" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; + sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; + }; + }; + "@babel/helper-module-imports-7.12.5" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz"; - sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; }; }; "@babel/helper-module-transforms-7.12.1" = { @@ -175,6 +193,15 @@ let sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg=="; }; }; + "@babel/helper-optimise-call-expression-7.12.7" = { + name = "_at_babel_slash_helper-optimise-call-expression"; + packageName = "@babel/helper-optimise-call-expression"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz"; + sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw=="; + }; + }; "@babel/helper-plugin-utils-7.10.4" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; @@ -202,13 +229,13 @@ let sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; }; }; - "@babel/helper-replace-supers-7.12.1" = { + "@babel/helper-replace-supers-7.12.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"; - sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; + sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; }; }; "@babel/helper-simple-access-7.12.1" = { @@ -265,13 +292,13 @@ let sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; }; }; - "@babel/helpers-7.12.1" = { + "@babel/helpers-7.12.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz"; - sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; + sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; }; }; "@babel/highlight-7.10.4" = { @@ -283,13 +310,22 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.3" = { + "@babel/parser-7.12.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.3"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz"; - sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz"; + sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="; + }; + }; + "@babel/parser-7.12.7" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz"; + sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.12.1" = { @@ -355,13 +391,13 @@ let sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.1" = { + "@babel/plugin-proposal-numeric-separator-7.12.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz"; - sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz"; + sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.12.1" = { @@ -868,13 +904,13 @@ let sha512 = "hNK/DhmoJPsksdHuI/RVrcEws7GN5eamhi28JkO52MqIxU8Z0QpmiSOQxZHWOHV7I3P4UjHV97ay4TcamMA6Kw=="; }; }; - "@babel/runtime-7.12.1" = { + "@babel/runtime-7.12.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; - sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz"; + sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; "@babel/template-7.10.4" = { @@ -886,22 +922,49 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.12.1" = { + "@babel/template-7.12.7" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; + sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; + }; + }; + "@babel/traverse-7.12.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.1"; + version = "7.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz"; + sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA=="; + }; + }; + "@babel/traverse-7.12.9" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.12.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz"; - sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz"; + sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw=="; }; }; - "@babel/types-7.12.1" = { + "@babel/types-7.12.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.1"; + version = "7.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz"; + sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA=="; + }; + }; + "@babel/types-7.12.7" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz"; - sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz"; + sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -958,103 +1021,103 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/console-26.6.1" = { + "@jest/console-26.6.2" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-26.6.1.tgz"; - sha512 = "cjqcXepwC5M+VeIhwT6Xpi/tT4AiNzlIx8SMJ9IihduHnsSrnWNvTBfKIpmqOOCNOPqtbBx6w2JqfoLOJguo8g=="; + url = "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz"; + sha512 = "IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g=="; }; }; - "@jest/core-26.6.1" = { + "@jest/core-26.6.3" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-26.6.1.tgz"; - sha512 = "p4F0pgK3rKnoS9olXXXOkbus1Bsu6fd8pcvLMPsUy4CVXZ8WSeiwQ1lK5hwkCIqJ+amZOYPd778sbPha/S8Srw=="; + url = "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz"; + sha512 = "xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw=="; }; }; - "@jest/environment-26.6.1" = { + "@jest/environment-26.6.2" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-26.6.1.tgz"; - sha512 = "GNvHwkOFJtNgSwdzH9flUPzF9AYAZhUg124CBoQcwcZCM9s5TLz8Y3fMtiaWt4ffbigoetjGk5PU2Dd8nLrSEw=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz"; + sha512 = "nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA=="; }; }; - "@jest/fake-timers-26.6.1" = { + "@jest/fake-timers-26.6.2" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.1.tgz"; - sha512 = "T/SkMLgOquenw/nIisBRD6XAYpFir0kNuclYLkse5BpzeDUukyBr+K31xgAo9M0hgjU9ORlekAYPSzc0DKfmKg=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz"; + sha512 = "14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA=="; }; }; - "@jest/globals-26.6.1" = { + "@jest/globals-26.6.2" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-26.6.1.tgz"; - sha512 = "acxXsSguuLV/CeMYmBseefw6apO7NuXqpE+v5r3yD9ye2PY7h1nS20vY7Obk2w6S7eJO4OIAJeDnoGcLC/McEQ=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz"; + sha512 = "85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA=="; }; }; - "@jest/reporters-26.6.1" = { + "@jest/reporters-26.6.2" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.1.tgz"; - sha512 = "J6OlXVFY3q1SXWJhjme5i7qT/BAZSikdOK2t8Ht5OS32BDo6KfG5CzIzzIFnAVd82/WWbc9Hb7SJ/jwSvVH9YA=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz"; + sha512 = "h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw=="; }; }; - "@jest/source-map-26.5.0" = { + "@jest/source-map-26.6.2" = { name = "_at_jest_slash_source-map"; packageName = "@jest/source-map"; - version = "26.5.0"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz"; - sha512 = "jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g=="; + url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz"; + sha512 = "YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA=="; }; }; - "@jest/test-result-26.6.1" = { + "@jest/test-result-26.6.2" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.1.tgz"; - sha512 = "wqAgIerIN2gSdT2A8WeA5+AFh9XQBqYGf8etK143yng3qYd0mF0ie2W5PVmgnjw4VDU6ammI9NdXrKgNhreawg=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz"; + sha512 = "5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ=="; }; }; - "@jest/test-sequencer-26.6.1" = { + "@jest/test-sequencer-26.6.3" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.1.tgz"; - sha512 = "0csqA/XApZiNeTIPYh6koIDCACSoR6hi29T61tKJMtCZdEC+tF3PoNt7MS0oK/zKC6daBgCbqXxia5ztr/NyCQ=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz"; + sha512 = "YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw=="; }; }; - "@jest/transform-26.6.1" = { + "@jest/transform-26.6.2" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-26.6.1.tgz"; - sha512 = "oNFAqVtqRxZRx6vXL3I4bPKUK0BIlEeaalkwxyQGGI8oXDQBtYQBpiMe5F7qPs4QdvvFYB42gPGIMMcxXaBBxQ=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz"; + sha512 = "E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA=="; }; }; - "@jest/types-26.6.1" = { + "@jest/types-26.6.2" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.6.1.tgz"; - sha512 = "ywHavIKNpAVrStiRY5wiyehvcktpijpItvGiK72RAn5ctqmzvPk8OvKnvHeBqa1XdQr959CTWAJMqxI8BTibyg=="; + url = "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"; + sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; "@nicolo-ribaudo/chokidar-2-2.1.8" = { @@ -1201,13 +1264,13 @@ let sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA=="; }; }; - "@types/babel__core-7.1.11" = { + "@types/babel__core-7.1.12" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.11"; + version = "7.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.11.tgz"; - sha512 = "E5nSOzrjnvhURYnbOR2dClTqcyhPbPvtEwLHf7JJADKedPbcZsoJVfP+I2vBNfBjz4bnZIuhL/tNmRi5nJ7Jlw=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz"; + sha512 = "wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ=="; }; }; "@types/babel__generator-7.6.2" = { @@ -1219,13 +1282,13 @@ let sha512 = "MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ=="; }; }; - "@types/babel__template-7.0.3" = { + "@types/babel__template-7.4.0" = { name = "_at_types_slash_babel__template"; packageName = "@types/babel__template"; - version = "7.0.3"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz"; - sha512 = "uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q=="; + url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz"; + sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A=="; }; }; "@types/babel__traverse-7.0.15" = { @@ -1237,6 +1300,15 @@ let sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A=="; }; }; + "@types/babel__traverse-7.0.16" = { + name = "_at_types_slash_babel__traverse"; + packageName = "@types/babel__traverse"; + version = "7.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.16.tgz"; + sha512 = "S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w=="; + }; + }; "@types/debounce-1.2.0" = { name = "_at_types_slash_debounce"; packageName = "@types/debounce"; @@ -1318,13 +1390,22 @@ let sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-14.14.6" = { + "@types/node-14.14.10" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.14.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz"; + sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="; + }; + }; + "@types/node-14.14.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.6"; + version = "14.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz"; - sha512 = "6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz"; + sha512 = "Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg=="; }; }; "@types/normalize-package-data-2.4.0" = { @@ -1363,6 +1444,15 @@ let sha512 = "RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw=="; }; }; + "@types/yargs-15.0.10" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "15.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz"; + sha512 = "z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ=="; + }; + }; "@types/yargs-15.0.9" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -1381,67 +1471,112 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-4.6.0" = { + "@typescript-eslint/eslint-plugin-4.7.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.0.tgz"; - sha512 = "1+419X+Ynijytr1iWI+/IcX/kJryc78YNpdaXR1aRO1sU3bC0vZrIAF1tIX7rudVI84W7o7M4zo5p1aVt70fAg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.7.0.tgz"; + sha512 = "li9aiSVBBd7kU5VlQlT1AqP0uWGDK6JYKUQ9cVDnOg34VNnd9t4jr0Yqc/bKxJr/tDCPDaB4KzoSFN9fgVxe/Q=="; }; }; - "@typescript-eslint/experimental-utils-4.6.0" = { + "@typescript-eslint/experimental-utils-4.7.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.0.tgz"; - sha512 = "pnh6Beh2/4xjJVNL+keP49DFHk3orDHHFylSp3WEjtgW3y1U+6l+jNnJrGlbs6qhAz5z96aFmmbUyKhunXKvKw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.7.0.tgz"; + sha512 = "cymzovXAiD4EF+YoHAB5Oh02MpnXjvyaOb+v+BdpY7lsJXZQN34oIETeUwVT2XfV9rSNpXaIcknDLfupO/tUoA=="; }; }; - "@typescript-eslint/parser-4.6.0" = { + "@typescript-eslint/experimental-utils-4.8.2" = { + name = "_at_typescript-eslint_slash_experimental-utils"; + packageName = "@typescript-eslint/experimental-utils"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.2.tgz"; + sha512 = "hpTw6o6IhBZEsQsjuw/4RWmceRyESfAiEzAEnXHKG1X7S5DXFaZ4IO1JO7CW1aQ604leQBzjZmuMI9QBCAJX8Q=="; + }; + }; + "@typescript-eslint/parser-4.7.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.6.0.tgz"; - sha512 = "Dj6NJxBhbdbPSZ5DYsQqpR32MwujF772F2H3VojWU6iT4AqL4BKuoNWOPFCoSZvCcADDvQjDpa6OLDAaiZPz2Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.7.0.tgz"; + sha512 = "+meGV8bMP1sJHBI2AFq1GeTwofcGiur8LoIr6v+rEmD9knyCqDlrQcFHR0KDDfldHIFDU/enZ53fla6ReF4wRw=="; }; }; - "@typescript-eslint/scope-manager-4.6.0" = { + "@typescript-eslint/scope-manager-4.7.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.6.0"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.7.0.tgz"; + sha512 = "ILITvqwDJYbcDCROj6+Ob0oCKNg3SH46iWcNcTIT9B5aiVssoTYkhKjxOMNzR1F7WSJkik4zmuqve5MdnA0DyA=="; + }; + }; + "@typescript-eslint/scope-manager-4.8.2" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.6.0.tgz"; - sha512 = "uZx5KvStXP/lwrMrfQQwDNvh2ppiXzz5TmyTVHb+5TfZ3sUP7U1onlz3pjoWrK9konRyFe1czyxObWTly27Ang=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.8.2.tgz"; + sha512 = "qHQ8ODi7mMin4Sq2eh/6eu03uVzsf5TX+J43xRmiq8ujng7ViQSHNPLOHGw/Wr5dFEoxq/ubKhzClIIdQy5q3g=="; }; }; - "@typescript-eslint/types-4.6.0" = { + "@typescript-eslint/types-4.7.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.6.0.tgz"; - sha512 = "5FAgjqH68SfFG4UTtIFv+rqYJg0nLjfkjD0iv+5O27a0xEeNZ5rZNDvFGZDizlCD1Ifj7MAbSW2DPMrf0E9zjA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.7.0.tgz"; + sha512 = "uLszFe0wExJc+I7q0Z/+BnP7wao/kzX0hB5vJn4LIgrfrMLgnB2UXoReV19lkJQS1a1mHWGGODSxnBx6JQC3Sg=="; }; }; - "@typescript-eslint/typescript-estree-4.6.0" = { + "@typescript-eslint/types-4.8.2" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.8.2.tgz"; + sha512 = "z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw=="; + }; + }; + "@typescript-eslint/typescript-estree-4.7.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.0.tgz"; - sha512 = "s4Z9qubMrAo/tw0CbN0IN4AtfwuehGXVZM0CHNMdfYMGBDhPdwTEpBrecwhP7dRJu6d9tT9ECYNaWDHvlFSngA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.7.0.tgz"; + sha512 = "5XZRQznD1MfUmxu1t8/j2Af4OxbA7EFU2rbo0No7meb46eHgGkSieFdfV6omiC/DGIBhH9H9gXn7okBbVOm8jw=="; }; }; - "@typescript-eslint/visitor-keys-4.6.0" = { + "@typescript-eslint/typescript-estree-4.8.2" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz"; + sha512 = "HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg=="; + }; + }; + "@typescript-eslint/visitor-keys-4.7.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.0.tgz"; - sha512 = "38Aa9Ztl0XyFPVzmutHXqDMCu15Xx8yKvUo38Gu3GhsuckCh3StPI5t2WIO9LHEsOH7MLmlGfKUisU8eW1Sjhg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.7.0.tgz"; + sha512 = "aDJDWuCRsf1lXOtignlfiPODkzSxxop7D0rZ91L6ZuMlcMCSh0YyK+gAfo5zN/ih6WxMwhoXgJWC3cWQdaKC+A=="; + }; + }; + "@typescript-eslint/visitor-keys-4.8.2" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz"; + sha512 = "Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw=="; }; }; "abab-2.0.5" = { @@ -1768,13 +1903,13 @@ let sha512 = "fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw=="; }; }; - "babel-jest-26.6.1" = { + "babel-jest-26.6.3" = { name = "babel-jest"; packageName = "babel-jest"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.1.tgz"; - sha512 = "duMWEOKrSBYRVTTNpL2SipNIWnZOjP77auOBMPQ3zXAdnDbyZQWU8r/RxNWpUf9N6cgPFecQYelYLytTVXVDtA=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz"; + sha512 = "pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1795,31 +1930,31 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-26.5.0" = { + "babel-plugin-jest-hoist-26.6.2" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "26.5.0"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz"; - sha512 = "ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz"; + sha512 = "PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw=="; }; }; - "babel-preset-current-node-syntax-0.1.4" = { + "babel-preset-current-node-syntax-1.0.0" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; - version = "0.1.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz"; - sha512 = "5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w=="; + url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz"; + sha512 = "mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q=="; }; }; - "babel-preset-jest-26.5.0" = { + "babel-preset-jest-26.6.2" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "26.5.0"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz"; - sha512 = "F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz"; + sha512 = "YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ=="; }; }; "balanced-match-1.0.0" = { @@ -1840,13 +1975,13 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; - "base64-js-1.3.1" = { + "base64-js-1.5.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -1930,13 +2065,13 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browserslist-4.14.5" = { + "browserslist-4.14.7" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.5"; + version = "4.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz"; - sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz"; + sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ=="; }; }; "bser-2.1.1" = { @@ -1948,15 +2083,6 @@ let sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; }; }; - "buffer-5.7.0" = { - name = "buffer"; - packageName = "buffer"; - version = "5.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz"; - sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg=="; - }; - }; "buffer-5.7.1" = { name = "buffer"; packageName = "buffer"; @@ -2038,13 +2164,13 @@ let sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; }; - "caniuse-lite-1.0.30001154" = { + "caniuse-lite-1.0.30001157" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001154"; + version = "1.0.30001157"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz"; - sha512 = "y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz"; + sha512 = "gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA=="; }; }; "capture-exit-2.0.0" = { @@ -2128,13 +2254,13 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "cjs-module-lexer-0.4.3" = { + "cjs-module-lexer-0.6.0" = { name = "cjs-module-lexer"; packageName = "cjs-module-lexer"; - version = "0.4.3"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.4.3.tgz"; - sha512 = "5RLK0Qfs0PNDpEyBXIr3bIT1Muw3ojSlvpw6dAmkUcO0+uTrsBn7GuEIgx40u+OzbCBLDta7nvmud85P4EmTsQ=="; + url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz"; + sha512 = "uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw=="; }; }; "class-utils-0.3.6" = { @@ -2245,6 +2371,15 @@ let sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw=="; }; }; + "colorette-1.2.1" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz"; + sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="; + }; + }; "colors-1.4.0" = { name = "colors"; packageName = "colors"; @@ -2344,13 +2479,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-compat-3.6.5" = { + "core-js-compat-3.7.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.6.5"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; - sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz"; + sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg=="; }; }; "core-util-is-1.0.2" = { @@ -2461,6 +2596,15 @@ let sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; + "debug-4.3.1" = { + name = "debug"; + packageName = "debug"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -2614,13 +2758,13 @@ let sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; }; }; - "diff-sequences-26.5.0" = { + "diff-sequences-26.6.2" = { name = "diff-sequences"; packageName = "diff-sequences"; - version = "26.5.0"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz"; - sha512 = "ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q=="; + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz"; + sha512 = "Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q=="; }; }; "dir-glob-3.0.1" = { @@ -2677,13 +2821,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.585" = { + "electron-to-chromium-1.3.596" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.585"; + version = "1.3.596"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.585.tgz"; - sha512 = "xoeqjMQhgHDZM7FiglJAb2aeOxHZWFruUc3MbAGTgE7GB8rr5fTn1Sdh5THGuQtndU3GuXlu91ZKqRivxoCZ/A=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz"; + sha512 = "nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg=="; }; }; "emittery-0.7.2" = { @@ -2857,13 +3001,22 @@ let sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; - "eslint-7.12.1" = { + "eslint-7.13.0" = { name = "eslint"; packageName = "eslint"; - version = "7.12.1"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz"; + sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ=="; + }; + }; + "eslint-7.14.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz"; - sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz"; + sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA=="; }; }; "eslint-config-google-0.14.0" = { @@ -2875,13 +3028,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-24.1.0" = { + "eslint-plugin-jest-24.1.3" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "24.1.0"; + version = "24.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz"; - sha512 = "827YJ+E8B9PvXu/0eiVSNFfxxndbKv+qE/3GSMhdorCaeaOehtqHGX2YDW9B85TEOre9n/zscledkFW/KbnyGg=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.1.3.tgz"; + sha512 = "dNGGjzuEzCE3d5EPZQ/QGtmlMotqnYWD/QpCZ1UuZlrMAdhG5rldh0N0haCvhGnUkSeuORS5VNROwF9Hrgn3Lg=="; }; }; "eslint-scope-5.1.1" = { @@ -3001,15 +3154,6 @@ let sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; - "eventemitter3-4.0.7" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; - }; - }; "exec-sh-0.3.4" = { name = "exec-sh"; packageName = "exec-sh"; @@ -3064,13 +3208,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-26.6.1" = { + "expect-26.6.2" = { name = "expect"; packageName = "expect"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-26.6.1.tgz"; - sha512 = "BRfxIBHagghMmr1D2MRY0Qv5d3Nc8HCqgbDwNXw/9izmM5eBb42a2YjLKSbsqle76ozGkAEPELQX4IdNHAKRNA=="; + url = "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz"; + sha512 = "9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA=="; }; }; "ext-1.4.0" = { @@ -3388,6 +3532,15 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; + "fsevents-2.2.1" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz"; + sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; + }; + }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -3757,15 +3910,6 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; - "http-proxy-1.18.1" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; - sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; - }; - }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -3838,13 +3982,13 @@ let sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; }; }; - "import-fresh-3.2.1" = { + "import-fresh-3.2.2" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; + sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; }; }; "import-local-3.0.2" = { @@ -3991,13 +4135,22 @@ let sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; }; - "is-core-module-2.0.0" = { + "is-core-module-2.1.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.0.0"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz"; + sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA=="; + }; + }; + "is-core-module-2.2.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz"; - sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; }; }; "is-data-descriptor-0.1.4" = { @@ -4324,49 +4477,49 @@ let sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; }; }; - "jest-26.6.1" = { + "jest-26.6.3" = { name = "jest"; packageName = "jest"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-26.6.1.tgz"; - sha512 = "f+ahfqw3Ffy+9vA7sWFGpTmhtKEMsNAZiWBVXDkrpIO73zIz22iimjirnV78kh/eWlylmvLh/0WxHN6fZraZdA=="; + url = "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz"; + sha512 = "lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q=="; }; }; - "jest-changed-files-26.6.1" = { + "jest-changed-files-26.6.2" = { name = "jest-changed-files"; packageName = "jest-changed-files"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.1.tgz"; - sha512 = "NhSdZ5F6b/rIN5V46x1l31vrmukD/bJUXgYAY8VtP1SknYdJwjYDRxuLt7Z8QryIdqCjMIn2C0Cd98EZ4umo8Q=="; + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz"; + sha512 = "fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ=="; }; }; - "jest-cli-26.6.1" = { + "jest-cli-26.6.3" = { name = "jest-cli"; packageName = "jest-cli"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.1.tgz"; - sha512 = "aPLoEjlwFrCWhiPpW5NUxQA1X1kWsAnQcQ0SO/fHsCvczL3W75iVAcH9kP6NN+BNqZcHNEvkhxT5cDmBfEAh+w=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz"; + sha512 = "GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg=="; }; }; - "jest-config-26.6.1" = { + "jest-config-26.6.3" = { name = "jest-config"; packageName = "jest-config"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-26.6.1.tgz"; - sha512 = "mtJzIynIwW1d1nMlKCNCQiSgWaqFn8cH/fOSNY97xG7Y9tBCZbCSuW2GTX0RPmceSJGO7l27JgwC18LEg0Vg+g=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz"; + sha512 = "t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg=="; }; }; - "jest-diff-26.6.1" = { + "jest-diff-26.6.2" = { name = "jest-diff"; packageName = "jest-diff"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.1.tgz"; - sha512 = "BBNy/zin2m4kG5In126O8chOBxLLS/XMTuuM2+YhgyHk87ewPzKTuTJcqj3lOWOi03NNgrl+DkMeV/exdvG9gg=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz"; + sha512 = "6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA=="; }; }; "jest-docblock-26.0.0" = { @@ -4378,31 +4531,31 @@ let sha512 = "RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w=="; }; }; - "jest-each-26.6.1" = { + "jest-each-26.6.2" = { name = "jest-each"; packageName = "jest-each"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-26.6.1.tgz"; - sha512 = "gSn8eB3buchuq45SU7pLB7qmCGax1ZSxfaWuEFblCyNMtyokYaKFh9dRhYPujK6xYL57dLIPhLKatjmB5XWzGA=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz"; + sha512 = "Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A=="; }; }; - "jest-environment-jsdom-26.6.1" = { + "jest-environment-jsdom-26.6.2" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.1.tgz"; - sha512 = "A17RiXuHYNVlkM+3QNcQ6n5EZyAc6eld8ra9TW26luounGWpku4tj03uqRgHJCI1d4uHr5rJiuCH5JFRtdmrcA=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz"; + sha512 = "jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q=="; }; }; - "jest-environment-node-26.6.1" = { + "jest-environment-node-26.6.2" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.1.tgz"; - sha512 = "YffaCp6h0j1kbcf1NVZ7umC6CPgD67YS+G1BeornfuSkx5s3xdhuwG0DCxSiHPXyT81FfJzA1L7nXvhq50OWIg=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz"; + sha512 = "zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag=="; }; }; "jest-get-type-26.3.0" = { @@ -4414,58 +4567,58 @@ let sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; }; }; - "jest-haste-map-26.6.1" = { + "jest-haste-map-26.6.2" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.1.tgz"; - sha512 = "9kPafkv0nX6ta1PrshnkiyhhoQoFWncrU/uUBt3/AP1r78WSCU5iLceYRTwDvJl67H3RrXqSlSVDDa/AsUB7OQ=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz"; + sha512 = "easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w=="; }; }; - "jest-jasmine2-26.6.1" = { + "jest-jasmine2-26.6.3" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.1.tgz"; - sha512 = "2uYdT32o/ZzSxYAPduAgokO8OlAL1YdG/9oxcEY138EDNpIK5XRRJDaGzTZdIBWSxk0aR8XxN44FvfXtHB+Fiw=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz"; + sha512 = "kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg=="; }; }; - "jest-leak-detector-26.6.1" = { + "jest-leak-detector-26.6.2" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.1.tgz"; - sha512 = "j9ZOtJSJKlHjrs4aIxWjiQUjyrffPdiAQn2Iw0916w7qZE5Lk0T2KhIH6E9vfhzP6sw0Q0jtnLLb4vQ71o1HlA=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz"; + sha512 = "i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg=="; }; }; - "jest-matcher-utils-26.6.1" = { + "jest-matcher-utils-26.6.2" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.1.tgz"; - sha512 = "9iu3zrsYlUnl8pByhREF9rr5eYoiEb1F7ymNKg6lJr/0qD37LWS5FSW/JcoDl8UdMX2+zAzabDs7sTO+QFKjCg=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz"; + sha512 = "llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw=="; }; }; - "jest-message-util-26.6.1" = { + "jest-message-util-26.6.2" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.1.tgz"; - sha512 = "cqM4HnqncIebBNdTKrBoWR/4ufHTll0pK/FWwX0YasK+TlBQEMqw3IEdynuuOTjDPFO3ONlFn37280X48beByw=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz"; + sha512 = "rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA=="; }; }; - "jest-mock-26.6.1" = { + "jest-mock-26.6.2" = { name = "jest-mock"; packageName = "jest-mock"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.1.tgz"; - sha512 = "my0lPTBu1awY8iVG62sB2sx9qf8zxNDVX+5aFgoB8Vbqjb6LqIOsfyFA8P1z6H2IsqMbvOX9oCJnK67Y3yUIMA=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz"; + sha512 = "YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -4486,94 +4639,94 @@ let sha512 = "Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A=="; }; }; - "jest-resolve-26.6.1" = { + "jest-resolve-26.6.2" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz"; - sha512 = "hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz"; + sha512 = "sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ=="; }; }; - "jest-resolve-dependencies-26.6.1" = { + "jest-resolve-dependencies-26.6.3" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.1.tgz"; - sha512 = "MN6lufbZJ3RBfTnJesZtHu3hUCBqPdHRe2+FhIt0yiqJ3fMgzWRqMRQyN/d/QwOE7KXwAG2ekZutbPhuD7s51A=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz"; + sha512 = "pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg=="; }; }; - "jest-runner-26.6.1" = { + "jest-runner-26.6.3" = { name = "jest-runner"; packageName = "jest-runner"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.1.tgz"; - sha512 = "DmpNGdgsbl5s0FGkmsInmqnmqCtliCSnjWA2TFAJS1m1mL5atwfPsf+uoZ8uYQ2X0uDj4NM+nPcDnUpbNTRMBA=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz"; + sha512 = "atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ=="; }; }; - "jest-runtime-26.6.1" = { + "jest-runtime-26.6.3" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "26.6.1"; + version = "26.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.1.tgz"; - sha512 = "7uOCNeezXDWgjEyzYbRN2ViY7xNZzusNVGAMmU0UHRUNXuY4j4GBHKGMqPo/cBPZA9bSYp+lwK2DRRBU5Dv6YQ=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz"; + sha512 = "lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw=="; }; }; - "jest-serializer-26.5.0" = { + "jest-serializer-26.6.2" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "26.5.0"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz"; - sha512 = "+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz"; + sha512 = "S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g=="; }; }; - "jest-snapshot-26.6.1" = { + "jest-snapshot-26.6.2" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.1.tgz"; - sha512 = "JA7bZp7HRTIJYAi85pJ/OZ2eur2dqmwIToA5/6d7Mn90isGEfeF9FvuhDLLEczgKP1ihreBzrJ6Vr7zteP5JNA=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz"; + sha512 = "OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og=="; }; }; - "jest-util-26.6.1" = { + "jest-util-26.6.2" = { name = "jest-util"; packageName = "jest-util"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.6.1.tgz"; - sha512 = "xCLZUqVoqhquyPLuDXmH7ogceGctbW8SMyQVjD9o+1+NPWI7t0vO08udcFLVPLgKWcvc+zotaUv/RuaR6l8HIA=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz"; + sha512 = "MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q=="; }; }; - "jest-validate-26.6.1" = { + "jest-validate-26.6.2" = { name = "jest-validate"; packageName = "jest-validate"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.1.tgz"; - sha512 = "BEFpGbylKocnNPZULcnk+TGaz1oFZQH/wcaXlaXABbu0zBwkOGczuWgdLucUouuQqn7VadHZZeTvo8VSFDLMOA=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz"; + sha512 = "NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ=="; }; }; - "jest-watcher-26.6.1" = { + "jest-watcher-26.6.2" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.1.tgz"; - sha512 = "0LBIPPncNi9CaLKK15bnxyd2E8OMl4kJg0PTiNOI+MXztXw1zVdtX/x9Pr6pXaQYps+eS/ts43O4+HByZ7yJSw=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz"; + sha512 = "WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ=="; }; }; - "jest-worker-26.6.1" = { + "jest-worker-26.6.2" = { name = "jest-worker"; packageName = "jest-worker"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.1.tgz"; - sha512 = "R5IE3qSGz+QynJx8y+ICEkdI2OJ3RJjRQVEyCcFAd3yVhQSEtquziPO29Mlzgn07LOVE8u8jhJ1FqcwegiXWOw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; + sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; "js-tokens-4.0.0" = { @@ -4891,13 +5044,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "marked-1.2.2" = { + "marked-1.2.3" = { name = "marked"; packageName = "marked"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz"; - sha512 = "5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.3.tgz"; + sha512 = "RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw=="; }; }; "merge-stream-2.0.0" = { @@ -5197,13 +5350,13 @@ let sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; }; }; - "node-releases-1.1.65" = { + "node-releases-1.1.66" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.65"; + version = "1.1.66"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.65.tgz"; - sha512 = "YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz"; + sha512 = "JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg=="; }; }; "noop-logger-0.1.1" = { @@ -5431,6 +5584,15 @@ let sha512 = "ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ=="; }; }; + "p-each-series-2.2.0" = { + name = "p-each-series"; + packageName = "p-each-series"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz"; + sha512 = "ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA=="; + }; + }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -5656,13 +5818,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-26.6.1" = { + "pretty-format-26.6.2" = { name = "pretty-format"; packageName = "pretty-format"; - version = "26.6.1"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.1.tgz"; - sha512 = "MeqqsP5PYcRBbGMvwzsyBdmAJ4EFX7pWFyl7x4+dMVg5pE0ZDdBIvEH2ergvIO+Gvwv1wh64YuOY9y5LuyY/GA=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"; + sha512 = "7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg=="; }; }; "process-nextick-args-2.0.1" = { @@ -5836,13 +5998,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "regenerate-1.4.1" = { + "regenerate-1.4.2" = { name = "regenerate"; packageName = "regenerate"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; - sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; "regenerate-unicode-properties-8.2.0" = { @@ -5998,22 +6160,13 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "requires-port-1.0.0" = { - name = "requires-port"; - packageName = "requires-port"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; - }; - }; - "resolve-1.18.1" = { + "resolve-1.19.0" = { name = "resolve"; packageName = "resolve"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz"; - sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; "resolve-cwd-3.0.0" = { @@ -6547,13 +6700,13 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "stack-utils-2.0.2" = { + "stack-utils-2.0.3" = { name = "stack-utils"; packageName = "stack-utils"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz"; - sha512 = "0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg=="; + url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz"; + sha512 = "gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw=="; }; }; "static-extend-0.1.2" = { @@ -6763,13 +6916,13 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "tar-fs-2.1.0" = { + "tar-fs-2.1.1" = { name = "tar-fs"; packageName = "tar-fs"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz"; - sha512 = "9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg=="; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; }; "tar-stream-2.1.4" = { @@ -7132,13 +7285,13 @@ let sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; }; }; - "uglify-js-3.11.4" = { + "uglify-js-3.11.6" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.4"; + version = "3.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz"; - sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz"; + sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g=="; }; }; "unc-path-regex-0.1.2" = { @@ -7321,13 +7474,13 @@ let sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; }; }; - "v8-to-istanbul-6.0.1" = { + "v8-to-istanbul-7.0.0" = { name = "v8-to-istanbul"; packageName = "v8-to-istanbul"; - version = "6.0.1"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz"; - sha512 = "PzM1WlqquhBvsV+Gco6WSFeg1AGdD53ccMRkFeyHRE/KRZaVacPOmQYP3EeVgDBtKD2BJ8kgynBQ5OtKiHCH+w=="; + url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz"; + sha512 = "fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA=="; }; }; "validate-npm-package-license-3.0.4" = { @@ -7546,13 +7699,13 @@ let sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; }; - "ws-7.3.1" = { + "ws-7.4.0" = { name = "ws"; packageName = "ws"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz"; - sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz"; + sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="; }; }; "xml-name-validator-3.0.0" = { @@ -7609,38 +7762,38 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "zigbee-herdsman-0.13.26" = { + "zigbee-herdsman-0.13.37" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.13.26"; + version = "0.13.37"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.26.tgz"; - sha512 = "NNPNmcqP7SaSdwzPGF4IjXczBnwX6rHXwB89t9faLDOLxAJgNU4EtFnLQXVrKi1t6ItMMfWzE9YtNdopSWicig=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.37.tgz"; + sha512 = "eK2EK2mqT80ueHvEicKmXGyw+VezoK+7NcHX9WjjeQL6bdOpaLCuDGZY0sOh86Lmodyvdd0ZxY7MwA6z/Ko2PA=="; }; }; - "zigbee-herdsman-converters-12.0.224" = { + "zigbee-herdsman-converters-13.0.7" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "12.0.224"; + version = "13.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.224.tgz"; - sha512 = "Iej1T5biRrXuKOdC6bsT8HDpayZSao/I4DWNstYlSyJhpa3QM0vZLbS4QexVmkG35gebrs1MSC7RVT4kUqizrw=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-13.0.7.tgz"; + sha512 = "aHqcbkQmoSkBth4s94//wJm2UO+0YFQkIndRBbz1XAIdNeHDhUVA6ZT1B1DgJZEbF/HRW8ZZLC+biSF6h/1HvQ=="; }; }; - "zigbee2mqtt-frontend-0.2.68" = { + "zigbee2mqtt-frontend-0.2.100" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.2.68"; + version = "0.2.100"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.68.tgz"; - sha512 = "i89/EG+wQZ4m+O8I9VPuIgsAOxtft/e1pH5qqZeFcDvQg2iRuvRWR7CuEFJ4FnbakjOXU62eGldfzqsoq/m9Tw=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.100.tgz"; + sha512 = "/WASdNtWYAqts8RvC3j6HkdnZifg2KEocGS1eIl1G7Gghoj/80TiF5TVYtU3YG9M40vgMIIMvIwrmc8UOmdJhg=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.16.1"; + version = "1.16.2"; src = ./.; dependencies = [ sources."@dabh/diagnostics-2.0.2" @@ -7648,7 +7801,7 @@ let sources."argparse-1.0.10" sources."async-3.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.1" + sources."base64-js-1.5.1" sources."bindings-1.5.0" (sources."bl-4.0.3" // { dependencies = [ @@ -7692,7 +7845,6 @@ let sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-emitter-0.3.5" - sources."eventemitter3-4.0.7" (sources."ext-1.4.0" // { dependencies = [ sources."type-2.1.0" @@ -7706,7 +7858,6 @@ let sources."file-uri-to-path-1.0.0" sources."finalhandler-1.1.2" sources."fn.name-1.1.0" - sources."follow-redirects-1.13.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."git-last-commit-1.0.0" @@ -7716,7 +7867,6 @@ let sources."glossy-0.1.7" sources."help-me-1.1.0" sources."http-errors-1.7.3" - sources."http-proxy-1.18.1" sources."humanize-duration-3.24.0" sources."ieee754-1.2.1" sources."inflight-1.0.6" @@ -7748,13 +7898,13 @@ let sources."moment-2.29.1" (sources."mqtt-4.2.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) (sources."mqtt-packet-6.6.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -7781,7 +7931,6 @@ let sources."readable-stream-2.3.7" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" - sources."requires-port-1.0.0" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."semver-7.3.2" @@ -7825,18 +7974,18 @@ let sources."winston-syslog-2.4.4" sources."winston-transport-4.4.0" sources."wrappy-1.0.2" - sources."ws-7.3.1" + sources."ws-7.4.0" sources."xtend-4.0.2" - (sources."zigbee-herdsman-0.13.26" // { + (sources."zigbee-herdsman-0.13.37" // { dependencies = [ sources."@babel/cli-7.12.1" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" + sources."@babel/compat-data-7.12.5" sources."@babel/core-7.12.3" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" @@ -7845,22 +7994,22 @@ let sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -7868,7 +8017,7 @@ let sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" sources."@babel/plugin-proposal-optional-chaining-7.12.1" @@ -7925,10 +8074,10 @@ let sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.1" - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.6" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" (sources."@eslint/eslintrc-0.2.1" // { @@ -7940,7 +8089,7 @@ let }) sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - (sources."@jest/console-26.6.1" // { + (sources."@jest/console-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -7951,7 +8100,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-26.6.1" // { + (sources."@jest/core-26.6.3" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -7970,10 +8119,10 @@ let sources."to-regex-range-5.0.1" ]; }) - sources."@jest/environment-26.6.1" - sources."@jest/fake-timers-26.6.1" - sources."@jest/globals-26.6.1" - (sources."@jest/reporters-26.6.1" // { + sources."@jest/environment-26.6.2" + sources."@jest/fake-timers-26.6.2" + sources."@jest/globals-26.6.2" + (sources."@jest/reporters-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -7985,14 +8134,14 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/source-map-26.5.0" // { + (sources."@jest/source-map-26.6.2" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/test-result-26.6.1" - sources."@jest/test-sequencer-26.6.1" - (sources."@jest/transform-26.6.1" // { + sources."@jest/test-result-26.6.2" + sources."@jest/test-sequencer-26.6.3" + (sources."@jest/transform-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."braces-3.0.2" @@ -8009,7 +8158,7 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."@jest/types-26.6.1" // { + (sources."@jest/types-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8039,9 +8188,9 @@ let sources."@serialport/stream-9.0.2" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" - sources."@types/babel__core-7.1.11" + sources."@types/babel__core-7.1.12" sources."@types/babel__generator-7.6.2" - sources."@types/babel__template-7.0.3" + sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.0.15" sources."@types/debounce-1.2.0" sources."@types/debug-4.1.5" @@ -8052,28 +8201,28 @@ let sources."@types/jest-26.0.15" sources."@types/json-schema-7.0.6" sources."@types/nedb-1.8.11" - sources."@types/node-14.14.6" + sources."@types/node-14.14.7" sources."@types/normalize-package-data-2.4.0" sources."@types/prettier-2.1.5" sources."@types/serialport-8.0.1" sources."@types/stack-utils-2.0.0" sources."@types/yargs-15.0.9" sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-4.6.0" // { + (sources."@typescript-eslint/eslint-plugin-4.7.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-4.6.0" - sources."@typescript-eslint/parser-4.6.0" - sources."@typescript-eslint/scope-manager-4.6.0" - sources."@typescript-eslint/types-4.6.0" - (sources."@typescript-eslint/typescript-estree-4.6.0" // { + sources."@typescript-eslint/experimental-utils-4.7.0" + sources."@typescript-eslint/parser-4.7.0" + sources."@typescript-eslint/scope-manager-4.7.0" + sources."@typescript-eslint/types-4.7.0" + (sources."@typescript-eslint/typescript-estree-4.7.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-4.6.0" + sources."@typescript-eslint/visitor-keys-4.7.0" sources."abab-2.0.5" sources."acorn-7.4.1" sources."acorn-globals-6.0.0" @@ -8111,7 +8260,7 @@ let sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - (sources."babel-jest-26.6.1" // { + (sources."babel-jest-26.6.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8124,9 +8273,9 @@ let }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.5.0" - sources."babel-preset-current-node-syntax-0.1.4" - sources."babel-preset-jest-26.5.0" + sources."babel-plugin-jest-hoist-26.6.2" + sources."babel-preset-current-node-syntax-1.0.0" + sources."babel-preset-jest-26.6.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -8138,7 +8287,7 @@ let sources."mixin-deep-1.3.2" ]; }) - sources."base64-js-1.3.1" + sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" @@ -8154,15 +8303,15 @@ let ]; }) sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.14.5" + sources."browserslist-4.14.7" sources."bser-2.1.1" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."call-bind-1.0.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001154" + sources."caniuse-lite-1.0.30001157" sources."capture-exit-2.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -8183,7 +8332,7 @@ let }) sources."chownr-1.1.4" sources."ci-info-2.0.0" - sources."cjs-module-lexer-0.4.3" + sources."cjs-module-lexer-0.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -8204,6 +8353,7 @@ let sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colorette-1.2.1" sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."component-emitter-1.3.0" @@ -8211,7 +8361,7 @@ let sources."console-control-strings-1.1.0" sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -8247,7 +8397,7 @@ let sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."detect-newline-3.1.0" - sources."diff-sequences-26.5.0" + sources."diff-sequences-26.6.2" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { @@ -8256,7 +8406,7 @@ let ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.585" + sources."electron-to-chromium-1.3.596" sources."emittery-0.7.2" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" @@ -8273,7 +8423,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.12.1" // { + (sources."eslint-7.13.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -8332,7 +8482,7 @@ let ]; }) sources."expand-template-2.0.3" - (sources."expect-26.6.1" // { + (sources."expect-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -8440,7 +8590,7 @@ let sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.1.8" - (sources."import-fresh-3.2.1" // { + (sources."import-fresh-3.2.2" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -8461,7 +8611,7 @@ let sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.1.0" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" @@ -8513,18 +8663,18 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-26.6.1" // { + (sources."jest-26.6.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-26.6.1" + sources."jest-cli-26.6.3" sources."supports-color-7.2.0" ]; }) - (sources."jest-changed-files-26.6.1" // { + (sources."jest-changed-files-26.6.2" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-4.1.0" @@ -8537,7 +8687,7 @@ let sources."which-2.0.2" ]; }) - (sources."jest-config-26.6.1" // { + (sources."jest-config-26.6.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."braces-3.0.2" @@ -8552,7 +8702,7 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-diff-26.6.1" // { + (sources."jest-diff-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8563,7 +8713,7 @@ let ]; }) sources."jest-docblock-26.0.0" - (sources."jest-each-26.6.1" // { + (sources."jest-each-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8573,21 +8723,21 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-26.6.1" - sources."jest-environment-node-26.6.1" + sources."jest-environment-jsdom-26.6.2" + sources."jest-environment-node-26.6.2" sources."jest-get-type-26.3.0" - (sources."jest-haste-map-26.6.1" // { + (sources."jest-haste-map-26.6.2" // { dependencies = [ sources."anymatch-3.1.1" sources."braces-3.0.2" sources."fill-range-7.0.1" - sources."fsevents-2.1.3" + sources."fsevents-2.2.1" sources."is-number-7.0.0" sources."micromatch-4.0.2" sources."to-regex-range-5.0.1" ]; }) - (sources."jest-jasmine2-26.6.1" // { + (sources."jest-jasmine2-26.6.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8597,8 +8747,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-26.6.1" - (sources."jest-matcher-utils-26.6.1" // { + sources."jest-leak-detector-26.6.2" + (sources."jest-matcher-utils-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8608,7 +8758,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-26.6.1" // { + (sources."jest-message-util-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."braces-3.0.2" @@ -8624,10 +8774,10 @@ let sources."to-regex-range-5.0.1" ]; }) - sources."jest-mock-26.6.1" + sources."jest-mock-26.6.2" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - (sources."jest-resolve-26.6.1" // { + (sources."jest-resolve-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8638,8 +8788,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-26.6.1" - (sources."jest-runner-26.6.1" // { + sources."jest-resolve-dependencies-26.6.3" + (sources."jest-runner-26.6.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8649,7 +8799,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-26.6.1" // { + (sources."jest-runtime-26.6.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8660,8 +8810,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-serializer-26.5.0" - (sources."jest-snapshot-26.6.1" // { + sources."jest-serializer-26.6.2" + (sources."jest-snapshot-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8672,7 +8822,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-util-26.6.1" // { + (sources."jest-util-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."braces-3.0.2" @@ -8687,7 +8837,7 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-validate-26.6.1" // { + (sources."jest-validate-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."camelcase-6.2.0" @@ -8698,7 +8848,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-26.6.1" // { + (sources."jest-watcher-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -8708,7 +8858,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-26.6.1" // { + (sources."jest-worker-26.6.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -8744,7 +8894,7 @@ let sources."makeerror-1.0.11" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."marked-1.2.2" + sources."marked-1.2.3" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-3.1.10" @@ -8773,7 +8923,7 @@ let sources."which-2.0.2" ]; }) - sources."node-releases-1.1.65" + sources."node-releases-1.1.66" sources."noop-logger-0.1.1" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -8819,7 +8969,7 @@ let sources."posix-character-classes-0.1.1" sources."prebuild-install-5.3.6" sources."prelude-ls-1.2.1" - (sources."pretty-format-26.6.1" // { + (sources."pretty-format-26.6.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -8845,7 +8995,7 @@ let sources."readable-stream-2.3.7" sources."readdirp-2.2.1" sources."rechoir-0.6.2" - sources."regenerate-1.4.1" + sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" @@ -8875,7 +9025,7 @@ let }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.18.1" + sources."resolve-1.19.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" @@ -8948,7 +9098,7 @@ let sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - (sources."stack-utils-2.0.2" // { + (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; @@ -8988,7 +9138,7 @@ let sources."strip-ansi-5.2.0" ]; }) - sources."tar-fs-2.1.0" + sources."tar-fs-2.1.1" (sources."tar-stream-2.1.4" // { dependencies = [ sources."readable-stream-3.6.0" @@ -9027,7 +9177,7 @@ let sources."typedoc-plugin-no-inherit-1.2.0" sources."typedoc-plugin-sourcefile-url-1.0.6" sources."typescript-4.0.5" - sources."uglify-js-3.11.4" + sources."uglify-js-3.11.6" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" @@ -9051,7 +9201,7 @@ let sources."util-deprecate-1.0.2" sources."uuid-8.3.1" sources."v8-compile-cache-2.2.0" - (sources."v8-to-istanbul-6.0.1" // { + (sources."v8-to-istanbul-7.0.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -9086,7 +9236,7 @@ let sources."wrappy-1.0.2" sources."write-1.0.3" sources."write-file-atomic-3.0.3" - sources."ws-7.3.1" + sources."ws-7.4.0" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-4.0.0" @@ -9102,38 +9252,38 @@ let sources."yargs-parser-18.1.3" ]; }) - (sources."zigbee-herdsman-converters-12.0.224" // { + (sources."zigbee-herdsman-converters-13.0.7" // { dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.12.3" // { + (sources."@babel/core-7.12.9" // { dependencies = [ sources."semver-5.7.1" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.1" // { + (sources."@babel/generator-7.12.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-member-expression-to-functions-7.12.7" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.7" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.1" @@ -9145,13 +9295,14 @@ let sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.1" // { + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/template-7.12.7" + (sources."@babel/traverse-7.12.9" // { dependencies = [ sources."globals-11.12.0" ]; }) - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.7" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" sources."@eslint/eslintrc-0.2.1" @@ -9161,46 +9312,46 @@ let ]; }) sources."@istanbuljs/schema-0.1.2" - sources."@jest/console-26.6.1" - (sources."@jest/core-26.6.1" // { + sources."@jest/console-26.6.2" + (sources."@jest/core-26.6.3" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."@jest/environment-26.6.1" - sources."@jest/fake-timers-26.6.1" - sources."@jest/globals-26.6.1" - sources."@jest/reporters-26.6.1" - sources."@jest/source-map-26.5.0" - sources."@jest/test-result-26.6.1" - sources."@jest/test-sequencer-26.6.1" - sources."@jest/transform-26.6.1" - sources."@jest/types-26.6.1" + sources."@jest/environment-26.6.2" + sources."@jest/fake-timers-26.6.2" + sources."@jest/globals-26.6.2" + sources."@jest/reporters-26.6.2" + sources."@jest/source-map-26.6.2" + sources."@jest/test-result-26.6.2" + sources."@jest/test-sequencer-26.6.3" + sources."@jest/transform-26.6.2" + sources."@jest/types-26.6.2" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" - sources."@types/babel__core-7.1.11" + sources."@types/babel__core-7.1.12" sources."@types/babel__generator-7.6.2" - sources."@types/babel__template-7.0.3" - sources."@types/babel__traverse-7.0.15" + sources."@types/babel__template-7.4.0" + sources."@types/babel__traverse-7.0.16" sources."@types/graceful-fs-4.1.4" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.0" sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.6" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."@types/prettier-2.1.5" sources."@types/stack-utils-2.0.0" - sources."@types/yargs-15.0.9" + sources."@types/yargs-15.0.10" sources."@types/yargs-parser-15.0.0" - sources."@typescript-eslint/experimental-utils-4.6.0" - sources."@typescript-eslint/scope-manager-4.6.0" - sources."@typescript-eslint/types-4.6.0" - sources."@typescript-eslint/typescript-estree-4.6.0" - sources."@typescript-eslint/visitor-keys-4.6.0" + sources."@typescript-eslint/experimental-utils-4.8.2" + sources."@typescript-eslint/scope-manager-4.8.2" + sources."@typescript-eslint/types-4.8.2" + sources."@typescript-eslint/typescript-estree-4.8.2" + sources."@typescript-eslint/visitor-keys-4.8.2" sources."abab-2.0.5" sources."acorn-7.4.1" sources."acorn-globals-6.0.0" @@ -9232,11 +9383,11 @@ let sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.0" - sources."babel-jest-26.6.1" + sources."babel-jest-26.6.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.5.0" - sources."babel-preset-current-node-syntax-0.1.4" - sources."babel-preset-jest-26.5.0" + sources."babel-plugin-jest-hoist-26.6.2" + sources."babel-preset-current-node-syntax-1.0.0" + sources."babel-preset-jest-26.6.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -9246,14 +9397,14 @@ let sources."is-descriptor-1.0.2" ]; }) - sources."base64-js-1.3.1" + sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."bl-4.0.3" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."bser-2.1.1" - sources."buffer-5.7.0" + sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" @@ -9272,7 +9423,7 @@ let }) sources."char-regex-1.0.2" sources."ci-info-2.0.0" - sources."cjs-module-lexer-0.4.3" + sources."cjs-module-lexer-0.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -9309,7 +9460,7 @@ let }) sources."dashdash-1.14.1" sources."data-urls-2.0.0" - sources."debug-4.2.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" sources."decimal.js-10.2.1" sources."decode-uri-component-0.2.0" @@ -9324,7 +9475,7 @@ let }) sources."delayed-stream-1.0.0" sources."detect-newline-3.1.0" - sources."diff-sequences-26.5.0" + sources."diff-sequences-26.6.2" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { @@ -9347,9 +9498,9 @@ let sources."type-check-0.3.2" ]; }) - sources."eslint-7.12.1" + sources."eslint-7.14.0" sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-24.1.0" + sources."eslint-plugin-jest-24.1.3" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -9395,7 +9546,7 @@ let sources."ms-2.0.0" ]; }) - (sources."expect-26.6.1" // { + (sources."expect-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -9436,7 +9587,7 @@ let sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.2.1" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."gensync-1.0.0-beta.2" @@ -9479,7 +9630,7 @@ let sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-4.0.6" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."import-local-3.0.2" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -9493,7 +9644,7 @@ let sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.0.0" + sources."is-core-module-2.2.0" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" @@ -9535,12 +9686,12 @@ let }) sources."istanbul-lib-source-maps-4.0.0" sources."istanbul-reports-3.0.2" - (sources."jest-26.6.1" // { + (sources."jest-26.6.3" // { dependencies = [ - sources."jest-cli-26.6.1" + sources."jest-cli-26.6.3" ]; }) - (sources."jest-changed-files-26.6.1" // { + (sources."jest-changed-files-26.6.2" // { dependencies = [ sources."execa-4.1.0" sources."get-stream-5.2.0" @@ -9548,35 +9699,35 @@ let sources."npm-run-path-4.0.1" ]; }) - sources."jest-config-26.6.1" - sources."jest-diff-26.6.1" + sources."jest-config-26.6.3" + sources."jest-diff-26.6.2" sources."jest-docblock-26.0.0" - sources."jest-each-26.6.1" - sources."jest-environment-jsdom-26.6.1" - sources."jest-environment-node-26.6.1" + sources."jest-each-26.6.2" + sources."jest-environment-jsdom-26.6.2" + sources."jest-environment-node-26.6.2" sources."jest-get-type-26.3.0" - sources."jest-haste-map-26.6.1" - sources."jest-jasmine2-26.6.1" - sources."jest-leak-detector-26.6.1" - sources."jest-matcher-utils-26.6.1" - sources."jest-message-util-26.6.1" - sources."jest-mock-26.6.1" + sources."jest-haste-map-26.6.2" + sources."jest-jasmine2-26.6.3" + sources."jest-leak-detector-26.6.2" + sources."jest-matcher-utils-26.6.2" + sources."jest-message-util-26.6.2" + sources."jest-mock-26.6.2" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - sources."jest-resolve-26.6.1" - sources."jest-resolve-dependencies-26.6.1" - sources."jest-runner-26.6.1" - sources."jest-runtime-26.6.1" - sources."jest-serializer-26.5.0" - sources."jest-snapshot-26.6.1" - sources."jest-util-26.6.1" - (sources."jest-validate-26.6.1" // { + sources."jest-resolve-26.6.2" + sources."jest-resolve-dependencies-26.6.3" + sources."jest-runner-26.6.3" + sources."jest-runtime-26.6.3" + sources."jest-serializer-26.6.2" + sources."jest-snapshot-26.6.2" + sources."jest-util-26.6.2" + (sources."jest-validate-26.6.2" // { dependencies = [ sources."camelcase-6.2.0" ]; }) - sources."jest-watcher-26.6.1" - (sources."jest-worker-26.6.1" // { + sources."jest-watcher-26.6.2" + (sources."jest-worker-26.6.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -9655,7 +9806,7 @@ let sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.9.1" - sources."p-each-series-2.1.0" + sources."p-each-series-2.2.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -9675,7 +9826,7 @@ let sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-26.6.1" // { + (sources."pretty-format-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -9715,7 +9866,7 @@ let }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.18.1" + sources."resolve-1.19.0" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -9802,7 +9953,7 @@ let sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - (sources."stack-utils-2.0.2" // { + (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; @@ -9876,7 +10027,7 @@ let sources."util-deprecate-1.0.2" sources."uuid-8.3.1" sources."v8-compile-cache-2.2.0" - (sources."v8-to-istanbul-6.0.1" // { + (sources."v8-to-istanbul-7.0.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -9906,7 +10057,7 @@ let sources."wrappy-1.0.2" sources."write-1.0.3" sources."write-file-atomic-3.0.3" - sources."ws-7.3.1" + sources."ws-7.4.0" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-4.0.0" @@ -9920,7 +10071,7 @@ let sources."yargs-parser-18.1.3" ]; }) - sources."zigbee2mqtt-frontend-0.2.68" + sources."zigbee2mqtt-frontend-0.2.100" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/servers/zigbee2mqtt/update.sh b/pkgs/servers/zigbee2mqtt/update.sh index 7fd32dff4634..14c4d93261d1 100755 --- a/pkgs/servers/zigbee2mqtt/update.sh +++ b/pkgs/servers/zigbee2mqtt/update.sh @@ -10,8 +10,8 @@ if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then exit 0 fi -wget $ZIGBEE2MQTT/package.json -wget $ZIGBEE2MQTT/npm-shrinkwrap.json +curl -LO $ZIGBEE2MQTT/package.json +curl -LO $ZIGBEE2MQTT/npm-shrinkwrap.json node2nix --nodejs-12 \ -l npm-shrinkwrap.json \ diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 2617a8f74ab5..4ff0a6caf760 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -483,10 +483,14 @@ activatePackage() { # the transition, we do include everything in thatcase. # # TODO(@Ericson2314): Don't special-case native compilation - if [[ ( -z "${strictDeps-}" || "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then + if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then addToSearchPath _PATH "$pkg/bin" fi + if [[ "$hostOffset" -le -1 ]]; then + addToSearchPath _XDG_DATA_DIRS "$pkg/share" + fi + if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then addToSearchPath _HOST_PATH "$pkg/bin" fi @@ -602,13 +606,16 @@ fi PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH" HOST_PATH="${_HOST_PATH-}${_HOST_PATH:+${HOST_PATH:+:}}$HOST_PATH" +export XDG_DATA_DIRS="${_XDG_DATA_DIRS-}${_XDG_DATA_DIRS:+${XDG_DATA_DIRS:+:}}${XDG_DATA_DIRS-}" if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "final path: $PATH" echo "final host path: $HOST_PATH" + echo "final data dirs: $XDG_DATA_DIRS" fi unset _PATH unset _HOST_PATH +unset _XDG_DATA_DIRS # Make GNU Make produce nested output. diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 2dc667277dd0..18e878b47b5c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ibus-bamboo"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "BambooEngine"; repo = pname; rev = "v${version}"; - sha256 = "0w3z36p8d3a04fgzc12xnpdkg6h8alfgqy5rjxbwqwi25h3byj6k"; + sha256 = "17zgxqlsjkqyjywynqzmymw310aypcsjdrwnc7hx7v7xwal8iwjk"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index b92236d35e6e..b114ee2373c1 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.24.3"; + version = "0.24.4"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "04ycjgy40if0licc883lp7i6jpndvcndw24xp7lilskmaacpm5if"; + sha256 = "17k32wr70sp7ag69xww2q9mrgnzakgkjw6la04n3jlhfa5z37dzj"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 693e99c46452..b00a0836021f 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -8,7 +8,7 @@ , dosfstools , e2fsprogs , perl -, python2 +, python3 , util-linux , check , enableStatic ? false @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. doCheck = !stdenv.hostPlatform.isMusl; /* translation test */ - checkInputs = [ check dosfstools e2fsprogs perl python2 util-linux ]; + checkInputs = [ check dosfstools e2fsprogs perl python3 util-linux ]; meta = { description = "Create, destroy, resize, check, and copy partitions"; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index e631aa9d342b..5ed63d799793 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "2.0.1"; - source.sha256 = "03q1q6majci0l6kzw6kv7r395jycrl862mlqmyydxcd29y8wm3m2"; + version = "2.0.2"; + source.sha256 = "0wwrgx1syi3zrwn52pblh7qivyxp3cvq0rywp6n0s2bkk0xz903z"; erubis = buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 78ba291b1519..176062ed314b 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "drill"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "fcsonline"; repo = pname; rev = version; - sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw"; + sha256 = "07zz0dj0wjwrc1rmayz7s8kpcv03i0ygl4vfwsam72qd4nf6v538"; }; - cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m"; + cargoSha256 = "1nbfbmm9v1yp7380zdzz7qrc7x6krwlvgn5x5yzb8yn1rc99jzx4"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 90e05e5310bd..4568aec9c5d9 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, runtimeShell }: let - version = "3.0.0"; + version = "3.0.8"; in stdenv.mkDerivation { pname = "easyrsa"; inherit version; @@ -10,14 +10,15 @@ in stdenv.mkDerivation { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "0wbdv3wmqwm5680rpb971l56xiw49adpicqshk3vhfmpvqzl4dbs"; + sha256 = "05q60s343ydh9j6hzj0840qdcq8fkyz06q68yw4pqgqg4w68rbgs"; }; patches = [ ./fix-paths.patch ]; installPhase = '' mkdir -p $out/share/easyrsa - cp -r easyrsa3/{openssl*.cnf,x509-types,vars.example} $out/share/easyrsa + cp -r easyrsa3/{*.cnf,x509-types,vars.example} $out/share/easyrsa + cp easyrsa3/openssl-easyrsa.cnf $out/share/easyrsa/safessl-easyrsa.cnf install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa substituteInPlace $out/bin/easyrsa \ --subst-var out \ @@ -35,7 +36,7 @@ in stdenv.mkDerivation { description = "Simple shell based CA utility"; homepage = "https://openvpn.net/"; license = licenses.gpl2; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.numinit ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/easyrsa/fix-paths.patch b/pkgs/tools/networking/easyrsa/fix-paths.patch index 82688fa79460..7891adcb20c7 100644 --- a/pkgs/tools/networking/easyrsa/fix-paths.patch +++ b/pkgs/tools/networking/easyrsa/fix-paths.patch @@ -1,33 +1,49 @@ diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa -index 6fec288..210648a 100755 +index 261336f..7b9a79b 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa -@@ -1003,7 +1003,7 @@ Note: using Easy-RSA configuration from: $vars" +@@ -1661,7 +1661,7 @@ Note: using Easy-RSA configuration from: $vars" # Set defaults, preferring existing env-vars if present - set_var EASYRSA "$PWD" + set_var EASYRSA "$prog_dir" - set_var EASYRSA_OPENSSL openssl + set_var EASYRSA_OPENSSL "@openssl@" - set_var EASYRSA_PKI "$EASYRSA/pki" + set_var EASYRSA_PKI "$PWD/pki" set_var EASYRSA_DN cn_only set_var EASYRSA_REQ_COUNTRY "US" -@@ -1030,13 +1030,17 @@ Note: using Easy-RSA configuration from: $vars" - # Detect openssl config, preferring EASYRSA_PKI over EASYRSA - if [ -f "$EASYRSA_PKI/openssl-1.0.cnf" ]; then - set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-1.0.cnf" -- else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf" -+ elif [ -f "$EASYRSA/openssl-1.0.cnf" ]; then -+ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf" -+ else set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-1.0.cnf" - fi +@@ -1683,16 +1683,31 @@ Note: using Easy-RSA configuration from: $vars" + set_var EASYRSA_TEMP_DIR "$EASYRSA_PKI" + set_var EASYRSA_REQ_CN ChangeMe + set_var EASYRSA_DIGEST sha256 +- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" +- set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" + set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM" ++ if [ -f "$EASYRSA_PKI/safessl-easyrsa.conf" ]; then ++ set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" ++ elif [ -f "$EASYRSA/safessl-easyrsa.conf" ]; then ++ set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf" ++ elif [ -f "@out@/share/easyrsa/safessl-easyrsa.cnf" ]; then ++ set_var EASYRSA_SAFE_CONF "@out@/share/easyrsa/safessl-easyrsa.cnf" ++ fi ++ ++ if [ -f "$EASYRSA_PKI/openssl-easyrsa.conf" ]; then ++ set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" ++ elif [ -f "$EASYRSA/openssl-easyrsa.conf" ]; then ++ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf" ++ elif [ -f "@out@/share/easyrsa/openssl-easyrsa.cnf" ]; then ++ set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-easyrsa.cnf" ++ fi ++ # Same as above for the x509-types extensions dir if [ -d "$EASYRSA_PKI/x509-types" ]; then set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types" -- else set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" +- else +- #TODO: This should be removed. Not really suitable for packaging. + elif [ -d "$EASYRSA/x509-types" ]; then -+ set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" -+ else set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types" + set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" ++ else ++ set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types" fi # EASYRSA_ALGO_PARAMS must be set depending on selected algo diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 605947e3ab26..9acd64a2c86e 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.23"; + version = "2.2.24"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0p6ss4f3vlkf91pmp27bmvfr5bdxxi0pb3dmxpqljglbsx4mxd8h"; + sha256 = "0ilcp7m1dvwnri3i7q9wanf5pvhwxk7h106pd62g0d5fz80b944h"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 9e9348105010..354437a9bd56 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -34,11 +34,15 @@ let postBuild = '' files=$(find $out/bin/ -type f -exec readlink -f {} \;) - rm $out/bin - mkdir $out/bin + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + fi for i in $files; do - ln -sf $i $out/bin/$(basename $i) + if ! [ "$(readlink -f "$out/bin/$(basename $i)")" = "$i" ]; then + ln -sf $i $out/bin/$(basename $i) + fi done wrapProgram $out/bin/pass \ diff --git a/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch b/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch new file mode 100644 index 000000000000..55822f170d14 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/0001-Fix-installation-with-Nix.patch @@ -0,0 +1,41 @@ +From 611cb2de31a460789c44615d3a52b8d24dbd6fdd Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Fri, 4 Dec 2020 21:53:52 +0100 +Subject: [PATCH] Fix installation with Nix + +--- + Makefile | 2 +- + setup.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 2febf4e..8feab91 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,7 +7,7 @@ all: + @echo + + install: +- @python3 setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build ++ @python3 setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build --prefix= + @echo + @echo "pass-import is installed succesfully" + @echo +diff --git a/setup.py b/setup.py +index b30870c..d9fedbc 100644 +--- a/setup.py ++++ b/setup.py +@@ -15,8 +15,8 @@ with Path('pass_import', '__about__.py').open() as file: + with open('README.md') as file: + long_description = file.read() + +-share = Path(sys.prefix, 'share') +-lib = Path('/usr', 'lib', 'password-store', 'extensions') ++share = Path('/share') ++lib = Path('/lib', 'password-store', 'extensions') + if '--user' in sys.argv: + lib = Path.home() / '.password-store' / 'extensions' + if 'XDG_DATA_HOME' in os.environ: +-- +2.28.0 + diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index bd41ae0c593c..885dd05110f3 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -5,48 +5,38 @@ let p.defusedxml p.setuptools p.pyaml + p.pykeepass + p.filemagic + p.cryptography + p.secretstorage ]); in stdenv.mkDerivation rec { pname = "pass-import"; - version = "2.6"; + version = "3.1"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-import"; rev = "v${version}"; - sha256 = "1q8rln4djh2z8j2ycm654df5y6anm5iv2r19spgy07c3fnisxlac"; + sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA="; }; + patches = [ ./0001-Fix-installation-with-Nix.patch ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - patches = [ - # https://github.com/roddhjav/pass-import/pull/91 - (fetchpatch { - url = "https://github.com/roddhjav/pass-import/commit/6ccaf639e92df45bd400503757ae4aa2c5c030d7.patch"; - sha256 = "0lw9vqvbqcy96s7v7nz0i1bdx93x7qr13azymqypcdhjwmq9i63h"; - }) - ]; - - postPatch = '' - sed -i -e 's|$0|${pass}/bin/pass|' import.bash - ''; - - dontBuild = true; - - installFlags = [ - "PREFIX=$(out)" - "BASHCOMPDIR=$(out)/share/bash-completion/completions" - ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; - postFixup = '' - install -D pass_import.py $out/${pythonPackages.python.sitePackages}/pass_import.py + postInstall = '' + wrapProgram $out/bin/pimport \ + --prefix PATH : "${pythonEnv}/bin" \ + --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" wrapProgram $out/lib/password-store/extensions/import.bash \ --prefix PATH : "${pythonEnv}/bin" \ - --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" \ - --run "export PREFIX" + --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 1e0164e10cf4..69ea8c0f9c2c 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,4 +1,5 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles +, Foundation, Security }: rustPlatform.buildRustPackage rec { pname = "rage"; @@ -15,7 +16,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + Foundation + Security + ]; postBuild = '' cargo run --example generate-docs diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 5b6cf5e22f21..ddff50ea0e83 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "scdoc"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "17cjh3lcfppyl2mzpanylla93gdgdv5spc8jldshvayzizhfghwa"; + sha256 = "007pm3gspvya58cwb12wpnrm9dq5p28max2s0b2y9rq80nqgqag5"; }; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a0245d77dd9..184632f49246 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -546,6 +546,8 @@ in wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; + wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; + separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh; @@ -2374,6 +2376,8 @@ in mapproxy = callPackage ../applications/misc/mapproxy { }; + marl = callPackage ../development/libraries/marl {}; + marlin-calc = callPackage ../tools/misc/marlin-calc {}; masscan = callPackage ../tools/security/masscan { @@ -3543,7 +3547,9 @@ in pax = callPackage ../tools/archivers/pax { }; - rage = callPackage ../tools/security/rage { }; + rage = callPackage ../tools/security/rage { + inherit (darwin.apple_sdk.frameworks) Foundation Security; + }; rar2fs = callPackage ../tools/filesystems/rar2fs { }; @@ -12784,18 +12790,12 @@ in ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { # The following need to be fixed on Darwin - frei0r = if stdenv.isDarwin then null else frei0r; - game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; - openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; - rav1e = if stdenv.isDarwin then null else rav1e; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; - x265 = if stdenv.isDarwin then null else x265; - xavs = if stdenv.isDarwin then null else xavs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; @@ -14318,7 +14318,18 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg - libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; + libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo (lib.optionalAttrs stdenv.isDarwin { + # cmake 3.19.1 has a bug. So far only noticed with this package. + # https://github.com/NixOS/nixpkgs/issues/105854 + cmake = cmake.overrideAttrs(oldAttrs: { + patches = oldAttrs.patches ++ [ + (fetchpatch { + url = "https://gitlab.kitware.com/cmake/cmake/-/commit/fcabf4a47e0c441ff80fad8f34e388b16738bd33.patch"; + sha256 = "bVrjY8omtAEKe8G76hGtmO54LKJvhx3RTW6OF6Y7rsU="; + }) + ]; + }); + }); libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; @@ -14407,6 +14418,8 @@ in libndctl = callPackage ../development/libraries/libndctl { }; + libnest2d = callPackage ../development/libraries/libnest2d { }; + libnet = callPackage ../development/libraries/libnet { }; libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { }; @@ -16880,8 +16893,8 @@ in clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - # clickhouse doesn't build on llvm8. - inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm; + # upstream requires llvm10 as of v20.11.4.13 + inherit (llvmPackages_10) clang-unwrapped lld lldClang llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -18402,6 +18415,8 @@ in fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; + gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; @@ -21027,6 +21042,10 @@ in gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + greenfoot = callPackage ../applications/editors/greenfoot/default.nix { + jdk = jetbrains.jdk; + }; + gspeech = callPackage ../applications/audio/gspeech { }; icesl = callPackage ../applications/misc/icesl { }; @@ -22883,9 +22902,7 @@ in pig = callPackage ../applications/networking/cluster/pig { }; - pijul = callPackage ../applications/version-management/pijul { - inherit (llvmPackages) clang libclang; - }; + pijul = callPackage ../applications/version-management/pijul { }; ping = callPackage ../applications/networking/ping { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 793b7b78b0e9..6fe157d2ea2b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -740,6 +740,8 @@ let octavius = callPackage ../development/ocaml-modules/octavius { }; + odate = callPackage ../development/ocaml-modules/odate { }; + odoc = callPackage ../development/ocaml-modules/odoc { }; omd = callPackage ../development/ocaml-modules/omd { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa3a001a8210..c6770420c3ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1215,6 +1215,10 @@ in { click-threading = callPackage ../development/python-modules/click-threading { }; + clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {}; + + clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {}; + cliff = callPackage ../development/python-modules/cliff { }; clifford = callPackage ../development/python-modules/clifford { }; @@ -2270,7 +2274,10 @@ in { freetype-py = callPackage ../development/python-modules/freetype-py { }; - freezegun = callPackage ../development/python-modules/freezegun { }; + freezegun = if isPy27 then + callPackage ../development/python-modules/freezegun/0.3.nix { } + else + callPackage ../development/python-modules/freezegun { }; fritzconnection = callPackage ../development/python-modules/fritzconnection { }; @@ -3058,7 +3065,11 @@ in { isodate = callPackage ../development/python-modules/isodate { }; - isort = callPackage ../development/python-modules/isort { }; + isort = if isPy3k then + callPackage ../development/python-modules/isort { } + else + callPackage ../development/python-modules/isort/4.nix { + }; isoweek = callPackage ../development/python-modules/isoweek { }; @@ -3229,6 +3240,8 @@ in { jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; + jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { }; + jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; @@ -3781,6 +3794,8 @@ in { mido = callPackage ../development/python-modules/mido { }; + milc = callPackage ../development/python-modules/milc { }; + milksnake = callPackage ../development/python-modules/milksnake { }; minidb = callPackage ../development/python-modules/minidb { }; @@ -4346,7 +4361,9 @@ in { oyaml = callPackage ../development/python-modules/oyaml { }; - packaging = callPackage ../development/python-modules/packaging { }; + packaging = if isPy3k + then callPackage ../development/python-modules/packaging { } + else callPackage ../development/python-modules/packaging/2.nix { }; packet-python = callPackage ../development/python-modules/packet-python { }; @@ -4851,6 +4868,8 @@ in { py-air-control = callPackage ../development/python-modules/py-air-control { }; + py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); @@ -5004,6 +5023,8 @@ in { pycurl = callPackage ../development/python-modules/pycurl { }; + pycxx = callPackage ../development/python-modules/pycxx { }; + pydantic = callPackage ../development/python-modules/pydantic { }; pydbus = callPackage ../development/python-modules/pydbus { }; @@ -5133,7 +5154,10 @@ in { pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }; + pygobject3 = if isPy3k then + callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; } + else + callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; }; pygogo = callPackage ../development/python-modules/pygogo { }; @@ -5221,7 +5245,10 @@ in { pylev = callPackage ../development/python-modules/pylev { }; - pylibacl = callPackage ../development/python-modules/pylibacl { }; + pylibacl = if isPy3k then + callPackage ../development/python-modules/pylibacl { } + else + callPackage ../development/python-modules/pylibacl/0.5.nix { }; pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; @@ -5322,6 +5349,8 @@ in { pync = callPackage ../development/python-modules/pync { }; + pynest2d = callPackage ../development/python-modules/pynest2d { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pynmea2 = callPackage ../development/python-modules/pynmea2 { }; @@ -5621,7 +5650,9 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pysvn = callPackage ../development/python-modules/pysvn { }; + pysvn = callPackage ../development/python-modules/pysvn { + inherit (pkgs) bash subversion apr aprutil expat neon openssl; + }; pytabix = callPackage ../development/python-modules/pytabix { }; @@ -5636,7 +5667,7 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; # pytest>=6 is too new for most packages - pytest = if isPy3k then self.pytest_5 else self.pytest_4; + pytest = if isPy3k then self.pytest_6 else self.pytest_4; pytest_4 = callPackage ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle @@ -5804,11 +5835,10 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; - - pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; - - pytest_xdist = self.pytest_xdist_1; + pytest_xdist = if isPy27 then + callPackage ../development/python-modules/pytest-xdist/1.nix { } + else + callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; @@ -6227,6 +6257,8 @@ in { rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + re-assert = callPackage ../development/python-modules/re-assert { }; + readchar = callPackage ../development/python-modules/readchar { }; readme = callPackage ../development/python-modules/readme { }; |